diff --git a/archive-configs/busybox-hd1.config b/archive-configs/busybox-hd1.config index b7648d69..fae92dab 100644 --- a/archive-configs/busybox-hd1.config +++ b/archive-configs/busybox-hd1.config @@ -1,7 +1,7 @@ # # Automatically generated make config: do not edit -# Busybox version: 1.27.1 -# Mon Aug 14 15:38:50 2017 +# Busybox version: 1.27.2 +# Fri Aug 25 11:00:55 2017 # CONFIG_HAVE_DOT_CONFIG=y @@ -10,6 +10,7 @@ CONFIG_HAVE_DOT_CONFIG=y # # CONFIG_DESKTOP is not set # CONFIG_EXTRA_COMPAT is not set +# CONFIG_FEDORA_COMPAT is not set CONFIG_INCLUDE_SUSv2=y # CONFIG_USE_PORTABLE_CODE is not set CONFIG_SHOW_USAGE=y @@ -164,8 +165,8 @@ CONFIG_LZOP=y # CONFIG_UNLZOP is not set # CONFIG_LZOPCAT is not set # CONFIG_LZOP_COMPR_HIGH is not set -# CONFIG_RPM2CPIO is not set # CONFIG_RPM is not set +# CONFIG_RPM2CPIO is not set CONFIG_TAR=y CONFIG_FEATURE_TAR_LONG_OPTIONS=y CONFIG_FEATURE_TAR_CREATE=y @@ -328,10 +329,10 @@ CONFIG_USLEEP=y # CONFIG_UUENCODE is not set CONFIG_WC=y # CONFIG_FEATURE_WC_LARGE is not set -# CONFIG_WHOAMI is not set # CONFIG_WHO is not set # CONFIG_W is not set # CONFIG_USERS is not set +# CONFIG_WHOAMI is not set CONFIG_YES=y # @@ -488,11 +489,11 @@ CONFIG_USE_BB_PWD_GRP=y # CONFIG_USE_BB_SHADOW is not set CONFIG_USE_BB_CRYPT=y # CONFIG_USE_BB_CRYPT_SHA is not set +# CONFIG_ADD_SHELL is not set +# CONFIG_REMOVE_SHELL is not set # CONFIG_ADDGROUP is not set # CONFIG_FEATURE_ADDGROUP_LONG_OPTIONS is not set # CONFIG_FEATURE_ADDUSER_TO_GROUP is not set -# CONFIG_ADD_SHELL is not set -# CONFIG_REMOVE_SHELL is not set # CONFIG_ADDUSER is not set # CONFIG_FEATURE_ADDUSER_LONG_OPTIONS is not set # CONFIG_FEATURE_CHECK_NAMES is not set @@ -735,10 +736,10 @@ CONFIG_CRONTAB=y # CONFIG_FEATURE_DEVFS is not set # CONFIG_DEVMEM is not set # CONFIG_FBSPLASH is not set -# CONFIG_FLASHCP is not set # CONFIG_FLASH_ERASEALL is not set CONFIG_FLASH_LOCK=y CONFIG_FLASH_UNLOCK=y +# CONFIG_FLASHCP is not set # CONFIG_HDPARM is not set # CONFIG_FEATURE_HDPARM_GET_IDENTITY is not set # CONFIG_FEATURE_HDPARM_HDIO_SCAN_HWIF is not set @@ -781,13 +782,13 @@ CONFIG_PARTPROBE=y CONFIG_STRINGS=y CONFIG_TIME=y # CONFIG_TTYSIZE is not set -CONFIG_UBIRENAME=y # CONFIG_UBIATTACH is not set # CONFIG_UBIDETACH is not set # CONFIG_UBIMKVOL is not set # CONFIG_UBIRMVOL is not set # CONFIG_UBIRSVOL is not set # CONFIG_UBIUPDATEVOL is not set +CONFIG_UBIRENAME=y # CONFIG_VOLNAME is not set # CONFIG_WATCHDOG is not set diff --git a/make/system-tools-extra.mk b/make/system-tools-extra.mk index 737d1709..b1224747 100644 --- a/make/system-tools-extra.mk +++ b/make/system-tools-extra.mk @@ -234,3 +234,17 @@ $(D)/python: $(ARCHIVE)/Python-$(PYTHON_VER).tgz | $(TARGETPREFIX) chmod +w $(TARGETLIB)/libpython* install -m755 $(BUILD_TMP)/Python-$(PYTHON_VER)/_install/bin/python $(TARGETPREFIX)/bin/ $(REMOVE)/Python-$(PYTHON_VER) + +$(D)/busybox-hd1: $(ARCHIVE)/busybox-1.20.2.tar.bz2 | $(TARGETPREFIX) + $(REMOVE)/busybox-1.20.2 + $(UNTAR)/busybox-1.20.2.tar.bz2 + pushd $(BUILD_TMP)/busybox-1.20.2 && \ + for patch in $(PATCHES)/busybox-1.20.2/*; do \ + patch -p1 -i $$patch; \ + done; \ + cp $(CONFIGS)/busybox-1.20.config .config && \ + $(MAKE) busybox $(BUSYBOX_MAKE_OPTS) && \ + make install $(BUSYBOX_MAKE_OPTS) + $(REMOVE)/busybox-1.20.2 + touch $@ + diff --git a/make/system-tools.mk b/make/system-tools.mk index a9de3d6f..afeddc0c 100644 --- a/make/system-tools.mk +++ b/make/system-tools.mk @@ -344,8 +344,6 @@ $(D)/minicom: $(D)/libncurses $(ARCHIVE)/minicom-$(MINICOM_VER).tar.gz | $(TARGE $(REMOVE)/minicom-$(MINICOM_VER) touch $@ -busybox: busybox-$(BOXSERIES) - # Link against libtirpc so that we can leverage its RPC # support for NFS mounting with BusyBox BUSYBOX_CFLAGS = $(TARGET_CFLAGS) @@ -369,7 +367,7 @@ BUSYBOX_MAKE_OPTS = \ EXTRA_LDFLAGS="$(TARGET_LDFLAGS)" \ CONFIG_PREFIX="$(TARGETPREFIX)" -$(D)/busybox-hd2: $(D)/libtirpc $(ARCHIVE)/busybox-$(BUSYBOX_VER).tar.bz2 | $(TARGETPREFIX) +$(D)/busybox: $(D)/libtirpc $(ARCHIVE)/busybox-$(BUSYBOX_VER).tar.bz2 | $(TARGETPREFIX) $(REMOVE)/busybox-$(BUSYBOX_VER) $(UNTAR)/busybox-$(BUSYBOX_VER).tar.bz2 pushd $(BUILD_TMP)/busybox-$(BUSYBOX_VER) && \ @@ -383,19 +381,6 @@ $(D)/busybox-hd2: $(D)/libtirpc $(ARCHIVE)/busybox-$(BUSYBOX_VER).tar.bz2 | $(TA $(REMOVE)/busybox-$(BUSYBOX_VER) touch $@ -$(D)/busybox-hd1: $(ARCHIVE)/busybox-1.20.2.tar.bz2 | $(TARGETPREFIX) - $(REMOVE)/busybox-1.20.2 - $(UNTAR)/busybox-1.20.2.tar.bz2 - pushd $(BUILD_TMP)/busybox-1.20.2 && \ - for patch in $(PATCHES)/busybox-1.20.2/*; do \ - patch -p1 -i $$patch; \ - done; \ - cp $(CONFIGS)/busybox-1.20.config .config && \ - $(MAKE) busybox $(BUSYBOX_MAKE_OPTS) && \ - make install $(BUSYBOX_MAKE_OPTS) - $(REMOVE)/busybox-1.20.2 - touch $@ - $(D)/bash: $(ARCHIVE)/bash-$(BASH_VER).tar.gz | $(TARGETPREFIX) $(REMOVE)/bash-$(BASH_VER) $(UNTAR)/bash-$(BASH_VER).tar.gz