Browse Source

- unify busybox.config names; align patch

master
vanhofen 6 years ago
parent
commit
60fdceff83
  1. 0
      archive-configs/busybox-armbox-hd51.config
  2. 2
      archive-patches/busybox-mount_single_uuid.patch
  3. 6
      make/system-tools.mk

0
archive-configs/busybox-armbox.config → archive-configs/busybox-armbox-hd51.config

2
archive-patches/busybox-mount_single_uuid.patch

@ -1,6 +1,6 @@
--- a/util-linux/mount.c
+++ b/util-linux/mount.c
@@ -2315,6 +2315,8 @@ int mount_main(int argc UNUSED_PARAM, ch
@@ -2323,6 +2323,8 @@ int mount_main(int argc UNUSED_PARAM, ch
// "proc") or a full path from root
if (argv[0]) {

6
make/system-tools.mk

@ -44,13 +44,9 @@ BUSYBOX_MAKE_OPTS = \
$(D)/busybox: $(D)/libtirpc $(ARCHIVE)/$(BUSYBOX_SOURCE) | $(TARGET_DIR)
$(REMOVE)/busybox-$(BUSYBOX_VER)
$(UNTAR)/$(BUSYBOX_SOURCE)
ifeq ($(BOXTYPE), coolstream)
cp $(CONFIGS)/busybox-$(BOXTYPE)-$(BOXSERIES).config $(BUILD_TMP)/busybox-$(BUSYBOX_VER)/.config
else
cp $(CONFIGS)/busybox-$(BOXTYPE).config $(BUILD_TMP)/busybox-$(BUSYBOX_VER)/.config
endif
$(CHDIR)/busybox-$(BUSYBOX_VER); \
$(call apply_patches, $(BUSYBOX_PATCH)); \
cp $(CONFIGS)/busybox-$(BOXTYPE)-$(BOXSERIES).config .config; \
sed -i -e 's|^CONFIG_PREFIX=.*|CONFIG_PREFIX="$(TARGET_DIR)"|' .config; \
$(BUSYBOX_MAKE_ENV) $(MAKE) busybox $(BUSYBOX_MAKE_OPTS); \
$(BUSYBOX_MAKE_ENV) $(MAKE) install $(BUSYBOX_MAKE_OPTS)

Loading…
Cancel
Save