From 75d7a71e4ba8cc418488e494c8321db98d4a4155 Mon Sep 17 00:00:00 2001 From: Ian Leonard Date: Sat, 21 Jul 2018 22:37:48 +0000 Subject: [PATCH 1/6] rpi: cleanup valid CPU/FPU comment and compression methods Also corrects comment typo's Signed-off-by: Ian Leonard --- projects/RPi/options | 25 +++++++------------------ 1 file changed, 7 insertions(+), 18 deletions(-) diff --git a/projects/RPi/options b/projects/RPi/options index 9ba413e3b6..1efcb47134 100644 --- a/projects/RPi/options +++ b/projects/RPi/options @@ -6,17 +6,8 @@ # generated code. case $TARGET_ARCH in arm) - # TARGET_CPU: - # arm2 arm250 arm3 arm6 arm60 arm600 arm610 arm620 arm7 arm7m arm7d - # arm7dm arm7di arm7dmi arm70 arm700 arm700i arm710 arm710c - # arm7100 arm720 arm7500 arm7500fe arm7tdmi arm7tdmi-s arm710t - # arm720t arm740t strongarm strongarm110 strongarm1100 - # strongarm1110 arm8 arm810 arm9 arm9e arm920 arm920t arm922t - # arm946e-s arm966e-s arm968e-s arm926ej-s arm940t arm9tdmi - # arm10tdmi arm1020t arm1026ej-s arm10e arm1020e arm1022e - # arm1136j-s arm1136jf-s mpcore mpcorenovfp arm1156t2-s - # arm1176jz-s arm1176jzf-s cortex-a8 cortex-a9 cortex-r4 - # cortex-r4f cortex-m3 cortex-m1 xscale iwmmxt iwmmxt2 ep9312. + # Valid TARGET_CPU for Raspberry Pi based devices are: + # arm1176jzf-s cortex-a7 cortex-a53 if [ "$DEVICE" = "RPi" -o "$DEVICE" = "Slice" ]; then TARGET_CPU="arm1176jzf-s" @@ -29,12 +20,10 @@ # soft softfp hard TARGET_FLOAT="hard" - # TARGET_FPU: + # Valid TARGET_FPU for Raspberry Pi based devices: # This specifies what floating point hardware (or hardware emulation) is # available on the target. Permissible names are: - # fpa fpe2 fpe3 maverick vfp vfpv3 vfpv3-fp16 vfpv3-d16 vfpv3-d16-fp16 - # vfpv3xd vfpv3xd-fp16 neon neon-fp16 vfpv4 vfpv4-d16 fpv4-sp-d16 - # neon-vfpv4. + # vfp neon-vfpv4 neon-fp-armv8 if [ "$DEVICE" = "RPi" -o "$DEVICE" = "Slice" ]; then TARGET_FPU="vfp" @@ -99,7 +88,7 @@ fi # Project CFLAGS PROJECT_CFLAGS="" - # SquashFS compression method (gzip / lzo / xz) + # SquashFS compression method (gzip / lzo / xz / zstd) SQUASHFS_COMPRESSION="lzo" @@ -159,7 +148,7 @@ fi KERNEL_NAME="kernel.img" # additional drivers to install: - # for a list of additinoal drivers see packages/linux-drivers + # for a list of additional drivers see packages/linux-drivers # Space separated list is supported, # e.g. ADDITIONAL_DRIVERS="DRIVER1 DRIVER2" ADDITIONAL_DRIVERS="$ADDITIONAL_DRIVERS rpi-cirrus-config" @@ -172,6 +161,6 @@ fi DRIVER_ADDONS_SUPPORT="yes" # driver addons to install: - # for a list of additinoal drivers see packages/linux-driver-addons + # for a list of additional drivers see packages/linux-driver-addons # Space separated list is supported, DRIVER_ADDONS="crazycat hauppauge" From 32174df9f82085f69a40512d342b5e40dd8a4cbd Mon Sep 17 00:00:00 2001 From: Ian Leonard Date: Mon, 23 Jul 2018 02:26:03 +0000 Subject: [PATCH 2/6] scripts/image: cleanup for clarity, code style and organization Have IMAGE_NAME check for devel version before applying default naming. Generate all the baselayout directories in a for loop instead of the long list of mkdir -p one after the other. For 64-bit builds, $INSTALL/usr is already generated for all arches a few lines previously, so don't repeat here. There are changes to comments for corrections and clarity. Unifies code style: $() versus `` and spaces before ; Signed-off-by: Ian Leonard --- scripts/image | 64 ++++++++++++++++++++++----------------------------- 1 file changed, 28 insertions(+), 36 deletions(-) diff --git a/scripts/image b/scripts/image index 400793a3a0..3f8d700bf0 100755 --- a/scripts/image +++ b/scripts/image @@ -7,10 +7,9 @@ unset _CACHE_PACKAGE_LOCAL _CACHE_PACKAGE_GLOBAL _DEBUG_DEPENDS_LIST _DEBUG_PACKAGE_LIST . config/options "" - . config/show_config -show_config +show_config save_build_config setup_toolchain target @@ -57,18 +56,19 @@ fi LIBREELEC_ARCH="${DEVICE:-$PROJECT}.$TARGET_ARCH" TARGET_VERSION="$LIBREELEC_ARCH-$LIBREELEC_VERSION" -IMAGE_NAME="$DISTRONAME-$TARGET_VERSION" - -if [ "$DEVEL_VERSION" = "devel" ] ; then - IMAGE_NAME="$DISTRONAME-$LIBREELEC_ARCH-$OS_VERSION-$LIBREELEC_VERSION" -fi - -if [ -n "$UBOOT_SYSTEM" ]; then - IMAGE_NAME="$IMAGE_NAME-$UBOOT_SYSTEM" -fi if [ -n "$CUSTOM_IMAGE_NAME" ]; then - IMAGE_NAME="$CUSTOM_IMAGE_NAME" + IMAGE_NAME="$CUSTOM_IMAGE_NAME" +else + if [ "$DEVEL_VERSION" = "devel" ]; then + IMAGE_NAME="$DISTRONAME-$LIBREELEC_ARCH-$OS_VERSION-$LIBREELEC_VERSION" + else + IMAGE_NAME="$DISTRONAME-$TARGET_VERSION" + fi + + if [ -n "$UBOOT_SYSTEM" ]; then + IMAGE_NAME="$IMAGE_NAME-$UBOOT_SYSTEM" + fi fi if [ -n "$IMAGE_SUFFIX" ]; then @@ -89,16 +89,9 @@ rm -rf $STAMPS_INSTALL mkdir -p $INSTALL # create baselayout -mkdir -p $INSTALL/etc -mkdir -p $INSTALL/dev -mkdir -p $INSTALL/proc -mkdir -p $INSTALL/run -mkdir -p $INSTALL/sys -mkdir -p $INSTALL/tmp -mkdir -p $INSTALL/usr -mkdir -p $INSTALL/var -mkdir -p $INSTALL/flash -mkdir -p $INSTALL/storage +for directory in etc dev proc run sys tmp usr var flash storage; do + mkdir -p $INSTALL/$directory +done ln -sf /var/media $INSTALL/media ln -sf /usr/lib $INSTALL/lib ln -sf /usr/bin $INSTALL/bin @@ -106,7 +99,6 @@ ln -sf /usr/sbin $INSTALL/sbin if [ "$TARGET_ARCH" = "x86_64" -o "$TARGET_ARCH" = "powerpc64" ]; then ln -s /usr/lib $INSTALL/lib64 - mkdir -p $INSTALL/usr ln -s /usr/lib $INSTALL/usr/lib64 fi @@ -137,7 +129,7 @@ echo "$DISTRONAME ($LIBREELEC_BUILD): $LIBREELEC_VERSION ($LIBREELEC_ARCH)" >> $ ln -sf /etc/issue $INSTALL/etc/motd -# Basissystem... +# populate base system... $SCRIPTS/install libc $SCRIPTS/install gcc @@ -164,7 +156,7 @@ $SCRIPTS/install network # Automounter support [ "$UDEVIL" = "yes" ] && $SCRIPTS/install udevil -# NTFS 3G support +# EXFAT support [ "$EXFAT" = "yes" ] && $SCRIPTS/install fuse-exfat # NTFS 3G support @@ -191,23 +183,23 @@ $SCRIPTS/install debug # OEM packages [ "$OEM_SUPPORT" = "yes" ] && $SCRIPTS/install oem -# copy project related files to filesystem +# copy PROJECT related files to filesystem if [ -d "$PROJECT_DIR/$PROJECT/filesystem" ]; then cp -PR $PROJECT_DIR/$PROJECT/filesystem/* $INSTALL # install project specific systemd services - for service in $PROJECT_DIR/$PROJECT/filesystem/usr/lib/systemd/system/*.service ; do - if [ -f "$service" ] ; then + for service in $PROJECT_DIR/$PROJECT/filesystem/usr/lib/systemd/system/*.service; do + if [ -f "$service" ]; then enable_service $(basename $service) fi done fi -# copy board related files to filesystem +# copy DEVICE related files to filesystem if [ -n "$DEVICE" -a -d "$PROJECT_DIR/$PROJECT/devices/$DEVICE/filesystem" ]; then cp -PR $PROJECT_DIR/$PROJECT/devices/$DEVICE/filesystem/* $INSTALL # install device specific systemd services - for service in $PROJECT_DIR/$PROJECT/devices/$DEVICE/filesystem/usr/lib/systemd/system/*.service ; do - if [ -f "$service" ] ; then + for service in $PROJECT_DIR/$PROJECT/devices/$DEVICE/filesystem/usr/lib/systemd/system/*.service; do + if [ -f "$service" ]; then enable_service $(basename $service) fi done @@ -221,7 +213,7 @@ find $INSTALL/usr/lib/kernel-overlays/base/lib/modules/$MODVER/ -name *.ko | \ $TOOLCHAIN/bin/depmod -b $INSTALL/usr/lib/kernel-overlays/base -a -e -F "$BUILD/linux-$(kernel_version)/System.map" $MODVER # strip kernel modules -for MOD in `find $INSTALL/usr/lib/kernel-overlays/ -type f -name *.ko`; do +for MOD in $(find $INSTALL/usr/lib/kernel-overlays/ -type f -name *.ko); do ${TARGET_KERNEL_PREFIX}strip --strip-debug $MOD done @@ -281,8 +273,8 @@ if [ "$1" = "release" -o "$1" = "mkimage" -o "$1" = "amlpkg" -o "$1" = "noobs" ] cp $ROOT/CHANGELOG* $RELEASE_DIR echo "$TARGET_VERSION" > $RELEASE_DIR/RELEASE - if [ -n "$MEDIACENTER" ] ; then - echo "Kodi commit: `scripts/git_version $MEDIACENTER`" >> $RELEASE_DIR/RELEASE + if [ -n "$MEDIACENTER" ]; then + echo "Kodi commit: $(scripts/git_version $MEDIACENTER)" >> $RELEASE_DIR/RELEASE fi mkdir -p $RELEASE_DIR/licenses @@ -483,13 +475,13 @@ if [ "$1" = "release" -o "$1" = "mkimage" -o "$1" = "amlpkg" -o "$1" = "noobs" ] cp $TARGET_IMG/$IMAGE_NAME.system $RELEASE_DIR/${NOOBS_DISTRO}/System/SYSTEM cp $TARGET_IMG/$IMAGE_NAME.kernel $RELEASE_DIR/${NOOBS_DISTRO}/System/kernel.img - for dtb in $INSTALL/usr/share/bootloader/*.dtb ; do + for dtb in $INSTALL/usr/share/bootloader/*.dtb; do if [ -f $dtb ]; then cp -PR $dtb $RELEASE_DIR/${NOOBS_DISTRO}/System fi done - for overlay in $INSTALL/usr/share/bootloader/overlays/* ; do + for overlay in $INSTALL/usr/share/bootloader/overlays/*; do if [ -f $overlay ]; then mkdir -p $RELEASE_DIR/${NOOBS_DISTRO}/System/overlays cp -PR $overlay $RELEASE_DIR/${NOOBS_DISTRO}/System/overlays From 42c4885f4e77697401f634fbfc6b2df91fbe3889 Mon Sep 17 00:00:00 2001 From: Ian Leonard Date: Wed, 15 Aug 2018 02:07:12 +0000 Subject: [PATCH 3/6] treewide: drop references to powerpc64 Signed-off-by: Ian Leonard --- packages/virtual/initramfs/package.mk | 2 +- scripts/image | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/packages/virtual/initramfs/package.mk b/packages/virtual/initramfs/package.mk index de42db4324..530195de4c 100644 --- a/packages/virtual/initramfs/package.mk +++ b/packages/virtual/initramfs/package.mk @@ -24,7 +24,7 @@ fi post_install() { ( cd $BUILD/initramfs - if [ "$TARGET_ARCH" = "x86_64" -o "$TARGET_ARCH" = "powerpc64" ]; then + if [ "$TARGET_ARCH" = "x86_64" ]; then ln -sf /usr/lib $BUILD/initramfs/lib64 mkdir -p $BUILD/initramfs/usr ln -sf /usr/lib $BUILD/initramfs/usr/lib64 diff --git a/scripts/image b/scripts/image index 3f8d700bf0..2aef736e24 100755 --- a/scripts/image +++ b/scripts/image @@ -97,7 +97,7 @@ ln -sf /usr/lib $INSTALL/lib ln -sf /usr/bin $INSTALL/bin ln -sf /usr/sbin $INSTALL/sbin -if [ "$TARGET_ARCH" = "x86_64" -o "$TARGET_ARCH" = "powerpc64" ]; then +if [ "$TARGET_ARCH" = "x86_64" ]; then ln -s /usr/lib $INSTALL/lib64 ln -s /usr/lib $INSTALL/usr/lib64 fi From 996876d9a1d64dc84188cd025ec87a9eb5ea968b Mon Sep 17 00:00:00 2001 From: Ian Leonard Date: Wed, 15 Aug 2018 02:12:47 +0000 Subject: [PATCH 4/6] generic: note zstd as image compression option Signed-off-by: Ian Leonard --- projects/Generic/options | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/projects/Generic/options b/projects/Generic/options index f2c8c18f7e..34a29593fd 100644 --- a/projects/Generic/options +++ b/projects/Generic/options @@ -51,7 +51,7 @@ # Project CFLAGS PROJECT_CFLAGS="-mmmx -msse -msse2 -mfpmath=sse" - # SquashFS compression method (gzip / lzo / xz) + # SquashFS compression method (gzip / lzo / xz / zstd) SQUASHFS_COMPRESSION="gzip" @@ -86,7 +86,7 @@ FIRMWARE="misc-firmware wlan-firmware dvb-firmware iwlwifi-firmware" # additional drivers to install: - # for a list of additinoal drivers see packages/linux-drivers + # for a list of additional drivers see packages/linux-drivers # Space separated list is supported, # e.g. ADDITIONAL_DRIVERS="DRIVER1 DRIVER2" ADDITIONAL_DRIVERS="$ADDITIONAL_DRIVERS bcm_sta intel_nuc_led" @@ -95,6 +95,6 @@ DRIVER_ADDONS_SUPPORT="NO" # driver addons to install: - # for a list of additinoal drivers see packages/linux-driver-addons + # for a list of additional drivers see packages/linux-driver-addons # Space separated list is supported, DRIVER_ADDONS="crazycat digital_devices hauppauge" From bfce57a7bd6fd2a563c62848b2ae72b424bbd90f Mon Sep 17 00:00:00 2001 From: Ian Leonard Date: Wed, 15 Aug 2018 17:30:58 +0000 Subject: [PATCH 5/6] scripts/image: fixup installed Kodi version in RELEASE Switch scripts/git_version for get_pkg_version out of config/functions. Resolves being unable to report Kodi's version in RELEASE file. Signed-off-by: Ian Leonard --- scripts/image | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/scripts/image b/scripts/image index 2aef736e24..b2ef6524af 100755 --- a/scripts/image +++ b/scripts/image @@ -274,7 +274,7 @@ if [ "$1" = "release" -o "$1" = "mkimage" -o "$1" = "amlpkg" -o "$1" = "noobs" ] echo "$TARGET_VERSION" > $RELEASE_DIR/RELEASE if [ -n "$MEDIACENTER" ]; then - echo "Kodi commit: $(scripts/git_version $MEDIACENTER)" >> $RELEASE_DIR/RELEASE + echo "Kodi commit: $(get_pkg_version $MEDIACENTER)" >> $RELEASE_DIR/RELEASE fi mkdir -p $RELEASE_DIR/licenses From 2f2a1ff4b73daf2af8f766335d82deb062f35405 Mon Sep 17 00:00:00 2001 From: Ian Leonard Date: Wed, 15 Aug 2018 22:38:50 +0000 Subject: [PATCH 6/6] scripts/git_version: delete as no users in tree Signed-off-by: Ian Leonard --- scripts/git_version | 10 ---------- 1 file changed, 10 deletions(-) delete mode 100755 scripts/git_version diff --git a/scripts/git_version b/scripts/git_version deleted file mode 100755 index 4b5cda3a7c..0000000000 --- a/scripts/git_version +++ /dev/null @@ -1,10 +0,0 @@ -#!/bin/bash - -# SPDX-License-Identifier: GPL-2.0-or-later -# Copyright (C) 2009-2016 Stephan Raue (stephan@openelec.tv) - -. config/options $1 - -[ -f "$PKG_BUILD/VERSION" ] && PKG_GIT_VERSION=`cat $PKG_BUILD/VERSION` - -echo $PKG_GIT_VERSION