diff options
| author | Matt Wilson <msw@redhat.com> | 2000-07-12 17:06:38 +0000 |
|---|---|---|
| committer | Matt Wilson <msw@redhat.com> | 2000-07-12 17:06:38 +0000 |
| commit | 6d2eefdf42db61bdea893978511c1d150d66df3c (patch) | |
| tree | b2bd7f8637f8f511e38d6ca3f2d96cbf5788762d /scripts | |
| parent | a4c57012d5978ce151534325ea32175fb29cda6d (diff) | |
fix for the way RPM works now, add +cdrom to drivers.img
Diffstat (limited to 'scripts')
| -rwxr-xr-x | scripts/buildinstall | 4 | ||||
| -rwxr-xr-x | scripts/mk-images | 2 | ||||
| -rw-r--r-- | scripts/mk-images.i386 | 2 | ||||
| -rwxr-xr-x | scripts/upd-instroot | 7 |
4 files changed, 10 insertions, 5 deletions
diff --git a/scripts/buildinstall b/scripts/buildinstall index 9852ecdfd..88707b9f2 100755 --- a/scripts/buildinstall +++ b/scripts/buildinstall @@ -19,7 +19,7 @@ BUILDARCH=`rpm -qp --qf "%{ARCH}" $p/RedHat/RPMS/anaconda-runtime-[0-9]*` if [ ! -f $UPD_INSTROOT ]; then cd $BUILDINSTDIR - rpm2cpio $p/RedHat/RPMS/anaconda-runtime-[0-9]* | cpio --quiet -iumd usr/lib/anaconda-runtime/upd-instroot + rpm2cpio $p/RedHat/RPMS/anaconda-runtime-[0-9]* | cpio --quiet -iumd ./usr/lib/anaconda-runtime/upd-instroot usr/lib/anaconda-runtime/upd-instroot mv usr/lib/anaconda-runtime/upd-instroot . rm -rf usr else @@ -29,7 +29,7 @@ UPD_INSTROOT=$BUILDINSTDIR/upd-instroot if [ ! -f $MK_IMAGES ]; then cd $BUILDINSTDIR - rpm2cpio $p/RedHat/RPMS/anaconda-runtime-[0-9]* | cpio --quiet -iumd usr/lib/anaconda-runtime/mk-images* + rpm2cpio $p/RedHat/RPMS/anaconda-runtime-[0-9]* | cpio --quiet -iumd ./usr/lib/anaconda-runtime/mk-images* usr/lib/anaconda-runtime/mk-images* mv usr/lib/anaconda-runtime/mk-images* . rm -rf usr else diff --git a/scripts/mk-images b/scripts/mk-images index 8a2894a2b..820148385 100755 --- a/scripts/mk-images +++ b/scripts/mk-images @@ -705,7 +705,7 @@ makedriverdisk () { rpm2cpio $kpackage | (cd $KERNELROOT; cpio --quiet -iumd) if [ ! -z $ppackage ]; then - rpm2cpio $ppackage | (cd $KERNELROOT; cpio --quiet -iumd etc/pcmcia/*) + rpm2cpio $ppackage | (cd $KERNELROOT; cpio --quiet -iumd etc/pcmcia/* ./etc/pcmcia/*) fi if [ ! -d "$KERNELROOT/lib/modules/$version/scsi" ]; then diff --git a/scripts/mk-images.i386 b/scripts/mk-images.i386 index 317b63de0..71f435a1b 100644 --- a/scripts/mk-images.i386 +++ b/scripts/mk-images.i386 @@ -132,7 +132,7 @@ makebootdisk --imagename ja/pcmcia.img \ --loaderbin loader-pcmcia-kon \ --modules "$PCMCIAMODULES nfs vfat"' -makedriverdisk "Supplemental Drivers" "drivers" "+scsi +net" +makedriverdisk "Supplemental Drivers" "drivers" "+scsi +net +cdrom" makedriverdisk "Parallel port IDE Drivers" "paride" "parport_pc parport pcd paride aten bpck comm dstr epat fit2 fit3 friq frpw kbic ktti on20 on26 epia ppa imm" diff --git a/scripts/upd-instroot b/scripts/upd-instroot index 44113ba75..cbfbe694d 100755 --- a/scripts/upd-instroot +++ b/scripts/upd-instroot @@ -433,6 +433,11 @@ rm -rf $DEST; mkdir -p $DEST/usr/sbin rm -rf $DESTGR; mkdir -p $DESTGR/usr/sbin $DESTGR/var/lib ln -s /tmp $DESTGR/var/lib/xkb +for file in $KEEPFILE $KEEPFILEGR; do + cat $file | awk '{print $1 "\n./" $1}' > $file- + mv -f $file- $file +done + echo -n "Expanding packages..." expandPackageSet "$RPMS" $DEST $KEEPFILE @@ -444,7 +449,7 @@ echo -e "\rExpanding packages..." echo "retrieving timezones" TZDIR=/tmp/glibc-timezone-$$ mkdir -p $TZDIR/usr/share/zoneinfo -rpm2cpio $GLIBC | (cd $TZDIR; cpio --quiet -iumd usr/share/zoneinfo usr/share/zoneinfo/*) +rpm2cpio $GLIBC | (cd $TZDIR; cpio --quiet -iumd usr/share/zoneinfo ./usr/share/zoneinfo ./usr/share/zoneinfo/* usr/share/zoneinfo/*) (cd $TZDIR; tar cSpf - $TIMEZONES) | (cd $DEST; tar xSpf -) (cd $TZDIR; tar cSpf - $TIMEZONES) | (cd $DESTGR; tar xSpf -) rm -rf $TZDIR |