version files on the boot cd always end with the major/minor numbers (easier
parsing)
- remove ability to specify output iso name, build it from the version info
BUILD_DIR=build/
BOOTCD_VERSION="3.0-beta0.4"
BUILD_DIR=build/
BOOTCD_VERSION="3.0-beta0.4"
-FULL_VERSION_STRING="PlanetLab BootCD $BOOTCD_VERSION"
-
+FULL_VERSION_STRING="PlanetLab BootCD"
+OUTPUT_IMAGE_NAME='PlanetLab-BootCD'
+
SYSLINUX_SRC=sources/syslinux-2.11.tar.bz2
BOOTCD_YUM_GROUP=BootCD
SYSLINUX_SRC=sources/syslinux-2.11.tar.bz2
BOOTCD_YUM_GROUP=BootCD
. $CURRENT_CONFIG_DIR/configuration
# setup vars for this configuration
. $CURRENT_CONFIG_DIR/configuration
# setup vars for this configuration
+
+ # version string for this build
if [[ ! -z "$EXTRA_VERSION" ]]; then
if [[ ! -z "$EXTRA_VERSION" ]]; then
- FULL_VERSION_STRING="$FULL_VERSION_STRING-$EXTRA_VERSION"
+ FULL_VERSION_STRING="$FULL_VERSION_STRING $EXTRA_VERSION"
+ FULL_VERSION_STRING="$FULL_VERSION_STRING $BOOTCD_VERSION"
+ if [[ ! -z "$EXTRA_VERSION" ]]; then
+ OUTPUT_IMAGE_NAME="$OUTPUT_IMAGE_NAME-$EXTRA_VERSION"
+ fi
+ OUTPUT_IMAGE_NAME="$OUTPUT_IMAGE_NAME-$BOOTCD_VERSION"
+
+ # setup build directories
BUILD_DIR=build/$configuration
mkdir -p $BUILD_DIR
ISO=$BUILD_DIR/`echo $OUTPUT_IMAGE_NAME | sed -e "s/%version/$BOOTCD_VERSION/"`.iso
BUILD_DIR=build/$configuration
mkdir -p $BUILD_DIR
ISO=$BUILD_DIR/`echo $OUTPUT_IMAGE_NAME | sed -e "s/%version/$BOOTCD_VERSION/"`.iso
CD_ROOT=`pwd`/$BUILD_DIR/cdroot
mkdir -p $CD_ROOT
CD_ROOT=`pwd`/$BUILD_DIR/cdroot
mkdir -p $CD_ROOT
-# the name of the cd image. %version is replaced with the current
-# cd version (from build.sh)
-OUTPUT_IMAGE_NAME='PlanetLab-BootCD-%version'
-
# extra version, if set, is added to end of version.
EXTRA_VERSION=
# extra version, if set, is added to end of version.
EXTRA_VERSION=