jeans/motioneyeos
jeans/motioneyeos
1
0
Fork 0
mirror of https://github.com/motioneye-project/motioneyeos.git synced 2025-07-27 21:26:36 +00:00
Code Issues Packages Projects Releases Wiki Activity

bash: minor install tweaks

Browse Source 
Remove the old symlink backup since we don't do uninstalls now.
Make the busybox dependency conditional shorter.

Signed-off-by: Gustavo Zacarias <gustavo@zacarias.com.ar>
Signed-off-by: Peter Korsgaard <peter@korsgaard.com>
This commit is contained in:
Gustavo Zacarias 2014-10-08 10:19:47 -03:00 committed by Peter Korsgaard
parent a0af871d00
commit 350bd00ec5
1 changed files with 4 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
package/bash/bash.mk
View File

@ -6,7 +6,9 @@
BASH_VERSION = 4.3 BASH_VERSION = 4.3
BASH_SITE = $(BR2_GNU_MIRROR)/bash BASH_SITE = $(BR2_GNU_MIRROR)/bash
BASH_DEPENDENCIES = ncurses readline host-bison # Build after since bash is better than busybox shells
BASH_DEPENDENCIES = ncurses readline host-bison \
$(if $(BR2_PACKAGE_BUSYBOX),busybox)
BASH_CONF_OPTS = --with-installed-readline BASH_CONF_OPTS = --with-installed-readline
BASH_LICENSE = GPLv3+ BASH_LICENSE = GPLv3+
BASH_LICENSE_FILES = COPYING BASH_LICENSE_FILES = COPYING
@ -28,19 +30,11 @@ ifeq ($(BR2_PREFER_STATIC_LIB),y)
BASH_CONF_OPTS += --enable-static-link --without-bash-malloc BASH_CONF_OPTS += --enable-static-link --without-bash-malloc
endif endif
# Make sure we build after busybox so that /bin/sh links to bash # Make /bin/sh -> bash (no other shell, better than busybox shells)
ifeq ($(BR2_PACKAGE_BUSYBOX),y)
BASH_DEPENDENCIES += busybox
endif
# Save the old sh file/link if there is one and symlink bash->sh
define BASH_INSTALL_TARGET_CMDS define BASH_INSTALL_TARGET_CMDS
$(TARGET_MAKE_ENV) $(MAKE) -C $(@D) \ $(TARGET_MAKE_ENV) $(MAKE) -C $(@D) \
DESTDIR=$(TARGET_DIR) exec_prefix=/ install DESTDIR=$(TARGET_DIR) exec_prefix=/ install
rm -f $(TARGET_DIR)/bin/bashbug rm -f $(TARGET_DIR)/bin/bashbug
if [ -e $(TARGET_DIR)/bin/sh ]; then \
mv -f $(TARGET_DIR)/bin/sh $(TARGET_DIR)/bin/sh.prebash; \
fi
ln -sf bash $(TARGET_DIR)/bin/sh ln -sf bash $(TARGET_DIR)/bin/sh
endef endef