busybox: get rid of BR2_PACKAGE_BUSYBOX_FULLINSTALL

As discussed on IRC, this only needs to be disabled for very specific
configurations, and it can nowadays be done with a custom busybox
.config (CONFIG_INSTALL_APPLET_DONT), so get rid of the option.

Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
This commit is contained in:
Peter Korsgaard 2010-12-21 20:25:29 +01:00
parent a7472011ae
commit c482c5ab6f
2 changed files with 1 additions and 23 deletions

View File

@ -42,18 +42,6 @@ config BR2_BUSYBOX_VERSION
default "1.17.4" if BR2_BUSYBOX_VERSION_1_17_X
default "1.18.1" if BR2_BUSYBOX_VERSION_1_18_X
config BR2_PACKAGE_BUSYBOX_FULLINSTALL
bool "Install symlinks to BusyBox applets"
default y
help
If you want to run BusyBox's own full install for the
configured applets, then answer Y.
This may overwrite files from other packages if your
busybox includes replacement applets for the package.
If you wish to just install /bin/busybox, then answer N.
config BR2_PACKAGE_BUSYBOX_CONFIG
string "BusyBox configuration file to use?"
default "package/busybox/busybox-1.18.x.config" if BR2_PACKAGE_BUSYBOX_SNAPSHOT

View File

@ -126,21 +126,11 @@ define BUSYBOX_BUILD_CMDS
CROSS_COMPILE="$(TARGET_CROSS)" -C $(@D)
endef
ifeq ($(BR2_PACKAGE_BUSYBOX_FULLINSTALL),y)
define BUSYBOX_INSTALL_BINARY
define BUSYBOX_INSTALL_TARGET_CMDS
$(BUSYBOX_MAKE_ENV) $(MAKE) CC="$(TARGET_CC)" ARCH=$(KERNEL_ARCH) \
PREFIX="$(TARGET_DIR)" EXTRA_LDFLAGS="$(TARGET_LDFLAGS)" \
CROSS_COMPILE="$(TARGET_CROSS)" CONFIG_PREFIX="$(TARGET_DIR)" \
-C $(@D) install
endef
else
define BUSYBOX_INSTALL_BINARY
install -D -m 0755 $(BUSYBOX_DIR)/busybox $(TARGET_DIR)/bin/busybox
endef
endif
define BUSYBOX_INSTALL_TARGET_CMDS
$(BUSYBOX_INSTALL_BINARY)
if [ ! -f $(TARGET_DIR)/usr/share/udhcpc/default.script ]; then \
$(INSTALL) -m 0755 -D package/busybox/udhcpc.script \
$(TARGET_DIR)/usr/share/udhcpc/default.script; \