pacakge: drop remnants of $(HOST_DIR)/usr

It's been ages (5 years at the next release) that we've not installed
host packages in $(HOST_DIR)/usr, but we still have a few packages that
reference it or install things in there.

Drop all of those in one fell swoop.

The run-time test still succeeds, and the following defconfig, which
should exercise all touched packages [*], does build:

    BR2_x86_i686=y
    BR2_TOOLCHAIN_EXTERNAL=y
    BR2_INIT_NONE=y
    BR2_SYSTEM_BIN_SH_NONE=y
    # BR2_PACKAGE_BUSYBOX is not set
    BR2_PACKAGE_GAWK=y
    BR2_PACKAGE_GETTEXT=y
    BR2_PACKAGE_ABOOTIMG=y
    BR2_PACKAGE_DBUS_PYTHON=y
    BR2_PACKAGE_OLA=y
    BR2_PACKAGE_JIMTCL=y
    BR2_PACKAGE_LUA=y
    # BR2_PACKAGE_LUA_32BITS is not set
    BR2_PACKAGE_ARGPARSE=y
    BR2_PACKAGE_PERL=y
    BR2_PACKAGE_PHP=y
    BR2_PACKAGE_PHP_APCU=y
    BR2_PACKAGE_PHP_LUA=y
    BR2_PACKAGE_PHP_PAM=y
    BR2_PACKAGE_PHP_PECL_DBUS=y
    BR2_PACKAGE_PYTHON3=y
    BR2_PACKAGE_PYTHON_CRYPTOGRAPHY=y
    BR2_PACKAGE_PYTHON_PLY=y
    BR2_PACKAGE_PYTHON_PYBIND=y
    BR2_PACKAGE_LIBVA=y
    BR2_PACKAGE_BIND=y
    BR2_PACKAGE_BIND_SERVER=y
    BR2_PACKAGE_BIND_TOOLS=y
    BR2_PACKAGE_APPARMOR=y
    BR2_PACKAGE_APPARMOR_BINUTILS=y
    BR2_PACKAGE_APPARMOR_UTILS=y
    BR2_PACKAGE_APPARMOR_UTILS_EXTRA=y
    BR2_PACKAGE_APPARMOR_PROFILES=y
    BR2_PACKAGE_REFPOLICY=y
    BR2_PACKAGE_URANDOM_SCRIPTS=y
    BR2_PACKAGE_BASH=y
    # embiggen-disk to exercise go
    BR2_PACKAGE_EMBIGGEN_DISK=y
    BR2_TARGET_GRUB2=y
    BR2_TARGET_GRUB2_I386_PC=y
    BR2_TARGET_GRUB2_I386_EFI=y

[*] exceptions:
  - zfs was not tested: it needs a kernel to be built;
  - compiler-rt was not tsted: it needs llvm to be built, that takes
    ages, and other packages already reference the correct location for
    llvm-config, so it was assumed that is OK.

Signed-off-by: Yann E. MORIN <[email protected]>
Cc: Angelo Compagnucci <[email protected]>
Cc: Anisse Astier <[email protected]>
Cc: Antoine Tenart <[email protected]>
Cc: Arnout Vandecappelle (Essensium/Mind) <[email protected]>
Cc: Asaf Kahlon <[email protected]>
Cc: Bernd Kuhls <[email protected]>
Cc: Christian Stewart <[email protected]>
Cc: Ezequiel Garcia <[email protected]>
Cc: Francois Perrad <[email protected]>
Cc: Guillaume William Brs <[email protected]>
Cc: Hervé Codina <[email protected]>
Cc: James Hilliard <[email protected]>
Cc: José Luis Salvador Rufo <[email protected]>
Cc: Julien Boibessot <[email protected]>
Cc: Julien Olivain <[email protected]>
Cc: Matt Weber <[email protected]>
Cc: Nicolas Carrier <[email protected]>
Cc: Peter Korsgaard <[email protected]>
Cc: Thomas Petazzoni <[email protected]>
Cc: Vadim Kochan <[email protected]>
Cc: Yegor Yefremov <[email protected]>
Reviewed-by: Romain Naour <[email protected]>
---
Changes v1 -> v2:
  - fix new instance that have crept in  (Romain)

diff --git a/boot/grub2/grub2.mk b/boot/grub2/grub2.mk
index ce0594d1d3c4fec870dbb5a38dfb3ca7c6c8b632..57593330ddc537e2a722cfa023671c60ea9bc12c 100644 (file)
--- a/boot/grub2/grub2.mk
+++ b/boot/grub2/grub2.mk
@@ -157,7 +157,7 @@ define GRUB2_INSTALL_IMAGES_CMDS
        $(foreach tuple, $(GRUB2_TUPLES-y), \
                @$(call MESSAGE,Installing $(tuple) to images directory)
                mkdir -p $(dir $(GRUB2_IMAGE_$(tuple)))
-               $(HOST_DIR)/usr/bin/grub-mkimage \
+               $(HOST_DIR)/bin/grub-mkimage \
                        -d $(@D)/build-$(tuple)/grub-core/ \
                        -O $(tuple) \
                        -o $(GRUB2_IMAGE_$(tuple)) \

diff --git a/package/abootimg/abootimg.mk b/package/abootimg/abootimg.mk
index a07100df5a7407809015ab1451ad9caab3c0527b..ca09e94f16e6b0e4644e0904b6281a1244fa6f61 100644 (file)
--- a/package/abootimg/abootimg.mk
+++ b/package/abootimg/abootimg.mk
@@ -27,7 +27,7 @@ define HOST_ABOOTIMG_BUILD_CMDS
 endef
 
 define HOST_ABOOTIMG_INSTALL_CMDS
-       $(INSTALL) -m 0755 $(@D)/abootimg $(HOST_DIR)/usr/bin/abootimg
+       $(INSTALL) -m 0755 $(@D)/abootimg $(HOST_DIR)/bin/abootimg
 endef
 
 $(eval $(generic-package))

diff --git a/package/bind/bind.mk b/package/bind/bind.mk
index bd12f7ad31d7261e2e406814f7a73355f679e1c2..5eb3e69bed0a0266b91a2c469141382cebd89b2a 100644 (file)
--- a/package/bind/bind.mk
+++ b/package/bind/bind.mk
@@ -91,7 +91,7 @@ endif
 # Used by dnssec-keymgr
 ifeq ($(BR2_PACKAGE_PYTHON_PLY),y)
 BIND_DEPENDENCIES += host-python-ply
-BIND_CONF_OPTS += --with-python=$(HOST_DIR)/usr/bin/python
+BIND_CONF_OPTS += --with-python=$(HOST_DIR)/bin/python
 else
 BIND_CONF_OPTS += --with-python=no
 endif

diff --git a/package/compiler-rt/compiler-rt.mk b/package/compiler-rt/compiler-rt.mk
index 57f9c2685431908d0ab3c2795b05409d3ce15046..c8ea86e899fe30d7b95eef63b2cfabf788b68551 100644 (file)
--- a/package/compiler-rt/compiler-rt.mk
+++ b/package/compiler-rt/compiler-rt.mk
@@ -19,7 +19,7 @@ COMPILER_RT_INSTALL_TARGET = NO
 COMPILER_RT_CONF_OPTS=-DCOMPILER_RT_STANDALONE_BUILD=OFF \
        -DCOMPILER_RT_STANDALONE_BUILD=ON \
        -DCOMPILER_RT_DEFAULT_TARGET_TRIPLE=$(GNU_TARGET_NAME) \
-       -DLLVM_CONFIG_PATH=$(HOST_DIR)/usr/bin/llvm-config
+       -DLLVM_CONFIG_PATH=$(HOST_DIR)/bin/llvm-config
 
 # The installation of the target runtime libraries defaults to DESTDIR, however
 # host-clang resources directory needs a link so Clang can find the runtime

diff --git a/package/dbus-python/dbus-python.mk b/package/dbus-python/dbus-python.mk
index d9bb30ed67b44e51fd0518769f656594bb7db628..16b22d4821050921292f60fe4c7db76816011c8e 100644 (file)
--- a/package/dbus-python/dbus-python.mk
+++ b/package/dbus-python/dbus-python.mk
@@ -20,9 +20,9 @@ DBUS_PYTHON_CONF_ENV = \
 
 HOST_DBUS_PYTHON_CONF_ENV = \
        PYTHON=$(HOST_DIR)/bin/python3 \
-       PYTHON_INCLUDES="`$(HOST_DIR)/usr/bin/python3-config --includes`" \
-       PYTHON_LIBS="`$(HOST_DIR)/usr/bin/python3-config --ldflags`" \
-       PYTHON_EXTRA_LIBS="`$(HOST_DIR)/usr/bin/python3-config --libs --embed`"
+       PYTHON_INCLUDES="`$(HOST_DIR)/bin/python3-config --includes`" \
+       PYTHON_LIBS="`$(HOST_DIR)/bin/python3-config --ldflags`" \
+       PYTHON_EXTRA_LIBS="`$(HOST_DIR)/bin/python3-config --libs --embed`"
 
 $(eval $(autotools-package))
 $(eval $(host-autotools-package))

diff --git a/package/gawk/gawk.mk b/package/gawk/gawk.mk
index b55c74d00ac2ec04195c90629166e244c1a4dfaa..3a1cec49695f699c5b79d9c9adf7e54dfde6d6d2 100644 (file)
--- a/package/gawk/gawk.mk
+++ b/package/gawk/gawk.mk
@@ -40,7 +40,7 @@ endef
 GAWK_POST_INSTALL_TARGET_HOOKS += GAWK_CREATE_SYMLINK
 
 define HOST_GAWK_CREATE_SYMLINK
-       ln -sf gawk $(HOST_DIR)/usr/bin/awk
+       ln -sf gawk $(HOST_DIR)/bin/awk
 endef
 
 HOST_GAWK_POST_INSTALL_HOOKS += HOST_GAWK_CREATE_SYMLINK

diff --git a/package/gettext-tiny/gettext-tiny.mk b/package/gettext-tiny/gettext-tiny.mk
index c297cb1fe5baf9c31590966dca4aae61b769faf9..e2dc5636675ddca7edd4c88b3da14962ee186f64 100644 (file)
--- a/package/gettext-tiny/gettext-tiny.mk
+++ b/package/gettext-tiny/gettext-tiny.mk
@@ -95,7 +95,7 @@ define HOST_GETTEXT_TINY_INSTALL_CMDS
        $(Q)touch $(HOST_DIR)/share/gettext-tiny/ABOUT-NLS
 
        # for gettextize
-       ln -sf $(HOST_DIR)/usr/share/gettext-tiny $(HOST_DIR)/usr/share/gettext
+       ln -sf $(HOST_DIR)/share/gettext-tiny $(HOST_DIR)/share/gettext
 endef
 
 # Install simple echo wrapper for gettext tool

diff --git a/package/go/go.mk b/package/go/go.mk
index 6767b1481d81ea7e498d62a304a00dbd7a9e605e..172bf16b6f6c2cb779872716e461b3a6d18c1237 100644 (file)
--- a/package/go/go.mk
+++ b/package/go/go.mk
@@ -13,10 +13,10 @@ GO_LICENSE_FILES = LICENSE
 GO_CPE_ID_VENDOR = golang
 
 HOST_GO_DEPENDENCIES = host-go-bootstrap
-HOST_GO_GOPATH = $(HOST_DIR)/usr/share/go-path
-HOST_GO_HOST_CACHE = $(HOST_DIR)/usr/share/host-go-cache
+HOST_GO_GOPATH = $(HOST_DIR)/share/go-path
+HOST_GO_HOST_CACHE = $(HOST_DIR)/share/host-go-cache
 HOST_GO_ROOT = $(HOST_DIR)/lib/go
-HOST_GO_TARGET_CACHE = $(HOST_DIR)/usr/share/go-cache
+HOST_GO_TARGET_CACHE = $(HOST_DIR)/share/go-cache
 
 # We pass an empty GOBIN, otherwise "go install: cannot install
 # cross-compiled binaries when GOBIN is set"

diff --git a/package/jimtcl/jimtcl.mk b/package/jimtcl/jimtcl.mk
index 2f8e0e6c690b87f78c5d44cdeff9a1d9f71deba9..3d68ca8f64529f42b9854e32bf0dd5e78d1c9b7c 100644 (file)
--- a/package/jimtcl/jimtcl.mk
+++ b/package/jimtcl/jimtcl.mk
@@ -92,11 +92,11 @@ endef
 
 define HOST_JIMTCL_INSTALL_CMDS
        for i in $(JIMTCL_HEADERS_TO_INSTALL); do \
-               cp -a $(@D)/$$i $(HOST_DIR)/usr/include/ || exit 1 ; \
+               cp -a $(@D)/$$i $(HOST_DIR)/include/ || exit 1 ; \
        done;
        $(INSTALL) -m 0755 -D $(@D)/libjim.so.$(JIMTCL_VERSION) \
-               $(HOST_DIR)/usr/lib/libjim.so.$(JIMTCL_VERSION)
-       ln -sf libjim.so.$(JIMTCL_VERSION) $(HOST_DIR)/usr/lib/libjim.so
+               $(HOST_DIR)/lib/libjim.so.$(JIMTCL_VERSION)
+       ln -sf libjim.so.$(JIMTCL_VERSION) $(HOST_DIR)/lib/libjim.so
 endef
 
 $(eval $(generic-package))

diff --git a/package/libapparmor/libapparmor.mk b/package/libapparmor/libapparmor.mk
index fcd3a4389b65e4ef7c6fb46c77e695488ab7cd89..af59335933ace8cb8530266357100cb2d9db82b0 100644 (file)
--- a/package/libapparmor/libapparmor.mk
+++ b/package/libapparmor/libapparmor.mk
@@ -31,7 +31,7 @@ ifeq ($(BR2_PACKAGE_PYTHON3),y)
 LIBAPPARMOR_DEPENDENCIES += host-python3 host-python-setuptools host-swig python3
 LIBAPPARMOR_CONF_OPTS += \
        --with-python \
-       PYTHON=$(HOST_DIR)/usr/bin/python3 \
+       PYTHON=$(HOST_DIR)/bin/python3 \
        PYTHON_CONFIG=$(STAGING_DIR)/usr/bin/python3-config \
        SWIG=$(SWIG)
 else

diff --git a/package/libva/libva.mk b/package/libva/libva.mk
index f89dac335f288f72ef6e54bfe93795dc67a64884..4138daf8b4ac9c9086fae55ebd5386e4ea1758be 100644 (file)
--- a/package/libva/libva.mk
+++ b/package/libva/libva.mk
@@ -30,7 +30,7 @@ endif
 
 ifeq ($(BR2_PACKAGE_WAYLAND),y)
 LIBVA_DEPENDENCIES += wayland
-LIBVA_CONF_ENV += ac_cv_path_WAYLAND_SCANNER=$(HOST_DIR)/usr/bin/wayland-scanner
+LIBVA_CONF_ENV += ac_cv_path_WAYLAND_SCANNER=$(HOST_DIR)/bin/wayland-scanner
 LIBVA_CONF_OPTS += --enable-wayland
 else
 LIBVA_CONF_OPTS += --disable-wayland

diff --git a/package/lua/lua.mk b/package/lua/lua.mk
index 09e7b34f7dc478d30954a73c33c1b6977851fc69..01b554eb6b37c0c8e35c04bffaea557165d8af65 100644 (file)
--- a/package/lua/lua.mk
+++ b/package/lua/lua.mk
@@ -60,7 +60,7 @@ LUA_POST_PATCH_HOOKS += LUA_32BITS_LUACONF
 endif
 
 define HOST_LUA_LUACONF
-       $(SED) 's|#define LUA_ROOT.*|#define LUA_ROOT "$(HOST_DIR)/usr/"|' $(@D)/src/luaconf.h
+       $(SED) 's|#define LUA_ROOT.*|#define LUA_ROOT "$(HOST_DIR)/"|' $(@D)/src/luaconf.h
 endef
 HOST_LUA_POST_PATCH_HOOKS += HOST_LUA_LUACONF
 

diff --git a/package/ola/ola.mk b/package/ola/ola.mk
index 6600de797ea546d538c50b509db0504d7ab77b49..82615e8155d49fe260c3fb8acc4979dd1d3db87e 100644 (file)
--- a/package/ola/ola.mk
+++ b/package/ola/ola.mk
@@ -24,7 +24,7 @@ OLA_CONF_OPTS = \
        --disable-root-check \
        --disable-tcmalloc \
        --disable-unittests \
-       --with-ola-protoc-plugin=$(HOST_DIR)/usr/bin/ola_protoc_plugin
+       --with-ola-protoc-plugin=$(HOST_DIR)/bin/ola_protoc_plugin
 
 HOST_OLA_DEPENDENCIES = host-util-linux host-protobuf host-bison host-flex
 
@@ -47,7 +47,7 @@ HOST_OLA_CONF_OPTS = \
 # only.
 HOST_OLA_MAKE_OPTS = protoc/ola_protoc_plugin
 define HOST_OLA_INSTALL_CMDS
-       $(INSTALL) -D -m 0755 $(@D)/protoc/ola_protoc_plugin $(HOST_DIR)/usr/bin/ola_protoc_plugin
+       $(INSTALL) -D -m 0755 $(@D)/protoc/ola_protoc_plugin $(HOST_DIR)/bin/ola_protoc_plugin
 endef
 
 # sets where to find python libs built for target and required by ola

diff --git a/package/openjdk-bin/openjdk-bin.mk b/package/openjdk-bin/openjdk-bin.mk
index 5cb6e3ba6a504488374b739ea8f11c04045ab51a..608a0bc3ac1f4b55fb462756c52b63ff868e123c 100644 (file)
--- a/package/openjdk-bin/openjdk-bin.mk
+++ b/package/openjdk-bin/openjdk-bin.mk
@@ -26,7 +26,7 @@ HOST_OPENJDK_BIN_SITE = https://github.com/adoptium/temurin$(HOST_OPENJDK_BIN_VE
 HOST_OPENJDK_BIN_LICENSE = GPL-2.0+ with exception
 HOST_OPENJDK_BIN_LICENSE_FILES = legal/java.prefs/LICENSE legal/java.prefs/ASSEMBLY_EXCEPTION
 
-HOST_OPENJDK_BIN_ROOT_DIR = $(HOST_DIR)/usr/lib/jvm
+HOST_OPENJDK_BIN_ROOT_DIR = $(HOST_DIR)/lib/jvm
 
 # unpack200 has an invalid RPATH and relies on libzlib. When
 # host-libzlib is installed on the system, the error "ERROR: package

diff --git a/package/php-apcu/php-apcu.mk b/package/php-apcu/php-apcu.mk
index 3ac062e772c6f4523111f9a33abbaf672919755a..d381c9054f1d9a49e421183f9a4f31c4852148c8 100644 (file)
--- a/package/php-apcu/php-apcu.mk
+++ b/package/php-apcu/php-apcu.mk
@@ -16,8 +16,8 @@ PHP_APCU_CONF_OPTS = \
 
 define PHP_APCU_PHPIZE
        (cd $(@D); \
-               PHP_AUTOCONF=$(HOST_DIR)/usr/bin/autoconf \
-               PHP_AUTOHEADER=$(HOST_DIR)/usr/bin/autoheader \
+               PHP_AUTOCONF=$(HOST_DIR)/bin/autoconf \
+               PHP_AUTOHEADER=$(HOST_DIR)/bin/autoheader \
                $(STAGING_DIR)/usr/bin/phpize)
 endef
 PHP_APCU_PRE_CONFIGURE_HOOKS += PHP_APCU_PHPIZE

diff --git a/package/php-lua/php-lua.mk b/package/php-lua/php-lua.mk
index 529b347e42663c44dbad60fa36e89212a4e8f010..559bd59209fd4ab1c14a0f4c9bf3ba9196cf486b 100644 (file)
--- a/package/php-lua/php-lua.mk
+++ b/package/php-lua/php-lua.mk
@@ -30,8 +30,8 @@ endif
 
 define PHP_LUA_PHPIZE
        (cd $(@D); \
-               PHP_AUTOCONF=$(HOST_DIR)/usr/bin/autoconf \
-               PHP_AUTOHEADER=$(HOST_DIR)/usr/bin/autoheader \
+               PHP_AUTOCONF=$(HOST_DIR)/bin/autoconf \
+               PHP_AUTOHEADER=$(HOST_DIR)/bin/autoheader \
                $(STAGING_DIR)/usr/bin/phpize)
 endef
 PHP_LUA_PRE_CONFIGURE_HOOKS += PHP_LUA_PHPIZE

diff --git a/package/php-pam/php-pam.mk b/package/php-pam/php-pam.mk
index 8e20095d866dfa1ad24095a377c8ab6746e4b44e..c35ad4f5d00c11815ef1cebe6bfb3fb129114b35 100644 (file)
--- a/package/php-pam/php-pam.mk
+++ b/package/php-pam/php-pam.mk
@@ -17,8 +17,8 @@ PHP_PAM_CONF_OPTS = \
 
 define PHP_PAM_PHPIZE
        (cd $(@D); \
-               PHP_AUTOCONF=$(HOST_DIR)/usr/bin/autoconf \
-               PHP_AUTOHEADER=$(HOST_DIR)/usr/bin/autoheader \
+               PHP_AUTOCONF=$(HOST_DIR)/bin/autoconf \
+               PHP_AUTOHEADER=$(HOST_DIR)/bin/autoheader \
                $(STAGING_DIR)/usr/bin/phpize)
 endef
 PHP_PAM_PRE_CONFIGURE_HOOKS += PHP_PAM_PHPIZE

diff --git a/package/php-pecl-dbus/php-pecl-dbus.mk b/package/php-pecl-dbus/php-pecl-dbus.mk
index 456d662554e6ea20471e2303f82e016f2d1bf17f..a70a2e7ae1d3bc4ebbdf597589fef753eda00722 100644 (file)
--- a/package/php-pecl-dbus/php-pecl-dbus.mk
+++ b/package/php-pecl-dbus/php-pecl-dbus.mk
@@ -15,8 +15,8 @@ PHP_PECL_DBUS_CONF_OPTS = \
 
 define PHP_PECL_DBUS_PHPIZE
        (cd $(@D); \
-               PHP_AUTOCONF=$(HOST_DIR)/usr/bin/autoconf \
-               PHP_AUTOHEADER=$(HOST_DIR)/usr/bin/autoheader \
+               PHP_AUTOCONF=$(HOST_DIR)/bin/autoconf \
+               PHP_AUTOHEADER=$(HOST_DIR)/bin/autoheader \
                $(STAGING_DIR)/usr/bin/phpize)
 endef
 PHP_PECL_DBUS_PRE_CONFIGURE_HOOKS += PHP_PECL_DBUS_PHPIZE

diff --git a/package/python-cryptography/python-cryptography.mk b/package/python-cryptography/python-cryptography.mk
index 99eba3eeabcd2b910227631eb930baa994f3d0e1..582a7f7891fc96d6bf90119ce9a00331a7e9418d 100644 (file)
--- a/package/python-cryptography/python-cryptography.mk
+++ b/package/python-cryptography/python-cryptography.mk
@@ -27,7 +27,7 @@ PYTHON_CRYPTOGRAPHY_ENV = \
        PYO3_CROSS_LIB_DIR="$(STAGING_DIR)/usr/lib/python$(PYTHON3_VERSION_MAJOR)"
 HOST_PYTHON_CRYPTOGRAPHY_ENV = \
        $(HOST_PKG_CARGO_ENV) \
-       PYO3_CROSS_LIB_DIR="$(HOST_DIR)/usr/lib/python$(PYTHON3_VERSION_MAJOR)"
+       PYO3_CROSS_LIB_DIR="$(HOST_DIR)/lib/python$(PYTHON3_VERSION_MAJOR)"
 # We need to vendor the Cargo crates at download time
 PYTHON_CRYPTOGRAPHY_DOWNLOAD_POST_PROCESS = cargo
 PYTHON_CRYPTOGRAPHY_DOWNLOAD_DEPENDENCIES = host-rustc

diff --git a/package/python-maturin/python-maturin.mk b/package/python-maturin/python-maturin.mk
index 3d5ba70391b6beea5aaeb6a3eeb8624689245398..9ac11f264b73450886b1e0bb01a483c11b2100e6 100644 (file)
--- a/package/python-maturin/python-maturin.mk
+++ b/package/python-maturin/python-maturin.mk
@@ -16,7 +16,7 @@ HOST_PYTHON_MATURIN_DEPENDENCIES = \
        host-rustc
 HOST_PYTHON_MATURIN_ENV = \
        $(HOST_PKG_CARGO_ENV) \
-       PYO3_CROSS_LIB_DIR="$(HOST_DIR)/usr/lib/python$(PYTHON3_VERSION_MAJOR)"
+       PYO3_CROSS_LIB_DIR="$(HOST_DIR)/lib/python$(PYTHON3_VERSION_MAJOR)"
 # We need to vendor the Cargo crates at download time
 PYTHON_MATURIN_DOWNLOAD_POST_PROCESS = cargo
 PYTHON_MATURIN_DOWNLOAD_DEPENDENCIES = host-rustc

diff --git a/package/python-pybind/python-pybind.mk b/package/python-pybind/python-pybind.mk
index 7448d246b2a93d7317673bd0736d123303524f76..05fc5933466a83c82cd2daa5c12e036537159b0c 100644 (file)
--- a/package/python-pybind/python-pybind.mk
+++ b/package/python-pybind/python-pybind.mk
@@ -17,7 +17,7 @@ PYTHON_PYBIND_CONF_OPTS = \
        -DPYBIND11_TEST=OFF \
        -DPYBIND11_NOPYTHON=ON
 
-PYTHON_PYBIND_INSTALL_PATH = $(HOST_DIR)/usr/lib/python$(PYTHON3_VERSION_MAJOR)/site-packages/pybind11
+PYTHON_PYBIND_INSTALL_PATH = $(HOST_DIR)/lib/python$(PYTHON3_VERSION_MAJOR)/site-packages/pybind11
 
 define PYTHON_PYBIND_INSTALL_MODULE
        mkdir -p $(PYTHON_PYBIND_INSTALL_PATH)

diff --git a/package/refpolicy/refpolicy.mk b/package/refpolicy/refpolicy.mk
index 44c50af2782c0f66b534051bae2c0d3a5db41532..f11b72755aec745516fa895599b9ce4b6e4a0574 100644 (file)
--- a/package/refpolicy/refpolicy.mk
+++ b/package/refpolicy/refpolicy.mk
@@ -30,7 +30,7 @@ endif
 
 # Cannot use multiple threads to build the reference policy
 REFPOLICY_MAKE = \
-       PYTHON=$(HOST_DIR)/usr/bin/python3 \
+       PYTHON=$(HOST_DIR)/bin/python3 \
        XMLLINT=$(LIBXML2_HOST_BINARY) \
        TEST_TOOLCHAIN=$(HOST_DIR) \
        $(TARGET_MAKE_ENV) \

diff --git a/package/zfs/zfs.mk b/package/zfs/zfs.mk
index 0a6e4a3cfa068eaf3e9b34e2ce1dfb06cbda5090..900a72f99707252086ba4d6c67ac52c056f0214f 100644 (file)
--- a/package/zfs/zfs.mk
+++ b/package/zfs/zfs.mk
@@ -40,7 +40,7 @@ endif
 ifeq ($(BR2_PACKAGE_PYTHON3),y)
 ZFS_DEPENDENCIES += python3 python-setuptools host-python-cffi host-python-packaging
 ZFS_CONF_ENV += \
-       PYTHON=$(HOST_DIR)/usr/bin/python3 \
+       PYTHON=$(HOST_DIR)/bin/python3 \
        PYTHON_CPPFLAGS="`$(STAGING_DIR)/usr/bin/python3-config --includes`" \
        PYTHON_LIBS="`$(STAGING_DIR)/usr/bin/python3-config --ldflags`" \
        PYTHON_EXTRA_LIBS="`$(STAGING_DIR)/usr/bin/python3-config --libs --embed`" \

diff --git a/support/testing/tests/package/br2-external/python-pybind/package/python-pybind-example/python-pybind-example.mk b/support/testing/tests/package/br2-external/python-pybind/package/python-pybind-example/python-pybind-example.mk
index a6d7e0daafececb9e3ae3146e0ccdb317b6c04e1..6620e704100689a4298424d3eb86df4e070a76e9 100644 (file)
--- a/support/testing/tests/package/br2-external/python-pybind/package/python-pybind-example/python-pybind-example.mk
+++ b/support/testing/tests/package/br2-external/python-pybind/package/python-pybind-example/python-pybind-example.mk
@@ -10,7 +10,7 @@
 PYTHON_PYBIND_EXAMPLE_DEPENDENCIES = python-pybind
 
 PYTHON_PYBIND_EXAMPLE_PYBIND_INCLUDE = \
-       $(shell $(HOST_DIR)/usr/bin/python3 -c 'import pybind11; print(pybind11.get_include())')
+       $(shell $(HOST_DIR)/bin/python3 -c 'import pybind11; print(pybind11.get_include())')
 
 PYTHON_PYBIND_EXAMPLE_CXX_FLAGS = \
        $(TARGET_CXXFLAGS) \