mirror of
https://gitlab.com/buildroot.org/buildroot.git
synced 2026-09-19 16:40:46 -09:00
package/bash: use --bindir instead of exec_prefix=
We want bash to be installed as /bin/bash. For ages, Buildroot has been doing this by overriding exec_prefix at install time. First of all, it would be preferred to do this at configure time. But also, overriding exec_prefix not only changes where "bash" goes, but also where the pkgconfig file goes. Due to this, bash.pc goes into /lib/pkgconfig/, and doesn't get removed by target-finalize. Since all we want is to have 'bash' as /bin/bash, simply pass --bindir=/bin at configure time. This allows to use the default target installation logic for autotools-package. We keep a post-install target hook to remove /bin/bashbug. Signed-off-by: Thomas Petazzoni <thomas.petazzoni@bootlin.com> Cc: Nicolas Cavallari <nicolas.cavallari@green-communications.fr> Signed-off-by: Yann E. MORIN <yann.morin.1998@free.fr>
This commit is contained in:
committed by
Yann E. MORIN
parent
8cf034ab0f
commit
73aed53c82
@@ -7,11 +7,16 @@
|
|||||||
BASH_VERSION = 5.1
|
BASH_VERSION = 5.1
|
||||||
BASH_SITE = $(BR2_GNU_MIRROR)/bash
|
BASH_SITE = $(BR2_GNU_MIRROR)/bash
|
||||||
BASH_DEPENDENCIES = ncurses readline host-bison
|
BASH_DEPENDENCIES = ncurses readline host-bison
|
||||||
BASH_CONF_OPTS = --with-installed-readline --without-bash-malloc
|
|
||||||
BASH_LICENSE = GPL-3.0+
|
BASH_LICENSE = GPL-3.0+
|
||||||
BASH_LICENSE_FILES = COPYING
|
BASH_LICENSE_FILES = COPYING
|
||||||
BASH_CPE_ID_VENDOR = gnu
|
BASH_CPE_ID_VENDOR = gnu
|
||||||
|
|
||||||
|
# We want the bash binary in /bin
|
||||||
|
BASH_CONF_OPTS = \
|
||||||
|
--bindir=/bin \
|
||||||
|
--with-installed-readline \
|
||||||
|
--without-bash-malloc
|
||||||
|
|
||||||
BASH_CONF_ENV += \
|
BASH_CONF_ENV += \
|
||||||
ac_cv_rl_prefix="$(STAGING_DIR)" \
|
ac_cv_rl_prefix="$(STAGING_DIR)" \
|
||||||
ac_cv_rl_version="$(READLINE_VERSION)" \
|
ac_cv_rl_version="$(READLINE_VERSION)" \
|
||||||
@@ -38,11 +43,10 @@ BASH_CONF_ENV += bash_cv_getenv_redef=yes
|
|||||||
endif
|
endif
|
||||||
endif
|
endif
|
||||||
|
|
||||||
define BASH_INSTALL_TARGET_CMDS
|
define BASH_REMOVE_UNUSED_FILES
|
||||||
$(TARGET_MAKE_ENV) $(MAKE) -C $(@D) \
|
|
||||||
DESTDIR=$(TARGET_DIR) exec_prefix=/ install
|
|
||||||
rm -f $(TARGET_DIR)/bin/bashbug
|
rm -f $(TARGET_DIR)/bin/bashbug
|
||||||
endef
|
endef
|
||||||
|
BASH_POST_INSTALL_TARGET_HOOKS += BASH_REMOVE_UNUSED_FILES
|
||||||
|
|
||||||
# Add /bin/bash to /etc/shells otherwise some login tools like dropbear
|
# Add /bin/bash to /etc/shells otherwise some login tools like dropbear
|
||||||
# can reject the user connection. See man shells.
|
# can reject the user connection. See man shells.
|
||||||
|
|||||||
Reference in New Issue
Block a user