Date: Monday, November 18, 2013 @ 08:24:59 Author: tpowa Revision: 199886
upgpkg: syslinux 6.02-6 #37758 don't be too verboose in install file Modified: syslinux/trunk/PKGBUILD syslinux/trunk/syslinux.install ------------------+ PKGBUILD | 61 +++++++++++++++++++++++++++++++++-------------------- syslinux.install | 19 ++++++++++++++-- 2 files changed, 56 insertions(+), 24 deletions(-) Modified: PKGBUILD =================================================================== --- PKGBUILD 2013-11-18 07:11:38 UTC (rev 199885) +++ PKGBUILD 2013-11-18 07:24:59 UTC (rev 199886) @@ -1,10 +1,10 @@ # Maintainer : Tobias Powalowski <tp...@archlinux.org> # Maintainer : Thomas Bächler <tho...@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)> pkgname="syslinux" pkgver="6.02" -pkgrel="5" +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" url="http://syslinux.zytor.com/" @@ -30,6 +30,28 @@ '9376f18fa3e42fc36cffa4cff0a84c09' '9dbede6b71a4de9e46aac4aad65334d7') +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() { rm -rf "${srcdir}/${pkgname}-${pkgver}-bios/" || true @@ -39,7 +61,8 @@ ## 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() { @@ -56,7 +79,8 @@ unset MAKEFLAGS make PYTHON="python2" efi64 - make PYTHON="python2" efi64 installer + make PYTHON="python2" efi64 installer + } _build_syslinux_efi32() { @@ -73,7 +97,8 @@ unset MAKEFLAGS make PYTHON="python2" efi32 - make PYTHON="python2" efi32 installer + make PYTHON="python2" efi32 installer + } build() { @@ -80,22 +105,6 @@ 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 @@ -145,7 +154,7 @@ } -package() { +_package_syslinux_efi() { cd "${srcdir}/${pkgname}-${pkgver}/" @@ -159,6 +168,14 @@ make INSTALLROOT="${pkgdir}/" AUXDIR="/usr/lib/syslinux/" efi32 install fi +} + +package() { + + cd "${srcdir}/${pkgname}-${pkgver}/" + + _package_syslinux_efi + _package_syslinux_bios } Modified: syslinux.install =================================================================== --- syslinux.install 2013-11-18 07:11:38 UTC (rev 199885) +++ syslinux.install 2013-11-18 07:24:59 UTC (rev 199886) @@ -1,8 +1,15 @@ post_install() { + cat << EOF -==> For setting up Syslinux BIOS using the install script follow +==> For setting up Syslinux BIOS using the syslinux-install_update script follow https://wiki.archlinux.org/index.php/Syslinux#Automatic_Install +EOF + + ## Message specific to Syslinux 4.xx (or 5.xx) to 6.xx upgrade + if [ "$(vercmp $2 6.00)" -lt 0 ]; then + + cat << EOF ==> If you are upgrading from Syslinux 4.xx or 5.xx, please re-install (not update) Syslinux BIOS manually (not using the install script) once @@ -9,20 +16,28 @@ by following https://wiki.archlinux.org/index.php/Syslinux#Manual_install ==> The install script may not properly upgrade Syslinux to 6.xx version +EOF + + fi + cat << EOF + ==> For setting up Syslinux EFI follow https://wiki.archlinux.org/index.php/Syslinux#UEFI_Systems -==> The install script does not currently support Syslinux EFI installation +==> The syslinux-install_update script does not currently support EFI install EOF + } post_upgrade() { + ## auto-update syslinux if /boot/syslinux/SYSLINUX_AUTOUPDATE exists /usr/bin/syslinux-install_update -s post_install + } # vim:set ts=2 sw=2 et: