* [PATCH V2 1/2] kernel.bbclass: fix external module building
@ 2012-07-20 23:22 Khem Raj
2012-07-20 23:22 ` [PATCH V2 2/2] kernel bbclass: Recreate uImage only when KEEPUIMAGE != "yes" Khem Raj
` (2 more replies)
0 siblings, 3 replies; 6+ messages in thread
From: Khem Raj @ 2012-07-20 23:22 UTC (permalink / raw)
To: openembedded-core; +Cc: Koen Kooi
From: Denis Carikli <GNUtoo@no-log.org>
Without that fix we have the following while compiling compat-wireless.
include/linux/mmzone.h:18:30: fatal error: generated/bounds.h: No such file or directory
Note that the compat-wireless recipe will be added in another commit.
make -C $kerneldir _mrproper_scripts deleted this file along with
other things so we resurrect it with this patch.
Signed-off-by: Denis 'GNUtoo' Carikli <GNUtoo@no-log.org>
Signed-off-by: Koen Kooi <koen@dominion.thruhere.net>
---
meta/classes/kernel.bbclass | 3 +++
1 file changed, 3 insertions(+)
diff --git a/meta/classes/kernel.bbclass b/meta/classes/kernel.bbclass
index 08b5e61..ce4d7de 100644
--- a/meta/classes/kernel.bbclass
+++ b/meta/classes/kernel.bbclass
@@ -187,6 +187,9 @@ kernel_do_install() {
cp arch/powerpc/lib/crtsavres.o $kerneldir/arch/powerpc/lib/crtsavres.o
fi
+ # Necessary for building modules like compat-wireless.
+ cp include/generated/bounds.h $kerneldir/include/generated/bounds.h
+
# Remove the following binaries which cause strip or arch QA errors
# during do_package for cross-compiled platforms
bin_files="arch/powerpc/boot/addnote arch/powerpc/boot/hack-coff \
--
1.7.9.5
^ permalink raw reply related [flat|nested] 6+ messages in thread
* [PATCH V2 2/2] kernel bbclass: Recreate uImage only when KEEPUIMAGE != "yes"
2012-07-20 23:22 [PATCH V2 1/2] kernel.bbclass: fix external module building Khem Raj
@ 2012-07-20 23:22 ` Khem Raj
2012-07-23 19:18 ` Saul Wold
2012-07-27 22:27 ` [PATCH V2 1/2] kernel.bbclass: fix external module building Darren Hart
2012-07-27 23:23 ` Chris Larson
2 siblings, 1 reply; 6+ messages in thread
From: Khem Raj @ 2012-07-20 23:22 UTC (permalink / raw)
To: openembedded-core; +Cc: Koen Kooi
From: Koen Kooi <koen@dominion.thruhere.net>
The intent of the uImage code in this class includes the following
1) be able to specify custom load addresses without needing to patch the kernel
2) add better information to the uImage description field
The current state is a NOP anyway, the kernel will always build a uImage when you tell it to 'make uImage'.
weakly Set KEEPUIMAGE to 'yes' in default-distrovars.inc which preserve the
current OE-Core behavior. Machines which are being ported from oe.dev and need to
regenerate uImage can set this to be empty
Signed-off-by: Koen Kooi <koen@dominion.thruhere.net>
Signed-off-by: Khem Raj <raj.khem@gmail.com>
xx
Signed-off-by: Khem Raj <raj.khem@gmail.com>
---
meta/classes/kernel.bbclass | 2 +-
meta/conf/distro/include/default-distrovars.inc | 1 +
2 files changed, 2 insertions(+), 1 deletion(-)
diff --git a/meta/classes/kernel.bbclass b/meta/classes/kernel.bbclass
index ce4d7de..ab984e3 100644
--- a/meta/classes/kernel.bbclass
+++ b/meta/classes/kernel.bbclass
@@ -507,7 +507,7 @@ KERNEL_IMAGE_SYMLINK_NAME ?= "${KERNEL_IMAGETYPE}-${MACHINE}"
do_uboot_mkimage() {
if test "x${KERNEL_IMAGETYPE}" = "xuImage" ; then
- if test ! -e arch/${ARCH}/boot/uImage ; then
+ if test "x${KEEPUIMAGE}" != "xyes" ; then
ENTRYPOINT=${UBOOT_ENTRYPOINT}
if test -n "${UBOOT_ENTRYSYMBOL}"; then
ENTRYPOINT=`${HOST_PREFIX}nm ${S}/vmlinux | \
diff --git a/meta/conf/distro/include/default-distrovars.inc b/meta/conf/distro/include/default-distrovars.inc
index f770919..b72221f 100644
--- a/meta/conf/distro/include/default-distrovars.inc
+++ b/meta/conf/distro/include/default-distrovars.inc
@@ -2,6 +2,7 @@ QA_LOGFILE = "${TMPDIR}/qa.log"
OEINCLUDELOGS ?= "yes"
KERNEL_CONSOLE ?= "ttyS0"
+KEEPUIMAGE ?? = "yes"
PCMCIA_MANAGER ?= "pcmciautils"
--
1.7.9.5
^ permalink raw reply related [flat|nested] 6+ messages in thread
* Re: [PATCH V2 2/2] kernel bbclass: Recreate uImage only when KEEPUIMAGE != "yes"
2012-07-20 23:22 ` [PATCH V2 2/2] kernel bbclass: Recreate uImage only when KEEPUIMAGE != "yes" Khem Raj
@ 2012-07-23 19:18 ` Saul Wold
2012-07-23 20:41 ` Khem Raj
0 siblings, 1 reply; 6+ messages in thread
From: Saul Wold @ 2012-07-23 19:18 UTC (permalink / raw)
To: Patches and discussions about the oe-core layer; +Cc: Koen Kooi
On 07/20/2012 04:22 PM, Khem Raj wrote:
> From: Koen Kooi <koen@dominion.thruhere.net>
>
> The intent of the uImage code in this class includes the following
>
> 1) be able to specify custom load addresses without needing to patch the kernel
> 2) add better information to the uImage description field
>
> The current state is a NOP anyway, the kernel will always build a uImage when you tell it to 'make uImage'.
>
> weakly Set KEEPUIMAGE to 'yes' in default-distrovars.inc which preserve the
> current OE-Core behavior. Machines which are being ported from oe.dev and need to
> regenerate uImage can set this to be empty
>
> Signed-off-by: Koen Kooi <koen@dominion.thruhere.net>
> Signed-off-by: Khem Raj <raj.khem@gmail.com>
>
> xx
>
????
> Signed-off-by: Khem Raj <raj.khem@gmail.com>
> ---
> meta/classes/kernel.bbclass | 2 +-
> meta/conf/distro/include/default-distrovars.inc | 1 +
> 2 files changed, 2 insertions(+), 1 deletion(-)
>
> diff --git a/meta/classes/kernel.bbclass b/meta/classes/kernel.bbclass
> index ce4d7de..ab984e3 100644
> --- a/meta/classes/kernel.bbclass
> +++ b/meta/classes/kernel.bbclass
> @@ -507,7 +507,7 @@ KERNEL_IMAGE_SYMLINK_NAME ?= "${KERNEL_IMAGETYPE}-${MACHINE}"
>
> do_uboot_mkimage() {
> if test "x${KERNEL_IMAGETYPE}" = "xuImage" ; then
> - if test ! -e arch/${ARCH}/boot/uImage ; then
> + if test "x${KEEPUIMAGE}" != "xyes" ; then
> ENTRYPOINT=${UBOOT_ENTRYPOINT}
> if test -n "${UBOOT_ENTRYSYMBOL}"; then
> ENTRYPOINT=`${HOST_PREFIX}nm ${S}/vmlinux | \
> diff --git a/meta/conf/distro/include/default-distrovars.inc b/meta/conf/distro/include/default-distrovars.inc
> index f770919..b72221f 100644
> --- a/meta/conf/distro/include/default-distrovars.inc
> +++ b/meta/conf/distro/include/default-distrovars.inc
> @@ -2,6 +2,7 @@ QA_LOGFILE = "${TMPDIR}/qa.log"
>
> OEINCLUDELOGS ?= "yes"
> KERNEL_CONSOLE ?= "ttyS0"
> +KEEPUIMAGE ?? = "yes"
>
this really worked? (note the space between ?? = )
> PCMCIA_MANAGER ?= "pcmciautils"
>
>
^ permalink raw reply [flat|nested] 6+ messages in thread
* Re: [PATCH V2 2/2] kernel bbclass: Recreate uImage only when KEEPUIMAGE != "yes"
2012-07-23 19:18 ` Saul Wold
@ 2012-07-23 20:41 ` Khem Raj
0 siblings, 0 replies; 6+ messages in thread
From: Khem Raj @ 2012-07-23 20:41 UTC (permalink / raw)
To: Saul Wold; +Cc: Koen Kooi, Patches and discussions about the oe-core layer
On Mon, Jul 23, 2012 at 12:18 PM, Saul Wold <sgw@linux.intel.com> wrote:
>>
>> +KEEPUIMAGE ?? = "yes"
>>
> this really worked? (note the space between ?? = )
No it did not once I switched the testing branch to really what I
wanted to test. Thanks I will send out a v3 soon
^ permalink raw reply [flat|nested] 6+ messages in thread
* Re: [PATCH V2 1/2] kernel.bbclass: fix external module building
2012-07-20 23:22 [PATCH V2 1/2] kernel.bbclass: fix external module building Khem Raj
2012-07-20 23:22 ` [PATCH V2 2/2] kernel bbclass: Recreate uImage only when KEEPUIMAGE != "yes" Khem Raj
@ 2012-07-27 22:27 ` Darren Hart
2012-07-27 23:23 ` Chris Larson
2 siblings, 0 replies; 6+ messages in thread
From: Darren Hart @ 2012-07-27 22:27 UTC (permalink / raw)
To: Patches and discussions about the oe-core layer; +Cc: Koen Kooi
On 07/20/2012 04:22 PM, Khem Raj wrote:
> From: Denis Carikli <GNUtoo@no-log.org>
>
> Without that fix we have the following while compiling compat-wireless.
> include/linux/mmzone.h:18:30: fatal error: generated/bounds.h: No such file or directory
>
> Note that the compat-wireless recipe will be added in another commit.
>
> make -C $kerneldir _mrproper_scripts deleted this file along with
> other things so we resurrect it with this patch.
>
> Signed-off-by: Denis 'GNUtoo' Carikli <GNUtoo@no-log.org>
> Signed-off-by: Koen Kooi <koen@dominion.thruhere.net>
This addresses my concerns and incorporates Paul's request for
documentation in the commit header.
Acked-by: Darren Hart <dvhart@linux.intel.com>
> ---
> meta/classes/kernel.bbclass | 3 +++
> 1 file changed, 3 insertions(+)
>
> diff --git a/meta/classes/kernel.bbclass b/meta/classes/kernel.bbclass
> index 08b5e61..ce4d7de 100644
> --- a/meta/classes/kernel.bbclass
> +++ b/meta/classes/kernel.bbclass
> @@ -187,6 +187,9 @@ kernel_do_install() {
> cp arch/powerpc/lib/crtsavres.o $kerneldir/arch/powerpc/lib/crtsavres.o
> fi
>
> + # Necessary for building modules like compat-wireless.
> + cp include/generated/bounds.h $kerneldir/include/generated/bounds.h
> +
> # Remove the following binaries which cause strip or arch QA errors
> # during do_package for cross-compiled platforms
> bin_files="arch/powerpc/boot/addnote arch/powerpc/boot/hack-coff \
>
--
Darren Hart
Intel Open Source Technology Center
Yocto Project - Technical Lead - Linux Kernel
^ permalink raw reply [flat|nested] 6+ messages in thread
* Re: [PATCH V2 1/2] kernel.bbclass: fix external module building
2012-07-20 23:22 [PATCH V2 1/2] kernel.bbclass: fix external module building Khem Raj
2012-07-20 23:22 ` [PATCH V2 2/2] kernel bbclass: Recreate uImage only when KEEPUIMAGE != "yes" Khem Raj
2012-07-27 22:27 ` [PATCH V2 1/2] kernel.bbclass: fix external module building Darren Hart
@ 2012-07-27 23:23 ` Chris Larson
2 siblings, 0 replies; 6+ messages in thread
From: Chris Larson @ 2012-07-27 23:23 UTC (permalink / raw)
To: Patches and discussions about the oe-core layer; +Cc: Koen Kooi
On Fri, Jul 20, 2012 at 4:22 PM, Khem Raj <raj.khem@gmail.com> wrote:
> From: Denis Carikli <GNUtoo@no-log.org>
>
> Without that fix we have the following while compiling compat-wireless.
> include/linux/mmzone.h:18:30: fatal error: generated/bounds.h: No such file or directory
>
> Note that the compat-wireless recipe will be added in another commit.
>
> make -C $kerneldir _mrproper_scripts deleted this file along with
> other things so we resurrect it with this patch.
>
> Signed-off-by: Denis 'GNUtoo' Carikli <GNUtoo@no-log.org>
> Signed-off-by: Koen Kooi <koen@dominion.thruhere.net>
> ---
> meta/classes/kernel.bbclass | 3 +++
> 1 file changed, 3 insertions(+)
>
> diff --git a/meta/classes/kernel.bbclass b/meta/classes/kernel.bbclass
> index 08b5e61..ce4d7de 100644
> --- a/meta/classes/kernel.bbclass
> +++ b/meta/classes/kernel.bbclass
> @@ -187,6 +187,9 @@ kernel_do_install() {
> cp arch/powerpc/lib/crtsavres.o $kerneldir/arch/powerpc/lib/crtsavres.o
> fi
>
> + # Necessary for building modules like compat-wireless.
> + cp include/generated/bounds.h $kerneldir/include/generated/bounds.h
> +
> # Remove the following binaries which cause strip or arch QA errors
> # during do_package for cross-compiled platforms
> bin_files="arch/powerpc/boot/addnote arch/powerpc/boot/hack-coff \
> --
> 1.7.9.5
As an fyi, this seems to have broken compatibility with 2.6 kernel
recipes, as bounds.h doesn't live in generated/ there.
--
Christopher Larson
^ permalink raw reply [flat|nested] 6+ messages in thread
end of thread, other threads:[~2012-07-27 23:35 UTC | newest]
Thread overview: 6+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2012-07-20 23:22 [PATCH V2 1/2] kernel.bbclass: fix external module building Khem Raj
2012-07-20 23:22 ` [PATCH V2 2/2] kernel bbclass: Recreate uImage only when KEEPUIMAGE != "yes" Khem Raj
2012-07-23 19:18 ` Saul Wold
2012-07-23 20:41 ` Khem Raj
2012-07-27 22:27 ` [PATCH V2 1/2] kernel.bbclass: fix external module building Darren Hart
2012-07-27 23:23 ` Chris Larson
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.