diff options
| -rw-r--r-- | package/busybox/busybox.mk | 10 | ||||
| -rw-r--r-- | target/linux/Makefile.in | 9 |
2 files changed, 16 insertions, 3 deletions
diff --git a/package/busybox/busybox.mk b/package/busybox/busybox.mk index 8e8042b8b..53feaee84 100644 --- a/package/busybox/busybox.mk +++ b/package/busybox/busybox.mk @@ -28,8 +28,6 @@ endif $(DL_DIR)/$(BUSYBOX_SOURCE): $(WGET) -P $(DL_DIR) $(BUSYBOX_SITE)/$(BUSYBOX_SOURCE) -busybox-source: $(DL_DIR)/$(BUSYBOX_SOURCE) $(BUSYBOX_CONFIG_FILE) - $(BUSYBOX_DIR)/.unpacked: $(DL_DIR)/$(BUSYBOX_SOURCE) $(BUSYBOX_UNZIP) $(DL_DIR)/$(BUSYBOX_SOURCE) | tar -C $(PROJECT_BUILD_DIR) $(TAR_OPTIONS) - ifeq ($(BR2_PACKAGE_SYSKLOGD),y) @@ -127,8 +125,16 @@ endif busybox: uclibc $(TARGET_DIR)/bin/busybox +busybox-source: $(DL_DIR)/$(BUSYBOX_SOURCE) $(BUSYBOX_CONFIG_FILE) + +busybox-unpacked: $(BUSYBOX_DIR)/.unpacked + +busybox-config: $(BUSYBOX_DIR)/.configured + busybox-menuconfig: host-sed $(PROJECT_BUILD_DIR) busybox-source $(BUSYBOX_DIR)/.configured $(MAKE) __TARGET_ARCH=$(ARCH) -C $(BUSYBOX_DIR) menuconfig + +busybox-update: cp -f $(BUSYBOX_DIR)/.config $(BUSYBOX_CONFIG_FILE) busybox-clean: diff --git a/target/linux/Makefile.in b/target/linux/Makefile.in index 62ce86a68..91132f145 100644 --- a/target/linux/Makefile.in +++ b/target/linux/Makefile.in @@ -209,6 +209,11 @@ linux26-menuconfig: $(LINUX26_DIR)/.patched host-sed $(MAKE) $(LINUX26_MAKE_FLAGS) -C $(LINUX26_DIR) menuconfig -[ -f $(LINUX26_DIR)/.config ] && touch $(LINUX26_DIR)/.configured +linux26-xconfig: $(LINUX26_DIR)/.patched host-sed + [ -f $(LINUX26_DIR)/.config ] || cp $(LINUX26_KCONFIG) $(LINUX26_DIR)/.config + $(MAKE) $(LINUX26_MAKE_FLAGS) -C $(LINUX26_DIR) xconfig + -[ -f $(LINUX26_DIR)/.config ] && touch $(LINUX26_DIR)/.configured + linux26: $(LINUX26_KERNEL) $(LINUX26_DIR)/.modules_installed: $(TARGET_DIR)/lib/modules/$(LINUX26_VERSION)/modules.dep @@ -218,7 +223,9 @@ linux26-modules: cross-depmod26 $(LINUX26_DIR)/.modules_installed linux26-source: $(DL_DIR)/$(LINUX26_SOURCE) -linux26-patched: $(LINUX26_DIR)/.patched +linux26-unpacked: $(LINUX26_DIR)/.patched + +linux26-config: $(LINUX26_DIR)/.configured # This has been renamed so we do _NOT_ by default run this on 'make clean' linux26clean: |