Alexander/grub-luks2-improved-stable
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

upgpkg: 0.97-20

Browse Source 
FS#25442 grub-install doesn't work on i686; add xfsprogs to optdepends and add check for it in install-grub script
This commit is contained in:
Ronald van Haren 2011-08-08 17:30:51 +00:00
parent 5d98dd0d5a
commit c8d4b86548
2 changed files with 9 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
PKGBUILD
View File

@ -2,13 +2,14 @@
pkgname=grub pkgname=grub
pkgver=0.97 pkgver=0.97
pkgrel=19 pkgrel=20
pkgdesc="A GNU multiboot boot loader" pkgdesc="A GNU multiboot boot loader"
arch=('i686' 'x86_64') arch=('i686' 'x86_64')
license=('GPL') license=('GPL')
url="http://www.gnu.org/software/grub/" url="http://www.gnu.org/software/grub/"
groups=('base') groups=('base')
depends=('ncurses' 'diffutils' 'sed') 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 source=(ftp://alpha.gnu.org/gnu/grub/grub-$pkgver.tar.gz
menu.lst menu.lst
install-grub install-grub
@ -25,7 +26,7 @@ backup=('boot/grub/menu.lst')
install=grub.install install=grub.install
sha1sums=('2580626c4579bd99336d3af4482c346c95dac4fb' sha1sums=('2580626c4579bd99336d3af4482c346c95dac4fb'
'33d43d48000b2027f9baec8fc99d33e0c4500c96' '33d43d48000b2027f9baec8fc99d33e0c4500c96'
'e88a68204c9c9d4bd0b50fa11cab789df4ac55f8' '60e8f7e4c113b85165fd5d9cd724e8413a337a12'
'157b81dbad3576536b08642242accfa1aeb093a9' '157b81dbad3576536b08642242accfa1aeb093a9'
'adbb4685c98797ffb4dc83561ec75698991dddbd' 'adbb4685c98797ffb4dc83561ec75698991dddbd'
'f2e0dff29a7c8a45e90aa07298a1b2a9a9d29afc' 'f2e0dff29a7c8a45e90aa07298a1b2a9a9d29afc'
@ -36,7 +37,6 @@ sha1sums=('2580626c4579bd99336d3af4482c346c95dac4fb'
'a36f34e51efed540f1ddafd78e9c9f6d83e4c8d4' 'a36f34e51efed540f1ddafd78e9c9f6d83e4c8d4'
'61c4b58d2eaa3c1561d8e9d8fc41341ce8882869') '61c4b58d2eaa3c1561d8e9d8fc41341ce8882869')
#set destination architecture here #set destination architecture here
DESTARCH="i686" DESTARCH="i686"
#DESTARCH="x86_64" #DESTARCH="x86_64"
@ -79,10 +79,10 @@ build() {
patch -Np1 -i ../040_all_grub-0.96-nxstack.patch patch -Np1 -i ../040_all_grub-0.96-nxstack.patch
# patch from frugalware to make it boot when more than 2GB ram installed # patch from frugalware to make it boot when more than 2GB ram installed
patch -Np1 -i ../05-grub-0.97-initrdaddr.diff 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 --mandir=/usr/share/man --infodir=/usr/share/info
else 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 --mandir=/usr/share/man --infodir=/usr/share/info
fi fi
fi fi

8
install-grub
View File

@ -160,8 +160,8 @@ dogrub() {
# freeze xfs filesystems to enable grub installation on xfs filesystems # freeze xfs filesystems to enable grub installation on xfs filesystems
if [ -x /usr/sbin/xfs_freeze ]; then if [ -x /usr/sbin/xfs_freeze ]; then
/usr/sbin/xfs_freeze -f /boot > /dev/null 2>&1 [ "$(stat -fLc %T /boot)" == "xfs" ] && /usr/sbin/xfs_freeze -f /boot > /dev/null 2>&1
/usr/sbin/xfs_freeze -f / > /dev/null 2>&1 [ "$(stat -fLc %T /)" == "xfs" ] && /usr/sbin/xfs_freeze -f / > /dev/null 2>&1
fi fi
# look for a separately-mounted /boot partition # look for a separately-mounted /boot partition
@ -187,8 +187,8 @@ EOF
# unfreeze xfs filesystems # unfreeze xfs filesystems
if [ -x /usr/sbin/xfs_freeze ]; then if [ -x /usr/sbin/xfs_freeze ]; then
/usr/sbin/xfs_freeze -u /boot > /dev/null 2>&1 [ "$(stat -fLc %T /boot)" == "xfs" ] && /usr/sbin/xfs_freeze -u /boot > /dev/null 2>&1
/usr/sbin/xfs_freeze -u / > /dev/null 2>&1 [ "$(stat -fLc %T /)" == "xfs" ] && /usr/sbin/xfs_freeze -u / > /dev/null 2>&1
fi fi
if grep "Error [0-9]*: " /tmp/grub.log >/dev/null; then if grep "Error [0-9]*: " /tmp/grub.log >/dev/null; then
echo "Error installing GRUB. (see /tmp/grub.log for output)" echo "Error installing GRUB. (see /tmp/grub.log for output)"