PATH cleanup

PATCH New Samuel Martin 2 participants 8 messages Apr 14, 2014 – Apr 16, 2014

Subsystems (2)

Kbuild ext2 file system

lore

Share & tools

lore

Samuel Martin

author

2014-04-14 22:31 UTC #0 lore raw

v8 cover PATH cleanup

Hi all,

Just a quick rebase for the 8th round of this series.

Yours,
Samuel

Samuel Martin (6):
Makefile: introduce BR_PATH
Makefile: add $(HOST_DIR)/sbin to BR_PATH
*.mk: replace (TARGET|HOST)_PATH by BR_PATH
infra: remove unused {TARGET, HOST}_PATH definition pkg-cmake.mk: add PATH in the configure command environment
Makefile: add PATH to the USER_HOOKS_EXTRA_ENV

 Makefile                 |  3 +++
 fs/ext2/ext2.mk          |  2 +-
 package/Makefile.in      | 13 +++++--------
 package/gpm/gpm.mk       |  2 +-
 package/libhid/libhid.mk |  2 +-
 package/pkg-cmake.mk     |  2 ++
 package/pkg-python.mk    |  8 ++++----
 package/sdl/sdl.mk       |  2 +-
 package/xbmc/xbmc.mk     |  2 +-
 package/znc/znc.mk       |  2 +-
 10 files changed, 20 insertions(+), 18 deletions(-)

--
1.9.2

Samuel Martin

author

2014-04-14 22:31 UTC #1 lore raw

PATCH v8 1/6 Makefile: introduce BR_PATH

Since the HOST_PATH and TARGET_PATH variables almost contain the same things, let's factorize this in a single BR_PATH.

Signed-off-by Samuel Martin <[email protected]>

Reviewed-by "Yann E. MORIN" <[email protected]>

---
changes v7 -> v8:
- rebase

changes v6 -> v7:
- rebase

changes v4 -> v6:
- rebase
- fix comments (Arnout)

changes v3 -> v4:
- rebase
- rename BR2_PATH -> BR_PATH

changes v2 -> v3:
- rebase

changes v1 -> v2:
- rebase

---
 Makefile            | 3 +++
 package/Makefile.in | 5 ++---
 2 files changed, 5 insertions(+), 3 deletions(-)

Makefile +3 -0

index 467e21c..fb0493d 100644
@@ -330,6 +330,9 @@ TAR_OPTIONS=$(call qstrip,$(BR2_TAR_OPTIONS)) -xf
 # packages compiled for the host go here
 HOST_DIR:=$(call qstrip,$(BR2_HOST_DIR))
 
+# Quotes are needed for spaces and all in the original PATH content.
+BR_PATH = "$(HOST_DIR)/bin:$(HOST_DIR)/usr/bin:$(HOST_DIR)/usr/sbin:$(PATH)"
+
 # locales to generate
 GENERATE_LOCALE=$(call qstrip,$(BR2_GENERATE_LOCALE))

package/Makefile.in +2 -3

index 0830cd5..f7c9bca 100644
@@ -168,8 +168,7 @@ else
 TARGET_CROSS=$(HOST_DIR)/usr/bin/$(call qstrip,$(BR2_TOOLCHAIN_EXTERNAL_PREFIX))-
 endif
 
-# Quotes are needed for spaces et al in path components.
-TARGET_PATH="$(HOST_DIR)/bin:$(HOST_DIR)/usr/bin:$(HOST_DIR)/usr/sbin/:$(PATH)"
+TARGET_PATH = $(BR_PATH)
 
 # Define TARGET_xx variables for all common binutils/gcc
 TARGET_AR       = $(TARGET_CROSS)ar

@@ -224,7 +223,7 @@ HOST_CFLAGS   ?= -O2
 HOST_CFLAGS   += $(HOST_CPPFLAGS)
 HOST_CXXFLAGS += $(HOST_CFLAGS)
 HOST_LDFLAGS  += -L$(HOST_DIR)/lib -L$(HOST_DIR)/usr/lib -Wl,-rpath,$(HOST_DIR)/usr/lib
