diff options
author | André Fabian Silva Delgado <emulatorman@parabola.nu> | 2013-11-22 16:48:39 -0200 |
---|---|---|
committer | André Fabian Silva Delgado <emulatorman@parabola.nu> | 2013-11-22 16:48:39 -0200 |
commit | 6334e77f64f574ef7bcd3aeceb2237b55495a4c7 (patch) | |
tree | 2c24cd38846c726eccb11bb26952b7b0da25bbfb /libre/syslinux/PKGBUILD | |
parent | a2387936e71fd3fa8d2cef0b1f4c92985877ce1a (diff) |
syslinux-6.02-6: updating revision
* fix install message, don't recommend symlinking anymore
* don't be too verboose in install file, #37758 => https://bugs.archlinux.org/task/37758
Diffstat (limited to 'libre/syslinux/PKGBUILD')
-rw-r--r-- | libre/syslinux/PKGBUILD | 64 |
1 files changed, 40 insertions, 24 deletions
diff --git a/libre/syslinux/PKGBUILD b/libre/syslinux/PKGBUILD index ad30022df..345523b0f 100644 --- a/libre/syslinux/PKGBUILD +++ b/libre/syslinux/PKGBUILD @@ -1,11 +1,11 @@ # Maintainer: Tobias Powalowski <tpowa@archlinux.org> # Maintainer: Thomas Bächler <thomas@archlinux.org> -# Contributor: Keshav Padram (the.ridikulus.rat) (aatt) (gemmaeiil) (ddoott) (ccoomm)> +# Contributor: Keshav Padram Amburay <(the ddoott ridikulus ddoott rat) (aatt) (gemmaeiil) (ddoott) (ccoomm)> # Maintainer (Parabola): André Silva <emulatorman@parabola.nu> pkgname="syslinux" pkgver="6.02" -pkgrel="4" +pkgrel="6" arch=('x86_64' 'i686') pkgdesc="Collection of boot loaders that boot from FAT, ext2/3/4 and btrfs filesystems, from CDs and via PXE (Parabola rebranded)" url="http://syslinux.zytor.com/" @@ -30,9 +30,30 @@ source=("https://www.kernel.org/pub/linux/utils/boot/syslinux/${pkgname}-${pkgve 'splash.png') md5sums=('6f275813a1b08cf852e55c0a3f8fbc78' 'f048880b57e2c5a7017ff8804bfda327' - '9da2b8b25ea8d628887f11749dc3fffa' - '9dbede6b71a4de9e46aac4aad65334d7' + '9376f18fa3e42fc36cffa4cff0a84c09' + '9dbede6b71a4de9e46aac4aad65334d7 'cb46ca47c6b6323127d908440057d98f') +prepare() { + + cd "${srcdir}/${pkgname}-${pkgver}/" + + ## Do not try to build the Windows or DOS installers and DIAG files + sed 's|diag libinstaller dos win32 win64 dosutil txt|libinstaller txt|g' -i "${srcdir}/${pkgname}-${pkgver}/Makefile" || true + sed 's|win32/syslinux.exe win64/syslinux64.exe||g' -i "${srcdir}/${pkgname}-${pkgver}/Makefile" || true + sed 's|dosutil/*.com dosutil/*.sys||g' -i "${srcdir}/${pkgname}-${pkgver}/Makefile" || true + sed 's|dos/syslinux.com||g' -i "${srcdir}/${pkgname}-${pkgver}/Makefile" || true + sed 's|INSTALLSUBDIRS = com32 utils dosutil|INSTALLSUBDIRS = com32 utils|g' -i "${srcdir}/${pkgname}-${pkgver}/Makefile" || true + sed 's|install -m 644 -c $(INSTALL_DIAG) $(INSTALLROOT)$(DIAGDIR)|# install -m 644 -c $(INSTALL_DIAG) $(INSTALLROOT)$(DIAGDIR)|g' -i "${srcdir}/${pkgname}-${pkgver}/Makefile" || true + + ## Fix FHS manpage path + sed 's|/usr/man|/usr/share/man|g' -i "${srcdir}/${pkgname}-${pkgver}/mk/syslinux.mk" || true + + # fix chainloading + # http://bugzilla.syslinux.org/show_bug.cgi?id=31 + # http://www.syslinux.org/archives/2013-October/020971.html + patch -Np1 -i "${srcdir}/syslinux-6.02-fix-chainloading.patch" + +} _build_syslinux_bios() { @@ -43,7 +64,8 @@ _build_syslinux_bios() { ## Do not try to build syslinux with our default LDFLAGS, it will fail unset LDFLAGS make PYTHON="python2" bios - make PYTHON="python2" bios installer + make PYTHON="python2" bios installer + } _build_syslinux_efi64() { @@ -60,7 +82,8 @@ _build_syslinux_efi64() { unset MAKEFLAGS make PYTHON="python2" efi64 - make PYTHON="python2" efi64 installer + make PYTHON="python2" efi64 installer + } _build_syslinux_efi32() { @@ -77,29 +100,14 @@ _build_syslinux_efi32() { unset MAKEFLAGS make PYTHON="python2" efi32 - make PYTHON="python2" efi32 installer + make PYTHON="python2" efi32 installer + } build() { cd "${srcdir}/${pkgname}-${pkgver}/" - ## Do not try to build the Windows or DOS installers and DIAG files - sed 's|diag libinstaller dos win32 win64 dosutil txt|libinstaller txt|g' -i "${srcdir}/${pkgname}-${pkgver}/Makefile" || true - sed 's|win32/syslinux.exe win64/syslinux64.exe||g' -i "${srcdir}/${pkgname}-${pkgver}/Makefile" || true - sed 's|dosutil/*.com dosutil/*.sys||g' -i "${srcdir}/${pkgname}-${pkgver}/Makefile" || true - sed 's|dos/syslinux.com||g' -i "${srcdir}/${pkgname}-${pkgver}/Makefile" || true - sed 's|INSTALLSUBDIRS = com32 utils dosutil|INSTALLSUBDIRS = com32 utils|g' -i "${srcdir}/${pkgname}-${pkgver}/Makefile" || true - sed 's|install -m 644 -c $(INSTALL_DIAG) $(INSTALLROOT)$(DIAGDIR)|# install -m 644 -c $(INSTALL_DIAG) $(INSTALLROOT)$(DIAGDIR)|g' -i "${srcdir}/${pkgname}-${pkgver}/Makefile" || true - - ## Fix FHS manpage path - sed 's|/usr/man|/usr/share/man|g' -i "${srcdir}/${pkgname}-${pkgver}/mk/syslinux.mk" || true - - # fix chainloading - # http://bugzilla.syslinux.org/show_bug.cgi?id=31 - # http://www.syslinux.org/archives/2013-October/020971.html - patch -Np1 -i "${srcdir}/syslinux-6.02-fix-chainloading.patch" - ## Build syslinux-efi if [[ "${CARCH}" == "x86_64" ]]; then _build_syslinux_efi64 @@ -151,7 +159,7 @@ _package_syslinux_bios() { install -D -m644 "${srcdir}/splash.png" "${pkgdir}/boot/syslinux/splash.png" } -package() { +_package_syslinux_efi() { cd "${srcdir}/${pkgname}-${pkgver}/" @@ -165,6 +173,14 @@ package() { make INSTALLROOT="${pkgdir}/" AUXDIR="/usr/lib/syslinux/" efi32 install fi +} + +package() { + + cd "${srcdir}/${pkgname}-${pkgver}/" + + _package_syslinux_efi + _package_syslinux_bios } |