Patchwork [meta-handheld,2/2] recipes-kernel: use shared linux.inc from meta-oe

login
register
mail settings
Submitter Martin Jansa
Date March 29, 2012, 6:35 a.m.
Message ID <3065bcbfb2b5c24a3e316375b0afbedadf265665.1333002899.git.Martin.Jansa@gmail.com>
Download mbox | patch
Permalink /patch/24805/
State Under Review, archived
Headers show

Comments

Martin Jansa - March 29, 2012, 6:35 a.m.
* notice that ARM_KEEP_OABI default value is now 0 instead of 1
  but only linux-hackndev and linux-handhelds-2.6-2.6.21 had
  CONFIG_OABI_COMPAT=y in defconfigs so this shouldn't change anything

Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
---
 recipes-kernel/linux/linux.inc             |  130 ----------------------------
 recipes-kernel/linux/linux_2.6.29.bb       |    2 +-
 recipes-kernel/linux/linux_3.0.1.bb        |    2 +-
 recipes-kernel/linux/linux_3.1.bb          |    2 +-
 recipes-kernel/linux/linux_3.2.bb          |    2 +-
 recipes-kernel/linux/linux_git.bb          |    2 +-
 recipes-kernel/linux/openezx-kernel_git.bb |    2 +-
 7 files changed, 6 insertions(+), 136 deletions(-)
 delete mode 100644 recipes-kernel/linux/linux.inc
