[arch-commits] Commit in syslinux/trunk (PKGBUILD)

Tobias Powalowski tpowa at nymeria.archlinux.org
Thu Jul 4 20:21:11 UTC 2013


    Date: Thursday, July 4, 2013 @ 22:21:11
  Author: tpowa
Revision: 189693

upgpkg: syslinux 6.01-1

bump to latest version

Modified:
  syslinux/trunk/PKGBUILD

----------+
 PKGBUILD |  239 +++++++++++++++++++++++++++++--------------------------------
 1 file changed, 117 insertions(+), 122 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2013-07-04 19:58:52 UTC (rev 189692)
+++ PKGBUILD	2013-07-04 20:21:11 UTC (rev 189693)
@@ -3,12 +3,13 @@
 # Contributor: Keshav Padram (the.ridikulus.rat) (aatt) (gemmaeiil) (ddoott) (ccoomm)>
 
 pkgname="syslinux"
-pkgver="6.00"
+pkgver="6.01"
 pkgrel="1"
 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/"
 license=('GPL2')
+options=('!makeflags' '!emptydirs')
 
 makedepends=('python2' 'nasm' 'gnu-efi-libs')
 depends=('perl' 'glibc')
@@ -23,147 +24,141 @@
 install="${pkgname}.install"
 
 source=("https://www.kernel.org/pub/linux/utils/boot/syslinux/${pkgname}-${pkgver}.tar.xz"
-        'syslinux-6.00-efi-fix-libcom32.patch'
-        'syslinux-6.00-efi-export-kbdmap.patch'
         'syslinux.cfg'
         'syslinux-install_update')
-options=(!makeflags)
 
