[arch-commits] Commit in syslinux/repos/core-i686 (3 files)

[Tobias Powalowski]

    Date: Friday, May 31, 2013 @ 11:26:52
  Author: tpowa
Revision: 186800

move everything to /usr/bin

Modified:
  syslinux/repos/core-i686/PKGBUILD
  syslinux/repos/core-i686/syslinux-install_update
  syslinux/repos/core-i686/syslinux.install

-------------------------+
 PKGBUILD                |   17 +++++++----------
 syslinux-install_update |    2 +-
 syslinux.install        |    4 ++--
 3 files changed, 10 insertions(+), 13 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2013-05-31 08:31:59 UTC (rev 186799)
+++ PKGBUILD	2013-05-31 09:26:52 UTC (rev 186800)
@@ -4,7 +4,7 @@
 
 pkgname=syslinux
 pkgver=4.06
-pkgrel=1
+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"
 url="http://syslinux.zytor.com/"
@@ -22,6 +22,10 @@
         syslinux-dont-build-dos-windows-targets.patch
         syslinux.cfg
         syslinux-install_update)
+md5sums=('0384ef35b724615074e77b1fc89d5b47'
+         '1528c376e43f0eaccaa80d8ad1bc13b4'
+         '832595501944fbcabcdc1207f4724fe7'
+         '8559fb3daf3afa8688600d8a38118918')
 
 build() {
   # Do not try to build syslinux with our default LDFLAGS, it will fail
@@ -38,18 +42,11 @@
 
 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 the default configuration
   install -D -m644 "$srcdir"/syslinux.cfg "$pkgdir"/boot/syslinux/syslinux.cfg
   # 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/sbin/syslinux-install_update
-  # move extlinux binary to /usr/sbin
-  mv "$pkgdir"/sbin/extlinux "$pkgdir"/usr/sbin/extlinux
-  rmdir "$pkgdir"/sbin
+  install -D -m755 "$srcdir"/syslinux-install_update "$pkgdir"/usr/bin/syslinux-install_update
 }
-md5sums=('0384ef35b724615074e77b1fc89d5b47'
-         '1528c376e43f0eaccaa80d8ad1bc13b4'
-         '832595501944fbcabcdc1207f4724fe7'
-         '680750f73dc2e587ac567d057d485813')

Modified: syslinux-install_update
===================================================================
--- syslinux-install_update	2013-05-31 08:31:59 UTC (rev 186799)
+++ syslinux-install_update	2013-05-31 09:26:52 UTC (rev 186800)
@@ -28,7 +28,7 @@
 
 libpath="/usr/lib/syslinux"
 bootpath="/boot/syslinux"
-extlinux="/usr/sbin/extlinux"
+extlinux="/usr/bin/extlinux"
 
 autoupdate_file=/boot/syslinux/SYSLINUX_AUTOUPDATE
 com32_files=(menu.c32 vesamenu.c32 chain.c32 hdt.c32 reboot.c32 poweroff.com)

Modified: syslinux.install
===================================================================
--- syslinux.install	2013-05-31 08:31:59 UTC (rev 186799)
+++ syslinux.install	2013-05-31 09:26:52 UTC (rev 186800)
@@ -1,13 +1,13 @@
 post_install() {
   echo "==> If you want to use syslinux as your bootloader"
   echo "==> edit /boot/syslinux/syslinux.cfg and run"
-  echo "==>   # /usr/sbin/syslinux-install_update -i -a -m"
+  echo "==>   # /usr/bin/syslinux-install_update -i -a -m"
   echo "==> to install it."
 }
 
 post_upgrade() {
   # auto-update syslinux if /boot/syslinux/SYSLINUX_AUTOUPDATE exists
-  /usr/sbin/syslinux-install_update -s
+  /usr/bin/syslinux-install_update -s
 }
 
 # vim:set ts=2 sw=2 et: