* [RFC v3 PATCH 0/9] Linux 3.0 build support
@ 2011-06-29 17:54 Anders Darander
2011-06-29 17:54 ` [RFC v3 PATCH 1/9] Remove support for building 2.4 kernels Anders Darander
` (9 more replies)
0 siblings, 10 replies; 13+ messages in thread
From: Anders Darander @ 2011-06-29 17:54 UTC (permalink / raw)
To: openembedded-core; +Cc: Anders Darander
v3: - task-base.bb: fix a problem that *pcmia26 couldn't be found.
v2: Probably some more patches could be squashed together. There might also
be more places that should be addressed in these patches.
- Whitespace fixes
- Updated module-init-tools to 3.16. I'm not applying the ignore*.patch
(it didn't apply).
- Do not provide virtual/*/depmod-2.6; just provide virtual/*/depmod.
- Do only install as depmod.
- Rearrange the order of some patches.
- Added patches to clean up (partly) task-base, distro_tracking_fields.
A few of the patches might be ready to pull, but the majority will need
to be revised.
===============
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 ff014d9634638457622f6019b163e75bafcefada:
task-base: add 3G into DISTRO_FEATURE (2011-06-29 14:46:46 +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 (9):
Remove support for building 2.4 kernels
image¡kernel.bblass: do not use depmod-2.6
modules-init-tools(-cross): update to 3.16
module-init-tools-cross: do not install depmod as depmod-2.6
kernel.bblass: remove get_kernelmajorversion
modutils-initscripts: move recipe prior to modutils removal
modutils: remove modutils
task-base: remove modutils reference.
distro_tracking_fields: remove modutils.
meta/classes/image.bbclass | 2 +-
meta/classes/kernel.bbclass | 22 ++----
meta/classes/linux-kernel-base.bbclass | 8 --
meta/classes/module-base.bbclass | 2 +-
.../conf/distro/include/distro_tracking_fields.inc | 8 +--
meta/recipes-core/tasks/task-base.bb | 24 +----
.../{modutils => module-init-tools}/files/PD.patch | 0
.../files/modutils.sh | 0
.../module-init-tools-cross_3.12.bb | 12 ---
.../module-init-tools-cross_3.16.bb | 8 ++
.../module-init-tools/module-init-tools.inc | 1 -
...nit-tools_3.12.bb => module-init-tools_3.16.bb} | 6 +-
.../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 --------------------
23 files changed, 24 insertions(+), 503 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%)
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
rename meta/recipes-kernel/module-init-tools/{module-init-tools_3.12.bb => module-init-tools_3.16.bb} (87%)
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
^ permalink raw reply [flat|nested] 13+ messages in thread
* [RFC v3 PATCH 1/9] Remove support for building 2.4 kernels
2011-06-29 17:54 [RFC v3 PATCH 0/9] Linux 3.0 build support Anders Darander
@ 2011-06-29 17:54 ` Anders Darander
2011-06-29 17:54 ` [RFC v3 PATCH 2/9] image¡kernel.bblass: do not use depmod-2.6 Anders Darander
` (8 subsequent siblings)
9 siblings, 0 replies; 13+ messages in thread
From: Anders Darander @ 2011-06-29 17:54 UTC (permalink / raw)
To: openembedded-core; +Cc: Anders Darander
Signed-off-by: Anders Darander <anders@chargestorm.se>
---
meta/classes/kernel.bbclass | 12 ++----------
meta/classes/module-base.bbclass | 2 +-
2 files changed, 3 insertions(+), 11 deletions(-)
diff --git a/meta/classes/kernel.bbclass b/meta/classes/kernel.bbclass
index fd27832..6bdfd3e 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}"
}
@@ -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
@@ -397,10 +392,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()
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
^ permalink raw reply related [flat|nested] 13+ messages in thread
* [RFC v3 PATCH 2/9] image¡kernel.bblass: do not use depmod-2.6
2011-06-29 17:54 [RFC v3 PATCH 0/9] Linux 3.0 build support Anders Darander
2011-06-29 17:54 ` [RFC v3 PATCH 1/9] Remove support for building 2.4 kernels Anders Darander
@ 2011-06-29 17:54 ` Anders Darander
2011-06-29 17:54 ` [RFC v3 PATCH 3/9] modules-init-tools(-cross): update to 3.16 Anders Darander
` (7 subsequent siblings)
9 siblings, 0 replies; 13+ messages in thread
From: Anders Darander @ 2011-06-29 17:54 UTC (permalink / raw)
To: openembedded-core; +Cc: Anders Darander
Change to only depend on virtual/*/depmod.
Change all calls to only use depmod.
Signed-off-by: Anders Darander <anders@chargestorm.se>
---
meta/classes/image.bbclass | 2 +-
meta/classes/kernel.bbclass | 10 ++++------
2 files changed, 5 insertions(+), 7 deletions(-)
diff --git a/meta/classes/image.bbclass b/meta/classes/image.bbclass
index 2469442..46d066e 100644
--- a/meta/classes/image.bbclass
+++ b/meta/classes/image.bbclass
@@ -114,7 +114,7 @@ fakeroot do_rootfs () {
KERNEL_VERSION=`cat ${STAGING_KERNEL_DIR}/kernel-abiversion`
mkdir -p ${IMAGE_ROOTFS}/lib/modules/$KERNEL_VERSION
- ${TARGET_SYS}-depmod-2.6 -a -b ${IMAGE_ROOTFS} -F ${STAGING_KERNEL_DIR}/System.map-$KERNEL_VERSION $KERNEL_VERSION
+ ${TARGET_SYS}-depmod -a -b ${IMAGE_ROOTFS} -F ${STAGING_KERNEL_DIR}/System.map-$KERNEL_VERSION $KERNEL_VERSION
fi
${IMAGE_PREPROCESS_COMMAND}
diff --git a/meta/classes/kernel.bbclass b/meta/classes/kernel.bbclass
index 6bdfd3e..26c8ea1 100644
--- a/meta/classes/kernel.bbclass
+++ b/meta/classes/kernel.bbclass
@@ -1,7 +1,7 @@
inherit linux-kernel-base module_strip
PROVIDES += "virtual/kernel"
-DEPENDS += "virtual/${TARGET_PREFIX}gcc virtual/${TARGET_PREFIX}depmod-${@get_kernelmajorversion('${PV}')} virtual/${TARGET_PREFIX}gcc${KERNEL_CCSUFFIX} update-modules"
+DEPENDS += "virtual/${TARGET_PREFIX}gcc virtual/${TARGET_PREFIX}depmod virtual/${TARGET_PREFIX}gcc${KERNEL_CCSUFFIX} update-modules"
# we include gcc above, we dont need virtual/libc
INHIBIT_DEFAULT_DEPS = "1"
@@ -53,7 +53,6 @@ KERNEL_IMAGEDEST = "boot"
export CMDLINE_CONSOLE = "console=${@bb.data.getVar("KERNEL_CONSOLE",d,1) or "ttyS0"}"
KERNEL_VERSION = "${@get_kernelversion('${B}')}"
-KERNEL_MAJOR_VERSION = "${@get_kernelmajorversion('${KERNEL_VERSION}')}"
KERNEL_LOCALVERSION ?= ""
@@ -232,7 +231,7 @@ if [ ! -e "$D/lib/modules/${KERNEL_VERSION}" ]; then
mkdir -p $D/lib/modules/${KERNEL_VERSION}
fi
if [ -n "$D" ]; then
- ${HOST_PREFIX}depmod-${KERNEL_MAJOR_VERSION} -A -b $D -F ${STAGING_KERNEL_DIR}/System.map-${KERNEL_VERSION} ${KERNEL_VERSION}
+ ${HOST_PREFIX}depmod -A -b $D -F ${STAGING_KERNEL_DIR}/System.map-${KERNEL_VERSION} ${KERNEL_VERSION}
else
depmod -a
fi
@@ -240,7 +239,7 @@ fi
pkg_postinst_modules () {
if [ -n "$D" ]; then
- ${HOST_PREFIX}depmod-${KERNEL_MAJOR_VERSION} -A -b $D -F ${STAGING_KERNEL_DIR}/System.map-${KERNEL_VERSION} ${KERNEL_VERSION}
+ ${HOST_PREFIX}depmod -A -b $D -F ${STAGING_KERNEL_DIR}/System.map-${KERNEL_VERSION} ${KERNEL_VERSION}
else
depmod -a
update-modules || true
@@ -313,9 +312,8 @@ python populate_packages_prepend () {
kernelver_stripped = m.group(1)
path = bb.data.getVar("PATH", d, 1)
host_prefix = bb.data.getVar("HOST_PREFIX", d, 1) or ""
- major_version = bb.data.getVar('KERNEL_MAJOR_VERSION', d, 1)
- cmd = "PATH=\"%s\" %sdepmod-%s -n -a -r -b %s -F %s/boot/System.map-%s %s" % (path, host_prefix, major_version, dvar, dvar, kernelver, kernelver_stripped)
+ cmd = "PATH=\"%s\" %sdepmod -n -a -r -b %s -F %s/boot/System.map-%s %s" % (path, host_prefix, dvar, dvar, kernelver, kernelver_stripped)
f = os.popen(cmd, 'r')
deps = {}
--
1.7.4.1
^ permalink raw reply related [flat|nested] 13+ messages in thread
* [RFC v3 PATCH 3/9] modules-init-tools(-cross): update to 3.16
2011-06-29 17:54 [RFC v3 PATCH 0/9] Linux 3.0 build support Anders Darander
2011-06-29 17:54 ` [RFC v3 PATCH 1/9] Remove support for building 2.4 kernels Anders Darander
2011-06-29 17:54 ` [RFC v3 PATCH 2/9] image¡kernel.bblass: do not use depmod-2.6 Anders Darander
@ 2011-06-29 17:54 ` Anders Darander
2011-06-29 17:54 ` [RFC v3 PATCH 4/9] module-init-tools-cross: do not install depmod as depmod-2.6 Anders Darander
` (6 subsequent siblings)
9 siblings, 0 replies; 13+ messages in thread
From: Anders Darander @ 2011-06-29 17:54 UTC (permalink / raw)
To: openembedded-core; +Cc: Anders Darander
Update to get support for Linux 3.0.
Remove the application of ignore_arch_directory.patch, as this one do not apply.
(A comment in the patch states "not sure the reason yet. Keep for a while and verify later.").
Signed-off-by: Anders Darander <anders@chargestorm.se>
---
...oss_3.12.bb => module-init-tools-cross_3.16.bb} | 4 ++--
.../module-init-tools/module-init-tools.inc | 1 -
...nit-tools_3.12.bb => module-init-tools_3.16.bb} | 6 +++---
3 files changed, 5 insertions(+), 6 deletions(-)
rename meta/recipes-kernel/module-init-tools/{module-init-tools-cross_3.12.bb => module-init-tools-cross_3.16.bb} (74%)
rename meta/recipes-kernel/module-init-tools/{module-init-tools_3.12.bb => module-init-tools_3.16.bb} (87%)
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.16.bb
similarity index 74%
rename from meta/recipes-kernel/module-init-tools/module-init-tools-cross_3.12.bb
rename to meta/recipes-kernel/module-init-tools/module-init-tools-cross_3.16.bb
index 08bf1a9..da7b30c 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.16.bb
@@ -1,7 +1,7 @@
require module-init-tools.inc
-PR = "r1"
+PR = "r0"
inherit cross
-PROVIDES += "virtual/${TARGET_PREFIX}depmod virtual/${TARGET_PREFIX}depmod-2.6"
+PROVIDES += "virtual/${TARGET_PREFIX}depmod"
SRC_URI += "file://no-static-binaries.patch"
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 4d96d16..c290c4f 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.16.bb
similarity index 87%
rename from meta/recipes-kernel/module-init-tools/module-init-tools_3.12.bb
rename to meta/recipes-kernel/module-init-tools/module-init-tools_3.16.bb
index 3d7c287..0248b46 100644
--- a/meta/recipes-kernel/module-init-tools/module-init-tools_3.12.bb
+++ b/meta/recipes-kernel/module-init-tools/module-init-tools_3.16.bb
@@ -1,5 +1,5 @@
require module-init-tools.inc
-PR = "r1"
+PR = "r0"
# autotools set prefix to /usr, however we want them in /bin and /sbin
bindir = "/bin"
@@ -38,5 +38,5 @@ pkg_prerm_module-init-tools-depmod() {
update-alternatives --remove depmod /sbin/depmod.26
}
-SRC_URI[md5sum] = "8b2257ce9abef74c4a44d825d23140f3"
-SRC_URI[sha256sum] = "d012ab07ea26721467a85a775f34747c1c8897e37f16bec5317d8a72ef8b4f17"
+SRC_URI[md5sum] = "bc44832c6e41707b8447e2847d2019f5"
+SRC_URI[sha256sum] = "e1f2cdcae64a8effc25e545a5e0bdaf312f816ebbcd0916e4e87450755fab64b"
--
1.7.4.1
^ permalink raw reply related [flat|nested] 13+ messages in thread
* [RFC v3 PATCH 4/9] module-init-tools-cross: do not install depmod as depmod-2.6
2011-06-29 17:54 [RFC v3 PATCH 0/9] Linux 3.0 build support Anders Darander
` (2 preceding siblings ...)
2011-06-29 17:54 ` [RFC v3 PATCH 3/9] modules-init-tools(-cross): update to 3.16 Anders Darander
@ 2011-06-29 17:54 ` Anders Darander
2011-06-29 17:54 ` [RFC v3 PATCH 5/9] kernel.bblass: remove get_kernelmajorversion Anders Darander
` (5 subsequent siblings)
9 siblings, 0 replies; 13+ messages in thread
From: Anders Darander @ 2011-06-29 17:54 UTC (permalink / raw)
To: openembedded-core; +Cc: Anders Darander
Signed-off-by: Anders Darander <anders@chargestorm.se>
---
.../module-init-tools-cross_3.16.bb | 4 ----
1 files changed, 0 insertions(+), 4 deletions(-)
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
index da7b30c..8b3458b 100644
--- 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
@@ -6,7 +6,3 @@ PROVIDES += "virtual/${TARGET_PREFIX}depmod"
SRC_URI += "file://no-static-binaries.patch"
EXTRA_OECONF_append = " --program-prefix=${TARGET_PREFIX}"
-
-do_install_append () {
- mv ${D}${bindir}/${TARGET_PREFIX}depmod ${D}${bindir}/${TARGET_PREFIX}depmod-2.6
-}
--
1.7.4.1
^ permalink raw reply related [flat|nested] 13+ messages in thread
* [RFC v3 PATCH 5/9] kernel.bblass: remove get_kernelmajorversion
2011-06-29 17:54 [RFC v3 PATCH 0/9] Linux 3.0 build support Anders Darander
` (3 preceding siblings ...)
2011-06-29 17:54 ` [RFC v3 PATCH 4/9] module-init-tools-cross: do not install depmod as depmod-2.6 Anders Darander
@ 2011-06-29 17:54 ` Anders Darander
2011-06-29 17:54 ` [RFC v3 PATCH 6/9] modutils-initscripts: move recipe prior to modutils removal Anders Darander
` (4 subsequent siblings)
9 siblings, 0 replies; 13+ messages in thread
From: Anders Darander @ 2011-06-29 17:54 UTC (permalink / raw)
To: openembedded-core; +Cc: Anders Darander
It is now unused.
Signed-off-by: Anders Darander <anders@chargestorm.se>
---
meta/classes/linux-kernel-base.bbclass | 8 --------
1 files changed, 0 insertions(+), 8 deletions(-)
diff --git a/meta/classes/linux-kernel-base.bbclass b/meta/classes/linux-kernel-base.bbclass
index 510951a..4f2b0a4 100644
--- a/meta/classes/linux-kernel-base.bbclass
+++ b/meta/classes/linux-kernel-base.bbclass
@@ -24,14 +24,6 @@ def get_kernelversion(p):
return m.group(1)
return None
-def get_kernelmajorversion(p):
- import re
- r = re.compile("([0-9]+\.[0-9]+).*")
- m = r.match(p);
- if m:
- return m.group(1)
- return None
-
def linux_module_packages(s, d):
suffix = ""
return " ".join(map(lambda s: "kernel-module-%s%s" % (s.lower().replace('_', '-').replace('@', '+'), suffix), s.split()))
--
1.7.4.1
^ permalink raw reply related [flat|nested] 13+ messages in thread
* [RFC v3 PATCH 6/9] modutils-initscripts: move recipe prior to modutils removal
2011-06-29 17:54 [RFC v3 PATCH 0/9] Linux 3.0 build support Anders Darander
` (4 preceding siblings ...)
2011-06-29 17:54 ` [RFC v3 PATCH 5/9] kernel.bblass: remove get_kernelmajorversion Anders Darander
@ 2011-06-29 17:54 ` Anders Darander
2011-06-29 17:54 ` [RFC v3 PATCH 7/9] modutils: remove modutils Anders Darander
` (3 subsequent siblings)
9 siblings, 0 replies; 13+ messages in thread
From: Anders Darander @ 2011-06-29 17:54 UTC (permalink / raw)
To: openembedded-core; +Cc: 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
^ permalink raw reply [flat|nested] 13+ messages in thread
* [RFC v3 PATCH 7/9] modutils: remove modutils
2011-06-29 17:54 [RFC v3 PATCH 0/9] Linux 3.0 build support Anders Darander
` (5 preceding siblings ...)
2011-06-29 17:54 ` [RFC v3 PATCH 6/9] modutils-initscripts: move recipe prior to modutils removal Anders Darander
@ 2011-06-29 17:54 ` Anders Darander
2011-06-29 17:54 ` [RFC v3 PATCH 8/9] task-base: remove modutils reference Anders Darander
` (2 subsequent siblings)
9 siblings, 0 replies; 13+ messages in thread
From: Anders Darander @ 2011-06-29 17:54 UTC (permalink / raw)
To: openembedded-core; +Cc: 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 9f2add3..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 = "r10"
-
-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 = "${PN}-dbg 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
^ permalink raw reply related [flat|nested] 13+ messages in thread
* [RFC v3 PATCH 8/9] task-base: remove modutils reference.
2011-06-29 17:54 [RFC v3 PATCH 0/9] Linux 3.0 build support Anders Darander
` (6 preceding siblings ...)
2011-06-29 17:54 ` [RFC v3 PATCH 7/9] modutils: remove modutils Anders Darander
@ 2011-06-29 17:54 ` Anders Darander
2011-06-29 17:54 ` [RFC v3 PATCH 9/9] distro_tracking_fields: remove modutils Anders Darander
2011-06-29 18:02 ` [RFC v3 PATCH 0/9] Linux 3.0 build support Anders Darander
9 siblings, 0 replies; 13+ messages in thread
From: Anders Darander @ 2011-06-29 17:54 UTC (permalink / raw)
To: openembedded-core; +Cc: Anders Darander
Also remove the other kernel24 references.
Make everything dependent on kernel26 default.
Signed-off-by: Anders Darander <anders@chargestorm.se>
---
meta/recipes-core/tasks/task-base.bb | 24 ++++--------------------
1 files changed, 4 insertions(+), 20 deletions(-)
diff --git a/meta/recipes-core/tasks/task-base.bb b/meta/recipes-core/tasks/task-base.bb
index 3ff57ff..62432b4 100644
--- a/meta/recipes-core/tasks/task-base.bb
+++ b/meta/recipes-core/tasks/task-base.bb
@@ -45,7 +45,7 @@ PACKAGES = ' \
${@base_contains("DISTRO_FEATURES", "raid", "task-base-raid", "",d)} \
${@base_contains("DISTRO_FEATURES", "zeroconf", "task-base-zeroconf", "", d)} \
\
- ${@base_contains("MACHINE_FEATURES","kernel26","task-base-kernel26","task-base-kernel24",d)} \
+ task-base-kernel26 \
'
ALLOW_EMPTY = "1"
@@ -58,12 +58,12 @@ PACKAGE_ARCH = "${MACHINE_ARCH}"
#
# linux-hotplug or none
#
-HOTPLUG ?= "${@base_contains("MACHINE_FEATURES", "kernel24", "linux-hotplug","",d)} "
+HOTPLUG ?= ""
#
# pcmciautils for >= 2.6.13-rc1, pcmcia-cs for others
#
-PCMCIA_MANAGER ?= "${@base_contains('MACHINE_FEATURES', 'kernel26','pcmciautils','pcmcia-cs',d)} "
+PCMCIA_MANAGER ?= "pcmciautils"
#
# those ones can be set in machine config to supply packages needed to get machine booting
@@ -79,7 +79,7 @@ RDEPENDS_task-base = "\
task-machine-base \
${HOTPLUG} \
\
- ${@base_contains('MACHINE_FEATURES', 'kernel26','task-base-kernel26','task-base-kernel24',d)} \
+ task-base-kernel26 \
${@base_contains('MACHINE_FEATURES', 'apm', 'task-base-apm', '',d)} \
${@base_contains('MACHINE_FEATURES', 'acpi', 'task-base-acpi', '',d)} \
${@base_contains('MACHINE_FEATURES', 'keyboard', 'task-base-keyboard', '',d)} \
@@ -155,17 +155,10 @@ RRECOMMENDS_task-distro-base = "${DISTRO_EXTRA_RRECOMMENDS}"
RDEPENDS_task-machine-base = "${MACHINE_EXTRA_RDEPENDS}"
RRECOMMENDS_task-machine-base = "${MACHINE_EXTRA_RRECOMMENDS}"
-RDEPENDS_task-base-kernel24 = "\
- modutils-depmod"
-
RDEPENDS_task-base-kernel26 = "\
sysfsutils \
module-init-tools"
-RRECOMMENDS_task-base-kernel24 = "\
- kernel-module-input \
- kernel-module-uinput"
-
RRECOMMENDS_task-base-kernel26 = "\
kernel-module-nls-utf8 \
kernel-module-input \
@@ -221,21 +214,12 @@ RDEPENDS_task-base-pcmcia = "\
RRECOMMENDS_task-base-pcmcia = "\
- ${@base_contains('MACHINE_FEATURES', 'kernel26', '${task-base-pcmcia26}', '${task-base-pcmcia24}',d)} \
kernel-module-pcmcia \
kernel-module-airo-cs \
kernel-module-pcnet-cs \
kernel-module-serial-cs \
kernel-module-ide-cs \
kernel-module-ide-disk \
- "
-
-task-base-pcmcia24 = "\
- ${@base_contains('DISTRO_FEATURES', 'wifi', 'hostap-modules-cs', '',d)} \
- ${@base_contains('DISTRO_FEATURES', 'wifi', 'orinoco-modules-cs', '',d)} \
- "
-
-task-base-pcmcia26 = "\
${@base_contains('DISTRO_FEATURES', 'wifi', 'kernel-module-hostap-cs', '',d)} \
${@base_contains('DISTRO_FEATURES', 'wifi', 'kernel-module-orinoco-cs', '',d)} \
${@base_contains('DISTRO_FEATURES', 'wifi', 'kernel-module-spectrum-cs', '',d)}"
--
1.7.4.1
^ permalink raw reply related [flat|nested] 13+ messages in thread
* [RFC v3 PATCH 9/9] distro_tracking_fields: remove modutils.
2011-06-29 17:54 [RFC v3 PATCH 0/9] Linux 3.0 build support Anders Darander
` (7 preceding siblings ...)
2011-06-29 17:54 ` [RFC v3 PATCH 8/9] task-base: remove modutils reference Anders Darander
@ 2011-06-29 17:54 ` Anders Darander
2011-06-29 18:02 ` [RFC v3 PATCH 0/9] Linux 3.0 build support Anders Darander
9 siblings, 0 replies; 13+ messages in thread
From: Anders Darander @ 2011-06-29 17:54 UTC (permalink / raw)
To: openembedded-core; +Cc: Anders Darander
Signed-off-by: Anders Darander <anders@chargestorm.se>
---
.../conf/distro/include/distro_tracking_fields.inc | 8 +-------
1 files changed, 1 insertions(+), 7 deletions(-)
diff --git a/meta/conf/distro/include/distro_tracking_fields.inc b/meta/conf/distro/include/distro_tracking_fields.inc
index 8a13426..0d915e4 100644
--- a/meta/conf/distro/include/distro_tracking_fields.inc
+++ b/meta/conf/distro/include/distro_tracking_fields.inc
@@ -1,5 +1,6 @@
RECIPE_STATUS_pn-diffutils = "green"
RECIPE_LATEST_VERSION_pn-diffutils = "3.0"
+
RECIPE_LAST_UPDATE_pn-diffutils = "Dec 10, 2010"
RECIPE_MAINTAINER_pn-diffutils = "Qing He <qing.he@intel.com>"
@@ -685,13 +686,6 @@ RECIPE_COMMENTS_pn-keymaps = "local scripts follow Poky's MIT license, however i
RECIPE_LAST_UPDATE_pn-keymaps = "Jul 21, 2006"
RECIPE_MAINTAINER_pn-keymaps = "Yu Ke <ke.yu@intel.com>"
-RECIPE_STATUS_pn-modutils = "red"
-RECIPE_DEPENDENCY_CHECK_pn-modutils-initscripts = "not done"
-RECIPE_LATEST_VERSION_pn-modutils = "2.4.27"
-RECIPE_LAST_UPDATE_pn-modutils = "Jul 21, 2006"
-RECIPE_MAINTAINER_pn-modutils = "Yu Ke <ke.yu@intel.com>"
-DISTRO_PN_ALIAS_pn-modutils = "Ubuntu=module-init-tools Fedora=module-init-tools"
-
RECIPE_STATUS_pn-modutils-initscripts = "green"
RECIPE_DEPENDENCY_CHECK_pn-modutils-initscripts = "not done"
RECIPE_LATEST_VERSION_pn-modutils-initscripts = "1.0"
--
1.7.4.1
^ permalink raw reply related [flat|nested] 13+ messages in thread
* Re: [RFC v3 PATCH 0/9] Linux 3.0 build support
2011-06-29 17:54 [RFC v3 PATCH 0/9] Linux 3.0 build support Anders Darander
` (8 preceding siblings ...)
2011-06-29 17:54 ` [RFC v3 PATCH 9/9] distro_tracking_fields: remove modutils Anders Darander
@ 2011-06-29 18:02 ` Anders Darander
2011-06-30 8:00 ` Richard Purdie
9 siblings, 1 reply; 13+ messages in thread
From: Anders Darander @ 2011-06-29 18:02 UTC (permalink / raw)
To: openembedded-core
On Wed, Jun 29, 2011 at 19:54, Anders Darander <anders@chargestorm.se> wrote:
>
> v3: - task-base.bb: fix a problem that *pcmia26 couldn't be found.
This third version fixes a bug introduced in v2. (task-base-pcmcia26
weren't found). The fix is incorporated in patch 0008 (task-base).
Sofar, I've only got positive feedback on v2. (some feedback off-list
(including some that probably should have been on-list if it hadn't
been for some gmane problems).
Unless I find some more problems, or get such reports, I plan to send
a pull request towards the end of this week.
Regards,
Anders
^ permalink raw reply [flat|nested] 13+ messages in thread
* Re: [RFC v3 PATCH 0/9] Linux 3.0 build support
2011-06-29 18:02 ` [RFC v3 PATCH 0/9] Linux 3.0 build support Anders Darander
@ 2011-06-30 8:00 ` Richard Purdie
2011-06-30 9:20 ` Anders Darander
0 siblings, 1 reply; 13+ messages in thread
From: Richard Purdie @ 2011-06-30 8:00 UTC (permalink / raw)
To: Patches and discussions about the oe-core layer
On Wed, 2011-06-29 at 20:02 +0200, Anders Darander wrote:
> On Wed, Jun 29, 2011 at 19:54, Anders Darander <anders@chargestorm.se> wrote:
> >
> > v3: - task-base.bb: fix a problem that *pcmia26 couldn't be found.
>
> This third version fixes a bug introduced in v2. (task-base-pcmcia26
> weren't found). The fix is incorporated in patch 0008 (task-base).
>
> Sofar, I've only got positive feedback on v2. (some feedback off-list
> (including some that probably should have been on-list if it hadn't
> been for some gmane problems).
>
> Unless I find some more problems, or get such reports, I plan to send
> a pull request towards the end of this week.
It looks good to me apart from some ordering and PR bump type issues.
Where you change the depmod dependency for example, we really need to
rebuild module-init-tools at the same time so the binary changes name at
the right point in the series. Patch 4 and patch 2 therefore probably
need to be together with a PR bump. I also wondered what the patch to
module-init-tools you're removing does (and why you just disabled rather
than deleted it).
Looks good though! I'm trying to resist merging some of the standalone
bits straight away :)
Cheers,
Richard
^ permalink raw reply [flat|nested] 13+ messages in thread
* Re: [RFC v3 PATCH 0/9] Linux 3.0 build support
2011-06-30 8:00 ` Richard Purdie
@ 2011-06-30 9:20 ` Anders Darander
0 siblings, 0 replies; 13+ messages in thread
From: Anders Darander @ 2011-06-30 9:20 UTC (permalink / raw)
To: Patches and discussions about the oe-core layer
On Thu, Jun 30, 2011 at 10:00, Richard Purdie
<richard.purdie@linuxfoundation.org> wrote:
> On Wed, 2011-06-29 at 20:02 +0200, Anders Darander wrote:
>> On Wed, Jun 29, 2011 at 19:54, Anders Darander <anders@chargestorm.se> wrote:
>> >
>> > v3: - task-base.bb: fix a problem that *pcmia26 couldn't be found.
>> Unless I find some more problems, or get such reports, I plan to send
>> a pull request towards the end of this week.
>
> It looks good to me apart from some ordering and PR bump type issues.
>
> Where you change the depmod dependency for example, we really need to
> rebuild module-init-tools at the same time so the binary changes name at
> the right point in the series. Patch 4 and patch 2 therefore probably
> need to be together with a PR bump.
You're right, of course there should have been a PR bump there. I'll fix it and
squash patch 4 into patch 2 before I'll send a pull request.
> I also wondered what the patch to
> module-init-tools you're removing does (and why you just disabled rather
> than deleted it).
I left it in there of laziness, in case someone had objected to the disabling
of the patch. As I'm not really sure of the purpose of that patch, I'll delete
the patch before I send the pull request. Then we'll probably find out
if someone
had any need for that patch...
> Looks good though! I'm trying to resist merging some of the standalone
> bits straight away :)
Thanks!
If you get too eager to cherrypick a few bits, it's no problem.
Otherwise you can
count on getting a pull request tomorrow.
Cheers,
Anders
^ permalink raw reply [flat|nested] 13+ messages in thread
end of thread, other threads:[~2011-06-30 9:23 UTC | newest]
Thread overview: 13+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2011-06-29 17:54 [RFC v3 PATCH 0/9] Linux 3.0 build support Anders Darander
2011-06-29 17:54 ` [RFC v3 PATCH 1/9] Remove support for building 2.4 kernels Anders Darander
2011-06-29 17:54 ` [RFC v3 PATCH 2/9] image¡kernel.bblass: do not use depmod-2.6 Anders Darander
2011-06-29 17:54 ` [RFC v3 PATCH 3/9] modules-init-tools(-cross): update to 3.16 Anders Darander
2011-06-29 17:54 ` [RFC v3 PATCH 4/9] module-init-tools-cross: do not install depmod as depmod-2.6 Anders Darander
2011-06-29 17:54 ` [RFC v3 PATCH 5/9] kernel.bblass: remove get_kernelmajorversion Anders Darander
2011-06-29 17:54 ` [RFC v3 PATCH 6/9] modutils-initscripts: move recipe prior to modutils removal Anders Darander
2011-06-29 17:54 ` [RFC v3 PATCH 7/9] modutils: remove modutils Anders Darander
2011-06-29 17:54 ` [RFC v3 PATCH 8/9] task-base: remove modutils reference Anders Darander
2011-06-29 17:54 ` [RFC v3 PATCH 9/9] distro_tracking_fields: remove modutils Anders Darander
2011-06-29 18:02 ` [RFC v3 PATCH 0/9] Linux 3.0 build support Anders Darander
2011-06-30 8:00 ` Richard Purdie
2011-06-30 9:20 ` Anders Darander
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.