diff options
| author | Richard Purdie <rpurdie@rpsys.net> | 2006-04-29 22:16:05 +0000 |
|---|---|---|
| committer | OpenEmbedded Project <openembedded-devel@lists.openembedded.org> | 2006-04-29 22:16:05 +0000 |
| commit | fb4bf48db5e1a3bed0ef9e490656357c70ae2088 (patch) | |
| tree | 7c9cdea26321ccea1944d0774df8ec3157f83c3a /packages | |
| parent | a3c05f2af07d2c0b02c74667f00d2d6045a4bb72 (diff) | |
Install depmod-2.4 and depmod-2.6 in cross staging instead of plain depmod so 2.4 and 2.6 kernel builds can coexist with multimachine (bug 581)
Diffstat (limited to 'packages')
| -rw-r--r-- | packages/linux/mnci-ramses_2.4.21-rmk2-pxa1.bb | 2 | ||||
| -rw-r--r-- | packages/module-init-tools/module-init-tools-cross_3.2.2.bb | 1 | ||||
| -rw-r--r-- | packages/module-init-tools/module-init-tools_3.2.2.bb | 2 | ||||
| -rw-r--r-- | packages/modutils/modutils-cross_2.4.27.bb | 3 | ||||
| -rw-r--r-- | packages/modutils/modutils_2.4.27.bb | 4 |
5 files changed, 7 insertions, 5 deletions
diff --git a/packages/linux/mnci-ramses_2.4.21-rmk2-pxa1.bb b/packages/linux/mnci-ramses_2.4.21-rmk2-pxa1.bb index 5e562798de..76e1769e31 100644 --- a/packages/linux/mnci-ramses_2.4.21-rmk2-pxa1.bb +++ b/packages/linux/mnci-ramses_2.4.21-rmk2-pxa1.bb @@ -58,7 +58,7 @@ pkg_postinst_kernel () { pkg_postinst_modules () { if [ -n "$D" ]; then - ${HOST_PREFIX}depmod -A -b $D -F $D/boot/System.map-${PV} ${KERNEL_VERSION} + ${HOST_PREFIX}depmod-${KERNEL_MAJOR_VERSION} -A -b $D -F $D/boot/System.map-${PV} ${KERNEL_VERSION} else depmod -A fi diff --git a/packages/module-init-tools/module-init-tools-cross_3.2.2.bb b/packages/module-init-tools/module-init-tools-cross_3.2.2.bb index 4bcc311709..fc8b461945 100644 --- a/packages/module-init-tools/module-init-tools-cross_3.2.2.bb +++ b/packages/module-init-tools/module-init-tools-cross_3.2.2.bb @@ -8,6 +8,7 @@ EXTRA_OECONF_append = " --program-prefix=${TARGET_PREFIX}" do_stage () { oe_runmake install + mv ${bindir}/${TARGET_PREFIX}depmod ${bindir}/${TARGET_PREFIX}depmod-2.6 } do_install () { diff --git a/packages/module-init-tools/module-init-tools_3.2.2.bb b/packages/module-init-tools/module-init-tools_3.2.2.bb index b0d2f34e5e..727bfaac1b 100644 --- a/packages/module-init-tools/module-init-tools_3.2.2.bb +++ b/packages/module-init-tools/module-init-tools_3.2.2.bb @@ -3,7 +3,7 @@ removing kernel modules for Linux (versions 2.5.48 and above). It serves \ the same function that the modutils package serves for Linux 2.4." LICENSE = "GPL" SECTION = "base" -PR = "r1" +PR = "r2" PACKAGES =+ "module-init-tools-insmod-static module-init-tools-depmod" RDEPENDS_${PN} += "module-init-tools-depmod" diff --git a/packages/modutils/modutils-cross_2.4.27.bb b/packages/modutils/modutils-cross_2.4.27.bb index 2b301d7d09..9ecdfba5da 100644 --- a/packages/modutils/modutils-cross_2.4.27.bb +++ b/packages/modutils/modutils-cross_2.4.27.bb @@ -1,6 +1,6 @@ SECTION = "base" include modutils_${PV}.bb -PR = "r6" +PR = "r7" inherit cross S = "${WORKDIR}/modutils-${PV}" DEPENDS = "" @@ -19,6 +19,7 @@ CFLAGS_prepend_mipseb = "-D__MIPSEB__" do_stage () { oe_runmake install + mv ${bindir}/${TARGET_PREFIX}-depmod ${bindir}/${TARGET_PREFIX}-depmod-2.4 } do_install () { diff --git a/packages/modutils/modutils_2.4.27.bb b/packages/modutils/modutils_2.4.27.bb index 9fa7cef105..56420f7de0 100644 --- a/packages/modutils/modutils_2.4.27.bb +++ b/packages/modutils/modutils_2.4.27.bb @@ -39,10 +39,10 @@ for f in sbin/insmod sbin/modprobe sbin/rmmod bin/lsmod; do done if test -n "$D"; then D="-r $D" - if test -n "`which ${TARGET_PREFIX}depmod`"; then + if test -n "`which ${TARGET_PREFIX}depmod-2.4`"; then for kerneldir in `ls -p ${IMAGE_ROOTFS}/lib/modules|grep /`; do kernelver=`basename $kerneldir` - ${TARGET_PREFIX}depmod -a -b ${IMAGE_ROOTFS} -C ${IMAGE_ROOTFS}/${sysconfdir}/modules.conf -r $kernelver + ${TARGET_PREFIX}depmod-2.4 -a -b ${IMAGE_ROOTFS} -C ${IMAGE_ROOTFS}/${sysconfdir}/modules.conf -r $kernelver done fi fi |