diff options
| author | Jeremy Katz <katzj@redhat.com> | 2003-06-23 19:02:38 +0000 |
|---|---|---|
| committer | Jeremy Katz <katzj@redhat.com> | 2003-06-23 19:02:38 +0000 |
| commit | c8c0190205336f69c1a94f890a28a3e040565a97 (patch) | |
| tree | e14cbf45307c02955d4e358dfb7e584026346953 /scripts | |
| parent | d1636e475e29facfa7c08db38d4845a9bfe682e7 (diff) | |
| download | anaconda-c8c0190205336f69c1a94f890a28a3e040565a97.tar.gz anaconda-c8c0190205336f69c1a94f890a28a3e040565a97.tar.xz anaconda-c8c0190205336f69c1a94f890a28a3e040565a97.zip | |
merge from taroon. highlights of this time around
* ppc boot constraints
* md5 endianness
* don't prompt to save tracebacks to a floppy without a floppy
* autopart for kickstart
* network configuration in the loader if vnc/display case
Diffstat (limited to 'scripts')
| -rwxr-xr-x | scripts/buildinstall | 3 | ||||
| -rw-r--r-- | scripts/mk-images.s390 | 2 | ||||
| -rwxr-xr-x | scripts/pkgorder | 4 | ||||
| -rw-r--r-- | scripts/splittree.py | 3 |
4 files changed, 7 insertions, 5 deletions
diff --git a/scripts/buildinstall b/scripts/buildinstall index 039477281..fbfb9d6cd 100755 --- a/scripts/buildinstall +++ b/scripts/buildinstall @@ -119,6 +119,8 @@ if [ -x /usr/bin/runroot ]; then else $BUILDINSTALL --buildinstdir $BUILDINSTDIR --second $PKGORDERSTR --comp $COMPNAME --version $VERSION --release \"$RELEASESTR\" --product \"$PRODUCTSTR\" $DIR fi + +rm -rf $BUILDINSTDIR } secondRun() { @@ -149,7 +151,6 @@ fi echo "Writing .discinfo file" $MK_STAMP --releasestr="$RELEASESTR" --arch=$BUILDARCH --discNum="1,2,3" --baseDir=RedHat/base --packagesDir=RedHat/RPMS --pixmapsDir=RedHat/pixmaps --outfile=$p/.discinfo -rm -rf $BUILDINSTDIR if [ -x /usr/bin/runroot ]; then runroot $COMPNAME --onlyone --arch $BUILDARCH "rm -rf $TREEDIR/image-template $TREEDIR/instimage" else diff --git a/scripts/mk-images.s390 b/scripts/mk-images.s390 index e428d4284..47a07b0e5 100644 --- a/scripts/mk-images.s390 +++ b/scripts/mk-images.s390 @@ -437,7 +437,7 @@ SECSTAGE="$IDEMODS $SCSIMODS raid0 raid1 raid5 lvm-mod" COMMONMODULES="loop cramfs dasd_diag_mod dasd_eckd_mod dasd_fba_mod dasd_mod tape390 isofs ext3" LOCALMODULES="$COMMONMODULES tape390 $IDEMODS $SCSIMODS" -NETWORKMODULES="$COMMONMODULES nfs ctc netiucv ipv6 lcs" +NETWORKMODULES="$COMMONMODULES nfs ctc netiucv ipv6 lcs qdio qeth" makeBootImages() { makeS390initrd --initrdto $TOPDESTPATH/images/initrd.img \ diff --git a/scripts/pkgorder b/scripts/pkgorder index 3e3092add..b4b8574b6 100755 --- a/scripts/pkgorder +++ b/scripts/pkgorder @@ -243,6 +243,6 @@ for p in pkgOrder: pkgs.sort(archSort) for pnevra in pkgs: pkg = hdlist.pkgs[pnevra[0]] - print "%s-%s-%s.%s" % (pkg['name'], pkg['version'], - pkg['release'], pkg['arch']) + print "%s-%s-%s.%s.rpm" % (pkg['name'], pkg['version'], + pkg['release'], pkg['arch']) diff --git a/scripts/splittree.py b/scripts/splittree.py index a39c06833..50297615a 100644 --- a/scripts/splittree.py +++ b/scripts/splittree.py @@ -38,7 +38,8 @@ def nvra(pkgfile): fd = os.open(pkgfile, os.O_RDONLY) h = _ts.hdrFromFdno(fd) os.close(fd) - return "%s-%s-%s.%s" %(h['name'], h['version'], h['release'], h['arch']) + return "%s-%s-%s.%s.rpm" %(h['name'], h['version'], h['release'], + h['arch']) class Timber: |