Skip to content

Commit 6585498

Browse files
feckerthauke
authored andcommittedSep 24, 2023
build: replace SourceName with PKG_NAME compile unit name
Currently, the same information is stored at the Packages.manifest in the 'Package:' variable and also additionally in the 'SourceName:' variable. So we have for Packages.manifest for strongswan-charon-cmd: ``` 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 installable packages are built from the same strongswan source. Therefore it makes more sense that the source name is really the source name. In this case the it is 'strongswan'. After this change the Packages.manifest for strongswan-charon-cmd: ``` Package: strongswan-charon-cmd Version: 5.9.11-1 SourceName: strongswan License: GPL-2.0-or-later Section: net ``` In summary. The 'Package' name is the name of the package to be installed on the target system. The 'SourceName' is the compile unit from which the package was build from. This must be the same for all installable packages built from the same compile unit. This commit fixes that. Signed-off-by: Florian Eckert <[email protected]>
1 parent 98d325a commit 6585498

File tree

1 file changed

+1
-1
lines changed

1 file changed

+1
-1
lines changed
 

‎include/package-ipkg.mk

+1-1
Original file line numberDiff line numberDiff line change
@@ -179,7 +179,7 @@ $$(call addfield,Depends,$$(Package/$(1)/DEPENDS)
179179
)$$(call addfield,Provides,$$(call mergelist,$$(filter-out $(1)$$(ABIV_$(1)),$(PROVIDES)$$(if $$(ABIV_$(1)), $(1) $(foreach provide,$(PROVIDES),$(provide)$$(ABIV_$(1))))))
180180
)$$(call addfield,Alternatives,$$(call mergelist,$(ALTERNATIVES))
181181
)$$(call addfield,Source,$(SOURCE)
182-
)$$(call addfield,SourceName,$(1)
182+
)$$(call addfield,SourceName,$(PKG_NAME)
183183
)$$(call addfield,License,$(LICENSE)
184184
)$$(call addfield,LicenseFiles,$(LICENSE_FILES)
185185
)$$(call addfield,Section,$(SECTION)

0 commit comments

Comments
 (0)