From patchwork Thu Jun 24 22:50:24 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Robin Roevens X-Patchwork-Id: 2 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) server-digest SHA384 client-signature ECDSA (P-384) client-digest SHA384) (Client CN "mail01.haj.ipfire.org", Issuer "R3" (verified OK)) by web04.haj.ipfire.org (Postfix) with ESMTPS id 4G9wYz1WMfz3wcC for ; Thu, 24 Jun 2021 22:59:35 +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 4G9wYx4rkPz9c; Thu, 24 Jun 2021 22:59:33 +0000 (UTC) Received: from mail02.haj.ipfire.org (localhost [127.0.0.1]) by mail02.haj.ipfire.org (Postfix) with ESMTP id 4G9wYx1RkPz2yFQ; Thu, 24 Jun 2021 22:59:33 +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) server-digest SHA384 client-signature ECDSA (P-384) client-digest SHA384) (Client CN "mail01.haj.ipfire.org", Issuer "R3" (verified OK)) by mail02.haj.ipfire.org (Postfix) with ESMTPS id 4G9wYv2hHkz2xb4 for ; Thu, 24 Jun 2021 22:59:31 +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 4G9wYt679Kz9c for ; Thu, 24 Jun 2021 22:59:30 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by disroot.org (Postfix) with ESMTP id 948685C8BD for ; Fri, 25 Jun 2021 00:50:54 +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 WmfpJbHWAUs7 for ; Fri, 25 Jun 2021 00:50:53 +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 1lwYB5-0006Dm-6z for development@lists.ipfire.org; Fri, 25 Jun 2021 00:50:31 +0200 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=disroot.org; s=mail; t=1624575052; bh=iZeKubgiH3BgjoYwdA0PEbDPMeOAIsXGS3Op0ZhFDuE=; h=From:To:Subject:Date; b=LfQG9bwBrYyZw2t0zoZMShFiRDsqU6uSvWfZp6dG4HaMDOqhPV2YVqzJ9gUyOy9LL Ea7JGoXU4hgeMlU0nwDVkP4+AwYANo8eak11ez6W7PdzcuK9bFTV/QwRuSbmykY87G GjEE4jgGS+4BJdLi4+ruOpPHRQqIgdG6KeltqMfvqvwpa6Zhazvl16PhQpYNmUD+w6 C3wOVwxO6uGMfQoXx1E6MFCzIR696DLGaQbwZJOQVqPdlMijyJ9moL/dVxz9eHqmDP DY6OOqGa8ZavKUZtY/oQokqwQVouAowh5fsBTVcqSJug5CzrWgVqbqdHqPRczvUDhu CZA033JooBRAA== From: Robin Roevens To: development@lists.ipfire.org Subject: [PATCH 0/2] buildprocess: additional pak metadata Date: Fri, 25 Jun 2021 00:50:24 +0200 Message-Id: <20210624225026.15535-1-robin.roevens@disroot.org> Mime-Version: 1.0 X-filekeeper-MailScanner-ID: 1lwYB5-0006Dm-6z X-filekeeper-MailScanner: Found to be clean X-filekeeper-MailScanner-From: robin.roevens@disroot.org X-filekeeper-MailScanner-Watermark: 1625179834.71396@mwfaVIyPtMiOETiXanFtbA ARC-Authentication-Results: i=1; mail01.ipfire.org; dkim=pass header.d=disroot.org header.s=mail header.b=LfQG9bwB; 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=1624575570; a=rsa-sha256; cv=none; b=FYD6/GCHoZbywY48vU4df2G0ZFLmYnCsqqPYBYWRm18ckTr7H3/D6R1rrajHfmaDqzfrdV HdlarX1Qj+vM2tHOpuNKqXSkA895YL7Kpcjo4WF1k8k3+RFvCt42u6P0VkoH+i+BiV3TGB Fioma4PcykWi+6AnAlU+UiWilEey9iD9E8+6qpz2IIZwQgkH4YwA6fVzDeYhxUuHYuCzpQ QcbbJNhvXe/0F5xKGHiAzznSn0/m7ai1GQ8GKzg4tiTGO98oSeU3OhucbnPEfpOeQkxIOk ndA/at93YhEX0/FfNP9RcWFZYmjlt3CcCV7ey9hUWQlz+5UUdD2ouRBAkSxa5w== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=lists.ipfire.org; s=202003rsa; t=1624575570; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version: content-transfer-encoding:content-transfer-encoding:dkim-signature; bh=jT0d2k5h27nP40hhN5g5bAhQBd4Tkag/wG4/t4oaOCg=; b=VkzIYKgdfmq1ecHtlhe4dsbcYXS7if/CmnDiH+P3xhNg8sgDIEi2fEkH+JO4pnGWkhMX02 Ysw5eKW9TTwbNxJJsDbSrVVmtfk+4WoXxRh6aK/hesPd1f5+C7IQanEFQappsj28qJXemP 7VGN+QKrQoNtA3Ed02G/ANxpDMYyMcpsJnfH+HRTPHHnP4vSzI6ms0/czenUzT9f1OiQ4Q ZcnQMnCsuS2YNVk8Ob6wd8Wy1OOLC9K45Mp9tWugofN2/mkMpPShebbLkRCLf1/wEg6Hu1 yeVnmXvgW6+I/slrunw2gact4t04FKaQTZKGk2smJksdLdi56myfoo/+KcRcZw== X-Rspamd-Queue-Id: 4G9wYt679Kz9c Authentication-Results: mail01.ipfire.org; dkim=pass header.d=disroot.org header.s=mail header.b=LfQG9bwB; 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 [4.03 / 11.00]; ARC_NA(0.00)[]; DMARC_POLICY_ALLOW(-0.50)[disroot.org,quarantine]; R_DKIM_ALLOW(-0.20)[disroot.org:s=mail]; FROM_HAS_DN(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)[]; RCPT_COUNT_ONE(0.00)[1]; RCVD_COUNT_THREE(0.00)[4]; TO_DN_NONE(0.00)[]; TO_MATCH_ENVRCPT_ALL(0.00)[]; DKIM_TRACE(0.00)[disroot.org:+]; MX_GOOD(-0.01)[]; MID_CONTAINS_FROM(1.00)[]; IP_REPUTATION_HAM(-0.01)[asn: 50673(0.00), country: NL(-0.01), ip: 178.21.23.139(0.00)]; 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(-0.45)[78.85%]; GREYLIST(0.00)[pass,body] 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" Hi As discussed earlier, I hereby submit a patchset adding extra metadata to all pak's. First patch adds the new metadata fields "Summary" and "Services" to the meta-file templates and introduces the new macro INSTALL_INITSCRIPTS accepting a space seperated list of initscripts to install to avoid duplicating the list of service initscripts. (Once in the new SERVICES meta-data field and once by calling INSTALL_INITSCRIPT for each of them). The original INSTALL_INITSCRIPT macro is kept (and called by the new macro) for corner cases where non-service initscripts need to be installed and for use by non-pak lfs files as they currently don't have a SERVICES variable. The second patch adds the new metadata for all pak's in their respective lfs files. As I went over all pak lfs files, I did not encounter any corner cases hence all calls to INSTALL_INITSCRIPT are replaced by calls to the new INSTALL_INITSCRIPTS passing the SERVICES variable as argument. The only special case maybe worth mentioning is Icinga, where a service initscript is installed by a make rule of the source. Hence no call to INSTALL_INITSCRIPT or INSTALL_INITSCRIPTS is required. But the service is included in the SERVICES variable to have it recorded in the meta-file. This set does not yet contain changes in pakfire or services.cgi to actually do something with the new meta-data. Those changes will be posted shortly. Regards Robin