-HOST_PATH=$(HOST_DIR)/bin:$(HOST_DIR)/usr/bin:$(PATH)
+HOST_PATH = $(BR_PATH)
 
 # hostcc version as an integer - E.G. 4.3.2 => 432
 HOSTCC_VERSION:=$(shell $(HOSTCC_NOCCACHE) --version | \

Signature · 1 line

1.9.2

Samuel Martin

author

2014-04-14 22:31 UTC #2 lore raw

PATCH v8 2/6 Makefile: add $(HOST_DIR)/sbin to BR_PATH

In reply to Samuel Martin

Extend BR_PATH because a few host-packages install programs in this location.

Signed-off-by Samuel Martin <[email protected]>

---
changes v7 -> v8:
- rebase

changes v6 -> v7:
- rebase
- fix typo (Yann)

changes v4 -> v6:
- rebase

changes v3 -> v4:
- rebase
- fix typo in commit log (ThomasP)
- rename BR2_PATH -> BR_PATH

changes v2 -> v3:
- rebase

changes v1 -> v2:
- rebase

---
 Makefile | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

Makefile +1 -1

index fb0493d..137921c 100644
@@ -331,7 +331,7 @@ TAR_OPTIONS=$(call qstrip,$(BR2_TAR_OPTIONS)) -xf
 HOST_DIR:=$(call qstrip,$(BR2_HOST_DIR))
 
 # Quotes are needed for spaces and all in the original PATH content.
-BR_PATH = "$(HOST_DIR)/bin:$(HOST_DIR)/usr/bin:$(HOST_DIR)/usr/sbin:$(PATH)"
+BR_PATH = "$(HOST_DIR)/bin:$(HOST_DIR)/sbin:$(HOST_DIR)/usr/bin:$(HOST_DIR)/usr/sbin:$(PATH)"
 
 # locales to generate
 GENERATE_LOCALE=$(call qstrip,$(BR2_GENERATE_LOCALE))

Signature · 1 line

1.9.2

Samuel Martin

author

2014-04-14 22:31 UTC #3 lore raw

PATCH v8 3/6 *.mk: replace (TARGET|HOST)_PATH by BR_PATH

In reply to Samuel Martin

Thanks to the 2 previous patches of the series, BR_PATH contains all locations in which host-packages may install programs.

This patch replaces the occurrences TARGET_PATH and HOST_PATH with BR_PATH, everywhere these variables are used in the *.mk files.

Signed-off-by Samuel Martin <[email protected]>

Reviewed-by Arnout Vandecappelle (Essensium/Mind) <[email protected]>

---
changes v7 -> v8:
- rebase
- update changes (in znc and xbmc packages)

changes v6 -> v7:
- rebase
- remove double quotes around $(BR_PATH) (Yann)

changes v4 -> v6:
- rebase

changes v3 -> v4:
- rebase
- fix typo in commit log (ThomasP)
- rename BR2_PATH -> BR_PATH

changes v2 -> v3:
- rebase

changes v1 -> v2:
- rebase

br_path: replace in *.mk

---
 fs/ext2/ext2.mk          | 2 +-
 package/Makefile.in      | 8 ++++----
 package/gpm/gpm.mk       | 2 +-
 package/libhid/libhid.mk | 2 +-
 package/pkg-python.mk    | 8 ++++----
 package/sdl/sdl.mk       | 2 +-
 package/xbmc/xbmc.mk     | 2 +-
 package/znc/znc.mk       | 2 +-
 8 files changed, 14 insertions(+), 14 deletions(-)

fs/ext2/ext2.mk +1 -1

index 0af955f..1bc49da 100644
@@ -24,7 +24,7 @@ EXT2_ENV  = GEN=$(BR2_TARGET_ROOTFS_EXT2_GEN)
 EXT2_ENV += REV=$(BR2_TARGET_ROOTFS_EXT2_REV)
 
 define ROOTFS_EXT2_CMD
-	PATH=$(TARGET_PATH) $(EXT2_ENV) fs/ext2/genext2fs.sh -d $(TARGET_DIR) $(EXT2_OPTS) $@
+	PATH=$(BR_PATH) $(EXT2_ENV) fs/ext2/genext2fs.sh -d $(TARGET_DIR) $(EXT2_OPTS) $@
 endef
 
 rootfs-ext2-symlink:

package/Makefile.in +4 -4

index f7c9bca..0bce599 100644
@@ -232,7 +232,7 @@ HOSTCC_VERSION:=$(shell $(HOSTCC_NOCCACHE) --version | \
 HOST_PERL_ARCHNAME := $(shell perl -MConfig -e "print Config->{archname}")
 export PERL5LIB := $(HOST_DIR)/usr/lib/perl5/$(HOST_PERL_ARCHNAME):$(HOST_DIR)/usr/lib/perl5
 
-TARGET_CONFIGURE_OPTS=PATH=$(TARGET_PATH) \
+TARGET_CONFIGURE_OPTS=PATH=$(BR_PATH) \
 		AR="$(TARGET_AR)" \
 		AS="$(TARGET_AS)" \
 		LD="$(TARGET_LD)" \

@@ -269,10 +269,10 @@ TARGET_CONFIGURE_OPTS=PATH=$(TARGET_PATH) \
 		PKG_CONFIG="$(PKG_CONFIG_HOST_BINARY)" \
 		STAGING_DIR="$(STAGING_DIR)"
 
-TARGET_MAKE_ENV=PATH=$(TARGET_PATH)
+TARGET_MAKE_ENV=PATH=$(BR_PATH)
 
 
-HOST_CONFIGURE_OPTS=PATH=$(HOST_PATH) \
+HOST_CONFIGURE_OPTS=PATH=$(BR_PATH) \
 		AR="$(HOSTAR)" \
 		AS="$(HOSTAS)" \
 		LD="$(HOSTLD)" \

@@ -294,7 +294,7 @@ HOST_CONFIGURE_OPTS=PATH=$(HOST_PATH) \
 		PKG_CONFIG_LIBDIR="$(HOST_DIR)/usr/lib/pkgconfig:$(HOST_DIR)/usr/share/pkgconfig" \
 		LD_LIBRARY_PATH="$(HOST_DIR)/usr/lib:$(LD_LIBRARY_PATH)"
 
-HOST_MAKE_ENV=PATH=$(HOST_PATH) \
+HOST_MAKE_ENV=PATH=$(BR_PATH) \
 		LD_LIBRARY_PATH="$(HOST_DIR)/usr/lib:$(LD_LIBRARY_PATH)" \
 		PKG_CONFIG="$(PKG_CONFIG_HOST_BINARY)" \
 		PKG_CONFIG_SYSROOT_DIR="/" \

package/gpm/gpm.mk +1 -1

index 85fdad6..d927bab 100644
@@ -27,7 +27,7 @@ GPM_CONF_OPT = --without-curses
 # configure is missing but gpm seems not compatible with our autoreconf
 # mechanism so we have to do it manually instead of using GPM_AUTORECONF = YES
 define GPM_RUN_AUTOGEN
-	cd $(@D) && PATH=$(HOST_PATH) ./autogen.sh
+	cd $(@D) && PATH=$(BR_PATH) ./autogen.sh
 endef
 GPM_PRE_CONFIGURE_HOOKS += GPM_RUN_AUTOGEN

package/libhid/libhid.mk +1 -1

index 1b9b895..30501d5 100644
@@ -11,7 +11,7 @@ LIBHID_INSTALL_STAGING = YES
 LIBHID_AUTORECONF = YES
 # configure runs libusb-config for cflags/ldflags. Ensure it picks up
 # the target version
-LIBHID_CONF_ENV = PATH=$(STAGING_DIR)/usr/bin:$(TARGET_PATH)
+LIBHID_CONF_ENV = PATH=$(STAGING_DIR)/usr/bin:$(BR_PATH)
 LIBHID_CONF_OPT = \
 	--disable-swig \
 	--disable-werror \

package/pkg-python.mk +4 -4

index d6786a3..e903c23 100644
@@ -22,7 +22,7 @@
 
 # Target distutils-based packages
 PKG_PYTHON_DISTUTILS_ENV = \
-	PATH="$(TARGET_PATH)" \
+	PATH=$(BR_PATH) \
 	CC="$(TARGET_CC)" \
 	CFLAGS="$(TARGET_CFLAGS)" \
 	LDFLAGS="$(TARGET_LDFLAGS)" \

@@ -40,14 +40,14 @@ PKG_PYTHON_DISTUTILS_INSTALL_OPT = \
 
 # Host distutils-based packages
 HOST_PKG_PYTHON_DISTUTILS_ENV = \
-	PATH="$(HOST_PATH)"
+	PATH=$(BR_PATH)
 
 HOST_PKG_PYTHON_DISTUTILS_INSTALL_OPT = \
 	--prefix=$(HOST_DIR)/usr
 
 # Target setuptools-based packages
 PKG_PYTHON_SETUPTOOLS_ENV = \
-	PATH="$(TARGET_PATH)" \
+	PATH=$(BR_PATH) \
 	PYTHONPATH="$(if $(BR2_PACKAGE_PYTHON3),$(PYTHON3_PATH),$(PYTHON_PATH))" \
 	_python_sysroot=$(STAGING_DIR) \
 	_python_prefix=/usr \

@@ -61,7 +61,7 @@ PKG_PYTHON_SETUPTOOLS_INSTALL_OPT = \
 
 # Host setuptools-based packages
 HOST_PKG_PYTHON_SETUPTOOLS_ENV = \
-	PATH="$(HOST_PATH)"
+	PATH=$(BR_PATH)
 
 HOST_PKG_PYTHON_SETUPTOOLS_INSTALL_OPT = \
 	--prefix=$(HOST_DIR)/usr

package/sdl/sdl.mk +1 -1

index 086f5e9..d36f3ff 100644
@@ -14,7 +14,7 @@ SDL_INSTALL_STAGING = YES
 # we're patching configure.in, but package cannot autoreconf with our version of
 # autotools, so we have to do it manually instead of setting SDL_AUTORECONF = YES
 define SDL_RUN_AUTOGEN
-	cd $(@D) && PATH=$(HOST_PATH) ./autogen.sh
+	cd $(@D) && PATH=$(BR_PATH) ./autogen.sh
 endef
 
 SDL_PRE_CONFIGURE_HOOKS += SDL_RUN_AUTOGEN

package/xbmc/xbmc.mk +1 -1

index 69bb1ef..7453db5 100644
@@ -129,7 +129,7 @@ endif
 
 # Add HOST_DIR to PATH for codegenerator.mk to find swig
 define XBMC_BOOTSTRAP
-	cd $(@D) && PATH=$(HOST_PATH) ./bootstrap
+	cd $(@D) && PATH=$(BR_PATH) ./bootstrap
 endef
 XBMC_PRE_CONFIGURE_HOOKS += XBMC_BOOTSTRAP

package/znc/znc.mk +1 -1

index 5e9b45b..6d367dc 100644
@@ -14,7 +14,7 @@ ZNC_CONF_OPT = --disable-perl
 # The standard <pkg>_AUTORECONF = YES invocation doesn't work for this
 # package, because it does not use automake in a normal way.
 define ZNC_RUN_AUTOGEN
-	cd $(@D) && PATH=$(HOST_PATH) ./autogen.sh
+	cd $(@D) && PATH=$(BR_PATH) ./autogen.sh
 endef
 ZNC_PRE_CONFIGURE_HOOKS += ZNC_RUN_AUTOGEN

Signature · 1 line

1.9.2

Samuel Martin

author

2014-04-14 22:31 UTC #4 lore raw

PATCH v8 4/6 infra: remove unused {TARGET, HOST}_PATH definition

In reply to Samuel Martin

Since the variables TARGET_PATH and HOST_PATH are not used anymore, let's remove them.

Signed-off-by Samuel Martin <[email protected]>

Reviewed-by "Yann E. MORIN" <[email protected]>

---
changes v7 -> v8:
- rebase

changes v6 -> v7:
- rebase

changes v4 -> v6:
- rebase

changes v3 -> v4:
- rebase
- rename BR2_PATH -> BR_PATH

changes v2 -> v3:
- rebase
- no one-line commit log (ThomasP)

changes v1 -> v2:
- rebase

---
 package/Makefile.in | 3 ---
 1 file changed, 3 deletions(-)

package/Makefile.in +0 -3

index 0bce599..3549f15 100644
@@ -168,8 +168,6 @@ else
 TARGET_CROSS=$(HOST_DIR)/usr/bin/$(call qstrip,$(BR2_TOOLCHAIN_EXTERNAL_PREFIX))-
 endif
 
-TARGET_PATH = $(BR_PATH)
-
 # Define TARGET_xx variables for all common binutils/gcc
 TARGET_AR       = $(TARGET_CROSS)ar
 TARGET_AS       = $(TARGET_CROSS)as

@@ -223,7 +221,6 @@ HOST_CFLAGS   ?= -O2
 HOST_CFLAGS   += $(HOST_CPPFLAGS)
 HOST_CXXFLAGS += $(HOST_CFLAGS)
 HOST_LDFLAGS  += -L$(HOST_DIR)/lib -L$(HOST_DIR)/usr/lib -Wl,-rpath,$(HOST_DIR)/usr/lib
-HOST_PATH = $(BR_PATH)
 
 # hostcc version as an integer - E.G. 4.3.2 => 432
 HOSTCC_VERSION:=$(shell $(HOSTCC_NOCCACHE) --version | \

Signature · 1 line

1.9.2

Samuel Martin

author

2014-04-14 22:31 UTC #5 lore raw

PATCH v8 5/6 pkg-cmake.mk: add PATH in the configure command environment

In reply to Samuel Martin

Because BR_PATH is not exported in the environment beforehand running cmake, it is necessary to add it on the cmake configure command.

Signed-off-by Samuel Martin <[email protected]>

Reviewed-by "Yann E. MORIN" <[email protected]>

---
changes v7 -> v8:
- rebase

changes v6 -> v7:
- rebase

changes v4 -> v6:
- rebase

changes v3 -> v4:
- rebase
- rename BR2_PATH -> BR_PATH

changes v2 -> v3:
- rebase
- no one-line commit log (ThomasP)

changes v1 -> v2:
- remove explicit PATH=... in configure commands in pkg-autotools.mk because it is already added via *_CONFIGURE_OPTS (ThomasP), and reword the commit message.

---
 package/pkg-cmake.mk | 2 ++
 1 file changed, 2 insertions(+)

package/pkg-cmake.mk +2 -0

index f7e454b..bf3db90 100644
@@ -60,6 +60,7 @@ ifeq ($(4),target)
 define $(2)_CONFIGURE_CMDS
 	(cd $$($$(PKG)_BUILDDIR) && \
 	rm -f CMakeCache.txt && \
+	PATH=$(BR_PATH) \
 	$$($$(PKG)_CONF_ENV) $(HOST_DIR)/usr/bin/cmake $$($$(PKG)_SRCDIR) \
 		-DCMAKE_TOOLCHAIN_FILE="$$(HOST_DIR)/usr/share/buildroot/toolchainfile.cmake" \
 		-DCMAKE_INSTALL_PREFIX="/usr" \

@@ -74,6 +75,7 @@ else
 define $(2)_CONFIGURE_CMDS
 	(cd $$($$(PKG)_BUILDDIR) && \
 	rm -f CMakeCache.txt && \
+	PATH=$(BR_PATH) \
 	$(HOST_DIR)/usr/bin/cmake $$($$(PKG)_SRCDIR) \
 		-DCMAKE_INSTALL_SO_NO_EXE=0 \
 		-DCMAKE_FIND_ROOT_PATH="$$(HOST_DIR)" \

Signature · 1 line

1.9.2

Samuel Martin

author

2014-04-14 22:31 UTC #6 lore raw

PATCH v8 6/6 Makefile: add PATH to the USER_HOOKS_EXTRA_ENV

In reply to Samuel Martin

This can be useful for post-{build,image} scripts, in case some host-tools were specifically built to be used by these scripts.

Signed-off-by Samuel Martin <[email protected]>

Cc "Yann E. MORIN" <[email protected]>

Acked-by "Yann E. MORIN" <[email protected]>

---
changes v7 -> v8:
- rebase

changes v6 -> v7:
- rebase

changes v5 -> v6:
- add this cset

---
 package/Makefile.in | 1 +
 1 file changed, 1 insertion(+)

package/Makefile.in +1 -0

index 3549f15..31eaaf2 100644
@@ -302,6 +302,7 @@ HOST_MAKE_ENV=PATH=$(BR_PATH) \
 # explicitly pass it to user-supplied external hooks (eg. post-build,
 # post-images)
 USER_HOOKS_EXTRA_ENV=\
+	PATH=$(BR_PATH) \
 	BUILD_DIR=$(BUILD_DIR)
 
 ################################################################################

Signature · 1 line

1.9.2

Thomas Petazzoni

2014-04-16 17:31 UTC #7 lore raw

v8 cover PATH cleanup

In reply to Samuel Martin

Dear Samuel Martin,

Quoted 7 lines · Samuel Martin

Samuel Martin (6):
Makefile: introduce BR_PATH
Makefile: add $(HOST_DIR)/sbin to BR_PATH
*.mk: replace (TARGET|HOST)_PATH by BR_PATH
infra: remove unused {TARGET, HOST}_PATH definition pkg-cmake.mk: add PATH in the configure command environment
Makefile: add PATH to the USER_HOOKS_EXTRA_ENV

Series applied, thanks!

Thomas

Signature · 3 lines

Thomas Petazzoni, CTO, Free Electrons
Embedded Linux, Kernel and Android engineering
http://free-electrons.com