diff options
| author | Martin Sivak <msivak@redhat.com> | 2007-11-20 14:20:06 +0100 |
|---|---|---|
| committer | Martin Sivak <msivak@redhat.com> | 2007-11-20 14:20:06 +0100 |
| commit | 8905e5d37edca1f84f85a4e0e35767ff76b58c45 (patch) | |
| tree | 6fc9a2ff4ad1c48a054df1b6787edd3453189913 | |
| parent | 0e1b5ac4e3b77b93b4a0d9730ecc9953c78ee08f (diff) | |
| download | anaconda-8905e5d37edca1f84f85a4e0e35767ff76b58c45.tar.gz anaconda-8905e5d37edca1f84f85a4e0e35767ff76b58c45.tar.xz anaconda-8905e5d37edca1f84f85a4e0e35767ff76b58c45.zip | |
Add option for selecting different comps file, than the hardcoded one (#352081)
| -rwxr-xr-x | scripts/buildinstall | 12 |
1 files changed, 10 insertions, 2 deletions
diff --git a/scripts/buildinstall b/scripts/buildinstall index e785d753b..06e637bc4 100755 --- a/scripts/buildinstall +++ b/scripts/buildinstall @@ -1,7 +1,7 @@ #!/bin/bash usage() { - echo "Usage: buildinstall [--pkgorder <file>] [--version <version>] [--product <product>] [--release <comment>] [--prodpath <path>] [--discs <discstring>] <root>" >&2 + echo "Usage: buildinstall [--pkgorder <file>] [--comps <file>] [--version <version>] [--product <product>] [--release <comment>] [--prodpath <path>] [--discs <discstring>] <root>" >&2 exit 1 } @@ -18,6 +18,10 @@ while [ $# -gt 0 ]; do COMPNAME=$2 shift; shift ;; + --comps) + COMPSFILE=$2 + shift; shift + ;; --version) VERSION=$2 shift; shift @@ -89,6 +93,10 @@ if [ -z "$BUGURL" ]; then BUGURL="your distribution provided bug reporting tool." fi +if [ -z "$COMPSFILE" ]; then + COMPSFILE="$PRODUCTPATH/base/comps.xml" +fi + p=`cd $DIR; /bin/pwd` if [ -d $DIR/$PRODUCTPATH/RPMS ]; then PKGDIR=$p/$PRODUCTPATH/RPMS @@ -141,7 +149,7 @@ echo "Building images..." $UPD_INSTROOT $DEBUGSTR $NOGRSTR $PKGDIR $TREEDIR/image-template $TREEDIR/instimage echo "Creating repository metadata..." -createrepo -g $PRODUCTPATH/base/comps.xml -q $p +createrepo -g "$COMPSFILE" -q $p if [ -n "$PKGORDER" ]; then echo "Getting package order..." |