From patchwork Sun Aug 15 20:38:44 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Robin Roevens X-Patchwork-Id: 6 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 4Gnq0G1lzVz3xHZ for ; Sun, 15 Aug 2021 20:39:26 +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 4Gnq0C6xGfz15B; Sun, 15 Aug 2021 20:39:23 +0000 (UTC) Received: from mail02.haj.ipfire.org (localhost [127.0.0.1]) by mail02.haj.ipfire.org (Postfix) with ESMTP id 4Gnq0C4rSHz2y0p; Sun, 15 Aug 2021 20:39:23 +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 4Gnq0B2gDkz2xLb for ; Sun, 15 Aug 2021 20:39:22 +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 4Gnq092tJdzQK for ; Sun, 15 Aug 2021 20:39:21 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by disroot.org (Postfix) with ESMTP id 89A6963355 for ; Sun, 15 Aug 2021 22:39:20 +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 UTF8SMTP id 69VfeqxFujQg for ; Sun, 15 Aug 2021 22:39:19 +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 1mFMu9-0000y1-KR for development@lists.ipfire.org; Sun, 15 Aug 2021 22:38:49 +0200 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=disroot.org; s=mail; t=1629059939; bh=uUoLgv4fZjvEv0YYEO9THGkrCVbQXnGnzKMzAqSXqjY=; h=From:To:Subject:Date; b=Cs3yfHEft2Nvd/1Evt18vP5ZKoAqt0QAkoEyHnf+RPkeWIAwPMdTdkshJnW4R50kH vPCg9N60doMnxRPcZ6ccsOsYxB6MSltAanzTxhnaRLJHbsXvR7raL+XiBxtH3m3Gde IzAHKzYmWWOboQ/AwnwoKjtE9zQwcHNTikkaklALa7qOnFiqqvOkAgNtapHLsDS6LT F5DWFN5/80DHK0vnWHaUW20Jrym5rcDOhcqmTVkuBNx8J5OYQnDkW78s58xo2z0xrj pi/rl9W1NIHCzC4bpMuCYatVTrbmN1HqOjygPMmp5p0vWZE61RFF275mbX30M9sK1J I/EzUbn7HX9+w== From: Robin Roevens To: development@lists.ipfire.org Subject: [PATCH v2 0/2] buildprocess: additional pak metadata Date: Sun, 15 Aug 2021 22:38:44 +0200 Message-Id: <20210815203846.15956-1-robin.roevens@disroot.org> Mime-Version: 1.0 X-filekeeper-MailScanner-ID: 1mFMu9-0000y1-KR X-filekeeper-MailScanner: Found to be clean X-filekeeper-MailScanner-From: robin.roevens@disroot.org X-filekeeper-MailScanner-Watermark: 1629664731.44121@0zyDvI6hiT9DbFx5jLULCQ ARC-Seal: i=1; s=202003rsa; d=lists.ipfire.org; t=1629059961; a=rsa-sha256; cv=none; b=Y9WJVM6bOF0tuEA+RsUiEv+gNupunZMz4uVQAT/0nkhKShn4RY7cgHF0mv7utMDMvVD2tL 6r+krpc4QMPwQkxJFa+6Iog3haayf8ByNh7XHgpqR4JhLjhFDmoxFgeVrnx4WZW3NRAEQw pvYL8tsQxtroZ9ammmMQzyb5sjxdqgoXcV03y0h+An/fWDFHJad5111g456bmbsvgqrTEW Qz/VKFs8yiErSQLM6SvAsCX1V9jTUf1JyNcGYrMG3mT5UPhAzuT89zzFz+NeEqa3ZiXE/K CXRtV1Bk0bVRwPDOFGAcEWx7rM6fbeXcHaCb15Eb8f8UnVNJfo0X40W9AC8FIA== ARC-Authentication-Results: i=1; mail01.ipfire.org; dkim=pass header.d=disroot.org header.s=mail header.b=Cs3yfHEf; 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-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=lists.ipfire.org; s=202003rsa; t=1629059961; 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=olmMMKTwdu3oUqJ7i5/sQzAMVVyvSTNLy4tvIQwqXpU=; b=TPZNj7jf2BiKP3hJ+b+ls1WcJb3wU28UgRT5mUTJZUWdedNFhG0woRkBgOmCUhU5jid8F3 D4Mvi7ZUcwmNf0X+uuejArMp4vn5WBM7NjLKjuBbSXyQdCok3f5llxA9TJnLSQiGhB3eAl 3O6TSyyZI3U1pCthM5jFi4iZaDqV8UK1vjd0cahbayvSnxlBATYc8Ec3clRZyqul64DG2/ eewW227UJUFXpiAjbNgNbQT64OvuikXoOQAn9PpMNCvPVNVcfbRBW4tAha4oEzJURIhFMM UIwg4Z4Htc0UIkQuoMLp1eDcAtZ6SWKeVLcra81w6jiKbQr+dAe7VoEoO8IKZA== X-Rspamd-Queue-Id: 4Gnq092tJdzQK Authentication-Results: mail01.ipfire.org; dkim=pass header.d=disroot.org header.s=mail header.b=Cs3yfHEf; 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; dmarc=pass (policy=quarantine) header.from=disroot.org X-Rspamd-Server: mail01.haj.ipfire.org X-Spamd-Result: default: False [3.07 / 11.00]; R_SPF_ALLOW(-0.20)[+a]; MV_CASE(0.50)[]; R_MISSING_CHARSET(2.50)[]; BROKEN_CONTENT_TYPE(1.50)[]; TO_DN_NONE(0.00)[]; RCVD_COUNT_THREE(0.00)[4]; ARC_SIGNED(0.00)[lists.ipfire.org:s=202003rsa:i=1]; 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:+]; DMARC_POLICY_ALLOW(-0.50)[disroot.org,quarantine]; MX_GOOD(-0.01)[]; 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.69)[83.27%]; ARC_NA(0.00)[]; R_DKIM_ALLOW(-0.20)[disroot.org:s=mail]; FROM_HAS_DN(0.00)[]; SPF_REPUTATION_HAM(-0.72)[-0.71676810681428]; TO_MATCH_ENVRCPT_ALL(0.00)[]; MIME_GOOD(-0.10)[text/plain]; PREVIOUSLY_DELIVERED(0.00)[development@lists.ipfire.org]; RCPT_COUNT_ONE(0.00)[1]; MID_CONTAINS_FROM(1.00)[]; RWL_MAILSPIKE_POSSIBLE(0.00)[178.21.23.139:from] 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 New version of this patch, based on current Next. For completeness, the summary included in the first version: 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 after acceptance of this patch. Regards Robin