[OS-BUILD PATCHv2 3/4] Wrap up all the tools requirements under a single copy statement and clean piecemeal statements.

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

 



From: "Paulo E. Castro" <pecastro@xxxxxxxxxxxxxxx>

Started going down a slippery slope of dependencies ...

  HOSTCC  scripts/sorttable
In file included from scripts/sorttable.h:89,
                 from scripts/sorttable.c:191:
./tools/arch/x86/include/asm/orc_types.h:10:10: fatal error: linux/compiler.h: No such file or directory
   10 | #include <linux/compiler.h>
      |          ^~~~~~~~~~~~~~~~~~
compilation terminated.

scripts/Makefile.build:415: warning: overriding recipe for target 'modules.order'
Makefile:1365: warning: ignoring old recipe for target 'modules.order'
error: Cannot generate ORC metadata for CONFIG_UNWINDER_ORC=y, please install libelf-dev, libelf-devel or elfutils-libelf-devel
make: *** [Makefile:1192: prepare-objtool] Error 1
[root@c8-sc-2 5.8.16-300.fc33.x86_64]# make prepare
scripts/Makefile.build:415: warning: overriding recipe for target 'modules.order'
Makefile:1365: warning: ignoring old recipe for target 'modules.order'
  DESCEND  objtool
/usr/src/kernels/5.8.16-300.fc33.x86_64/tools/build/Makefile.build:37: /usr/src/kernels/5.8.16-300.fc33.x86_64/tools/build/Build.include: No such file or directory
make[4]: *** No rule to make target '/usr/src/kernels/5.8.16-300.fc33.x86_64/tools/build/Build.include'.  Stop.
make[3]: *** [Makefile:43: /usr/src/kernels/5.8.16-300.fc33.x86_64/tools/objtool/fixdep-in.o] Error 2
make[2]: *** [/usr/src/kernels/5.8.16-300.fc33.x86_64/tools/build/Makefile.include:5: fixdep] Error 2
make[1]: *** [Makefile:68: objtool] Error 2
make: *** [Makefile:1854: tools/objtool] Error 2

scripts/selinux/mdp/mdp.c:38:10: fatal error: policycap_names.h: No such file or directory
   38 | #include "policycap_names.h"

In file included from scripts/selinux/mdp/mdp.c:38:
./security/selinux/include/policycap_names.h:5:10: fatal error: policycap.h: No such file or directory
    5 | #include "policycap.h"

make[4]: *** No rule to make target '/usr/src/kernels/5.10.0-0.rc2.20201108git24622beca025.66.test.fc33.x86_64/tools/objtool/fixdep.o', needed by '/usr/src/kernels/5.10.0-0.rc2.20201108git24622beca025.66.test.fc33.x86_64/tools/objtool/fixdep-in.o'.  Stop.
make[3]: *** [Makefile:45: /usr/src/kernels/5.10.0-0.rc2.20201108git24622beca025.66.test.fc33.x86_64/tools/objtool/fixdep-in.o] Error 2
make[2]: *** [/usr/src/kernels/5.10.0-0.rc2.20201108git24622beca025.66.test.fc33.x86_64/tools/build/Makefile.include:5: fixdep] Error 2

sh: ./sync-check.sh: No such file or directory
make[2]: *** [Makefile:67: /usr/src/kernels/5.10.0-0.rc2.20201108git24622beca025.66.test.fc33.x86_64/tools/objtool/objtool-in.o] Error 127
make[1]: *** [Makefile:68: objtool] Error 2
make: *** [Makefile:1936: tools/objtool] Error 2

Makefile:1410: warning: ignoring old recipe for target 'modules.order'
  DESCEND  objtool
  LD       /usr/src/kernels/5.10.0-0.rc2.20201108git24622beca025.66.test.fc33.x86_64/tools/objtool/libsubcmd-in.o
  AR       /usr/src/kernels/5.10.0-0.rc2.20201108git24622beca025.66.test.fc33.x86_64/tools/objtool/libsubcmd.a
sh: ./sync-check.sh: No such file or directory
Signed-off-by: Paulo E. Castro <pecastro@xxxxxxxxxxxxxxx>
---
 redhat/kernel.spec.template | 18 +++++-------------
 1 file changed, 5 insertions(+), 13 deletions(-)

diff --git a/redhat/kernel.spec.template b/redhat/kernel.spec.template
index 8ae48bedf7f0..3bc8450e4fea 100755
--- a/redhat/kernel.spec.template
+++ b/redhat/kernel.spec.template
@@ -1673,22 +1673,14 @@ BuildKernel() {
     mkdir -p $RPM_BUILD_ROOT/lib/modules/$KernelVer/build/security/selinux/include
     cp -a --parents security/selinux/include/classmap.h $RPM_BUILD_ROOT/lib/modules/$KernelVer/build
     cp -a --parents security/selinux/include/initial_sid_to_string.h $RPM_BUILD_ROOT/lib/modules/$KernelVer/build
-    mkdir -p $RPM_BUILD_ROOT/lib/modules/$KernelVer/build/tools/include/tools
-    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
+    cp -a --parents tools $RPM_BUILD_ROOT/lib/modules/$KernelVer/build
+    find $RPM_BUILD_ROOT/lib/modules/$KernelVer/build/tools \( -iname "*.o" -o -iname "*.cmd" \) -exec rm -f {} +
+
+    cp --parents security/selinux/include/policycap_names.h $RPM_BUILD_ROOT/lib/modules/$KernelVer/build
+    cp --parents security/selinux/include/policycap.h $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
-- 
GitLab
_______________________________________________
kernel mailing list -- kernel@xxxxxxxxxxxxxxxxxxxxxxx
To unsubscribe send an email to kernel-leave@xxxxxxxxxxxxxxxxxxxxxxx
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/kernel@xxxxxxxxxxxxxxxxxxxxxxx




[Index of Archives]     [Fedora General Discussion]     [Older Fedora Users Archive]     [Fedora Advisory Board]     [Fedora Security]     [Fedora Devel Java]     [Fedora Legacy]     [Fedora Desktop]     [ATA RAID]     [Fedora Marketing]     [Fedora Mentors]     [Fedora Package Announce]     [Fedora Package Review]     [Fedora Music]     [Fedora Packaging]     [Centos]     [Fedora SELinux]     [Coolkey]     [Yum Users]     [Tux]     [Yosemite News]     [KDE Users]     [Fedora Art]     [Fedora Docs]     [USB]     [Asterisk PBX]

  Powered by Linux