Skip to contentSkip to conversation

btrfs-progs: adjust install-static patch to install headers under $(prefix)/include/btrfs

PATCH New Peter Korsgaard 2 participants 4 messages Jul 1, 2018 – Jul 19, 2018

lore
Share & tools
lore

Peter Korsgaard

author
#0 lore raw

PATCH 1/1 btrfs-progs: adjust install-static patch to install headers under $(prefix)/include/btrfs

Fixes:
http://autobuild.buildroot.net/results/15cc6523a42bf66508b2b37fd1fcb74625561ec2/

btrfs-progs 'make install' installs headers under $(prefix)/include/btrfs, but our patch to also install headers for 'install-static' installed directly into $(prefix)/include, confusing other packages as btrfs-progs headers have very common names such as version, sizes.h, list.h, ioctl.h, ..

Fix it by adjusting the patch to also install under $(prefix)/include/btrfs.

Signed-off-by Peter Korsgaard <[email protected]>
---
 .../0001-Makefile-install-static-library-and-headers-in-insta.patch   | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)
package/btrfs-progs/0001-Makefile-install-static-library-and-headers-in-insta.patch +2 -2
index 1cdedfd984..de2db2f16f 100644
@@ -41,8 +41,8 @@ index 67fbc48..d9e34be 100644
  	$(LN_S) -f btrfs.static $(DESTDIR)$(bindir)/btrfsck.static
 +	$(INSTALL) -m755 -d $(DESTDIR)$(libdir)
 +	$(INSTALL) $(libs_static) $(DESTDIR)$(libdir)
-+	$(INSTALL) -m755 -d $(DESTDIR)$(incdir)
-+	$(INSTALL) -m644 $(libbtrfs_headers) $(DESTDIR)$(incdir)
++	$(INSTALL) -m755 -d $(DESTDIR)$(incdir)/btrfs
++	$(INSTALL) -m644 $(libbtrfs_headers) $(DESTDIR)$(incdir)/btrfs
  
  $(INSTALLDIRS):
  	@echo "Making install in $(patsubst install-%,%,$@)"
Signature · 1 line
2.11.0
Applied
#1 lore raw

PATCH 1/1 btrfs-progs: adjust install-static patch to install headers under $(prefix)/include/btrfs

Hello,

Quoted 7 lines · Peter Korsgaard

Fixes:
http://autobuild.buildroot.net/results/15cc6523a42bf66508b2b37fd1fcb74625561ec2/

btrfs-progs 'make install' installs headers under $(prefix)/include/btrfs, but our patch to also install headers for 'install-static' installed directly into $(prefix)/include, confusing other packages as btrfs-progs headers have very common names such as version, sizes.h, list.h, ioctl.h, ..

Wow, nasty stuff indeed with lots of weird consequences.

Applied, thanks!

Thomas

Signature · 3 lines
Thomas Petazzoni, CTO, Bootlin (formerly Free Electrons)
Embedded Linux and Kernel engineering
https://bootlin.com
#2 lore raw

PATCH 1/1 btrfs-progs: adjust install-static patch to install headers under $(prefix)/include/btrfs

In reply to Peter Korsgaard

Hello Peter,

Quoted 11 lines · Peter Korsgaard

Fixes:
http://autobuild.buildroot.net/results/15cc6523a42bf66508b2b37fd1fcb74625561ec2/

btrfs-progs 'make install' installs headers under $(prefix)/include/btrfs, but our patch to also install headers for 'install-static' installed directly into $(prefix)/include, confusing other packages as btrfs-progs headers have very common names such as version, sizes.h, list.h, ioctl.h, ..

Fix it by adjusting the patch to also install under $(prefix)/include/btrfs.

Signed-off-by Peter Korsgaard <[email protected]>

Could you backport this patch to 2018.05.x. Indeed, the version.h installed by btrfs-progs confuses the U-Boot build system, which is the reason for the following build failures:

http://autobuild.buildroot.net/?reason=uboot-tools%&branch=2018.05.x

The problem doesn't seem to exist on 2018.02.x, because back then, the btrfs-progs version was older and was not installing those headers in bogus locations. At least the specific uboot-tools problem cannot be reproduced on 2018.02.x.

Thanks!

Thomas

Signature · 3 lines
Thomas Petazzoni, CTO, Bootlin (formerly Free Electrons)
Embedded Linux and Kernel engineering
https://bootlin.com
author
#3 lore raw

PATCH 1/1 btrfs-progs: adjust install-static patch to install headers under $(prefix)/include/btrfs

Quoted 20 lines
Quoted 1 line
Quoted 1 line
Quoted 1 line
Quoted 1 line

"Thomas" == Thomas Petazzoni <[email protected]> writes:

Hello Peter,

Quoted 11 lines · Peter Korsgaard

Fixes:
http://autobuild.buildroot.net/results/15cc6523a42bf66508b2b37fd1fcb74625561ec2/

btrfs-progs 'make install' installs headers under $(prefix)/include/btrfs, but our patch to also install headers for 'install-static' installed directly into $(prefix)/include, confusing other packages as btrfs-progs headers have very common names such as version, sizes.h, list.h, ioctl.h, ..

Fix it by adjusting the patch to also install under $(prefix)/include/btrfs.

Signed-off-by Peter Korsgaard <[email protected]>

Could you backport this patch to 2018.05.x. Indeed, the version.h installed by btrfs-progs confuses the U-Boot build system, which is the reason for the following build failures:

Quoted 6 lines

http://autobuild.buildroot.net/?reason=uboot-tools%&branch=2018.05.x

The problem doesn't seem to exist on 2018.02.x, because back then, the btrfs-progs version was older and was not installing those headers in bogus locations. At least the specific uboot-tools problem cannot be reproduced on 2018.02.x.

Sure, backported to 2018.05.x. Thanks for the heads up!

Signature · 1 line
Bye, Peter Korsgaard