From c878cb8ba7df1f6295c98f23ed617a311d0222eb Mon Sep 17 00:00:00 2001
From: Anders Darander <anders@chargestorm.se>
Date: Fri, 1 Jul 2011 15:07:59 +0200
Subject: modules-init-tools(-cross): update to 3.16

Update to get support for Linux 3.0.
Delete the ignore_arch_directory.patch (as it does not apply to 3.16).

(From OE-Core rev: 773fc8fc45224e37d442d927ed28d50680fb954c)

Signed-off-by: Anders Darander <anders@chargestorm.se>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
---
 .../files/ignore_arch_directory.patch              | 30 ----------------
 .../module-init-tools-cross_3.12.bb                |  8 -----
 .../module-init-tools-cross_3.16.bb                |  8 +++++
 .../module-init-tools/module-init-tools.inc        |  1 -
 .../module-init-tools/module-init-tools_3.12.bb    | 42 ----------------------
 .../module-init-tools/module-init-tools_3.16.bb    | 42 ++++++++++++++++++++++
 6 files changed, 50 insertions(+), 81 deletions(-)
 delete mode 100644 meta/recipes-kernel/module-init-tools/files/ignore_arch_directory.patch
 delete mode 100644 meta/recipes-kernel/module-init-tools/module-init-tools-cross_3.12.bb
 create mode 100644 meta/recipes-kernel/module-init-tools/module-init-tools-cross_3.16.bb
 delete mode 100644 meta/recipes-kernel/module-init-tools/module-init-tools_3.12.bb
 create mode 100644 meta/recipes-kernel/module-init-tools/module-init-tools_3.16.bb

(limited to 'meta/recipes-kernel/module-init-tools')

diff --git a/meta/recipes-kernel/module-init-tools/files/ignore_arch_directory.patch b/meta/recipes-kernel/module-init-tools/files/ignore_arch_directory.patch
deleted file mode 100644
index d29957d98b..0000000000
--- a/meta/recipes-kernel/module-init-tools/files/ignore_arch_directory.patch
+++ /dev/null
@@ -1,30 +0,0 @@
-# not sure the reason yet. Keep for a while and verify later.
-#
-# comments added by Kevin Tian <kevin.tian@intel.com>, 2010-07-21
-
-Upstream-Status: Pending
-
-diff -ruN module-init-tools-3.12.orig/modprobe.8 module-init-tools-3.12/modprobe.8
---- module-init-tools-3.12/modprobe.8.orig
-+++ module-init-tools-3.12/modprobe.8
-@@ -27,6 +27,7 @@
- (see \fBmodprobe.conf\fR(5)). \fBmodprobe\fR will also use module
- options specified on the kernel command line in the form of
- <module>\&.<option>\&.
-+All files in the \fI/etc/modprobe.d/arch/\fR directory are ignored.
- .PP
- Note that unlike in 2.4 series Linux kernels (which are not supported
- by this tool) this version of \fBmodprobe\fR does not
---- module-init-tools-3.12/modprobe.c.orig
-+++ module-init-tools-3.12/modprobe.c
-@@ -1052,6 +1052,10 @@
- 	DIR *dir;
- 	int ret = 0;
- 
-+	/* ignore everything in this directory */
-+	if (streq(filename, "/etc/modprobe.d/arch"))
-+		return 1;
-+
- 	dir = opendir(filename);
- 	if (dir) {
- 		struct file_entry {
diff --git a/meta/recipes-kernel/module-init-tools/module-init-tools-cross_3.12.bb b/meta/recipes-kernel/module-init-tools/module-init-tools-cross_3.12.bb
deleted file mode 100644
index 5cbf9c50e7..0000000000
--- a/meta/recipes-kernel/module-init-tools/module-init-tools-cross_3.12.bb
+++ /dev/null
@@ -1,8 +0,0 @@
-require module-init-tools.inc
-PR = "r2"
-inherit cross
-PROVIDES += "virtual/${TARGET_PREFIX}depmod virtual/${TARGET_PREFIX}depmod-2.6"
-
-SRC_URI += "file://no-static-binaries.patch"
-
-EXTRA_OECONF_append = " --program-prefix=${TARGET_PREFIX}"
diff --git a/meta/recipes-kernel/module-init-tools/module-init-tools-cross_3.16.bb b/meta/recipes-kernel/module-init-tools/module-init-tools-cross_3.16.bb
new file mode 100644
index 0000000000..8b3458bf53
--- /dev/null
+++ b/meta/recipes-kernel/module-init-tools/module-init-tools-cross_3.16.bb
@@ -0,0 +1,8 @@
+require module-init-tools.inc
+PR = "r0"
+inherit cross
+PROVIDES += "virtual/${TARGET_PREFIX}depmod"
+
+SRC_URI += "file://no-static-binaries.patch"
+
+EXTRA_OECONF_append = " --program-prefix=${TARGET_PREFIX}"
diff --git a/meta/recipes-kernel/module-init-tools/module-init-tools.inc b/meta/recipes-kernel/module-init-tools/module-init-tools.inc
index 4d96d16f60..c290c4f7fb 100644
--- a/meta/recipes-kernel/module-init-tools/module-init-tools.inc
+++ b/meta/recipes-kernel/module-init-tools/module-init-tools.inc
@@ -12,7 +12,6 @@ FILES_module-init-tools-depmod = "${sbindir}/depmod.26"
 FILES_module-init-tools-insmod-static = "${sbindir}/insmod.static"
 
 SRC_URI = "${KERNELORG_MIRROR}/linux/utils/kernel/module-init-tools/module-init-tools-${PV}.tar.bz2 \
-           file://ignore_arch_directory.patch \
            file://modutils_extension.patch \
            file://disable_man.patch \
            file://grab_module_memset.patch"
diff --git a/meta/recipes-kernel/module-init-tools/module-init-tools_3.12.bb b/meta/recipes-kernel/module-init-tools/module-init-tools_3.12.bb
deleted file mode 100644
index 3d7c287092..0000000000
--- a/meta/recipes-kernel/module-init-tools/module-init-tools_3.12.bb
+++ /dev/null
@@ -1,42 +0,0 @@
-require module-init-tools.inc
-PR = "r1"
-
-# autotools set prefix to /usr, however we want them in /bin and /sbin
-bindir = "/bin"
-sbindir = "/sbin"
-
-do_install() {
-	autotools_do_install
-	for f in bin/lsmod sbin/insmod sbin/rmmod sbin/modprobe sbin/modinfo sbin/depmod; do
-		mv ${D}/$f ${D}/$f.26
-	done
-}
-
-pkg_postinst_module-init-tools() {
-	for f in sbin/insmod sbin/modprobe sbin/rmmod sbin/modinfo; do
-		bn=`basename $f`
-		update-alternatives --install /$f $bn /$f.26 60
-	done
-	update-alternatives --install /bin/lsmod bin-lsmod /bin/lsmod.26 60
-	update-alternatives --install /sbin/lsmod lsmod /bin/lsmod.26 60
-}
-
-pkg_prerm_module-init-tools() {
-	for f in sbin/insmod sbin/modprobe sbin/rmmod sbin/modinfo; do
-		bn=`basename $f`
-		update-alternatives --remove $bn /$f.26
-	done
-	update-alternatives --remove bin-lsmod /bin/lsmod.26
-	update-alternatives --remove lsmod /bin/lsmod.26
-}
-
-pkg_postinst_module-init-tools-depmod() {
-	update-alternatives --install /sbin/depmod depmod /sbin/depmod.26 60
-}
-
-pkg_prerm_module-init-tools-depmod() {
-	update-alternatives --remove depmod /sbin/depmod.26
-}
-
-SRC_URI[md5sum] = "8b2257ce9abef74c4a44d825d23140f3"
-SRC_URI[sha256sum] = "d012ab07ea26721467a85a775f34747c1c8897e37f16bec5317d8a72ef8b4f17"
diff --git a/meta/recipes-kernel/module-init-tools/module-init-tools_3.16.bb b/meta/recipes-kernel/module-init-tools/module-init-tools_3.16.bb
new file mode 100644
index 0000000000..0248b464c1
--- /dev/null
+++ b/meta/recipes-kernel/module-init-tools/module-init-tools_3.16.bb
@@ -0,0 +1,42 @@
+require module-init-tools.inc
+PR = "r0"
+
+# autotools set prefix to /usr, however we want them in /bin and /sbin
+bindir = "/bin"
+sbindir = "/sbin"
+
+do_install() {
+	autotools_do_install
+	for f in bin/lsmod sbin/insmod sbin/rmmod sbin/modprobe sbin/modinfo sbin/depmod; do
+		mv ${D}/$f ${D}/$f.26
+	done
+}
+
+pkg_postinst_module-init-tools() {
+	for f in sbin/insmod sbin/modprobe sbin/rmmod sbin/modinfo; do
+		bn=`basename $f`
+		update-alternatives --install /$f $bn /$f.26 60
+	done
+	update-alternatives --install /bin/lsmod bin-lsmod /bin/lsmod.26 60
+	update-alternatives --install /sbin/lsmod lsmod /bin/lsmod.26 60
+}
+
+pkg_prerm_module-init-tools() {
+	for f in sbin/insmod sbin/modprobe sbin/rmmod sbin/modinfo; do
+		bn=`basename $f`
+		update-alternatives --remove $bn /$f.26
+	done
+	update-alternatives --remove bin-lsmod /bin/lsmod.26
+	update-alternatives --remove lsmod /bin/lsmod.26
+}
+
+pkg_postinst_module-init-tools-depmod() {
+	update-alternatives --install /sbin/depmod depmod /sbin/depmod.26 60
+}
+
+pkg_prerm_module-init-tools-depmod() {
+	update-alternatives --remove depmod /sbin/depmod.26
+}
+
+SRC_URI[md5sum] = "bc44832c6e41707b8447e2847d2019f5"
+SRC_URI[sha256sum] = "e1f2cdcae64a8effc25e545a5e0bdaf312f816ebbcd0916e4e87450755fab64b"
-- 
cgit v1.2.3-54-g00ecf