Linux 3.0 build support
v5 cover Linux 3.0 build support
v5: - task-base.bb: Move the RDEPENDS- and RRECOMMENDS_task-base-kernel26
to *_task-base.
v4: Removed the RFC in patch subject.
- Merge the patches 2 and 4 from v3.
- Bump PR in patch 2.
- Delete the ignore*.patch from module-init-tools. In v2, the patch was just disabled.
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/[email protected]/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
The following changes since commit 40ecaf6a59ba61e72d29d7e677197ef37c998408:
uclibc: Add default uClibc.machine files (2011-07-01 00:40:10 +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 (8):
Remove support for building 2.4 kernels image¡kernel.bblass module-init-tools: do not use depmod-2.6 modules-init-tools(-cross): update to 3.16 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 | 49 +++-------
.../{modutils => module-init-tools}/files/PD.patch | 0
.../files/ignore_arch_directory.patch | 30 ------
.../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 --------------------
24 files changed, 35 insertions(+), 547 deletions(-)
rename meta/recipes-kernel/{modutils => module-init-tools}/files/PD.patch (100%)
delete mode 100644 meta/recipes-kernel/module-init-tools/files/ignore_arch_directory.patch
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.bbSignature · 1 line
1.7.4.1
PATCH v5 1/8 Remove support for building 2.4 kernels
--- meta/classes/kernel.bbclass | 12 ++---------- meta/classes/module-base.bbclass | 2 +- 2 files changed, 3 insertions(+), 11 deletions(-)
meta/classes/kernel.bbclass +2 -10
@@ -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()
meta/classes/module-base.bbclass +1 -1
@@ -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')}"
Signature · 1 line
1.7.4.1
PATCH v5 2/8 image¡kernel.bblass module-init-tools: do not use depmod-2.6
In reply to Anders DaranderChange to only depend on virtual/*/depmod. Change all calls to only use depmod. Do not install depmod as depmod-2.6 Bump PR in module-init-tools-cross.
--- meta/classes/image.bbclass | 2 +- meta/classes/kernel.bbclass | 10 ++++------ .../module-init-tools-cross_3.12.bb | 6 +----- 3 files changed, 6 insertions(+), 12 deletions(-)
meta/classes/image.bbclass +1 -1
@@ -116,7 +116,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}
meta/classes/kernel.bbclass +4 -6
@@ -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 = {}
meta/recipes-kernel/module-init-tools/module-init-tools-cross_3.12.bb +1 -5
@@ -1,12 +1,8 @@ require module-init-tools.inc -PR = "r1" +PR = "r2" inherit cross PROVIDES += "virtual/${TARGET_PREFIX}depmod virtual/${TARGET_PREFIX}depmod-2.6" SRC_URI += "file://no-static-binaries.patch" EXTRA_OECONF_append = " --program-prefix=${TARGET_PREFIX}" - -do_install_append () { - mv ${D}${bindir}/${TARGET_PREFIX}depmod ${D}${bindir}/${TARGET_PREFIX}depmod-2.6 -}
Signature · 1 line
1.7.4.1
PATCH v5 3/8 modules-init-tools(-cross): update to 3.16
In reply to Anders DaranderUpdate to get support for Linux 3.0.
Delete the ignore_arch_directory.patch (as it does not apply to 3.16).
---
.../files/ignore_arch_directory.patch | 30 --------------------
...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 ++--
4 files changed, 5 insertions(+), 36 deletions(-)
delete mode 100644 meta/recipes-kernel/module-init-tools/files/ignore_arch_directory.patch
rename meta/recipes-kernel/module-init-tools/{module-init-tools-cross_3.12.bb => module-init-tools-cross_3.16.bb} (62%)
rename meta/recipes-kernel/module-init-tools/{module-init-tools_3.12.bb => module-init-tools_3.16.bb} (87%)meta/recipes-kernel/module-init-tools/files/ignore_arch_directory.patch deleted +0 -30
@@ -1,30 +0,0 @@ -# not sure the reason yet. Keep for a while and verify later. -# -# comments added by Kevin Tian <[email protected]>, 2010-07-21 - -Upstream-Status: Pending - -diff -ruN module-init-tools-3.12.orig/modprobe.8 module-init-tools-3.12/modprobe.8 ---- module-init-tools-3.12/modprobe.8.orig -+++ module-init-tools-3.12/modprobe.8 -@@ -27,6 +27,7 @@ - (see \fBmodprobe.conf\fR(5)). \fBmodprobe\fR will also use module - options specified on the kernel command line in the form of - <module>\&.<option>\&. -+All files in the \fI/etc/modprobe.d/arch/\fR directory are ignored. - .PP - Note that unlike in 2.4 series Linux kernels (which are not supported - by this tool) this version of \fBmodprobe\fR does not ---- module-init-tools-3.12/modprobe.c.orig -+++ module-init-tools-3.12/modprobe.c -@@ -1052,6 +1052,10 @@ - DIR *dir; - int ret = 0; - -+ /* ignore everything in this directory */ -+ if (streq(filename, "/etc/modprobe.d/arch")) -+ return 1; -+ - dir = opendir(filename); - if (dir) { - struct file_entry {
meta/recipes-kernel/module-init-tools/module-init-tools-cross_3.16.bb renamed from meta/recipes-kernel/module-init-tools/module-init-tools-cross_3.12.bb +2 -2
@@ -1,7 +1,7 @@ require module-init-tools.inc -PR = "r2" +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"
meta/recipes-kernel/module-init-tools/module-init-tools.inc +0 -1
@@ -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"
meta/recipes-kernel/module-init-tools/module-init-tools_3.16.bb renamed from meta/recipes-kernel/module-init-tools/module-init-tools_3.12.bb +3 -3
@@ -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"
Signature · 1 line
1.7.4.1
PATCH v5 4/8 kernel.bblass: remove get_kernelmajorversion
In reply to Anders DaranderIt is now unused.
--- meta/classes/linux-kernel-base.bbclass | 8 -------- 1 files changed, 0 insertions(+), 8 deletions(-)
meta/classes/linux-kernel-base.bbclass +0 -8
@@ -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()))
Signature · 1 line
1.7.4.1
PATCH v5 5/8 modutils-initscripts: move recipe prior to modutils removal
In reply to Anders Darander---
.../{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%)meta/recipes-kernel/module-init-tools/files/PD.patch renamed from meta/recipes-kernel/modutils/files/PD.patch +0 -0
meta/recipes-kernel/module-init-tools/files/modutils.sh renamed from meta/recipes-kernel/modutils/files/modutils.sh +0 -0
meta/recipes-kernel/module-init-tools/modutils-initscripts.bb renamed from meta/recipes-kernel/modutils/modutils-initscripts.bb +0 -0
Signature · 1 line
1.7.4.1
PATCH v5 6/8 modutils: remove modutils
In reply to Anders DaranderAs 2.4 support is being phased out, remove modutils.
--- 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
meta/recipes-kernel/modutils/files/armeb.patch deleted +0 -16
@@ -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) -
meta/recipes-kernel/modutils/files/configure.patch deleted +0 -34
@@ -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
meta/recipes-kernel/modutils/files/gcc4.patch deleted +0 -93
93 lines not on this page · raw message
meta/recipes-kernel/modutils/files/lex.l.diff deleted +0 -35
@@ -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;
meta/recipes-kernel/modutils/files/modules deleted +0 -0
meta/recipes-kernel/modutils/files/modules.conf deleted +0 -0
meta/recipes-kernel/modutils/files/modutils-notest.patch deleted +0 -16
@@ -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);
meta/recipes-kernel/modutils/files/program_prefix.patch deleted +0 -71
71 lines not on this page · raw message
meta/recipes-kernel/modutils/modutils-collateral.bb deleted +0 -21
@@ -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 - -}
meta/recipes-kernel/modutils/modutils-cross/module.h.diff deleted +0 -35
@@ -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.
meta/recipes-kernel/modutils/modutils-cross_2.4.27.bb deleted +0 -20
@@ -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 -}
meta/recipes-kernel/modutils/modutils_2.4.27.bb deleted +0 -93
93 lines not on this page · raw message
Signature · 1 line
1.7.4.1
PATCH v5 7/8 task-base: remove modutils reference.
In reply to Anders DaranderAlso remove the other kernel24 references.
Make everything dependent on kernel26 default.
Move the RDEPENDS- and RRECOMMENDS_task-base-kernel26 to _task-base.
--- meta/recipes-core/tasks/task-base.bb | 49 ++++++++++----------------------- 1 files changed, 15 insertions(+), 34 deletions(-)
meta/recipes-core/tasks/task-base.bb +15 -34
@@ -45,7 +45,6 @@ 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)} \ ' ALLOW_EMPTY = "1"
@@ -58,12 +57,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 +78,8 @@ RDEPENDS_task-base = "\ task-machine-base \ ${HOTPLUG} \ \ - ${@base_contains('MACHINE_FEATURES', 'kernel26','task-base-kernel26','task-base-kernel24',d)} \ + sysfsutils \ + module-init-tools \ ${@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)} \
@@ -112,6 +112,17 @@ RDEPENDS_task-base = "\ " # bluez-dtl1-workaround above is workaround for bitbake not handling DEPENDS on it in + +RRECOMMENDS_task-base = "\ + kernel-module-nls-utf8 \ + kernel-module-input \ + kernel-module-uinput \ + kernel-module-rtc-dev \ + kernel-module-rtc-proc \ + kernel-module-rtc-sysfs \ + kernel-module-rtc-sa1100 \ + kernel-module-unix" + RDEPENDS_task-base-extended = "\ task-base \ ${ADD_WIFI} \
@@ -155,27 +166,6 @@ 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 \ - kernel-module-uinput \ - kernel-module-rtc-dev \ - kernel-module-rtc-proc \ - kernel-module-rtc-sysfs \ - kernel-module-rtc-sa1100 \ - kernel-module-unix" - RDEPENDS_task-base-keyboard = "\ keymaps"
@@ -221,21 +211,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)}"
Signature · 1 line
1.7.4.1
Re: [PATCH v5 7/8] task-base: remove modutils reference.
Op 1 jul 2011, om 15:08 heeft Anders Darander het volgende geschreven:
Quoted 12 lines
Also remove the other kernel24 references.
Make everything dependent on kernel26 default.
Move the RDEPENDS- and RRECOMMENDS_task-base-kernel26 to _task-base.Signed-off-by Anders Darander <[email protected]>---
meta/recipes-core/tasks/task-base.bb | 49 ++++++++++-----------------------1 files changed, 15 insertions(+), 34 deletions(-)#
# linux-hotplug or none #
meta/recipes-core/tasks/task-base.bb PACKAGE_ARCH = "${MACHINE_ARCH}" · line 60
Quoted 2 lines
meta/recipes-core/tasks/task-base.bb +1
-1-HOTPLUG ?= "${@base_contains("MACHINE_FEATURES", "kernel24", "linux-hotplug","",d)} " +HOTPLUG ?= ""
I think this one can go completely
meta/recipes-core/tasks/task-base.bb PACKAGE_ARCH = "${MACHINE_ARCH}" · line 65
Quoted 5 lines
#
# pcmciautils for >= 2.6.13-rc1, pcmcia-cs for others #meta/recipes-core/tasks/task-base.bb +1
-1-PCMCIA_MANAGER ?= "${@base_contains('MACHINE_FEATURES', 'kernel26','pcmciautils','pcmcia-cs',d)} " +PCMCIA_MANAGER ?= "pcmciautils"
This one can get folded into the task directly
regards,
Koen
Re: [PATCH v5 7/8] task-base: remove modutils reference.
Quoted 20 lines · Koen Kooi
Op 1 jul 2011, om 15:08 heeft Anders Darander het volgende geschreven:
Quoted 12 lines
Also remove the other kernel24 references.
Make everything dependent on kernel26 default.
Move the RDEPENDS- and RRECOMMENDS_task-base-kernel26 to _task-base.Signed-off-by Anders Darander <[email protected]>---
meta/recipes-core/tasks/task-base.bb | 49 ++++++++++-----------------------1 files changed, 15 insertions(+), 34 deletions(-)#
# linux-hotplug or none #meta/recipes-core/tasks/task-base.bb PACKAGE_ARCH = "${MACHINE_ARCH}" · line 60
Quoted 2 lines
meta/recipes-core/tasks/task-base.bb +1
-1-HOTPLUG ?= "${@base_contains("MACHINE_FEATURES", "kernel24", "linux-hotplug","",d)} " +HOTPLUG ?= ""I think this one can go completely
Quoted 7 lines
meta/recipes-core/tasks/task-base.bb PACKAGE_ARCH = "${MACHINE_ARCH}" · line 65
Quoted 5 lines
#
# pcmciautils for >= 2.6.13-rc1, pcmcia-cs for others #meta/recipes-core/tasks/task-base.bb +1
-1-PCMCIA_MANAGER ?= "${@base_contains('MACHINE_FEATURES', 'kernel26','pcmciautils','pcmcia-cs',d)} " +PCMCIA_MANAGER ?= "pcmciautils"This one can get folded into the task directly
Agreed but I didn't feel it warranted not merging the patches so far. Please send a follow up patch :)
Cheers,
Richard
Re: [PATCH v5 7/8] task-base: remove modutils reference.
Hi,
* Richard Purdie Richard Purdie <[email protected]> [07/02/11 12:35 AM]:
Quoted 16 lines · Koen Kooi
Quoted 15 lines
Op 1 jul 2011, om 15:08 heeft Anders Darander het volgende geschreven:
Quoted 4 lines
# linux-hotplug or none # -HOTPLUG ?= "${@base_contains("MACHINE_FEATURES", "kernel24", "linux-hotplug","",d)} " +HOTPLUG ?= ""I think this one can go completely
Quoted 6 lines
#
# pcmciautils for >= 2.6.13-rc1, pcmcia-cs for others # -PCMCIA_MANAGER ?= "${@base_contains('MACHINE_FEATURES', 'kernel26','pcmciautils','pcmcia-cs',d)} " +PCMCIA_MANAGER ?= "pcmciautils"
Quoted 4 lines
Quoted 1 line
This one can get folded into the task directly
Agreed but I didn't feel it warranted not merging the patches so far. Please send a follow up patch :)
Before I'll try to look into the comments above, I'd just like to be sure I'm working on the correct version of task-base.bb. Did you leave it out of the merging, awaiting the last fixes, or was it just left out by mistake? (I've just now realised that this patch didn't make it into master).
Regards,
Anders
Re: [PATCH v5 7/8] task-base: remove modutils reference.
Quoted 22 lines · Anders Darander
Hi,
* Richard Purdie Richard Purdie <[email protected]> [07/02/11 12:35 AM]:
Quoted 18 lines · Koen Kooi
Quoted 16 lines
Op 1 jul 2011, om 15:08 heeft Anders Darander het volgende geschreven:
Quoted 4 lines
# linux-hotplug or none # -HOTPLUG ?= "${@base_contains("MACHINE_FEATURES", "kernel24", "linux-hotplug","",d)} " +HOTPLUG ?= ""I think this one can go completely
Quoted 6 lines
#
# pcmciautils for >= 2.6.13-rc1, pcmcia-cs for others # -PCMCIA_MANAGER ?= "${@base_contains('MACHINE_FEATURES', 'kernel26','pcmciautils','pcmcia-cs',d)} " +PCMCIA_MANAGER ?= "pcmciautils"This one can get folded into the task directly
Quoted 7 lines
Quoted 2 lines
Agreed but I didn't feel it warranted not merging the patches so far. Please send a follow up patch :)
Before I'll try to look into the comments above, I'd just like to be sure I'm working on the correct version of task-base.bb. Did you leave it out of the merging, awaiting the last fixes, or was it just left out by mistake? (I've just now realised that this patch didn't make it into master).
That was a mistake on my part, sorry...
Cheers,
Richard
Re: [PATCH v5 7/8] task-base: remove modutils reference.
* Richard Purdie Richard Purdie <[email protected]> [07/05/11 10:24 AM]:
Quoted 8 lines · Anders Darander
Quoted 5 lines
Before I'll try to look into the comments above, I'd just like to be sure I'm working on the correct version of task-base.bb. Did you leave it out of the merging, awaiting the last fixes, or was it just left out by mistake? (I've just now realised that this patch didn't make it into master).
That was a mistake on my part, sorry...
No problem.
I'll try to get some time to fix at least a few of the relevant issues, and submit a new pull request later this week.
Regards,
Anders
PATCH v5 8/8 distro_tracking_fields: remove modutils.
In reply to Anders Darander--- .../conf/distro/include/distro_tracking_fields.inc | 8 +------- 1 files changed, 1 insertions(+), 7 deletions(-)
meta/conf/distro/include/distro_tracking_fields.inc +1 -7
@@ -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 = "Mei Lei <[email protected]>"
@@ -684,13 +685,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 <[email protected]>" -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 <[email protected]>" -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"
Signature · 1 line
1.7.4.1
Quoted 53 lines · Anders Darander
v5: - task-base.bb: Move the RDEPENDS- and RRECOMMENDS_task-base-kernel26
to *_task-base.v4: Removed the RFC in patch subject.
- Merge the patches 2 and 4 from v3.
- Bump PR in patch 2.
- Delete the ignore*.patch from module-init-tools. In v2, the patch was just disabled.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/[email protected]/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
The following changes since commit
40ecaf6a59ba61e72d29d7e677197ef37c998408:uclibc: Add default uClibc.machine files (2011-07-01 00:40:10 +0100)
are available in the git repository at:
git://github.com/darander/oe-corekernel-3.0
https://github.com/darander/oe-core/tree/kernel-3.0
Quoted 9 lines
Anders Darander (8):
Remove support for building 2.4 kernels image¡kernel.bblass module-init-tools: do not use depmod-2.6 modules-init-tools(-cross): update to 3.16 kernel.bblass: removeget_kernelmajorversion
modutils-initscripts: move recipe prior to modutils removal
modutils: remove modutils
task-base: remove modutils reference.
distro_tracking_fields: remove modutils.
Thanks for these, I merged them to master.
Cheers,
Richard