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

Shift build structure, fix jelos-info.

Browse source
This commit is contained in:
fewtarius 2022-07-11 19:35:08 -04:00
parent f748ffca6b
commit 1c07a31565
No known key found for this signature in database
GPG key ID: F4AE55305D1B8C1A
3 changed files with 30 additions and 17 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:
PROJECT=Rockchip DEVICE=RG353P ARCH=arm ./scripts/build_distro
PROJECT=Rockchip DEVICE=RG353P ARCH=aarch64 ./scripts/build_distro
ROOT=RG503 PROJECT=Rockchip DEVICE=RG353P ARCH=arm ./scripts/build_distro
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:
PROJECT=Rockchip DEVICE=RG351V ARCH=arm ./scripts/build_distro
PROJECT=Rockchip DEVICE=RG351V ARCH=aarch64 ./scripts/build_distro
ROOT=RG351P PROJECT=Rockchip DEVICE=RG351V ARCH=arm ./scripts/build_distro
ROOT=RG351P PROJECT=Rockchip DEVICE=RG351V ARCH=aarch64 ./scripts/build_distro
RG351MP:
PROJECT=Rockchip DEVICE=RG351MP ARCH=arm ./scripts/build_distro
PROJECT=Rockchip DEVICE=RG351MP ARCH=aarch64 ./scripts/build_distro
ROOT=RG351P PROJECT=Rockchip DEVICE=RG351MP ARCH=arm ./scripts/build_distro
ROOT=RG351P PROJECT=Rockchip DEVICE=RG351MP ARCH=aarch64 ./scripts/build_distro
update:
PROJECT=Rockchip DEVICE=RG552 ARCH=aarch64 ./scripts/update_packages

13
packages/jelos/sources/scripts/jelos-info
View file

@ -17,14 +17,6 @@ then
fi
###
TEST=$(ldd /usr/bin/emulationstation | grep 64)
if [ $? == 0 ]
then
V_OSARCH="aarch64"
else
V_OSARCH="arm"
fi
V_CPUNB=$(grep -E $'^processor\t:' /proc/cpuinfo | wc -l)
V_CPUMODEL1=$(grep -E $'^model name\t:' /proc/cpuinfo | head -1 | sed -e s+'^model name\t: '++)
V_SYSTEM=$(uname -rs)
@ -73,15 +65,14 @@ echo "SYSTEM INFORMATION:"
echo "OPERATING SYSTEM: ${OS_NAME}"
echo "VERSION: ${OS_VERSION}"
echo "BUILD ID: ${BUILD_ID:0:7} (${BUILD_BRANCH})"
echo "ARCHITECTURE: ${V_OSARCH}"
echo "KERNEL: ${V_SYSTEM} (${V_ARCH})"
echo "KERNEL: ${V_SYSTEM} ($(uname -m))"
echo "DISK SPACE:"
echo "/storage: $(df -h /storage | awk '/dev/ {print $3"/"$2" ("$5")"}')"
echo "/storage/roms: $(df -h /storage/roms | awk '/dev/ {print $3"/"$2" ("$5")"}')"
echo "BATTERY INFORMATION:"
if test -n "${BATT}"
then
echo "BATTERY INFORMATION:"
echo "BATTERY REMAINING: ${BATT}%"
if [ -e "/sys/class/power_supply/bat/health" ]
then

22
scripts/build_distro
View file

@ -20,6 +20,28 @@ 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
# a folder and take additional clean steps to ensure everything is built properly.
if [ ! -z "${ROOT}" ]
then
# Ensure there isn't a left over build directory.
if [ -d "build.${DISTRO}-${DEVICE}.${ARCH}" ]
then
echo "Removing stale build root."
rm -rf build.${DISTRO}-${DEVICE}.${ARCH}
fi
# Link back to the 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}
fi
# Clean additional packages to ensure the OS is properly built for this device
PKG_CLEAN="${PKG_CLEAN} 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"