Skip to contentSkip to conversation

Makefile: use HOST_DIR_SYMLINK instead of hardcoding

PATCH New Thomas De Schampheleire 2 participants 6 messages Feb 18, 2020 – Feb 19, 2020 Kbuild

lore
Share & tools
lore
#0 lore raw

PATCH 1/2 Makefile: use HOST_DIR_SYMLINK instead of hardcoding

From: Thomas De Schampheleire <[email protected]>

---
 Makefile | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
Makefile +1 -1
index a52f1c75fd..facccd32e7 100644
@@ -455,7 +455,7 @@ endif
 ifneq ($(HOST_DIR),$(BASE_DIR)/host)
 HOST_DIR_SYMLINK = $(BASE_DIR)/host
 $(HOST_DIR_SYMLINK): $(BASE_DIR)
-	ln -snf $(HOST_DIR) $(BASE_DIR)/host
+	ln -snf $(HOST_DIR) $(HOST_DIR_SYMLINK)
 endif
 
 # Quotes are needed for spaces and all in the original PATH content.
Signature · 1 line
2.24.1
#1 lore raw

PATCH 2/2 Makefile: don't recreate staging symlink if it exists

From: Thomas De Schampheleire <[email protected]>

Create the staging symlink the same way as the host symlink. This means using a make dependency rather than recreating it every time.

In coreutils versions below 8.27, re-creation of symbolic links was not atomic. This means that there is a period in time where the existing link is removed, before the new one is created. In coreutils 8.27 this was fixed, see [1]. Note that CentOS 7 ships with coreutils 8.22.

In the following scenario, this is a problem:

- an application is compiled using the sysroot prepared by Buildroot and links against Xenomai userspace libraries, but its build process is steered from outside of Buildroot
- to know the correct flags, the application makefile uses the 'xeno-config' file to request them, and passes DESTDIR=/buildroot/output/staging
- the xeno-config responds with flags based on the path '/buildroot/output/staging/...'
- while the application build is ongoing, a 'make' happens in Buildroot, causing the 'staging' symlink to be recreated (even though it already existed)
- when exactly at this time, the application calls the compiler with -I flags pointing to output/staging, the build fails with:

-I/buildroot/output/staging/usr/include/xenomai/mercury: Error: ^ is not a directory -I/buildroot/output/staging/usr/include/xenomai: Error: ^ is not a directory -I/buildroot/output/staging/usr/include/xenomai/xenomai: Error: ^ is not a directory -I/buildroot/output/staging/usr/include/xenomai/psos: Error: ^ is not a directory
Failed: ** ^ *

Work around this problem by only creating the staging symlink once, similar to how the host symlink (if any) is created.

See also commit d0f4f95e390bcb1c953efa125f5277a8a235396e which changed the way these symlinks are made. The reasoning in this commit is to move away from the 'dirs' target.

[1] https://github.com/coreutils/coreutils/commit/376967889ed7ed561e46ff6d88a66779db62737a

---
 Makefile | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)
Makefile +5 -2
index facccd32e7..3f301716f1 100644
@@ -458,6 +458,10 @@ $(HOST_DIR_SYMLINK): $(BASE_DIR)
 	ln -snf $(HOST_DIR) $(HOST_DIR_SYMLINK)
 endif
 
+STAGING_DIR_SYMLINK = $(BASE_DIR)/staging
+$(STAGING_DIR_SYMLINK): $(BASE_DIR)
+	ln -snf $(STAGING_DIR) $(STAGING_DIR_SYMLINK)
+
 # Quotes are needed for spaces and all in the original PATH content.
 BR_PATH = "$(HOST_DIR)/bin:$(HOST_DIR)/sbin:$(PATH)"
 
@@ -726,8 +730,7 @@ host-finalize: $(PACKAGES) $(HOST_DIR) $(HOST_DIR_SYMLINK)
 	$(call per-package-rsync,$(sort $(PACKAGES)),host,$(HOST_DIR))
 
 .PHONY: staging-finalize
-staging-finalize:
-	@ln -snf $(STAGING_DIR) $(BASE_DIR)/staging
+staging-finalize: $(STAGING_DIR_SYMLINK)
 
 .PHONY: target-finalize
 target-finalize: $(PACKAGES) $(TARGET_DIR) host-finalize
Signature · 1 line
2.24.1
#2 lore raw

PATCH 2/2 Makefile: don't recreate staging symlink if it exists

Hello,

Quoted 31 lines · On Tue, 18 Feb 2020 16:01:00 +0100 Thomas De Schampheleire…

From: Thomas De Schampheleire <[email protected]>

Create the staging symlink the same way as the host symlink. This means using a make dependency rather than recreating it every time.

In coreutils versions below 8.27, re-creation of symbolic links was not atomic. This means that there is a period in time where the existing link is removed, before the new one is created. In coreutils 8.27 this was fixed, see [1]. Note that CentOS 7 ships with coreutils 8.22.

In the following scenario, this is a problem:

- an application is compiled using the sysroot prepared by Buildroot and links against Xenomai userspace libraries, but its build process is steered from outside of Buildroot
- to know the correct flags, the application makefile uses the 'xeno-config' file to request them, and passes DESTDIR=/buildroot/output/staging
- the xeno-config responds with flags based on the path '/buildroot/output/staging/...'
- while the application build is ongoing, a 'make' happens in Buildroot, causing the 'staging' symlink to be recreated (even though it already existed)
- when exactly at this time, the application calls the compiler with -I flags pointing to output/staging, the build fails with:

