Date: Monday, October 13, 2014 @ 23:51:28
Author: anatolik
Revision: 224297
Move syslinux modules back to /usr/lib/syslinux
Modified:
syslinux/trunk/PKGBUILD
syslinux/trunk/syslinux-install_update
syslinux/trunk/syslinux.cfg
-------------------------+
PKGBUILD | 20 +++++++++-----------
syslinux-install_update | 2 +-
syslinux.cfg | 2 +-
3 files changed, 11 insertions(+), 13 deletions(-)
Modified: PKGBUILD
===================================================================
--- PKGBUILD 2014-10-13 21:37:54 UTC (rev 224296)
+++ PKGBUILD 2014-10-13 21:51:28 UTC (rev 224297)
@@ -14,7 +14,8 @@
install=syslinux.install
license=(GPL2)
# syslinux build system is a mess of submakes that does not work with -jN
-options=(!makeflags)
+# efi32/com32 do not like Arch cflags/ldflags, though it would be nice to have
the flags for userspace tools
+options=(!makeflags !buildflags)
makedepends=(git python2 nasm upx asciidoc)
if [[ "$CARCH" == x86_64 ]]; then
# efi32 needs it
@@ -34,8 +35,8 @@
syslinux.cfg
syslinux-install_update)
sha1sums=('SKIP'
- '0640bd89e2ba609bab20db671e14f74e26554873'
- '15db7e99259bed1c88907d0561f1af4174d1cc65')
+ '1145f454bd297d373ad123425f93620c3e92f585'
+ 'd22e7e3fc544cf8a49f27ae9a25f17e65f575ea1')
_targets='bios efi32'
case "$CARCH" in
@@ -54,12 +55,6 @@
build() {
cd syslinux
-
- # it would be great to use Arch cflags/ldflags for userspace tools
- unset CFLAGS
- unset CPPFLAGS
- unset CXXFLAGS
- unset LDFLAGS
make PYTHON=python2 $_targets
}
@@ -70,13 +65,16 @@
package() {
cd syslinux
- make $_targets install INSTALLROOT="$pkgdir" SBINDIR=/usr/bin
MANDIR=/usr/share/man
+ make $_targets install INSTALLROOT="$pkgdir" SBINDIR=/usr/bin
MANDIR=/usr/share/man AUXDIR=/usr/lib/syslinux
- rm -r "$pkgdir"/usr/share/syslinux/{com32,dosutil,syslinux.com}
+ rm -r "$pkgdir"/usr/lib/syslinux/{com32,dosutil,syslinux.com}
install -D -m644 COPYING "$pkgdir"/usr/share/licenses/syslinux/COPYING
install -d "$pkgdir"/usr/share/doc
cp -ar doc "$pkgdir"/usr/share/doc/syslinux
+ install -d "$pkgdir"/usr/lib/syslinux/bios
+ mv "$pkgdir"/usr/lib/syslinux/{*.bin,*.c32,*.0,memdisk}
"$pkgdir"/usr/lib/syslinux/bios
+
install -D -m0644 ../syslinux.cfg "$pkgdir"/boot/syslinux/syslinux.cfg
install -D -m0755 ../syslinux-install_update
"$pkgdir"/usr/bin/syslinux-install_update
}
Modified: syslinux-install_update
===================================================================
--- syslinux-install_update 2014-10-13 21:37:54 UTC (rev 224296)
+++ syslinux-install_update 2014-10-13 21:51:28 UTC (rev 224297)
@@ -31,7 +31,7 @@
shopt -s nullglob
-bios_libpath="/usr/share/syslinux"
+bios_libpath="/usr/lib/syslinux/bios"
bios_bootpath="/boot/syslinux"
EXTLINUX="/usr/bin/extlinux"
Modified: syslinux.cfg
===================================================================
--- syslinux.cfg 2014-10-13 21:37:54 UTC (rev 224296)
+++ syslinux.cfg 2014-10-13 21:51:28 UTC (rev 224297)
@@ -8,7 +8,7 @@
# * hdt.c32 - hardware detection tool
# * reboot.c32 - reboots the system
#
-# To Use: Copy the respective files from /usr/share/syslinux to /boot/syslinux.
+# 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
# of copying them.
#
