diff --git a/config/boards/README.md b/config/boards/README.md index b657f8c7e5..3bb8d0ba78 100644 --- a/config/boards/README.md +++ b/config/boards/README.md @@ -22,7 +22,9 @@ | FULL_DESKTOP | yes/no = install Office, Thunderbird, ... | | DESKTOP_AUTOLOGIN | yes/no | | PACKAGE_LIST_BOARD | space delimited packages to be installed on this boards | +| PACKAGE_LIST_BOARD_REMOVE | space delimited packages to be removed | | PACKAGE_LIST_DESKTOP_BOARD | space delimited packages to be installed on this boards desktop build | +| PACKAGE_LIST_DESKTOP_BOARD_REMOVE | space delimited packages to be removed | Statuses displayed at the login prompt: diff --git a/lib/build-all-ng.sh b/lib/build-all-ng.sh index 429bcc9adf..8717585cb9 100644 --- a/lib/build-all-ng.sh +++ b/lib/build-all-ng.sh @@ -59,7 +59,8 @@ unset LINUXFAMILY LINUXCONFIG KERNELDIR KERNELSOURCE KERNELBRANCH BOOTDIR BOOTSO DEB_STORAGE REPO_STORAGE REPO_CONFIG REPOSITORY_UPDATE PACKAGE_LIST_RELEASE LOCAL_MIRROR COMPILE_ATF \ PACKAGE_LIST_BOARD PACKAGE_LIST_FAMILY PACKAGE_LIST_DESKTOP_BOARD PACKAGE_LIST_DESKTOP_FAMILY ATF_COMPILE ATFPATCHDIR OFFSET BOOTSOURCEDIR BOOT_USE_BLOBS \ BOOT_SOC DDR_BLOB MINILOADER_BLOB BL31_BLOB BOOT_RK3328_USE_AYUFAN_ATF BOOT_USE_BLOBS BOOT_RK3399_LEGACY_HYBRID \ - BOOT_USE_MAINLINE_ATF BOOT_USE_TPL_SPL_BLOB OFFLINE_WORK IMAGE_PARTITION_TABLE BOOT_LOGO UPSTREM_VER + BOOT_USE_MAINLINE_ATF BOOT_USE_TPL_SPL_BLOB OFFLINE_WORK IMAGE_PARTITION_TABLE BOOT_LOGO UPSTREM_VER \ + PACKAGE_LIST_BOARD_REMOVE PACKAGE_LIST_FAMILY_REMOVE PACKAGE_LIST_DESKTOP_BOARD_REMOVE PACKAGE_LIST_DESKTOP_FAMILY_REMOVE } pack_upload () diff --git a/lib/distributions.sh b/lib/distributions.sh index 4eb059a985..8d14512862 100644 --- a/lib/distributions.sh +++ b/lib/distributions.sh @@ -220,11 +220,21 @@ install_common() chroot "${SDCARD}" /bin/bash -c "DEBIAN_FRONTEND=noninteractive apt -yqq --no-install-recommends install $PACKAGE_LIST_FAMILY" >> "${DEST}"/debug/install.log fi - # install family packages + # install board packages if [[ -n ${PACKAGE_LIST_BOARD} ]]; then chroot "${SDCARD}" /bin/bash -c "DEBIAN_FRONTEND=noninteractive apt -yqq --no-install-recommends install $PACKAGE_LIST_BOARD" >> "${DEST}"/debug/install.log fi + # remove family packages + if [[ -n ${PACKAGE_LIST_FAMILY_REMOVE} ]]; then + chroot "${SDCARD}" /bin/bash -c "DEBIAN_FRONTEND=noninteractive apt -yqq remove --auto-remove $PACKAGE_LIST_FAMILY_REMOVE" >> "${DEST}"/debug/install.log + fi + + # remove board packages + if [[ -n ${PACKAGE_LIST_BOARD_REMOVE} ]]; then + chroot "${SDCARD}" /bin/bash -c "DEBIAN_FRONTEND=noninteractive apt -yqq remove --auto-remove $PACKAGE_LIST_BOARD_REMOVE" >> "${DEST}"/debug/install.log + fi + # install u-boot if [[ "${REPOSITORY_INSTALL}" != *u-boot* ]]; then UBOOT_VER=$(dpkg --info "${DEB_STORAGE}/${CHOSEN_UBOOT}_${REVISION}_${ARCH}.deb" | grep Descr | awk '{print $(NF)}')