* [meta-oe][PATCH 1/5] kernel.bbclass: use better number for KERNEL_PRIORITY
2012-03-23 13:03 [meta-oe][PATCH 0/5] kernel.bbclass update Martin Jansa
@ 2012-03-23 13:04 ` Martin Jansa
2012-03-23 13:04 ` [meta-oe][PATCH 2/5] kernel.bbclass: fix extra + in kernelrelease Martin Jansa
` (3 subsequent siblings)
4 siblings, 0 replies; 9+ messages in thread
From: Martin Jansa @ 2012-03-23 13:04 UTC (permalink / raw)
To: openembedded-devel
* there is no upgrade from 2.6.X to 3.X.Y
last part of PV is used as kernel priority for u-a, but X is usually higher then Y in 3.x.x
so use all 3 parts in one bigger number
* and make it weak assignment if this scheme doesn't work for some
recipe
Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
---
meta-oe/classes/kernel.bbclass | 4 +++-
1 files changed, 3 insertions(+), 1 deletions(-)
diff --git a/meta-oe/classes/kernel.bbclass b/meta-oe/classes/kernel.bbclass
index 41a741f..02d0ca5 100644
--- a/meta-oe/classes/kernel.bbclass
+++ b/meta-oe/classes/kernel.bbclass
@@ -36,7 +36,9 @@ PACKAGES_DYNAMIC += "kernel-firmware-*"
export OS = "${TARGET_OS}"
export CROSS_COMPILE = "${TARGET_PREFIX}"
-KERNEL_PRIORITY = "${@d.getVar('PV',1).split('-')[0].split('.')[-1]}"
+KERNEL_PRIORITY ?= "${@int(d.getVar('PV',1).split('-')[0].split('+')[0].split('.')[0]) * 10000 + \
+ int(d.getVar('PV',1).split('-')[0].split('+')[0].split('.')[1]) * 100 + \
+ int(d.getVar('PV',1).split('-')[0].split('+')[0].split('.')[-1])}"
KERNEL_RELEASE ?= "${KERNEL_VERSION}"
--
1.7.8.5
^ permalink raw reply related [flat|nested] 9+ messages in thread* [meta-oe][PATCH 2/5] kernel.bbclass: fix extra + in kernelrelease
2012-03-23 13:03 [meta-oe][PATCH 0/5] kernel.bbclass update Martin Jansa
2012-03-23 13:04 ` [meta-oe][PATCH 1/5] kernel.bbclass: use better number for KERNEL_PRIORITY Martin Jansa
@ 2012-03-23 13:04 ` Martin Jansa
2012-03-23 13:04 ` [meta-oe][PATCH 3/5] linux: import shared linux.inc so we have just one copy Martin Jansa
` (2 subsequent siblings)
4 siblings, 0 replies; 9+ messages in thread
From: Martin Jansa @ 2012-03-23 13:04 UTC (permalink / raw)
To: openembedded-devel
* see http://lists.linuxtogo.org/pipermail/openembedded-core/2011-December/014308.html
Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
---
meta-oe/classes/kernel.bbclass | 6 ++++++
1 files changed, 6 insertions(+), 0 deletions(-)
diff --git a/meta-oe/classes/kernel.bbclass b/meta-oe/classes/kernel.bbclass
index 02d0ca5..d87b177 100644
--- a/meta-oe/classes/kernel.bbclass
+++ b/meta-oe/classes/kernel.bbclass
@@ -209,6 +209,12 @@ sysroot_stage_all_append() {
}
kernel_do_configure() {
+ # fixes extra + in /lib/modules/2.6.37+
+ # $ scripts/setlocalversion . => +
+ # $ make kernelversion => 2.6.37
+ # $ make kernelrelease => 2.6.37+
+ touch ${B}/.scmversion
+
# Copy defconfig to .config if .config does not exist. This allows
# recipes to manage the .config themselves in do_configure_prepend().
if [ -f "${WORKDIR}/defconfig" ] && [ ! -f "${B}/.config" ]; then
--
1.7.8.5
^ permalink raw reply related [flat|nested] 9+ messages in thread* [meta-oe][PATCH 3/5] linux: import shared linux.inc so we have just one copy
2012-03-23 13:03 [meta-oe][PATCH 0/5] kernel.bbclass update Martin Jansa
2012-03-23 13:04 ` [meta-oe][PATCH 1/5] kernel.bbclass: use better number for KERNEL_PRIORITY Martin Jansa
2012-03-23 13:04 ` [meta-oe][PATCH 2/5] kernel.bbclass: fix extra + in kernelrelease Martin Jansa
@ 2012-03-23 13:04 ` Martin Jansa
2012-03-23 13:59 ` Andrea Adami
2012-03-29 3:49 ` Denys Dmytriyenko
2012-03-23 13:04 ` [meta-oe][PATCH 4/5] kernel.bbclass: use symlinks for modutils files Martin Jansa
2012-03-23 13:04 ` [meta-oe][PATCH 5/5] kernel.bbclass: don't create /etc/modutils/* Martin Jansa
4 siblings, 2 replies; 9+ messages in thread
From: Martin Jansa @ 2012-03-23 13:04 UTC (permalink / raw)
To: openembedded-devel
* 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
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
^ permalink raw reply related [flat|nested] 9+ messages in thread* Re: [meta-oe][PATCH 3/5] linux: import shared linux.inc so we have just one copy
2012-03-23 13:04 ` [meta-oe][PATCH 3/5] linux: import shared linux.inc so we have just one copy Martin Jansa
@ 2012-03-23 13:59 ` Andrea Adami
2012-03-23 14:30 ` Martin Jansa
2012-03-29 3:49 ` Denys Dmytriyenko
1 sibling, 1 reply; 9+ messages in thread
From: Andrea Adami @ 2012-03-23 13:59 UTC (permalink / raw)
To: openembedded-devel
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
^ permalink raw reply [flat|nested] 9+ messages in thread* Re: [meta-oe][PATCH 3/5] linux: import shared linux.inc so we have just one copy
2012-03-23 13:59 ` Andrea Adami
@ 2012-03-23 14:30 ` Martin Jansa
0 siblings, 0 replies; 9+ messages in thread
From: Martin Jansa @ 2012-03-23 14:30 UTC (permalink / raw)
To: openembedded-devel
[-- Attachment #1: Type: text/plain, Size: 8558 bytes --]
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
--
Martin 'JaMa' Jansa jabber: Martin.Jansa@gmail.com
[-- Attachment #2: Digital signature --]
[-- Type: application/pgp-signature, Size: 205 bytes --]
^ permalink raw reply [flat|nested] 9+ messages in thread
* Re: [meta-oe][PATCH 3/5] linux: import shared linux.inc so we have just one copy
2012-03-23 13:04 ` [meta-oe][PATCH 3/5] linux: import shared linux.inc so we have just one copy Martin Jansa
2012-03-23 13:59 ` Andrea Adami
@ 2012-03-29 3:49 ` Denys Dmytriyenko
1 sibling, 0 replies; 9+ messages in thread
From: Denys Dmytriyenko @ 2012-03-29 3:49 UTC (permalink / raw)
To: openembedded-devel
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.
--
Denys
> 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
^ permalink raw reply [flat|nested] 9+ messages in thread
* [meta-oe][PATCH 4/5] kernel.bbclass: use symlinks for modutils files
2012-03-23 13:03 [meta-oe][PATCH 0/5] kernel.bbclass update Martin Jansa
` (2 preceding siblings ...)
2012-03-23 13:04 ` [meta-oe][PATCH 3/5] linux: import shared linux.inc so we have just one copy Martin Jansa
@ 2012-03-23 13:04 ` Martin Jansa
2012-03-23 13:04 ` [meta-oe][PATCH 5/5] kernel.bbclass: don't create /etc/modutils/* Martin Jansa
4 siblings, 0 replies; 9+ messages in thread
From: Martin Jansa @ 2012-03-23 13:04 UTC (permalink / raw)
To: openembedded-devel
Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
---
meta-oe/classes/kernel.bbclass | 8 +++-----
1 files changed, 3 insertions(+), 5 deletions(-)
diff --git a/meta-oe/classes/kernel.bbclass b/meta-oe/classes/kernel.bbclass
index d87b177..3636ff0 100644
--- a/meta-oe/classes/kernel.bbclass
+++ b/meta-oe/classes/kernel.bbclass
@@ -420,16 +420,14 @@ python populate_packages_prepend () {
# appropriate modprobe commands to the postinst
autoload = d.getVar('module_autoload_%s' % basename, True)
if autoload:
- name = '%s/etc/modutils/%s' % (dvar, basename)
- f = open(name, 'w')
- for m in autoload.split():
- f.write('%s\n' % m)
- f.close()
name = '%s/etc/modules-load.d/%s.conf' % (dvar, basename)
f = open(name, 'w')
for m in autoload.split():
f.write('%s\n' % m)
f.close()
+ modutils_name = '%s/etc/modutils/%s' % (dvar, basename)
+ modutils_target = '../modules-load.d/%s.conf' % (basename)
+ os.symlink(modutils_target, modutils_name)
postinst = d.getVar('pkg_postinst_%s' % pkg, True)
if not postinst:
bb.fatal("pkg_postinst_%s not defined" % pkg)
--
1.7.8.5
^ permalink raw reply related [flat|nested] 9+ messages in thread* [meta-oe][PATCH 5/5] kernel.bbclass: don't create /etc/modutils/*
2012-03-23 13:03 [meta-oe][PATCH 0/5] kernel.bbclass update Martin Jansa
` (3 preceding siblings ...)
2012-03-23 13:04 ` [meta-oe][PATCH 4/5] kernel.bbclass: use symlinks for modutils files Martin Jansa
@ 2012-03-23 13:04 ` Martin Jansa
4 siblings, 0 replies; 9+ messages in thread
From: Martin Jansa @ 2012-03-23 13:04 UTC (permalink / raw)
To: openembedded-devel
* update-modules was updated to read /etc/modules-load.d/*.conf
Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
---
meta-oe/classes/kernel.bbclass | 12 ++++--------
1 files changed, 4 insertions(+), 8 deletions(-)
diff --git a/meta-oe/classes/kernel.bbclass b/meta-oe/classes/kernel.bbclass
index 3636ff0..9ce2f44 100644
--- a/meta-oe/classes/kernel.bbclass
+++ b/meta-oe/classes/kernel.bbclass
@@ -128,7 +128,6 @@ kernel_do_install() {
install -m 0644 .config ${D}/boot/config-${KERNEL_VERSION}
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
install -d ${D}/etc/modules-load.d
install -d ${D}/etc/modprobe.d
@@ -416,7 +415,7 @@ python populate_packages_prepend () {
dvar = d.getVar('PKGD', True)
- # If autoloading is requested, output /etc/modutils/<name> and append
+ # If autoloading is requested, output /etc/modules-load.d/<name>.conf and append
# appropriate modprobe commands to the postinst
autoload = d.getVar('module_autoload_%s' % basename, True)
if autoload:
@@ -425,9 +424,6 @@ python populate_packages_prepend () {
for m in autoload.split():
f.write('%s\n' % m)
f.close()
- modutils_name = '%s/etc/modutils/%s' % (dvar, basename)
- modutils_target = '../modules-load.d/%s.conf' % (basename)
- os.symlink(modutils_target, modutils_name)
postinst = d.getVar('pkg_postinst_%s' % pkg, True)
if not postinst:
bb.fatal("pkg_postinst_%s not defined" % pkg)
@@ -443,7 +439,7 @@ python populate_packages_prepend () {
f.close()
files = d.getVar('FILES_%s' % pkg, True)
- files = "%s /etc/modutils/%s /etc/modutils/%s.conf /etc/modules-load.d/%s.conf /etc/modprobe.d/%s.conf" % (files, basename, basename, basename, basename)
+ files = "%s /etc/modules-load.d/%s.conf /etc/modprobe.d/%s.conf" % (files, basename, basename)
d.setVar('FILES_%s' % pkg, files)
if vals.has_key("description"):
@@ -469,11 +465,11 @@ python populate_packages_prepend () {
do_split_packages(d, root='/lib/firmware', file_regex='^(.*)\.cis$', output_pattern='kernel-firmware-%s', description='Firmware for %s', recursive=True, extra_depends='')
do_split_packages(d, root='/lib/modules', file_regex=module_regex, output_pattern=module_pattern, description='%s kernel module', postinst=postinst, postrm=postrm, recursive=True, hook=frob_metadata, extra_depends='update-modules kernel-%s' % d.getVar("KERNEL_VERSION", True))
- # If modutils and modprobe.d are empty at this point, remove them to
+ # If modules-load.d and modprobe.d are empty at this point, remove them to
# avoid warnings. removedirs only raises an OSError if an empty
# directory cannot be removed.
dvar = d.getVar('PKGD', True)
- for dir in ["%s/etc/modutils" % (dvar), "%s/etc/modprobe.d" % (dvar), "%s/etc/modules-load.d" % (dvar)]:
+ for dir in ["%s/etc/modprobe.d" % (dvar), "%s/etc/modules-load.d" % (dvar)]:
if len(os.listdir(dir)) == 0:
os.rmdir(dir)
--
1.7.8.5
^ permalink raw reply related [flat|nested] 9+ messages in thread