summaryrefslogtreecommitdiffstats
path: root/meta/packages/module-init-tools
diff options
context:
space:
mode:
authorRichard Purdie <rpurdie@linux.intel.com>2009-09-16 23:09:44 +0100
committerRichard Purdie <rpurdie@linux.intel.com>2009-09-17 22:24:36 +0100
commitaf85ce4b4e675feb5796f87137c86d70c2f15b9a (patch)
treef19dbb9bcf1eec671b26685458f7cc47ebb3721e /meta/packages/module-init-tools
parent046ae6a38d829048663fe1afb1f67de1fbe2e3b5 (diff)
downloadpoky-af85ce4b4e675feb5796f87137c86d70c2f15b9a.tar.gz
Remove layout_* variables
Remove layout_* variables and replace them with variables specific to the different classes. The layout variables were only useful for the native/cross classes and caused more confusion than they solved. They didn't scale to the sdk class. It now clear a small set of native/cross variables fulfil the needs. This patch also changes native.bbclass to use "/" as the STAGING_DIR which makes sense since we're installing binaries into the locations we're compiling them for. Signed-off-by: Richard Purdie <rpurdie@linux.intel.com>
Diffstat (limited to 'meta/packages/module-init-tools')
-rw-r--r--meta/packages/module-init-tools/module-init-tools-cross_3.2.2.bb5
-rw-r--r--meta/packages/module-init-tools/module-init-tools.inc23
-rw-r--r--meta/packages/module-init-tools/module-init-tools_3.2.2.bb24
3 files changed, 26 insertions, 26 deletions
diff --git a/meta/packages/module-init-tools/module-init-tools-cross_3.2.2.bb b/meta/packages/module-init-tools/module-init-tools-cross_3.2.2.bb
index 9e6bcd6eee..450313c2e7 100644
--- a/meta/packages/module-init-tools/module-init-tools-cross_3.2.2.bb
+++ b/meta/packages/module-init-tools/module-init-tools-cross_3.2.2.bb
@@ -1,7 +1,6 @@
1LICENSE = "GPL" 1require module-init-tools.inc
2require module-init-tools_${PV}.bb 2PR = "r3"
3inherit cross 3inherit cross
4DEFAULT_PREFERENCE = "0"
5PROVIDES += "virtual/${TARGET_PREFIX}depmod virtual/${TARGET_PREFIX}depmod-2.6" 4PROVIDES += "virtual/${TARGET_PREFIX}depmod virtual/${TARGET_PREFIX}depmod-2.6"
6 5
7EXTRA_OECONF_append = " --program-prefix=${TARGET_PREFIX}" 6EXTRA_OECONF_append = " --program-prefix=${TARGET_PREFIX}"
diff --git a/meta/packages/module-init-tools/module-init-tools.inc b/meta/packages/module-init-tools/module-init-tools.inc
new file mode 100644
index 0000000000..449b9fd455
--- /dev/null
+++ b/meta/packages/module-init-tools/module-init-tools.inc
@@ -0,0 +1,23 @@
1DESCRIPTION = "This package contains a set of programs for loading, inserting, and \
2removing kernel modules for Linux (versions 2.5.48 and above). It serves \
3the same function that the modutils package serves for Linux 2.4."
4LICENSE = "GPL"
5SECTION = "base"
6
7PACKAGES =+ "module-init-tools-insmod-static module-init-tools-depmod"
8RDEPENDS_${PN} += "module-init-tools-depmod"
9
10FILES_module-init-tools-depmod = "${sbindir}/depmod.26"
11FILES_module-init-tools-insmod-static = "${sbindir}/insmod.static"
12
13SRC_URI = "${KERNELORG_MIRROR}/pub/linux/utils/kernel/module-init-tools/module-init-tools-${PV}.tar.bz2 \
14 file://ignore_arch_directory;patch=1 \
15 file://modutils_extension;patch=1 \
16 file://no_man_rebuild;patch=1 \
17 file://manpagesopt;patch=1 \
18 file://module-init-tools-remove-index.patch;patch=1 "
19S = "${WORKDIR}/module-init-tools-${PV}"
20
21EXTRA_OECONF = "--disable-manpages"
22
23inherit autotools
diff --git a/meta/packages/module-init-tools/module-init-tools_3.2.2.bb b/meta/packages/module-init-tools/module-init-tools_3.2.2.bb
index dcf9063219..4977049b8a 100644
--- a/meta/packages/module-init-tools/module-init-tools_3.2.2.bb
+++ b/meta/packages/module-init-tools/module-init-tools_3.2.2.bb
@@ -1,31 +1,9 @@
1DESCRIPTION = "This package contains a set of programs for loading, inserting, and \ 1require module-init-tools.inc
2removing kernel modules for Linux (versions 2.5.48 and above). It serves \
3the same function that the modutils package serves for Linux 2.4."
4LICENSE = "GPL"
5SECTION = "base"
6PR = "r3" 2PR = "r3"
7 3
8PACKAGES =+ "module-init-tools-insmod-static module-init-tools-depmod"
9RDEPENDS_${PN} += "module-init-tools-depmod"
10
11FILES_module-init-tools-depmod = "${sbindir}/depmod.26"
12FILES_module-init-tools-insmod-static = "${sbindir}/insmod.static"
13
14SRC_URI = "${KERNELORG_MIRROR}/pub/linux/utils/kernel/module-init-tools/module-init-tools-${PV}.tar.bz2 \
15 file://ignore_arch_directory;patch=1 \
16 file://modutils_extension;patch=1 \
17 file://no_man_rebuild;patch=1 \
18 file://manpagesopt;patch=1 \
19 file://module-init-tools-remove-index.patch;patch=1 "
20S = "${WORKDIR}/module-init-tools-${PV}"
21
22EXTRA_OECONF = "--disable-manpages"
23
24bindir = "/bin" 4bindir = "/bin"
25sbindir = "/sbin" 5sbindir = "/sbin"
26 6
27inherit autotools
28
29do_install() { 7do_install() {
30 autotools_do_install 8 autotools_do_install
31 for f in bin/lsmod sbin/insmod sbin/rmmod sbin/modprobe sbin/modinfo sbin/depmod; do 9 for f in bin/lsmod sbin/insmod sbin/rmmod sbin/modprobe sbin/modinfo sbin/depmod; do