From a83875b5866cf721378d7b555df302424a46c69f Mon Sep 17 00:00:00 2001 From: Jeremy Katz Date: Wed, 13 Feb 2008 12:01:40 -0500 Subject: Don't run pkgorder as a part of buildinstall anymore --- scripts/buildinstall | 13 +------------ 1 file changed, 1 insertion(+), 12 deletions(-) diff --git a/scripts/buildinstall b/scripts/buildinstall index c8ebe0c4f..7144afdbe 100755 --- a/scripts/buildinstall +++ b/scripts/buildinstall @@ -19,7 +19,7 @@ # usage() { - echo "Usage: buildinstall --version --product --release [--pkgorder ] [--prodpath ] [--discs ] " >&2 + echo "Usage: buildinstall --version --product --release [--prodpath ] [--discs ] " >&2 exit 1 } @@ -27,11 +27,6 @@ PRODUCTPATH="anaconda" while [ $# -gt 0 ]; do case $1 in - --pkgorder) - PKGORDER=$2 - PKGORDERSTR="--pkgorder $2" - shift; shift - ;; --comp) COMPNAME=$2 shift; shift @@ -154,12 +149,6 @@ BUILDINSTALL=$BUILDINSTDIR/buildinstall echo "Building images..." $UPD_INSTROOT $DEBUGSTR $NOGRSTR $PKGDIR $TREEDIR/image-template $TREEDIR/instimage $p -if [ -n "$PKGORDER" ]; then - echo "Getting package order..." - echo "PYTHONPATH=$TREEDIR/instimage/usr/lib/anaconda $TREEDIR/instimage/usr/lib/anaconda-runtime/pkgorder $p $BUILDARCH $PRODUCTPATH" - PYTHONPATH=$TREEDIR/instimage/usr/lib/anaconda $TREEDIR/instimage/usr/lib/anaconda-runtime/pkgorder $p $BUILDARCH $PRODUCTPATH > $PKGORDER -fi - echo "Writing .treeinfo file..." $MK_TREEINFO --family="$PRODUCTSTR" ${VARIANT:+--variant="$VARIANT"} --version=$VERSION --arch=$BUILDARCH --packagedir=${PKGDIR#$p/} --outfile=$p/.treeinfo -- cgit