Update of /cvsroot/devil-linux/build/scripts
In directory vz-cvs-3.sog:/tmp/cvs-serv28462/scripts
Modified Files:
grub
Log Message:
updated grub to 1.99
Index: grub
===================================================================
RCS file: /cvsroot/devil-linux/build/scripts/grub,v
retrieving revision 1.23
retrieving revision 1.24
diff -u -d -r1.23 -r1.24
--- grub 5 Dec 2011 09:11:38 -0000 1.23
+++ grub 8 Dec 2011 19:24:31 -0000 1.24
@@ -16,13 +16,6 @@
MYNAME="GRUB"
-# currently doesn't work on 64 bit
-# no clue why, things should be fine
-# even new version doesn't work
-if [ "$CONFIG_CPU" = "x86_64" ]; then
- exit 0
-fi
-
case $1 in
build )
patch_from_dir ../grub-patches
@@ -30,29 +23,20 @@
if [ "$CONFIG_GCC_HARDENED" = "y" ]; then
export CC="gcc -fno-stack-protector -fno-pic -fno-pie -nopie"
fi
- export CFLAGS="-static ${CFLAGS}"
- aclocal
- automake
- autoconf
- ./configure --prefix=/usr --sbindir=/sbin --disable-auto-linux-mem-opt
-
+ unset CFLAGS
+ unset CXXFLAGS
+ ./configure --prefix=/usr --sbindir=/sbin --sysconfdir=/etc --disable-nls || exit 1
make $PMAKE || exit 1
- pushd grub > /dev/null || exit 1
- rm -f grub
- make $PMAKE LDFLAGS="-static -Wl,-z,noexecstack" || exit 1
- popd > /dev/null || exit 1
-
;;
install )
rm -rf $TMPDIR || exit 1
mkdir -p $TMPDIR || exit 1
make install DESTDIR=$TMPDIR || exit 1
- paxctl -p -s -m -x -e -r $TMPDIR/sbin/grub || exit 1
copy_docs $TMPDIR
- mkdir -p $CDDIR/sbin
- cp -dpvR $TMPDIR/sbin/* $CDDIR/sbin/ || exit 1
- cp -dpvR $TMPDIR/usr/lib $CDDIR/usr/ || exit 1
+ cp -dpvR $TMPDIR/etc/* $ETCDIR/etc/ || exit 1
+ rm -rf $TMPDIR/etc
+ cp -dpvR $TMPDIR/* $CDDIR/ || exit 1
mkdir -p $CDDIR/boot/grub
cp -dpvR $TMPDIR/usr/lib/grub/i386-pc/* $CDDIR/boot/grub/ || exit 1
cp -p $DL_DIR/other/devil-linux.xpm.gz $CDDIR/boot/grub/ || exit 1
|
