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

2013-11-17 Thread Tobias Powalowski 
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
===
--- PKGBUILD2013-11-18 07:11:38 UTC (rev 199885)
+++ PKGBUILD2013-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

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

2013-05-19 Thread Tobias Powalowski 
Date: Sunday, May 19, 2013 @ 19:17:51
  Author: tpowa
Revision: 185894

upgpkg: syslinux 5.01-4

fixed running .install after /usr/bin move

Modified:
  syslinux/trunk/PKGBUILD
  syslinux/trunk/syslinux.install

--+
 PKGBUILD |2 +-
 syslinux.install |6 +++---
 2 files changed, 4 insertions(+), 4 deletions(-)

Modified: PKGBUILD
===
--- PKGBUILD2013-05-19 17:11:30 UTC (rev 185893)
+++ PKGBUILD2013-05-19 17:17:51 UTC (rev 185894)
@@ -4,7 +4,7 @@
 
 pkgname=syslinux
 pkgver=5.01
-pkgrel=3
+pkgrel=4
 arch=('i686' 'x86_64')
 pkgdesc=Collection of boot loaders that boot from FAT, ext2/3/4 and btrfs 
filesystems, from CDs and via PXE
 url=http://www.syslinux.org;

Modified: syslinux.install
===
--- syslinux.install2013-05-19 17:11:30 UTC (rev 185893)
+++ syslinux.install2013-05-19 17:17:51 UTC (rev 185894)
@@ -1,18 +1,18 @@
 post_install() {
   echo == If you want to use syslinux as your bootloader
   echo == edit /boot/syslinux/syslinux.cfg and run
-  echo ==   # /usr/sbin/syslinux-install_update -i -a -m
+  echo ==   # /usr/bin/syslinux-install_update -i -a -m
   echo == to install it.
 }
 
 post_upgrade() {
   # auto-update syslinux if /boot/syslinux/SYSLINUX_AUTOUPDATE exists
-  /usr/sbin/syslinux-install_update -s
+  /usr/bin/syslinux-install_update -s
   # update to 5.01 message
   if [ $(vercmp $2 5.01) -lt 0 ]; then
   echo If you used syslinux-install_update to install syslinux:
   echo == If you want to use syslinux with menu and all modules please 
rerun 
-  echo ==   # /usr/sbin/syslinux-install_update -i -a -m
+  echo ==   # /usr/bin/syslinux-install_update -i -a -m
   echo 
   echo If you manually installed syslinux:
   echo == Please copy or symlink all .c32 modules to your /boot/syslinux 
directory.