diff options
| author | Jeremy Katz <katzj@redhat.com> | 2008-02-13 12:01:40 -0500 |
|---|---|---|
| committer | Jeremy Katz <katzj@redhat.com> | 2008-02-14 17:01:20 -0500 |
| commit | a83875b5866cf721378d7b555df302424a46c69f (patch) | |
| tree | 526c5472051540404e511c1d5682bc3b58cda67b /scripts/buildinstall | |
| parent | e2fc13b2e0099b6aaabf9cbc6fb8cb219397d99f (diff) | |
| download | anaconda-a83875b5866cf721378d7b555df302424a46c69f.tar.gz anaconda-a83875b5866cf721378d7b555df302424a46c69f.tar.xz anaconda-a83875b5866cf721378d7b555df302424a46c69f.zip | |
Don't run pkgorder as a part of buildinstall anymore
Diffstat (limited to 'scripts/buildinstall')
| -rwxr-xr-x | scripts/buildinstall | 13 |
1 files changed, 1 insertions, 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 <version> --product <product> --release <comment> [--pkgorder <file>] [--prodpath <path>] [--discs <discstring>] <root>" >&2 + echo "Usage: buildinstall --version <version> --product <product> --release <comment> [--prodpath <path>] [--discs <discstring>] <root>" >&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 |