Skip to contentSkip to conversation

RFE: tools: fix parallel build of tools-all

PATCH New Peter Robinson 2 participants 5 messages Dec 4, 2019 Kbuild

lore
Share & tools
lore
#0 lore raw

PATCH 1/1 RFE: tools: fix parallel build of tools-all

Commit 4d90f6cd9813 breaks parallel builds in 2020.01-rc series. This fixes the issue, reverting it also fixes it. Not sure which is the best route.

---
 Makefile | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)
Makefile +3 -3
index 8024baaddf..4330c2f3a4 100644
@@ -1895,14 +1895,14 @@ checkarmreloc: u-boot
 		false; \
 	fi
 
-tools/version.h: include/version.h
+version.h: include/version.h
 	$(call if_changed,copy)
 
-envtools: scripts_basic $(version_h) $(timestamp_h) tools/version.h
+envtools: scripts_basic $(version_h) $(timestamp_h) version.h
 	$(Q)$(MAKE) $(build)=tools/env
 
 tools-only: export TOOLS_ONLY=y
-tools-only: scripts_basic $(version_h) $(timestamp_h) tools/version.h
+tools-only: scripts_basic $(version_h) $(timestamp_h) version.h
 	$(Q)$(MAKE) $(build)=tools
 
 tools-all: export HOST_TOOLS_ALL=y
Signature · 1 line
2.23.0
#1 lore raw

PATCH 1/1 RFE: tools: fix parallel build of tools-all

Quoted 21 lines · Peter Robinson

Commit 4d90f6cd9813 breaks parallel builds in 2020.01-rc series. This fixes the issue, reverting it also fixes it. Not sure which is the best route.

---
 Makefile | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)
Makefile +1 -1
index 8024baaddf..4330c2f3a4 100644
@@ -1895,14 +1895,14 @@ checkarmreloc: u-boot
 		false; \
 	fi
 
-tools/version.h: include/version.h
+version.h: include/version.h
 	$(call if_changed,copy)
 

Makefile checkarmreloc: u-boot · line 1908

Quoted 10 lines
Makefile +2 -2
-envtools: scripts_basic $(version_h) $(timestamp_h) tools/version.h
+envtools: scripts_basic $(version_h) $(timestamp_h) version.h
 	$(Q)$(MAKE) $(build)=tools/env
 
 tools-only: export TOOLS_ONLY=y
-tools-only: scripts_basic $(version_h) $(timestamp_h) tools/version.h
+tools-only: scripts_basic $(version_h) $(timestamp_h) version.h
 	$(Q)$(MAKE) $(build)=tools
 
 tools-all: export HOST_TOOLS_ALL=y

It's a heck of a build machine you're throwing this at I assume. Can you explain a bit more on how this is still the right set of dependencies? Assuming you haven't hooked up Azure so you can get a CI run of the Windows build, I'll take care of that as part of testing this in general, thanks.

Signature · 8 lines
Tom
-------------- next part --------------
A non-text attachment was scrubbed...
Name: signature.asc
Type: application/pgp-signature
Size: 833 bytes
Desc: not available
URL: <https://lists.denx.de/pipermail/u-boot/attachments/20191204/270d518c/attachment.sig>
#2 lore raw

PATCH 1/1 RFE: tools: fix parallel build of tools-all

Quoted 25 lines
Quoted 25 lines

Commit 4d90f6cd9813 breaks parallel builds in 2020.01-rc series. This fixes the issue, reverting it also fixes it. Not sure which is the best route.

---
 Makefile | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)
Makefile +2 -2
index 8024baaddf..4330c2f3a4 100644
@@ -1895,14 +1895,14 @@ checkarmreloc: u-boot
              false; \
      fi
 
-tools/version.h: include/version.h
+version.h: include/version.h
      $(call if_changed,copy)
 
-envtools: scripts_basic $(version_h) $(timestamp_h) tools/version.h
+envtools: scripts_basic $(version_h) $(timestamp_h) version.h
      $(Q)$(MAKE) $(build)=tools/env
 
Quoted 8 lines

Makefile checkarmreloc: u-boot · line 1908

Quoted 6 lines
Makefile +1 -1
 tools-only: export TOOLS_ONLY=y
-tools-only: scripts_basic $(version_h) $(timestamp_h) tools/version.h
+tools-only: scripts_basic $(version_h) $(timestamp_h) version.h
      $(Q)$(MAKE) $(build)=tools
 
 tools-all: export HOST_TOOLS_ALL=y

It's a heck of a build machine you're throwing this at I assume. Can

I can reproduce it on my laptop when doing a local rpm build, the full logs output on the build system is in the link below. I'm trying to work out if a specific build flag causes the issue.

https://kojipkgs.fedoraproject.org//work/tasks/467/39430467/build.log

Quoted 2 lines

you explain a bit more on how this is still the right set of dependencies? Assuming you haven't hooked up Azure so you can get a CI

TBH I'm not sure if does but all the binaries are there and they appear to work OK with testing.

Quoted 2 lines

