diff options
| -rw-r--r-- | .SRCINFO | 5 | ||||
| -rw-r--r-- | PKGBUILD | 10 | ||||
| -rwxr-xr-x | install-grub | 8 |
3 files changed, 12 insertions, 11 deletions
@@ -1,7 +1,7 @@ pkgbase = grub pkgdesc = A GNU multiboot boot loader pkgver = 0.97 - pkgrel = 19 + pkgrel = 20 url = http://www.gnu.org/software/grub/ install = grub.install arch = i686 @@ -11,6 +11,7 @@ pkgbase = grub depends = ncurses depends = diffutils depends = sed + optdepends = xfsprogs: freezing of xfs /boot in install-grub script backup = boot/grub/menu.lst source = ftp://alpha.gnu.org/gnu/grub/grub-0.97.tar.gz source = menu.lst @@ -26,7 +27,7 @@ pkgbase = grub source = grub-0.97-ldflags-objcopy-remove-build-id.patch sha1sums = 2580626c4579bd99336d3af4482c346c95dac4fb sha1sums = 33d43d48000b2027f9baec8fc99d33e0c4500c96 - sha1sums = e88a68204c9c9d4bd0b50fa11cab789df4ac55f8 + sha1sums = 60e8f7e4c113b85165fd5d9cd724e8413a337a12 sha1sums = 157b81dbad3576536b08642242accfa1aeb093a9 sha1sums = adbb4685c98797ffb4dc83561ec75698991dddbd sha1sums = f2e0dff29a7c8a45e90aa07298a1b2a9a9d29afc @@ -3,13 +3,14 @@ pkgname=grub pkgver=0.97 -pkgrel=19 +pkgrel=20 pkgdesc="A GNU multiboot boot loader" arch=('i686' 'x86_64') license=('GPL') url="http://www.gnu.org/software/grub/" groups=('base') depends=('ncurses' 'diffutils' 'sed') +optdepends=('xfsprogs: freezing of xfs /boot in install-grub script') source=(ftp://alpha.gnu.org/gnu/grub/grub-$pkgver.tar.gz menu.lst install-grub @@ -26,7 +27,7 @@ backup=('boot/grub/menu.lst') install=grub.install sha1sums=('2580626c4579bd99336d3af4482c346c95dac4fb' '33d43d48000b2027f9baec8fc99d33e0c4500c96' - 'e88a68204c9c9d4bd0b50fa11cab789df4ac55f8' + '60e8f7e4c113b85165fd5d9cd724e8413a337a12' '157b81dbad3576536b08642242accfa1aeb093a9' 'adbb4685c98797ffb4dc83561ec75698991dddbd' 'f2e0dff29a7c8a45e90aa07298a1b2a9a9d29afc' @@ -37,7 +38,6 @@ sha1sums=('2580626c4579bd99336d3af4482c346c95dac4fb' 'a36f34e51efed540f1ddafd78e9c9f6d83e4c8d4' '61c4b58d2eaa3c1561d8e9d8fc41341ce8882869') - #set destination architecture here DESTARCH="i686" #DESTARCH="x86_64" @@ -80,10 +80,10 @@ build() { patch -Np1 -i ../040_all_grub-0.96-nxstack.patch # patch from frugalware to make it boot when more than 2GB ram installed patch -Np1 -i ../05-grub-0.97-initrdaddr.diff - CFLAGS="-static" ./configure --prefix=/usr --bindir=/bin --sbindir=/sbin \ + CFLAGS="-static -fno-strict-aliasing" ./configure --prefix=/usr --bindir=/bin --sbindir=/sbin \ --mandir=/usr/share/man --infodir=/usr/share/info else - CFLAGS= ./configure --prefix=/usr --bindir=/bin --sbindir=/sbin \ + CFLAGS="-fno-strict-aliasing" ./configure --prefix=/usr --bindir=/bin --sbindir=/sbin \ --mandir=/usr/share/man --infodir=/usr/share/info fi fi diff --git a/install-grub b/install-grub index a1b4e56fa408..70b06600b202 100755 --- a/install-grub +++ b/install-grub @@ -160,8 +160,8 @@ dogrub() { # freeze xfs filesystems to enable grub installation on xfs filesystems if [ -x /usr/sbin/xfs_freeze ]; then - /usr/sbin/xfs_freeze -f /boot > /dev/null 2>&1 - /usr/sbin/xfs_freeze -f / > /dev/null 2>&1 + [ "$(stat -fLc %T /boot)" == "xfs" ] && /usr/sbin/xfs_freeze -f /boot > /dev/null 2>&1 + [ "$(stat -fLc %T /)" == "xfs" ] && /usr/sbin/xfs_freeze -f / > /dev/null 2>&1 fi # look for a separately-mounted /boot partition @@ -187,8 +187,8 @@ EOF # unfreeze xfs filesystems if [ -x /usr/sbin/xfs_freeze ]; then - /usr/sbin/xfs_freeze -u /boot > /dev/null 2>&1 - /usr/sbin/xfs_freeze -u / > /dev/null 2>&1 + [ "$(stat -fLc %T /boot)" == "xfs" ] && /usr/sbin/xfs_freeze -u /boot > /dev/null 2>&1 + [ "$(stat -fLc %T /)" == "xfs" ] && /usr/sbin/xfs_freeze -u / > /dev/null 2>&1 fi if grep "Error [0-9]*: " /tmp/grub.log >/dev/null; then echo "Error installing GRUB. (see /tmp/grub.log for output)" |