KumiSystems/openwrtv3
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

treewide: combine VERSION_SED and VERSION_SED_SCRIPT

Browse source 
We don't need two versions of this.  The escaping quotes
is so that the sed commands aren't misinterpreted by shell;
it has nothing to do with the contents of the file, thus
one version is adequate.

Signed-off-by: Philip Prindeville <philipp@redfish-solutions.com>
This commit is contained in:
Philip Prindeville 2018-01-24 17:33:21 -07:00 committed by Jo-Philipp Wich
parent abbb07a661
commit ff8e9a4ecb
2 changed files with 3 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
include/version.mk
View file

@ -85,7 +85,7 @@ $(subst &,\&,$(subst $(comma),\$(comma),$(subst ','\'',$(subst \,\\,$(1)))))
endef endef
#' #'
VERSION_SED:=$(SED) 's,%U,$(call sed_escape,$(VERSION_REPO)),g' \ VERSION_SED_SCRIPT:=$(SED) 's,%U,$(call sed_escape,$(VERSION_REPO)),g' \
-e 's,%V,$(call sed_escape,$(VERSION_NUMBER)),g' \ -e 's,%V,$(call sed_escape,$(VERSION_NUMBER)),g' \
-e 's,%v,\L$(call sed_escape,$(subst $(space),_,$(VERSION_NUMBER))),g' \ -e 's,%v,\L$(call sed_escape,$(subst $(space),_,$(VERSION_NUMBER))),g' \
-e 's,%C,$(call sed_escape,$(VERSION_CODE)),g' \ -e 's,%C,$(call sed_escape,$(VERSION_CODE)),g' \
@ -104,4 +104,3 @@ VERSION_SED:=$(SED) 's,%U,$(call sed_escape,$(VERSION_REPO)),g' \
-e 's,%P,$(call sed_escape,$(VERSION_PRODUCT)),g' \ -e 's,%P,$(call sed_escape,$(VERSION_PRODUCT)),g' \
-e 's,%h,$(call sed_escape,$(VERSION_HWREV)),g' -e 's,%h,$(call sed_escape,$(VERSION_HWREV)),g'
VERSION_SED_SCRIPT:=$(VERSION_SED)

4
package/base-files/Makefile
View file

@ -137,7 +137,7 @@ define Package/base-files/install
fi; \ fi; \
) )
$(VERSION_SED) \ $(VERSION_SED_SCRIPT) \
$(1)/etc/banner \ $(1)/etc/banner \
$(1)/etc/openwrt_version \ $(1)/etc/openwrt_version \
$(1)/usr/lib/os-release $(1)/usr/lib/os-release
@ -194,7 +194,7 @@ define Package/base-files/install
$(if $(CONFIG_CLEAN_IPKG),, \ $(if $(CONFIG_CLEAN_IPKG),, \
mkdir -p $(1)/etc/opkg; \ mkdir -p $(1)/etc/opkg; \
$(call FeedSourcesAppend,$(1)/etc/opkg/distfeeds.conf); \ $(call FeedSourcesAppend,$(1)/etc/opkg/distfeeds.conf); \
$(VERSION_SED) $(1)/etc/opkg/distfeeds.conf) $(VERSION_SED_SCRIPT) $(1)/etc/opkg/distfeeds.conf)
endef endef
ifneq ($(DUMP),1) ifneq ($(DUMP),1)