From 9f9f2da8f23041b08a2bb193f425f9818b7e806b Mon Sep 17 00:00:00 2001 From: Gabriel Valcazar Date: Thu, 6 Sep 2018 18:24:48 +0200 Subject: [PATCH] build.sh: add support for building ccimx8x framebuffer images Add wayland and vulkan to the distro features that get removed alongside x11. Signed-off-by: Gabriel Valcazar --- sdk/build-github.sh | 8 ++++---- sdk/build.sh | 8 ++++---- 2 files changed, 8 insertions(+), 8 deletions(-) diff --git a/sdk/build-github.sh b/sdk/build-github.sh index 7ffeaa69f..2da93e40b 100755 --- a/sdk/build-github.sh +++ b/sdk/build-github.sh @@ -36,8 +36,8 @@ ZIP_INSTALLER_CFG=" DEY_IMAGE_INSTALLER = \"1\" " -X11_REMOVAL_CFG=" -DISTRO_FEATURES_remove = \"x11\" +BACKEND_REMOVAL_CFG=" +DISTRO_FEATURES_remove = \"x11 wayland vulkan\" " REPO="$(which repo)" @@ -175,9 +175,9 @@ for platform in ${DY_PLATFORMS}; do conf/local.conf printf "${RM_WORK_CFG}" >> conf/local.conf printf "${ZIP_INSTALLER_CFG}" >> conf/local.conf - # Remove 'x11' distro feature if building framebuffer images + # Remove all desktop backend distro features if building framebuffer images if [ "${DY_FB_IMAGE}" = "true" ]; then - printf "${X11_REMOVAL_CFG}" >> conf/local.conf + printf "${BACKEND_REMOVAL_CFG}" >> conf/local.conf fi for target in ${platform_targets}; do printf "\n[INFO] Building the ${target} target.\n" diff --git a/sdk/build.sh b/sdk/build.sh index a5191d980..5983dffa0 100755 --- a/sdk/build.sh +++ b/sdk/build.sh @@ -49,8 +49,8 @@ ZIP_INSTALLER_CFG=" DEY_IMAGE_INSTALLER = \"1\" " -X11_REMOVAL_CFG=" -DISTRO_FEATURES_remove = \"x11\" +BACKEND_REMOVAL_CFG=" +DISTRO_FEATURES_remove = \"x11 wayland vulkan\" " REPO="$(which repo)" @@ -254,9 +254,9 @@ for platform in ${DY_PLATFORMS}; do printf "${RM_WORK_CFG}" >> conf/local.conf fi printf "${ZIP_INSTALLER_CFG}" >> conf/local.conf - # Remove 'x11' distro feature if building framebuffer images + # Remove all desktop backend distro features if building framebuffer images if [ "${DY_FB_IMAGE}" = "true" ]; then - printf "${X11_REMOVAL_CFG}" >> conf/local.conf + printf "${BACKEND_REMOVAL_CFG}" >> conf/local.conf fi # Append extra configuration macros if provided from build environment if [ -n "${DY_EXTRA_LOCAL_CONF}" ]; then