diff options
| author | Jeremy Katz <katzj@redhat.com> | 2005-03-29 18:53:09 +0000 |
|---|---|---|
| committer | Jeremy Katz <katzj@redhat.com> | 2005-03-29 18:53:09 +0000 |
| commit | c5c389047f0895675c11746b7b8316826f99e4b8 (patch) | |
| tree | cc677be44e9d17ab88e1b9a3565970e528da17b6 /scripts/buildinstall | |
| parent | c311ba73990340f9036267d41b72c85c77624186 (diff) | |
| download | anaconda-c5c389047f0895675c11746b7b8316826f99e4b8.tar.gz anaconda-c5c389047f0895675c11746b7b8316826f99e4b8.tar.xz anaconda-c5c389047f0895675c11746b7b8316826f99e4b8.zip | |
2005-03-29 Jeremy Katz <katzj@redhat.com>
* product.py (bugUrl): Clean up .buildstamp reading, read in bug url
* constants.py (bugzillaUrl): Make bug url a per-product characteristic.
* scripts/buildinstall: Allow passing in bug url on the command
line.
* scripts/mk-images: Likewise, and use it to populate .buildstamp.
Diffstat (limited to 'scripts/buildinstall')
| -rwxr-xr-x | scripts/buildinstall | 16 |
1 files changed, 12 insertions, 4 deletions
diff --git a/scripts/buildinstall b/scripts/buildinstall index c63861adb..d7cf1a204 100755 --- a/scripts/buildinstall +++ b/scripts/buildinstall @@ -51,6 +51,10 @@ while [ $# -gt 0 ]; do DISCSTR=$2 shift; shift ;; + --bugurl) + BUGURL=$2 + shift; shift + ;; *) if [ -n "$DIR" -o ! -d $1/$PRODUCTPATH/RPMS ]; then usage @@ -81,6 +85,10 @@ if [ -z "$DISCSTR" ]; then DISCSTR="1,2,3" fi +if [ -z "$BUGURL" ]; then + BUGURL="your distribution provider's bug reporting tool." +fi + p=`cd $DIR; /bin/pwd` if [ -z "$BUILDINSTDIR" ]; then @@ -127,9 +135,9 @@ rm -rf $BUILDINSTDIR/usr echo "Going to run buildinstall again" # run it again for the second half if [ -x /usr/bin/runroot ]; then - runroot $COMPNAME --onlyone --arch $BUILDARCH "$BUILDINSTALL $DEBUGSTR --buildinstdir $BUILDINSTDIR --second $PKGORDERSTR --comp $COMPNAME --version $VERSION --release '\"$RELEASESTR\"' --product '\"$PRODUCTSTR\"' --prodpath $PRODUCTPATH --discs '\"$DISCSTR\"' $DIR" + runroot $COMPNAME --onlyone --arch $BUILDARCH "$BUILDINSTALL $DEBUGSTR --buildinstdir $BUILDINSTDIR --second $PKGORDERSTR --comp $COMPNAME --version $VERSION --release '\"$RELEASESTR\"' --product '\"$PRODUCTSTR\"' --prodpath $PRODUCTPATH --discs '\"$DISCSTR\"' --bugurl '\"$BUGURL\"' $DIR" else - $BUILDINSTALL $DEBUGSTR --buildinstdir $BUILDINSTDIR --second $PKGORDERSTR --comp $COMPNAME --version $VERSION --release "$RELEASESTR" --product "$PRODUCTSTR" --prodpath $PRODUCTPATH --discs "$DISCSTR" $DIR + $BUILDINSTALL $DEBUGSTR --buildinstdir $BUILDINSTDIR --second $PKGORDERSTR --comp $COMPNAME --version $VERSION --release "$RELEASESTR" --product "$PRODUCTSTR" --prodpath $PRODUCTPATH --discs "$DISCSTR" --bugurl "$BUGURL" $DIR fi rm -rf $BUILDINSTDIR @@ -155,9 +163,9 @@ fi echo "Making images..." if [ -x /usr/bin/runroot ]; then - runroot $COMPNAME --onlyone --arch $BUILDARCH "cd $BUILDINSTDIR\; ./mk-images $DEBUGSTR $p/$PRODUCTPATH/RPMS $p $TREEDIR/image-template $TREEDIR/instimage $BUILDARCH '\"$PRODUCTSTR\"' $VERSION $PRODUCTPATH" + runroot $COMPNAME --onlyone --arch $BUILDARCH "cd $BUILDINSTDIR\; ./mk-images $DEBUGSTR $p/$PRODUCTPATH/RPMS $p $TREEDIR/image-template $TREEDIR/instimage $BUILDARCH '\"$PRODUCTSTR\"' $VERSION $PRODUCTPATH '\"$BUGURL\"'" else - $MK_IMAGES $DEBUGSTR $p/$PRODUCTPATH/RPMS $p $TREEDIR/image-template $TREEDIR/instimage $BUILDARCH "$PRODUCTSTR" $VERSION $PRODUCTPATH + $MK_IMAGES $DEBUGSTR $p/$PRODUCTPATH/RPMS $p $TREEDIR/image-template $TREEDIR/instimage $BUILDARCH "$PRODUCTSTR" $VERSION $PRODUCTPATH "$BUGURL" fi echo "Writing .discinfo file" |