diff options
| author | Marcin Juszkiewicz <hrw@openedhand.com> | 2007-10-19 13:36:19 +0000 |
|---|---|---|
| committer | Marcin Juszkiewicz <hrw@openedhand.com> | 2007-10-19 13:36:19 +0000 |
| commit | 483b058837f6c9f5d92269da56947fd522d9d1e2 (patch) | |
| tree | 0244667267883b32c13f4f3b7773be47e145fc39 | |
| parent | d64a6b7e7a3979970952a0808ebe8bdf4fe03f50 (diff) | |
| download | openembedded-core-483b058837f6c9f5d92269da56947fd522d9d1e2.tar.gz openembedded-core-483b058837f6c9f5d92269da56947fd522d9d1e2.tar.bz2 openembedded-core-483b058837f6c9f5d92269da56947fd522d9d1e2.zip | |
update-modules: sync with OE (no changes for us)
git-svn-id: https://svn.o-hand.com/repos/poky/trunk@2930 311d38ba-8fff-0310-9ca6-ca027cbcb966
| -rw-r--r-- | meta/packages/update-modules/update-modules_1.0.bb | 12 |
1 files changed, 11 insertions, 1 deletions
diff --git a/meta/packages/update-modules/update-modules_1.0.bb b/meta/packages/update-modules/update-modules_1.0.bb index dadcddb8c3..cc7a585207 100644 --- a/meta/packages/update-modules/update-modules_1.0.bb +++ b/meta/packages/update-modules/update-modules_1.0.bb @@ -3,7 +3,7 @@ DESCRIPTION = "Script to manage module configuration files" LICENSE = "GPLv2" PACKAGE_ARCH = "all" RDEPENDS = "${@base_contains("MACHINE_FEATURES", "kernel26", "module-init-tools-depmod","modutils-depmod",d)} " -PR = "r5" +PR = "r6" SRC_URI = "file://update-modules" @@ -18,3 +18,13 @@ do_install() { install -d ${D}${sbindir} install ${WORKDIR}/update-modules ${D}${sbindir} } + +# The Unslung distro uses a 2.4 kernel for a machine (the NSLU2) which +# supports both 2.4 and 2.6 kernels. Rather than forcing OE to have +# to deal with that unique legacy corner case, we just nullify the +# RDEPENDS here and handle it in the Unslung image recipe. I know this +# is ugly. Please don't remove it unless you first make the RDEPENDS +# line at the top of this file understand that a machine can be used +# in both a 2.4 kernel distro and a 2.6 kernel distro. Really, it's +# not worth the effort to do that, so just overlook the next line. +RDEPENDS_unslung = "" |