[ptxdist] [PATCH] glslang: add back libglslang-default-resource-limits

[Philipp Zabel]

Adapt to glslang commit 3787b6947f9a ('Revert "CMake: Make
glslang-default-resource-limits STATIC"') by adding back installation
of libglslang-default-resource-limits.

Fixes: 57dc2cb97395 ("glslang: version bump 1.3.261.1 -> 1.3.268.0")
Signed-off-by: Philipp Zabel 
---
 rules/glslang.make | 1 +
 1 file changed, 1 insertion(+)

diff --git a/rules/glslang.make b/rules/glslang.make
index 37be0c18db9f..b6abb65d307e 100644
--- a/rules/glslang.make
+++ b/rules/glslang.make
@@ -65,6 +65,7 @@ ifdef PTXCONF_GLSLANG_TOOLS
 endif
 
 ifdef PTXCONF_GLSLANG_LIBS
+   @$(call install_lib, glslang, 0, 0, 0644, 
libglslang-default-resource-limits)
@$(call install_lib, glslang, 0, 0, 0644, libglslang)
@$(call install_lib, glslang, 0, 0, 0644, libSPIRV)
@$(call install_lib, glslang, 0, 0, 0644, libSPVRemapper)
-- 
2.39.2

[ptxdist] [PATCH] image-rauc: pick up hook script if it exists

[Roland Hieber]

Look for a hook script in any config/images/rauc-hooks.sh in the usual
search locations, and if one is found, package it into the RAUC bundle
and reference it in the manifest. Otherwise leave the [hooks] section
in the manifest empty.

As hooks that should be called by RAUC need to be mentioned in the
manifest too (in the relevant slot or the [bundle] section), the image
config will still need to be forked by BSPs in order to adapt the
manifest for that use case. However, the mechanism to find the hook
script is then already in place, and can be used as-is.

Signed-off-by: Roland Hieber 
---
 config/images/rauc.config |  4 
 platforms/image-rauc.in   |  4 
 rules/image-rauc.make | 15 +++
 3 files changed, 23 insertions(+)

diff --git a/config/images/rauc.config b/config/images/rauc.config
index e4169cc8cd95..4a6b34deee29 100644
--- a/config/images/rauc.config
+++ b/config/images/rauc.config
@@ -1,6 +1,7 @@
 image @IMAGE@ {
rauc {
file root.tar.gz { image = "root.tgz" }
+   @RAUC_HOOK_FILE@
manifest = "
[update]
compatible=@RAUC_BUNDLE_COMPATIBLE@
@@ -11,6 +12,9 @@ image @IMAGE@ {
[bundle]
format=@RAUC_BUNDLE_FORMAT@
 
+   [hooks]
+   @RAUC_HOOK_MANIFEST@
+
[image.rootfs]
filename=root.tar.gz
"
diff --git a/platforms/image-rauc.in b/platforms/image-rauc.in
index 391956a42f81..2850045c313e 100644
--- a/platforms/image-rauc.in
+++ b/platforms/image-rauc.in
@@ -17,6 +17,10 @@ menuconfig IMAGE_RAUC
  To customize the bundle, copy and adapt the genimage configuration
  in configs/images/rauc.config.
 
+ If you create a file config/images/rauc-hooks.sh in any PTXDIST_PATH
+ component, it will be included in the bundle and declared as a hook
+ script in the manifest.
+
 if IMAGE_RAUC
 
 config IMAGE_RAUC_DESCRIPTION
diff --git a/rules/image-rauc.make b/rules/image-rauc.make
index 23d8d83b5251..860f69834687 100644
--- a/rules/image-rauc.make
+++ b/rules/image-rauc.make
@@ -19,6 +19,10 @@ IMAGE_RAUC   := image-rauc
 IMAGE_RAUC_DIR := $(BUILDDIR)/$(IMAGE_RAUC)
 IMAGE_RAUC_IMAGE   := $(IMAGEDIR)/update.raucb
 IMAGE_RAUC_CONFIG  := rauc.config
+IMAGE_RAUC_HOOK_SCRIPT := $(call ptx/in-path, PTXDIST_PATH, 
config/images/rauc-hooks.sh)
+
+$(call ptx/cfghash, IMAGE_RAUC, $(IMAGE_RAUC_HOOK_SCRIPT))
+$(call ptx/cfghash-file, IMAGE_RAUC, $(IMAGE_RAUC_HOOK_SCRIPT))
 
 # 
 # Image
@@ -36,6 +40,16 @@ ifdef PTXCONF_IMAGE_RAUC_BUNDLE_FORMAT_CRYPT
 IMAGE_RAUC_BUNDLE_FORMAT := "crypt"
 endif
 
+ifneq ($(IMAGE_RAUC_HOOK_SCRIPT),)
+IMAGE_RAUC_ENV_HOOK = \
+   RAUC_HOOK_FILE="file hooks.sh { image = \\"$(IMAGE_RAUC_HOOK_SCRIPT)\\" 
}" \
+   RAUC_HOOK_MANIFEST="filename=hooks.sh"
+else
+IMAGE_RAUC_ENV_HOOK = \
+   RAUC_HOOK_FILE="" \
+   RAUC_HOOK_MANIFEST=""
+endif
+
 IMAGE_RAUC_ENV = \
$(CODE_SIGNING_ENV) \
RAUC_BUNDLE_COMPATIBLE="$(call 
remove_quotes,$(PTXCONF_RAUC_COMPATIBLE))" \
@@ -43,6 +57,7 @@ IMAGE_RAUC_ENV= \
RAUC_BUNDLE_VERSION="$(call remove_quotes, 
$(PTXCONF_RAUC_BUNDLE_VERSION))" \
RAUC_BUNDLE_BUILD=$(call ptx/sh, date +%FT%T%z) \
RAUC_BUNDLE_DESCRIPTION=$(PTXCONF_IMAGE_RAUC_DESCRIPTION) \
+   $(IMAGE_RAUC_ENV_HOOK) \
RAUC_KEY="$(shell cs_get_uri update)" \
RAUC_CERT="$(shell cs_get_uri update)" \
RAUC_KEYRING="$(shell cs_get_ca update)" \
-- 
2.39.2