2018-03-21 05:16:44

by Jan Kiszka

[permalink] [raw]
Subject: [PATCH] builddeb: Fix header package regarding dtc source links

Since d5d332d3f7e8, a couple of links in scripts/dtc/include-prefixes
are additionally required in order to build device trees with the header
package.

Signed-off-by: Jan Kiszka <[email protected]>
---
scripts/package/builddeb | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/scripts/package/builddeb b/scripts/package/builddeb
index b4f0f2b3f8d2..13fabb1f81db 100755
--- a/scripts/package/builddeb
+++ b/scripts/package/builddeb
@@ -313,7 +313,7 @@ fi

# Build kernel header package
(cd $srctree; find . -name Makefile\* -o -name Kconfig\* -o -name \*.pl) > "$objtree/debian/hdrsrcfiles"
-(cd $srctree; find arch/*/include include scripts -type f) >> "$objtree/debian/hdrsrcfiles"
+(cd $srctree; find arch/*/include include scripts -type f -o -type l) >> "$objtree/debian/hdrsrcfiles"
(cd $srctree; find arch/$SRCARCH -name module.lds -o -name Kbuild.platforms -o -name Platform) >> "$objtree/debian/hdrsrcfiles"
(cd $srctree; find $(find arch/$SRCARCH -name include -o -name scripts -type d) -type f) >> "$objtree/debian/hdrsrcfiles"
if grep -q '^CONFIG_STACK_VALIDATION=y' $KCONFIG_CONFIG ; then
--
2.13.6


2018-03-22 07:46:39

by Riku Voipio

[permalink] [raw]
Subject: Re: [PATCH] builddeb: Fix header package regarding dtc source links

On 21 March 2018 at 07:15, Jan Kiszka <[email protected]> wrote:
> Since d5d332d3f7e8, a couple of links in scripts/dtc/include-prefixes
> are additionally required in order to build device trees with the header
> package.

A bit odd usecase IMHO, but:

Reviewed-by: Riku Voipio <[email protected]>

> Signed-off-by: Jan Kiszka <[email protected]>
> ---
> scripts/package/builddeb | 2 +-
> 1 file changed, 1 insertion(+), 1 deletion(-)
>
> diff --git a/scripts/package/builddeb b/scripts/package/builddeb
> index b4f0f2b3f8d2..13fabb1f81db 100755
> --- a/scripts/package/builddeb
> +++ b/scripts/package/builddeb
> @@ -313,7 +313,7 @@ fi
>
> # Build kernel header package
> (cd $srctree; find . -name Makefile\* -o -name Kconfig\* -o -name \*.pl) > "$objtree/debian/hdrsrcfiles"
> -(cd $srctree; find arch/*/include include scripts -type f) >> "$objtree/debian/hdrsrcfiles"
> +(cd $srctree; find arch/*/include include scripts -type f -o -type l) >> "$objtree/debian/hdrsrcfiles"
> (cd $srctree; find arch/$SRCARCH -name module.lds -o -name Kbuild.platforms -o -name Platform) >> "$objtree/debian/hdrsrcfiles"
> (cd $srctree; find $(find arch/$SRCARCH -name include -o -name scripts -type d) -type f) >> "$objtree/debian/hdrsrcfiles"
> if grep -q '^CONFIG_STACK_VALIDATION=y' $KCONFIG_CONFIG ; then
> --
> 2.13.6
> --
> To unsubscribe from this list: send the line "unsubscribe linux-kbuild" in
> the body of a message to [email protected]
> More majordomo info at http://vger.kernel.org/majordomo-info.html

2018-03-22 07:50:29

by Jan Kiszka

[permalink] [raw]
Subject: Re: [PATCH] builddeb: Fix header package regarding dtc source links

On 2018-03-22 15:45, Riku Voipio wrote:
> On 21 March 2018 at 07:15, Jan Kiszka <[email protected]> wrote:
>> Since d5d332d3f7e8, a couple of links in scripts/dtc/include-prefixes
>> are additionally required in order to build device trees with the header
>> package.
>
> A bit odd usecase IMHO, but:

The use case is not completely odd (I hope): Jailhouse hypervisor. We
build it as out-of-tree module so far, and we both need dtc for the
driver module as well as the guest device trees.

>
> Reviewed-by: Riku Voipio <[email protected]>

Thanks,
Jan

>
>> Signed-off-by: Jan Kiszka <[email protected]>
>> ---
>> scripts/package/builddeb | 2 +-
>> 1 file changed, 1 insertion(+), 1 deletion(-)
>>
>> diff --git a/scripts/package/builddeb b/scripts/package/builddeb
>> index b4f0f2b3f8d2..13fabb1f81db 100755
>> --- a/scripts/package/builddeb
>> +++ b/scripts/package/builddeb
>> @@ -313,7 +313,7 @@ fi
>>
>> # Build kernel header package
>> (cd $srctree; find . -name Makefile\* -o -name Kconfig\* -o -name \*.pl) > "$objtree/debian/hdrsrcfiles"
>> -(cd $srctree; find arch/*/include include scripts -type f) >> "$objtree/debian/hdrsrcfiles"
>> +(cd $srctree; find arch/*/include include scripts -type f -o -type l) >> "$objtree/debian/hdrsrcfiles"
>> (cd $srctree; find arch/$SRCARCH -name module.lds -o -name Kbuild.platforms -o -name Platform) >> "$objtree/debian/hdrsrcfiles"
>> (cd $srctree; find $(find arch/$SRCARCH -name include -o -name scripts -type d) -type f) >> "$objtree/debian/hdrsrcfiles"
>> if grep -q '^CONFIG_STACK_VALIDATION=y' $KCONFIG_CONFIG ; then
>> --
>> 2.13.6
>> --
>> To unsubscribe from this list: send the line "unsubscribe linux-kbuild" in
>> the body of a message to [email protected]
>> More majordomo info at http://vger.kernel.org/majordomo-info.html


2018-03-27 16:54:09

by Masahiro Yamada

[permalink] [raw]
Subject: Re: [PATCH] builddeb: Fix header package regarding dtc source links

2018-03-22 16:49 GMT+09:00 Jan Kiszka <[email protected]>:
> On 2018-03-22 15:45, Riku Voipio wrote:
>> On 21 March 2018 at 07:15, Jan Kiszka <[email protected]> wrote:
>>> Since d5d332d3f7e8, a couple of links in scripts/dtc/include-prefixes
>>> are additionally required in order to build device trees with the header
>>> package.
>>
>> A bit odd usecase IMHO, but:
>
> The use case is not completely odd (I hope): Jailhouse hypervisor. We
> build it as out-of-tree module so far, and we both need dtc for the
> driver module as well as the guest device trees.
>


I do not think this use case is odd.

Some drivers embed DTB for overlay, for example,
https://patchwork.kernel.org/patch/10159055/

So, building external modules may require
ability to build DT as well.


Applied to linux-kbuild/fixes. Thanks!


--
Best Regards
Masahiro Yamada