Andrea Adami - March 29, 2012, 9:52 a.m.
On Thu, Mar 29, 2012 at 8:35 AM, Martin Jansa <martin.jansa@gmail.com> wrote:
> * notice that ARM_KEEP_OABI default value is now 0 instead of 1
>  but only linux-hackndev and linux-handhelds-2.6-2.6.21 had
>  CONFIG_OABI_COMPAT=y in defconfigs so this shouldn't change anything
>
> Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
> ---
>  recipes-kernel/linux/linux.inc             |  130 ----------------------------
>  recipes-kernel/linux/linux_2.6.29.bb       |    2 +-
>  recipes-kernel/linux/linux_3.0.1.bb        |    2 +-
>  recipes-kernel/linux/linux_3.1.bb          |    2 +-
>  recipes-kernel/linux/linux_3.2.bb          |    2 +-
>  recipes-kernel/linux/linux_git.bb          |    2 +-
>  recipes-kernel/linux/openezx-kernel_git.bb |    2 +-
>  7 files changed, 6 insertions(+), 136 deletions(-)
>  delete mode 100644 recipes-kernel/linux/linux.inc
>
> diff --git a/recipes-kernel/linux/linux.inc b/recipes-kernel/linux/linux.inc
> deleted file mode 100644
> index f920b84..0000000
> --- a/recipes-kernel/linux/linux.inc
> +++ /dev/null
> @@ -1,130 +0,0 @@
> -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 ?= "1"
> -
> -# 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() {
> -       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*"
> diff --git a/recipes-kernel/linux/linux_2.6.29.bb b/recipes-kernel/linux/linux_2.6.29.bb
> index e1da026..6640004 100644
> --- a/recipes-kernel/linux/linux_2.6.29.bb
> +++ b/recipes-kernel/linux/linux_2.6.29.bb
> @@ -1,4 +1,4 @@
> -require linux.inc
> +require recipes-kernel/linux/linux.inc
>
>  PR = "r0"
>
> diff --git a/recipes-kernel/linux/linux_3.0.1.bb b/recipes-kernel/linux/linux_3.0.1.bb
> index 38c5196..5eb44d1 100644
> --- a/recipes-kernel/linux/linux_3.0.1.bb
> +++ b/recipes-kernel/linux/linux_3.0.1.bb
> @@ -1,4 +1,4 @@
> -require linux.inc
> +require recipes-kernel/linux/linux.inc
>
>  # Mark archs/machines that this kernel supports
>  DEFAULT_PREFERENCE = "-1"
> diff --git a/recipes-kernel/linux/linux_3.1.bb b/recipes-kernel/linux/linux_3.1.bb
> index 5e9a714..613f9e5 100644
> --- a/recipes-kernel/linux/linux_3.1.bb
> +++ b/recipes-kernel/linux/linux_3.1.bb
> @@ -1,4 +1,4 @@
> -require linux.inc
> +require recipes-kernel/linux/linux.inc
>
>  PR = "${INC_PR}.9"
>  COMPATIBLE_MACHINE = "(akita|c7x0|collie|poodle|tosa|spitz|h1940)"
> diff --git a/recipes-kernel/linux/linux_3.2.bb b/recipes-kernel/linux/linux_3.2.bb
> index 5379870..2799ab4 100644
> --- a/recipes-kernel/linux/linux_3.2.bb
> +++ b/recipes-kernel/linux/linux_3.2.bb
> @@ -1,4 +1,4 @@
> -require linux.inc
> +require recipes-kernel/linux/linux.inc
>
>  PR = "${INC_PR}.4"
>  COMPATIBLE_MACHINE = "(akita|c7x0|collie|poodle|tosa|spitz)"
> diff --git a/recipes-kernel/linux/linux_git.bb b/recipes-kernel/linux/linux_git.bb
> index 222df31..f7425ee 100644
> --- a/recipes-kernel/linux/linux_git.bb
> +++ b/recipes-kernel/linux/linux_git.bb
> @@ -1,4 +1,4 @@
> -require linux.inc
> +require recipes-kernel/linux/linux.inc
>
>  PR = "${INC_PR}.0"
>  COMPATIBLE_MACHINE = "spitz"
> diff --git a/recipes-kernel/linux/openezx-kernel_git.bb b/recipes-kernel/linux/openezx-kernel_git.bb
> index 03467d0..d48afa5 100644
> --- a/recipes-kernel/linux/openezx-kernel_git.bb
> +++ b/recipes-kernel/linux/openezx-kernel_git.bb
> @@ -6,7 +6,7 @@ KV = "2.6.38-oe"
>  PV = "${KV}+gitr${SRCREV}"
>  PR = "r0"
>
> -require linux.inc
> +require recipes-kernel/linux/linux.inc
>
>  # Make sure not to use thumb[-interworking]
>  ARM_INSTRUCTION_SET = "arm"
> --
> 1.7.8.5
>
>
> _______________________________________________
> Openembedded-devel mailing list
> Openembedded-devel@lists.openembedded.org
> http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-devel

Martin,

I have some concerns here, because I don't think meta-handeld should
depend on meta-oe.
(I know udev .bbappend requires it now but talking with Paul we found
a better solution and udev will disappear from layer soon).

Then, I have already done some tests using linux-yocto with our
defconfigs and this could be indeed the future direction.
So, please, let it there until we decide the best approach.

Regards

Andrea
Martin Jansa - March 29, 2012, 1:45 p.m.
On Thu, Mar 29, 2012 at 11:52:15AM +0200, Andrea Adami wrote:
> On Thu, Mar 29, 2012 at 8:35 AM, Martin Jansa <martin.jansa@gmail.com> wrote:
> > * notice that ARM_KEEP_OABI default value is now 0 instead of 1
> >  but only linux-hackndev and linux-handhelds-2.6-2.6.21 had
> >  CONFIG_OABI_COMPAT=y in defconfigs so this shouldn't change anything
> >
> > Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
> > ---
> >  recipes-kernel/linux/linux.inc             |  130 ----------------------------
> >  recipes-kernel/linux/linux_2.6.29.bb       |    2 +-
> >  recipes-kernel/linux/linux_3.0.1.bb        |    2 +-
> >  recipes-kernel/linux/linux_3.1.bb          |    2 +-
> >  recipes-kernel/linux/linux_3.2.bb          |    2 +-
> >  recipes-kernel/linux/linux_git.bb          |    2 +-
> >  recipes-kernel/linux/openezx-kernel_git.bb |    2 +-
> >  7 files changed, 6 insertions(+), 136 deletions(-)
> >  delete mode 100644 recipes-kernel/linux/linux.inc
> >
> > diff --git a/recipes-kernel/linux/linux.inc b/recipes-kernel/linux/linux.inc
> > deleted file mode 100644
> > index f920b84..0000000
> > --- a/recipes-kernel/linux/linux.inc
> > +++ /dev/null
> > @@ -1,130 +0,0 @@
> > -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 ?= "1"
> > -
> > -# 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() {
> > -       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*"
> > diff --git a/recipes-kernel/linux/linux_2.6.29.bb b/recipes-kernel/linux/linux_2.6.29.bb
> > index e1da026..6640004 100644
> > --- a/recipes-kernel/linux/linux_2.6.29.bb
> > +++ b/recipes-kernel/linux/linux_2.6.29.bb
> > @@ -1,4 +1,4 @@
> > -require linux.inc
> > +require recipes-kernel/linux/linux.inc
> >
> >  PR = "r0"
> >
> > diff --git a/recipes-kernel/linux/linux_3.0.1.bb b/recipes-kernel/linux/linux_3.0.1.bb
> > index 38c5196..5eb44d1 100644
> > --- a/recipes-kernel/linux/linux_3.0.1.bb
> > +++ b/recipes-kernel/linux/linux_3.0.1.bb
> > @@ -1,4 +1,4 @@
> > -require linux.inc
> > +require recipes-kernel/linux/linux.inc
> >
> >  # Mark archs/machines that this kernel supports
> >  DEFAULT_PREFERENCE = "-1"
> > diff --git a/recipes-kernel/linux/linux_3.1.bb b/recipes-kernel/linux/linux_3.1.bb
> > index 5e9a714..613f9e5 100644
> > --- a/recipes-kernel/linux/linux_3.1.bb
> > +++ b/recipes-kernel/linux/linux_3.1.bb
> > @@ -1,4 +1,4 @@
> > -require linux.inc
> > +require recipes-kernel/linux/linux.inc
> >
> >  PR = "${INC_PR}.9"
> >  COMPATIBLE_MACHINE = "(akita|c7x0|collie|poodle|tosa|spitz|h1940)"
> > diff --git a/recipes-kernel/linux/linux_3.2.bb b/recipes-kernel/linux/linux_3.2.bb
> > index 5379870..2799ab4 100644
> > --- a/recipes-kernel/linux/linux_3.2.bb
> > +++ b/recipes-kernel/linux/linux_3.2.bb
> > @@ -1,4 +1,4 @@
> > -require linux.inc
> > +require recipes-kernel/linux/linux.inc
> >
> >  PR = "${INC_PR}.4"
> >  COMPATIBLE_MACHINE = "(akita|c7x0|collie|poodle|tosa|spitz)"
> > diff --git a/recipes-kernel/linux/linux_git.bb b/recipes-kernel/linux/linux_git.bb
> > index 222df31..f7425ee 100644
> > --- a/recipes-kernel/linux/linux_git.bb
> > +++ b/recipes-kernel/linux/linux_git.bb
> > @@ -1,4 +1,4 @@
> > -require linux.inc
> > +require recipes-kernel/linux/linux.inc
> >
> >  PR = "${INC_PR}.0"
> >  COMPATIBLE_MACHINE = "spitz"
> > diff --git a/recipes-kernel/linux/openezx-kernel_git.bb b/recipes-kernel/linux/openezx-kernel_git.bb
> > index 03467d0..d48afa5 100644
> > --- a/recipes-kernel/linux/openezx-kernel_git.bb
> > +++ b/recipes-kernel/linux/openezx-kernel_git.bb
> > @@ -6,7 +6,7 @@ KV = "2.6.38-oe"
> >  PV = "${KV}+gitr${SRCREV}"
> >  PR = "r0"
> >
> > -require linux.inc
> > +require recipes-kernel/linux/linux.inc
> >
> >  # Make sure not to use thumb[-interworking]
> >  ARM_INSTRUCTION_SET = "arm"
> > --
> > 1.7.8.5
> >
> >
> > _______________________________________________
> > Openembedded-devel mailing list
> > Openembedded-devel@lists.openembedded.org
> > http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-devel
> 
> Martin,
> 
> I have some concerns here, because I don't think meta-handeld should
> depend on meta-oe.
> (I know udev .bbappend requires it now but talking with Paul we found
> a better solution and udev will disappear from layer soon).

