diff options
Diffstat (limited to 'scripts')
| -rwxr-xr-x | scripts/buildinstall | 16 | ||||
| -rwxr-xr-x | scripts/mk-images | 8 |
2 files changed, 19 insertions, 5 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" diff --git a/scripts/mk-images b/scripts/mk-images index 66345ad23..857ae923b 100755 --- a/scripts/mk-images +++ b/scripts/mk-images @@ -15,11 +15,14 @@ if [ "$1" == "--debug" ]; then shift fi -if [ -z "$1" -o -z "$2" -o -z "$3" -o -z "$4" -o -z "$5" -o -z "$6" -o -z "$7" ]; then usage; fi +if [ -z "$1" -o -z "$2" -o -z "$3" -o -z "$4" -o -z "$5" -o -z "$6" -o -z "$7" -o -z "$8" ]; then usage; fi PRODUCT=$6 VERSION=$7 PRODUCTPATH=$8 +if [ -n "$9" ]; then + BUGURL=$9 +fi TOPDIR=$(echo $0 | sed "s,/[^/]*$,,") if [ $TOPDIR = $0 ]; then @@ -366,6 +369,9 @@ makeproductfile() { echo $PRODUCT >> $root/.buildstamp echo $VERSION >> $root/.buildstamp echo $PRODUCTPATH >> $root/.buildstamp + if [ -n "$BUGURL" ]; then + echo $BUGURL >> $root/.buildstamp + fi } setupShellEnvironment() { |