busybox: unify duplicated build steps
PATCH v2 1/2 busybox: unify duplicated build steps
This does set a few more vars in some steps that weren't set before, but they should be harmless in the contexts in question. And the resulting save in duplication is nice.
---
v2
- remove some code unification to appease thomas
package/busybox/busybox.mk | 29 ++++++++++++----------------- 1 files changed, 12 insertions(+), 17 deletions(-)
package/busybox/busybox.mk +12 -17
@@ -15,6 +15,13 @@ BUSYBOX_SOURCE = busybox-$(BUSYBOX_VERSION).tar.bz2 BUSYBOX_BUILD_CONFIG = $(BUSYBOX_DIR)/.config # Allows the build system to tweak CFLAGS BUSYBOX_MAKE_ENV = $(TARGET_MAKE_ENV) CFLAGS="$(TARGET_CFLAGS) -I$(LINUX_HEADERS_DIR)/include" +BUSYBOX_MAKE_OPTS = \ + CC="$(TARGET_CC)" \ + ARCH=$(KERNEL_ARCH) \ + PREFIX="$(TARGET_DIR)" \ + EXTRA_LDFLAGS="$(TARGET_LDFLAGS)" \ + CROSS_COMPILE="$(TARGET_CROSS)" \ + CONFIG_PREFIX="$(TARGET_DIR)" ifndef BUSYBOX_CONFIG_FILE BUSYBOX_CONFIG_FILE = $(call qstrip,$(BR2_PACKAGE_BUSYBOX_CONFIG))
@@ -121,17 +128,12 @@ define BUSYBOX_CONFIGURE_CMDS endef define BUSYBOX_BUILD_CMDS - $(BUSYBOX_MAKE_ENV) $(MAKE) CC="$(TARGET_CC)" ARCH=$(KERNEL_ARCH) \ - PREFIX="$(TARGET_DIR)" EXTRA_LDFLAGS="$(TARGET_LDFLAGS)" \ - CROSS_COMPILE="$(TARGET_CROSS)" -C $(@D) + $(BUSYBOX_MAKE_ENV) $(MAKE) $(BUSYBOX_MAKE_OPTS) -C $(@D) endef ifeq ($(BR2_PACKAGE_BUSYBOX_FULLINSTALL),y) define BUSYBOX_INSTALL_BINARY - $(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 + $(BUSYBOX_MAKE_ENV) $(MAKE) $(BUSYBOX_MAKE_OPTS) -C $(@D) install endef else define BUSYBOX_INSTALL_BINARY
@@ -145,24 +147,17 @@ define BUSYBOX_INSTALL_TARGET_CMDS endef define BUSYBOX_UNINSTALL_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) uninstall + $(BUSYBOX_MAKE_ENV) $(MAKE) $(BUSYBOX_MAKE_OPTS) -C $(@D) uninstall endef define BUSYBOX_CLEAN_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) clean + $(BUSYBOX_MAKE_ENV) $(MAKE) $(BUSYBOX_MAKE_OPTS) -C $(@D) clean endef $(eval $(call GENTARGETS,package,busybox)) busybox-menuconfig: $(BUSYBOX_DIR)/.stamp_extracted - $(BUSYBOX_MAKE_ENV) $(MAKE) ARCH=$(KERNEL_ARCH) \ - CROSS_COMPILE="$(TARGET_CROSS)" -C $(BUSYBOX_DIR) menuconfig + $(BUSYBOX_MAKE_ENV) $(MAKE) $(BUSYBOX_MAKE_OPTS) -C $(@D) menuconfig rm -f $(BUSYBOX_DIR)/.stamp_built rm -f $(BUSYBOX_DIR)/.stamp_target_installed
Signature · 1 line
1.7.3.3
PATCH v2 2/2 busybox: let buildroot handle stripping
For some ABI's (like FLAT), we cannot strip busybox as the file format does not support it and strip will abort with errors like 'File format not recognized'. Since the toplevel already takes care of stripping things, simply disable the busybox step.
---
v2
- rebase on top of new unification code
package/busybox/busybox.mk | 3 ++- 1 files changed, 2 insertions(+), 1 deletions(-)
package/busybox/busybox.mk +2 -1
@@ -21,7 +21,8 @@ BUSYBOX_MAKE_OPTS = \ PREFIX="$(TARGET_DIR)" \ EXTRA_LDFLAGS="$(TARGET_LDFLAGS)" \ CROSS_COMPILE="$(TARGET_CROSS)" \ - CONFIG_PREFIX="$(TARGET_DIR)" + CONFIG_PREFIX="$(TARGET_DIR)" \ + SKIP_STRIP=y ifndef BUSYBOX_CONFIG_FILE BUSYBOX_CONFIG_FILE = $(call qstrip,$(BR2_PACKAGE_BUSYBOX_CONFIG))
Signature · 1 line
1.7.3.3
PATCH v2 1/2 busybox: unify duplicated build steps
In reply to Mike Frysingerpackage/busybox/busybox.mk define BUSYBOX_INSTALL_TARGET_CMDS · line 162
Quoted 6 lines · On Sun, 12 Dec 2010 11:58:06 -0500 Mike Frysinger <[email protected]> wrote:
busybox-menuconfig: $(BUSYBOX_DIR)/.stamp_extracted
package/busybox/busybox.mk +1
-2- $(BUSYBOX_MAKE_ENV) $(MAKE) ARCH=$(KERNEL_ARCH) \ - CROSS_COMPILE="$(TARGET_CROSS)" -C $(BUSYBOX_DIR) menuconfig + $(BUSYBOX_MAKE_ENV) $(MAKE) $(BUSYBOX_MAKE_OPTS) -C $(@D) menuconfig rm -f $(BUSYBOX_DIR)/.stamp_built rm -f $(BUSYBOX_DIR)/.stamp_target_installed
Here you should keep -C $(BUSYBOX_DIR). We are not inside a package _CMDS, so $(@D) is in fact the main Buildroot source directory, so running make busybox-menuconfig starts the Buildroot menuconfig.
Thomas
Signature · 4 lines
Thomas Petazzoni, Free Electrons Kernel, drivers, real-time and embedded Linux development, consulting, training and support. http://free-electrons.com