diff options
| author | Jeremy Katz <katzj@redhat.com> | 2008-02-13 13:42:58 -0500 |
|---|---|---|
| committer | Jeremy Katz <katzj@redhat.com> | 2008-02-14 17:10:41 -0500 |
| commit | 6e1f8c1bf77517dd05bdc11b8bc1475e6d078d20 (patch) | |
| tree | 225e4009c14e89a88380d65a83ca5177b88b061b /scripts | |
| parent | eb027d4fcbd08e65b16f170278d968584db308e7 (diff) | |
| download | anaconda-6e1f8c1bf77517dd05bdc11b8bc1475e6d078d20.tar.gz anaconda-6e1f8c1bf77517dd05bdc11b8bc1475e6d078d20.tar.xz anaconda-6e1f8c1bf77517dd05bdc11b8bc1475e6d078d20.zip | |
Remove some unused options (--discs and --buildinstdir)
Diffstat (limited to 'scripts')
| -rwxr-xr-x | scripts/buildinstall | 47 |
1 files changed, 21 insertions, 26 deletions
diff --git a/scripts/buildinstall b/scripts/buildinstall index aafcb9712..3a3e5cc56 100755 --- a/scripts/buildinstall +++ b/scripts/buildinstall @@ -27,6 +27,17 @@ PRODUCTPATH="anaconda" while [ $# -gt 0 ]; do case $1 in + # general options affecting how we build things + --nogr) + NOGRSTR="--nogr" + shift + ;; + --debug) + DEBUGSTR="--debug" + shift + ;; + + # release information --version) VERSION=$2 shift; shift @@ -43,30 +54,18 @@ while [ $# -gt 0 ]; do VARIANT=$2 shift; shift ;; - --prodpath) - PRODUCTPATH=$2 - shift; shift - ;; - --nogr) - NOGRSTR="--nogr" - shift - ;; - --debug) - DEBUGSTR="--debug" - shift - ;; - --buildinstdir) - BUILDINSTDIR=$2 - shift; shift - ;; - --discs) - DISCSTR=$2 - shift; shift - ;; --bugurl) BUGURL=$2 shift; shift ;; + + + # where to find the packages so that we can find anaconda-runtime + --prodpath) + PRODUCTPATH=$2 + shift; shift + ;; + *) DIR=$1 shift @@ -90,10 +89,6 @@ if [ -z "$RELEASESTR" ]; then usage fi -if [ -z "$DISCSTR" ]; then - DISCSTR="ALL" -fi - if [ -z "$BUGURL" ]; then BUGURL="your distribution provided bug reporting tool." fi @@ -102,7 +97,7 @@ p=`cd $DIR; /bin/pwd` PKGDIR=$p/$PRODUCTPATH if [ -z "$BUILDINSTDIR" ]; then - BUILDINSTDIR=$p/buildinstall.tree.$$ + BUILDINSTDIR=${TMPDIR:-/tmp}/buildinstall.tree.$$ rm -rf $BUILDINSTDIR mkdir -p $BUILDINSTDIR fi @@ -152,6 +147,6 @@ echo "Making images..." $MK_IMAGES $DEBUGSTR $NOGRSTR $PKGDIR $p $TREEDIR/image-template $TREEDIR/instimage $BUILDARCH "$PRODUCTSTR" $VERSION $PRODUCTPATH "$BUGURL" echo "Writing .discinfo file" -$MK_STAMP --releasestr="$RELEASESTR" --arch=$BUILDARCH --discNum="$DISCSTR" --baseDir=$PRODUCTPATH/base --packagesDir=$PKGDIR --pixmapsDir=$PRODUCTPATH/pixmaps --outfile=$p/.discinfo +$MK_STAMP --releasestr="$RELEASESTR" --arch=$BUILDARCH --discNum="ALL" --baseDir=$PRODUCTPATH/base --packagesDir=$PKGDIR --pixmapsDir=$PRODUCTPATH/pixmaps --outfile=$p/.discinfo rm -rf $TREEDIR/image-template $TREEDIR/instimage $BUILDINSTDIR |