From patchwork Thu Jun 24 22:50:25 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Robin Roevens X-Patchwork-Id: 4465 Return-Path: Received: from mail01.ipfire.org (mail01.haj.ipfire.org [172.28.1.202]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature ECDSA (P-384) client-signature ECDSA (P-384)) (Client CN "mail01.haj.ipfire.org", Issuer "R3" (verified OK)) by web04.haj.ipfire.org (Postfix) with ESMTPS id 4G9wN22M90z3wYx for ; Thu, 24 Jun 2021 22:50:58 +0000 (UTC) Received: from mail02.haj.ipfire.org (mail02.haj.ipfire.org [172.28.1.201]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature ECDSA (P-384) server-digest SHA384 client-signature ECDSA (P-384) client-digest SHA384) (Client CN "mail02.haj.ipfire.org", Issuer "R3" (verified OK)) by mail01.ipfire.org (Postfix) with ESMTPS id 4G9wN10xFBzjw; Thu, 24 Jun 2021 22:50:57 +0000 (UTC) Received: from mail02.haj.ipfire.org (localhost [127.0.0.1]) by mail02.haj.ipfire.org (Postfix) with ESMTP id 4G9wN03LbNz2xbB; Thu, 24 Jun 2021 22:50:56 +0000 (UTC) Received: from mail01.ipfire.org (mail01.haj.ipfire.org [172.28.1.202]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature ECDSA (P-384) client-signature ECDSA (P-384)) (Client CN "mail01.haj.ipfire.org", Issuer "R3" (verified OK)) by mail02.haj.ipfire.org (Postfix) with ESMTPS id 4G9wMy6FSsz2xb4 for ; Thu, 24 Jun 2021 22:50:54 +0000 (UTC) Received: from knopi.disroot.org (knopi.disroot.org [178.21.23.139]) (using TLSv1.2 with cipher ECDHE-ECDSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mail01.ipfire.org (Postfix) with ESMTPS id 4G9wMx6kJmzHw for ; Thu, 24 Jun 2021 22:50:53 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by disroot.org (Postfix) with ESMTP id A8D905C89A for ; Fri, 25 Jun 2021 00:50:53 +0200 (CEST) X-Virus-Scanned: Debian amavisd-new at disroot.org Received: from knopi.disroot.org ([127.0.0.1]) by localhost (disroot.org [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id HAfZ8z15h6bh for ; Fri, 25 Jun 2021 00:50:52 +0200 (CEST) Received: from amaterasu.sicho.home ([192.168.0.1] helo=chojin.sicho.home) by filekeeper.sicho.home with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.84_2) (envelope-from ) id 1lwYB7-0006Dm-VB; Fri, 25 Jun 2021 00:50:34 +0200 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=disroot.org; s=mail; t=1624575052; bh=bzDIIo+b+/fed4OFHhXuDsRQmeQDTqB0o+wzPmSRtKo=; h=From:To:Cc:Subject:Date:In-Reply-To:References; b=OS3ImGHcx1JzraFemrOeH/b59CttcGf2rX2S9TdobXe61aKvcHwHDC75m6q9PiqiJ MzWkvVjiokpFUrJEmg/aG6AiyXmRXNFsAvDzMDmlIRa/pfgbHJQHDazzU5xPPsRJzC XnyRMaY7g7+o+EN+KZ3yUTYU8Fm8ndrHIRortIZQGGBJ/Q2suUUSsT5UMg8+KhYgp4 7gosZwcqmtEjdTwKUXGsf4mer3txapCQ5jrpkVqp9Lbsol1E3KK8p4sRX4lDoO/lXB gkXLih3bD/uZfk5mQVoDUI21WTNuXSJdt2leUYT0pvK7T2Dnd1Y1mQD+gaaV5RyclX M8FSd5XDXqBpw== From: Robin Roevens 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> References: <20210624225026.15535-1-robin.roevens@disroot.org> Mime-Version: 1.0 X-filekeeper-MailScanner-ID: 1lwYB7-0006Dm-VB X-filekeeper-MailScanner: Found to be clean X-filekeeper-MailScanner-From: robin.roevens@disroot.org X-filekeeper-MailScanner-Watermark: 1625179834.9442@cyZWBpVM5KFeXkxkaGreBQ ARC-Authentication-Results: i=1; mail01.ipfire.org; dkim=pass header.d=disroot.org header.s=mail header.b=OS3ImGHc; dmarc=pass (policy=quarantine) header.from=disroot.org; spf=pass (mail01.ipfire.org: domain of robin.roevens@disroot.org designates 178.21.23.139 as permitted sender) smtp.mailfrom=robin.roevens@disroot.org ARC-Seal: i=1; s=202003rsa; d=lists.ipfire.org; t=1624575053; a=rsa-sha256; cv=none; b=Q7RnOiLqZ4V1YWhIYoQ1kloZSHh06UAV1y0uWp+gwmVzvKw9hlX4gSdkvlMhHFR3lo5viD 48Knryc9n7tfnsM4IyrV87eCk8T2cVL+eDiMyHlOR83m9tw9i1Nf9HRDZu6fPL/Hj9233L pjNNvtcYPfcUkDspB8Rk1U7uFtA29CuXjQZHVF2qMF+Msxb+fhfbsg/VIth8hIx7MqTh4E qxo/oP/ifxlgmS0UG3XRQIK4MwRrsfuIxWan7B+roBCTsr7OgW5cUs5050H4kBLZKu9hG9 YdWvG9/JW/bwgtdr60dmZqx+FDWYrowOwaxHE/SzA9inBOrnCFJD3iGLtMyW2Q== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=lists.ipfire.org; s=202003rsa; t=1624575053; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references:dkim-signature; bh=0WyjrmTM6D2RsFi+AxeB60Tucjx6/IEHagBBh78emeE=; b=KrBKrvn62Xktt8bB9lcpS6k+8PKkEwDXtUCtUSOjRv1gSIVYzeBMIy0MwkNMJ8h01GQt6x 3IUIf7mrDX0zcHqedOJMl1k6Oqq6/dHZJnrCJ+OPXoyhE6QMkanRE7/EW/HYXR7JnLzUyy fqJXNqNHzQeRRcjBKkQ7kjFwJaYLTxxrVDhagnvWyWw4R8B4sE4GuQ/KY07Ws6E0CIyODY kLPqUuN8u4kG3SQYIdc5k4BqiDGRlIhvRoOx+8I3vUgD5+LbXCjAedbFbIrhoO/m1VEwvQ VgbNPghFfW/okUxsd1kMsa4Yb0xRWKiWrXSexooj86a5CiBWwKuyXZrdhCr+YQ== X-Rspamd-Queue-Id: 4G9wMx6kJmzHw Authentication-Results: mail01.ipfire.org; dkim=pass header.d=disroot.org header.s=mail header.b=OS3ImGHc; dmarc=pass (policy=quarantine) header.from=disroot.org; spf=pass (mail01.ipfire.org: domain of robin.roevens@disroot.org designates 178.21.23.139 as permitted sender) smtp.mailfrom=robin.roevens@disroot.org X-Rspamd-Server: mail01.haj.ipfire.org X-Spamd-Result: default: False [1.48 / 11.00]; ARC_NA(0.00)[]; R_DKIM_ALLOW(-0.20)[disroot.org:s=mail]; FROM_HAS_DN(0.00)[]; TO_DN_SOME(0.00)[]; R_SPF_ALLOW(-0.20)[+a:c]; MV_CASE(0.50)[]; MIME_GOOD(-0.10)[text/plain]; PREVIOUSLY_DELIVERED(0.00)[development@lists.ipfire.org]; BROKEN_CONTENT_TYPE(1.50)[]; R_MISSING_CHARSET(2.50)[]; RCVD_COUNT_THREE(0.00)[4]; TO_MATCH_ENVRCPT_SOME(0.00)[]; IP_REPUTATION_HAM(-0.01)[asn: 50673(0.00), country: NL(-0.01), ip: 178.21.23.139(0.00)]; DKIM_TRACE(0.00)[disroot.org:+]; RCPT_COUNT_TWO(0.00)[2]; MID_CONTAINS_FROM(1.00)[]; MX_GOOD(-0.01)[]; DMARC_POLICY_ALLOW(-0.50)[disroot.org,quarantine]; ARC_SIGNED(0.00)[lists.ipfire.org:s=202003rsa:i=1]; FROM_EQ_ENVFROM(0.00)[]; MIME_TRACE(0.00)[0:+]; RCVD_TLS_LAST(0.00)[]; ASN(0.00)[asn:50673, ipnet:178.21.23.0/24, country:NL]; BAYES_HAM(-3.00)[99.99%] X-BeenThere: development@lists.ipfire.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: IPFire development talk List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: development-bounces@lists.ipfire.org Sender: "Development" * 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 --- 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) - # Create meta file + # Escape SUMMARY variable and create meta file + summaryEscaped=$$(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=%s /install/packages/$(PROG)-$(VER)-$(PAK_VER).ipfire)/g" \ + -e "s/SERVICES/$(SERVICES)/g" \ < /usr/src/src/pakfire/meta > /install/packages/meta-$(PROG) endef @@ -311,6 +314,12 @@ define INSTALL_INITSCRIPT install -m 754 -v $(DIR_SRC)/src/initscripts/packages/$(1) /etc/rc.d/init.d/$(1) endef +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