summaryrefslogtreecommitdiffstats
path: root/base
diff options
context:
space:
mode:
authorThierry N <thierryn1 at hispeed dot ch>2009-09-29 22:25:04 +0200
committerThierry N <thierryn1 at hispeed dot ch>2009-09-29 22:25:04 +0200
commitdb1a4fad0b393a13b038f2f07106df13f9ef1c3c (patch)
tree4714dc25bc54bf0d418cd38f70c6b832bb362949 /base
parentb5e9ff0e7ecc1aa1d035002858aea4df08c86ad8 (diff)
downloadnutyx-extra-db1a4fad0b393a13b038f2f07106df13f9ef1c3c.tar.gz
nutyx-extra-db1a4fad0b393a13b038f2f07106df13f9ef1c3c.tar.bz2
nutyx-extra-db1a4fad0b393a13b038f2f07106df13f9ef1c3c.tar.xz
nutyx-extra-db1a4fad0b393a13b038f2f07106df13f9ef1c3c.zip
grub, maj grub#0.97-4
Diffstat (limited to 'base')
-rw-r--r--base/grub/.footprint7
-rw-r--r--base/grub/.md5sum2
-rwxr-xr-xbase/grub/Pkgfile19
3 files changed, 11 insertions, 17 deletions
diff --git a/base/grub/.footprint b/base/grub/.footprint
index 6ccb28ba8..25bcfdf85 100644
--- a/base/grub/.footprint
+++ b/base/grub/.footprint
@@ -1,10 +1,3 @@
-drwxr-xr-x root/root boot/
-drwxr-xr-x root/root boot/grub/
--rw-r--r-- root/root boot/grub/e2fs_stage1_5
--rw-r--r-- root/root boot/grub/reiserfs_stage1_5
--rw-r--r-- root/root boot/grub/stage1
--rw-r--r-- root/root boot/grub/stage2
--rw-r--r-- root/root boot/message
drwxr-xr-x root/root usr/
drwxr-xr-x root/root usr/bin/
-rwxr-xr-x root/root usr/bin/mbchk
diff --git a/base/grub/.md5sum b/base/grub/.md5sum
index fe7251e07..57db19bda 100644
--- a/base/grub/.md5sum
+++ b/base/grub/.md5sum
@@ -4,6 +4,7 @@ f44bc6572e7af2e488e46d9b174caa4d bad-assert-sideeffect
6ebd162bfe44a8bd5b404ae85a3175e6 chainloader-devicefix
39e0f9a05b7e04aceb24fc7bc4893e3d ext4.patch
2482bef9c1866b4045767a56268ba673 grub-0.97-256byte_inode-1.patch
+9dbf5660cce3044dec91edee69cfe795 grub-0.97-btrfs-2.patch
40ddcc8caaef7e86b9dcb5c3799e0808 grub-0.97-devicemap.diff
bf1594e82940e25d089feca74c6f1879 grub-0.97-disk_geometry-1.patch
12f043616b51ce2ba82e46c9186a528d grub-0.97-graphics.patch
@@ -12,6 +13,5 @@ cd3f3eb54446be6003156158d51f4884 grub-0.97.tar.gz
bc609feede67ffcf3f4f9d00fa2995df grub-R
6547de447a98c12ff245f175f23a01a7 grub-a20.patch
e48ca6cdec7811a6d4566c0c1b0d7883 grub-gfxmenu-v8.diff
-f2cdde506d446113e04153e5695adb2a message
37558faaba7e32929f767ef64f4248ac reiser-unpack
b8b550b08b9e9eafd7031a1849fb7d02 use_ferror.diff
diff --git a/base/grub/Pkgfile b/base/grub/Pkgfile
index 512a0da8e..bf16bc3f2 100755
--- a/base/grub/Pkgfile
+++ b/base/grub/Pkgfile
@@ -6,7 +6,7 @@
name=grub
version=0.97
-release=3
+release=4
source=(ftp://alpha.gnu.org/gnu/$name/$name-$version.tar.gz\
http://www.linuxfromscratch.org/patches/lfs/development/grub-0.97-disk_geometry-1.patch \
http://www.linuxfromscratch.org/patches/lfs/development/grub-0.97-256byte_inode-1.patch \
@@ -21,10 +21,9 @@ source=(ftp://alpha.gnu.org/gnu/$name/$name-$version.tar.gz\
http://www.nutyx.org/files/patchs/grub/grub-gfxmenu-v8.diff \
http://www.nutyx.org/files/patchs/grub/grub-a20.patch \
http://www.nutyx.org/files/patchs/grub/ext4.patch \
+ http://www.nutyx.org/files/patchs/grub/grub-0.97-btrfs-2.patch \
http://aur.archlinux.org/packages/grub-gfxboot/grub-gfxboot/02-grub-$version-debugcdboot.patch\
- http://aur.archlinux.org/packages/grub-gfx/grub-gfx/grub-0.97-graphics.patch \
-
- message )
+ http://aur.archlinux.org/packages/grub-gfx/grub-gfx/grub-0.97-graphics.patch )
build() {
cd $name-$version
patch -Np1 -i ../$name-$version-path-patch
@@ -40,19 +39,21 @@ build() {
patch -Np1 -i ../$name-$version-256byte_inode-1.patch
patch -Np1 -i ../ext4.patch
+# patch -Np1 -i ../grub-0.97-btrfs-2.patch
unset CXXFLAGS
unset CFLAGS
+ if [ "`uname -m`" == "x86_64" ]; then
+ echo "Ce paquet doit être builder dans i686"
+ echo 'Ajouter CFLAGS="-static" avant ./configure'
+ echo 'CFLAGS="-static" ./configure --prefix=/usr'
+ exit 1
+ fi
./configure --prefix=/usr \
--mandir=/usr/share/man \
--infodir=/usr/share/info
make
make DESTDIR=$PKG install
- install -d $PKG/boot/grub
install -d $PKG/usr/share
- cp -v ../message $PKG/boot/
- cp -v $PKG/usr/lib/grub/i386-pc/stage{1,2} $PKG/boot/grub
- cp -v $PKG/usr/lib/grub/i386-pc/e2fs_stage1_5 $PKG/boot/grub
- cp -v $PKG/usr/lib/grub/i386-pc/reiserfs_stage1_5 $PKG/boot/grub
if [ -f $PKG/usr/share/info/dir ]; then
rm $PKG/usr/share/info/dir
fi