diff --git a/Makefile b/Makefile index 4e4e66e4..e421b840 100755 --- a/Makefile +++ b/Makefile @@ -137,7 +137,7 @@ local: printenv: @$(call draw_line); @echo "Build Environment Varibles:" - @echo "BS_PATH: `type -p fmt>/dev/null&&echo $(BS_PATH)|sed 's/:/ /g'|fmt -64|sed 's/ /:/g; 2,$$s/^/ /;'||echo $(BS_PATH)`" + @echo "PATH: `type -p fmt>/dev/null&&echo $(PATH)|sed 's/:/ /g'|fmt -64|sed 's/ /:/g; 2,$$s/^/ /;'||echo $(PATH)`" @echo "ARCHIVE_DIR: $(DL_DIR)" @echo "BASE_DIR: $(BASE_DIR)" @echo "CROSS_DIR: $(CROSS_DIR)" diff --git a/make/environment-build.mk b/make/environment-build.mk index 08577826..81019a37 100644 --- a/make/environment-build.mk +++ b/make/environment-build.mk @@ -157,7 +157,7 @@ GNU_HOST_NAME := $(shell support/gnuconfig/config.guess) # search path(s) for all prerequisites VPATH = $(DEPS_DIR) $(HOST_DEPS_DIR) -BS_PATH := $(HOST_DIR)/bin:$(HOST_DIR)/sbin:$(CROSS_DIR)/bin:$(PATH) +PATH := $(HOST_DIR)/bin:$(HOST_DIR)/sbin:$(CROSS_DIR)/bin:$(PATH) # ----------------------------------------------------------------------------- diff --git a/make/flash-images.mk b/make/flash-images.mk index b527d672..2e80d0ca 100644 --- a/make/flash-images.mk +++ b/make/flash-images.mk @@ -55,7 +55,6 @@ endef # ----------------------------------------------------------------------------- -flash-image: PATH="$(BS_PATH)" flash-image: ifeq ($(BOXMODEL),$(filter $(BOXMODEL),nevis kronos kronos_v2)) make flash-image-coolstream ERASE_SIZE=0x20000 diff --git a/package/autofs/autofs.mk b/package/autofs/autofs.mk index c0cef042..69fcd2ff 100644 --- a/package/autofs/autofs.mk +++ b/package/autofs/autofs.mk @@ -30,7 +30,7 @@ AUTOFS_CONF_OPTS = \ --enable-ignore-busy \ --without-openldap \ --without-sasl \ - --with-path="$(BS_PATH)" \ + --with-path="$(PATH)" \ --with-hesiod=no \ --with-libtirpc \ --with-confdir=/etc \ diff --git a/package/pkg-generic.mk b/package/pkg-generic.mk index 65f6b0fe..bfc898d4 100644 --- a/package/pkg-generic.mk +++ b/package/pkg-generic.mk @@ -5,7 +5,7 @@ ################################################################################ TARGET_MAKE_ENV = \ - PATH=$(BS_PATH) + PATH=$(PATH) define TARGET_MAKE_BUILD_CMDS_DEFAULT $(CHDIR)/$($(PKG)_DIR)/$($(PKG)_SUBDIR); \ @@ -48,7 +48,7 @@ endef # ----------------------------------------------------------------------------- HOST_MAKE_ENV = \ - PATH=$(BS_PATH) \ + PATH=$(PATH) \ PKG_CONFIG=/usr/bin/pkg-config \ PKG_CONFIG_LIBDIR=$(HOST_DIR)/lib \ PKG_CONFIG_PATH=$(HOST_DIR)/lib/pkgconfig \ diff --git a/package/pkg-kernel-module.mk b/package/pkg-kernel-module.mk index c1147774..9ae501f7 100644 --- a/package/pkg-kernel-module.mk +++ b/package/pkg-kernel-module.mk @@ -73,6 +73,6 @@ endef define LINUX_RUN_DEPMOD @$(call MESSAGE,"Running depmod") if test -d $(TARGET_modulesdir) && grep -q "CONFIG_MODULES=y" $(KERNEL_OBJ_DIR)/.config; then \ - PATH=$(BS_PATH):/sbin:/usr/sbin depmod -a -b $(TARGET_DIR) $(KERNEL_VERSION); \ + PATH=$(PATH):/sbin:/usr/sbin depmod -a -b $(TARGET_DIR) $(KERNEL_VERSION); \ fi endef diff --git a/package/pkg-meson.mk b/package/pkg-meson.mk index 67dad20d..01e207e5 100644 --- a/package/pkg-meson.mk +++ b/package/pkg-meson.mk @@ -45,7 +45,7 @@ endef define TARGET_MESON_CMDS_DEFAULT unset CC CXX CPP LD AR NM STRIP; \ $(CHDIR)/$($(PKG)_DIR)/$($(PKG)_SUBDIR); \ - PATH=$(BS_PATH) \ + PATH=$(PATH) \ $($(PKG)_CONF_ENV) \ $(HOST_MESON_BINARY) \ --buildtype=release \ @@ -111,7 +111,7 @@ define HOST_MESON_CMDS_DEFAULT PKG_CONFIG=/usr/bin/pkg-config \ PKG_CONFIG_PATH=$(HOST_DIR)/lib/pkgconfig \ $(CHDIR)/$($(PKG)_DIR)/$($(PKG)_SUBDIR); \ - PATH=$(BS_PATH) \ + PATH=$(PATH) \ $($(PKG)_CONF_ENV) \ $(HOST_MESON_BINARY) \ --prefix=$(HOST_DIR) \