domenico/openwrt_NSS_ACW
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

merge: properly remove %n / %N references

Browse Source 
- use %d instead of %n for opkg feed identifiers
- remove %n / %N references from version files

Fixes bf5cef47b3 merge: release/banner: drop release name and update banner.
Fixes FS#1213.

Signed-off-by: Jo-Philipp Wich <jo@mein.io>
This commit is contained in:
Jo-Philipp Wich
2017-12-09 16:01:14 +01:00
parent 69d22a6bf6
commit d23e1e1e1a
3 changed files with 4 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
include/feeds.mk
View File

@@ -41,10 +41,10 @@ endef
# 1: destination file # 1: destination file
define FeedSourcesAppend define FeedSourcesAppend
( \ ( \
echo "src/gz %n_core %U/targets/%S/packages"; \ echo "src/gz %d_core %U/targets/%S/packages"; \
$(strip $(if $(CONFIG_PER_FEED_REPO), \ $(strip $(if $(CONFIG_PER_FEED_REPO), \
$(foreach feed,base $(FEEDS_ENABLED),echo "src/gz %n_$(feed) %U/packages/%A/$(feed)";) \ $(foreach feed,base $(FEEDS_ENABLED),echo "src/gz %d_$(feed) %U/packages/%A/$(feed)";) \
$(if $(CONFIG_PER_FEED_REPO_ADD_DISABLED), \ $(if $(CONFIG_PER_FEED_REPO_ADD_DISABLED), \
$(foreach feed,$(FEEDS_DISABLED),echo "$(if $(CONFIG_PER_FEED_REPO_ADD_COMMENTED),# )src/gz %n_$(feed) %U/packages/%A/$(feed)";)))) \ $(foreach feed,$(FEEDS_DISABLED),echo "$(if $(CONFIG_PER_FEED_REPO_ADD_COMMENTED),# )src/gz %d_$(feed) %U/packages/%A/$(feed)";)))) \
) >> $(1) ) >> $(1)
endef endef

3
package/base-files/files/etc/openwrt_release
View File

@@ -1,8 +1,7 @@
DISTRIB_ID='%D' DISTRIB_ID='%D'
DISTRIB_RELEASE='%V' DISTRIB_RELEASE='%V'
DISTRIB_REVISION='%R' DISTRIB_REVISION='%R'
DISTRIB_CODENAME='%n'
DISTRIB_TARGET='%S' DISTRIB_TARGET='%S'
DISTRIB_ARCH='%A' DISTRIB_ARCH='%A'
DISTRIB_DESCRIPTION='%D %N %V %C' DISTRIB_DESCRIPTION='%D %V %C'
DISTRIB_TAINTS='%t' DISTRIB_TAINTS='%t'

2
package/base-files/image-config.in
View File

@@ -199,8 +199,6 @@ if VERSIONOPT
%v .. Configured release version number or "snapshot", lowercase %v .. Configured release version number or "snapshot", lowercase
%C .. Configured release revision code or value of %R, uppercase %C .. Configured release revision code or value of %R, uppercase
%c .. Configured release revision code or value of %R, lowercase %c .. Configured release revision code or value of %R, lowercase
%N .. Release name, uppercase
%n .. Release name, lowercase
%D .. Distribution name or "OpenWrt", uppercase %D .. Distribution name or "OpenWrt", uppercase
%d .. Distribution name or "openwrt", lowercase %d .. Distribution name or "openwrt", lowercase
%T .. Target name %T .. Target name