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

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

[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 <peter@korsgaard.com>
---
 .../0001-Makefile-install-static-library-and-headers-in-insta.patch   | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/package/btrfs-progs/0001-Makefile-install-static-library-and-headers-in-insta.patch b/package/btrfs-progs/0001-Makefile-install-static-library-and-headers-in-insta.patch
index 1cdedfd984..de2db2f16f 100644
--- a/package/btrfs-progs/0001-Makefile-install-static-library-and-headers-in-insta.patch
+++ b/package/btrfs-progs/0001-Makefile-install-static-library-and-headers-in-insta.patch
@@ -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-%,%,$@)"
-- 
2.11.0

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

[Thomas Petazzoni]

Hello,

On Sun,  1 Jul 2018 20:34:08 +0200, Peter Korsgaard wrote:
> 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
-- 
Thomas Petazzoni, CTO, Bootlin (formerly Free Electrons)
Embedded Linux and Kernel engineering
https://bootlin.com

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

[Thomas Petazzoni]

Hello Peter,

On Sun,  1 Jul 2018 20:34:08 +0200, Peter Korsgaard wrote:
> 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 <peter@korsgaard.com>

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
-- 
Thomas Petazzoni, CTO, Bootlin (formerly Free Electrons)
Embedded Linux and Kernel engineering
https://bootlin.com

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

[Peter Korsgaard]

>>>>> "Thomas" == Thomas Petazzoni <thomas.petazzoni@bootlin.com> writes:

 > Hello Peter,
 > On Sun,  1 Jul 2018 20:34:08 +0200, Peter Korsgaard wrote:
 >> 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 <peter@korsgaard.com>

 > 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.

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

-- 
Bye, Peter Korsgaard