diff options
| author | Matt Wilson <msw@redhat.com> | 2000-06-14 06:18:59 +0000 |
|---|---|---|
| committer | Matt Wilson <msw@redhat.com> | 2000-06-14 06:18:59 +0000 |
| commit | f6650c9f9bd202de48384e4c2b6573e2e8ba346e (patch) | |
| tree | 50d3d89c2d26d84caeac5730db7f40a90cda0355 /scripts | |
| parent | 3bc12f7d7252c2e152eab3081027c1f801d0a367 (diff) | |
| download | anaconda-f6650c9f9bd202de48384e4c2b6573e2e8ba346e.tar.gz anaconda-f6650c9f9bd202de48384e4c2b6573e2e8ba346e.tar.xz anaconda-f6650c9f9bd202de48384e4c2b6573e2e8ba346e.zip | |
tighten down the packages we're dealing with here
Diffstat (limited to 'scripts')
| -rwxr-xr-x | scripts/buildinstall | 5 | ||||
| -rwxr-xr-x | scripts/upd-instroot | 5 |
2 files changed, 5 insertions, 5 deletions
diff --git a/scripts/buildinstall b/scripts/buildinstall index 91d1bedff..0c398abcc 100755 --- a/scripts/buildinstall +++ b/scripts/buildinstall @@ -37,13 +37,14 @@ else fi MK_IMAGES=$BUILDINSTDIR/mk-images +echo "Building images..." +$UPD_INSTROOT $p/RedHat/RPMS $p/image-template $p/RedHat/instimage + # XXX hack - msw if [ $BUILDARCH = "sparc" ]; then BUILDARCH=sparc64 fi -echo "Building images..." -$UPD_INSTROOT $p/RedHat/RPMS $p/image-template $p/RedHat/instimage $BUILDARCH if [ -x /usr/bin/runroot ]; then runroot dist-7.0 --arch $BUILDARCH "cd $BUILDINSTDIR\; ./mk-images $p/RedHat/RPMS $p $p/image-template $BUILDARCH" else diff --git a/scripts/upd-instroot b/scripts/upd-instroot index a74b87aff..cef866300 100755 --- a/scripts/upd-instroot +++ b/scripts/upd-instroot @@ -5,7 +5,7 @@ ORIGDIR=`pwd` if [ -z "$1" ]; then echo "upd-instroot: updates instimage from a Red Hat RPMS directory" - echo "usage: $0 <packagedir> [<targetdir>]" + echo "usage: $0 <packagedir> [templatedir] [instroot]" exit 1 fi @@ -35,7 +35,7 @@ prunePackageList() { PACKAGEFILES="" for PKG in $PACKAGES; do PATTERN="${PATTERN:+${PATTERN}|}(^$PKG )" - PACKAGEFILES="$PACKAGEFILES $(ls $PACKAGEPATH/${PKG}*)" + PACKAGEFILES="$PACKAGEFILES $(ls $PACKAGEPATH/${PKG}*{${ARCH},noarch}.rpm)" done # gtk+, enough said PATTERN=$(echo $PATTERN | sed 's,[\+\*],\\&,g') @@ -73,7 +73,6 @@ else DESTGR=$3 fi - rm -rf $DEST $DESTGR mkdir -p $DEST mkdir -p $DESTGR |