Really reflecting the last modifications to build.sh

This commit is contained in:
Pierre Pronchery 2010-01-15 22:26:28 +00:00
parent 5c08379368
commit bfff596d9d

View File

@ -5,11 +5,20 @@
#variables #variables
[ -z "$ARCH" ] && ARCH=`uname -m` [ -z "$ARCH" ] && ARCH=`uname -m`
case "$ARCH" in
i486|i586|i686)
ARCH="i386"
;;
x86_64)
ARCH="amd64"
;;
esac
[ -z "$CVSROOT" ] && CVSROOT=":pserver:anonymous@anoncvs.defora.org:/Data/CVS" [ -z "$CVSROOT" ] && CVSROOT=":pserver:anonymous@anoncvs.defora.org:/Data/CVS"
[ -z "$OS" ] && OS=`uname -s` [ -z "$OS" ] && OS=`uname -s`
#private #private
DESTDIR="/var/www/htdocs/download/snapshots" DESTDIR="/var/www/htdocs/download/snapshots"
DEVNULL="/dev/null" DEVNULL="/dev/null"
FILE="DeforaOS-daily.iso"
MODULE="DeforaOS" MODULE="DeforaOS"
PREFIX="/usr" PREFIX="/usr"
SRC="$HOME/build/$OS-$ARCH" SRC="$HOME/build/$OS-$ARCH"
@ -17,6 +26,7 @@ DST="$HOME/destdir/$OS-$ARCH"
#executables #executables
CP="cp -f" CP="cp -f"
CONFIGURE="Apps/Devel/src/configure/src/configure -O DeforaOS"
CVS="cvs -q" CVS="cvs -q"
MAKE="make" MAKE="make"
MKDIR="mkdir -p" MKDIR="mkdir -p"
@ -37,16 +47,6 @@ error()
#main #main
#check variables
case "$ARCH" in
i*86)
ARCH="i386"
;;
x86_64)
ARCH="amd64"
;;
esac
#configure cvs if necessary #configure cvs if necessary
[ ! -f "$HOME/.cvspass" ] && touch "$HOME/.cvspass" [ ! -f "$HOME/.cvspass" ] && touch "$HOME/.cvspass"
@ -67,22 +67,23 @@ $MKDIR "$DST" || error
echo "" echo ""
echo "Configuring CVS module $MODULE:" echo "Configuring CVS module $MODULE:"
cd "$SRC" || error cd "$SRC" || error
$MAKE DESTDIR="$DST" < "$DEVNULL" || error $MAKE DESTDIR="$DST" PREFIX="$PREFIX" bootstrap < "$DEVNULL" || error
#build #build
echo "" echo ""
echo "Building CVS module $MODULE:" echo "Building CVS module $MODULE:"
./build.sh MAKE="$MAKE" DESTDIR="$DST" PREFIX="$PREFIX" install || error ./build.sh CONFIGURE="$CONFIGURE" MAKE="$MAKE" DESTDIR="$DST" PREFIX="$PREFIX" \
all || error
#create CD-ROM image #create CD-ROM image
echo "" echo ""
echo "Creating CD-ROM image:" echo "Creating CD-ROM image:"
./build.sh MAKE="$MAKE" DESTDIR="$DST" PREFIX="$PREFIX" \ ./build.sh CONFIGURE="$CONFIGURE" MAKE="$MAKE" DESTDIR="$DST" PREFIX="$PREFIX" \
IMAGE_TYPE="ramdisk" IMAGE_FILE="initrd.img" IMAGE_SIZE=8192 \ IMAGE_TYPE="ramdisk" IMAGE_FILE="initrd.img" IMAGE_SIZE=8192 \
IMAGE_MODULES="/usr/src/linux-2.4.37/modules-ramdisk.tgz" \ IMAGE_MODULES="/usr/src/linux-2.4.37/modules-ramdisk.tgz" \
image || error image || error
$RM -r "$DST" $RM -r "$DST"
./build.sh MAKE="$MAKE" DESTDIR="$DST" PREFIX="$PREFIX" \ ./build.sh CONFIGURE="$CONFIGURE" MAKE="$MAKE" DESTDIR="$DST" PREFIX="$PREFIX" \
IMAGE_TYPE="iso" \ IMAGE_TYPE="iso" \
IMAGE_FILE="DeforaOS-daily.iso" \ IMAGE_FILE="DeforaOS-daily.iso" \
IMAGE_KERNEL="/usr/src/linux-2.4.37/arch/i386/boot/bzImage" \ IMAGE_KERNEL="/usr/src/linux-2.4.37/arch/i386/boot/bzImage" \
@ -90,8 +91,8 @@ $RM -r "$DST"
IMAGE_RAMDISK="initrd.img" \ IMAGE_RAMDISK="initrd.img" \
KERNEL_ARGS="vga=0x301 rw" \ KERNEL_ARGS="vga=0x301 rw" \
image || error image || error
$CP "DeforaOS-daily.iso" "$DESTDIR" || error $CP "$FILE" "$DESTDIR" || error
echo "http://www.defora.org/download/snapshots/DeforaOS-daily.tar.gz" echo "http://www.defora.org/download/snapshots/$FILE"
#cleanup #cleanup
$RM -r "$SRC" $RM -r "$SRC"