Attachment 152149 Details for Bug 235612 – simplify script args

[patch] simplify script args

anaconda-simpify-script-args.patch (text/plain), 3.61 KB, created by David Woodhouse on 2007-04-10 15:48:01 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: David Woodhouse

Created: 2007-04-10 15:48:01 UTC

Size: 3.61 KB

patch

obsolete

>? anaconda-simpify-script-args.patch
>Index: scripts/buildinstall
>===================================================================
>RCS file: /usr/local/CVS/anaconda/scripts/buildinstall,v
>retrieving revision 1.70
>diff -u -r1.70 buildinstall
>--- scripts/buildinstall	7 Mar 2007 22:51:22 -0000	1.70
>+++ scripts/buildinstall	10 Apr 2007 15:37:14 -0000
>@@ -140,7 +140,7 @@
> BUILDINSTALL=$BUILDINSTDIR/buildinstall
> 
> echo "Building images..."
>-$UPD_INSTROOT $DEBUGSTR $NOGRSTR $PKGDIR $TREEDIR/image-template $TREEDIR/instimage
>+$UPD_INSTROOT $DEBUGSTR $NOGRSTR $PKGDIR $TREEDIR
> 
> if [ -n "$PKGORDER" ]; then
>     echo "Getting package order..."
>@@ -152,9 +152,9 @@
> $MK_TREEINFO --family="$PRODUCTSTR" ${VARIANT:+--variant="$VARIANT"} --version=$VERSION --arch=$BUILDARCH --packagedir=${PKGDIR#$p/} --outfile=$p/.treeinfo
> 
> echo "Making images..."
>-$MK_IMAGES $DEBUGSTR $NOGRSTR $PKGDIR $p $TREEDIR/image-template $TREEDIR/instimage $BUILDARCH "$PRODUCTSTR" $VERSION $PRODUCTPATH "$BUGURL"
>+$MK_IMAGES $DEBUGSTR $NOGRSTR $PKGDIR $p $TREEDIR $BUILDARCH "$PRODUCTSTR" $VERSION $PRODUCTPATH "$BUGURL"
> 
> echo "Writing .discinfo file"
> $MK_STAMP --releasestr="$RELEASESTR" --arch=$BUILDARCH --discNum="$DISCSTR" --baseDir=$PRODUCTPATH/base --packagesDir=$PKGDIR --pixmapsDir=$PRODUCTPATH/pixmaps --outfile=$p/.discinfo
> 
>-rm -rf $TREEDIR/image-template $TREEDIR/instimage $BUILDINSTDIR
>+rm -rf $TREEDIR $BUILDINSTDIR
>Index: scripts/mk-images
>===================================================================
>RCS file: /usr/local/CVS/anaconda/scripts/mk-images,v
>retrieving revision 1.233
>diff -u -r1.233 mk-images
>--- scripts/mk-images	3 Apr 2007 19:21:29 -0000	1.233
>+++ scripts/mk-images	10 Apr 2007 15:37:14 -0000
>@@ -6,7 +6,7 @@
> TMPDIR=${TMPDIR:-/tmp}
> 
> usage () {
>-	echo "usage: mk-images <pkgsrc> <toplevel> <template> <imgdir> <buildarch> <productname> <version> [<productpath>]"
>+	echo "usage: mk-images <pkgsrc> <toplevel> <treedir> <buildarch> <productname> <version> [<productpath>]"
>     exit 0
> }
> 
>@@ -24,11 +24,11 @@
> 
> 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
>+PRODUCT=$5
>+VERSION=$6
>+PRODUCTPATH=$7
>+if [ -n "$8" ]; then
>+    BUGURL=$8
> fi
> 
> TOPDIR=$(echo $0 | sed "s,/[^/]*$,,")
>@@ -58,12 +58,13 @@
>     FULLMODPATH=$TMPDIR/instimagemods.$$
>     FINALFULLMODPATH=$4/modules
>     INSTIMGPATH=$TOPDESTPATH/images
>-    INSTIMGTEMPLATE=$3
>-    IMGPATH=$4
>+    TREEDIR=$3
>+    INSTIMGTEMPLATE=$TREEDIR/image-template
>+    IMGPATH=$TREEDIR/instimage
>     KERNELBASE=$TMPDIR/updboot.kernel.$$
>     MODDEPS=$KERNELBASE/moddeps
>     MODALIAS=$KERNELBASE/modules.alias
>-    BUILDARCH=$5
>+    BUILDARCH=$4
> 
>     KERNELNAME=vmlinuz
> 
>Index: scripts/upd-instroot
>===================================================================
>RCS file: /usr/local/CVS/anaconda/scripts/upd-instroot,v
>retrieving revision 1.544
>diff -u -r1.544 upd-instroot
>--- scripts/upd-instroot	23 Mar 2007 14:26:10 -0000	1.544
>+++ scripts/upd-instroot	10 Apr 2007 15:37:14 -0000
>@@ -16,7 +16,7 @@
> 
> if [ -z "$1" ]; then
> 	echo "upd-instroot: updates instimage from a Red Hat RPMS directory"
>-	echo "usage:        $0 <packagedir> [templatedir] [instroot]"
>+	echo "usage:        $0 <packagedir> [treedir]"
> 	exit 1
> fi
> 
>@@ -93,16 +93,13 @@
> }
> 
> if [ -z "$2" ]; then
>-    DEST=${TMPDIR:-/tmp}/upd-instroot
>+    TREEDIR=${TMPDIR:-/tmp}/treedir.$$
> else
>-    DEST=$2
>+    TREEDIR=$2
> fi
> 
>-if [ -z "$3" ]; then
>-    DESTGR=${TMPDIR:-/tmp}/upd-instroot
>-else
>-    DESTGR=$3
>-fi
>+DEST=$TREEDIR/image-template
>+DESTGR=$TREEDIR/instimage
> 
> rm -rf $DEST $DESTGR
> mkdir -p $DEST

Actions: View | Diff

Attachments on bug 235612: 151924 | 152087 | 152149 | 152193