On Sat, Nov 21, 2020 at 04:55:49PM -0000, GitLab Bridge on behalf of pecastro 
wrote:
> From: "Paulo E. Castro" <[email protected]>
> 
> In file included from scripts/sorttable.c:191:
> scripts/sorttable.h:89:10: fatal error: asm/orc_types.h: No such file or 
> directory
>    89 | #include <asm/orc_types.h>
>       |          ^~~~~~~~~~~~~~~~~
> compilation terminated.
> make[1]: *** [scripts/Makefile.host:103: scripts/sorttable] Error 1
> make: *** [Makefile:1155: scripts] Error 2
> 
> Signed-off-by: Paulo E. Castro <[email protected]>
> ---
>  redhat/kernel.spec.template | 10 ++++++++++
>  1 file changed, 10 insertions(+)
>  mode change 100644 => 100755 redhat/kernel.spec.template
> 
> diff --git a/redhat/kernel.spec.template b/redhat/kernel.spec.template
> old mode 100644
> new mode 100755
> index 4d16c0005536..40685210d9fc
> --- a/redhat/kernel.spec.template
> +++ b/redhat/kernel.spec.template
> @@ -1677,9 +1677,18 @@ BuildKernel() {
>      cp -a --parents tools/include/tools/be_byteshift.h 
> $RPM_BUILD_ROOT/lib/modules/$KernelVer/build
>      cp -a --parents tools/include/tools/le_byteshift.h 
> $RPM_BUILD_ROOT/lib/modules/$KernelVer/build
>  
> +    # Files for 'make prepare' to succeed with kernel-devel.
> +    cp -a --parents tools/include/linux/compiler* 
> $RPM_BUILD_ROOT/lib/modules/$KernelVer/build
> +    cp -a --parents tools/include/linux/types.h 
> $RPM_BUILD_ROOT/lib/modules/$KernelVer/build
> +    cp -a --parents tools/build/Build.include 
> $RPM_BUILD_ROOT/lib/modules/$KernelVer/build
> +    cp --parents tools/objtool/sync-check.sh 
> $RPM_BUILD_ROOT/lib/modules/$KernelVer/build
> +
>      if [ -f tools/objtool/objtool ]; then
>        cp -a tools/objtool/objtool 
> $RPM_BUILD_ROOT/lib/modules/$KernelVer/build/tools/objtool/ || :
>      fi
> +    if [ -f tools/objtool/fixdep ]; then
> +      cp -a tools/objtool/fixdep 
> $RPM_BUILD_ROOT/lib/modules/$KernelVer/build/tools/objtool/ || :
> +    fi
>      if [ -d arch/$Arch/scripts ]; then
>        cp -a arch/$Arch/scripts 
> $RPM_BUILD_ROOT/lib/modules/$KernelVer/build/arch/%{_arch} || :
>      fi
> @@ -1733,6 +1742,7 @@ BuildKernel() {
>      cp -a --parents arch/x86/boot/string.h 
> $RPM_BUILD_ROOT/lib/modules/$KernelVer/build/
>      cp -a --parents arch/x86/boot/string.c 
> $RPM_BUILD_ROOT/lib/modules/$KernelVer/build/
>      cp -a --parents arch/x86/boot/ctype.h 
> $RPM_BUILD_ROOT/lib/modules/$KernelVer/build/
> +    cp -a --parents arch/x86/include/asm/orc_types.h 
> $RPM_BUILD_ROOT/lib/modules/$KernelVer/build/tools

I believe the correct fix here is _tools_/arch/x86/...

though the files are the same, but in case upstream fails to keep those two
separate files in-sync...

Cheers,
Don

>  %endif
>      # Make sure the Makefile and version.h have a matching timestamp so that
>      # external modules can be built
> -- 
> GitLab
> _______________________________________________
> kernel mailing list -- [email protected]
> To unsubscribe send an email to [email protected]
> Fedora Code of Conduct: 
> https://docs.fedoraproject.org/en-US/project/code-of-conduct/
> List Guidelines: https://fedoraproject.org/wiki/Mailing_list_guidelines
> List Archives: 
> https://lists.fedoraproject.org/archives/list/[email protected]
_______________________________________________
kernel mailing list -- [email protected]
To unsubscribe send an email to [email protected]
Fedora Code of Conduct: 
https://docs.fedoraproject.org/en-US/project/code-of-conduct/
List Guidelines: https://fedoraproject.org/wiki/Mailing_list_guidelines
List Archives: 
https://lists.fedoraproject.org/archives/list/[email protected]

Reply via email to