diff options
| -rw-r--r-- | libre/syslinux/PKGBUILD | 9 | ||||
| -rw-r--r-- | libre/syslinux/syslinux-install_update | 5 |
2 files changed, 7 insertions, 7 deletions
diff --git a/libre/syslinux/PKGBUILD b/libre/syslinux/PKGBUILD index fa0886dd7..a564f0fa7 100644 --- a/libre/syslinux/PKGBUILD +++ b/libre/syslinux/PKGBUILD @@ -8,7 +8,7 @@ pkgname=syslinux pkgver=6.03 _tag=syslinux-$pkgver -pkgrel=8.parabola1 +pkgrel=10.parabola1 pkgdesc='Collection of boot loaders that boot from FAT, ext2/3/4 and btrfs filesystems, from CDs and via PXE (Parabola rebranded)' url='http://www.syslinux.org/' arch=(i686 x86_64) @@ -44,13 +44,14 @@ source=(git://git.kernel.org/pub/scm/boot/syslinux/syslinux.git#tag=$_tag correct_base_type.patch::http://repo.or.cz/syslinux.git/patch/83aad4f set_mode_base.patch::http://repo.or.cz/syslinux.git/patch/0a2dbb3 fix_return_pointer.patch::http://repo.or.cz/syslinux.git/patch/8dc6d758b564a1ccc44c3ae11f265d43628219ce + support-ext4-64bit.patch::http://repo.or.cz/syslinux.git/patch/af7e95c32cea40c1e443ae301e64b27f068b4915 fix_infinite_loop_tests.patch gnu-efi-git.patch splash.png) sha1sums=('SKIP' 'SKIP' 'e40acf4cf9d05ec000c59284f959d1540b35a3be' - '6bf38a8de1891ba3fbea27ef73cc4a8047c1b6c7' + 'df5160a138ca8c6502d67fe1a64fec78b50e82c2' '6ebf77bf028c928a6ef33dadeee7402b3113b6d3' 'eaa9f5cd82b501f076ece4812d2d37f49d02caae' 'c6a6e96e233b2f8105503725cd614abc1bac2845' @@ -58,6 +59,7 @@ sha1sums=('SKIP' 'e24bf5b1617bab4a3f46925c5a8ee6079f4686bf' '500c174fce91133d40024b28f6f5cedb144b84c2' 'b3d2196aaec154749c5b796c6d9bfd605a918cf8' + 'fe3ab41235aa57259bb6af8cc30c5877c1d8fb57' '7ecb02550666dfafeb0b22a67dcc34caa4b79767' '324af118594e6fb0864ef4905ce47d95c4d8e6ef' 'aab1c7789e0d7290fe87538abad181abac069d40') @@ -90,6 +92,9 @@ prepare() { # fix infinite loop in load_linux patch -p1 < ../fix_infinite_loop_tests.patch + # FS#58137 + patch -p1 < ../support-ext4-64bit.patch + patch -p1 < ../gnu-efi-git.patch # do not swallow efi compilation output to make debugging easier diff --git a/libre/syslinux/syslinux-install_update b/libre/syslinux/syslinux-install_update index 13dbe258c..63bbd03c6 100644 --- a/libre/syslinux/syslinux-install_update +++ b/libre/syslinux/syslinux-install_update @@ -204,11 +204,6 @@ getBoot() { echo "Could not find filesystem on / (root) or /boot." exit 1 fi - - if [[ $bootfs = ext4 && -n "$(tune2fs -l $bootpart | grep 64bit)" ]]; then - echo "64 bit option on EXT filesystem is not supported by Syslinux, see http://www.syslinux.org/wiki/index.php?title=Filesystem#ext"; - exit 1 - fi } # We store the partition table type either gpt or mbr in var ptb |