On 09/08/08 22:59 -0400, Ward Vandewege wrote: > See attached. > > -- > Ward Vandewege <[EMAIL PROTECTED]> > Free Software Foundation - Senior Systems Administrator
> > Buildrom rev 210 (the upgrade to the latest kconfig) broke kernel and LAB > payload build quite spectacularly. It broke compilation of the kernel and of > busybox by introducing extra environment variables needed for kconfig. > > 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 <[EMAIL PROTECTED]> Acked-by: Jordan Crouse <[EMAIL PROTECTED]> > Index: packages/kernel/kernel.inc > =================================================================== > --- packages/kernel/kernel.inc (revision 218) > +++ packages/kernel/kernel.inc (working copy) > @@ -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/ > > Index: packages/busybox/busybox.mk > =================================================================== > --- packages/busybox/busybox.mk (revision 218) > +++ packages/busybox/busybox.mk (working copy) > @@ -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 \ > -- > coreboot mailing list > [email protected] > http://www.coreboot.org/mailman/listinfo/coreboot -- Jordan Crouse Systems Software Development Engineer Advanced Micro Devices, Inc. -- coreboot mailing list [email protected] http://www.coreboot.org/mailman/listinfo/coreboot
