* [Buildroot] [PATCH] package/gcnano-binaries: bump version to 4.3.7
@ 2022-06-08 13:29 Kory Maincent via buildroot
2022-06-08 13:35 ` Thomas Petazzoni via buildroot
0 siblings, 1 reply; 4+ messages in thread
From: Kory Maincent via buildroot @ 2022-06-08 13:29 UTC (permalink / raw)
To: buildroot; +Cc: Kory Maincent, scooby22, thomas.petazzoni
From: Kory Maincent <kory.maincent@bootlin.com>
Update to the latest version of the gcnano-binaries blobs, which are
compatible with the soon-to-be-released 5.15 kernel from the
STMicroelectronics BSP.
As we are installing all the libraries and the pkgconfig files we do not
need to list them anymore. Therefore this patch removes
GCNANO_BINARIES_LIBRARIES and GCNANO_BINARIES_PKG_CONFIGS variables.
It also updates the installation command to follow the path and naming
of the new version and the pkgconfig files to fill the prefix variable with
the right value.
The new version of gcnano has gbm.h header installed in a gbm folder,
this break the build of other packages. The patch fixes it with a simple
link.
Signed-off-by: Kory Maincent <kory.maincent@bootlin.com>
---
package/gcnano-binaries/gcnano-binaries.hash | 2 +-
package/gcnano-binaries/gcnano-binaries.mk | 37 ++++++++------------
2 files changed, 16 insertions(+), 23 deletions(-)
diff --git a/package/gcnano-binaries/gcnano-binaries.hash b/package/gcnano-binaries/gcnano-binaries.hash
index d4ad96672a..1ed66e3753 100644
--- a/package/gcnano-binaries/gcnano-binaries.hash
+++ b/package/gcnano-binaries/gcnano-binaries.hash
@@ -1,3 +1,3 @@
# Locally calculated
-sha256 32d91d6ce6e6551cb7ad0eee4698041fdeb10a4f216e6564adb06408476edc38 gcnano-binaries-969d11518529bb70a132909b02ddcc5736c92d91.tar.gz
+sha256 d3aebbc87ca27e743fdd21d71025cdf0761af748907bbdd7b193262eb48ab3c7 gcnano-binaries-a20611434ef048d3d0c04f55b6cd7d75a2156d43.tar.gz
sha256 7d209718473d18f69f75adb7caf9cb5d4b0a31da068756aa011bea617de3dc57 EULA
diff --git a/package/gcnano-binaries/gcnano-binaries.mk b/package/gcnano-binaries/gcnano-binaries.mk
index affe0a6063..4814db10c9 100644
--- a/package/gcnano-binaries/gcnano-binaries.mk
+++ b/package/gcnano-binaries/gcnano-binaries.mk
@@ -4,12 +4,10 @@
#
################################################################################
-GCNANO_BINARIES_LIB_VERSION = 6.4
-GCNANO_BINARIES_LIB_REVISION = 3
-GCNANO_BINARIES_LIB_FULL_VERSION = $(GCNANO_BINARIES_LIB_VERSION).$(GCNANO_BINARIES_LIB_REVISION)
-GCNANO_BINARIES_DRIVER_VERSION = $(GCNANO_BINARIES_LIB_FULL_VERSION)
-GCNANO_BINARIES_USERLAND_VERSION = $(GCNANO_BINARIES_LIB_FULL_VERSION)-20210726
-GCNANO_BINARIES_VERSION = 969d11518529bb70a132909b02ddcc5736c92d91
+GCNANO_BINARIES_LIB_VERSION = 6.4.7
+GCNANO_BINARIES_DRIVER_VERSION = $(GCNANO_BINARIES_LIB_VERSION)
+GCNANO_BINARIES_USERLAND_VERSION = $(GCNANO_BINARIES_LIB_VERSION)-20220524
+GCNANO_BINARIES_VERSION = a20611434ef048d3d0c04f55b6cd7d75a2156d43
GCNANO_BINARIES_SITE = $(call github,STMicroelectronics,gcnano-binaries,$(GCNANO_BINARIES_VERSION))
GCNANO_BINARIES_LICENSE = MIT, Vivante End User Software License Terms
@@ -44,26 +42,21 @@ GCNANO_BINARIES_MODULE_MAKE_OPTS = \
AQROOT=$(@D) \
DEBUG=0
-GCNANO_BINARIES_LIBRARIES = \
- libgbm_viv libEGL libGAL libgbm libGLESv1_CM \
- libGLESv2 libGLSLC libOpenVG libVSC
-
GCNANO_BINARIES_USERLAND_SUBDIR = gcnano-userland-multi-$(GCNANO_BINARIES_USERLAND_VERSION)
-GCNANO_BINARIES_PKG_CONFIGS = egl gbm glesv1_cm glesv2 vg
-
define GCNANO_BINARIES_INSTALL
- $(foreach lib,$(GCNANO_BINARIES_LIBRARIES), \
- $(INSTALL) -D -m 0755 $(@D)/$(GCNANO_BINARIES_USERLAND_SUBDIR)/usr/lib/$(lib).$(GCNANO_BINARIES_LIB_VERSION).multi.release.so \
- $(1)/usr/lib/$(lib).$(GCNANO_BINARIES_LIB_VERSION).multi.release.so ; \
- cp -a $(@D)/$(GCNANO_BINARIES_USERLAND_SUBDIR)/usr/lib/$(lib).so* $(1)/usr/lib
- )
+ cd $(@D)/$(GCNANO_BINARIES_USERLAND_SUBDIR)/release/drivers/ ; \
+ find . -type f -exec $(INSTALL) -D -m 0755 {} $(1)/usr/lib/{} \; ; \
+ find . -type l -exec cp -a {} $(1)/usr/lib \; ; \
mkdir -p $(1)/usr/include
- cp -a $(@D)/$(GCNANO_BINARIES_USERLAND_SUBDIR)/usr/include/* $(1)/usr/include/
- $(foreach pkgconfig,$(GCNANO_BINARIES_PKG_CONFIGS), \
- $(INSTALL) -D -m 0644 $(@D)/$(GCNANO_BINARIES_USERLAND_SUBDIR)/usr/lib/pkgconfig/$(pkgconfig).pc \
- $(1)/usr/lib/pkgconfig/$(pkgconfig).pc
- )
+ cp -a $(@D)/$(GCNANO_BINARIES_USERLAND_SUBDIR)/release/include/* $(1)/usr/include/
+ ln -s gbm/gbm.h $(1)/usr/include/gbm.h
+ cd $(@D)/$(GCNANO_BINARIES_USERLAND_SUBDIR)/pkgconfig/ ; \
+ for file in * ; do \
+ sed -e "s|#PREFIX#|/usr|" $$file > $$file.temp ; \
+ $(INSTALL) -D -m 0644 $$file.temp $(1)/usr/lib/pkgconfig/$$file ; \
+ rm $$file.temp ; \
+ done
endef
define GCNANO_BINARIES_INSTALL_TARGET_CMDS
--
2.25.1
_______________________________________________
buildroot mailing list
buildroot@buildroot.org
https://lists.buildroot.org/mailman/listinfo/buildroot
^ permalink raw reply related [flat|nested] 4+ messages in thread* Re: [Buildroot] [PATCH] package/gcnano-binaries: bump version to 4.3.7
2022-06-08 13:29 [Buildroot] [PATCH] package/gcnano-binaries: bump version to 4.3.7 Kory Maincent via buildroot
@ 2022-06-08 13:35 ` Thomas Petazzoni via buildroot
2022-06-08 13:46 ` Köry Maincent via buildroot
0 siblings, 1 reply; 4+ messages in thread
From: Thomas Petazzoni via buildroot @ 2022-06-08 13:35 UTC (permalink / raw)
To: kory.maincent; +Cc: scooby22, buildroot
Hello,
Commit title has an issue, you're bumping to 6.4.7
On Wed, 8 Jun 2022 15:29:57 +0200
kory.maincent@bootlin.com wrote:
> -GCNANO_BINARIES_LIBRARIES = \
> - libgbm_viv libEGL libGAL libgbm libGLESv1_CM \
> - libGLESv2 libGLSLC libOpenVG libVSC
> -
> GCNANO_BINARIES_USERLAND_SUBDIR = gcnano-userland-multi-$(GCNANO_BINARIES_USERLAND_VERSION)
>
> -GCNANO_BINARIES_PKG_CONFIGS = egl gbm glesv1_cm glesv2 vg
> -
> define GCNANO_BINARIES_INSTALL
> - $(foreach lib,$(GCNANO_BINARIES_LIBRARIES), \
> - $(INSTALL) -D -m 0755 $(@D)/$(GCNANO_BINARIES_USERLAND_SUBDIR)/usr/lib/$(lib).$(GCNANO_BINARIES_LIB_VERSION).multi.release.so \
> - $(1)/usr/lib/$(lib).$(GCNANO_BINARIES_LIB_VERSION).multi.release.so ; \
> - cp -a $(@D)/$(GCNANO_BINARIES_USERLAND_SUBDIR)/usr/lib/$(lib).so* $(1)/usr/lib
> - )
> + cd $(@D)/$(GCNANO_BINARIES_USERLAND_SUBDIR)/release/drivers/ ; \
> + find . -type f -exec $(INSTALL) -D -m 0755 {} $(1)/usr/lib/{} \; ; \
> + find . -type l -exec cp -a {} $(1)/usr/lib \; ; \
The ; \ at the end is not needed, it is the last line of the command.
> + cp -a $(@D)/$(GCNANO_BINARIES_USERLAND_SUBDIR)/release/include/* $(1)/usr/include/
> + ln -s gbm/gbm.h $(1)/usr/include/gbm.h
> + cd $(@D)/$(GCNANO_BINARIES_USERLAND_SUBDIR)/pkgconfig/ ; \
> + for file in * ; do \
> + sed -e "s|#PREFIX#|/usr|" $$file > $$file.temp ; \
> + $(INSTALL) -D -m 0644 $$file.temp $(1)/usr/lib/pkgconfig/$$file ; \
> + rm $$file.temp ; \
I'd say you can leave the $$file.tmp around in the build directory, it
will not cause any problem.
Thomas
--
Thomas Petazzoni, co-owner and CEO, Bootlin
Embedded Linux and Kernel engineering and training
https://bootlin.com
_______________________________________________
buildroot mailing list
buildroot@buildroot.org
https://lists.buildroot.org/mailman/listinfo/buildroot
^ permalink raw reply [flat|nested] 4+ messages in thread* Re: [Buildroot] [PATCH] package/gcnano-binaries: bump version to 4.3.7
2022-06-08 13:35 ` Thomas Petazzoni via buildroot
@ 2022-06-08 13:46 ` Köry Maincent via buildroot
2022-06-08 14:34 ` Thomas Petazzoni via buildroot
0 siblings, 1 reply; 4+ messages in thread
From: Köry Maincent via buildroot @ 2022-06-08 13:46 UTC (permalink / raw)
To: Thomas Petazzoni; +Cc: scooby22, buildroot
Hello Thomas
On Wed, 8 Jun 2022 15:35:11 +0200
Thomas Petazzoni <thomas.petazzoni@bootlin.com> wrote:
> Hello,
>
> Commit title has an issue, you're bumping to 6.4.7
Doh, you are right, I don't know how my brain did this.
>
> On Wed, 8 Jun 2022 15:29:57 +0200
> kory.maincent@bootlin.com wrote:
>
> > -GCNANO_BINARIES_LIBRARIES = \
> > - libgbm_viv libEGL libGAL libgbm libGLESv1_CM \
> > - libGLESv2 libGLSLC libOpenVG libVSC
> > -
> > GCNANO_BINARIES_USERLAND_SUBDIR =
> > gcnano-userland-multi-$(GCNANO_BINARIES_USERLAND_VERSION)
> > -GCNANO_BINARIES_PKG_CONFIGS = egl gbm glesv1_cm glesv2 vg
> > -
> > define GCNANO_BINARIES_INSTALL
> > - $(foreach lib,$(GCNANO_BINARIES_LIBRARIES), \
> > - $(INSTALL) -D -m 0755
> > $(@D)/$(GCNANO_BINARIES_USERLAND_SUBDIR)/usr/lib/$(lib).$(GCNANO_BINARIES_LIB_VERSION).multi.release.so
> > \
> > -
> > $(1)/usr/lib/$(lib).$(GCNANO_BINARIES_LIB_VERSION).multi.release.so ; \
> > - cp -a
> > $(@D)/$(GCNANO_BINARIES_USERLAND_SUBDIR)/usr/lib/$(lib).so* $(1)/usr/lib
> > - )
> > + cd $(@D)/$(GCNANO_BINARIES_USERLAND_SUBDIR)/release/drivers/ ; \
> > + find . -type f -exec $(INSTALL) -D -m 0755 {} $(1)/usr/lib/{} \; ;
> > \
> > + find . -type l -exec cp -a {} $(1)/usr/lib \; ; \
>
> The ; \ at the end is not needed, it is the last line of the command.
Yes indeed.
>
> > + cp -a $(@D)/$(GCNANO_BINARIES_USERLAND_SUBDIR)/release/include/*
> > $(1)/usr/include/
> > + ln -s gbm/gbm.h $(1)/usr/include/gbm.h
> > + cd $(@D)/$(GCNANO_BINARIES_USERLAND_SUBDIR)/pkgconfig/ ; \
> > + for file in * ; do \
> > + sed -e "s|#PREFIX#|/usr|" $$file > $$file.temp ; \
> > + $(INSTALL) -D -m 0644 $$file.temp
> > $(1)/usr/lib/pkgconfig/$$file ; \
> > + rm $$file.temp ; \
>
> I'd say you can leave the $$file.tmp around in the build directory, it
> will not cause any problem.
It does, in the case we call the reinstall task, these temp files will be added
to the for loop.
Köry
_______________________________________________
buildroot mailing list
buildroot@buildroot.org
https://lists.buildroot.org/mailman/listinfo/buildroot
^ permalink raw reply [flat|nested] 4+ messages in thread* Re: [Buildroot] [PATCH] package/gcnano-binaries: bump version to 4.3.7
2022-06-08 13:46 ` Köry Maincent via buildroot
@ 2022-06-08 14:34 ` Thomas Petazzoni via buildroot
0 siblings, 0 replies; 4+ messages in thread
From: Thomas Petazzoni via buildroot @ 2022-06-08 14:34 UTC (permalink / raw)
To: Köry Maincent; +Cc: scooby22, buildroot
On Wed, 8 Jun 2022 15:46:09 +0200
Köry Maincent <kory.maincent@bootlin.com> wrote:
> > > + cp -a $(@D)/$(GCNANO_BINARIES_USERLAND_SUBDIR)/release/include/*
> > > $(1)/usr/include/
> > > + ln -s gbm/gbm.h $(1)/usr/include/gbm.h
> > > + cd $(@D)/$(GCNANO_BINARIES_USERLAND_SUBDIR)/pkgconfig/ ; \
> > > + for file in * ; do \
> > > + sed -e "s|#PREFIX#|/usr|" $$file > $$file.temp ; \
> > > + $(INSTALL) -D -m 0644 $$file.temp
> > > $(1)/usr/lib/pkgconfig/$$file ; \
> > > + rm $$file.temp ; \
> >
> > I'd say you can leave the $$file.tmp around in the build directory, it
> > will not cause any problem.
>
> It does, in the case we call the reinstall task, these temp files will be added
> to the for loop.
Change the for loop to:
for file in *.pc; do
and problem solved.
Thomas
--
Thomas Petazzoni, co-owner and CEO, Bootlin
Embedded Linux and Kernel engineering and training
https://bootlin.com
_______________________________________________
buildroot mailing list
buildroot@buildroot.org
https://lists.buildroot.org/mailman/listinfo/buildroot
^ permalink raw reply [flat|nested] 4+ messages in thread
end of thread, other threads:[~2022-06-08 14:34 UTC | newest]
Thread overview: 4+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2022-06-08 13:29 [Buildroot] [PATCH] package/gcnano-binaries: bump version to 4.3.7 Kory Maincent via buildroot
2022-06-08 13:35 ` Thomas Petazzoni via buildroot
2022-06-08 13:46 ` Köry Maincent via buildroot
2022-06-08 14:34 ` Thomas Petazzoni via buildroot
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.