Patchwork [meta-oe,3/5] linux: import shared linux.inc so we have just one copy

login
register
mail settings
Submitter Martin Jansa
Date March 23, 2012, 1:04 p.m.
Message ID <b16115c16837e5aa6a3ad556a37832192c128f43.1332507730.git.Martin.Jansa@gmail.com>
Download mbox | patch
Permalink /patch/24285/
State Accepted
Commit be333f0e2fd25882d20f039a7b26548b61b68bf2
Headers show

Comments

Martin Jansa - March 23, 2012, 1:04 p.m.
* in my env I have 7 copies now
  ./meta-smartphone/meta-htc/recipes-kernel/linux/linux.inc
  ./meta-smartphone/meta-nokia/recipes-kernel/linux/linux.inc
  ./meta-smartphone/meta-openmoko/recipes-kernel/linux/linux.inc
  ./meta-smartphone/meta-samsung/recipes-kernel/linux/linux.inc
  ./meta-smartphone/meta-palm/recipes-kernel/linux/linux.inc
  ./meta-ti/recipes-kernel/linux/linux.inc
  ./meta-handheld/recipes-kernel/linux/linux.inc
  meta-smartphone's are 100% identical, meta-handheld is slightly
  different (ARM_KEEP_OABI can be set in recipe after require .inc) and
  meta-ti seems like much older version of linux.inc

Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
---
 meta-oe/recipes-kernel/linux/linux.inc |  131 ++++++++++++++++++++++++++++++++
 1 files changed, 131 insertions(+), 0 deletions(-)
 create mode 100644 meta-oe/recipes-kernel/linux/linux.inc
Andrea Adami - March 23, 2012, 1:59 p.m.
On Fri, Mar 23, 2012 at 2:04 PM, Martin Jansa <martin.jansa@gmail.com> wrote:
> * in my env I have 7 copies now
>  ./meta-smartphone/meta-htc/recipes-kernel/linux/linux.inc
>  ./meta-smartphone/meta-nokia/recipes-kernel/linux/linux.inc
>  ./meta-smartphone/meta-openmoko/recipes-kernel/linux/linux.inc
>  ./meta-smartphone/meta-samsung/recipes-kernel/linux/linux.inc
>  ./meta-smartphone/meta-palm/recipes-kernel/linux/linux.inc
>  ./meta-ti/recipes-kernel/linux/linux.inc
>  ./meta-handheld/recipes-kernel/linux/linux.inc
>  meta-smartphone's are 100% identical, meta-handheld is slightly
>  different (ARM_KEEP_OABI can be set in recipe after require .inc) and
>  meta-ti seems like much older version of linux.inc
>

Good idea Martin!
Only some minor thoughts:

> +CMDLINE_DEBUG ?= "loglevel=3"

