diff options
| -rwxr-xr-x | scripts/mk-images | 2 | ||||
| -rw-r--r-- | scripts/mk-images.sparc64 | 9 | ||||
| -rwxr-xr-x | scripts/upd-instroot | 5 |
3 files changed, 9 insertions, 7 deletions
diff --git a/scripts/mk-images b/scripts/mk-images index b278b502a..68a121eac 100755 --- a/scripts/mk-images +++ b/scripts/mk-images @@ -118,7 +118,7 @@ rundepmod () { exclpattern="tc90x|FPT|BusLogic|Pci2000|Pci2220i" - /sbin/depmod -e -i -m $KERNELROOT/boot/System.map-$version \ + $FAKEARCH /sbin/depmod -e -i -m $KERNELROOT/boot/System.map-$version \ $what > $final.foo 2>&1 | egrep -v "modprobe: (${exclpattern}) multiply defined" diff --git a/scripts/mk-images.sparc64 b/scripts/mk-images.sparc64 index a1321962a..a509120ef 100644 --- a/scripts/mk-images.sparc64 +++ b/scripts/mk-images.sparc64 @@ -1,10 +1,9 @@ SECSTAGE="vfat raid0 raid1 raid5" TILO=$IMGPATH/usr/bin/tilo SILO=$IMGPATH/usr/sbin/silo +FAKEARCH=sparc64 prepareBootImage() { - dd if=/dev/zero bs=1k count=$BOOTDISKSIZE of=$MBD_TMPIMAGE 2>/dev/null - loopdev=`findloopdevice $MBD_TMPIMAGE` stagedir=/tmp/sparcboot.$$ rm -rf $stagedir mkdir -p $stagedir @@ -14,9 +13,11 @@ prepareBootImage() { cp $BOOTDISKDIR/second.b $stagedir cp $BOOTDISKDIR/*.msg $stagedir cp $BOOTDISKDIR/silo64.conf $stagedir/silo.conf - genromfs -V "Red Hat Linux Install" -d $stagedir -f $loopdev -a 512 -A 2048,/.. + genromfs -V "Red Hat Linux Install" -d $stagedir -f $MBD_TMPIMAGE -a 512 -A 2048,/.. + size=`cat $MBD_TMPIMAGE | wc -c` + filler=`expr $BOOTDISKSIZE "*" 1024 - $size` + dd if=/dev/zero bs=$filler count=1 >> $MBD_TMPIMAGE 2> /dev/null rm -rf $stagedir - losetup -d $loopdev mount -tromfs -oloop $MBD_TMPIMAGE $MBD_BOOTTREE $SILO -r $MBD_BOOTTREE -i /fd.b -b /second.b -C /silo.conf -F } diff --git a/scripts/upd-instroot b/scripts/upd-instroot index cef866300..104b135c5 100755 --- a/scripts/upd-instroot +++ b/scripts/upd-instroot @@ -2,7 +2,6 @@ ORIGDIR=`pwd` - if [ -z "$1" ]; then echo "upd-instroot: updates instimage from a Red Hat RPMS directory" echo "usage: $0 <packagedir> [templatedir] [instroot]" @@ -35,7 +34,7 @@ prunePackageList() { PACKAGEFILES="" for PKG in $PACKAGES; do PATTERN="${PATTERN:+${PATTERN}|}(^$PKG )" - PACKAGEFILES="$PACKAGEFILES $(ls $PACKAGEPATH/${PKG}*{${ARCH},noarch}.rpm)" + PACKAGEFILES="$PACKAGEFILES $(ls $PACKAGEPATH/${PKG}*{${ARCH},noarch}.rpm 2>/dev/null)" done # gtk+, enough said PATTERN=$(echo $PATTERN | sed 's,[\+\*],\\&,g') @@ -421,6 +420,8 @@ rpm2cpio $GLIBC | (cd $TZDIR; cpio --quiet -iumd usr/share/zoneinfo usr/share/zo (cd $TZDIR; tar cSpf - $TIMEZONES) | (cd $DESTGR; tar xSpf -) rm -rf $TZDIR +chown -R root:root $DEST $DESGTR + # XXX kludge, fix me #rm -f $DEST/usr/lib/python1.5/site-packages/rpmmodule.so #rm -f $DESTGR/usr/lib/python1.5/site-packages/rpmmodule.so |