Merge pull request #2886 from antonlacon/misc-cleanup

script/image: cleanup

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

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"

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"

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,24 +89,16 @@ 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
 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
-  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: $(get_pkg_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