builddeb: Fix header package regarding dtc source links
diff mbox

Message ID c6e11bd4-3d22-f8aa-c905-d06b16b1f5e2@siemens.com
State New
Headers show

Commit Message

Jan Kiszka March 21, 2018, 5:15 a.m. UTC
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 <jan.kiszka@siemens.com>
---
 scripts/package/builddeb | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

Comments

Riku Voipio March 22, 2018, 7:45 a.m. UTC | #1
On 21 March 2018 at 07:15, Jan Kiszka <jan.kiszka@siemens.com> 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 <riku.voipio@linaro.org>

> Signed-off-by: Jan Kiszka <jan.kiszka@siemens.com>
> ---
>  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 majordomo@vger.kernel.org
> More majordomo info at  http://vger.kernel.org/majordomo-info.html
--
To unsubscribe from this list: send the line "unsubscribe linux-kbuild" in
the body of a message to majordomo@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Jan Kiszka March 22, 2018, 7:49 a.m. UTC | #2
On 2018-03-22 15:45, Riku Voipio wrote:
> On 21 March 2018 at 07:15, Jan Kiszka <jan.kiszka@siemens.com> 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 <riku.voipio@linaro.org>

Thanks,
Jan

> 
>> Signed-off-by: Jan Kiszka <jan.kiszka@siemens.com>
>> ---
>>  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 majordomo@vger.kernel.org
>> More majordomo info at  http://vger.kernel.org/majordomo-info.html

--
To unsubscribe from this list: send the line "unsubscribe linux-kbuild" in
the body of a message to majordomo@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Masahiro Yamada March 27, 2018, 4:51 p.m. UTC | #3
2018-03-22 16:49 GMT+09:00 Jan Kiszka <jan.kiszka@siemens.com>:
> On 2018-03-22 15:45, Riku Voipio wrote:
>> On 21 March 2018 at 07:15, Jan Kiszka <jan.kiszka@siemens.com> 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!

Patch
diff mbox

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