[RFC PATCH 0/5] Linux 3.0 build support

[RFC PATCH 0/5] Linux 3.0 build support

[Anders Darander]

This work is unfinished and incomplete...
It is published in its current form both to get feedback, but also to aid
anyone else who is working on 3.0-support. If some of the patches are found to
be OK, it's fine to cherrypick them.

The kernel-related classes has been modified to build a 3.0 kernel. The
patches has been simplified by removing support for the 2.4-series. (The
latter was suggested in an older mail thread:
http://www.mail-archive.com/openembedded-core@lists.openembedded.org/msg02682.html
).

The patches has been tested on linux-yocto_2.6.37 and a hacked version using
the linux-yocto-dev repository (using a 3.0-rcX). The latest versions has only
been built for qemuarm, prior iterations has also been built for qemux86.

Finally, no work has been done on the libc-linux-headers classes and recipes.

/Anders

Please review the following changes for suitability for inclusion. If you have
any objections or suggestions for improvement, please respond to the patches. If
you agree with the changes, please provide your Acked-by.

The following changes since commit 835d817f1ba7b99167743fdb86ba80f3a07bd82d:

  systemtap: remove non-core COMPATIBLE_MACHINES (2011-06-16 22:12:40 +0100)

are available in the git repository at:
  git://github.com/darander/oe-core kernel-3.0
  https://github.com/darander/oe-core/tree/kernel-3.0

Anders Darander (5):
  Remove support for building 2.4 kernels
  module-init-tools-cross: add provides for depmod-3
  linux-kernel-base: add support for Linux 3.x
  modutils-initscripts: move recipe prior to modutils removal
  modutils: remove modutils

 meta/classes/kernel.bbclass                        |   22 ++---
 meta/classes/linux-kernel-base.bbclass             |    3 +
 meta/classes/module-base.bbclass                   |    2 +-
 .../{modutils => module-init-tools}/files/PD.patch |    0
 .../files/modutils.sh                              |    0
 .../module-init-tools-cross_3.12.bb                |    2 +-
 .../modutils-initscripts.bb                        |    0
 meta/recipes-kernel/modutils/files/armeb.patch     |   16 ----
 meta/recipes-kernel/modutils/files/configure.patch |   34 -------
 meta/recipes-kernel/modutils/files/gcc4.patch      |   93 --------------------
 meta/recipes-kernel/modutils/files/lex.l.diff      |   35 --------
 .../modutils/files/modutils-notest.patch           |   16 ----
 .../modutils/files/program_prefix.patch            |   71 ---------------
 .../recipes-kernel/modutils/modutils-collateral.bb |   21 -----
 .../modutils/modutils-cross/module.h.diff          |   35 --------
 .../modutils/modutils-cross_2.4.27.bb              |   20 ----
 meta/recipes-kernel/modutils/modutils_2.4.27.bb    |   93 --------------------
 17 files changed, 12 insertions(+), 451 deletions(-)
 rename meta/recipes-kernel/{modutils => module-init-tools}/files/PD.patch (100%)
 rename meta/recipes-kernel/{modutils => module-init-tools}/files/modutils.sh (100%)
 rename meta/recipes-kernel/{modutils => module-init-tools}/modutils-initscripts.bb (100%)
 delete mode 100644 meta/recipes-kernel/modutils/files/armeb.patch
 delete mode 100644 meta/recipes-kernel/modutils/files/configure.patch
 delete mode 100644 meta/recipes-kernel/modutils/files/gcc4.patch
 delete mode 100644 meta/recipes-kernel/modutils/files/lex.l.diff
 delete mode 100644 meta/recipes-kernel/modutils/files/modules
 delete mode 100644 meta/recipes-kernel/modutils/files/modules.conf
 delete mode 100644 meta/recipes-kernel/modutils/files/modutils-notest.patch
 delete mode 100644 meta/recipes-kernel/modutils/files/program_prefix.patch
 delete mode 100644 meta/recipes-kernel/modutils/modutils-collateral.bb
 delete mode 100644 meta/recipes-kernel/modutils/modutils-cross/module.h.diff
 delete mode 100644 meta/recipes-kernel/modutils/modutils-cross_2.4.27.bb
 delete mode 100644 meta/recipes-kernel/modutils/modutils_2.4.27.bb

-- 
1.7.4.1

[RFC PATCH 1/5] Remove support for building 2.4 kernels

[Anders Darander]

Signed-off-by: Anders Darander <anders@chargestorm.se>
---
 meta/classes/kernel.bbclass      |   22 +++++++---------------
 meta/classes/module-base.bbclass |    2 +-
 2 files changed, 8 insertions(+), 16 deletions(-)

diff --git a/meta/classes/kernel.bbclass b/meta/classes/kernel.bbclass
index 1bb69f5..3b6fc6b 100644
--- a/meta/classes/kernel.bbclass
+++ b/meta/classes/kernel.bbclass
@@ -73,9 +73,6 @@ KERNEL_ALT_IMAGETYPE ??= ""
 kernel_do_compile() {
 	unset CFLAGS CPPFLAGS CXXFLAGS LDFLAGS MACHINE
 	oe_runmake include/linux/version.h CC="${KERNEL_CC}" LD="${KERNEL_LD}"
-	if [ "${KERNEL_MAJOR_VERSION}" != "2.6" ]; then
-		oe_runmake dep CC="${KERNEL_CC}" LD="${KERNEL_LD}"
-	fi
 	oe_runmake ${KERNEL_IMAGETYPE} ${KERNEL_ALT_IMAGETYPE} CC="${KERNEL_CC}" LD="${KERNEL_LD}"
 }
 