-sha1sums=('601036fb00f39ea838ef1cbe3dae8b9bf24fabda'
-          'e24c10acc7a923ba957957b1c2c1cd4b649a4cf4'
-          '44245ab68b607f412738dc222d51e9b8b4bf664b'
+sha1sums=('d7bc1b188677f77ac2d7060d25491dc29877a9c4'
           'b0f174bcc0386fdf699e03d0090e3ac841098010'
           'b1d915045fe3094f5359df043c53e73a4dc32745')
 
 _build_syslinux_bios() {
-	
-	rm -rf "${srcdir}/${pkgname}-${pkgver}-bios/" || true
-	cp -r "${srcdir}/${pkgname}-${pkgver}" "${srcdir}/${pkgname}-${pkgver}-bios"
-	cd "${srcdir}/${pkgname}-${pkgver}-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
-	
+    
+    rm -rf "${srcdir}/${pkgname}-${pkgver}-bios/" || true
+    cp -r "${srcdir}/${pkgname}-${pkgver}" "${srcdir}/${pkgname}-${pkgver}-bios"
+    cd "${srcdir}/${pkgname}-${pkgver}-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
+    
 }
 
 _build_syslinux_efi64() {
-	
-	rm -rf "${srcdir}/${pkgname}-${pkgver}-efi64/" || true
-	cp -r "${srcdir}/${pkgname}-${pkgver}" "${srcdir}/${pkgname}-${pkgver}-efi64"
-	cd "${srcdir}/${pkgname}-${pkgver}-efi64/"
-	
-	## Unset all compiler FLAGS for efi64 build
-	unset CFLAGS
-	unset CPPFLAGS
-	unset CXXFLAGS
-	unset LDFLAGS
-	unset MAKEFLAGS
-	
-	make PYTHON="python2" efi64
-	make PYTHON="python2" efi64 installer
-	
+    
+    rm -rf "${srcdir}/${pkgname}-${pkgver}-efi64/" || true
+    cp -r "${srcdir}/${pkgname}-${pkgver}" "${srcdir}/${pkgname}-${pkgver}-efi64"
+    cd "${srcdir}/${pkgname}-${pkgver}-efi64/"
+    
+    ## Unset all compiler FLAGS for efi64 build
+    unset CFLAGS
+    unset CPPFLAGS
+    unset CXXFLAGS
+    unset LDFLAGS
+    unset MAKEFLAGS
+    
+    make PYTHON="python2" efi64
+    make PYTHON="python2" efi64 installer
+    
 }
 
 _build_syslinux_efi32() {
-	
-	rm -rf "${srcdir}/${pkgname}-${pkgver}-efi32/" || true
-	cp -r "${srcdir}/${pkgname}-${pkgver}" "${srcdir}/${pkgname}-${pkgver}-efi32"
-	cd "${srcdir}/${pkgname}-${pkgver}-efi32/"
-	
-	## Unset all compiler FLAGS for efi32 build
-	unset CFLAGS
-	unset CPPFLAGS
-	unset CXXFLAGS
-	unset LDFLAGS
-	unset MAKEFLAGS
-	
-	make PYTHON="python2" efi32
-	make PYTHON="python2" efi32 installer
-	
+    
+    rm -rf "${srcdir}/${pkgname}-${pkgver}-efi32/" || true
+    cp -r "${srcdir}/${pkgname}-${pkgver}" "${srcdir}/${pkgname}-${pkgver}-efi32"
+    cd "${srcdir}/${pkgname}-${pkgver}-efi32/"
+    
+    ## Unset all compiler FLAGS for efi32 build
+    unset CFLAGS
+    unset CPPFLAGS
+    unset CXXFLAGS
+    unset LDFLAGS
+    unset MAKEFLAGS
+    
+    make PYTHON="python2" efi32
+    make PYTHON="python2" efi32 installer
+    
 }
 
 build() {
-	
-	cd "${srcdir}/${pkgname}-${pkgver}/"
-	
-	## Apply syslinux-6.00-efi-fix-libcom32.patch from git
-	patch -Np1 -i "${srcdir}/syslinux-6.00-efi-fix-libcom32.patch"
-	
-	## Apply syslinux-6.00-efi-export-kbdmap.patch from git
-	patch -Np1 -i "${srcdir}/syslinux-6.00-efi-export-kbdmap.patch"
-	
-	## Do not try to build the Windows or DOS installers
-	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
-	
-	## Fix FHS manpage path
-	sed 's|/usr/man|/usr/share/man|g' -i "${srcdir}/${pkgname}-${pkgver}/mk/syslinux.mk" || true
-	
-	## Build syslinux-bios
-	_build_syslinux_bios
-	
-	## Build syslinux-efi
-	if [[ "${CARCH}" == "x86_64" ]]; then
-		_build_syslinux_efi64
-	fi
-	
-	if [[ "${CARCH}" == "i686" ]]; then
-		_build_syslinux_efi32
-	fi
-	
+    
+    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
+    
+    ## Build syslinux-efi
+    if [[ "${CARCH}" == "x86_64" ]]; then
+        _build_syslinux_efi64
+    fi
+    
+    if [[ "${CARCH}" == "i686" ]]; then
+        _build_syslinux_efi32
+    fi
+    
+    ## Build syslinux-bios
+    _build_syslinux_bios
+    
 }
 
 _package_syslinux_bios() {
-	
-	cd "${srcdir}/${pkgname}-${pkgver}-bios/"
-	
-	## Install Syslinux bios
-	make INSTALLROOT="${pkgdir}/" AUXDIR="/usr/lib/syslinux/bios/" bios install
-	
-	## Remove syslinux.exe,syslinux64.exe,syslinux.com and dosutil dir
-	rm "/usr/lib/syslinux/bios"/syslinux.{com,exe} || true
-	rm "/usr/lib/syslinux/bios/syslinux64.exe" || true
-	rm -rf "/usr/lib/syslinux/bios/dosutil/" || true
-	
-	## Move extlinux binary to /usr/bin
-	install -d "${pkgdir}/usr/bin"
-	mv "${pkgdir}/sbin/extlinux" "${pkgdir}/usr/bin/extlinux"
-	rm -rf "${pkgdir}/sbin/"
-	
-	## Install docs
-        install -d "${pkgdir}/usr/share/doc/syslinux"
-        cp -ar "${srcdir}/${pkgname}-${pkgver}/doc" "${pkgdir}/usr/share/doc/syslinux"
-	
-	## Install the default configuration
-	install -D -m0644 "${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
-	## Script not yet updated for syslinux-efi
-	install -D -m0755 "${srcdir}/syslinux-install_update" "${pkgdir}/usr/bin/syslinux-install_update"
-	
+    
+    cd "${srcdir}/${pkgname}-${pkgver}-bios/"
+    
+    ## Install Syslinux bios
+    make INSTALLROOT="${pkgdir}/" AUXDIR="/usr/lib/syslinux/bios/" bios install
+    
+    ## Remove syslinux.exe,syslinux64.exe,syslinux.com and dosutil dir
+    rm "${pkgdir}/usr/lib/syslinux/bios"/syslinux.{com,exe} || true
+    rm "${pkgdir}/usr/lib/syslinux/bios/syslinux64.exe" || true
+    rm -rf "${pkgdir}/usr/lib/syslinux/bios/dosutil/" || true
+    
+    ## Remove com32 and diag dirs
+    rm -rf "${pkgdir}/usr/lib/syslinux/bios/diag/" || true
+    rm -rf "${pkgdir}/usr/lib/syslinux/bios/com32/" || true
+    
+    ## Move extlinux binary to /usr/bin
+    install -d "${pkgdir}/usr/bin"
+    mv "${pkgdir}/sbin/extlinux" "${pkgdir}/usr/bin/extlinux"
+    rm -rf "${pkgdir}/sbin/"
+    
+    ## Install docs
+    install -d "${pkgdir}/usr/share/doc"
+    cp -ar "${srcdir}/${pkgname}-${pkgver}/doc" "${pkgdir}/usr/share/doc/syslinux"
+    
+    ## Install the default configuration
+    install -D -m0644 "${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
+    ## Script not yet updated for syslinux-efi
+    install -D -m0755 "${srcdir}/syslinux-install_update" "${pkgdir}/usr/bin/syslinux-install_update"
+    
 }
 
 package() {
-	
-	cd "${srcdir}/${pkgname}-${pkgver}/"
-	
-	_package_syslinux_bios
-	
-	if [[ "${CARCH}" == "x86_64" ]]; then
-		cd "${srcdir}/${pkgname}-${pkgver}-efi64/"
-		make INSTALLROOT="${pkgdir}/" AUXDIR="/usr/lib/syslinux/" efi64 install
-	fi
-	
-	if [[ "${CARCH}" == "i686" ]]; then
-		cd "${srcdir}/${pkgname}-${pkgver}-efi32/"
-		make INSTALLROOT="${pkgdir}/" AUXDIR="/usr/lib/syslinux/" efi32 install
-	fi
-	
+    
+    cd "${srcdir}/${pkgname}-${pkgver}/"
+    
+    if [[ "${CARCH}" == "x86_64" ]]; then
+        cd "${srcdir}/${pkgname}-${pkgver}-efi64/"
+        make INSTALLROOT="${pkgdir}/" AUXDIR="/usr/lib/syslinux/" efi64 install
+    fi
+    
+    if [[ "${CARCH}" == "i686" ]]; then
+        cd "${srcdir}/${pkgname}-${pkgver}-efi32/"
+        make INSTALLROOT="${pkgdir}/" AUXDIR="/usr/lib/syslinux/" efi32 install
+    fi
+    
+    _package_syslinux_bios
+    
 }




More information about the arch-commits mailing list