diff options
| -rw-r--r-- | Makefile | 21 | ||||
| -rw-r--r-- | dl/.gitignore | 2 | ||||
| -rw-r--r-- | packages/busybox/busybox.mk | 12 |
3 files changed, 34 insertions, 1 deletions
@@ -100,3 +100,24 @@ include mk/toolchain.mk include mk/packages.mk include mk/rootfs.mk +busybox_config: +ifeq ($(CONFIG_EMBTK_DOTCONFIG),) + $(call EMBTK_GENERIC_MESSAGE,"Please run make xconfig and configure EmbToolkit first") + @echo + @echo +else ifeq ($(CONFIG_EMBTK_HAVE_ROOTFS),) + $(call EMBTK_GENERIC_MESSAGE,"Please run make xconfig and enable build of root filesystem") + @echo + @echo +else ifeq ($(CONFIG_EMBTK_ROOTFS_HAVE_BB),) + $(call EMBTK_GENERIC_MESSAGE,"Please run make xconfig and enable build of Busybox") + @echo + @echo +else + $(MAKE) mkinitialpath + $(MAKE) download_busybox $(BB_BUILD_DIR)/.decompressed \ + $(BB_BUILD_DIR)/.Config.in.renewed + KCONFIG_CONFIG=$(BB_BUILD_DIR)/.config \ + scripts/kconfig/qconf $(BB_BUILD_DIR)/Config.in.new +endif + diff --git a/dl/.gitignore b/dl/.gitignore new file mode 100644 index 0000000..d6129b2 --- /dev/null +++ b/dl/.gitignore @@ -0,0 +1,2 @@ +*.bz2 +*.gz diff --git a/packages/busybox/busybox.mk b/packages/busybox/busybox.mk index a5c6062..9da0909 100644 --- a/packages/busybox/busybox.mk +++ b/packages/busybox/busybox.mk @@ -30,7 +30,8 @@ BB_BUILD_DIR := $(PACKAGES_BUILD)/busybox-$(BB_VERSION) busybox_install: $(BB_BUILD_DIR)/.installed -$(BB_BUILD_DIR)/.installed: download_busybox $(BB_BUILD_DIR)/.decompressed +$(BB_BUILD_DIR)/.installed: download_busybox $(BB_BUILD_DIR)/.decompressed \ + $(BB_BUILD_DIR)/.patched $(BB_BUILD_DIR)/.Config.in.renewed CFLAGS="-Os -pipe -fno-strict-aliasing" \ $(MAKE) -C $(BB_BUILD_DIR) CROSS_COMPILE=$(TOOLS)/bin/$(STRICT_GNU_TARGET)- \ CONFIG_PREFIX=$(ROOTFS) install @@ -46,3 +47,12 @@ $(BB_BUILD_DIR)/.decompressed: @test -e $(BB_BUILD_DIR)/.config || \ cp $(EMBTK_ROOT)/packages/busybox/$(BB_DOT_CONFIG) $(BB_BUILD_DIR)/.config @touch $@ + +$(BB_BUILD_DIR)/.Config.in.renewed: + @cd $(PACKAGES_BUILD)/busybox-$(BB_VERSION); \ + sed 's|source |source $(BB_BUILD_DIR)/|' < Config.in >Config.in.tmp; \ + sed 's/networking\/Config.in/&.new/' <Config.in.tmp >Config.in.new; \ + cd networking; \ + sed 's|source networking|source $(BB_BUILD_DIR)/networking|' < Config.in >Config.in.new + touch $@ + |