From patchwork Fri Apr 23 16:15:32 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Robin Roevens X-Patchwork-Id: 4208 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 4FRfYM5HRFz44R4 for ; Fri, 23 Apr 2021 16:16:23 +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) client-signature ECDSA (P-384)) (Client CN "mail02.haj.ipfire.org", Issuer "R3" (verified OK)) by mail01.ipfire.org (Postfix) with ESMTPS id 4FRfYL189jzBZ; Fri, 23 Apr 2021 16:16:22 +0000 (UTC) Received: from mail02.haj.ipfire.org (localhost [127.0.0.1]) by mail02.haj.ipfire.org (Postfix) with ESMTP id 4FRfYL0QDdz2y0r; Fri, 23 Apr 2021 16:16:22 +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 4FRfYK4SlZz2xLb for ; Fri, 23 Apr 2021 16:16:21 +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 4FRfYF08T8z5Z for ; Fri, 23 Apr 2021 16:16:17 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by disroot.org (Postfix) with ESMTP id 734DC5300E for ; Fri, 23 Apr 2021 18:16:16 +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 yAT-mxN7LEd2 for ; Fri, 23 Apr 2021 18:16:15 +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 1lZyTC-0007uY-2I; Fri, 23 Apr 2021 18:15:54 +0200 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=disroot.org; s=mail; t=1619194574; bh=Pq+92x3fOW1VWc7+jpcyzHSGtbW2oDi1uGeRyoJ3vJw=; h=From:To:Cc:Subject:Date:In-Reply-To:References; b=K8STPvssntjWTSqM0YBHtkWglueyUy7+Y433HgJ4rt7ouGS/asDCK9usVmhTwh16r MgXAzh+5JiUqmA8IKDqdwOboauNSOsPFGJx8XVsJ07xGWKpMLTF02yDjbXHtSFOuaN 6ESdw25Nx35lM7VwB+EIt4CzGcPrvP4u4n8i1A7qifqnd9AUHMFfeFHfmdHEnENOjA dQa8RyBZ2wx4jbDcMkh1pbeYAkG1LYZ00v/eRhoej9px+ozWlu7xYuIyrick2D9rP4 GfrkQ5QmSyt9EhKAGeA+eB5pzlrtI0zADP1zJJAzY18F/ZvYAG1NH27J9oss0YYtk6 ddtwTO8QLzOLg== From: Robin Roevens To: development@lists.ipfire.org Subject: [PATCH 1/3] buildprocess: Add extra metadata to meta-* files Date: Fri, 23 Apr 2021 18:15:32 +0200 Message-Id: <20210423161534.32738-2-robin.roevens@disroot.org> In-Reply-To: <20210423161534.32738-1-robin.roevens@disroot.org> References: <20210423161534.32738-1-robin.roevens@disroot.org> Mime-Version: 1.0 X-filekeeper-MailScanner-ID: 1lZyTC-0007uY-2I X-filekeeper-MailScanner: Found to be clean X-filekeeper-MailScanner-From: robin.roevens@disroot.org X-filekeeper-MailScanner-Watermark: 1619799358.37567@rwLghHF5Ikd0b/88BY4CJA ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=lists.ipfire.org; s=202003rsa; t=1619194577; 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=9qD+IBr6V/p+hJtxe9mZTpr4+u+dTb+X5eZ/rzHzvq8=; b=BWwGjqCgNbodxfMVNqrBy+fPnp/0tJSV1xv/0KNTUUI0souMeNOBPDqyGHfVr0EJts4Bea bBnvGoaxwQmTgmatV8OPGCHu3OV9RScCh4DHMpBsWNqkozuAxe6YBf6aySEWaFjp8C4qPB oYFutDP/bmRXcQ15mqNz8QjvUaMWh89G5KSx2v5nYd0KEk7OiUzv8MlsFXo2vlW8JAerZ0 HP/yiazJgB5J7LX0zkXmeCl2nPtHiyRaLtbT2tCZa288j4lhksFxfj62YNSn73QuCc5FRL BF9C0zNq8G3cZMcGVehWKRzhdNJVZyTBukIXj/l1e4k4zjm5M8WG2YL+d+kEcw== ARC-Authentication-Results: i=1; mail01.ipfire.org; dkim=pass header.d=disroot.org header.s=mail header.b=K8STPvss; 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=1619194577; a=rsa-sha256; cv=none; b=JeuFgCFQNGqEfdQkOzUolIswgKlgYzIHrAzIW4b2erKNMKamXf8iCpznFwmbNtS7SUHqOy Az8jgqGm4bxWVZRoDXvHEYtiElgkPfNUb10yxnqEjzLYgQiwC7+Ji9V+Bpz4n69UzEMkiS qgmxxNHJ6uPBLIJrvjHqf+/vtqlEWLnXgzTlrJf5/7RM6GSesDfxJsx6OMyo3oGk4N/wUw PFT+YGQfmGRcEjujsC129+Mfx1hUn+Mlq1NmzQoBxP3HiAEnUgZHw2wBVBdGtKXkk+8413 BDU6IosVBqoW9Q+NXp+sanRsF2S/pWAQ1WqBWRWF8YW63iFqxXlEm7oCPOEE+w== X-Rspamd-Server: mail01.haj.ipfire.org X-Spamd-Result: default: False [-1.90 / 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(-2.40)[asn: 50673(-0.34), country: NL(-0.01), ip: 178.21.23.139(-0.85)]; DKIM_TRACE(0.00)[disroot.org:+]; RCPT_COUNT_TWO(0.00)[2]; MID_CONTAINS_FROM(1.00)[]; BLOCKLISTDE_FAIL(0.00)[178.21.23.139:server fail]; DMARC_POLICY_ALLOW(-0.50)[disroot.org,quarantine]; NEURAL_HAM(-1.00)[-1.000]; 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-Rspamd-Queue-Id: 4FRfYF08T8z5Z Authentication-Results: mail01.ipfire.org; dkim=pass header.d=disroot.org header.s=mail header.b=K8STPvss; 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-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" * Introduce SUMMARY and INITSCRIPTS macro's in LFS-makefiles. * Add a Summary and InitScripts field to the meta-* addon files containing the value's of those macro's. * Replace the INSTALL_INITSCRIPT makefile macro by a new INSTALL_INITSCRIPTS macro/method that will install all initscripts defined in the new INITSCRIPTS macro. * Adapt libvirt and zabbix_agentd pak as examples of how to use this. Signed-off-by: Robin Roevens --- lfs/Config | 8 ++++++-- lfs/libvirt | 6 ++++-- lfs/zabbix_agentd | 5 ++++- src/pakfire/meta | 2 ++ 4 files changed, 16 insertions(+), 5 deletions(-) diff --git a/lfs/Config b/lfs/Config index eadbbc408..61d6f0c82 100644 --- a/lfs/Config +++ b/lfs/Config @@ -299,15 +299,19 @@ define PAK # Create meta file sed \ -e "s/NAME/$(PROG)/g" \ + -e "s/SUMMARY/$(SUMMARY)/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/INITSCRIPTS/$(INITSCRIPTS)/g" \ < /usr/src/src/pakfire/meta > /install/packages/meta-$(PROG) endef -define INSTALL_INITSCRIPT - install -m 754 -v $(DIR_SRC)/src/initscripts/packages/$(1) /etc/rc.d/init.d/$(1) +define INSTALL_INITSCRIPTS + for initscript in $(INITSCRIPTS); do \ + install -m 754 -v $(DIR_SRC)/src/initscripts/packages/$$initscript /etc/rc.d/init.d/$$initscript; \ + done endef ifeq "$(BUILD_ARCH)" "$(filter $(BUILD_ARCH),aarch64 riscv64)" diff --git a/lfs/libvirt b/lfs/libvirt index 28a95d317..be5d3db3a 100644 --- a/lfs/libvirt +++ b/lfs/libvirt @@ -25,6 +25,7 @@ include Config VER = 6.5.0 +SUMMARY = Server side daemon and supporting files for libvirt THISAPP = libvirt-$(VER) DL_FILE = $(THISAPP).tar.xz @@ -37,6 +38,8 @@ PAK_VER = 25 DEPS = ebtables libpciaccess libtirpc libyajl ncat qemu +INITSCRIPTS= libvirtd virtlogd + ############################################################################### # Top-level Rules ############################################################################### @@ -121,8 +124,7 @@ $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects)) cd $(DIR_APP)/build_libvirt && make install #install initscripts - $(call INSTALL_INITSCRIPT,libvirtd) - $(call INSTALL_INITSCRIPT,virtlogd) + @$(INSTALL_INITSCRIPTS) mv /usr/libexec/libvirt-guests.sh /etc/rc.d/init.d/libvirt-guests # Backup diff --git a/lfs/zabbix_agentd b/lfs/zabbix_agentd index c69643a54..a72fe024b 100644 --- a/lfs/zabbix_agentd +++ b/lfs/zabbix_agentd @@ -25,6 +25,7 @@ include Config VER = 4.2.6 +SUMMARY = Zabbix Agent THISAPP = zabbix-$(VER) DL_FILE = $(THISAPP).tar.gz @@ -35,6 +36,8 @@ PROG = zabbix_agentd PAK_VER = 4 DEPS = +INITSCRIPTS= zabbix_agentd + ############################################################################### # Top-level Rules ############################################################################### @@ -106,7 +109,7 @@ $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects)) chown zabbix.zabbix /var/run/zabbix # Install initscripts - $(call INSTALL_INITSCRIPT,zabbix_agentd) + @$(INSTALL_INITSCRIPTS) # Install sudoers include file install -v -m 644 $(DIR_SRC)/config/zabbix_agentd/sudoers \ diff --git a/src/pakfire/meta b/src/pakfire/meta index d97b2a0fa..849b9cd6c 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 +InitScripts: INITSCRIPTS