diff options
| author | Natanael Copa <ncopa@alpinelinux.org> | 2013-11-04 15:17:01 +0000 |
|---|---|---|
| committer | Natanael Copa <ncopa@alpinelinux.org> | 2013-11-04 15:17:01 +0000 |
| commit | 826a14f13ee1fabeb973f094d17140a24fc429c5 (patch) | |
| tree | c348f9a5f10897a41eb9da98bfc221afe5ac0087 /main/syslinux | |
| parent | db74557de78aef004e6e475ee2f48bc7db78602e (diff) | |
| download | aports-826a14f13ee1fabeb973f094d17140a24fc429c5.zip | |
main/syslinux upgrade to 6.02
Diffstat (limited to 'main/syslinux')
| -rw-r--r-- | main/syslinux/APKBUILD | 25 | ||||
| -rw-r--r-- | main/syslinux/syslinux-3.86-nopie.patch | 11 |
2 files changed, 16 insertions, 20 deletions
diff --git a/main/syslinux/APKBUILD b/main/syslinux/APKBUILD index 7d95f456e9f..191ae4915be 100644 --- a/main/syslinux/APKBUILD +++ b/main/syslinux/APKBUILD @@ -1,13 +1,13 @@ # Maintainer: Natanael Copa <ncopa@alpinelinux.org> pkgname=syslinux -pkgver=5.10 -pkgrel=4 +pkgver=6.02 +pkgrel=0 _ver=${pkgver/_/-} pkgdesc="Boot loader for the Linux operating system" url="http://syslinux.org" arch="x86 x86_64" license="GPL" -makedepends="nasm perl util-linux-dev" +makedepends="nasm perl util-linux-dev gnu-efi-dev" depends="mtools blkid mkinitfs" triggers="syslinux.trigger=/boot" install="syslinux.post-upgrade" @@ -18,7 +18,13 @@ source="https://www.kernel.org/pub/linux/utils/boot/syslinux/syslinux-$_ver.tar. update-extlinux.conf update-extlinux " -subpackages="$pkgname-doc" +subpackages="$pkgname-doc $pkgname-dev" + +_loaderarch= +case "$CARCH" in +x86) _loaderarch=efi32;; +x86_64) _loaderarch=efi64;; +esac _builddir="$srcdir"/$pkgname-$_ver prepare() { @@ -33,12 +39,13 @@ prepare() { build() { cd "$_builddir" unset LDFLAGS - make installer || return 1 + make $_loaderarch installer || return 1 } package() { cd "$_builddir" - make INSTALLROOT="$pkgdir" MANDIR=/usr/share/man local-install + make -j1 INSTALLROOT="$pkgdir" MANDIR=/usr/share/man \ + bios $_loaderarch install || return 1 mkdir -p "$pkgdir"/etc/update-extlinux.d cp "$srcdir"/update-extlinux.conf "$pkgdir"/etc/ @@ -47,12 +54,12 @@ package() { chmod 755 "$pkgdir"/sbin/update-extlinux } -md5sums="67c8a85ca275d13b4f7f6139dd47d999 syslinux-5.10.tar.xz +md5sums="6f275813a1b08cf852e55c0a3f8fbc78 syslinux-6.02.tar.xz 603c7e3745c2cdded5332c7acb390fa0 update-extlinux.conf 89fb72c4dd47516402bc91a3cdf2b4d5 update-extlinux" -sha256sums="4b52d7647d5584c69764c06a836e0d524e5246bf2e94f68cf86342c415508422 syslinux-5.10.tar.xz +sha256sums="afa31b7cbf72e1c0c1752a0636ba724ce01c0e374366e46e61db6862b4685478 syslinux-6.02.tar.xz 99c8864958daf6f7bb2460082ceb809e0ce49aec3f0b847c7644565da14595e3 update-extlinux.conf 0dce3d534ab4288872c7654d7408d35896f508d486ad7d02cdaaf5fee37f6ae5 update-extlinux" -sha512sums="56422e14b4aa53ca1a5811da0582dbbb349aa52b9e78868bbedc24c67ef2420c4d0ac63fd68c7f0adc2c22606196276265d503b5b6f9d3d796d9ce42845bbdb5 syslinux-5.10.tar.xz +sha512sums="919d165e9cba2b964cec8b015f0a4281a5f90e908f247441d6edefe289170e697b933554d12fa90e698b6d2e8b5b40fdb3b7a95d746a41c580e3a44f8859818f syslinux-6.02.tar.xz 6e01a8c181812218eef38f183475d5b96079cbefe635b57b23cb2322fed552ff4d0c3e974a7defa7ea84b015659725b35aee247bc1ab9dc5903ffd124ae7ff25 update-extlinux.conf 848940244b9547c8d5d721b494cda199ea5785e306e8ac2124640f89ba7837d4a6e3a9a09fd2c5cd662d3ba66c5f81fcb1ec1f52fae9fade45b1ff10d7fc2b61 update-extlinux" diff --git a/main/syslinux/syslinux-3.86-nopie.patch b/main/syslinux/syslinux-3.86-nopie.patch deleted file mode 100644 index 262a4c15cad..00000000000 --- a/main/syslinux/syslinux-3.86-nopie.patch +++ /dev/null @@ -1,11 +0,0 @@ ---- ./com32/MCONFIG.orig -+++ ./com32/MCONFIG -@@ -25,6 +25,8 @@ - $(call gcc_ok,-falign-loops=0,-malign-loops=0) \ - $(call gcc_ok,-mpreferred-stack-boundary=2,) \ - $(call gcc_ok,-mincoming-stack-boundary=2,) \ -+ $(call gcc_ok,-nopie,) \ -+ $(call gcc_ok,-fno-pie,) \ - -march=i386 -Os -fomit-frame-pointer -mregparm=3 -DREGPARM=3 - - com32 = $(topdir)/com32 |