installer: drop extlinux support, not needed - use syslinux

packages/sysutils/busybox/scripts/init

@@ -1051,7 +1051,7 @@
 
     if [ ! -d "/sysroot/usr/lib/kernel-overlays/base/lib/modules/$(uname -r)/" -a -f "/sysroot/usr/lib/systemd/systemd" ]; then
       echo ""
-      echo "NEVER TOUCH boot= in extlinux.conf / cmdline.txt!"
+      echo "NEVER TOUCH boot= in syslinux.conf / cmdline.txt!"
       echo "If you don't know what you are doing,"
       echo "your installation is now broken."
       echo ""

packages/tools/installer/config/installer.conf

@@ -25,8 +25,8 @@
 # Default starting offset for system partition, in sectors (1 sector = 512B), eg. 2048
   PARTSIZE_SYSTEM_OFFSET="@SYSTEM_PART_START@"
 
-# additional parameters to extlinux
+# additional parameters to syslinux
-  EXTLINUX_PARAMETERS="@EXTLINUX_PARAMETERS@"
+  SYSLINUX_PARAMETERS="@SYSLINUX_PARAMETERS@"
 
 # enable BIOS update function
   BIOS_UPDATE="no"

packages/tools/installer/package.mk

@@ -39,7 +39,7 @@ post_install() {
     cp ${FOUND_PATH} $INSTALL/etc
     sed -e "s/@SYSTEM_SIZE@/$SYSTEM_SIZE/g" \
         -e "s/@SYSTEM_PART_START@/$SYSTEM_PART_START/g" \
-        -e "s/@EXTLINUX_PARAMETERS@/$EXTLINUX_PARAMETERS/g" \
+        -e "s/@SYSLINUX_PARAMETERS@/$SYSLINUX_PARAMETERS/g" \
         -i $INSTALL/etc/installer.conf
 
   enable_service installer.service

packages/tools/installer/scripts/installer

@@ -194,11 +194,7 @@ do_install_quick() {
         partsize_storage_end=-1024
 
         msg_progress_install "10" "Creating partition on $INSTALL_DEVICE"
-        if [ "$UEFI" = "1" ]; then
+        parted -s $INSTALL_DEVICE unit s mkpart primary fat32 -- $partsize_system_start $partsize_system_end >> $LOGFILE 2>&1
-          parted -s $INSTALL_DEVICE unit s mkpart primary fat32 -- $partsize_system_start $partsize_system_end >> $LOGFILE 2>&1
-        else
-          parted -s $INSTALL_DEVICE unit s mkpart primary ext2  -- $partsize_system_start $partsize_system_end >> $LOGFILE 2>&1
-        fi
 
         msg_progress_install "13" "Creating partition on $INSTALL_DEVICE"
         parted -s $INSTALL_DEVICE unit s mkpart primary ext4 -- $partsize_storage_start $partsize_storage_end >> $LOGFILE 2>&1
@@ -209,23 +205,15 @@ do_install_quick() {
           parted -s $INSTALL_DEVICE set 1 legacy_boot on >> $LOGFILE 2>&1
         fi
 
-        msg_progress_install "20" "Tell the kernel we have a new partitiontable on $INSTALL_DEVICE"
+        msg_progress_install "20" "Tell the kernel we have a new partition table on $INSTALL_DEVICE"
         partprobe $INSTALL_DEVICE >> $LOGFILE 2>&1
 
         # create filesystem
         msg_progress_install "23" "Creating filesystem on ${INSTALL_DEVICE}1"
-        if [ "$UEFI" = "1" ]; then
+        mkfs.vfat ${INSTALL_DEVICE}${PART1} >> $LOGFILE 2>&1
-          mkfs.vfat ${INSTALL_DEVICE}${PART1} >> $LOGFILE 2>&1
-        else
-          mke2fs -t ext4 -m 0 ${INSTALL_DEVICE}${PART1} >> $LOGFILE 2>&1
-        fi
 
         msg_progress_install "25" "Set uuid and disklabel $DISKLABEL_SYSTEM on ${INSTALL_DEVICE}${PART1}"
-        if [ "$UEFI" = "1" ]; then
+        dosfslabel ${INSTALL_DEVICE}${PART1}  $DISKLABEL_SYSTEM >> $LOGFILE 2>&1
-          dosfslabel ${INSTALL_DEVICE}${PART1}  $DISKLABEL_SYSTEM >> $LOGFILE 2>&1
-        else
-          tune2fs -U random -L $DISKLABEL_SYSTEM  ${INSTALL_DEVICE}${PART1} >> $LOGFILE 2>&1
-        fi
 
         msg_progress_install "28" "Creating filesystem on ${INSTALL_DEVICE}${PART2}"
         mke2fs -t ext4 -m 0 ${INSTALL_DEVICE}${PART2} >> $LOGFILE 2>&1
@@ -238,20 +226,11 @@ do_install_quick() {
         mkdir -p $TMPDIR/part1 >> $LOGFILE 2>&1
 
         msg_progress_install "40" "Mounting ${INSTALL_DEVICE}${PART1} to $TMPDIR/part1"
-        if [ "$UEFI" = "1" ]; then
+        mount -t vfat ${INSTALL_DEVICE}${PART1} $TMPDIR/part1 >> $LOGFILE 2>&1
-          mount -t vfat ${INSTALL_DEVICE}${PART1} $TMPDIR/part1 >> $LOGFILE 2>&1
-        else
-          mount -t ext4 ${INSTALL_DEVICE}${PART1} $TMPDIR/part1 >> $LOGFILE 2>&1
-        fi
 
-        # installing extlinux
+        # installing syslinux
-        if [ "$UEFI" = "1" ]; then
+        msg_progress_install "50" "Installing syslinux to $TMPDIR/part1"
-          msg_progress_install "50" "Installing syslinux to $TMPDIR/part1"
+        syslinux -i ${INSTALL_DEVICE}${PART1} >> $LOGFILE 2>&1
-          syslinux -i ${INSTALL_DEVICE}${PART1} >> $LOGFILE 2>&1
-        else
-          msg_progress_install "50" "Installing extlinux to $TMPDIR/part1"
-          extlinux -i $TMPDIR/part1 >> $LOGFILE 2>&1
-        fi
 
         # install system files
         msg_progress_install "60" "Installing Kernel"
@@ -262,15 +241,15 @@ do_install_quick() {
         sync
 
         # configuring bootloader
-        mkdir -p $TMPDIR/part1/EFI/BOOT
         msg_progress_install "80" "Setup bootloader with boot label = $DISKLABEL_SYSTEM and disk label = $DISKLABEL_STORAGE"
-        cat << EOF > $TMPDIR/part1/extlinux.conf
+        mkdir -p $TMPDIR/part1/EFI/BOOT
+        cat << EOF > $TMPDIR/part1/syslinux.cfg
 DEFAULT linux
 PROMPT 0
 
 LABEL linux
  KERNEL /KERNEL
- APPEND boot=LABEL=$DISKLABEL_SYSTEM disk=LABEL=$DISKLABEL_STORAGE $EXTLINUX_PARAMETERS quiet
+ APPEND boot=LABEL=$DISKLABEL_SYSTEM disk=LABEL=$DISKLABEL_STORAGE $SYSLINUX_PARAMETERS quiet
 EOF
         cat << EOF > $TMPDIR/part1/EFI/BOOT/grub.cfg
 set timeout="0"
@@ -282,12 +261,9 @@ menuentry "LibreELEC" {
 }
 EOF
         # uefi boot / hybrid mode
-        if [ "$UEFI" = "1" ]; then
+        cp /usr/share/syslinux/bootx64.efi $TMPDIR/part1/EFI/BOOT
-          mv $TMPDIR/part1/extlinux.conf $TMPDIR/part1/syslinux.cfg
+        cp /usr/share/syslinux/ldlinux.e64 $TMPDIR/part1/EFI/BOOT
-          cp /usr/share/syslinux/bootx64.efi $TMPDIR/part1/EFI/BOOT
+        cp /usr/share/grub/bootia32.efi $TMPDIR/part1/EFI/BOOT
-          cp /usr/share/syslinux/ldlinux.e64 $TMPDIR/part1/EFI/BOOT
-          cp /usr/share/grub/bootia32.efi $TMPDIR/part1/EFI/BOOT
-        fi
         sync
 
         # umount system partition, remove mountpoint

packages/tools/syslinux/package.mk

@@ -66,7 +66,6 @@ make_host() {
 
 makeinstall_host() {
   mkdir -p $TOOLCHAIN/bin
-    cp bios/extlinux/extlinux $TOOLCHAIN/bin
     cp bios/linux/syslinux $TOOLCHAIN/bin
     cp bios/mtools/syslinux $TOOLCHAIN/bin/syslinux.mtools
 
@@ -79,11 +78,9 @@ makeinstall_host() {
 
 makeinstall_target() {
   mkdir -p $INSTALL/usr/bin
-    cp bios/extlinux/extlinux $INSTALL/usr/bin
     cp bios/linux/syslinux $INSTALL/usr/bin
 
   $STRIP $INSTALL/usr/bin/syslinux
-  $STRIP $INSTALL/usr/bin/extlinux
 
   mkdir -p $INSTALL/usr/share/syslinux
     cp bios/mbr/mbr.bin $INSTALL/usr/share/syslinux

scripts/mkimage

@@ -174,8 +174,8 @@ EOF
 
     mcopy "$LE_TMP/syslinux.cfg" ::
 
-  # install extlinux
+  # install syslinux
-    echo "image: installing extlinux to part1..."
+    echo "image: installing syslinux to part1..."
     syslinux.mtools --offset "$OFFSET" -i "$DISK"
 
   # copy files