wbrawner/distribution
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Switch how we clean packages to ensure the primary buildroot for a device type is also cleaned properly.

Browse source
This commit is contained in:
fewtarius 2022-07-20 20:51:59 -04:00
parent e18e6e49e8
commit 51cf874101
No known key found for this signature in database
GPG key ID: F4AE55305D1B8C1A
2 changed files with 20 additions and 21 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
Makefile
View file

@ -37,20 +37,20 @@ RG503:
PROJECT=Rockchip DEVICE=RG503 ARCH=aarch64 ./scripts/build_distro
RG353P:
ROOT=RG503 PROJECT=Rockchip DEVICE=RG353P ARCH=arm ./scripts/build_distro
ROOT=RG503 PROJECT=Rockchip DEVICE=RG353P ARCH=aarch64 ./scripts/build_distro
DEVICE_ROOT=RG503 PROJECT=Rockchip DEVICE=RG353P ARCH=arm ./scripts/build_distro
DEVICE_ROOT=RG503 PROJECT=Rockchip DEVICE=RG353P ARCH=aarch64 ./scripts/build_distro
RG351P:
PROJECT=Rockchip DEVICE=RG351P ARCH=arm ./scripts/build_distro
PROJECT=Rockchip DEVICE=RG351P ARCH=aarch64 ./scripts/build_distro
RG351V:
ROOT=RG351P PROJECT=Rockchip DEVICE=RG351V ARCH=arm ./scripts/build_distro
ROOT=RG351P PROJECT=Rockchip DEVICE=RG351V ARCH=aarch64 ./scripts/build_distro
DEVICE_ROOT=RG351P PROJECT=Rockchip DEVICE=RG351V ARCH=arm ./scripts/build_distro
DEVICE_ROOT=RG351P PROJECT=Rockchip DEVICE=RG351V ARCH=aarch64 ./scripts/build_distro
RG351MP:
ROOT=RG351P PROJECT=Rockchip DEVICE=RG351MP ARCH=arm ./scripts/build_distro
ROOT=RG351P PROJECT=Rockchip DEVICE=RG351MP ARCH=aarch64 ./scripts/build_distro
DEVICE_ROOT=RG351P PROJECT=Rockchip DEVICE=RG351MP ARCH=arm ./scripts/build_distro
DEVICE_ROOT=RG351P PROJECT=Rockchip DEVICE=RG351MP ARCH=aarch64 ./scripts/build_distro
update:
PROJECT=Rockchip DEVICE=RG552 ARCH=aarch64 ./scripts/update_packages

29
scripts/build_distro
View file

@ -20,10 +20,10 @@ export BUILD_DATE=$(date)
echo "Building ${DISTRO} for ${DEVICE}"
# If ROOT is defined make sure that the build folder is a link to root rather than
# If DEVICE_ROOT is defined make sure that the build folder is a link to root rather than
# a folder and take additional clean steps to ensure everything is built properly.
if [ -n "${ROOT}" ]
if [ -n "${DEVICE_ROOT}" ]
then
# Ensure there isn't a left over build directory.
if [ -d "build.${DISTRO}-${DEVICE}.${ARCH}" ]
@ -32,24 +32,23 @@ then
rm -rf build.${DISTRO}-${DEVICE}.${ARCH}
fi
# Link back to the ROOT so we can re-use the build directory to save space.
# Link back to the DEVICE_ROOT so we can re-use the build directory to save space.
if [ ! -L "build.${DISTRO}-${DEVICE}.${ARCH}" ]
then
ln -sf build.${DISTRO}-${ROOT}.${ARCH} build.${DISTRO}-${DEVICE}.${ARCH}
ln -sf build.${DISTRO}-${DEVICE_ROOT}.${ARCH} build.${DISTRO}-${DEVICE}.${ARCH}
fi
# Clean packages that have device specific configurations.
PKG_CLEAN="${PKG_CLEAN} mupen64plus-nx mupen64plus flycast_libretro dosbox-pure parallel-n64_glide64 \
parallel-n64_gln64 parallel-n64_rice pcsx_rearmed pcsx_rearmed gpsp raze amiberry lzdoom \
PPSSPPSDL gzdoom mupen64plussa-core mupen64plussa-input-sdl 351files libgo2 \
gamecontrollerdb duckstationsa"
# Clean additional packages to ensure the OS is properly built for this device
PKG_CLEAN="${PKG_CLEAN} system-utils plymouth-lite initramfs busybox kernel grub u-boot SDL2"
fi
# If this variable exists in the environment, expand it and clean those packages too.
PKG_CLEAN="${PKG_CLEAN} modules emulationstation retroarch lib32 jelos"
# We need to always assume some packages are build and clean them so the linked build functionality
# works as expected. Start with the emulators and cores.
PKG_CLEAN="${PKG_CLEAN} mupen64plus-nx mupen64plus flycast_libretro dosbox-pure parallel-n64_glide64 \
parallel-n64_gln64 parallel-n64_rice pcsx_rearmed pcsx_rearmed gpsp raze amiberry lzdoom \
PPSSPPSDL gzdoom mupen64plussa-core mupen64plussa-input-sdl 351files libgo2 \
gamecontrollerdb duckstationsa"
# Clean OS specific packages.
PKG_CLEAN="${PKG_CLEAN} system-utils plymouth-lite initramfs busybox kernel grub u-boot SDL2 modules \
emulationstation retroarch lib32 jelos"
# Clean a few packages to ensure the build date and version are updated
for package in ${PKG_CLEAN}