From patchwork Tue Jul 25 12:26:23 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Florian Eckert X-Patchwork-Id: 1812499 X-Patchwork-Delegate: hauke@hauke-m.de Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@legolas.ozlabs.org Authentication-Results: legolas.ozlabs.org; spf=none (no SPF record) smtp.mailfrom=lists.openwrt.org (client-ip=2607:7c80:54:3::133; helo=bombadil.infradead.org; envelope-from=openwrt-devel-bounces+incoming=patchwork.ozlabs.org@lists.openwrt.org; receiver=) Authentication-Results: legolas.ozlabs.org; dkim=pass (2048-bit key; secure) header.d=lists.infradead.org header.i=@lists.infradead.org header.a=rsa-sha256 header.s=bombadil.20210309 header.b=TJ3uRmb6; dkim-atps=neutral Received: from bombadil.infradead.org (bombadil.infradead.org [IPv6:2607:7c80:54:3::133]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature ECDSA (P-384) server-digest SHA384) (No client certificate requested) by legolas.ozlabs.org (Postfix) with ESMTPS id 4R9GXz3v0qz1ydq for ; Tue, 25 Jul 2023 22:28:51 +1000 (AEST) DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=bombadil.20210309; h=Sender: Content-Transfer-Encoding:Content-Type:List-Subscribe:List-Help:List-Post: List-Archive:List-Unsubscribe:List-Id:MIME-Version:Message-ID:Date:Subject:Cc :To:From:Reply-To:Content-ID:Content-Description:Resent-Date:Resent-From: Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID:In-Reply-To:References: List-Owner; bh=wXSolppDviER0k7Cdma8Mty/0xWMvNNs59kh5+sa7TY=; b=TJ3uRmb67hqOEM oKaqiwVQ9SrJqh0ExhnzMHQ0mG3APnpaQ0qW0d8i7yp6OSS9dWfF+vsr/IUPwbg0JLkL87UvREGPo lKUS4UJPIpcZq5UQXMwUgFH1umARRsEckLjTa4G6j6rkdeNIFdlLsZMUNkrQfvS6VBpKRfnajsWoi QITgu0NZyQSEpyJi8z/BNbKIPl07AV4z9Cuq0XVcZnN/V5lzy3J6RXGojggkBf3dJlxomB0sSC1cQ ZQsUamIefPs5FnXSBB0N/6dfRdJlvatvDUhLSivlC3NeU5UOr3FggzMGPbeqhdpSrpRgTB7x3EATu uyC7KwdrUpYgMugvTMPA==; Received: from localhost ([::1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.96 #2 (Red Hat Linux)) id 1qOH7l-007VoI-1b; Tue, 25 Jul 2023 12:26:45 +0000 Received: from mxout70.expurgate.net ([194.37.255.70]) by bombadil.infradead.org with esmtps (Exim 4.96 #2 (Red Hat Linux)) id 1qOH7d-007Vm0-2P for openwrt-devel@lists.openwrt.org; Tue, 25 Jul 2023 12:26:39 +0000 Received: from [127.0.0.1] (helo=localhost) by relay.expurgate.net with smtp (Exim 4.92) (envelope-from ) id 1qOH7W-00Fa13-Sw; Tue, 25 Jul 2023 14:26:30 +0200 Received: from [195.243.126.94] (helo=securemail.tdt.de) by relay.expurgate.net with esmtps (TLS1.3:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.92) (envelope-from ) id 1qOH7V-00Fa0c-Tw; Tue, 25 Jul 2023 14:26:29 +0200 Received: from securemail.tdt.de (localhost [127.0.0.1]) by securemail.tdt.de (Postfix) with ESMTP id A698E24004B; Tue, 25 Jul 2023 14:26:29 +0200 (CEST) Received: from mail.dev.tdt.de (unknown [10.2.4.42]) by securemail.tdt.de (Postfix) with ESMTP id 53796240040; Tue, 25 Jul 2023 14:26:29 +0200 (CEST) Received: from localhost.localdomain (unknown [10.2.3.40]) by mail.dev.tdt.de (Postfix) with ESMTPSA id C034630D78; Tue, 25 Jul 2023 14:26:28 +0200 (CEST) From: Florian Eckert To: jo@mein.io Cc: openwrt-devel@lists.openwrt.org, Eckert.Florian@googlemail.com Subject: [PATCH] build: replace SourceName with PKG_NAME Date: Tue, 25 Jul 2023 14:26:23 +0200 Message-ID: <20230725122624.3231282-1-fe@dev.tdt.de> X-Mailer: git-send-email 2.30.2 MIME-Version: 1.0 X-Spam-Status: No, score=-1.0 required=5.0 tests=ALL_TRUSTED, T_SCC_BODY_TEXT_LINE,URIBL_BLOCKED autolearn=ham autolearn_force=no version=3.4.2 X-Spam-Checker-Version: SpamAssassin 3.4.2 (2018-09-13) on mail.dev.tdt.de X-purgate: clean X-purgate-ID: 151534::1690287990-77FD67FE-6AFED1AA/0/0 X-purgate-type: clean X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20230725_052637_952207_70ED53A2 X-CRM114-Status: GOOD ( 11.46 ) X-Spam-Score: -0.7 (/) X-Spam-Report: Spam detection software, running on the system "bombadil.infradead.org", has NOT identified this incoming email as spam. The original message has been attached to this so you can view it or label similar future email. If you have any questions, see the administrator of that system for details. Content preview: Currently, the same information is stored in the Packages.manifest in the 'Package:' variable and also additionally in the 'SourceName:' variable. Packages.manifest for strongswan-charon-cmd (before): Content analysis details: (-0.7 points, 5.0 required) pts rule name description ---- ---------------------- -------------------------------------------------- -0.0 SPF_PASS SPF: sender matches SPF record -0.0 SPF_HELO_PASS SPF: HELO matches SPF record -0.7 RCVD_IN_DNSWL_LOW RBL: Sender listed at https://www.dnswl.org/, low trust [194.37.255.70 listed in list.dnswl.org] X-BeenThere: openwrt-devel@lists.openwrt.org X-Mailman-Version: 2.1.34 Precedence: list List-Id: OpenWrt Development List List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: "openwrt-devel" Errors-To: openwrt-devel-bounces+incoming=patchwork.ozlabs.org@lists.openwrt.org Currently, the same information is stored in the Packages.manifest in the 'Package:' variable and also additionally in the 'SourceName:' variable. Packages.manifest for strongswan-charon-cmd (before): Package: strongswan-charon-cmd Version: 5.9.11-1 ... SourceName: strongswan-charon-cmd License: GPL-2.0-or-later Section: net This is not correct. Several install packages are built from the strongswan source. Therefore it makes more sense that the source name is really the source name. In this case it is 'strongswan' $PKG_NAME. Packages.manifest for strongswan-charon-cmd (after): Package: strongswan-charon-cmd Version: 5.9.11-1 ... SourceName: strongswan License: GPL-2.0-or-later Section: net Signed-off-by: Florian Eckert --- include/package-ipkg.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/include/package-ipkg.mk b/include/package-ipkg.mk index 3063a86a28..afa2b81eb9 100644 --- a/include/package-ipkg.mk +++ b/include/package-ipkg.mk @@ -179,7 +179,7 @@ $$(call addfield,Depends,$$(Package/$(1)/DEPENDS) )$$(call addfield,Provides,$$(call mergelist,$$(filter-out $(1)$$(ABIV_$(1)),$(PROVIDES)$$(if $$(ABIV_$(1)), $(1) $(foreach provide,$(PROVIDES),$(provide)$$(ABIV_$(1)))))) )$$(call addfield,Alternatives,$$(call mergelist,$(ALTERNATIVES)) )$$(call addfield,Source,$(SOURCE) -)$$(call addfield,SourceName,$(1) +)$$(call addfield,SourceName,$(PKG_NAME) )$$(call addfield,License,$(LICENSE) )$$(call addfield,LicenseFiles,$(LICENSE_FILES) )$$(call addfield,Section,$(SECTION)