diff options
| author | Jeremy Katz <katzj@redhat.com> | 2003-07-16 03:23:20 +0000 |
|---|---|---|
| committer | Jeremy Katz <katzj@redhat.com> | 2003-07-16 03:23:20 +0000 |
| commit | a51764f258d46a2e2f0ae39f25144c6ffabb8804 (patch) | |
| tree | 18980a7ca91a86f6432dd19e172608ed7c12e8f1 /scripts/mk-images | |
| parent | 1b2f9fe18937b9f187b7fd77a50c2c7d0f369654 (diff) | |
| download | anaconda-a51764f258d46a2e2f0ae39f25144c6ffabb8804.tar.gz anaconda-a51764f258d46a2e2f0ae39f25144c6ffabb8804.tar.xz anaconda-a51764f258d46a2e2f0ae39f25144c6ffabb8804.zip | |
merge from taroon branch. product.img stuff, md can be modular, lots of
little things across the board
Diffstat (limited to 'scripts/mk-images')
| -rwxr-xr-x | scripts/mk-images | 13 |
1 files changed, 11 insertions, 2 deletions
diff --git a/scripts/mk-images b/scripts/mk-images index 68d9a9195..251ab96dc 100755 --- a/scripts/mk-images +++ b/scripts/mk-images @@ -36,6 +36,7 @@ TOPDIR=$(cd $TOPDIR; pwd) IMGPATH=$4 KERNELBASE=/tmp/updboot.kernel.$$ MODDEPS=$KERNELBASE/moddeps + MODMAPS=$KERNELBASE/modules.pcimap BUILDARCH=$5 if [ "$BUILDARCH" = "ppc" -o "$BUILDARCH" = "ppc64" ]; then @@ -84,6 +85,7 @@ TOPDIR=$(cd $TOPDIR; pwd) # Stuff that we need TRIMPCITABLE=$IMGPATH/usr/lib/anaconda-runtime/trimpcitable + TRIMMODMAP=$IMGPATH/usr/lib/anaconda-runtime/trimmodmap GETKEYMAPS=$IMGPATH/usr/lib/anaconda-runtime/getkeymaps KEYMAPS=/tmp/keymaps-$BUILDARCH.$$ SCREENFONT=$IMGPATH/usr/lib/anaconda-runtime/screenfont-${BASEARCH}.gz @@ -100,7 +102,7 @@ TOPDIR=$(cd $TOPDIR; pwd) touch $MODULESUSED - REQUIREMENTS="$TRIMPCITABLE $PCITABLE $GETMODDEPS $MODINFO + REQUIREMENTS="$TRIMPCITABLE $TRIMMODMAP $PCITABLE $GETMODDEPS $MODINFO $FILTERMODDEPS $LANGTABLE $GETKEYMAPS" dieLater= @@ -170,6 +172,9 @@ rundepmod () { $FAKEARCH /sbin/depmod -e -F $KERNELROOT/boot/System.map-$version \ $what > $final.foo 2>&1 | egrep -v "modprobe: (${exclpattern}) multiply defined" + $FAKEARCH /sbin/depmod -a -F $KERNELROOT/boot/System.map-$version \ + -b $KERNELROOT $version + mv $KERNELROOT/lib/modules/$version/modules.pcimap $MODMAPS # For paride we need to change this: # aten: paride @@ -313,7 +318,7 @@ makemoduleball() { MMB_MODULESET=$(resdeps $2) rm -rf $MMB_DIR/modules $MMB_DIR/$MMB_NAME $MMB_DIR/modules.dep \ - $MMB_DIR/pcitable $MMB_DIR/$MMB_MODINFO + $MMB_DIR/modules.pcimap $MMB_DIR/pcitable $MMB_DIR/$MMB_MODINFO mkdir -p $MMB_DIR/modules MMB_MODULESET=$(intcopymodules "$MMB_MODULESET" $MMB_DIR/modules) @@ -332,6 +337,9 @@ makemoduleball() { # create the pcitable $TRIMPCITABLE $(find . -name *.o -exec basename {} \;) < $PCITABLE > ../pcitable + + # create the modules.pcimap + $TRIMMODMAP $PCITABLE $(find . -name *.o -exec basename {} \;) < $MODMAPS > ../modules.pcimap if [ -n "$MMB_DD" ]; then echo $MMB_DD > $MMB_DIR/rhdd @@ -561,6 +569,7 @@ EOF $MBD_DIR urandom c 1 9 644 root:root $MBD_DIR nvram c 10 144 644 root:root $MBD_DIR adb c 56 0 644 root:root + $MBD_DIR rtc c 10 135 644 root:root EOF ln -s fb0 $MBD_DIR/dev/fb |