uclibc: prevent rebuilding after installation to staging

PATCH New Alexey Brodkin 2 participants 7 messages Jun 4, 2014 – Jun 18, 2014

Share & tools

Alexey Brodkin

author

2014-06-04 20:27 UTC #0 lore raw

PATCH 1/1 uclibc: prevent rebuilding after installation to staging

Currently we configure uClibc to use kernel headers from "staging" folder with KERNEL_HEADERS="$(STAGING_DIR)/usr/include". This path is added to include search path of uClibc build system in Rules.mak "CFLAGS += -I$(KERNEL_HEADERS)".

At the same time on uClibc installation to "staging" we point to the same location "$(STAGING_DIR)/usr" (headers effectively go in "usr/include").

So after every installation to "staging" dependences get touched (even though we copy the same headers every time) and so we may see lots of sources in uClibc get rebuilt.

This has 2 consequences:
1. Longer build time - becase even on ordinary buildroot build uClibc is built twice. On "uclibc building" and on "uclibc installation to target".

2. Symbols in libuClibc built initially (that is later installed in "staging/sysroot") are situated with different offset compared to second build (later copied in "target"). This happens because as described above only part of sources get rebuilt and then on final linkage object files are linked in different order.

And (2) leads to problems on remote rebugging: gdbserver reports offsets that correspond to pointless assembly in libuClibc on host.

Here's how it looks like.

Before this patch:

$ cd ~/br2_output/i586/target/lib
$ i586-buildroot-linux-uclibc-readelf -s libuClibc-0.9.33.2.so | grep kill
   423: 0000c42c    54 FUNC    GLOBAL DEFAULT    7 kill

$ cd ~/br2_output/i586/staging/lib
$ i586-buildroot-linux-uclibc-readelf -s libuClibc-0.9.33.2.so | grep kill
   423: 0000b518    54 FUNC    GLOBAL DEFAULT    7 kill

After this patch:

$ cd ~/br2_output/i586/target/lib
$ i586-buildroot-linux-uclibc-readelf -s libuClibc-0.9.33.2.so | grep kill
   423: 0000b518    54 FUNC    GLOBAL DEFAULT    7 kill

$ cd ~/br2_output/i586/staging/lib
$ i586-buildroot-linux-uclibc-readelf -s libuClibc-0.9.33.2.so | grep kill
   423: 0000b518    54 FUNC    GLOBAL DEFAULT    7 kill

Signed-off-by Alexey Brodkin <[email protected]>

Cc Thomas Petazzoni <[email protected]>

Cc Peter Korsgaard <[email protected]>

Cc Noam Camus <[email protected]>

---
 package/linux-headers/linux-headers.mk | 14 ++++++++++++++
 package/uclibc/uclibc.mk               |  2 +-
 2 files changed, 15 insertions(+), 1 deletion(-)

package/linux-headers/linux-headers.mk +14 -0

index 7b3edf4..8302d56 100644
@@ -26,6 +26,20 @@ LINUX_HEADERS_ADD_TOOLCHAIN_DEPENDENCY = NO
 # This results in seemingly errors like:
 #   [...]/scripts/gcc-version.sh: line 26: arc-linux-uclibc-gcc: command not found
 # Those can be safely ignored.
