* [PATCH 1/5] kernel.bbclass: handles symbolic KERNEL_OUTPUT in bundle_initramfs task
2014-03-28 9:43 [PATCH 0/5][Part IV] wr-misc patches Hongxu Jia
@ 2014-03-28 9:43 ` Hongxu Jia
2014-03-28 9:43 ` [PATCH 2/5] packagegroups: Remove toolchain *-symlinks packages Hongxu Jia
` (3 subsequent siblings)
4 siblings, 0 replies; 13+ messages in thread
From: Hongxu Jia @ 2014-03-28 9:43 UTC (permalink / raw)
To: openembedded-core; +Cc: saul.wold
From: Ming Liu <ming.liu@windriver.com>
In many cases, KERNEL_OUTPUT is a symbolic link to the real bootable image,
but in bundle_initramfs task, it's not considered so that the KERNEL_OUTPUT
is being renamed/restored as a regular file, this leads it finally point to
a incorrect target, or even worse, break the bundle_initramfs task for
KERNEL_OUTPUT is not going to be regenerated in case it is a symbolic link
to vmlinux.
Signed-off-by: Ming Liu <ming.liu@windriver.com>
Signed-off-by: Robert Yang <liezhi.yang@windriver.com>
Signed-off-by: Jeff Polk <jeff.polk@windriver.com>
Signed-off-by: Hongxu Jia <hongxu.jia@windriver.com>
---
meta/classes/kernel.bbclass | 21 ++++++++++++++++++---
1 file changed, 18 insertions(+), 3 deletions(-)
diff --git a/meta/classes/kernel.bbclass b/meta/classes/kernel.bbclass
index 19b159b..b5e5a85 100644
--- a/meta/classes/kernel.bbclass
+++ b/meta/classes/kernel.bbclass
@@ -128,13 +128,28 @@ do_bundle_initramfs () {
if [ ! -z "${INITRAMFS_IMAGE}" -a x"${INITRAMFS_IMAGE_BUNDLE}" = x1 ]; then
echo "Creating a kernel image with a bundled initramfs..."
copy_initramfs
- if [ -e ${KERNEL_OUTPUT} ] ; then
+ # Backuping kernel image relies on its type(regular file or symbolic link)
+ linkpath=""
+ realpath=""
+ if [ -h ${KERNEL_OUTPUT} ] ; then
+ linkpath=`readlink -n ${KERNEL_OUTPUT}`
+ realpath=`readlink -fn ${KERNEL_OUTPUT}`
+ mv -f $realpath $realpath.bak
+ elif [ -f ${KERNEL_OUTPUT} ]; then
mv -f ${KERNEL_OUTPUT} ${KERNEL_OUTPUT}.bak
fi
use_alternate_initrd=CONFIG_INITRAMFS_SOURCE=${B}/usr/${INITRAMFS_IMAGE}-${MACHINE}.cpio
kernel_do_compile
- mv -f ${KERNEL_OUTPUT} ${KERNEL_OUTPUT}.initramfs
- mv -f ${KERNEL_OUTPUT}.bak ${KERNEL_OUTPUT}
+ # Restoring kernel image
+ if [ -n "$realpath" ]; then
+ mv -f $realpath $realpath.initramfs
+ mv -f $realpath.bak $realpath
+ cd ${B}/$(dirname ${KERNEL_OUTPUT})
+ ln -sf $linkpath.initramfs
+ else
+ mv -f ${KERNEL_OUTPUT} ${KERNEL_OUTPUT}.initramfs
+ mv -f ${KERNEL_OUTPUT}.bak ${KERNEL_OUTPUT}
+ fi
# Update install area
echo "There is kernel image bundled with initramfs: ${B}/${KERNEL_OUTPUT}.initramfs"
install -m 0644 ${B}/${KERNEL_OUTPUT}.initramfs ${D}/boot/${KERNEL_IMAGETYPE}-initramfs-${MACHINE}.bin
--
1.8.1.2
^ permalink raw reply related [flat|nested] 13+ messages in thread* [PATCH 2/5] packagegroups: Remove toolchain *-symlinks packages
2014-03-28 9:43 [PATCH 0/5][Part IV] wr-misc patches Hongxu Jia
2014-03-28 9:43 ` [PATCH 1/5] kernel.bbclass: handles symbolic KERNEL_OUTPUT in bundle_initramfs task Hongxu Jia
@ 2014-03-28 9:43 ` Hongxu Jia
2014-03-28 17:31 ` Richard Purdie
2014-03-28 9:43 ` [PATCH 3/5] packagegroup-self-hosted: Use packagegroup-core-buildessential Hongxu Jia
` (2 subsequent siblings)
4 siblings, 1 reply; 13+ messages in thread
From: Hongxu Jia @ 2014-03-28 9:43 UTC (permalink / raw)
To: openembedded-core; +Cc: saul.wold
From: Mark Hatle <mark.hatle@windriver.com>
We are no longer producing the *-symlinks packages, so remove the dependencies
to those items.
Signed-off-by: Mark Hatle <mark.hatle@windriver.com>
Signed-off-by: Jeff Polk <jeff.polk@windriver.com>
Signed-off-by: Hongxu Jia <hongxu.jia@windriver.com>
---
meta/recipes-core/packagegroups/packagegroup-core-buildessential.bb | 4 ----
meta/recipes-core/packagegroups/packagegroup-self-hosted.bb | 4 ----
2 files changed, 8 deletions(-)
diff --git a/meta/recipes-core/packagegroups/packagegroup-core-buildessential.bb b/meta/recipes-core/packagegroups/packagegroup-core-buildessential.bb
index 74ed247..e21f8c1 100644
--- a/meta/recipes-core/packagegroups/packagegroup-core-buildessential.bb
+++ b/meta/recipes-core/packagegroups/packagegroup-core-buildessential.bb
@@ -12,13 +12,9 @@ RDEPENDS_packagegroup-core-buildessential = "\
autoconf \
automake \
binutils \
- binutils-symlinks \
cpp \
- cpp-symlinks \
gcc \
- gcc-symlinks \
g++ \
- g++-symlinks \
gettext \
make \
libstdc++ \
diff --git a/meta/recipes-core/packagegroups/packagegroup-self-hosted.bb b/meta/recipes-core/packagegroups/packagegroup-self-hosted.bb
index 8e3b917..5581d8e 100644
--- a/meta/recipes-core/packagegroups/packagegroup-self-hosted.bb
+++ b/meta/recipes-core/packagegroups/packagegroup-self-hosted.bb
@@ -69,20 +69,16 @@ RDEPENDS_packagegroup-self-hosted-sdk = "\
autoconf \
automake \
binutils \
- binutils-symlinks \
ccache \
coreutils \
cpp \
- cpp-symlinks \
distcc \
eglibc-utils \
eglibc-gconv-ibm850 \
file \
findutils \
g++ \
- g++-symlinks \
gcc \
- gcc-symlinks \
intltool \
ldd \
less \
--
1.8.1.2
^ permalink raw reply related [flat|nested] 13+ messages in thread* Re: [PATCH 2/5] packagegroups: Remove toolchain *-symlinks packages
2014-03-28 9:43 ` [PATCH 2/5] packagegroups: Remove toolchain *-symlinks packages Hongxu Jia
@ 2014-03-28 17:31 ` Richard Purdie
2014-03-29 6:58 ` Hongxu Jia
0 siblings, 1 reply; 13+ messages in thread
From: Richard Purdie @ 2014-03-28 17:31 UTC (permalink / raw)
To: Hongxu Jia; +Cc: saul.wold, openembedded-core
On Fri, 2014-03-28 at 17:43 +0800, Hongxu Jia wrote:
> From: Mark Hatle <mark.hatle@windriver.com>
>
> We are no longer producing the *-symlinks packages, so remove the dependencies
> to those items.
>
> Signed-off-by: Mark Hatle <mark.hatle@windriver.com>
> Signed-off-by: Jeff Polk <jeff.polk@windriver.com>
> Signed-off-by: Hongxu Jia <hongxu.jia@windriver.com>
> ---
> meta/recipes-core/packagegroups/packagegroup-core-buildessential.bb | 4 ----
> meta/recipes-core/packagegroups/packagegroup-self-hosted.bb | 4 ----
> 2 files changed, 8 deletions(-)
The binutils-symlinks package was removed however the gcc related ones
have not been. This patch is therefore not appropriate until that has
happened.
Cheers,
Richard
> diff --git a/meta/recipes-core/packagegroups/packagegroup-core-buildessential.bb b/meta/recipes-core/packagegroups/packagegroup-core-buildessential.bb
> index 74ed247..e21f8c1 100644
> --- a/meta/recipes-core/packagegroups/packagegroup-core-buildessential.bb
> +++ b/meta/recipes-core/packagegroups/packagegroup-core-buildessential.bb
> @@ -12,13 +12,9 @@ RDEPENDS_packagegroup-core-buildessential = "\
> autoconf \
> automake \
> binutils \
> - binutils-symlinks \
> cpp \
> - cpp-symlinks \
> gcc \
> - gcc-symlinks \
> g++ \
> - g++-symlinks \
> gettext \
> make \
> libstdc++ \
> diff --git a/meta/recipes-core/packagegroups/packagegroup-self-hosted.bb b/meta/recipes-core/packagegroups/packagegroup-self-hosted.bb
> index 8e3b917..5581d8e 100644
> --- a/meta/recipes-core/packagegroups/packagegroup-self-hosted.bb
> +++ b/meta/recipes-core/packagegroups/packagegroup-self-hosted.bb
> @@ -69,20 +69,16 @@ RDEPENDS_packagegroup-self-hosted-sdk = "\
> autoconf \
> automake \
> binutils \
> - binutils-symlinks \
> ccache \
> coreutils \
> cpp \
> - cpp-symlinks \
> distcc \
> eglibc-utils \
> eglibc-gconv-ibm850 \
> file \
> findutils \
> g++ \
> - g++-symlinks \
> gcc \
> - gcc-symlinks \
> intltool \
> ldd \
> less \
> --
> 1.8.1.2
>
^ permalink raw reply [flat|nested] 13+ messages in thread
* Re: [PATCH 2/5] packagegroups: Remove toolchain *-symlinks packages
2014-03-28 17:31 ` Richard Purdie
@ 2014-03-29 6:58 ` Hongxu Jia
0 siblings, 0 replies; 13+ messages in thread
From: Hongxu Jia @ 2014-03-29 6:58 UTC (permalink / raw)
To: Richard Purdie; +Cc: saul.wold, openembedded-core
On 03/29/2014 01:31 AM, Richard Purdie wrote:
> On Fri, 2014-03-28 at 17:43 +0800, Hongxu Jia wrote:
>> From: Mark Hatle <mark.hatle@windriver.com>
>>
>> We are no longer producing the *-symlinks packages, so remove the dependencies
>> to those items.
>>
>> Signed-off-by: Mark Hatle <mark.hatle@windriver.com>
>> Signed-off-by: Jeff Polk <jeff.polk@windriver.com>
>> Signed-off-by: Hongxu Jia <hongxu.jia@windriver.com>
>> ---
>> meta/recipes-core/packagegroups/packagegroup-core-buildessential.bb | 4 ----
>> meta/recipes-core/packagegroups/packagegroup-self-hosted.bb | 4 ----
>> 2 files changed, 8 deletions(-)
> The binutils-symlinks package was removed however the gcc related ones
> have not been. This patch is therefore not appropriate until that has
> happened.
Got it, I will drop this patch in V2.
//Hongxu
> Cheers,
>
> Richard
>
>> diff --git a/meta/recipes-core/packagegroups/packagegroup-core-buildessential.bb b/meta/recipes-core/packagegroups/packagegroup-core-buildessential.bb
>> index 74ed247..e21f8c1 100644
>> --- a/meta/recipes-core/packagegroups/packagegroup-core-buildessential.bb
>> +++ b/meta/recipes-core/packagegroups/packagegroup-core-buildessential.bb
>> @@ -12,13 +12,9 @@ RDEPENDS_packagegroup-core-buildessential = "\
>> autoconf \
>> automake \
>> binutils \
>> - binutils-symlinks \
>> cpp \
>> - cpp-symlinks \
>> gcc \
>> - gcc-symlinks \
>> g++ \
>> - g++-symlinks \
>> gettext \
>> make \
>> libstdc++ \
>> diff --git a/meta/recipes-core/packagegroups/packagegroup-self-hosted.bb b/meta/recipes-core/packagegroups/packagegroup-self-hosted.bb
>> index 8e3b917..5581d8e 100644
>> --- a/meta/recipes-core/packagegroups/packagegroup-self-hosted.bb
>> +++ b/meta/recipes-core/packagegroups/packagegroup-self-hosted.bb
>> @@ -69,20 +69,16 @@ RDEPENDS_packagegroup-self-hosted-sdk = "\
>> autoconf \
>> automake \
>> binutils \
>> - binutils-symlinks \
>> ccache \
>> coreutils \
>> cpp \
>> - cpp-symlinks \
>> distcc \
>> eglibc-utils \
>> eglibc-gconv-ibm850 \
>> file \
>> findutils \
>> g++ \
>> - g++-symlinks \
>> gcc \
>> - gcc-symlinks \
>> intltool \
>> ldd \
>> less \
>> --
>> 1.8.1.2
>>
>
^ permalink raw reply [flat|nested] 13+ messages in thread
* [PATCH 3/5] packagegroup-self-hosted: Use packagegroup-core-buildessential
2014-03-28 9:43 [PATCH 0/5][Part IV] wr-misc patches Hongxu Jia
2014-03-28 9:43 ` [PATCH 1/5] kernel.bbclass: handles symbolic KERNEL_OUTPUT in bundle_initramfs task Hongxu Jia
2014-03-28 9:43 ` [PATCH 2/5] packagegroups: Remove toolchain *-symlinks packages Hongxu Jia
@ 2014-03-28 9:43 ` Hongxu Jia
2014-03-28 16:48 ` Iorga, Cristian
2014-03-28 9:43 ` [PATCH 4/5] syslinux.bbclass: Enable additional kernel parameters for syslinux Hongxu Jia
2014-03-28 9:43 ` [PATCH 5/5] libc-common.bbclass: rename ALL the packages Hongxu Jia
4 siblings, 1 reply; 13+ messages in thread
From: Hongxu Jia @ 2014-03-28 9:43 UTC (permalink / raw)
To: openembedded-core; +Cc: saul.wold
From: Mark Hatle <mark.hatle@windriver.com>
Instead of manually specifying build dependencies, use the
packagegroup-core-buildessential. This ensures there is only one place
that needs to be modified when toolchain items and dependencies change.
Signed-off-by: Mark Hatle <mark.hatle@windriver.com>
Signed-off-by: Jeff Polk <jeff.polk@windriver.com>
Signed-off-by: Hongxu Jia <hongxu.jia@windriver.com>
---
meta/recipes-core/packagegroups/packagegroup-self-hosted.bb | 12 +-----------
1 file changed, 1 insertion(+), 11 deletions(-)
diff --git a/meta/recipes-core/packagegroups/packagegroup-self-hosted.bb b/meta/recipes-core/packagegroups/packagegroup-self-hosted.bb
index 5581d8e..fe49fb4 100644
--- a/meta/recipes-core/packagegroups/packagegroup-self-hosted.bb
+++ b/meta/recipes-core/packagegroups/packagegroup-self-hosted.bb
@@ -66,33 +66,23 @@ RRECOMMENDS_packagegroup-self-hosted-host-tools = "\
# eglibc-utils: for rpcgen
RDEPENDS_packagegroup-self-hosted-sdk = "\
- autoconf \
- automake \
- binutils \
ccache \
coreutils \
- cpp \
distcc \
eglibc-utils \
eglibc-gconv-ibm850 \
file \
findutils \
- g++ \
- gcc \
intltool \
ldd \
less \
libssp \
libssp-dev \
libssp-staticdev \
- libstdc++ \
- libstdc++-dev \
- libtool \
- make \
mktemp \
+ packagegroup-core-buildessential \
perl-module-re \
perl-module-text-wrap \
- pkgconfig \
quilt \
sed \
"
--
1.8.1.2
^ permalink raw reply related [flat|nested] 13+ messages in thread* Re: [PATCH 3/5] packagegroup-self-hosted: Use packagegroup-core-buildessential
2014-03-28 9:43 ` [PATCH 3/5] packagegroup-self-hosted: Use packagegroup-core-buildessential Hongxu Jia
@ 2014-03-28 16:48 ` Iorga, Cristian
2014-03-31 8:31 ` Hongxu Jia
0 siblings, 1 reply; 13+ messages in thread
From: Iorga, Cristian @ 2014-03-28 16:48 UTC (permalink / raw)
To: Jia, Hongxu (Wind River),
openembedded-core@lists.openembedded.org
Cc: Wold, Saul
Hello all,
This is an important patch, please make sure that BA still works correctly after this one gets merged (including properly building an image in BA).
Thanks,
Cristian Iorga
YP
Intel Corporation
-----Original Message-----
From: openembedded-core-bounces@lists.openembedded.org [mailto:openembedded-core-bounces@lists.openembedded.org] On Behalf Of Hongxu Jia
Sent: Friday, March 28, 2014 11:44 AM
To: openembedded-core@lists.openembedded.org
Cc: Wold, Saul
Subject: [OE-core] [PATCH 3/5] packagegroup-self-hosted: Use packagegroup-core-buildessential
From: Mark Hatle <mark.hatle@windriver.com>
Instead of manually specifying build dependencies, use the packagegroup-core-buildessential. This ensures there is only one place that needs to be modified when toolchain items and dependencies change.
Signed-off-by: Mark Hatle <mark.hatle@windriver.com>
Signed-off-by: Jeff Polk <jeff.polk@windriver.com>
Signed-off-by: Hongxu Jia <hongxu.jia@windriver.com>
---
meta/recipes-core/packagegroups/packagegroup-self-hosted.bb | 12 +-----------
1 file changed, 1 insertion(+), 11 deletions(-)
diff --git a/meta/recipes-core/packagegroups/packagegroup-self-hosted.bb b/meta/recipes-core/packagegroups/packagegroup-self-hosted.bb
index 5581d8e..fe49fb4 100644
--- a/meta/recipes-core/packagegroups/packagegroup-self-hosted.bb
+++ b/meta/recipes-core/packagegroups/packagegroup-self-hosted.bb
@@ -66,33 +66,23 @@ RRECOMMENDS_packagegroup-self-hosted-host-tools = "\
# eglibc-utils: for rpcgen
RDEPENDS_packagegroup-self-hosted-sdk = "\
- autoconf \
- automake \
- binutils \
ccache \
coreutils \
- cpp \
distcc \
eglibc-utils \
eglibc-gconv-ibm850 \
file \
findutils \
- g++ \
- gcc \
intltool \
ldd \
less \
libssp \
libssp-dev \
libssp-staticdev \
- libstdc++ \
- libstdc++-dev \
- libtool \
- make \
mktemp \
+ packagegroup-core-buildessential \
perl-module-re \
perl-module-text-wrap \
- pkgconfig \
quilt \
sed \
"
--
1.8.1.2
--
_______________________________________________
Openembedded-core mailing list
Openembedded-core@lists.openembedded.org
http://lists.openembedded.org/mailman/listinfo/openembedded-core
^ permalink raw reply related [flat|nested] 13+ messages in thread* Re: [PATCH 3/5] packagegroup-self-hosted: Use packagegroup-core-buildessential
2014-03-28 16:48 ` Iorga, Cristian
@ 2014-03-31 8:31 ` Hongxu Jia
2014-03-31 8:52 ` Iorga, Cristian
0 siblings, 1 reply; 13+ messages in thread
From: Hongxu Jia @ 2014-03-31 8:31 UTC (permalink / raw)
To: Iorga, Cristian; +Cc: openembedded-core@lists.openembedded.org
On 03/29/2014 12:48 AM, Iorga, Cristian wrote:
> Hello all,
>
> This is an important patch, please make sure that BA still works correctly after this one gets merged (including properly building an image in BA).
Hi Cristian,
I have built the build-appliance-image with this one merged,
and everything is ok, but I could not understand what the 'BA'
means, would you please explain that?
Thanks,
//Hongxu
> Thanks,
> Cristian Iorga
> YP
> Intel Corporation
>
> -----Original Message-----
> From: openembedded-core-bounces@lists.openembedded.org [mailto:openembedded-core-bounces@lists.openembedded.org] On Behalf Of Hongxu Jia
> Sent: Friday, March 28, 2014 11:44 AM
> To: openembedded-core@lists.openembedded.org
> Cc: Wold, Saul
> Subject: [OE-core] [PATCH 3/5] packagegroup-self-hosted: Use packagegroup-core-buildessential
>
> From: Mark Hatle <mark.hatle@windriver.com>
>
> Instead of manually specifying build dependencies, use the packagegroup-core-buildessential. This ensures there is only one place that needs to be modified when toolchain items and dependencies change.
>
> Signed-off-by: Mark Hatle <mark.hatle@windriver.com>
> Signed-off-by: Jeff Polk <jeff.polk@windriver.com>
> Signed-off-by: Hongxu Jia <hongxu.jia@windriver.com>
> ---
> meta/recipes-core/packagegroups/packagegroup-self-hosted.bb | 12 +-----------
> 1 file changed, 1 insertion(+), 11 deletions(-)
>
> diff --git a/meta/recipes-core/packagegroups/packagegroup-self-hosted.bb b/meta/recipes-core/packagegroups/packagegroup-self-hosted.bb
> index 5581d8e..fe49fb4 100644
> --- a/meta/recipes-core/packagegroups/packagegroup-self-hosted.bb
> +++ b/meta/recipes-core/packagegroups/packagegroup-self-hosted.bb
> @@ -66,33 +66,23 @@ RRECOMMENDS_packagegroup-self-hosted-host-tools = "\
>
> # eglibc-utils: for rpcgen
> RDEPENDS_packagegroup-self-hosted-sdk = "\
> - autoconf \
> - automake \
> - binutils \
> ccache \
> coreutils \
> - cpp \
> distcc \
> eglibc-utils \
> eglibc-gconv-ibm850 \
> file \
> findutils \
> - g++ \
> - gcc \
> intltool \
> ldd \
> less \
> libssp \
> libssp-dev \
> libssp-staticdev \
> - libstdc++ \
> - libstdc++-dev \
> - libtool \
> - make \
> mktemp \
> + packagegroup-core-buildessential \
> perl-module-re \
> perl-module-text-wrap \
> - pkgconfig \
> quilt \
> sed \
> "
> --
> 1.8.1.2
>
> --
> _______________________________________________
> Openembedded-core mailing list
> Openembedded-core@lists.openembedded.org
> http://lists.openembedded.org/mailman/listinfo/openembedded-core
^ permalink raw reply [flat|nested] 13+ messages in thread
* Re: [PATCH 3/5] packagegroup-self-hosted: Use packagegroup-core-buildessential
2014-03-31 8:31 ` Hongxu Jia
@ 2014-03-31 8:52 ` Iorga, Cristian
0 siblings, 0 replies; 13+ messages in thread
From: Iorga, Cristian @ 2014-03-31 8:52 UTC (permalink / raw)
To: Jia, Hongxu (Wind River); +Cc: openembedded-core@lists.openembedded.org
Hello,
BA is short for Build Appliance, and corresponds to build-appliance-image target.
Like I previously said, only building BA is not a proper test.
After the change that you proposed (a fine change, I might say), building images in BA is another test that needs to be performed in order to validate your change.
See details here: https://www.yoctoproject.org/documentation/build-appliance-manual
Regards,
Cristian Iorga
YP
Intel Corporation
-----Original Message-----
From: Hongxu Jia [mailto:hongxu.jia@windriver.com]
Sent: Monday, March 31, 2014 11:32 AM
To: Iorga, Cristian
Cc: openembedded-core@lists.openembedded.org; Georgescu, Alexandru C
Subject: Re: [OE-core] [PATCH 3/5] packagegroup-self-hosted: Use packagegroup-core-buildessential
On 03/29/2014 12:48 AM, Iorga, Cristian wrote:
> Hello all,
>
> This is an important patch, please make sure that BA still works correctly after this one gets merged (including properly building an image in BA).
Hi Cristian,
I have built the build-appliance-image with this one merged, and everything is ok, but I could not understand what the 'BA'
means, would you please explain that?
Thanks,
//Hongxu
> Thanks,
> Cristian Iorga
> YP
> Intel Corporation
>
> -----Original Message-----
> From: openembedded-core-bounces@lists.openembedded.org
> [mailto:openembedded-core-bounces@lists.openembedded.org] On Behalf Of
> Hongxu Jia
> Sent: Friday, March 28, 2014 11:44 AM
> To: openembedded-core@lists.openembedded.org
> Cc: Wold, Saul
> Subject: [OE-core] [PATCH 3/5] packagegroup-self-hosted: Use
> packagegroup-core-buildessential
>
> From: Mark Hatle <mark.hatle@windriver.com>
>
> Instead of manually specifying build dependencies, use the packagegroup-core-buildessential. This ensures there is only one place that needs to be modified when toolchain items and dependencies change.
>
> Signed-off-by: Mark Hatle <mark.hatle@windriver.com>
> Signed-off-by: Jeff Polk <jeff.polk@windriver.com>
> Signed-off-by: Hongxu Jia <hongxu.jia@windriver.com>
> ---
> meta/recipes-core/packagegroups/packagegroup-self-hosted.bb | 12 +-----------
> 1 file changed, 1 insertion(+), 11 deletions(-)
>
> diff --git
> a/meta/recipes-core/packagegroups/packagegroup-self-hosted.bb
> b/meta/recipes-core/packagegroups/packagegroup-self-hosted.bb
> index 5581d8e..fe49fb4 100644
> --- a/meta/recipes-core/packagegroups/packagegroup-self-hosted.bb
> +++ b/meta/recipes-core/packagegroups/packagegroup-self-hosted.bb
> @@ -66,33 +66,23 @@ RRECOMMENDS_packagegroup-self-hosted-host-tools =
> "\
>
> # eglibc-utils: for rpcgen
> RDEPENDS_packagegroup-self-hosted-sdk = "\
> - autoconf \
> - automake \
> - binutils \
> ccache \
> coreutils \
> - cpp \
> distcc \
> eglibc-utils \
> eglibc-gconv-ibm850 \
> file \
> findutils \
> - g++ \
> - gcc \
> intltool \
> ldd \
> less \
> libssp \
> libssp-dev \
> libssp-staticdev \
> - libstdc++ \
> - libstdc++-dev \
> - libtool \
> - make \
> mktemp \
> + packagegroup-core-buildessential \
> perl-module-re \
> perl-module-text-wrap \
> - pkgconfig \
> quilt \
> sed \
> "
> --
> 1.8.1.2
>
> --
> _______________________________________________
> Openembedded-core mailing list
> Openembedded-core@lists.openembedded.org
> http://lists.openembedded.org/mailman/listinfo/openembedded-core
^ permalink raw reply [flat|nested] 13+ messages in thread
* [PATCH 4/5] syslinux.bbclass: Enable additional kernel parameters for syslinux
2014-03-28 9:43 [PATCH 0/5][Part IV] wr-misc patches Hongxu Jia
` (2 preceding siblings ...)
2014-03-28 9:43 ` [PATCH 3/5] packagegroup-self-hosted: Use packagegroup-core-buildessential Hongxu Jia
@ 2014-03-28 9:43 ` Hongxu Jia
2014-03-28 9:43 ` [PATCH 5/5] libc-common.bbclass: rename ALL the packages Hongxu Jia
4 siblings, 0 replies; 13+ messages in thread
From: Hongxu Jia @ 2014-03-28 9:43 UTC (permalink / raw)
To: openembedded-core; +Cc: saul.wold
From: Konrad Scherer <Konrad.Scherer@windriver.com>
Add additional parameter 'SYSLINUX_KERNEL_ARGS' in order to allow
for specific kernel parameters to be set when using syslinux.
The extra kernel parameters are added to btype[1] and then written out
as part of the APPEND field.
Signed-off-by: Konrad Scherer <Konrad.Scherer@windriver.com>
Signed-off-by: Mark Hatle <mark.hatle@windriver.com>
Signed-off-by: Hongxu Jia <hongxu.jia@windriver.com>
---
meta/classes/syslinux.bbclass | 5 +++++
1 file changed, 5 insertions(+)
diff --git a/meta/classes/syslinux.bbclass b/meta/classes/syslinux.bbclass
index 62d4b7a..8964d3f 100644
--- a/meta/classes/syslinux.bbclass
+++ b/meta/classes/syslinux.bbclass
@@ -15,6 +15,7 @@
# ${SYSLINUX_DEFAULT_CONSOLE} - set to "console=ttyX" to change kernel boot default console
# ${SYSLINUX_SERIAL} - Set an alternate serial port or turn off serial with empty string
# ${SYSLINUX_SERIAL_TTY} - Set alternate console=tty... kernel boot argument
+# ${SYSLINUX_KERNEL_ARGS} - Add additional kernel arguments
do_bootimg[depends] += "syslinux:do_populate_sysroot \
syslinux-native:do_populate_sysroot"
@@ -162,6 +163,10 @@ python build_syslinux_cfg () {
for btype in btypes:
cfgfile.write('LABEL %s%s\nKERNEL /vmlinuz\n' % (btype[0], label))
+ exargs = d.getVar('SYSLINUX_KERNEL_ARGS', True)
+ if exargs:
+ btype[1] += " " + exargs
+
append = localdata.getVar('APPEND', True)
initrd = localdata.getVar('INITRD', True)
--
1.8.1.2
^ permalink raw reply related [flat|nested] 13+ messages in thread* [PATCH 5/5] libc-common.bbclass: rename ALL the packages
2014-03-28 9:43 [PATCH 0/5][Part IV] wr-misc patches Hongxu Jia
` (3 preceding siblings ...)
2014-03-28 9:43 ` [PATCH 4/5] syslinux.bbclass: Enable additional kernel parameters for syslinux Hongxu Jia
@ 2014-03-28 9:43 ` Hongxu Jia
2014-03-28 10:17 ` Martin Jansa
4 siblings, 1 reply; 13+ messages in thread
From: Hongxu Jia @ 2014-03-28 9:43 UTC (permalink / raw)
To: openembedded-core; +Cc: saul.wold
From: Peter Seebach <peter.seebach@windriver.com>
The DEBIAN_NAMES feature renames some of the libc packages to
"libc6*" names --but only some. A previous patch added the -dbg
package. However, this doesn't cover other packages (such as
the -doc package), and it didn't take multilibs into account.
Signed-off-by: Peter Seebach <peter.seebach@windriver.com>
Signed-off-by: Jeff Polk <jeff.polk@windriver.com>
Signed-off-by: Mark Hatle <mark.hatle@windriver.com>
Signed-off-by: Hongxu Jia <hongxu.jia@windriver.com>
---
meta/classes/libc-common.bbclass | 19 +++++++++++++------
1 file changed, 13 insertions(+), 6 deletions(-)
diff --git a/meta/classes/libc-common.bbclass b/meta/classes/libc-common.bbclass
index daf499d..53bf467 100644
--- a/meta/classes/libc-common.bbclass
+++ b/meta/classes/libc-common.bbclass
@@ -25,12 +25,19 @@ def get_libc_fpu_setting(bb, d):
python populate_packages_prepend () {
if d.getVar('DEBIAN_NAMES', True):
+ pkgs = d.getVar('PACKAGES', True).split()
bpn = d.getVar('BPN', True)
- d.setVar('PKG_'+bpn, 'libc6')
- d.setVar('PKG_'+bpn+'-dev', 'libc6-dev')
- d.setVar('PKG_'+bpn+'-dbg', 'libc6-dbg')
+ prefix = d.getVar('MLPREFIX', True) or ""
+ # Set the base package...
+ d.setVar('PKG_' + prefix + bpn, prefix + 'libc6')
+ initial = prefix + bpn + '-'
+ for p in pkgs:
+ # And all the subpackages.
+ if p.startswith(initial):
+ renamed = p.replace(bpn, 'libc6', 1)
+ d.setVar('PKG_' + p, renamed)
# For backward compatibility with old -dbg package
- d.appendVar('RPROVIDES_' + bpn + '-dbg', ' libc-dbg')
- d.appendVar('RCONFLICTS_' + bpn + '-dbg', ' libc-dbg')
- d.appendVar('RREPLACES_' + bpn + '-dbg', ' libc-dbg')
+ d.appendVar('RPROVIDES_' + initial + 'dbg', ' ' + prefix + 'libc-dbg')
+ d.appendVar('RCONFLICTS_' + initial + 'dbg', ' ' + prefix + 'libc-dbg')
+ d.appendVar('RREPLACES_' + initial + 'dbg', ' ' + prefix + 'libc-dbg')
}
--
1.8.1.2
^ permalink raw reply related [flat|nested] 13+ messages in thread* Re: [PATCH 5/5] libc-common.bbclass: rename ALL the packages
2014-03-28 9:43 ` [PATCH 5/5] libc-common.bbclass: rename ALL the packages Hongxu Jia
@ 2014-03-28 10:17 ` Martin Jansa
2014-03-28 10:28 ` Hongxu Jia
0 siblings, 1 reply; 13+ messages in thread
From: Martin Jansa @ 2014-03-28 10:17 UTC (permalink / raw)
To: Hongxu Jia; +Cc: saul.wold, openembedded-core
[-- Attachment #1: Type: text/plain, Size: 2727 bytes --]
On Fri, Mar 28, 2014 at 05:43:54PM +0800, Hongxu Jia wrote:
> From: Peter Seebach <peter.seebach@windriver.com>
>
> The DEBIAN_NAMES feature renames some of the libc packages to
> "libc6*" names --but only some. A previous patch added the -dbg
> package. However, this doesn't cover other packages (such as
> the -doc package), and it didn't take multilibs into account.
>
> Signed-off-by: Peter Seebach <peter.seebach@windriver.com>
> Signed-off-by: Jeff Polk <jeff.polk@windriver.com>
> Signed-off-by: Mark Hatle <mark.hatle@windriver.com>
> Signed-off-by: Hongxu Jia <hongxu.jia@windriver.com>
> ---
> meta/classes/libc-common.bbclass | 19 +++++++++++++------
> 1 file changed, 13 insertions(+), 6 deletions(-)
>
> diff --git a/meta/classes/libc-common.bbclass b/meta/classes/libc-common.bbclass
> index daf499d..53bf467 100644
> --- a/meta/classes/libc-common.bbclass
> +++ b/meta/classes/libc-common.bbclass
> @@ -25,12 +25,19 @@ def get_libc_fpu_setting(bb, d):
>
> python populate_packages_prepend () {
> if d.getVar('DEBIAN_NAMES', True):
> + pkgs = d.getVar('PACKAGES', True).split()
> bpn = d.getVar('BPN', True)
> - d.setVar('PKG_'+bpn, 'libc6')
> - d.setVar('PKG_'+bpn+'-dev', 'libc6-dev')
> - d.setVar('PKG_'+bpn+'-dbg', 'libc6-dbg')
> + prefix = d.getVar('MLPREFIX', True) or ""
> + # Set the base package...
> + d.setVar('PKG_' + prefix + bpn, prefix + 'libc6')
> + initial = prefix + bpn + '-'
I would prefer better variable name here, first thing on my mind when
I've seen it was eglibc-initial and I was wondering why should all libc
packages be renamed like that.
> + for p in pkgs:
> + # And all the subpackages.
> + if p.startswith(initial):
> + renamed = p.replace(bpn, 'libc6', 1)
> + d.setVar('PKG_' + p, renamed)
> # For backward compatibility with old -dbg package
> - d.appendVar('RPROVIDES_' + bpn + '-dbg', ' libc-dbg')
> - d.appendVar('RCONFLICTS_' + bpn + '-dbg', ' libc-dbg')
> - d.appendVar('RREPLACES_' + bpn + '-dbg', ' libc-dbg')
> + d.appendVar('RPROVIDES_' + initial + 'dbg', ' ' + prefix + 'libc-dbg')
> + d.appendVar('RCONFLICTS_' + initial + 'dbg', ' ' + prefix + 'libc-dbg')
> + d.appendVar('RREPLACES_' + initial + 'dbg', ' ' + prefix + 'libc-dbg')
> }
> --
> 1.8.1.2
>
> --
> _______________________________________________
> Openembedded-core mailing list
> Openembedded-core@lists.openembedded.org
> http://lists.openembedded.org/mailman/listinfo/openembedded-core
--
Martin 'JaMa' Jansa jabber: Martin.Jansa@gmail.com
[-- Attachment #2: Digital signature --]
[-- Type: application/pgp-signature, Size: 205 bytes --]
^ permalink raw reply [flat|nested] 13+ messages in thread* Re: [PATCH 5/5] libc-common.bbclass: rename ALL the packages
2014-03-28 10:17 ` Martin Jansa
@ 2014-03-28 10:28 ` Hongxu Jia
0 siblings, 0 replies; 13+ messages in thread
From: Hongxu Jia @ 2014-03-28 10:28 UTC (permalink / raw)
To: Martin Jansa; +Cc: saul.wold, openembedded-core
On 03/28/2014 06:17 PM, Martin Jansa wrote:
> On Fri, Mar 28, 2014 at 05:43:54PM +0800, Hongxu Jia wrote:
>> From: Peter Seebach <peter.seebach@windriver.com>
>>
>> The DEBIAN_NAMES feature renames some of the libc packages to
>> "libc6*" names --but only some. A previous patch added the -dbg
>> package. However, this doesn't cover other packages (such as
>> the -doc package), and it didn't take multilibs into account.
>>
>> Signed-off-by: Peter Seebach <peter.seebach@windriver.com>
>> Signed-off-by: Jeff Polk <jeff.polk@windriver.com>
>> Signed-off-by: Mark Hatle <mark.hatle@windriver.com>
>> Signed-off-by: Hongxu Jia <hongxu.jia@windriver.com>
>> ---
>> meta/classes/libc-common.bbclass | 19 +++++++++++++------
>> 1 file changed, 13 insertions(+), 6 deletions(-)
>>
>> diff --git a/meta/classes/libc-common.bbclass b/meta/classes/libc-common.bbclass
>> index daf499d..53bf467 100644
>> --- a/meta/classes/libc-common.bbclass
>> +++ b/meta/classes/libc-common.bbclass
>> @@ -25,12 +25,19 @@ def get_libc_fpu_setting(bb, d):
>>
>> python populate_packages_prepend () {
>> if d.getVar('DEBIAN_NAMES', True):
>> + pkgs = d.getVar('PACKAGES', True).split()
>> bpn = d.getVar('BPN', True)
>> - d.setVar('PKG_'+bpn, 'libc6')
>> - d.setVar('PKG_'+bpn+'-dev', 'libc6-dev')
>> - d.setVar('PKG_'+bpn+'-dbg', 'libc6-dbg')
>> + prefix = d.getVar('MLPREFIX', True) or ""
>> + # Set the base package...
>> + d.setVar('PKG_' + prefix + bpn, prefix + 'libc6')
>> + initial = prefix + bpn + '-'
> I would prefer better variable name here, first thing on my mind when
> I've seen it was eglibc-initial and I was wondering why should all libc
> packages be renamed like that.
Yep, how about 'libcprefix' instead,
s/initial/libcprefix/
//Hongxu
>> + for p in pkgs:
>> + # And all the subpackages.
>> + if p.startswith(initial):
>> + renamed = p.replace(bpn, 'libc6', 1)
>> + d.setVar('PKG_' + p, renamed)
>> # For backward compatibility with old -dbg package
>> - d.appendVar('RPROVIDES_' + bpn + '-dbg', ' libc-dbg')
>> - d.appendVar('RCONFLICTS_' + bpn + '-dbg', ' libc-dbg')
>> - d.appendVar('RREPLACES_' + bpn + '-dbg', ' libc-dbg')
>> + d.appendVar('RPROVIDES_' + initial + 'dbg', ' ' + prefix + 'libc-dbg')
>> + d.appendVar('RCONFLICTS_' + initial + 'dbg', ' ' + prefix + 'libc-dbg')
>> + d.appendVar('RREPLACES_' + initial + 'dbg', ' ' + prefix + 'libc-dbg')
>> }
>> --
>> 1.8.1.2
>>
>> --
>> _______________________________________________
>> Openembedded-core mailing list
>> Openembedded-core@lists.openembedded.org
>> http://lists.openembedded.org/mailman/listinfo/openembedded-core
^ permalink raw reply [flat|nested] 13+ messages in thread