@@ -102,7 +99,7 @@ kernel_do_install() {
 
 	#
 	# Install various kernel output (zImage, map file, config, module support files)
-	#	
+	#
 	install -d ${D}/${KERNEL_IMAGEDEST}
 	install -d ${D}/boot
 	install -m 0644 ${KERNEL_OUTPUT} ${D}/${KERNEL_IMAGEDEST}/${KERNEL_IMAGETYPE}-${KERNEL_VERSION}
@@ -111,9 +108,7 @@ kernel_do_install() {
 	install -m 0644 vmlinux ${D}/boot/vmlinux-${KERNEL_VERSION}
 	[ -e Module.symvers ] && install -m 0644 Module.symvers ${D}/boot/Module.symvers-${KERNEL_VERSION}
 	install -d ${D}/etc/modutils
-	if [ "${KERNEL_MAJOR_VERSION}" = "2.6" ]; then
-		install -d ${D}/etc/modprobe.d
-	fi
+	install -d ${D}/etc/modprobe.d
 
 	#
 	# Support for external module building - create a minimal copy of the
@@ -211,7 +206,7 @@ FILES_kernel-vmlinux = "/boot/vmlinux*"
 # misc is a package to contain files we need in staging
 FILES_kernel-misc = "/kernel/include/config /kernel/scripts /kernel/drivers/crypto /kernel/drivers/media"
 RDEPENDS_kernel = "kernel-base"
-# Allow machines to override this dependency if kernel image files are 
+# Allow machines to override this dependency if kernel image files are
 # not wanted in images as standard
 RDEPENDS_kernel-base ?= "kernel-image"
 PKG_kernel-image = "kernel-image-${@legitimize_package_name('${KERNEL_VERSION}')}"
@@ -295,7 +290,7 @@ python populate_packages_prepend () {
 				continue
 			vals[m.group(1)] = m.group(2)
 		return vals
-	
+
 	def parse_depmod():
 		import re
 
@@ -346,7 +341,7 @@ python populate_packages_prepend () {
 			line = f.readline()
 		f.close()
 		return deps
-	
+
 	def get_dependencies(file, pattern, format):
                 # file no longer includes PKGD
 		file = file.replace(bb.data.getVar('PKGD', d, 1) or '', '', 1)
@@ -390,10 +385,7 @@ python populate_packages_prepend () {
 		# Write out any modconf fragment
 		modconf = bb.data.getVar('module_conf_%s' % basename, d, 1)
 		if modconf:
-			if bb.data.getVar("KERNEL_MAJOR_VERSION", d, 1) == "2.6":
-				name = '%s/etc/modprobe.d/%s.conf' % (dvar, basename)
-			else:
-				name = '%s/etc/modutils/%s.conf' % (dvar, basename)
+			name = '%s/etc/modprobe.d/%s.conf' % (dvar, basename)
 			f = open(name, 'w')
 			f.write("%s\n" % modconf)
 			f.close()
@@ -469,7 +461,7 @@ kernel_do_deploy() {
 		tar -cvzf ${DEPLOYDIR}/modules-${KERNEL_VERSION}-${PR}-${MACHINE}.tgz -C ${D} lib
 	fi
 
-	if test "x${KERNEL_IMAGETYPE}" = "xuImage" ; then 
+	if test "x${KERNEL_IMAGETYPE}" = "xuImage" ; then
 		if test -e arch/${ARCH}/boot/uImage ; then
 			cp arch/${ARCH}/boot/uImage ${DEPLOYDIR}/${KERNEL_IMAGE_BASE_NAME}.bin
 		elif test -e arch/${ARCH}/boot/compressed/vmlinux ; then
diff --git a/meta/classes/module-base.bbclass b/meta/classes/module-base.bbclass
index c98bace..a7cf233 100644
--- a/meta/classes/module-base.bbclass
+++ b/meta/classes/module-base.bbclass
@@ -7,7 +7,7 @@ export CROSS_COMPILE = "${TARGET_PREFIX}"
 
 export KERNEL_VERSION = "${@base_read_file('${STAGING_KERNEL_DIR}/kernel-abiversion')}"
 export KERNEL_SOURCE = "${@base_read_file('${STAGING_KERNEL_DIR}/kernel-source')}"
-KERNEL_OBJECT_SUFFIX = "${@[".o", ".ko"][base_read_file('${STAGING_KERNEL_DIR}/kernel-abiversion') > "2.6.0"]}"
+KERNEL_OBJECT_SUFFIX = ".ko"
 KERNEL_CCSUFFIX = "${@base_read_file('${STAGING_KERNEL_DIR}/kernel-ccsuffix')}"
 KERNEL_LDSUFFIX = "${@base_read_file('${STAGING_KERNEL_DIR}/kernel-ldsuffix')}"
 KERNEL_ARSUFFIX = "${@base_read_file('${STAGING_KERNEL_DIR}/kernel-arsuffix')}"
-- 
1.7.4.1

Re: [RFC PATCH 1/5] Remove support for building 2.4 kernels

[Phil Blundell]

On Tue, 2011-06-21 at 20:18 +0200, Anders Darander wrote:
> Signed-off-by: Anders Darander <anders@chargestorm.se>
> ---
>  meta/classes/kernel.bbclass      |   22 +++++++---------------
>  meta/classes/module-base.bbclass |    2 +-
>  2 files changed, 8 insertions(+), 16 deletions(-)

This patch looks basically fine but it has quite a lot of extraneous
whitespace changes.  Could you try to filter those out in future, or
submit them as a separate patch?

p.

Re: [RFC PATCH 1/5] Remove support for building 2.4 kernels

[Anders Darander]

On Tue, Jun 21, 2011 at 20:47, Phil Blundell <pb@pbcl.net> wrote:
> On Tue, 2011-06-21 at 20:18 +0200, Anders Darander wrote:
>> Signed-off-by: Anders Darander <anders@chargestorm.se>
>> ---
>>  meta/classes/kernel.bbclass      |   22 +++++++---------------
>>  meta/classes/module-base.bbclass |    2 +-
>>  2 files changed, 8 insertions(+), 16 deletions(-)
>
> This patch looks basically fine but it has quite a lot of extraneous
> whitespace changes.  Could you try to filter those out in future, or
> submit them as a separate patch?

Sure, I'll try to watch out for these in the future.

Regards,
Anders

[RFC PATCH 2/5] module-init-tools-cross: add provides for depmod-3

[Anders Darander]

Signed-off-by: Anders Darander <anders@chargestorm.se>
---
 .../module-init-tools-cross_3.12.bb                |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

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
index 08bf1a9..9b6ab95 100644
--- 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
@@ -1,7 +1,7 @@
 require module-init-tools.inc
 PR = "r1"
 inherit cross
-PROVIDES += "virtual/${TARGET_PREFIX}depmod virtual/${TARGET_PREFIX}depmod-2.6"
+PROVIDES += "virtual/${TARGET_PREFIX}depmod virtual/${TARGET_PREFIX}depmod-2.6 virtual/${TARGET_PREFIX}depmod-3"
 
 SRC_URI += "file://no-static-binaries.patch"
 
-- 
1.7.4.1

Re: [RFC PATCH 2/5] module-init-tools-cross: add provides for depmod-3

[Koen Kooi]

Op 21 jun 2011, om 20:18 heeft Anders Darander het volgende geschreven:

> Signed-off-by: Anders Darander <anders@chargestorm.se>
> ---
> .../module-init-tools-cross_3.12.bb                |    2 +-
> 1 files changed, 1 insertions(+), 1 deletions(-)
> 
> 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
> index 08bf1a9..9b6ab95 100644
> --- 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
> @@ -1,7 +1,7 @@
> require module-init-tools.inc
> PR = "r1"
> inherit cross
> -PROVIDES += "virtual/${TARGET_PREFIX}depmod virtual/${TARGET_PREFIX}depmod-2.6"
> +PROVIDES += "virtual/${TARGET_PREFIX}depmod virtual/${TARGET_PREFIX}depmod-2.6 virtual/${TARGET_PREFIX}depmod-3"

Don't you need at least 3.13 (or better 3.16) for proper 3.0 support? This one was added after 3.12:

http://git.kernel.org/?p=utils/kernel/module-init-tools/module-init-tools.git;a=commitdiff;h=3328d178247017affd90b7897393699f2f45227d

regards,

Koen

Re: [RFC PATCH 2/5] module-init-tools-cross: add provides for depmod-3

[Anders Darander]

On Tue, Jun 21, 2011 at 20:22, Koen Kooi <koen@dominion.thruhere.net> wrote:
> Don't you need at least 3.13 (or better 3.16) for proper 3.0 support? This one was added after 3.12:
>
> http://git.kernel.org/?p=utils/kernel/module-init-tools/module-init-tools.git;a=commitdiff;h=3328d178247017affd90b7897393699f2f45227d

That's of course true...

I'll send a version 2 at some time.

Regards,
Anders

Re: [RFC PATCH 2/5] module-init-tools-cross: add provides for depmod-3

[Phil Blundell]

On Tue, 2011-06-21 at 20:18 +0200, Anders Darander wrote:
> -PROVIDES += "virtual/${TARGET_PREFIX}depmod virtual/${TARGET_PREFIX}depmod-2.6"
> +PROVIDES += "virtual/${TARGET_PREFIX}depmod virtual/${TARGET_PREFIX}depmod-2.6 virtual/${TARGET_PREFIX}depmod-3"

Can we not just ditch the versioned virtuals and have all the
dependencies use plain virtual/depmod now?

p.

Re: [RFC PATCH 2/5] module-init-tools-cross: add provides for depmod-3

[Anders Darander]

On Tue, Jun 21, 2011 at 20:46, Phil Blundell <pb@pbcl.net> wrote:
> On Tue, 2011-06-21 at 20:18 +0200, Anders Darander wrote:
>> -PROVIDES += "virtual/${TARGET_PREFIX}depmod virtual/${TARGET_PREFIX}depmod-2.6"
>> +PROVIDES += "virtual/${TARGET_PREFIX}depmod virtual/${TARGET_PREFIX}depmod-2.6 virtual/${TARGET_PREFIX}depmod-3"
>
> Can we not just ditch the versioned virtuals and have all the
> dependencies use plain virtual/depmod now?

Well, when thinking about it, that sounds like a good idea. If we are
ditching 2.4-support, as in my patches, there will only be one module
format, as well as one depmod (or two, if we count the busybox
version).

Lets think about it, and I'll probably address that in v2.

Regards,
Anders

Re: [RFC PATCH 2/5] module-init-tools-cross: add provides for depmod-3

[Anders Darander]

On Tue, Jun 21, 2011 at 21:03, Anders Darander
<anders.darander@gmail.com> wrote:
> On Tue, Jun 21, 2011 at 20:46, Phil Blundell <pb@pbcl.net> wrote:
>> On Tue, 2011-06-21 at 20:18 +0200, Anders Darander wrote:
>>> -PROVIDES += "virtual/${TARGET_PREFIX}depmod virtual/${TARGET_PREFIX}depmod-2.6"
>>> +PROVIDES += "virtual/${TARGET_PREFIX}depmod virtual/${TARGET_PREFIX}depmod-2.6 virtual/${TARGET_PREFIX}depmod-3"
>>
>> Can we not just ditch the versioned virtuals and have all the
>> dependencies use plain virtual/depmod now?
>
> Well, when thinking about it, that sounds like a good idea. If we are
> ditching 2.4-support, as in my patches, there will only be one module
> format, as well as one depmod (or two, if we count the busybox
> version).

I'll try to address this, as well as an update to module-init-tools 3.16 in a
v2. It'll probably take a few days before I can find the time necessary, though.

Regards,
Anders

[RFC PATCH 3/5] linux-kernel-base: add support for Linux 3.x

[Anders Darander]

Return 2.X as major version for kernels 2.X, and return
X for kernels X.Y (X>=3).

Signed-off-by: Anders Darander <anders@chargestorm.se>
---
 meta/classes/linux-kernel-base.bbclass |    3 +++
 1 files changed, 3 insertions(+), 0 deletions(-)

diff --git a/meta/classes/linux-kernel-base.bbclass b/meta/classes/linux-kernel-base.bbclass
index 510951a..fa32379 100644
--- a/meta/classes/linux-kernel-base.bbclass
+++ b/meta/classes/linux-kernel-base.bbclass
@@ -29,6 +29,9 @@ def get_kernelmajorversion(p):
 	r = re.compile("([0-9]+\.[0-9]+).*")
 	m = r.match(p);
 	if m:
+		i = m.group(1).partition('.')[0]
+		if int(i) > 2:
+			return i
 		return m.group(1)
 	return None
 
-- 
1.7.4.1

Re: [RFC PATCH 3/5] linux-kernel-base: add support for Linux 3.x

[Phil Blundell]

On Tue, 2011-06-21 at 20:18 +0200, Anders Darander wrote:
> Return 2.X as major version for kernels 2.X, and return
> X for kernels X.Y (X>=3).

I'm not quite sure I understand what this particular logic is useful
for.  If we're removing 2.4 support (which I'm fairly relaxed about)
then it seems as though this whole "kernel_majorversion" thing can and
should just go away.  

Or, alternatively, perhaps it should be mapped into a more abstract kind
of "kernel epoch" thing which treats 2.6 and 3.0 as basically the same.

p.

Re: [RFC PATCH 3/5] linux-kernel-base: add support for Linux 3.x

[Anders Darander]

On Tue, Jun 21, 2011 at 20:45, Phil Blundell <pb@pbcl.net> wrote:
> On Tue, 2011-06-21 at 20:18 +0200, Anders Darander wrote:
>> Return 2.X as major version for kernels 2.X, and return
>> X for kernels X.Y (X>=3).
>
> I'm not quite sure I understand what this particular logic is useful
> for.  If we're removing 2.4 support (which I'm fairly relaxed about)
> then it seems as though this whole "kernel_majorversion" thing can and
> should just go away.

If we should remove the kernel_majorversion, we'll have to double check that
this isn't used somewhere else. If it isn't, I'm all in favor of removing it.

> Or, alternatively, perhaps it should be mapped into a more abstract kind
> of "kernel epoch" thing which treats 2.6 and 3.0 as basically the same.

If we keep the kernel_majorversion, we'll need to have something
similar to this,
as the major version up to 2.6 was determined by X.Y. From 3.0, only the first
digit represents the major number; while the second digit (0 in 3.0)
is equal to
x in 2.6.x. Thus, the function to determine the major version has to
return either
2.6 or 3.

Regards,
Anders

Re: [RFC PATCH 3/5] linux-kernel-base: add support for Linux 3.x

[Phil Blundell]

On Tue, 2011-06-21 at 21:10 +0200, Anders Darander wrote:
> If we keep the kernel_majorversion, we'll need to have something
> similar to this,
> as the major version up to 2.6 was determined by X.Y. From 3.0, only the first
> digit represents the major number; while the second digit (0 in 3.0)
> is equal to
> x in 2.6.x. Thus, the function to determine the major version has to
> return either
> 2.6 or 3.

Well, the thing is that OE's "kernelmajorversion" was always something
of an artificial construct.  It was introduced purely as a way of coping
with some of the differences between 2.4 and 2.6: this was primarily the
different module format, but it also happened to coincide with major
rewrites of the iPAQ and Zaurus kernels which were the main ones we were
using in OE at the time.  Returning "3" here isn't going to be helpful
since none of the classes will know what to do with that value: all they
ever do is compare it against either 2.4 or 2.6.  The exact form of
those tests has never been standardised, so there is a risk that you
might encounter

if [ "$KERNEL_MAJORVERSION" != "2.6" ]; then
  # must be 2.4!
fi

which would evidently lose quite badly if the major version were
suddenly to become 3.

Since there are no material differences between Linux 2.6 and Linux 3.0
that OE needs to be aware of, I think it would make most sense for
kernelmajorversion() to continue returning "2.6" for Linux 3.0 and
future versions if we did want to keep that mechanism.

However, since the whole purpose of the mechanism was to ease the
transition from 2.4 to 2.6, I am fairly confident that it can just be
deleted altogether if support for 2.4 is being removed. 

p.

Re: [RFC PATCH 3/5] linux-kernel-base: add support for Linux 3.x

[Anders Darander]

On Wed, Jun 22, 2011 at 12:22, Phil Blundell <pb@pbcl.net> wrote:
> On Tue, 2011-06-21 at 21:10 +0200, Anders Darander wrote:
>> If we keep the kernel_majorversion, we'll need to have something
>> similar to this,
>> as the major version up to 2.6 was determined by X.Y. From 3.0, only the first
>> digit represents the major number; while the second digit (0 in 3.0)
>> is equal to
>> x in 2.6.x. Thus, the function to determine the major version has to
>> return either
>> 2.6 or 3.
>
> Well, the thing is that OE's "kernelmajorversion" was always something
> of an artificial construct.  It was introduced purely as a way of coping
> with some of the differences between 2.4 and 2.6: this was primarily the
> different module format, but it also happened to coincide with major
> rewrites of the iPAQ and Zaurus kernels which were the main ones we were
> using in OE at the time.  Returning "3" here isn't going to be helpful
> since none of the classes will know what to do with that value: all they
> ever do is compare it against either 2.4 or 2.6.  The exact form of
> those tests has never been standardised, so there is a risk that you
> might encounter

I assumed that the reason was that; and it's nice to get a better grip of the
older history. (At that time I was more concerned with Buildroot and uCLinux).

> Since there are no material differences between Linux 2.6 and Linux 3.0
> that OE needs to be aware of, I think it would make most sense for
> kernelmajorversion() to continue returning "2.6" for Linux 3.0 and
> future versions if we did want to keep that mechanism.

Yes, and that's why I completely removed the tests in the bbclasses that
I've touch sofar.

> However, since the whole purpose of the mechanism was to ease the
> transition from 2.4 to 2.6, I am fairly confident that it can just be
> deleted altogether if support for 2.4 is being removed.

Sounds good. I'll grep through a few more classes to see if the tests seems
to occur in more places. Unless I find that the major version is used for
something else, I'll remove it.

Regards,
Anders

[RFC PATCH 4/5] modutils-initscripts: move recipe prior to modutils removal

[Anders Darander]

Signed-off-by: Anders Darander <anders@chargestorm.se>
---
 .../{modutils => module-init-tools}/files/PD.patch |    0
 .../files/modutils.sh                              |    0
 .../modutils-initscripts.bb                        |    0
 3 files changed, 0 insertions(+), 0 deletions(-)
 rename meta/recipes-kernel/{modutils => module-init-tools}/files/PD.patch (100%)
 rename meta/recipes-kernel/{modutils => module-init-tools}/files/modutils.sh (100%)
 rename meta/recipes-kernel/{modutils => module-init-tools}/modutils-initscripts.bb (100%)

diff --git a/meta/recipes-kernel/modutils/files/PD.patch b/meta/recipes-kernel/module-init-tools/files/PD.patch
similarity index 100%
rename from meta/recipes-kernel/modutils/files/PD.patch
rename to meta/recipes-kernel/module-init-tools/files/PD.patch
diff --git a/meta/recipes-kernel/modutils/files/modutils.sh b/meta/recipes-kernel/module-init-tools/files/modutils.sh
similarity index 100%
rename from meta/recipes-kernel/modutils/files/modutils.sh
rename to meta/recipes-kernel/module-init-tools/files/modutils.sh
diff --git a/meta/recipes-kernel/modutils/modutils-initscripts.bb b/meta/recipes-kernel/module-init-tools/modutils-initscripts.bb
similarity index 100%
rename from meta/recipes-kernel/modutils/modutils-initscripts.bb
rename to meta/recipes-kernel/module-init-tools/modutils-initscripts.bb
-- 
1.7.4.1

[RFC PATCH 5/5] modutils: remove modutils

[Anders Darander]

As 2.4 support is being phased out, remove modutils.

Signed-off-by: Anders Darander <anders@chargestorm.se>
---
 meta/recipes-kernel/modutils/files/armeb.patch     |   16 ----
 meta/recipes-kernel/modutils/files/configure.patch |   34 -------
 meta/recipes-kernel/modutils/files/gcc4.patch      |   93 --------------------
 meta/recipes-kernel/modutils/files/lex.l.diff      |   35 --------
 .../modutils/files/modutils-notest.patch           |   16 ----
 .../modutils/files/program_prefix.patch            |   71 ---------------
 .../recipes-kernel/modutils/modutils-collateral.bb |   21 -----
 .../modutils/modutils-cross/module.h.diff          |   35 --------
 .../modutils/modutils-cross_2.4.27.bb              |   20 ----
 meta/recipes-kernel/modutils/modutils_2.4.27.bb    |   93 --------------------
 10 files changed, 0 insertions(+), 434 deletions(-)
 delete mode 100644 meta/recipes-kernel/modutils/files/armeb.patch
 delete mode 100644 meta/recipes-kernel/modutils/files/configure.patch
 delete mode 100644 meta/recipes-kernel/modutils/files/gcc4.patch
 delete mode 100644 meta/recipes-kernel/modutils/files/lex.l.diff
 delete mode 100644 meta/recipes-kernel/modutils/files/modules
 delete mode 100644 meta/recipes-kernel/modutils/files/modules.conf
 delete mode 100644 meta/recipes-kernel/modutils/files/modutils-notest.patch
 delete mode 100644 meta/recipes-kernel/modutils/files/program_prefix.patch
 delete mode 100644 meta/recipes-kernel/modutils/modutils-collateral.bb
 delete mode 100644 meta/recipes-kernel/modutils/modutils-cross/module.h.diff
 delete mode 100644 meta/recipes-kernel/modutils/modutils-cross_2.4.27.bb
 delete mode 100644 meta/recipes-kernel/modutils/modutils_2.4.27.bb

diff --git a/meta/recipes-kernel/modutils/files/armeb.patch b/meta/recipes-kernel/modutils/files/armeb.patch
deleted file mode 100644
index 3198553..0000000
--- a/meta/recipes-kernel/modutils/files/armeb.patch
+++ /dev/null
@@ -1,16 +0,0 @@
-Upstream-Status: Pending
-
---- modutils-2.4.27/include/elf_arm.h.orig	2004-09-21 18:37:00.000000000 -0400
-+++ modutils-2.4.27/include/elf_arm.h	2004-09-21 18:38:18.000000000 -0400
-@@ -1,7 +1,11 @@
- /* Machine-specific elf macros for ARM.  */
- 
- #define ELFCLASSM	ELFCLASS32
-+#ifdef __ARMEB__
-+#define ELFDATAM	ELFDATA2MSB
-+#else
- #define ELFDATAM	ELFDATA2LSB
-+#endif
- 
- #define MATCH_MACHINE(x)  (x == EM_ARM)
- 
diff --git a/meta/recipes-kernel/modutils/files/configure.patch b/meta/recipes-kernel/modutils/files/configure.patch
deleted file mode 100644
index 63e80d7..0000000
--- a/meta/recipes-kernel/modutils/files/configure.patch
+++ /dev/null
@@ -1,34 +0,0 @@
-Upstream-Status: Pending
-
-#
-# Patch managed by http://www.mn-logistik.de/unsupported/pxa250/patcher
-#
-
---- modutils-2.4.25/./configure.in~configure
-+++ modutils-2.4.25/./configure.in
-@@ -1,4 +1,5 @@
--AC_INIT(insmod/insmod.c)
-+AC_INIT
-+AC_CONFIG_SRCDIR([insmod/insmod.c])
- AC_PREFIX_DEFAULT(/usr)
- 
- # Canonical system uses CC_FOR_BUILD while Linux may use BUILDCC
-@@ -15,7 +16,7 @@
- BUILDCC="$CC_FOR_BUILD"
- export CC_FOR_BUILD
- 
--AC_CANONICAL_SYSTEM
-+AC_CANONICAL_TARGET([])
- 
- # Handle target_cpu for compatibility.
- if test "$host_cpu" != "$target_cpu"; then
-@@ -350,6 +351,7 @@
-   fi
- fi
- 
--AC_OUTPUT(Makefile Makefile.common depmod/Makefile genksyms/Makefile
-+AC_CONFIG_FILES([Makefile Makefile.common depmod/Makefile genksyms/Makefile
- 	  insmod/Makefile $kerneld_Makefiles obj/Makefile util/Makefile
--	  man/Makefile)
-+	  man/Makefile])
-+AC_OUTPUT
diff --git a/meta/recipes-kernel/modutils/files/gcc4.patch b/meta/recipes-kernel/modutils/files/gcc4.patch
deleted file mode 100644
index 4507b03..0000000
--- a/meta/recipes-kernel/modutils/files/gcc4.patch
+++ /dev/null
@@ -1,93 +0,0 @@
-Upstream-Status: Pending
-
-Index: modutils-2.4.27/depmod/depmod.c
-===================================================================
---- modutils-2.4.27.orig/depmod/depmod.c
-+++ modutils-2.4.27/depmod/depmod.c
-@@ -1133,7 +1133,7 @@ static int addksyms(char *file_syms)
- 
- 		for (ksym = ksyms; so_far < nksyms; ++so_far, ksym++) {
- 			if (strncmp((char *)ksym->name, "GPLONLY_", 8) == 0)
--				((char *)ksym->name) += 8;
-+				ksym->name += 8;
- 			assert(n_syms < MAX_MAP_SYM);
- 			symtab[n_syms++] = addsym((char *)ksym->name, mod, SYM_DEFINED, 0);
- 		}
-Index: modutils-2.4.27/genksyms/genksyms.c
-===================================================================
---- modutils-2.4.27.orig/genksyms/genksyms.c
-+++ modutils-2.4.27/genksyms/genksyms.c
-@@ -45,7 +45,7 @@ char *cur_filename, *output_directory;
- int flag_debug, flag_dump_defs, flag_warnings;
- int checksum_version = 1, kernel_version = version(2,0,0);
- 
--static int errors;
-+int errors;
- static int nsyms;
- 
- static struct symbol *expansion_trail;
-Index: modutils-2.4.27/insmod/insmod.c
-===================================================================
---- modutils-2.4.27.orig/insmod/insmod.c
-+++ modutils-2.4.27/insmod/insmod.c
-@@ -275,7 +275,7 @@ static int add_symbols_from(struct obj_f
- 		if (strncmp((char *)s->name, "GPLONLY_", 8) == 0) {
- 			gplonly_seen = 1;
- 			if (gpl)
--				((char *)s->name) += 8;
-+				s->name += 8;
- 			else
- 				continue;
- 		}
-Index: modutils-2.4.27/obj/obj_kallsyms.c
-===================================================================
---- modutils-2.4.27.orig/obj/obj_kallsyms.c
-+++ modutils-2.4.27/obj/obj_kallsyms.c
-@@ -200,7 +200,7 @@ obj_kallsyms (struct obj_file *fin, stru
- 
-     /* Initial contents, header + one entry per input section.  No strings. */
-     osec->header.sh_size = sizeof(*a_hdr) + loaded*sizeof(*a_sec);
--    a_hdr = (struct kallsyms_header *) osec->contents =
-+    a_hdr = osec->contents =
-     	xmalloc(osec->header.sh_size);
-     memset(osec->contents, 0, osec->header.sh_size);
-     a_hdr->size = sizeof(*a_hdr);
-@@ -275,7 +275,7 @@ obj_kallsyms (struct obj_file *fin, stru
- 	a_hdr->symbol_off +
- 	a_hdr->symbols*a_hdr->symbol_size +
- 	strings_size - strings_left;
--    a_hdr = (struct kallsyms_header *) osec->contents =
-+    a_hdr = osec->contents =
- 	xrealloc(a_hdr, a_hdr->total_size);
-     p = (char *)a_hdr + a_hdr->symbol_off;
-     memcpy(p, symbols, a_hdr->symbols*a_hdr->symbol_size);
-Index: modutils-2.4.27/obj/obj_mips.c
-===================================================================
---- modutils-2.4.27.orig/obj/obj_mips.c
-+++ modutils-2.4.27/obj/obj_mips.c
-@@ -244,7 +244,9 @@ arch_archdata (struct obj_file *f, struc
-   archdata_sec->header.sh_size = 0;
-   sec = obj_find_section(f, "__dbe_table");
-   if (sec) {
--    ad = (struct archdata *) (archdata_sec->contents) = xmalloc(sizeof(*ad));
-+/*    ad = (struct archdata *) (archdata_sec->contents) = xmalloc(sizeof(*ad));*/
-+    archdata_sec->contents = xmalloc(sizeof(*ad));
-+    ad = (struct archdata *) (archdata_sec->contents);
-     memset(ad, 0, sizeof(*ad));
-     archdata_sec->header.sh_size = sizeof(*ad);
-     ad->__start___dbe_table = sec->header.sh_addr;
-Index: modutils-2.4.27/obj/obj_ppc.c
-===================================================================
---- modutils-2.4.27.orig/obj/obj_ppc.c
-+++ modutils-2.4.27/obj/obj_ppc.c
-@@ -255,7 +255,9 @@ arch_archdata (struct obj_file *f, struc
-   archdata_sec->header.sh_size = 0;
-   sec = obj_find_section(f, "__ftr_fixup");
-   if (sec) {
--    ad = (struct archdata *) (archdata_sec->contents) = xmalloc(sizeof(*ad));
-+    /* ad = (struct archdata *) (archdata_sec->contents) = xmalloc(sizeof(*ad)); */
-+    archdata_sec->contents = xmalloc(sizeof(*ad));
-+    ad = (struct archdata *) (archdata_sec->contents);
-     memset(ad, 0, sizeof(*ad));
-     archdata_sec->header.sh_size = sizeof(*ad);
-     ad->__start___ftr_fixup = sec->header.sh_addr;
diff --git a/meta/recipes-kernel/modutils/files/lex.l.diff b/meta/recipes-kernel/modutils/files/lex.l.diff
deleted file mode 100644
index b2419a4..0000000
--- a/meta/recipes-kernel/modutils/files/lex.l.diff
+++ /dev/null
@@ -1,35 +0,0 @@
-Upstream-Status: Pending
-
---- modutils-2.4.26.orig/genksyms/lex.l
-+++ modutils-2.4.26/genksyms/lex.l
-@@ -130,6 +130,7 @@
- 
-   static int suppress_type_lookup, dont_want_brace_phrase;
-   static struct string_list *next_node;
-+  static int next_token = 0;
- 
-   int token, count = 0;
-   struct string_list *cur_node;
-@@ -144,7 +145,12 @@
-     }
- 
- repeat:
--  token = yylex1();
-+  if (next_token != 0) {
-+    token = next_token;
-+    next_token = 0;
-+  }
-+  else
-+    token = yylex1();
- 
-   if (token == 0)
-     return 0;
-@@ -425,7 +431,7 @@
- 	    {
- 	      /* Put back the token we just read so's we can find it again
- 		 after registering the expression.  */
--	      unput(token);
-+	      next_token = token;
- 
- 	      lexstate = ST_NORMAL;
- 	      token = EXPRESSION_PHRASE;
diff --git a/meta/recipes-kernel/modutils/files/modules b/meta/recipes-kernel/modutils/files/modules
deleted file mode 100644
index e69de29..0000000
diff --git a/meta/recipes-kernel/modutils/files/modules.conf b/meta/recipes-kernel/modutils/files/modules.conf
deleted file mode 100644
index e69de29..0000000
diff --git a/meta/recipes-kernel/modutils/files/modutils-notest.patch b/meta/recipes-kernel/modutils/files/modutils-notest.patch
deleted file mode 100644
index ab100f2..0000000
--- a/meta/recipes-kernel/modutils/files/modutils-notest.patch
+++ /dev/null
@@ -1,16 +0,0 @@
-This test disables the annoying
-   Note: /etc/modules.conf is more recent than /lib/modules/2.4.19-rmk6-pxa1/modules.dep
-message.
-
-Upstream-Status: Inappropriate [disable feature]
-
---- modutils-2.4.6/insmod/modprobe.c~notest	Mon Feb 26 02:07:17 2001
-+++ modutils-2.4.6/insmod/modprobe.c	Wed Feb 19 14:31:52 2003
-@@ -785,7 +785,6 @@
- 		return -1;
- 	}
- 
--#define EXTREMELY_CAUTIOUS
- #ifdef EXTREMELY_CAUTIOUS
- 	if (fstat(fileno(fin), &statbuf) != 0)
- 		error("Could not stat %s", depfile);
diff --git a/meta/recipes-kernel/modutils/files/program_prefix.patch b/meta/recipes-kernel/modutils/files/program_prefix.patch
deleted file mode 100644
index 973705e..0000000
--- a/meta/recipes-kernel/modutils/files/program_prefix.patch
+++ /dev/null
@@ -1,71 +0,0 @@
-Upstream-Status: Pending
-
---- modutils-2.4.25/Makefile.common.in	Sun Nov 24 21:23:35 2002
-+++ modutils-2.4.25/Makefile.common.in	Thu Jan 29 17:16:30 2004
-@@ -7,6 +7,7 @@
- mandir		= @mandir@
- prefix		= @prefix@
- sbindir		= @sbindir@
-+transform	= @program_transform_name@
- 
- AR		= @AR@
- ARCH		= @ARCH@
---- modutils-2.4.25/configure.in	Thu Jan 29 17:24:10 2004
-+++ modutils-2.4.25/configure.in	Thu Jan 29 17:13:59 2004
-@@ -17,6 +17,7 @@
- export CC_FOR_BUILD
- 
- AC_CANONICAL_TARGET([])
-+AC_ARG_PROGRAM
- 
- # Handle target_cpu for compatibility.
- if test "$host_cpu" != "$target_cpu"; then
---- modutils-2.4.25/depmod/Makefile.in	Fri Mar 28 17:54:20 2003
-+++ modutils-2.4.25/depmod/Makefile.in	Thu Jan 29 17:16:41 2004
-@@ -60,7 +60,7 @@
- 
- install install-bin: all
- 	$(MKDIR) $(DESTDIR)$(sbindir)
--	$(INSTALL) $(STRIP) depmod $(DESTDIR)$(sbindir)
-+	$(INSTALL) $(STRIP) depmod $(DESTDIR)$(sbindir)/`echo depmod | sed -e'$(transform)'`
- 
- dep depend .depend: depmod.c
- 	$(CC) -M $(CFLAGS) $(DEFSNOARCH) $(DEFS) $^ > .depend
---- modutils-2.4.25/genksyms/Makefile.in	Sun Nov 24 21:23:35 2002
-+++ modutils-2.4.25/genksyms/Makefile.in	Thu Jan 29 17:17:07 2004
-@@ -62,7 +62,7 @@
- 
- install install-bin: all
- 	$(MKDIR) $(DESTDIR)$(sbindir)
--	$(INSTALL) $(STRIP) genksyms $(DESTDIR)$(sbindir)
-+	$(INSTALL) $(STRIP) genksyms $(DESTDIR)$(sbindir)/`echo genksyms | sed -e'$(transform)'`
- 
- # auto-generated dependancies are almost redundant once we add all the
- # rules to get the generated files built first.
---- modutils-2.4.25/insmod/Makefile.in	Fri Mar 28 17:54:20 2003
-+++ modutils-2.4.25/insmod/Makefile.in	Thu Jan 29 17:21:10 2004
-@@ -120,16 +120,19 @@
- 	@set -ex;\
- 	for i in $(TARGETS_REAL); do \
- 	$(MKDIR) $(DESTDIR)$(sbindir); \
--	$(INSTALL) $(STRIP) $$i $(DESTDIR)$(sbindir); done;
-+	f=`echo $$i|sed -e'$(transform)'`; \
-+	$(INSTALL) $(STRIP) $$i $(DESTDIR)$(sbindir)/$$f; done;
- 	set -e; \
--	for i in $(srcdir)/insmod_ksymoops_clean $(srcdir)/kernelversion; do \
-+	for i in insmod_ksymoops_clean kernelversion; do \
- 	$(MKDIR) $(DESTDIR)$(sbindir); \
--	$(INSTALL) $$i $(DESTDIR)$(sbindir); done;
-+	f=`echo $$i|sed -e'$(transform)'`; \
-+	$(INSTALL) $$i $(DESTDIR)$(sbindir)/$$f; done;
- 	set -e; \
- 	for i in $(COMB); do \
--	ln -sf insmod $(DESTDIR)$(sbindir)/$$i; \
-+	f=`echo $$i|sed -e'$(transform)'`; \
-+	ln -sf `echo insmod|sed -e'$(transform)'` $(DESTDIR)$(sbindir)/$$f; \
- 	(test "$(insmod_static)" = yes && \
--		ln -sf insmod.static $(DESTDIR)$(sbindir)/$$i.static) || true; \
-+		ln -sf `echo insmod.static|sed -e'$(transform)'`  $(DESTDIR)$(sbindir)/$$f.static) || true; \
- 	done
- 
- clean:
diff --git a/meta/recipes-kernel/modutils/modutils-collateral.bb b/meta/recipes-kernel/modutils/modutils-collateral.bb
deleted file mode 100644
index 919b86f..0000000
--- a/meta/recipes-kernel/modutils/modutils-collateral.bb
+++ /dev/null
@@ -1,21 +0,0 @@
-SECTION = "base"
-DESCRIPTION = "modutils configuration files"
-PR = "r3"
-LICENSE = "MIT"
-LIC_FILES_CHKSUM = "file://${COREBASE}/meta/COPYING.MIT;md5=3da9cfbcb788c80a0384361b4de20420"
-SRC_URI = "file://modules \
-	   file://modules.conf" 
-
-do_compile () {
-}
-
-do_install () {
-	install -d ${D}${sysconfdir}
-	install -m 0644 ${WORKDIR}/modules ${D}${sysconfdir}/modules
-        if [ ${MAJOR_KERNEL_VERSION}=2.6 ]; then
-  	 install -d ${D}${sysconfdir}/modprobe.d         
-        else
- 	 install -m 0644 ${WORKDIR}/modules.conf ${D}${sysconfdir}/modules.conf
-        fi
-
-}
diff --git a/meta/recipes-kernel/modutils/modutils-cross/module.h.diff b/meta/recipes-kernel/modutils/modutils-cross/module.h.diff
deleted file mode 100644
index e9f1224..0000000
--- a/meta/recipes-kernel/modutils/modutils-cross/module.h.diff
+++ /dev/null
@@ -1,35 +0,0 @@
-Upstream-Status: Pending
-
-diff -urN modutils-2.4.27.orig/include/module.h modutils-2.4.27/include/module.h
---- modutils-2.4.27.orig/include/module.h	2003-01-27 11:22:02.000000000 -0500
-+++ modutils-2.4.27/include/module.h	2004-08-23 19:52:34.756772712 -0400
-@@ -88,6 +88,20 @@
- /* For sizeof() which are related to the module platform and not to the
-    environment isnmod is running in, use sizeof_xx instead of sizeof(xx).  */
- 
-+/* Additional test for OE, set tgt_blah correct for the target arch, *not* the
-+   native arch. If int isn't 32bit on the native machine we're in trouble. */
-+
-+#ifdef ARCH_arm
-+#define tgt_sizeof_char		sizeof(char)
-+#define tgt_sizeof_short	sizeof(short)
-+#define tgt_sizeof_int		sizeof(int)
-+#define tgt_sizeof_long		4
-+#define tgt_sizeof_char_p	4
-+#define tgt_sizeof_void_p	4
-+#define tgt_long		int
-+#define tgt_long_fmt		"l"
-+#define tgt_strtoul		strtoul
-+#else
- #define tgt_sizeof_char		sizeof(char)
- #define tgt_sizeof_short	sizeof(short)
- #define tgt_sizeof_int		sizeof(int)
-@@ -97,7 +111,7 @@
- #define tgt_long		long
- #define tgt_long_fmt		"l"
- #define tgt_strtoul		strtoul
--
-+#endif
- /* This assumes that long long on a 32 bit system is equivalent to long on the
-  * equivalent 64 bit system.  Also that void and char pointers are 8 bytes on
-  * all 64 bit systems.  Add per system tweaks if it ever becomes necessary.
diff --git a/meta/recipes-kernel/modutils/modutils-cross_2.4.27.bb b/meta/recipes-kernel/modutils/modutils-cross_2.4.27.bb
deleted file mode 100644
index f7c68bb..0000000
--- a/meta/recipes-kernel/modutils/modutils-cross_2.4.27.bb
+++ /dev/null
@@ -1,20 +0,0 @@
-require modutils_${PV}.bb
-PR = "r10"
-inherit cross
-DEPENDS = ""
-PACKAGES = ""
-PROVIDES += "virtual/${TARGET_PREFIX}depmod virtual/${TARGET_PREFIX}depmod-2.4"
-DEFAULT_PREFERENCE = "1"
-
-SRC_URI +=  "file://modutils-cross/module.h.diff;patch=1"
-
-sbindir = "${prefix}/bin"
-
-EXTRA_OECONF_append = " --program-prefix=${TARGET_PREFIX}"
-
-CFLAGS_prepend_mipsel = "-D__MIPSEL__"
-CFLAGS_prepend_mipseb = "-D__MIPSEB__"
-
-do_install_append () {
-        mv ${D}${sbindir}/${TARGET_PREFIX}depmod ${D}${sbindir}/${TARGET_PREFIX}depmod-2.4
-}
diff --git a/meta/recipes-kernel/modutils/modutils_2.4.27.bb b/meta/recipes-kernel/modutils/modutils_2.4.27.bb
deleted file mode 100644
index 1ebc90c..0000000
--- a/meta/recipes-kernel/modutils/modutils_2.4.27.bb
+++ /dev/null
@@ -1,93 +0,0 @@
-SECTION = "base"
-SUMMARY = "Kernel module utilities"
-DESCRIPTION = "These utilities are intended to make a Linux modular kernel \
-manageable for all users, administrators and distribution maintainers."
-LICENSE = "GPLv2"
-LIC_FILES_CHKSUM = "file://COPYING;md5=8ca43cbc842c2336e835926c2166c28b"
-DEPENDS = "bison-native"
-PR = "r9"
-
-SRC_URI = "${KERNELORG_MIRROR}/linux/utils/kernel/modutils/v2.4/modutils-${PV}.tar.bz2 \
-           file://lex.l.diff;patch=1 \
-           file://modutils-notest.patch;patch=1 \
-           file://configure.patch;patch=1 \
-           file://program_prefix.patch;patch=1 \
-           file://armeb.patch;patch=1 \
-	   file://gcc4.patch;patch=1"
-
-SRC_URI[md5sum] = "bac989c74ed10f3bf86177fc5b4b89b6"
-SRC_URI[sha256sum] = "ab4c9191645f9ffb455ae7c014d8c45339c13a1d0f6914817cfbf30a0bc56bf0"
-
-inherit autotools
-
-# modutils go in /sbin
-sbindir = "/sbin"
-EXTRA_OECONF = "--disable-strip"
-export BUILDCC = "${BUILD_CC}"
-export BUILDCFLAGS = "${BUILD_CFLAGS}"
-
-do_install () {
-	oe_runmake 'DESTDIR=${D}' install
-	install -d ${D}${sysconfdir}
-	rm ${D}${base_sbindir}/lsmod
-	install -d ${D}${base_bindir}/
-	ln -s ../sbin/insmod ${D}${base_bindir}/lsmod
-        for f in bin/lsmod sbin/insmod sbin/rmmod sbin/modprobe sbin/modinfo sbin/depmod; do                mv ${D}/$f ${D}/$f.24
-        done
-}
-
-pkg_postinst_modutils () {
-#!/bin/sh
-for f in sbin/insmod sbin/modprobe sbin/rmmod bin/lsmod; do
-	bn=`basename $f`
-	update-alternatives --install /$f $bn /$f.24 10
-done
-if test -n "$D"; then
-	D="-r $D"
-	if test -n "`which ${TARGET_PREFIX}depmod-2.4`"; then
-		for kerneldir in `ls -p $D/lib/modules|grep /`; do
-			kernelver=`basename $kerneldir`
-			${TARGET_PREFIX}depmod-2.4 -a -b $D -C ${IMAGE_ROOTFS}/${sysconfdir}/modules.conf -r $kernelver
-		done
-	fi
-fi
-update-rc.d $D modutils.sh start 20 S .
-}
-
-pkg_prerm_modutils () {
-#!/bin/sh
-for f in sbin/insmod sbin/modprobe sbin/rmmod sbin/depmod sbin/modinfo bin/lsmod; do
-bn=`basename $f`
-	update-alternatives --remove $bn /$f.24
-done
-if test -n "$D"; then
-	D="-r $D"
-fi
-update-rc.d $D modutils.sh remove
-}
-
-pkg_postinst_modutils-depmod() {
-#!/bin/sh
-update-alternatives --install /sbin/depmod depmod /sbin/depmod.24 10
-}
-
-pkg_postinst_modutils-modinfo() {
-#!/bin/sh
-update-alternatives --install /sbin/modinfo modinfo /sbin/modinfo.24 10
-}
-
-pkg_prerm_modutils-depmod() {
-#!/bin/sh
-update-alternatives --remove depmod /sbin/depmod.24
-}
-
-pkg_prerm_modutils-modinfo() {
-#!/bin/sh
-update-alternatives --remove modinfo /sbin/modinfo.24
-}
-
-PACKAGES = "modutils-depmod modutils-modinfo modutils-doc modutils"
-
-FILES_modutils-depmod = "sbin/depmod.24"
-FILES_modutils-modinfo = "sbin/modinfo.24"
-RDEPENDS_modutils = "modutils-depmod"
-- 
1.7.4.1