From bbd6999a7249b7b99e434a4a01c8cedf540279bd Mon Sep 17 00:00:00 2001 From: Paul Eggleton Date: Thu, 21 Apr 2011 15:04:58 +0100 Subject: Remove distro-specific metadata for distros not in oe-core (From OE-Core rev: ea2cd4b8e9bc013a007fe2a1a605ecb59db5a896) Signed-off-by: Paul Eggleton Signed-off-by: Richard Purdie --- .../update-modules/update-modules-1.0/openmn/update-modules | 3 --- meta/recipes-kernel/update-modules/update-modules_1.0.bb | 11 +---------- 2 files changed, 1 insertion(+), 13 deletions(-) delete mode 100755 meta/recipes-kernel/update-modules/update-modules-1.0/openmn/update-modules (limited to 'meta/recipes-kernel/update-modules') diff --git a/meta/recipes-kernel/update-modules/update-modules-1.0/openmn/update-modules b/meta/recipes-kernel/update-modules/update-modules-1.0/openmn/update-modules deleted file mode 100755 index 976161f141..0000000000 --- a/meta/recipes-kernel/update-modules/update-modules-1.0/openmn/update-modules +++ /dev/null @@ -1,3 +0,0 @@ -#!/bin/sh -depmod -ae -exit 0 diff --git a/meta/recipes-kernel/update-modules/update-modules_1.0.bb b/meta/recipes-kernel/update-modules/update-modules_1.0.bb index a8ebbdaebd..336bca2e9b 100644 --- a/meta/recipes-kernel/update-modules/update-modules_1.0.bb +++ b/meta/recipes-kernel/update-modules/update-modules_1.0.bb @@ -5,7 +5,7 @@ LIC_FILES_CHKSUM = "file://${WORKDIR}/COPYING.GPL;md5=751419260aa954499f7abaabaa PACKAGE_ARCH = "all" RDEPENDS_${PN} = "${@base_contains("MACHINE_FEATURES", "kernel26", "module-init-tools-depmod","modutils-depmod",d)} " -PR = "r8" +PR = "r9" SRC_URI = "file://update-modules \ file://COPYING.GPL" @@ -22,12 +22,3 @@ do_install() { 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_${PN} 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 = "" -- cgit v1.2.3-54-g00ecf