Răsfoiți Sursa

package/gcnano-binaries: bump version to 6.4.13

Update to the latest version of the gcnano-binaries blobs, which are
compatible with the last v6.1-stm32mp-r1 kernel from the
STMicroelectronics BSP.

The location of the driver has changed it is now in the
gcnano-driver-stm32mp directory instead of an archive.

The VERSION and PREFIX temporary variable in pkgconfig file came back
therefore the sed replacement also came back.

The EULA license file has changed due to copyright year update, so its
hash has changed.

Signed-off-by: Kory Maincent <kory.maincent@bootlin.com>
Signed-off-by: Thomas Petazzoni <thomas.petazzoni@bootlin.com>
Kory Maincent 1 an în urmă
părinte
comite
001986db10

+ 2 - 2
package/gcnano-binaries/gcnano-binaries.hash

@@ -1,3 +1,3 @@
 # Locally calculated
 # Locally calculated
-sha256  b122a0cd7a1bd2cee8c6117b259ef977a765d24e48655f639694cbef471da99b  gcnano-binaries-0ac1a89d7a59d040a69745a85f0da7e98644cc4b.tar.gz
-sha256  7d209718473d18f69f75adb7caf9cb5d4b0a31da068756aa011bea617de3dc57  EULA
+sha256  8bb1f6ee633f3c30e16b33ff6913286edf31f77b69105a14d147509beba3ea94  gcnano-binaries-5d02efd5cb4cfa85307633891f3cf87550a8bc1d.tar.gz
+sha256  29c78804b097b5cfee0e802bef9f60348a635640eadd8a91b7ce82ddf17fbf5a  EULA

+ 11 - 7
package/gcnano-binaries/gcnano-binaries.mk

@@ -4,10 +4,10 @@
 #
 #
 ################################################################################
 ################################################################################
 
 
-GCNANO_BINARIES_LIB_VERSION = 6.4.9
+GCNANO_BINARIES_LIB_VERSION = 6.4.13
 GCNANO_BINARIES_DRIVER_VERSION = $(GCNANO_BINARIES_LIB_VERSION)
 GCNANO_BINARIES_DRIVER_VERSION = $(GCNANO_BINARIES_LIB_VERSION)
-GCNANO_BINARIES_USERLAND_VERSION = $(GCNANO_BINARIES_LIB_VERSION)-20221206
-GCNANO_BINARIES_VERSION = 0ac1a89d7a59d040a69745a85f0da7e98644cc4b
+GCNANO_BINARIES_USERLAND_VERSION = $(GCNANO_BINARIES_LIB_VERSION)-20230517
+GCNANO_BINARIES_VERSION = 5d02efd5cb4cfa85307633891f3cf87550a8bc1d
 GCNANO_BINARIES_SITE = $(call github,STMicroelectronics,gcnano-binaries,$(GCNANO_BINARIES_VERSION))
 GCNANO_BINARIES_SITE = $(call github,STMicroelectronics,gcnano-binaries,$(GCNANO_BINARIES_VERSION))
 
 
 GCNANO_BINARIES_LICENSE = MIT, Vivante End User Software License Terms
 GCNANO_BINARIES_LICENSE = MIT, Vivante End User Software License Terms
@@ -25,7 +25,6 @@ GCNANO_BINARIES_PROVIDES = libegl libgles libgbm
 # self-extractible binary for the user-space parts. So we extract both
 # self-extractible binary for the user-space parts. So we extract both
 # below, and also extract the EULA text from the self-extractible binary
 # below, and also extract the EULA text from the self-extractible binary
 define GCNANO_BINARIES_EXTRACT_HELPER
 define GCNANO_BINARIES_EXTRACT_HELPER
-	tar --strip-components=1 -xJf $(@D)/gcnano-driver-$(GCNANO_BINARIES_DRIVER_VERSION).tar.xz -C $(@D)
 	awk 'BEGIN      { start = 0; } \
 	awk 'BEGIN      { start = 0; } \
 		/^EOEULA/  { start = 0; } \
 		/^EOEULA/  { start = 0; } \
 			{ if (start) print; } \
 			{ if (start) print; } \
@@ -36,10 +35,12 @@ endef
 
 
 GCNANO_BINARIES_POST_EXTRACT_HOOKS += GCNANO_BINARIES_EXTRACT_HELPER
 GCNANO_BINARIES_POST_EXTRACT_HOOKS += GCNANO_BINARIES_EXTRACT_HELPER
 
 
+GCNANO_BINARIES_MODULE_SUBDIRS = gcnano-driver-stm32mp
+
 GCNANO_BINARIES_MODULE_MAKE_OPTS = \
 GCNANO_BINARIES_MODULE_MAKE_OPTS = \
 	KERNEL_DIR=$(LINUX_DIR) \
 	KERNEL_DIR=$(LINUX_DIR) \
 	SOC_PLATFORM=st-mp1 \
 	SOC_PLATFORM=st-mp1 \
-	AQROOT=$(@D) \
+	AQROOT=$(@D)/gcnano-driver-stm32mp \
 	DEBUG=0
 	DEBUG=0
 
 
 GCNANO_BINARIES_USERLAND_SUBDIR = gcnano-userland-multi-$(GCNANO_BINARIES_USERLAND_VERSION)
 GCNANO_BINARIES_USERLAND_SUBDIR = gcnano-userland-multi-$(GCNANO_BINARIES_USERLAND_VERSION)
@@ -55,8 +56,11 @@ define GCNANO_BINARIES_INSTALL
 	done
 	done
 	mkdir -p $(1)/usr/include
 	mkdir -p $(1)/usr/include
 	cp -a $(@D)/$(GCNANO_BINARIES_USERLAND_SUBDIR)/release/include/* $(1)/usr/include/
 	cp -a $(@D)/$(GCNANO_BINARIES_USERLAND_SUBDIR)/release/include/* $(1)/usr/include/
-	mkdir -p $(1)/usr/lib/pkgconfig/
-	cp -a $(@D)/$(GCNANO_BINARIES_USERLAND_SUBDIR)/pkgconfig/*  $(1)/usr/lib/pkgconfig/
+	cd $(@D)/$(GCNANO_BINARIES_USERLAND_SUBDIR)/pkgconfig/ ; \
+	for file in *.pc ; do \
+		sed -e "s|#PREFIX#|/usr|" -e "s|#VERSION#|22.0.3|" $$file > $$file.temp ; \
+		$(INSTALL) -D -m 0644 $$file.temp $(1)/usr/lib/pkgconfig/$$file ; \
+	done
 endef
 endef
 
 
 define GCNANO_BINARIES_INSTALL_TARGET_CMDS
 define GCNANO_BINARIES_INSTALL_TARGET_CMDS