Denis wanted linux.inc also in some smaller layer then meta-oe, so maybe
we can create meta-bsp-support in meta-opememebedded repository and move
it there?

Having linux.inc copy for each BSP is wrong.

Cheers,
Denys Dmytriyenko - March 29, 2012, 3:40 p.m.
On Thu, Mar 29, 2012 at 03:45:19PM +0200, Martin Jansa wrote:
> On Thu, Mar 29, 2012 at 11:52:15AM +0200, Andrea Adami wrote:
> > On Thu, Mar 29, 2012 at 8:35 AM, Martin Jansa <martin.jansa@gmail.com> wrote:
> > > * notice that ARM_KEEP_OABI default value is now 0 instead of 1
> > >  but only linux-hackndev and linux-handhelds-2.6-2.6.21 had
> > >  CONFIG_OABI_COMPAT=y in defconfigs so this shouldn't change anything
> > >
> > > Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
> > > ---
> > 
> > Martin,
> > 
> > I have some concerns here, because I don't think meta-handeld should
> > depend on meta-oe.
> > (I know udev .bbappend requires it now but talking with Paul we found
> > a better solution and udev will disappear from layer soon).
> 
> Denis wanted linux.inc also in some smaller layer then meta-oe, so maybe
> we can create meta-bsp-support in meta-opememebedded repository and move
> it there?
> 
> Having linux.inc copy for each BSP is wrong.

Remind me, what was the reason to have linux.inc as a separate file in the 
first place? I mean, can we roll it back to kernel.bbclass in OE-Core? If not, 
maybe it would be easier to push it as is to OE-Core, since it's much cleaner 
now?
Martin Jansa - March 29, 2012, 6:56 p.m.
On Thu, Mar 29, 2012 at 11:40:05AM -0400, Denys Dmytriyenko wrote:
> On Thu, Mar 29, 2012 at 03:45:19PM +0200, Martin Jansa wrote:
> > On Thu, Mar 29, 2012 at 11:52:15AM +0200, Andrea Adami wrote:
> > > On Thu, Mar 29, 2012 at 8:35 AM, Martin Jansa <martin.jansa@gmail.com> wrote:
> > > > * notice that ARM_KEEP_OABI default value is now 0 instead of 1
> > > >  but only linux-hackndev and linux-handhelds-2.6-2.6.21 had
> > > >  CONFIG_OABI_COMPAT=y in defconfigs so this shouldn't change anything
> > > >
> > > > Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
> > > > ---
> > > 
> > > Martin,
> > > 
> > > I have some concerns here, because I don't think meta-handeld should
> > > depend on meta-oe.
> > > (I know udev .bbappend requires it now but talking with Paul we found
> > > a better solution and udev will disappear from layer soon).
> > 
> > Denis wanted linux.inc also in some smaller layer then meta-oe, so maybe
> > we can create meta-bsp-support in meta-opememebedded repository and move
> > it there?
> > 
> > Having linux.inc copy for each BSP is wrong.
> 
> Remind me, what was the reason to have linux.inc as a separate file in the 
> first place? I mean, can we roll it back to kernel.bbclass in OE-Core? If not, 

