From b65e9ae6c662815183d45320a0fc75c7262adc0e Mon Sep 17 00:00:00 2001 From: Silvan Calarco Date: Tue, 16 Apr 2013 16:52:08 +0200 Subject: [PATCH] rootfs, rootfs-light: remove redundant and failing depmod; arm: configure for mamba-arm kernel --- platforms/rootfs-light/post.inc.sh | 5 ----- platforms/rootfs-light/settings.inc | 7 ++++--- platforms/rootfs/post.inc.sh | 5 ----- platforms/rootfs/settings.inc | 5 +++-- 4 files changed, 7 insertions(+), 15 deletions(-) diff --git a/platforms/rootfs-light/post.inc.sh b/platforms/rootfs-light/post.inc.sh index 749750c..8770fdb 100644 --- a/platforms/rootfs-light/post.inc.sh +++ b/platforms/rootfs-light/post.inc.sh @@ -46,11 +46,6 @@ esac echo $timezone > $MOUNTDIR/etc/timezone cp /usr/share/zoneinfo/$timezone $MOUNTDIR/etc/localtime -if [ ! "$KERNEL_IGNORE" ]; then - # run depmod - chroot $MOUNTDIR depmod -a ${KERNEL_MAJVER}-${KERNEL_EXTRAVER} -fi - # disable automatic depmod and ldconfig execution on boot (also due to clock error) cat >> $MOUNTDIR/etc/sysconfig/rc << _EOF no_auto_depmod=1 diff --git a/platforms/rootfs-light/settings.inc b/platforms/rootfs-light/settings.inc index 698968a..20a59e6 100644 --- a/platforms/rootfs-light/settings.inc +++ b/platforms/rootfs-light/settings.inc @@ -1,8 +1,9 @@ if [ "$ARCH" = "arm" ]; then - KERNEL_EXTRAVER= - #KERNEL_PLATFORM="" + KERNEL_EXTRAVER=mamba-arm + KERNEL_PLATFORM="" KERNEL_ADDITIONAL="" - KERNEL_IGNORE=true + #KERNEL_IGNORE=true + KERNEL_MORE_EXTRAVER= elif [ "$ARCH" = "i586" ]; then KERNEL_EXTRAVER=mamba KERNEL_PLATFORM="" diff --git a/platforms/rootfs/post.inc.sh b/platforms/rootfs/post.inc.sh index a80a083..fb9c4b2 100644 --- a/platforms/rootfs/post.inc.sh +++ b/platforms/rootfs/post.inc.sh @@ -46,11 +46,6 @@ esac echo $timezone > $MOUNTDIR/etc/timezone cp /usr/share/zoneinfo/$timezone $MOUNTDIR/etc/localtime -if [ ! "$KERNEL_IGNORE" ]; then - # run depmod - chroot $MOUNTDIR depmod -a ${KERNEL_MAJVER}-${KERNEL_EXTRAVER} -fi - # disable automatic depmod and ldconfig execution on boot (also due to clock error) cat >> $MOUNTDIR/etc/sysconfig/rc << _EOF no_auto_depmod=1 diff --git a/platforms/rootfs/settings.inc b/platforms/rootfs/settings.inc index fdd2332..a63e64a 100644 --- a/platforms/rootfs/settings.inc +++ b/platforms/rootfs/settings.inc @@ -1,8 +1,9 @@ if [ "$ARCH" = "arm" ]; then - KERNEL_EXTRAVER= + KERNEL_EXTRAVER=mamba-arm #KERNEL_PLATFORM="" KERNEL_ADDITIONAL="" - KERNEL_IGNORE=true + #KERNEL_IGNORE=true + KERNEL_MORE_EXTRAVER= elif [ "$ARCH" = "i586" ]; then KERNEL_EXTRAVER=mamba KERNEL_PLATFORM=""