+
+# This step is required to have a separate linux headers location for
+# uClibc building. This way uClibc doesn't modify linux headers on installation
+# of "its" headers
+define LINUX_HEADERS_CONFIGURE_CMDS
+	(cd $(@D); \
+		$(TARGET_MAKE_ENV) $(MAKE) \
+			ARCH=$(KERNEL_ARCH) \
+			HOSTCC="$(HOSTCC)" \
+			HOSTCFLAGS="$(HOSTCFLAGS)" \
+			HOSTCXX="$(HOSTCXX)" \
+			headers_install)
+endef
+
 define LINUX_HEADERS_INSTALL_STAGING_CMDS
 	(cd $(@D); \
 		$(TARGET_MAKE_ENV) $(MAKE) \

package/uclibc/uclibc.mk +1 -1

index 717cf53..144f993 100644
@@ -418,7 +418,7 @@ define UCLIBC_SETUP_DOT_CONFIG
 	$(call UCLIBC_OPT_SET,CROSS_COMPILER_PREFIX,"$(TARGET_CROSS)",$(@D))
 	$(call UCLIBC_OPT_SET,TARGET_$(UCLIBC_TARGET_ARCH),y,$(@D))
 	$(call UCLIBC_OPT_SET,TARGET_ARCH,"$(UCLIBC_TARGET_ARCH)",$(@D))
-	$(call UCLIBC_OPT_SET,KERNEL_HEADERS,"$(STAGING_DIR)/usr/include",$(@D))
+	$(call UCLIBC_OPT_SET,KERNEL_HEADERS,"$(LINUX_HEADERS_DIR)/usr/include",$(@D))
 	$(call UCLIBC_OPT_SET,RUNTIME_PREFIX,"/",$(@D))
 	$(call UCLIBC_OPT_SET,DEVEL_PREFIX,"/usr",$(@D))
 	$(call UCLIBC_OPT_SET,SHARED_LIB_LOADER_PREFIX,"/lib",$(@D))

Signature · 1 line

1.9.3

Alexey Brodkin

author

2014-06-10 16:00 UTC #1 lore raw

PATCH 1/1 uclibc: prevent rebuilding after installation to staging

Hi all,

Quoted 35 lines · Alexey Brodkin

Currently we configure uClibc to use kernel headers from "staging" folder with KERNEL_HEADERS="$(STAGING_DIR)/usr/include". This path is added to include search path of uClibc build system in Rules.mak "CFLAGS += -I$(KERNEL_HEADERS)".
At the same time on uClibc installation to "staging" we point to the same location "$(STAGING_DIR)/usr" (headers effectively go in "usr/include").
So after every installation to "staging" dependences get touched (even though we copy the same headers every time) and so we may see lots of sources in uClibc get rebuilt.
This has 2 consequences:
1. Longer build time - becase even on ordinary buildroot build uClibc is built twice. On "uclibc building" and on "uclibc installation to target".
2. Symbols in libuClibc built initially (that is later installed in "staging/sysroot") are situated with different offset compared to second build (later copied in "target"). This happens because as described above only part of sources get rebuilt and then on final linkage object files are linked in different order.
And (2) leads to problems on remote rebugging: gdbserver reports offsets that correspond to pointless assembly in libuClibc on host.
Here's how it looks like.
Before this patch:
$ cd ~/br2_output/i586/target/lib
$ i586-buildroot-linux-uclibc-readelf -s libuClibc-0.9.33.2.so | grep kill
   423: 0000c42c    54 FUNC    GLOBAL DEFAULT    7 kill
$ cd ~/br2_output/i586/staging/lib
$ i586-buildroot-linux-uclibc-readelf -s libuClibc-0.9.33.2.so | grep kill
   423: 0000b518    54 FUNC    GLOBAL DEFAULT    7 kill

Quoted 8 lines

After this patch:

$ cd ~/br2_output/i586/target/lib
$ i586-buildroot-linux-uclibc-readelf -s libuClibc-0.9.33.2.so | grep kill
   423: 0000b518    54 FUNC    GLOBAL DEFAULT    7 kill

$ cd ~/br2_output/i586/staging/lib
$ i586-buildroot-linux-uclibc-readelf -s libuClibc-0.9.33.2.so | grep kill
   423: 0000b518    54 FUNC    GLOBAL DEFAULT    7 kill

Any thoughts on this one?

Regards,
Alexey

Peter Korsgaard

2014-06-10 19:21 UTC #2 lore raw

PATCH 1/1 uclibc: prevent rebuilding after installation to staging

Quoted 1 line

Quoted 1 line
Quoted 1 line
Quoted 1 line
Quoted 1 line
"Alexey" == Alexey Brodkin <[email protected]> writes:

Hi,

Quoted 1 line

Any thoughts on this one?

Sorry, I haven't had time to review it yet. It certainly sounds good. I will get back to you later today or tomorrow.

Signature · 1 line

Bye, Peter Korsgaard

Alexey Brodkin

author

2014-06-16 06:43 UTC #3 lore raw

PATCH 1/1 uclibc: prevent rebuilding after installation to staging

Dear Peter,

Quoted 9 lines · Peter Korsgaard

Quoted 1 line
Quoted 1 line
Quoted 1 line
Quoted 1 line
Quoted 1 line
"Alexey" == Alexey Brodkin <[email protected]> writes:
Hi,
Quoted 1 line
Any thoughts on this one?
Sorry, I haven't had time to review it yet. It certainly sounds good. I will get back to you later today or tomorrow.

Please pardon me for this reminder but I'm wondering if you were able to try this patch?

Regards,
Alexey

Peter Korsgaard

2014-06-16 07:20 UTC #4 lore raw

PATCH 1/1 uclibc: prevent rebuilding after installation to staging

Quoted 4 lines

Quoted 1 line
Quoted 1 line
Quoted 1 line
Quoted 1 line
"Alexey" == Alexey Brodkin <[email protected]> writes:
Dear Peter,

Quoted 8 lines

Quoted 5 lines
Quoted 1 line
Any thoughts on this one?
Sorry, I haven't had time to review it yet. It certainly sounds good. I will get back to you later today or tomorrow.
Please pardon me for this reminder but I'm wondering if you were able to try this patch?

I'm really sorry, but real life got in the way. I'll test it now.

Signature · 1 line

Bye, Peter Korsgaard

Alexey Brodkin

author

2014-06-17 08:27 UTC #5 lore raw

PATCH 1/1 uclibc: prevent rebuilding after installation to staging

Dear Peter,

Quoted 6 lines · Peter Korsgaard

Quoted 6 lines
Quoted 1 line
Quoted 1 line
Quoted 1 line
Quoted 1 line
"Alexey" == Alexey Brodkin <[email protected]> writes:
Dear Peter,
Quoted 2 lines
Quoted 1 line
Any thoughts on this one?

Quoted 8 lines

Quoted 6 lines
Quoted 3 lines
Sorry, I haven't had time to review it yet. It certainly sounds good. I will get back to you later today or tomorrow.
Please pardon me for this reminder but I'm wondering if you were able to try this patch?
I'm really sorry, but real life got in the way. I'll test it now.

I'm wondering if you faced any issues during your testing, may I help you somehow?

Regards,
Alexey

Peter Korsgaard

2014-06-18 11:34 UTC #6 lore raw

PATCH 1/1 uclibc: prevent rebuilding after installation to staging

Quoted 1 line

Quoted 1 line
Quoted 1 line
Quoted 1 line
Quoted 1 line
"Alexey" == Alexey Brodkin <[email protected]> writes:

Hi,

Quoted 7 lines

Quoted 4 lines
Quoted 2 lines
Please pardon me for this reminder but I'm wondering if you were able to try this patch?
I'm really sorry, but real life got in the way. I'll test it now.
I'm wondering if you faced any issues during your testing, may I help you somehow?

Sorry, I didn't got around to check it before now. Looks good, and I have verified that it isn't needed for glibc and musl.

Committed, thanks.

Signature · 1 line

Bye, Peter Korsgaard