I guess that linux-yocto would not like linux.inc functionality in
kernel.bbclass, but I haven't looked into linux-yocto much, but I guess
it's still using kernel.bbclass..

> maybe it would be easier to push it as is to OE-Core, since it's much cleaner 
> now?

yes if someone wants to push it there, feel free

Cheers,

Patch

diff --git a/recipes-kernel/linux/linux.inc b/recipes-kernel/linux/linux.inc
deleted file mode 100644
index f920b84..0000000
--- a/recipes-kernel/linux/linux.inc
+++ /dev/null
@@ -1,130 +0,0 @@ 
-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 ?= "1"
-
-# 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() {
-	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*"
diff --git a/recipes-kernel/linux/linux_2.6.29.bb b/recipes-kernel/linux/linux_2.6.29.bb
index e1da026..6640004 100644
--- a/recipes-kernel/linux/linux_2.6.29.bb
+++ b/recipes-kernel/linux/linux_2.6.29.bb
@@ -1,4 +1,4 @@ 
-require linux.inc
+require recipes-kernel/linux/linux.inc
 
 PR = "r0"
 
diff --git a/recipes-kernel/linux/linux_3.0.1.bb b/recipes-kernel/linux/linux_3.0.1.bb
index 38c5196..5eb44d1 100644
--- a/recipes-kernel/linux/linux_3.0.1.bb
+++ b/recipes-kernel/linux/linux_3.0.1.bb
@@ -1,4 +1,4 @@ 
-require linux.inc
+require recipes-kernel/linux/linux.inc
 
 # Mark archs/machines that this kernel supports
 DEFAULT_PREFERENCE = "-1"
diff --git a/recipes-kernel/linux/linux_3.1.bb b/recipes-kernel/linux/linux_3.1.bb
index 5e9a714..613f9e5 100644
--- a/recipes-kernel/linux/linux_3.1.bb
+++ b/recipes-kernel/linux/linux_3.1.bb
@@ -1,4 +1,4 @@ 
-require linux.inc
+require recipes-kernel/linux/linux.inc
 
 PR = "${INC_PR}.9"
 COMPATIBLE_MACHINE = "(akita|c7x0|collie|poodle|tosa|spitz|h1940)"
diff --git a/recipes-kernel/linux/linux_3.2.bb b/recipes-kernel/linux/linux_3.2.bb
index 5379870..2799ab4 100644
--- a/recipes-kernel/linux/linux_3.2.bb
+++ b/recipes-kernel/linux/linux_3.2.bb
@@ -1,4 +1,4 @@ 
-require linux.inc
+require recipes-kernel/linux/linux.inc
 
 PR = "${INC_PR}.4"
 COMPATIBLE_MACHINE = "(akita|c7x0|collie|poodle|tosa|spitz)"
diff --git a/recipes-kernel/linux/linux_git.bb b/recipes-kernel/linux/linux_git.bb
index 222df31..f7425ee 100644
--- a/recipes-kernel/linux/linux_git.bb
+++ b/recipes-kernel/linux/linux_git.bb
@@ -1,4 +1,4 @@ 
-require linux.inc
+require recipes-kernel/linux/linux.inc
 
 PR = "${INC_PR}.0"
 COMPATIBLE_MACHINE = "spitz"
diff --git a/recipes-kernel/linux/openezx-kernel_git.bb b/recipes-kernel/linux/openezx-kernel_git.bb
index 03467d0..d48afa5 100644
--- a/recipes-kernel/linux/openezx-kernel_git.bb
+++ b/recipes-kernel/linux/openezx-kernel_git.bb
@@ -6,7 +6,7 @@  KV = "2.6.38-oe"
 PV = "${KV}+gitr${SRCREV}"
 PR = "r0"
 
-require linux.inc
+require recipes-kernel/linux/linux.inc
 
 # Make sure not to use thumb[-interworking]
 ARM_INSTRUCTION_SET = "arm"