run of the Windows build, I'll take care of that as part of testing this in general, thanks.

I've no idea how to do a Windows build let alone one in Azure, sorry.

Peter

#3 lore raw

PATCH 1/1 RFE: tools: fix parallel build of tools-all

Quoted 34 lines · Peter Robinson
Quoted 25 lines
Quoted 25 lines

Commit 4d90f6cd9813 breaks parallel builds in 2020.01-rc series. This fixes the issue, reverting it also fixes it. Not sure which is the best route.

---
 Makefile | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)
Makefile +2 -2
index 8024baaddf..4330c2f3a4 100644
@@ -1895,14 +1895,14 @@ checkarmreloc: u-boot
              false; \
      fi
 
-tools/version.h: include/version.h
+version.h: include/version.h
      $(call if_changed,copy)
 
-envtools: scripts_basic $(version_h) $(timestamp_h) tools/version.h
+envtools: scripts_basic $(version_h) $(timestamp_h) version.h
      $(Q)$(MAKE) $(build)=tools/env
 
Quoted 8 lines

Makefile checkarmreloc: u-boot · line 1908

Quoted 6 lines
Makefile +1 -1
 tools-only: export TOOLS_ONLY=y
-tools-only: scripts_basic $(version_h) $(timestamp_h) tools/version.h
+tools-only: scripts_basic $(version_h) $(timestamp_h) version.h
      $(Q)$(MAKE) $(build)=tools
 
 tools-all: export HOST_TOOLS_ALL=y

It's a heck of a build machine you're throwing this at I assume. Can

Quoted 5 lines

I can reproduce it on my laptop when doing a local rpm build, the full logs output on the build system is in the link below. I'm trying to work out if a specific build flag causes the issue.

https://kojipkgs.fedoraproject.org//work/tasks/467/39430467/build.log

Ah, interesting. So the tools directory doesn't exist yet, in this case. I'm not sure why it does when we're building via buildman. Can you try this:

Makefile +1 -0
index 0ee0c701022a..960926caad45 100644
@@ -1889,6 +1889,7 @@ checkarmreloc: u-boot
 	fi
 
 tools/version.h: include/version.h
+	$(Q)mkdir -p $(dir $@)
 	$(call if_changed,copy)
 
 envtools: scripts_basic $(version_h) $(timestamp_h) tools/version.h
Signature · 8 lines
Tom
-------------- next part --------------
A non-text attachment was scrubbed...
Name: signature.asc
Type: application/pgp-signature
Size: 833 bytes
Desc: not available
URL: <https://lists.denx.de/pipermail/u-boot/attachments/20191204/ac68bc59/attachment.sig>
#4 lore raw

PATCH 1/1 RFE: tools: fix parallel build of tools-all

Quoted 40 lines · Tom Rini
Quoted 38 lines · Peter Robinson
Quoted 25 lines
Quoted 25 lines

Commit 4d90f6cd9813 breaks parallel builds in 2020.01-rc series. This fixes the issue, reverting it also fixes it. Not sure which is the best route.

---
 Makefile | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)
Makefile +2 -2
index 8024baaddf..4330c2f3a4 100644
@@ -1895,14 +1895,14 @@ checkarmreloc: u-boot
              false; \
      fi
 
-tools/version.h: include/version.h
+version.h: include/version.h
      $(call if_changed,copy)
 
-envtools: scripts_basic $(version_h) $(timestamp_h) tools/version.h
+envtools: scripts_basic $(version_h) $(timestamp_h) version.h
      $(Q)$(MAKE) $(build)=tools/env
 
Quoted 8 lines

Makefile checkarmreloc: u-boot · line 1908

Quoted 6 lines
Makefile +1 -1
 tools-only: export TOOLS_ONLY=y
-tools-only: scripts_basic $(version_h) $(timestamp_h) tools/version.h
+tools-only: scripts_basic $(version_h) $(timestamp_h) version.h
      $(Q)$(MAKE) $(build)=tools
 
 tools-all: export HOST_TOOLS_ALL=y

It's a heck of a build machine you're throwing this at I assume. Can

I can reproduce it on my laptop when doing a local rpm build, the full logs output on the build system is in the link below. I'm trying to work out if a specific build flag causes the issue.

Quoted 5 lines
Quoted 1 line

https://kojipkgs.fedoraproject.org//work/tasks/467/39430467/build.log

Ah, interesting. So the tools directory doesn't exist yet, in this case. I'm not sure why it does when we're building via buildman. Can you try this:

That works for my local build, just trying on the build system but you can add my tested by, thanks for the proper fix, my make fu is limited.

Quoted 15 lines
Makefile +1 -1
index 0ee0c701022a..960926caad45 100644
@@ -1889,6 +1889,7 @@ checkarmreloc: u-boot
        fi
 
 tools/version.h: include/version.h
+       $(Q)mkdir -p $(dir $@)
        $(call if_changed,copy)
 
 envtools: scripts_basic $(version_h) $(timestamp_h) tools/version.h
 
--

Tom