* [PATCH] kernel-devsrc: Don't package kernel meta-data
@ 2016-07-26 16:56 Jacob Kroon
2016-08-03 9:33 ` Jacob Kroon
0 siblings, 1 reply; 5+ messages in thread
From: Jacob Kroon @ 2016-07-26 16:56 UTC (permalink / raw)
To: openembedded-core
* The kernel meta-data doesn't need to be distributed in the kernel source
package, so drop it
* Fix a typo
* Split long lines
Signed-off-by: Jacob Kroon <jacob.kroon@gmail.com>
---
meta/recipes-kernel/linux/kernel-devsrc.bb | 10 +++++++---
1 file changed, 7 insertions(+), 3 deletions(-)
diff --git a/meta/recipes-kernel/linux/kernel-devsrc.bb b/meta/recipes-kernel/linux/kernel-devsrc.bb
index 0fdd0ad..2dcf01e 100644
--- a/meta/recipes-kernel/linux/kernel-devsrc.bb
+++ b/meta/recipes-kernel/linux/kernel-devsrc.bb
@@ -41,13 +41,17 @@ do_install() {
#
# Copy the staging dir source (and module build support) into the devsrc structure.
- # We can keep this copy simple and take everything, since a we'll clean up any build
+ # We can keep this copy simple and take everything, since we'll clean up any build
# artifacts afterwards, and the extra i/o is not significant
#
cd ${B}
- find . -type d -name '.git*' -prune -o -path '.debug' -prune -o -type f -print0 | cpio --null -pdlu $kerneldir
+ find . -type d -name '.git*' -prune -o \
+ -path '.debug' -prune -o \
+ -type f -print0 | cpio --null -pdlu $kerneldir
cd ${S}
- find . -type d -name '.git*' -prune -o -type f -print0 | cpio --null -pdlu $kerneldir
+ find . -type d -name '.git*' -prune -o \
+ -type d -name '.kernel-meta' -prune -o \
+ -type f -print0 | cpio --null -pdlu $kerneldir
# Explicitly set KBUILD_OUTPUT to ensure that the image directory is cleaned and not
# The main build artifacts. We clean the directory to avoid QA errors on mismatched
--
2.7.4
^ permalink raw reply related [flat|nested] 5+ messages in thread
* Re: [PATCH] kernel-devsrc: Don't package kernel meta-data
2016-07-26 16:56 [PATCH] kernel-devsrc: Don't package kernel meta-data Jacob Kroon
@ 2016-08-03 9:33 ` Jacob Kroon
2016-08-04 1:41 ` Bruce Ashfield
0 siblings, 1 reply; 5+ messages in thread
From: Jacob Kroon @ 2016-08-03 9:33 UTC (permalink / raw)
To: openembedded-core
On 07/26/2016 06:56 PM, Jacob Kroon wrote:
> * The kernel meta-data doesn't need to be distributed in the kernel source
> package, so drop it
> * Fix a typo
> * Split long lines
>
> Signed-off-by: Jacob Kroon <jacob.kroon@gmail.com>
> ---
> meta/recipes-kernel/linux/kernel-devsrc.bb | 10 +++++++---
> 1 file changed, 7 insertions(+), 3 deletions(-)
>
> diff --git a/meta/recipes-kernel/linux/kernel-devsrc.bb b/meta/recipes-kernel/linux/kernel-devsrc.bb
> index 0fdd0ad..2dcf01e 100644
> --- a/meta/recipes-kernel/linux/kernel-devsrc.bb
> +++ b/meta/recipes-kernel/linux/kernel-devsrc.bb
> @@ -41,13 +41,17 @@ do_install() {
>
> #
> # Copy the staging dir source (and module build support) into the devsrc structure.
> - # We can keep this copy simple and take everything, since a we'll clean up any build
> + # We can keep this copy simple and take everything, since we'll clean up any build
> # artifacts afterwards, and the extra i/o is not significant
> #
> cd ${B}
> - find . -type d -name '.git*' -prune -o -path '.debug' -prune -o -type f -print0 | cpio --null -pdlu $kerneldir
> + find . -type d -name '.git*' -prune -o \
> + -path '.debug' -prune -o \
> + -type f -print0 | cpio --null -pdlu $kerneldir
> cd ${S}
> - find . -type d -name '.git*' -prune -o -type f -print0 | cpio --null -pdlu $kerneldir
> + find . -type d -name '.git*' -prune -o \
> + -type d -name '.kernel-meta' -prune -o \
> + -type f -print0 | cpio --null -pdlu $kerneldir
>
> # Explicitly set KBUILD_OUTPUT to ensure that the image directory is cleaned and not
> # The main build artifacts. We clean the directory to avoid QA errors on mismatched
>
Ignore this patch, I'm suspecting that .kernel-meta/ directory shouldn't
exist in ${STAGING_KERNEL_DIR} to begin with ?
/Jacob
^ permalink raw reply [flat|nested] 5+ messages in thread
* Re: [PATCH] kernel-devsrc: Don't package kernel meta-data
2016-08-03 9:33 ` Jacob Kroon
@ 2016-08-04 1:41 ` Bruce Ashfield
2016-08-04 7:48 ` Jacob Kroon
0 siblings, 1 reply; 5+ messages in thread
From: Bruce Ashfield @ 2016-08-04 1:41 UTC (permalink / raw)
To: Jacob Kroon; +Cc: Patches and discussions about the oe-core layer
[-- Attachment #1: Type: text/plain, Size: 2638 bytes --]
On Wed, Aug 3, 2016 at 5:33 AM, Jacob Kroon <jacob.kroon@gmail.com> wrote:
> On 07/26/2016 06:56 PM, Jacob Kroon wrote:
>
>> * The kernel meta-data doesn't need to be distributed in the kernel
>> source
>> package, so drop it
>> * Fix a typo
>> * Split long lines
>>
>> Signed-off-by: Jacob Kroon <jacob.kroon@gmail.com>
>> ---
>> meta/recipes-kernel/linux/kernel-devsrc.bb | 10 +++++++---
>> 1 file changed, 7 insertions(+), 3 deletions(-)
>>
>> diff --git a/meta/recipes-kernel/linux/kernel-devsrc.bb
>> b/meta/recipes-kernel/linux/kernel-devsrc.bb
>> index 0fdd0ad..2dcf01e 100644
>> --- a/meta/recipes-kernel/linux/kernel-devsrc.bb
>> +++ b/meta/recipes-kernel/linux/kernel-devsrc.bb
>> @@ -41,13 +41,17 @@ do_install() {
>>
>> #
>> # Copy the staging dir source (and module build support) into
>> the devsrc structure.
>> - # We can keep this copy simple and take everything, since a
>> we'll clean up any build
>> + # We can keep this copy simple and take everything, since we'll
>> clean up any build
>> # artifacts afterwards, and the extra i/o is not significant
>> #
>> cd ${B}
>> - find . -type d -name '.git*' -prune -o -path '.debug' -prune -o
>> -type f -print0 | cpio --null -pdlu $kerneldir
>> + find . -type d -name '.git*' -prune -o \
>> + -path '.debug' -prune -o \
>> + -type f -print0 | cpio --null -pdlu $kerneldir
>> cd ${S}
>> - find . -type d -name '.git*' -prune -o -type f -print0 | cpio
>> --null -pdlu $kerneldir
>> + find . -type d -name '.git*' -prune -o \
>> + -type d -name '.kernel-meta' -prune -o \
>> + -type f -print0 | cpio --null -pdlu $kerneldir
>>
>> # Explicitly set KBUILD_OUTPUT to ensure that the image
>> directory is cleaned and not
>> # The main build artifacts. We clean the directory to avoid QA
>> errors on mismatched
>>
>>
> Ignore this patch, I'm suspecting that .kernel-meta/ directory shouldn't
> exist in ${STAGING_KERNEL_DIR} to begin with ?
>
It doesn't hurt anything by being there, but you can either intercept it at
the
time we stage the common kernel parts, or when you package devsrc .. either
will work.
Bruce
> /Jacob
>
> --
> _______________________________________________
> Openembedded-core mailing list
> Openembedded-core@lists.openembedded.org
> http://lists.openembedded.org/mailman/listinfo/openembedded-core
>
--
"Thou shalt not follow the NULL pointer, for chaos and madness await thee
at its end"
[-- Attachment #2: Type: text/html, Size: 4353 bytes --]
^ permalink raw reply [flat|nested] 5+ messages in thread
* Re: [PATCH] kernel-devsrc: Don't package kernel meta-data
2016-08-04 1:41 ` Bruce Ashfield
@ 2016-08-04 7:48 ` Jacob Kroon
2016-08-05 1:19 ` Bruce Ashfield
0 siblings, 1 reply; 5+ messages in thread
From: Jacob Kroon @ 2016-08-04 7:48 UTC (permalink / raw)
To: Bruce Ashfield; +Cc: Patches and discussions about the oe-core layer
On 08/04/2016 03:41 AM, Bruce Ashfield wrote:
> On Wed, Aug 3, 2016 at 5:33 AM, Jacob Kroon <jacob.kroon@gmail.com
> <mailto:jacob.kroon@gmail.com>> wrote:
[...]
> Ignore this patch, I'm suspecting that .kernel-meta/ directory
> shouldn't exist in ${STAGING_KERNEL_DIR} to begin with ?
>
>
> It doesn't hurt anything by being there, but you can either intercept it
> at the
> time we stage the common kernel parts, or when you package devsrc .. either
> will work.
Since commit 3b49416fc7a7ee9bfe722f2e6089aa18df41dc58, linux-yocto.inc
does:
do_install_append(){
if [ -n "${KMETA}" ]; then
rm -rf ${STAGING_KERNEL_DIR}/${KMETA}
fi
}
But I think this accidentally got broken by a later commit
3b2b4eef0fd06099342fcc2dfa35ecf37840c090, which changed the directory
name by conditionally prepending a ".":
kmeta = d.getVar( "KMETA", True ) or "meta"
if not os.path.exists(kmeta):
kmeta = "." + kmeta
So it seems to me that the right thing to do here would be to fix and
move the do_install_append() to kernel-yocto.bbclass. Bruce, what do
you think ?
Regards Jacob
^ permalink raw reply [flat|nested] 5+ messages in thread
* Re: [PATCH] kernel-devsrc: Don't package kernel meta-data
2016-08-04 7:48 ` Jacob Kroon
@ 2016-08-05 1:19 ` Bruce Ashfield
0 siblings, 0 replies; 5+ messages in thread
From: Bruce Ashfield @ 2016-08-05 1:19 UTC (permalink / raw)
To: Jacob Kroon; +Cc: Patches and discussions about the oe-core layer
[-- Attachment #1: Type: text/plain, Size: 1630 bytes --]
On Thu, Aug 4, 2016 at 3:48 AM, Jacob Kroon <jacob.kroon@gmail.com> wrote:
> On 08/04/2016 03:41 AM, Bruce Ashfield wrote:
>
>> On Wed, Aug 3, 2016 at 5:33 AM, Jacob Kroon <jacob.kroon@gmail.com
>> <mailto:jacob.kroon@gmail.com>> wrote:
>>
> [...]
>
>> Ignore this patch, I'm suspecting that .kernel-meta/ directory
>> shouldn't exist in ${STAGING_KERNEL_DIR} to begin with ?
>>
>>
>> It doesn't hurt anything by being there, but you can either intercept it
>> at the
>> time we stage the common kernel parts, or when you package devsrc ..
>> either
>> will work.
>>
>
> Since commit 3b49416fc7a7ee9bfe722f2e6089aa18df41dc58, linux-yocto.inc
> does:
>
> do_install_append(){
> if [ -n "${KMETA}" ]; then
> rm -rf ${STAGING_KERNEL_DIR}/${KMETA}
> fi
> }
>
> But I think this accidentally got broken by a later commit
> 3b2b4eef0fd06099342fcc2dfa35ecf37840c090, which changed the directory
> name by conditionally prepending a ".":
>
> kmeta = d.getVar( "KMETA", True ) or "meta"
> if not os.path.exists(kmeta):
> kmeta = "." + kmeta
>
> So it seems to me that the right thing to do here would be to fix and
> move the do_install_append() to kernel-yocto.bbclass. Bruce, what do
> you think ?
>
Yep, that rm -rf could be both ${KMETA} and .${KMETA}. If either exist,
they should be removed. Whether it is in the .inc or the bbclass isn't
significant. I'd leave it where it is as smallest footprint action.
Bruce
>
> Regards Jacob
>
--
"Thou shalt not follow the NULL pointer, for chaos and madness await thee
at its end"
[-- Attachment #2: Type: text/html, Size: 2756 bytes --]
^ permalink raw reply [flat|nested] 5+ messages in thread
end of thread, other threads:[~2016-08-05 1:19 UTC | newest]
Thread overview: 5+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2016-07-26 16:56 [PATCH] kernel-devsrc: Don't package kernel meta-data Jacob Kroon
2016-08-03 9:33 ` Jacob Kroon
2016-08-04 1:41 ` Bruce Ashfield
2016-08-04 7:48 ` Jacob Kroon
2016-08-05 1:19 ` Bruce Ashfield
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox