syslinux: downgrading version for parabolaiso works properly

5 files changed, 36 insertions, 62 deletions

diff --git a/libre/syslinux/PKGBUILD b/libre/syslinux/PKGBUILD
index f9907d3f4..7b28929b5 100644
--- a/libre/syslinux/PKGBUILD
+++ b/libre/syslinux/PKGBUILD
@@ -1,14 +1,13 @@
-# $Id: PKGBUILD 187808 2013-06-06 07:51:31Z tpowa $
 # Maintainer: Thomas Bächler <thomas@archlinux.org>
 # Maintainer: Tobias Powalowski <tpowa@archlinux.org>
 # Maintainer (Parabola): André Silva <emulatorman@lavabit.com>
 
 pkgname=syslinux
-pkgver=5.10
-pkgrel=3
+pkgver=4.06
+pkgrel=2
 arch=('i686' 'x86_64')
 pkgdesc="Collection of boot loaders that boot from FAT, ext2/3/4 and btrfs filesystems, from CDs and via PXE (Parabola rebranded)"
-url="http://www.syslinux.org"
+url="http://syslinux.zytor.com/"
 license=('GPL2')
 depends=('perl' 'glibc')
 optdepends=('perl-passwd-md5:  For md5pass'
@@ -25,10 +24,10 @@ source=(http://www.kernel.org/pub/linux/utils/boot/syslinux/$pkgname-${pkgver}.t
         syslinux.cfg
         syslinux-install_update
         splash.png)
-md5sums=('8f51d6a5d2730f534ba90e71f3347bff'
-         '25af85a05e7b212b7fb8b7587175e492'
-         'e5a69630e3f7083aad2d14362b6117b3'
-         '4450792e13a0270c1b89bb6a66ce2fbc'
+md5sums=('0384ef35b724615074e77b1fc89d5b47'
+         '1528c376e43f0eaccaa80d8ad1bc13b4'
+         '832595501944fbcabcdc1207f4724fe7'
+         '8559fb3daf3afa8688600d8a38118918'
          'befd0e7c38a03442b791f2a530b4dd2d')
 
 build() {
@@ -46,10 +45,8 @@ build() {
 
 package() {
   cd "$srcdir"/$pkgname-${pkgver}
-  make INSTALLROOT="$pkgdir" AUXDIR=/usr/lib/syslinux install
+  make INSTALLROOT="$pkgdir" SBINDIR=/usr/bin AUXDIR=/usr/lib/syslinux install
 
-  # install docs
-  cp -ar "$srcdir"/$pkgname-${pkgver}/doc "$pkgdir"/usr/share/
   # Install the default configuration
   install -D -m644 "$srcdir"/syslinux.cfg "$pkgdir"/boot/syslinux/syslinux.cfg
   # Install Parabola splash
@@ -57,7 +54,4 @@ package() {
   # Install the installation and update script
   # This script is maintained at git://gist.github.com/772138.git
   install -D -m755 "$srcdir"/syslinux-install_update "$pkgdir"/usr/bin/syslinux-install_update
-  # move extlinux binary to /usr/bin
-  mv "$pkgdir"/sbin/extlinux "$pkgdir"/usr/bin/extlinux
-  rmdir "$pkgdir"/sbin
 }
diff --git a/libre/syslinux/syslinux-dont-build-dos-windows-targets.patch b/libre/syslinux/syslinux-dont-build-dos-windows-targets.patch
index 54151ab87..2b86ab828 100644
--- a/libre/syslinux/syslinux-dont-build-dos-windows-targets.patch
+++ b/libre/syslinux/syslinux-dont-build-dos-windows-targets.patch
@@ -4,9 +4,9 @@ diff -Nur syslinux-4.02.orig//Makefile syslinux-4.02//Makefile
 @@ -54,7 +54,7 @@
  # files that depend only on the B phase, but may have to be regenerated
  # for "make installer".
- BSUBDIRS = codepage com32 lzo core memdisk mbr memdump gpxe sample \
--	   diag libinstaller dos win32 win64 dosutil txt
-+	   libinstaller txt
+ BSUBDIRS = codepage com32 lzo core memdisk modules mbr memdump gpxe sample \
+-	   diag libinstaller dos win32 win64 dosutil
++	   libinstaller
  ITARGET  =
  IOBJECTS = $(ITARGET) \
  	utils/gethostip utils/isohybrid utils/mkdiskimage \
diff --git a/libre/syslinux/syslinux-install_update b/libre/syslinux/syslinux-install_update
index 47d4d88be..34fe8e916 100644
--- a/libre/syslinux/syslinux-install_update
+++ b/libre/syslinux/syslinux-install_update
@@ -30,8 +30,8 @@ libpath="/usr/lib/syslinux"
 bootpath="/boot/syslinux"
 extlinux="/usr/bin/extlinux"
 
-core_modules=(ldlinux.c32)
 autoupdate_file=/boot/syslinux/SYSLINUX_AUTOUPDATE
+com32_files=(menu.c32 vesamenu.c32 chain.c32 hdt.c32 reboot.c32 poweroff.com)
 pciids_file=/usr/share/hwdata/pci.ids
 
 ## Helper functions ##
@@ -294,10 +294,9 @@ install_mbr() {
 }
 
 _install() {
-    # Copy all com32 files to /boot
-    for file in "${libpath}"/*.c32; do
-        file=${file##*/}
-        # Symlink files if /boot resides on the same partition as root
+    # Copy files to /boot
+    for file in "${com32_files[@]}"; do
+        # Symlink files even if links exist
         if [[ "$boot" = root ]]; then
             ln -s "${libpath#$CHROOT}/$file" "$bootpath/$file" &> /dev/null
         elif [[ "$boot" = boot ]]; then
@@ -305,8 +304,8 @@ _install() {
         fi
     done
 
-    # Copy / Symlink pci.ids if pci.ids exists on the FS
-    if [[ -f $pciids_file ]]; then
+    # Copy / Symlink pci.ids if we copy the com32 module and if pci.ids exists in the FS
+    if check_is_in "hdt.c32" "${com32_files[@]}" && [[ -f $pciids_file ]]; then 
         if [[ "$boot" = root ]]; then
             ln -s "$pciids_file" "$bootpath/pci.ids" &> /dev/null
         elif [[ "$boot" = boot ]]; then
@@ -332,10 +331,10 @@ _install() {
 }
 
 update() {
-    # Update c32 files in /boot, if /boot is not on same fs
+    # Update any com and c32 files in /boot
     if [[ "$boot" = boot ]]; then
-        for file in "$bootpath"/*.c32; do
-            file=${file##*/}
+        for file in "$bootpath"/*.{c32,com}; do
+            file=$(basename "$file")
             cp "$libpath/$file" "$bootpath/$file" &> /dev/null
         done
         if [[ -f "$bootpath/pci.ids" ]]; then
@@ -343,17 +342,6 @@ update() {
         fi
     fi
 
-    # Ensure core modules exist and if not install them
-    for file in "${core_modules[@]}"; do
-        if [[ ! -f $bootpath/$file ]]; then
-            if [[  "$boot" = root ]]; then
-                ln -s "${libpath#$CHROOT}/$file" "$bootpath/$file" &> /dev/null
-            elif [[ "$boot" = boot ]]; then
-                cp "$libpath/$file" "$bootpath/$file"
-            fi
-        fi
-    done
-
     if device_is_raid $bootpart; then
         echo "Detected RAID on /boot - installing Syslinux with --raid"
         "$extlinux" --update "$bootpath" -r &> /dev/null
diff --git a/libre/syslinux/syslinux.cfg b/libre/syslinux/syslinux.cfg
index e4f8d8e28..cb5afb371 100644
--- a/libre/syslinux/syslinux.cfg
+++ b/libre/syslinux/syslinux.cfg
@@ -7,6 +7,7 @@
 #   * chain.c32 - chainload MBRs, partition boot sectors, Windows bootloaders
 #   * hdt.c32 - hardware detection tool
 #   * reboot.c32 - reboots the system
+#   * poweroff.com - shutdown the system
 #
 # To Use: Copy the respective files from /usr/lib/syslinux to /boot/syslinux.
 # If /usr and /boot are on the same file system, symlink the files instead
@@ -49,21 +50,21 @@ MENU COLOR tabmsg       31;40   #30ffffff #00000000 std
 #-*
 
 LABEL parabola
-    MENU LABEL Parabola GNU/Linux-libre
-    LINUX ../vmlinuz-linux-libre
-    APPEND root=/dev/sda3 ro
-    INITRD ../initramfs-linux-libre.img
+	MENU LABEL Parabola GNU/Linux-libre
+	LINUX ../vmlinuz-linux-libre
+	APPEND root=/dev/sda3 ro
+	INITRD ../initramfs-linux-libre.img
 
 LABEL parabolafallback
-    MENU LABEL Parabola GNU/Linux-libre Fallback
-    LINUX ../vmlinuz-linux-libre
-    APPEND root=/dev/sda3 ro
-    INITRD ../initramfs-linux-libre-fallback.img
+	MENU LABEL Parabola GNU/Linux-libre Fallback
+	LINUX ../vmlinuz-linux-libre
+	APPEND root=/dev/sda3 ro
+	INITRD ../initramfs-linux-libre-fallback.img
 
 # If you want Memtest on syslinux, use this LABEL section to launch it (install the memtest86+ package)
-#    LABEL memtest
-#    MENU LABEL Memtest86+
-#    LINUX ../memtest86+/memtest.bin
+#	LABEL memtest
+#	MENU LABEL Memtest86+
+#	LINUX ../memtest86+/memtest.bin
 
 LABEL hdt
         MENU LABEL HDT (Hardware Detection Tool)
@@ -72,3 +73,7 @@ LABEL hdt
 LABEL reboot
         MENU LABEL Reboot
         COM32 reboot.c32
+ 
+LABEL off
+        MENU LABEL Power Off
+        COMBOOT poweroff.com
diff --git a/libre/syslinux/syslinux.install b/libre/syslinux/syslinux.install
index 19caa1026..89dbf4e86 100644
--- a/libre/syslinux/syslinux.install
+++ b/libre/syslinux/syslinux.install
@@ -8,19 +8,6 @@ post_install() {
 post_upgrade() {
   # auto-update syslinux if /boot/syslinux/SYSLINUX_AUTOUPDATE exists
   /usr/bin/syslinux-install_update -s
-  # update to 5.01 message
-  if [ "$(vercmp $2 5.01)" -lt 0 ]; then
-      echo "If you used syslinux-install_update to install syslinux:"
-      echo "==> If you want to use syslinux with menu and all modules please rerun" 
-      echo "==>   # /usr/bin/syslinux-install_update -i -a -m"
-      echo ""
-      echo "If you manually installed syslinux:"
-      echo "==> Please copy or symlink all .c32 modules to your /boot/syslinux directory."
-      echo "==> If (/ and /boot on seperate fs):"
-      echo "==>   # cp /usr/lib/syslinux/*.c32 /boot/syslinux"
-      echo "==> If (/ and /boot on same fs):"
-      echo "==>   # ln -s /usr/lib/syslinux/*.c32 /boot/syslinux"
-  fi
 }
 
 # vim:set ts=2 sw=2 et: