treewide: combine VERSION_SED and VERSION_SED_SCRIPT

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>

diff --git a/include/version.mk b/include/version.mk
index 6c6eb75ff66d2e6209648673cc7e89c8b79b162f..ab427ecba89746ce8ebf4de24d6d4f1e1cd21082 100644 (file)
--- a/include/version.mk
+++ b/include/version.mk
@@ -85,7 +85,7 @@ $(subst &,\&,$(subst $(comma),\$(comma),$(subst ','\'',$(subst \,\\,$(1)))))
 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,\L$(call sed_escape,$(subst $(space),_,$(VERSION_NUMBER))),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,%h,$(call sed_escape,$(VERSION_HWREV)),g'
 
-VERSION_SED_SCRIPT:=$(VERSION_SED)

diff --git a/package/base-files/Makefile b/package/base-files/Makefile
index ed3448094875d67152ccaf9d6707f1a290a12d65..ab21213b51f866223e37aaffa58c6b9c1ee82ae5 100644 (file)
--- a/package/base-files/Makefile
+++ b/package/base-files/Makefile
@@ -137,7 +137,7 @@ define Package/base-files/install
                fi; \
        )
 
-       $(VERSION_SED) \
+       $(VERSION_SED_SCRIPT) \
                $(1)/etc/banner \
                $(1)/etc/openwrt_version \
                $(1)/usr/lib/os-release
@@ -194,7 +194,7 @@ define Package/base-files/install
        $(if $(CONFIG_CLEAN_IPKG),, \
                mkdir -p $(1)/etc/opkg; \
                $(call FeedSourcesAppend,$(1)/etc/opkg/distfeeds.conf); \
-               $(VERSION_SED) $(1)/etc/opkg/distfeeds.conf)
+               $(VERSION_SED_SCRIPT) $(1)/etc/opkg/distfeeds.conf)
 endef
 
 ifneq ($(DUMP),1)