From mboxrd@z Thu Jan  1 00:00:00 1970
From: Robin Roevens <robin.roevens@disroot.org>
To: development@lists.ipfire.org
Subject: [PATCH 1/2] buildprocess: Add extra metadata to meta-* files
Date: Fri, 25 Jun 2021 00:50:25 +0200
Message-ID: <20210624225026.15535-2-robin.roevens@disroot.org>
In-Reply-To: <20210624225026.15535-1-robin.roevens@disroot.org>
MIME-Version: 1.0
Content-Type: multipart/mixed; boundary="===============5987690973470646264=="
List-Id: <development.lists.ipfire.org>

--===============5987690973470646264==
Content-Type: text/plain; charset="utf-8"
Content-Transfer-Encoding: quoted-printable

* Add a Summary and Services field to the meta-* addon files.
* Add an INSTALL_INITSCRIPTS macro that takes a space seperated
  list of initscripts to install.
* I kept the original INSTALL_INITSCRIPT as a method to install
  individual initscripts for backwards compatibility and possible corner
  cases.

Signed-off-by: Robin Roevens <robin.roevens(a)disroot.org>
---
 lfs/Config       | 11 ++++++++++-
 src/pakfire/meta |  2 ++
 2 files changed, 12 insertions(+), 1 deletion(-)

diff --git a/lfs/Config b/lfs/Config
index 7d98e303b..5f48b0f33 100644
--- a/lfs/Config
+++ b/lfs/Config
@@ -297,13 +297,16 @@ define PAK
 	# Cleanup
 	rm -rf $(DIR_TMP_PAK)
=20
-	# Create meta file
+	# Escape SUMMARY variable and create meta file
+	summaryEscaped=3D$$(sed 's/[&/\]/\\&/g' <<< "$(SUMMARY)"); \
 	sed \
 		-e "s/NAME/$(PROG)/g" \
+		-e "s/SUMMARY/$$summaryEscaped/g" \
 		-e "s/VER/$(VER)/g" \
 		-e "s/RELEASE/$(PAK_VER)/g" \
 		-e "s/DEPS/$(DEPS)/g" \
 		-e "s/SIZE/$$(stat --format=3D%s /install/packages/$(PROG)-$(VER)-$(PAK_VE=
R).ipfire)/g" \
+		-e "s/SERVICES/$(SERVICES)/g" \
 	  < /usr/src/src/pakfire/meta > /install/packages/meta-$(PROG)
 endef
=20
@@ -311,6 +314,12 @@ define INSTALL_INITSCRIPT
 	install -m 754 -v $(DIR_SRC)/src/initscripts/packages/$(1)  /etc/rc.d/init.=
d/$(1)
 endef
=20
+define INSTALL_INITSCRIPTS
+	for initscript in $(1); do \
+		$(call INSTALL_INITSCRIPT,$$initscript) || exit 1; \
+    done
+endef
+
 ifeq "$(BUILD_ARCH)" "$(filter $(BUILD_ARCH),aarch64 riscv64)"
 define UPDATE_AUTOMAKE
 	for i in $$(find $(DIR_APP) -name config.guess -o -name config.sub); do \
diff --git a/src/pakfire/meta b/src/pakfire/meta
index d97b2a0fa..08e7d53fb 100644
--- a/src/pakfire/meta
+++ b/src/pakfire/meta
@@ -1,6 +1,8 @@
 Name: NAME
+Summary: SUMMARY
 ProgVersion: VER
 Release: RELEASE
 Size: SIZE
 Dependencies: DEPS
 File: NAME-VER-RELEASE.ipfire
+Services: SERVICES
--=20
2.31.1


--=20
Dit bericht is gescanned op virussen en andere gevaarlijke
inhoud door MailScanner en lijkt schoon te zijn.


--===============5987690973470646264==--