-I/buildroot/output/staging/usr/include/xenomai/mercury: Error: ^ is not a directory -I/buildroot/output/staging/usr/include/xenomai: Error: ^ is not a directory -I/buildroot/output/staging/usr/include/xenomai/xenomai: Error: ^ is not a directory -I/buildroot/output/staging/usr/include/xenomai/psos: Error: ^ is not a directory
Failed: ** ^ *

Quoted 8 lines

Work around this problem by only creating the staging symlink once, similar to how the host symlink (if any) is created.

See also commit d0f4f95e390bcb1c953efa125f5277a8a235396e which changed the way these symlinks are made. The reasoning in this commit is to move away from the 'dirs' target.

[1] https://github.com/coreutils/coreutils/commit/376967889ed7ed561e46ff6d88a66779db62737a

Wow, thanks for the investigation and detailed commit log. Quite crazy stuff.

The question that comes to mind is: why are you building something against the Buildroot toolchain/sysroot, before the Buildroot build has completed ?

Thomas

Signature · 3 lines
Thomas Petazzoni, CTO, Bootlin
Embedded Linux and Kernel engineering
https://bootlin.com
#3 lore raw

PATCH 2/2 Makefile: don't recreate staging symlink if it exists

El mar., 18 feb. 2020 a las 16:40, Thomas Petazzoni (<[email protected]>) escribi?:

Quoted 44 lines

Hello,

Quoted 38 lines · On Tue, 18 Feb 2020 16:01:00 +0100 Thomas De Schampheleire…

From: Thomas De Schampheleire <[email protected]>

Create the staging symlink the same way as the host symlink. This means using a make dependency rather than recreating it every time.

In coreutils versions below 8.27, re-creation of symbolic links was not atomic. This means that there is a period in time where the existing link is removed, before the new one is created. In coreutils 8.27 this was fixed, see [1]. Note that CentOS 7 ships with coreutils 8.22.

In the following scenario, this is a problem:

- an application is compiled using the sysroot prepared by Buildroot and links against Xenomai userspace libraries, but its build process is steered from outside of Buildroot
- to know the correct flags, the application makefile uses the 'xeno-config' file to request them, and passes DESTDIR=/buildroot/output/staging
- the xeno-config responds with flags based on the path '/buildroot/output/staging/...'
- while the application build is ongoing, a 'make' happens in Buildroot, causing the 'staging' symlink to be recreated (even though it already existed)
- when exactly at this time, the application calls the compiler with -I flags pointing to output/staging, the build fails with:

-I/buildroot/output/staging/usr/include/xenomai/mercury: Error: ^ is not a directory -I/buildroot/output/staging/usr/include/xenomai: Error: ^ is not a directory -I/buildroot/output/staging/usr/include/xenomai/xenomai: Error: ^ is not a directory -I/buildroot/output/staging/usr/include/xenomai/psos: Error: ^ is not a directory
Failed: ** ^ *

Work around this problem by only creating the staging symlink once, similar to how the host symlink (if any) is created.

See also commit d0f4f95e390bcb1c953efa125f5277a8a235396e which changed the way these symlinks are made. The reasoning in this commit is to move away from the 'dirs' target.

Quoted 8 lines
Quoted 1 line

[1] https://github.com/coreutils/coreutils/commit/376967889ed7ed561e46ff6d88a66779db62737a

Wow, thanks for the investigation and detailed commit log. Quite crazy stuff.

The question that comes to mind is: why are you building something against the Buildroot toolchain/sysroot, before the Buildroot build has completed ?

No, the initial Buildroot build _is_ completed first. Then the application build starts according to the scenario described. In our case, the extra Buildroot 'make' is done to let Buildroot create the images, passing a custom TARGET_DIR which is an extended copy of the original output/target. This step happens multiple times for different boards, out of the same Buildroot (the boards differ a bit in our own software plus perhaps some other customization done in the rootfs). From the perspective of the application build, the fact that Buildroot 'make' is called shouldn't matter because all the files it needs will not be touched. Buildroot itself is also retained as-is, except it is asked to produce images.

Best regards,
Thomas

#4 lore raw

PATCH 2/2 Makefile: don't recreate staging symlink if it exists

Quoted 4 lines · On Tue, 18 Feb 2020 18:59:49 +0100 Thomas De Schampheleire…
Quoted 3 lines

The question that comes to mind is: why are you building something against the Buildroot toolchain/sysroot, before the Buildroot build has completed ?

Quoted 11 lines

No, the initial Buildroot build _is_ completed first. Then the application build starts according to the scenario described. In our case, the extra Buildroot 'make' is done to let Buildroot create the images, passing a custom TARGET_DIR which is an extended copy of the original output/target. This step happens multiple times for different boards, out of the same Buildroot (the boards differ a bit in our own software plus perhaps some other customization done in the rootfs). From the perspective of the application build, the fact that Buildroot 'make' is called shouldn't matter because all the files it needs will not be touched. Buildroot itself is also retained as-is, except it is asked to produce images.

Ah, ok. Convoluted use case, but OK. Anyway, the change makes sense, so we'll apply. Thanks for the additional explanation!

Best regards,

Thomas

Signature · 3 lines
Thomas Petazzoni, CTO, Bootlin
Embedded Linux and Kernel engineering
https://bootlin.com
#5 lore raw

PATCH 1/2 Makefile: use HOST_DIR_SYMLINK instead of hardcoding

In reply to Thomas De Schampheleire
Quoted 6 lines · On Tue, 18 Feb 2020 16:00:59 +0100 Thomas De Schampheleire…

From: Thomas De Schampheleire <[email protected]>

---
 Makefile | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

Thanks. Both applied to master.

Thomas

Signature · 3 lines
Thomas Petazzoni, CTO, Bootlin
Embedded Linux and Kernel engineering
https://bootlin.com