diff mbox series

builddeb: Don't look for a missing Module.symvers

Message ID 20210204202054.1608664-1-sean.anderson@seco.com (mailing list archive)
State New, archived
Headers show
Series builddeb: Don't look for a missing Module.symvers | expand

Commit Message

Sean Anderson Feb. 4, 2021, 8:20 p.m. UTC
If deb-pkg is run with CONFIG_MODULES disabled, then make fails with

find: ‘Module.symvers’: No such file or directory
make[4]: *** [scripts/Makefile.package:87: intdeb-pkg] Error 1
make[3]: *** [Makefile:1523: intdeb-pkg] Error 2
make[2]: *** [debian/rules:9: binary-arch] Error 2

Only add it to headerobjfiles if we actually have modules.

Signed-off-by: Sean Anderson <sean.anderson@seco.com>
---

 scripts/package/builddeb | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

Comments

Masahiro Yamada Feb. 5, 2021, 8:14 a.m. UTC | #1
On Fri, Feb 5, 2021 at 5:21 AM Sean Anderson <sean.anderson@seco.com> wrote:
>
> If deb-pkg is run with CONFIG_MODULES disabled, then make fails with
>
> find: ‘Module.symvers’: No such file or directory
> make[4]: *** [scripts/Makefile.package:87: intdeb-pkg] Error 1
> make[3]: *** [Makefile:1523: intdeb-pkg] Error 2
> make[2]: *** [debian/rules:9: binary-arch] Error 2
>
> Only add it to headerobjfiles if we actually have modules.
>
> Signed-off-by: Sean Anderson <sean.anderson@seco.com>
> ---


I do not see this error any more after
the following commit was merged.


commit bac977cbc0d6731fb8e67c2be0e4acbd959e10b3
Author: Masahiro Yamada <masahiroy@kernel.org>
Date:   Wed Oct 14 03:38:19 2020 +0900

    kbuild: deb-pkg: do not build linux-headers package if CONFIG_MODULES=n







>  scripts/package/builddeb | 6 +++++-
>  1 file changed, 5 insertions(+), 1 deletion(-)
>
> diff --git a/scripts/package/builddeb b/scripts/package/builddeb
> index 91a502bb97e8..19d44704832b 100755
> --- a/scripts/package/builddeb
> +++ b/scripts/package/builddeb
> @@ -71,7 +71,11 @@ deploy_kernel_headers () {
>                         echo tools/objtool/objtool
>                 fi
>
> -               find arch/$SRCARCH/include Module.symvers include scripts -type f
> +               if is_enabled CONFIG_MODULES; then
> +                       echo Module.symvers
> +               fi
> +
> +               find arch/$SRCARCH/include include scripts -type f
>
>                 if is_enabled CONFIG_GCC_PLUGINS; then
>                         find scripts/gcc-plugins -name \*.so
> --
> 2.25.1
>
Sean Anderson Feb. 5, 2021, 3:07 p.m. UTC | #2
On 2/5/21 3:14 AM, Masahiro Yamada wrote:
> On Fri, Feb 5, 2021 at 5:21 AM Sean Anderson <sean.anderson@seco.com> wrote:
>>
>> If deb-pkg is run with CONFIG_MODULES disabled, then make fails with
>>
>> find: ‘Module.symvers’: No such file or directory
>> make[4]: *** [scripts/Makefile.package:87: intdeb-pkg] Error 1
>> make[3]: *** [Makefile:1523: intdeb-pkg] Error 2
>> make[2]: *** [debian/rules:9: binary-arch] Error 2
>>
>> Only add it to headerobjfiles if we actually have modules.
>>
>> Signed-off-by: Sean Anderson <sean.anderson@seco.com>
>> ---
> 
> 
> I do not see this error any more after
> the following commit was merged.

That fixes it on my end as well.

--Sean

> 
> 
> commit bac977cbc0d6731fb8e67c2be0e4acbd959e10b3
> Author: Masahiro Yamada <masahiroy@kernel.org>
> Date:   Wed Oct 14 03:38:19 2020 +0900
> 
>      kbuild: deb-pkg: do not build linux-headers package if CONFIG_MODULES=n
> 
> 
> 
> 
> 
> 
> 
>>   scripts/package/builddeb | 6 +++++-
>>   1 file changed, 5 insertions(+), 1 deletion(-)
>>
>> diff --git a/scripts/package/builddeb b/scripts/package/builddeb
>> index 91a502bb97e8..19d44704832b 100755
>> --- a/scripts/package/builddeb
>> +++ b/scripts/package/builddeb
>> @@ -71,7 +71,11 @@ deploy_kernel_headers () {
>>                          echo tools/objtool/objtool
>>                  fi
>>
>> -               find arch/$SRCARCH/include Module.symvers include scripts -type f
>> +               if is_enabled CONFIG_MODULES; then
>> +                       echo Module.symvers
>> +               fi
>> +
>> +               find arch/$SRCARCH/include include scripts -type f
>>
>>                  if is_enabled CONFIG_GCC_PLUGINS; then
>>                          find scripts/gcc-plugins -name \*.so
>> --
>> 2.25.1
>>
> 
>
diff mbox series

Patch

diff --git a/scripts/package/builddeb b/scripts/package/builddeb
index 91a502bb97e8..19d44704832b 100755
--- a/scripts/package/builddeb
+++ b/scripts/package/builddeb
@@ -71,7 +71,11 @@  deploy_kernel_headers () {
 			echo tools/objtool/objtool
 		fi
 
-		find arch/$SRCARCH/include Module.symvers include scripts -type f
+		if is_enabled CONFIG_MODULES; then
+			echo Module.symvers
+		fi
+
+		find arch/$SRCARCH/include include scripts -type f
 
 		if is_enabled CONFIG_GCC_PLUGINS; then
 			find scripts/gcc-plugins -name \*.so