diff options
| author | Nicolas Reynolds <fauno@kiwwwi.com.ar> | 2011-12-14 13:56:57 -0300 |
|---|---|---|
| committer | Nicolas Reynolds <fauno@kiwwwi.com.ar> | 2011-12-14 13:56:57 -0300 |
| commit | 2a5d7fae98236635f0b42f281b98c7fa878651b2 (patch) | |
| tree | 70dd342f375174900d28e203fa4cca8162c5ffc8 /core | |
| parent | 342f33686394ec009cb900cbb583997521ff362c (diff) | |
| parent | f4dcb5cb43b68e265512a03a160bdda634818b43 (diff) | |
Merge branch 'master' of ssh://vparabola/home/parabola/abslibre-pre-mips64el
Conflicts:
community/lorcon-old-svn/PKGBUILD
extra/ristretto/PKGBUILD
libre/texlive-bin-libre/PKGBUILD
multilib/lib32-util-linux/PKGBUILD
Diffstat (limited to 'core')
| -rw-r--r-- | core/syslinux/PKGBUILD | 12 | ||||
| -rw-r--r-- | core/syslinux/syslinux-dont-build-dos-windows-targets.patch | 2 |
2 files changed, 7 insertions, 7 deletions
diff --git a/core/syslinux/PKGBUILD b/core/syslinux/PKGBUILD index a999277f1..53eb06d0b 100644 --- a/core/syslinux/PKGBUILD +++ b/core/syslinux/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 134206 2011-08-02 14:26:49Z ibiru $ +# $Id: PKGBUILD 144967 2011-12-12 09:45:24Z thomas $ # Maintainer: Thomas Bächler <thomas@archlinux.org> # Maintainer: Tobias Powalowski <tpowa@archlinux.org> pkgname=syslinux -pkgver=4.04 -pkgrel=2 +pkgver=4.05 +pkgrel=1 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://syslinux.zytor.com/" @@ -21,8 +21,8 @@ source=(http://www.kernel.org/pub/linux/utils/boot/syslinux/$pkgname-${pkgver}.t syslinux-dont-build-dos-windows-targets.patch syslinux.cfg syslinux-install_update) -md5sums=('a3936208767eb7ced65320abe2e33a10' - '5274062f91931eae6573f1ec3cd5b640' +md5sums=('82299242418385da1274c9479a778cb2' + '1528c376e43f0eaccaa80d8ad1bc13b4' '4dc27d8ab3802f8e50f3dda28168ce6d' 'b5b4953c0a5a01cd16441402f6321765') @@ -33,7 +33,7 @@ build() { # Do not try to build the Windows or DOS installers patch -p1 -i "$srcdir"/syslinux-dont-build-dos-windows-targets.patch # Fix FHS manpage path - sed 's|/usr/man|/usr/share/man|g' -i MCONFIG + sed 's|/usr/man|/usr/share/man|g' -i mk/syslinux.mk make } diff --git a/core/syslinux/syslinux-dont-build-dos-windows-targets.patch b/core/syslinux/syslinux-dont-build-dos-windows-targets.patch index 7355e4acb..2b86ab828 100644 --- a/core/syslinux/syslinux-dont-build-dos-windows-targets.patch +++ b/core/syslinux/syslinux-dont-build-dos-windows-targets.patch @@ -1,7 +1,7 @@ diff -Nur syslinux-4.02.orig//Makefile syslinux-4.02//Makefile --- syslinux-4.02.orig//Makefile 2010-07-21 21:33:13.000000000 +0200 +++ syslinux-4.02//Makefile 2010-07-22 11:14:03.325522937 +0200 -@@ -55,7 +55,7 @@ +@@ -54,7 +54,7 @@ # files that depend only on the B phase, but may have to be regenerated # for "make installer". BSUBDIRS = codepage com32 lzo core memdisk modules mbr memdump gpxe sample \ |