pacakge: drop remnants of $(HOST_DIR)/usr (branch yem/no-host-dir-usr)
cover pacakge: drop remnants of $(HOST_DIR)/usr (branch yem/no-host-dir-usr)
Hello All!
Back in 2017.08, we dropped the use of $(HOST_DIR)/usr as a prefix, and just installed with $(HOST_DIR) as a prefix. At least, the migration information was added as c8f51a00d8ec for 2017.08.
5 years ago.
And we still had a few packages that installed stuff in there, or used stuff from there.
Fix those.
In the process of testing the change, we noticed that the conditions for the rustc tier-1 and tier-2 platforms were incorrect, so we fixed them too.
Regards,
Yann E. MORIN.
----------------------------------------------------------------
Yann E. MORIN (2):
package/rustc: fix target names for i586 and i686
pacakge: drop remnants of $(HOST_DIR)/usr
boot/grub2/grub2.mk | 2 +- package/abootimg/abootimg.mk | 2 +- package/bind/bind.mk | 2 +- package/compiler-rt/compiler-rt.mk | 2 +- package/dbus-python/dbus-python.mk | 6 +++--- package/gawk/gawk.mk | 2 +- package/gettext-tiny/gettext-tiny.mk | 2 +- package/go/go.mk | 6 +++--- package/jimtcl/jimtcl.mk | 6 +++--- package/libapparmor/libapparmor.mk | 2 +- package/libva/libva.mk | 2 +- package/lua/lua.mk | 2 +- package/ola/ola.mk | 4 ++-- package/openjdk-bin/openjdk-bin.mk | 2 +- package/php-apcu/php-apcu.mk | 4 ++-- package/php-lua/php-lua.mk | 4 ++-- package/php-pam/php-pam.mk | 4 ++-- package/php-pecl-dbus/php-pecl-dbus.mk | 4 ++-- package/python-cryptography/python-cryptography.mk | 2 +- package/python-pybind/python-pybind.mk | 2 +- package/refpolicy/refpolicy.mk | 2 +- package/rustc/Config.in.host | 8 ++++---- package/zfs/zfs.mk | 2 +- .../package/python-pybind-example/python-pybind-example.mk | 2 +- 24 files changed, 38 insertions(+), 38 deletions(-)
Signature · 10 lines
.-----------------.--------------------.------------------.--------------------. | Yann E. MORIN | Real-Time Embedded | /"\ ASCII RIBBON | Erics' conspiracy: | | +33 662 376 056 | Software Designer | \ / CAMPAIGN | ___ | | +33 561 099 427 `------------.-------: X AGAINST | \e/ There is no | | http://ymorin.is-a-geek.org/ | _/*\_ | / \ HTML MAIL | v conspiracy. | '------------------------------^-------^------------------^--------------------' _______________________________________________ buildroot mailing list [email protected] https://lists.buildroot.org/mailman/listinfo/buildroot
PATCH 1/2 package/rustc: fix target names for i586 and i686
Commit d69d40c029dc (package/rustc: add support for Tier 1 and Tier 2 platforms) misspelled the config options for i586 and i686.
They are BR2_i386_i586 and BR2_i386_i686, not BR2_i586 or BR2_i686.
--- package/rustc/Config.in.host | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-)
package/rustc/Config.in.host +4 -4
@@ -25,7 +25,7 @@ config BR2_PACKAGE_HOST_RUSTC_TARGET_TIER1_PLATFORMS # aarch64-unknown-linux-gnu default y if BR2_aarch64 && BR2_TOOLCHAIN_USES_GLIBC # i686-unknown-linux-gnu - default y if (BR2_i686 || BR2_x86_pentiumpro || BR2_X86_CPU_HAS_MMX) && BR2_TOOLCHAIN_USES_GLIBC + default y if (BR2_x86_i686 || BR2_x86_pentiumpro || BR2_X86_CPU_HAS_MMX) && BR2_TOOLCHAIN_USES_GLIBC # x86_64-unknown-linux-gnu default y if BR2_x86_64 && BR2_TOOLCHAIN_USES_GLIBC
@@ -93,11 +93,11 @@ config BR2_PACKAGE_HOST_RUSTC_TARGET_TIER2_PLATFORMS # userspace default y if BR2_arm && BR2_ARM_CPU_ARMV8A && BR2_ARM_EABIHF && BR2_TOOLCHAIN_USES_MUSL # i586-unknown-linux-gnu - default y if BR2_i586 && BR2_TOOLCHAIN_USES_GLIBC + default y if BR2_x86_i586 && BR2_TOOLCHAIN_USES_GLIBC # i586-unknown-linux-musl - default y if BR2_i586 && BR2_TOOLCHAIN_USES_MUSL + default y if BR2_x86_i586 && BR2_TOOLCHAIN_USES_MUSL # i686-unknown-linux-musl - default y if (BR2_i686 || BR2_x86_pentiumpro || BR2_X86_CPU_HAS_MMX) && BR2_TOOLCHAIN_USES_MUSL + default y if (BR2_x86_i686 || BR2_x86_pentiumpro || BR2_X86_CPU_HAS_MMX) && BR2_TOOLCHAIN_USES_MUSL # mips-unknown-linux-musl default y if BR2_mips && BR2_TOOLCHAIN_USES_MUSL && !BR2_MIPS_CPU_MIPS32R6 # mips64-unknown-linux-muslabi64
Signature · 6 lines
2.25.1 _______________________________________________ buildroot mailing list [email protected] https://lists.buildroot.org/mailman/listinfo/buildroot
Re: [Buildroot] [PATCH 1/2] package/rustc: fix target names for i586 and i686
Hi Yann,
Quoted 4 lines · Yann E. MORIN
Commit
d69d40c029dc(package/rustc: add support for Tier 1 and Tier 2 platforms) misspelled the config options for i586 and i686.They are
BR2_i386_i586andBR2_i386_i686, notBR2_i586orBR2_i686.
You mean BR2_x86_i586 and BR2_x86_i686, right? Because that's what the patch does.
baruch
Quoted 34 lines
Signed-off-by Yann E. MORIN <[email protected]>Cc Thomas Petazzoni <[email protected]>--- package/rustc/Config.in.host | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-)package/rustc/Config.in.host +4
-4@@ -25,7 +25,7 @@ config BR2_PACKAGE_HOST_RUSTC_TARGET_TIER1_PLATFORMS # aarch64-unknown-linux-gnu default y if BR2_aarch64 && BR2_TOOLCHAIN_USES_GLIBC # i686-unknown-linux-gnu - default y if (BR2_i686 || BR2_x86_pentiumpro || BR2_X86_CPU_HAS_MMX) && BR2_TOOLCHAIN_USES_GLIBC + default y if (BR2_x86_i686 || BR2_x86_pentiumpro || BR2_X86_CPU_HAS_MMX) && BR2_TOOLCHAIN_USES_GLIBC # x86_64-unknown-linux-gnu default y if BR2_x86_64 && BR2_TOOLCHAIN_USES_GLIBC@@ -93,11 +93,11 @@ config BR2_PACKAGE_HOST_RUSTC_TARGET_TIER2_PLATFORMS # userspace default y if BR2_arm && BR2_ARM_CPU_ARMV8A && BR2_ARM_EABIHF && BR2_TOOLCHAIN_USES_MUSL # i586-unknown-linux-gnu - default y if BR2_i586 && BR2_TOOLCHAIN_USES_GLIBC + default y if BR2_x86_i586 && BR2_TOOLCHAIN_USES_GLIBC # i586-unknown-linux-musl - default y if BR2_i586 && BR2_TOOLCHAIN_USES_MUSL + default y if BR2_x86_i586 && BR2_TOOLCHAIN_USES_MUSL # i686-unknown-linux-musl - default y if (BR2_i686 || BR2_x86_pentiumpro || BR2_X86_CPU_HAS_MMX) && BR2_TOOLCHAIN_USES_MUSL + default y if (BR2_x86_i686 || BR2_x86_pentiumpro || BR2_X86_CPU_HAS_MMX) && BR2_TOOLCHAIN_USES_MUSL # mips-unknown-linux-musl default y if BR2_mips && BR2_TOOLCHAIN_USES_MUSL && !BR2_MIPS_CPU_MIPS32R6 # mips64-unknown-linux-muslabi64
Signature · 7 lines
~. .~ Tk Open Systems
=}------------------------------------------------ooO--U--Ooo------------{=
- [email protected] - tel: +972.52.368.4656, http://www.tkos.co.il -
_______________________________________________
buildroot mailing list
[email protected]
https://lists.buildroot.org/mailman/listinfo/buildrootRe: [Buildroot] [PATCH 1/2] package/rustc: fix target names for i586 and i686
Baruch, All,
On 2022-07-17 06:21 +0300, Baruch Siach via buildroot spake thusly:
Quoted 8 lines · Yann E. MORIN
Quoted 4 lines
Commit
d69d40c029dc(package/rustc: add support for Tier 1 and Tier 2 platforms) misspelled the config options for i586 and i686.They are
BR2_i386_i586andBR2_i386_i686, notBR2_i586orBR2_i686.You mean
BR2_x86_i586andBR2_x86_i686, right? Because that's what the patch does.
Aha, good catch, thanks! :-)
"Why would I copy-paste the options names, they are simple enough, it's gonna be faster to type them..." did I think while fixing typoes in simple variable names. Doh...
So, I double-checked, and the options really arenamed BR2_x86_i586 and BR2_x86_i686. And this time, I did copy-pate them:-)
Regards,
Yann E. MORIN.
Quoted 46 lines
baruch
Quoted 34 lines
Signed-off-by Yann E. MORIN <[email protected]>Cc Thomas Petazzoni <[email protected]>--- package/rustc/Config.in.host | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-)package/rustc/Config.in.host +4
-4@@ -25,7 +25,7 @@ config BR2_PACKAGE_HOST_RUSTC_TARGET_TIER1_PLATFORMS # aarch64-unknown-linux-gnu default y if BR2_aarch64 && BR2_TOOLCHAIN_USES_GLIBC # i686-unknown-linux-gnu - default y if (BR2_i686 || BR2_x86_pentiumpro || BR2_X86_CPU_HAS_MMX) && BR2_TOOLCHAIN_USES_GLIBC + default y if (BR2_x86_i686 || BR2_x86_pentiumpro || BR2_X86_CPU_HAS_MMX) && BR2_TOOLCHAIN_USES_GLIBC # x86_64-unknown-linux-gnu default y if BR2_x86_64 && BR2_TOOLCHAIN_USES_GLIBC@@ -93,11 +93,11 @@ config BR2_PACKAGE_HOST_RUSTC_TARGET_TIER2_PLATFORMS # userspace default y if BR2_arm && BR2_ARM_CPU_ARMV8A && BR2_ARM_EABIHF && BR2_TOOLCHAIN_USES_MUSL # i586-unknown-linux-gnu - default y if BR2_i586 && BR2_TOOLCHAIN_USES_GLIBC + default y if BR2_x86_i586 && BR2_TOOLCHAIN_USES_GLIBC # i586-unknown-linux-musl - default y if BR2_i586 && BR2_TOOLCHAIN_USES_MUSL + default y if BR2_x86_i586 && BR2_TOOLCHAIN_USES_MUSL # i686-unknown-linux-musl - default y if (BR2_i686 || BR2_x86_pentiumpro || BR2_X86_CPU_HAS_MMX) && BR2_TOOLCHAIN_USES_MUSL + default y if (BR2_x86_i686 || BR2_x86_pentiumpro || BR2_X86_CPU_HAS_MMX) && BR2_TOOLCHAIN_USES_MUSL # mips-unknown-linux-musl default y if BR2_mips && BR2_TOOLCHAIN_USES_MUSL && !BR2_MIPS_CPU_MIPS32R6 # mips64-unknown-linux-muslabi64Signature · 7 lines
~. .~ Tk Open Systems =}------------------------------------------------ooO--U--Ooo------------{= - [email protected] - tel: +972.52.368.4656, http://www.tkos.co.il - _______________________________________________ buildroot mailing list [email protected] https://lists.buildroot.org/mailman/listinfo/buildroot
Signature · 10 lines
.-----------------.--------------------.------------------.--------------------. | Yann E. MORIN | Real-Time Embedded | /"\ ASCII RIBBON | Erics' conspiracy: | | +33 662 376 056 | Software Designer | \ / CAMPAIGN | ___ | | +33 561 099 427 `------------.-------: X AGAINST | \e/ There is no | | http://ymorin.is-a-geek.org/ | _/*\_ | / \ HTML MAIL | v conspiracy. | '------------------------------^-------^------------------^--------------------' _______________________________________________ buildroot mailing list [email protected] https://lists.buildroot.org/mailman/listinfo/buildroot
Romain Naour
Reviewed-byRe: [Buildroot] [PATCH 1/2] package/rustc: fix target names for i586 and i686
Le 17/07/2022 à 08:56, Yann E. MORIN a écrit :
Quoted 12 lines
Baruch, All,
On 2022-07-17 06:21 +0300, Baruch Siach via buildroot spake thusly:
Quoted 8 lines · Yann E. MORIN
Quoted 4 lines
Commit
d69d40c029dc(package/rustc: add support for Tier 1 and Tier 2 platforms) misspelled the config options for i586 and i686.They are
BR2_i386_i586andBR2_i386_i686, notBR2_i586orBR2_i686.You mean
BR2_x86_i586andBR2_x86_i686, right? Because that's what the patch does.
Quoted 8 lines
Aha, good catch, thanks! :-)
"Why would I copy-paste the options names, they are simple enough, it's gonna be faster to type them..." did I think while fixing typoes in simple variable names. Doh...
So, I double-checked, and the options really arenamed
BR2_x86_i586andBR2_x86_i686. And this time, I did copy-pate them:-)
With an updated commit log:
Best regards,
Romain
Quoted 51 lines
Regards,
Yann E. MORIN.Quoted 46 lines
baruch
Quoted 34 lines
Signed-off-by Yann E. MORIN <[email protected]>Cc Thomas Petazzoni <[email protected]>--- package/rustc/Config.in.host | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-)package/rustc/Config.in.host +4
-4@@ -25,7 +25,7 @@ config BR2_PACKAGE_HOST_RUSTC_TARGET_TIER1_PLATFORMS # aarch64-unknown-linux-gnu default y if BR2_aarch64 && BR2_TOOLCHAIN_USES_GLIBC # i686-unknown-linux-gnu - default y if (BR2_i686 || BR2_x86_pentiumpro || BR2_X86_CPU_HAS_MMX) && BR2_TOOLCHAIN_USES_GLIBC + default y if (BR2_x86_i686 || BR2_x86_pentiumpro || BR2_X86_CPU_HAS_MMX) && BR2_TOOLCHAIN_USES_GLIBC # x86_64-unknown-linux-gnu default y if BR2_x86_64 && BR2_TOOLCHAIN_USES_GLIBC@@ -93,11 +93,11 @@ config BR2_PACKAGE_HOST_RUSTC_TARGET_TIER2_PLATFORMS # userspace default y if BR2_arm && BR2_ARM_CPU_ARMV8A && BR2_ARM_EABIHF && BR2_TOOLCHAIN_USES_MUSL # i586-unknown-linux-gnu - default y if BR2_i586 && BR2_TOOLCHAIN_USES_GLIBC + default y if BR2_x86_i586 && BR2_TOOLCHAIN_USES_GLIBC # i586-unknown-linux-musl - default y if BR2_i586 && BR2_TOOLCHAIN_USES_MUSL + default y if BR2_x86_i586 && BR2_TOOLCHAIN_USES_MUSL # i686-unknown-linux-musl - default y if (BR2_i686 || BR2_x86_pentiumpro || BR2_X86_CPU_HAS_MMX) && BR2_TOOLCHAIN_USES_MUSL + default y if (BR2_x86_i686 || BR2_x86_pentiumpro || BR2_X86_CPU_HAS_MMX) && BR2_TOOLCHAIN_USES_MUSL # mips-unknown-linux-musl default y if BR2_mips && BR2_TOOLCHAIN_USES_MUSL && !BR2_MIPS_CPU_MIPS32R6 # mips64-unknown-linux-muslabi64Signature · 7 lines
~. .~ Tk Open Systems =}------------------------------------------------ooO--U--Ooo------------{= - [email protected] - tel: +972.52.368.4656, http://www.tkos.co.il - _______________________________________________ buildroot mailing list [email protected] https://lists.buildroot.org/mailman/listinfo/buildroot
_______________________________________________
buildroot mailing list
[email protected]
https://lists.buildroot.org/mailman/listinfo/buildroot
Re: [Buildroot] [PATCH 1/2] package/rustc: fix target names for i586 and i686
In reply to Yann E. MORINQuoted 9 lines
Quoted 1 line
Quoted 1 line
Quoted 1 line
Quoted 1 line
"Yann" == Yann E MORIN <[email protected]> writes:
Commit
d69d40c029dc(package/rustc: add support for Tier 1 and Tier 2 platforms) misspelled the config options for i586 and i686.They are
BR2_i386_i586andBR2_i386_i686, notBR2_i586orBR2_i686.Signed-off-by Yann E. MORIN <[email protected]>Cc Thomas Petazzoni <[email protected]>
Committed to 2022.05.x and 2022.02.x, thanks.
Signature · 5 lines
Bye, Peter Korsgaard _______________________________________________ buildroot mailing list [email protected] https://lists.buildroot.org/mailman/listinfo/buildroot
PATCH 2/2 pacakge: drop remnants of $(HOST_DIR)/usr
In reply to Yann E. MORINIt'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.
--- boot/grub2/grub2.mk | 2 +- package/abootimg/abootimg.mk | 2 +- package/bind/bind.mk | 2 +- package/compiler-rt/compiler-rt.mk | 2 +- package/dbus-python/dbus-python.mk | 6 +++--- package/gawk/gawk.mk | 2 +- package/gettext-tiny/gettext-tiny.mk | 2 +- package/go/go.mk | 6 +++--- package/jimtcl/jimtcl.mk | 6 +++--- package/libapparmor/libapparmor.mk | 2 +- package/libva/libva.mk | 2 +- package/lua/lua.mk | 2 +- package/ola/ola.mk | 4 ++-- package/openjdk-bin/openjdk-bin.mk | 2 +- package/php-apcu/php-apcu.mk | 4 ++-- package/php-lua/php-lua.mk | 4 ++-- package/php-pam/php-pam.mk | 4 ++-- package/php-pecl-dbus/php-pecl-dbus.mk | 4 ++-- package/python-cryptography/python-cryptography.mk | 2 +- package/python-pybind/python-pybind.mk | 2 +- package/refpolicy/refpolicy.mk | 2 +- package/zfs/zfs.mk | 2 +- .../package/python-pybind-example/python-pybind-example.mk | 2 +- 23 files changed, 34 insertions(+), 34 deletions(-)
boot/grub2/grub2.mk +1 -1
@@ -183,7 +183,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)) \
package/abootimg/abootimg.mk +1 -1
@@ -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))
package/bind/bind.mk +1 -1
@@ -83,7 +83,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
package/compiler-rt/compiler-rt.mk +1 -1
@@ -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
package/dbus-python/dbus-python.mk +3 -3
@@ -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))
package/gawk/gawk.mk +1 -1
@@ -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
package/gettext-tiny/gettext-tiny.mk +1 -1
@@ -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
package/go/go.mk +3 -3
@@ -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"
package/jimtcl/jimtcl.mk +3 -3
@@ -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))
package/libapparmor/libapparmor.mk +1 -1
@@ -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
package/libva/libva.mk +1 -1
@@ -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
package/lua/lua.mk +1 -1
@@ -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
package/ola/ola.mk +2 -2
@@ -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
package/openjdk-bin/openjdk-bin.mk +1 -1
@@ -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
package/php-apcu/php-apcu.mk +2 -2
@@ -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
package/php-lua/php-lua.mk +2 -2
@@ -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
package/php-pam/php-pam.mk +2 -2
@@ -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
package/php-pecl-dbus/php-pecl-dbus.mk +2 -2
@@ -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
package/python-cryptography/python-cryptography.mk +1 -1
@@ -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
package/python-pybind/python-pybind.mk +1 -1
@@ -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)
package/refpolicy/refpolicy.mk +1 -1
@@ -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) \
package/zfs/zfs.mk +1 -1
@@ -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`" \
support/testing/tests/package/br2-external/python-pybind/package/python-pybind-example/python-pybind-example.mk +1 -1
@@ -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) \
Signature · 6 lines
2.25.1 _______________________________________________ buildroot mailing list [email protected] https://lists.buildroot.org/mailman/listinfo/buildroot
Re: [Buildroot] [PATCH 2/2] pacakge: drop remnants of $(HOST_DIR)/usr
Le 16/07/2022 à 23:30, Yann E. MORIN a écrit :
Quoted 51 lines
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
Quoted 5 lines
[*] 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.
A new instance of $(HOST_DIR)/usr has been merged recently:
http://lists.busybox.net/pipermail/buildroot/2022-July/647034.html
Best regards,
Romain
Quoted 371 lines
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 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]>--- boot/grub2/grub2.mk | 2 +- package/abootimg/abootimg.mk | 2 +- package/bind/bind.mk | 2 +- package/compiler-rt/compiler-rt.mk | 2 +- package/dbus-python/dbus-python.mk | 6 +++--- package/gawk/gawk.mk | 2 +- package/gettext-tiny/gettext-tiny.mk | 2 +- package/go/go.mk | 6 +++--- package/jimtcl/jimtcl.mk | 6 +++--- package/libapparmor/libapparmor.mk | 2 +- package/libva/libva.mk | 2 +- package/lua/lua.mk | 2 +- package/ola/ola.mk | 4 ++-- package/openjdk-bin/openjdk-bin.mk | 2 +- package/php-apcu/php-apcu.mk | 4 ++-- package/php-lua/php-lua.mk | 4 ++-- package/php-pam/php-pam.mk | 4 ++-- package/php-pecl-dbus/php-pecl-dbus.mk | 4 ++-- package/python-cryptography/python-cryptography.mk | 2 +- package/python-pybind/python-pybind.mk | 2 +- package/refpolicy/refpolicy.mk | 2 +- package/zfs/zfs.mk | 2 +- .../package/python-pybind-example/python-pybind-example.mk | 2 +- 23 files changed, 34 insertions(+), 34 deletions(-)boot/grub2/grub2.mk +1
-1@@ -183,7 +183,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)) \package/abootimg/abootimg.mk +1
-1@@ -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))package/bind/bind.mk +1
-1@@ -83,7 +83,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 endifpackage/compiler-rt/compiler-rt.mk +1
-1@@ -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 runtimepackage/dbus-python/dbus-python.mk +3
-3@@ -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))package/gawk/gawk.mk +1
-1@@ -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_SYMLINKpackage/gettext-tiny/gettext-tiny.mk +1
-1@@ -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 toolpackage/go/go.mk +3
-3@@ -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"package/jimtcl/jimtcl.mk +3
-3@@ -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))package/libapparmor/libapparmor.mk +1
-1@@ -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) elsepackage/libva/libva.mk +1
-1@@ -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-waylandpackage/lua/lua.mk +1
-1@@ -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_LUACONFpackage/ola/ola.mk +2
-2@@ -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 olapackage/openjdk-bin/openjdk-bin.mk +1
-1@@ -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: packagepackage/php-apcu/php-apcu.mk +2
-2@@ -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_PHPIZEpackage/php-lua/php-lua.mk +2
-2@@ -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_PHPIZEpackage/php-pam/php-pam.mk +2
-2@@ -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_PHPIZEpackage/php-pecl-dbus/php-pecl-dbus.mk +2
-2@@ -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_PHPIZEpackage/python-cryptography/python-cryptography.mk +1
-1@@ -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-rustcpackage/python-pybind/python-pybind.mk +1
-1@@ -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)package/refpolicy/refpolicy.mk +1
-1@@ -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) \package/zfs/zfs.mk +1
-1@@ -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`" \support/testing/tests/package/br2-external/python-pybind/package/python-pybind-example/python-pybind-example.mk +0
-0
support/testing/tests/package/br2-external/python-pybind/package/python-pybind-example/python-pybind-example.mk line 16
Quoted 8 lines
support/testing/tests/package/br2-external/python-pybind/package/python-pybind-example/python-pybind-example.mk +1
-1@@ -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) \
_______________________________________________
buildroot mailing list
[email protected]
https://lists.buildroot.org/mailman/listinfo/buildroot
All,
On 2022-07-16 23:30 +0200, Yann E. MORIN spake thusly:
Quoted 10 lines
Back in 2017.08, we dropped the use of $(HOST_DIR)/usr as a prefix, and just installed with $(HOST_DIR) as a prefix. At least, the migration information was added as
c8f51a00d8ecfor 2017.08.
5 years ago.
And we still had a few packages that installed stuff in there, or used stuff from there.
Fix those.
In the process of testing the change, we noticed that the conditions for the rustc tier-1 and tier-2 platforms were incorrect, so we fixed them too.
Series applied to master, after fixing issues pointed out by Baruch and Romain.
Regards,
Yann E. MORIN.
Signature · 10 lines
.-----------------.--------------------.------------------.--------------------. | Yann E. MORIN | Real-Time Embedded | /"\ ASCII RIBBON | Erics' conspiracy: | | +33 662 376 056 | Software Designer | \ / CAMPAIGN | ___ | | +33 561 099 427 `------------.-------: X AGAINST | \e/ There is no | | http://ymorin.is-a-geek.org/ | _/*\_ | / \ HTML MAIL | v conspiracy. | '------------------------------^-------^------------------^--------------------' _______________________________________________ buildroot mailing list [email protected] https://lists.buildroot.org/mailman/listinfo/buildroot