Author: ward Date: 2008-08-11 17:01:35 +0200 (Mon, 11 Aug 2008) New Revision: 219
Modified: buildrom-devel/packages/busybox/busybox.mk buildrom-devel/packages/kernel/kernel.inc Log:
Buildrom rev 210 (the upgrade to the latest kconfig) broke kernel and LAB payload build quite spectacularly. It did so by introducing extra environment variables needed for kconfig which do not agree with the kernel and LAB payload build process.
The attached patch fixes that. Not tested on real hardware yet. But since this makes buildrom build again, this is certainly an improvement over the status quo, I would argue.
Signed-off-by: Ward Vandewege ward@gnu.org Acked-by: Jordan Crouse jordan.crouse@amd.com
Modified: buildrom-devel/packages/busybox/busybox.mk =================================================================== --- buildrom-devel/packages/busybox/busybox.mk 2008-08-09 23:10:31 UTC (rev 218) +++ buildrom-devel/packages/busybox/busybox.mk 2008-08-11 15:01:35 UTC (rev 219) @@ -46,7 +46,7 @@ ifneq ($(findstring defconfig,$(BUSYBOX_CONFIG)),defconfig) @ echo "Using custom config $(PACKAGE_DIR)/busybox/conf/$(BUSYBOX_CONFIG)" endif - @ ( unset CFLAGS; unset LDFLAGS; \ + @ ( unset MAKEFLAGS; unset CFLAGS; unset LDFLAGS; \ export EXTRA_CFLAGS="$(CFLAGS)";\ export LDFLAGS="$(LDFLAGS_orig)";\ $(MAKE) -C $(BUSYBOX_SRC_DIR) VERBOSE=y \
Modified: buildrom-devel/packages/kernel/kernel.inc =================================================================== --- buildrom-devel/packages/kernel/kernel.inc 2008-08-09 23:10:31 UTC (rev 218) +++ buildrom-devel/packages/kernel/kernel.inc 2008-08-11 15:01:35 UTC (rev 219) @@ -61,8 +61,9 @@ ifneq ($(findstring defconfig,$(KERNEL_CONFIG)),defconfig) @ echo "Using custom kernel config $(KERNEL_CONFIG)" endif - @ $(MAKE) $(PARALLEL_MAKE) -C $(KERNEL_SRC_DIR) ARCH=$(KERNEL_BUILD_ARCH) \ - KERNEL_CC="$(CC)" KERNEL_LD="$(LD)" > $(KERNEL_BUILD_LOG) 2>&1 + @ (unset KCONFIG_AUTOHEADER; unset KCONFIG_AUTOCONFIG; \ + $(MAKE) $(PARALLEL_MAKE) -C $(KERNEL_SRC_DIR) ARCH=$(KERNEL_BUILD_ARCH) \ + KERNEL_CC="$(CC)" KERNEL_LD="$(LD)" > $(KERNEL_BUILD_LOG) 2>&1) @ mkdir -p $(OUTPUT_DIR)/config/kernel @ cp $(KERNEL_SRC_DIR)/.config $(OUTPUT_DIR)/config/kernel/