Fix broken device root clean.

This commit is contained in:
fewtarius 2023-04-26 13:21:19 +00:00
parent bb433eb7a2
commit 473be84fda
No known key found for this signature in database
GPG key ID: F4AE55305D1B8C1A
3 changed files with 13 additions and 6 deletions

View file

@ -34,12 +34,12 @@ RK3588:
PROJECT=Rockchip DEVICE=RK3588 ARCH=aarch64 ./scripts/build_distro
RK3566:
PKG_CLEAN="SDL2 retroarch" PROJECT=Rockchip DEVICE=RK3566 ARCH=arm ./scripts/build_distro
PKG_CLEAN="SDL2 retroarch" PROJECT=Rockchip DEVICE=RK3566 ARCH=aarch64 ./scripts/build_distro
PROJECT=Rockchip DEVICE=RK3566 ARCH=arm ./scripts/build_distro
PROJECT=Rockchip DEVICE=RK3566 ARCH=aarch64 ./scripts/build_distro
RK3566-X55:
PKG_CLEAN="SDL2 retroarch" DEVICE_ROOT=RK3566 PROJECT=Rockchip DEVICE=RK3566-X55 ARCH=arm ./scripts/build_distro
PKG_CLEAN="SDL2 retroarch" DEVICE_ROOT=RK3566 PROJECT=Rockchip DEVICE=RK3566-X55 ARCH=aarch64 ./scripts/build_distro
DEVICE_ROOT=RK3566 PROJECT=Rockchip DEVICE=RK3566-X55 ARCH=arm ./scripts/build_distro
DEVICE_ROOT=RK3566 PROJECT=Rockchip DEVICE=RK3566-X55 ARCH=aarch64 ./scripts/build_distro
unset DEVICE_ROOT
S922X:

View file

@ -46,6 +46,13 @@
CLEAN_NETWORK="RTL8821CS-firmware"
CLEAN_EMU_32BIT="lib32 box86 flycast-lr pcsx_rearmed-lr"
# Make sure we clean a minimal number of packages for devices with
# a BSP kernel and a rotated display when using DEVICE_ROOT.
if [ -n "DEVICE_ROOT" ]
then
CLEAN_DEVICE_ROOT="SDL2 retroarch"
fi
# additional drivers to install:
# for a list of additional drivers see packages/linux-drivers
# Space separated list is supported,

View file

@ -19,7 +19,7 @@ echo "Building ${DISTRO} for ${DEVICE}"
if [ "${ENABLE_32BIT}" == "true" ]
then
PKG_CLEAN=" ${PKG_CLEAN} ${CLEAN_EMU_32BIT}"
PKG_CLEAN+=" ${CLEAN_EMU_32BIT}"
fi
# If DEVICE_ROOT is defined and not the device being built, make sure that the
@ -60,7 +60,7 @@ then
fi
# Clean necessary packages.
PKG_CLEAN=" ${PKG_CLEAN} ${CLEAN_NETWORK} ${CLEAN_OS_BASE}"
PKG_CLEAN+=" ${CLEAN_NETWORK} ${CLEAN_OS_BASE} ${CLEAN_DEVICE_ROOT}"
if [ ! -n "${DIRTY}" ]
then