Actually setting loglevel=3 is too low. We did this to protect bootlogo.
Probably "ignore_loglevel" is the more appropriate for debug (this
will print /all/ kernel messages to the console.
Where should we expect to define CMDLINE_DEBUG? At machine level?
Distro level? User choice/local.conf?

> +LOGO_SIZE ?= '${@base_conditional("MACHINE_GUI_CLASS", "bigscreen", "vga", "qvga", d)}'
This is maybe too specific and iirc was causing issues when LOGO_SIZE
and MACHINE_GUI_CLASS were unset.
Need to be tested out of meta-handheld.


> Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
> ---
>  meta-oe/recipes-kernel/linux/linux.inc |  131 ++++++++++++++++++++++++++++++++
>  1 files changed, 131 insertions(+), 0 deletions(-)
>  create mode 100644 meta-oe/recipes-kernel/linux/linux.inc
>
> diff --git a/meta-oe/recipes-kernel/linux/linux.inc b/meta-oe/recipes-kernel/linux/linux.inc
> new file mode 100644
> index 0000000..2b2fbf3
> --- /dev/null
> +++ b/meta-oe/recipes-kernel/linux/linux.inc
> @@ -0,0 +1,131 @@
> +DESCRIPTION = "Linux Kernel"
> +SECTION = "kernel"
> +LICENSE = "GPLv2"
> +LIC_FILES_CHKSUM = "file://COPYING;md5=d7810fab7487fb0aad327b76f1be7cd7"
> +
> +INC_PR = "r0"
> +
> +inherit kernel siteinfo
> +
> +# Enable OABI compat for people stuck with obsolete userspace
> +ARM_KEEP_OABI ?= "0"
> +
> +# Set the verbosity of kernel messages during runtime
> +# You can define CMDLINE_DEBUG in your local.conf or distro.conf to override this behaviour
> +CMDLINE_DEBUG ?= "loglevel=3"
> +
> +# Kernel bootlogo is distro-specific (default is OE logo).
> +# Logo resolution (qvga, vga, ...) is machine-specific.
> +LOGO_SIZE ?= '${@base_conditional("MACHINE_GUI_CLASS", "bigscreen", "vga", "qvga", d)}'
> +# To use this, add file://${LOGO_SIZE}/logo_linux_clut224.ppm.bz2 or similar
> +# to your kernel recipe, and then structure your logos for each resolution
> +# accordingly.
> +
> +LOCALVERSION ?= ""
> +
> +#kernel_conf_variable CMDLINE "\"${CMDLINE} ${CMDLINE_DEBUG}\""
> +kernel_conf_variable() {
> +       CONF_SED_SCRIPT="$CONF_SED_SCRIPT /CONFIG_$1[ =]/d;"
> +       if test "$2" = "n"
> +       then
> +               echo "# CONFIG_$1 is not set" >> ${S}/.config
> +       else
> +               echo "CONFIG_$1=$2" >> ${S}/.config
> +       fi
> +}
> +
> +do_configure_prepend() {
> +        echo "" > ${S}/.config
> +       CONF_SED_SCRIPT=""
> +
> +        #
> +        # logo support, if you supply logo_linux_clut224.ppm in SRC_URI, then it's going to be used
> +        #
> +        if [ -e ${WORKDIR}/logo_linux_clut224.ppm ]; then
> +                install -m 0644 ${WORKDIR}/logo_linux_clut224.ppm drivers/video/logo/logo_linux_clut224.ppm
> +               kernel_conf_variable LOGO y
> +               kernel_conf_variable LOGO_LINUX_CLUT224 y
> +        fi
> +
> +        #
> +        # oabi / eabi support
> +        #
> +       kernel_conf_variable AEABI y
> +       if [ "${ARM_KEEP_OABI}" = "1" ] ; then
> +               kernel_conf_variable OABI_COMPAT y
> +       else
> +               kernel_conf_variable OABI_COMPAT n
> +       fi
> +
> +        # When enabling thumb for userspace we also need thumb support in the kernel
> +        if [ "${ARM_INSTRUCTION_SET}" = "thumb" ] ; then
> +               kernel_conf_variable ARM_THUMB y
> +        fi
> +
> +       kernel_conf_variable CMDLINE "\"${CMDLINE} ${CMDLINE_DEBUG}\""
> +
> +       kernel_conf_variable LOCALVERSION "\"${LOCALVERSION}\""
> +       kernel_conf_variable LOCALVERSION_AUTO n
> +
> +       kernel_conf_variable SYSFS_DEPRECATED n
> +       kernel_conf_variable SYSFS_DEPRECATED_V2 n
> +        kernel_conf_variable HOTPLUG y
> +        kernel_conf_variable UEVENT_HELPER_PATH \"\"
> +        kernel_conf_variable UNIX y
> +        kernel_conf_variable SYSFS y
> +        kernel_conf_variable PROC_FS y
> +        kernel_conf_variable TMPFS y
> +        kernel_conf_variable INOTIFY_USER y
> +        kernel_conf_variable SIGNALFD y
> +        kernel_conf_variable TMPFS_POSIX_ACL y
> +        kernel_conf_variable BLK_DEV_BSG y
> +        kernel_conf_variable DEVTMPFS y
> +        kernel_conf_variable DEVTMPFS_MOUNT y
> +
> +        # Newer inits like systemd need cgroup support
> +        if [ "${KERNEL_ENABLE_CGROUPS}" = "1" ] ; then
> +            kernel_conf_variable CGROUP_SCHED y
> +            kernel_conf_variable CGROUPS y
> +            kernel_conf_variable CGROUP_NS y
> +            kernel_conf_variable CGROUP_FREEZER y
> +            kernel_conf_variable CGROUP_DEVICE y
> +            kernel_conf_variable CPUSETS y
> +            kernel_conf_variable PROC_PID_CPUSET y
> +            kernel_conf_variable CGROUP_CPUACCT y
> +            kernel_conf_variable RESOURCE_COUNTERS y
> +        fi
> +
> +        #
> +        # root-over-nfs-over-usb-eth support. Limited, but should cover some cases.
> +        # Enable this by setting a proper CMDLINE_NFSROOT_USB.
> +        #
> +        if [ ! -z "${CMDLINE_NFSROOT_USB}" ]; then
> +                bbnote "Configuring the kernel for root-over-nfs-over-usb-eth with CMDLINE ${CMDLINE_NFSROOT_USB}"
> +                kernel_conf_variable INET y
> +                kernel_conf_variable IP_PNP y
> +                kernel_conf_variable USB_GADGET y
> +                kernel_conf_variable USB_GADGET_SELECTED y
> +                kernel_conf_variable USB_ETH y
> +                kernel_conf_variable NFS_FS y
> +                kernel_conf_variable ROOT_NFS y
> +                kernel_conf_variable CMDLINE \"${CMDLINE_NFSROOT_USB} ${CMDLINE_DEBUG}\"
> +        fi
> +
> +        sed -e "${CONF_SED_SCRIPT}" \
> +               < '${WORKDIR}/defconfig' >>'${S}/.config'
> +
> +       yes '' | oe_runmake oldconfig
> +}
> +
> +do_configure_append() {
> +        if test -e scripts/Makefile.fwinst ; then
> +               sed -i -e "s:-m0644:-m 0644:g" scripts/Makefile.fwinst
> +       fi
> +}
> +
> +do_install_append() {
> +       oe_runmake headers_install INSTALL_HDR_PATH=${D}${exec_prefix}/src/linux-${KERNEL_VERSION} ARCH=$ARCH
> +}
> +
> +PACKAGES =+ "kernel-headers"
> +FILES_kernel-headers = "${exec_prefix}/src/linux*"
> --
> 1.7.8.5
>
>
> _______________________________________________
> Openembedded-devel mailing list
> Openembedded-devel@lists.openembedded.org
> http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-devel

Regards

Andrea
Martin Jansa - March 23, 2012, 2:30 p.m.
On Fri, Mar 23, 2012 at 02:59:42PM +0100, Andrea Adami wrote:
> On Fri, Mar 23, 2012 at 2:04 PM, Martin Jansa <martin.jansa@gmail.com> wrote:
> > * in my env I have 7 copies now
> >  ./meta-smartphone/meta-htc/recipes-kernel/linux/linux.inc
> >  ./meta-smartphone/meta-nokia/recipes-kernel/linux/linux.inc
> >  ./meta-smartphone/meta-openmoko/recipes-kernel/linux/linux.inc
> >  ./meta-smartphone/meta-samsung/recipes-kernel/linux/linux.inc
> >  ./meta-smartphone/meta-palm/recipes-kernel/linux/linux.inc
> >  ./meta-ti/recipes-kernel/linux/linux.inc
> >  ./meta-handheld/recipes-kernel/linux/linux.inc
> >  meta-smartphone's are 100% identical, meta-handheld is slightly
> >  different (ARM_KEEP_OABI can be set in recipe after require .inc) and
> >  meta-ti seems like much older version of linux.inc
> >
> 
> Good idea Martin!
> Only some minor thoughts:
> 
> > +CMDLINE_DEBUG ?= "loglevel=3"
> 
> Actually setting loglevel=3 is too low. We did this to protect bootlogo.
> Probably "ignore_loglevel" is the more appropriate for debug (this
> will print /all/ kernel messages to the console.

No strong opinion on this but it looks like reasonable default for me.

> Where should we expect to define CMDLINE_DEBUG? At machine level?
> Distro level? User choice/local.conf?

It's writen just above the line you referenced

> 
> > +LOGO_SIZE ?= '${@base_conditional("MACHINE_GUI_CLASS", "bigscreen", "vga", "qvga", d)}'
> This is maybe too specific and iirc was causing issues when LOGO_SIZE
> and MACHINE_GUI_CLASS were unset.
> Need to be tested out of meta-handheld.

Do you know about any other layer which is using LOGO_SIZE in SRC_URI?
Empty MACHINE_GUI_CLASS is tested out of meta-handheld on all meta-smartphone machines.

Other option is to drop whole LOGO_SIZE and let recipe to handle it
after including this .inc, but I was thinking again that this is
reasonable default and whoever wants can replace it in recipe anyway.

Cheers,

> 
> > Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
> > ---
> >  meta-oe/recipes-kernel/linux/linux.inc |  131 ++++++++++++++++++++++++++++++++
> >  1 files changed, 131 insertions(+), 0 deletions(-)
> >  create mode 100644 meta-oe/recipes-kernel/linux/linux.inc
> >
> > diff --git a/meta-oe/recipes-kernel/linux/linux.inc b/meta-oe/recipes-kernel/linux/linux.inc
> > new file mode 100644
> > index 0000000..2b2fbf3
> > --- /dev/null
> > +++ b/meta-oe/recipes-kernel/linux/linux.inc
> > @@ -0,0 +1,131 @@
> > +DESCRIPTION = "Linux Kernel"
> > +SECTION = "kernel"
> > +LICENSE = "GPLv2"
> > +LIC_FILES_CHKSUM = "file://COPYING;md5=d7810fab7487fb0aad327b76f1be7cd7"
> > +
> > +INC_PR = "r0"
> > +
> > +inherit kernel siteinfo
> > +
> > +# Enable OABI compat for people stuck with obsolete userspace
> > +ARM_KEEP_OABI ?= "0"
> > +
> > +# Set the verbosity of kernel messages during runtime
> > +# You can define CMDLINE_DEBUG in your local.conf or distro.conf to override this behaviour
> > +CMDLINE_DEBUG ?= "loglevel=3"
> > +
> > +# Kernel bootlogo is distro-specific (default is OE logo).
> > +# Logo resolution (qvga, vga, ...) is machine-specific.
> > +LOGO_SIZE ?= '${@base_conditional("MACHINE_GUI_CLASS", "bigscreen", "vga", "qvga", d)}'
> > +# To use this, add file://${LOGO_SIZE}/logo_linux_clut224.ppm.bz2 or similar
> > +# to your kernel recipe, and then structure your logos for each resolution
> > +# accordingly.
> > +
> > +LOCALVERSION ?= ""
> > +
> > +#kernel_conf_variable CMDLINE "\"${CMDLINE} ${CMDLINE_DEBUG}\""
> > +kernel_conf_variable() {
> > +       CONF_SED_SCRIPT="$CONF_SED_SCRIPT /CONFIG_$1[ =]/d;"
> > +       if test "$2" = "n"
> > +       then
> > +               echo "# CONFIG_$1 is not set" >> ${S}/.config
> > +       else
> > +               echo "CONFIG_$1=$2" >> ${S}/.config
> > +       fi
> > +}
> > +
> > +do_configure_prepend() {
> > +        echo "" > ${S}/.config
> > +       CONF_SED_SCRIPT=""
> > +
> > +        #
> > +        # logo support, if you supply logo_linux_clut224.ppm in SRC_URI, then it's going to be used
> > +        #
> > +        if [ -e ${WORKDIR}/logo_linux_clut224.ppm ]; then
> > +                install -m 0644 ${WORKDIR}/logo_linux_clut224.ppm drivers/video/logo/logo_linux_clut224.ppm
> > +               kernel_conf_variable LOGO y
> > +               kernel_conf_variable LOGO_LINUX_CLUT224 y
> > +        fi
> > +
> > +        #
> > +        # oabi / eabi support
> > +        #
> > +       kernel_conf_variable AEABI y
> > +       if [ "${ARM_KEEP_OABI}" = "1" ] ; then
> > +               kernel_conf_variable OABI_COMPAT y
> > +       else
> > +               kernel_conf_variable OABI_COMPAT n
> > +       fi
> > +
> > +        # When enabling thumb for userspace we also need thumb support in the kernel
> > +        if [ "${ARM_INSTRUCTION_SET}" = "thumb" ] ; then
> > +               kernel_conf_variable ARM_THUMB y
> > +        fi
> > +
> > +       kernel_conf_variable CMDLINE "\"${CMDLINE} ${CMDLINE_DEBUG}\""
> > +
> > +       kernel_conf_variable LOCALVERSION "\"${LOCALVERSION}\""
> > +       kernel_conf_variable LOCALVERSION_AUTO n
> > +
> > +       kernel_conf_variable SYSFS_DEPRECATED n
> > +       kernel_conf_variable SYSFS_DEPRECATED_V2 n
> > +        kernel_conf_variable HOTPLUG y
> > +        kernel_conf_variable UEVENT_HELPER_PATH \"\"
> > +        kernel_conf_variable UNIX y
> > +        kernel_conf_variable SYSFS y
> > +        kernel_conf_variable PROC_FS y
> > +        kernel_conf_variable TMPFS y
> > +        kernel_conf_variable INOTIFY_USER y
> > +        kernel_conf_variable SIGNALFD y
> > +        kernel_conf_variable TMPFS_POSIX_ACL y
> > +        kernel_conf_variable BLK_DEV_BSG y
> > +        kernel_conf_variable DEVTMPFS y
> > +        kernel_conf_variable DEVTMPFS_MOUNT y
> > +
> > +        # Newer inits like systemd need cgroup support
> > +        if [ "${KERNEL_ENABLE_CGROUPS}" = "1" ] ; then
> > +            kernel_conf_variable CGROUP_SCHED y
> > +            kernel_conf_variable CGROUPS y
> > +            kernel_conf_variable CGROUP_NS y
> > +            kernel_conf_variable CGROUP_FREEZER y
> > +            kernel_conf_variable CGROUP_DEVICE y
> > +            kernel_conf_variable CPUSETS y
> > +            kernel_conf_variable PROC_PID_CPUSET y
> > +            kernel_conf_variable CGROUP_CPUACCT y
> > +            kernel_conf_variable RESOURCE_COUNTERS y
> > +        fi
> > +
> > +        #
> > +        # root-over-nfs-over-usb-eth support. Limited, but should cover some cases.
> > +        # Enable this by setting a proper CMDLINE_NFSROOT_USB.
> > +        #
> > +        if [ ! -z "${CMDLINE_NFSROOT_USB}" ]; then
> > +                bbnote "Configuring the kernel for root-over-nfs-over-usb-eth with CMDLINE ${CMDLINE_NFSROOT_USB}"
> > +                kernel_conf_variable INET y
> > +                kernel_conf_variable IP_PNP y
> > +                kernel_conf_variable USB_GADGET y
> > +                kernel_conf_variable USB_GADGET_SELECTED y
> > +                kernel_conf_variable USB_ETH y
> > +                kernel_conf_variable NFS_FS y
> > +                kernel_conf_variable ROOT_NFS y
> > +                kernel_conf_variable CMDLINE \"${CMDLINE_NFSROOT_USB} ${CMDLINE_DEBUG}\"
> > +        fi
> > +
> > +        sed -e "${CONF_SED_SCRIPT}" \
> > +               < '${WORKDIR}/defconfig' >>'${S}/.config'
> > +
> > +       yes '' | oe_runmake oldconfig
> > +}
> > +
> > +do_configure_append() {
> > +        if test -e scripts/Makefile.fwinst ; then
> > +               sed -i -e "s:-m0644:-m 0644:g" scripts/Makefile.fwinst
> > +       fi
> > +}
> > +
> > +do_install_append() {
> > +       oe_runmake headers_install INSTALL_HDR_PATH=${D}${exec_prefix}/src/linux-${KERNEL_VERSION} ARCH=$ARCH
> > +}
> > +
> > +PACKAGES =+ "kernel-headers"
> > +FILES_kernel-headers = "${exec_prefix}/src/linux*"
> > --
> > 1.7.8.5
> >
> >
> > _______________________________________________
> > Openembedded-devel mailing list
> > Openembedded-devel@lists.openembedded.org
> > http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-devel
> 
> Regards
> 
> Andrea
> 
> _______________________________________________
> Openembedded-devel mailing list
> Openembedded-devel@lists.openembedded.org
> http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-devel
Denys Dmytriyenko - March 29, 2012, 3:49 a.m.
On Fri, Mar 23, 2012 at 02:04:12PM +0100, Martin Jansa wrote:
> * in my env I have 7 copies now
>   ./meta-smartphone/meta-htc/recipes-kernel/linux/linux.inc
>   ./meta-smartphone/meta-nokia/recipes-kernel/linux/linux.inc
>   ./meta-smartphone/meta-openmoko/recipes-kernel/linux/linux.inc
>   ./meta-smartphone/meta-samsung/recipes-kernel/linux/linux.inc
>   ./meta-smartphone/meta-palm/recipes-kernel/linux/linux.inc
>   ./meta-ti/recipes-kernel/linux/linux.inc
>   ./meta-handheld/recipes-kernel/linux/linux.inc
>   meta-smartphone's are 100% identical, meta-handheld is slightly
>   different (ARM_KEEP_OABI can be set in recipe after require .inc) and


>   meta-ti seems like much older version of linux.inc

FYI, I'm going through this one in meta-ti right now... While I like 
unification, I think the ultimate goal for a BSP layer is to not depend 
on any extra layers, such as meta-oe. On the other hand, we do depend on 
toolchain-layer for now. I'll think about the best course of action here.

Patch

diff --git a/meta-oe/recipes-kernel/linux/linux.inc b/meta-oe/recipes-kernel/linux/linux.inc
new file mode 100644
index 0000000..2b2fbf3
--- /dev/null
+++ b/meta-oe/recipes-kernel/linux/linux.inc
@@ -0,0 +1,131 @@ 
+DESCRIPTION = "Linux Kernel"
+SECTION = "kernel"
+LICENSE = "GPLv2"
+LIC_FILES_CHKSUM = "file://COPYING;md5=d7810fab7487fb0aad327b76f1be7cd7"
+
+INC_PR = "r0"
+
+inherit kernel siteinfo
+
+# Enable OABI compat for people stuck with obsolete userspace
+ARM_KEEP_OABI ?= "0"
+
+# Set the verbosity of kernel messages during runtime
+# You can define CMDLINE_DEBUG in your local.conf or distro.conf to override this behaviour
+CMDLINE_DEBUG ?= "loglevel=3"
+
+# Kernel bootlogo is distro-specific (default is OE logo).
+# Logo resolution (qvga, vga, ...) is machine-specific.
+LOGO_SIZE ?= '${@base_conditional("MACHINE_GUI_CLASS", "bigscreen", "vga", "qvga", d)}'
+# To use this, add file://${LOGO_SIZE}/logo_linux_clut224.ppm.bz2 or similar
+# to your kernel recipe, and then structure your logos for each resolution
+# accordingly.
+
+LOCALVERSION ?= ""
+
+#kernel_conf_variable CMDLINE "\"${CMDLINE} ${CMDLINE_DEBUG}\""
+kernel_conf_variable() {
+	CONF_SED_SCRIPT="$CONF_SED_SCRIPT /CONFIG_$1[ =]/d;"
+	if test "$2" = "n"
+	then
+		echo "# CONFIG_$1 is not set" >> ${S}/.config
+	else
+		echo "CONFIG_$1=$2" >> ${S}/.config
+	fi
+}
+
+do_configure_prepend() {
+        echo "" > ${S}/.config
+	CONF_SED_SCRIPT=""
+
+        #
+        # logo support, if you supply logo_linux_clut224.ppm in SRC_URI, then it's going to be used
+        #
+        if [ -e ${WORKDIR}/logo_linux_clut224.ppm ]; then
+                install -m 0644 ${WORKDIR}/logo_linux_clut224.ppm drivers/video/logo/logo_linux_clut224.ppm
+		kernel_conf_variable LOGO y
+		kernel_conf_variable LOGO_LINUX_CLUT224 y
+        fi
+
+        #
+        # oabi / eabi support
+        #
+	kernel_conf_variable AEABI y
+	if [ "${ARM_KEEP_OABI}" = "1" ] ; then
+		kernel_conf_variable OABI_COMPAT y
+	else
+		kernel_conf_variable OABI_COMPAT n
+	fi
+
+        # When enabling thumb for userspace we also need thumb support in the kernel
+        if [ "${ARM_INSTRUCTION_SET}" = "thumb" ] ; then
+		kernel_conf_variable ARM_THUMB y
+        fi
+
+	kernel_conf_variable CMDLINE "\"${CMDLINE} ${CMDLINE_DEBUG}\""
+
+	kernel_conf_variable LOCALVERSION "\"${LOCALVERSION}\""
+	kernel_conf_variable LOCALVERSION_AUTO n
+
+	kernel_conf_variable SYSFS_DEPRECATED n
+	kernel_conf_variable SYSFS_DEPRECATED_V2 n
+        kernel_conf_variable HOTPLUG y
+        kernel_conf_variable UEVENT_HELPER_PATH \"\"
+        kernel_conf_variable UNIX y
+        kernel_conf_variable SYSFS y
+        kernel_conf_variable PROC_FS y
+        kernel_conf_variable TMPFS y
+        kernel_conf_variable INOTIFY_USER y
+        kernel_conf_variable SIGNALFD y
+        kernel_conf_variable TMPFS_POSIX_ACL y
+        kernel_conf_variable BLK_DEV_BSG y
+        kernel_conf_variable DEVTMPFS y
+        kernel_conf_variable DEVTMPFS_MOUNT y
+
+        # Newer inits like systemd need cgroup support
+        if [ "${KERNEL_ENABLE_CGROUPS}" = "1" ] ; then
+            kernel_conf_variable CGROUP_SCHED y
+            kernel_conf_variable CGROUPS y
+            kernel_conf_variable CGROUP_NS y
+            kernel_conf_variable CGROUP_FREEZER y
+            kernel_conf_variable CGROUP_DEVICE y
+            kernel_conf_variable CPUSETS y
+            kernel_conf_variable PROC_PID_CPUSET y
+            kernel_conf_variable CGROUP_CPUACCT y
+            kernel_conf_variable RESOURCE_COUNTERS y
+        fi
+
+        #
+        # root-over-nfs-over-usb-eth support. Limited, but should cover some cases.
+        # Enable this by setting a proper CMDLINE_NFSROOT_USB.
+        #
+        if [ ! -z "${CMDLINE_NFSROOT_USB}" ]; then
+                bbnote "Configuring the kernel for root-over-nfs-over-usb-eth with CMDLINE ${CMDLINE_NFSROOT_USB}"
+                kernel_conf_variable INET y
+                kernel_conf_variable IP_PNP y
+                kernel_conf_variable USB_GADGET y
+                kernel_conf_variable USB_GADGET_SELECTED y
+                kernel_conf_variable USB_ETH y
+                kernel_conf_variable NFS_FS y
+                kernel_conf_variable ROOT_NFS y
+                kernel_conf_variable CMDLINE \"${CMDLINE_NFSROOT_USB} ${CMDLINE_DEBUG}\"
+        fi
+
+        sed -e "${CONF_SED_SCRIPT}" \
+		< '${WORKDIR}/defconfig' >>'${S}/.config'
+
+	yes '' | oe_runmake oldconfig
+}
+
+do_configure_append() {
+        if test -e scripts/Makefile.fwinst ; then
+		sed -i -e "s:-m0644:-m 0644:g" scripts/Makefile.fwinst
+	fi
+}
+
+do_install_append() {
+	oe_runmake headers_install INSTALL_HDR_PATH=${D}${exec_prefix}/src/linux-${KERNEL_VERSION} ARCH=$ARCH
+}
+
+PACKAGES =+ "kernel-headers"
+FILES_kernel-headers = "${exec_prefix}/src/linux*"