r116 - in buildrom-devel/packages: busybox coreboot-v3 filo uclibc

Author: ward
Date: 2008-02-13 22:30:35 +0100 (Wed, 13 Feb 2008)
New Revision: 116

Modified:
   buildrom-devel/packages/busybox/busybox.mk
   buildrom-devel/packages/coreboot-v3/coreboot-v3.mk
   buildrom-devel/packages/filo/filo.mk
   buildrom-devel/packages/uclibc/uclibc.mk
Log:

Fix make dependency for various *-config targets; make them be the configured
tree rather than stamps/.patched. This means that

make distclean && make coreboot-v3-config 
  make distclean && make uclibc-config 
  make distclean && make busybox-config 
  make distclean && make filo-config

will now work properly.

This is a trivial patch.

Signed-off-by: Ward Vandewege 
Acked-by: Ward Vandewege

Modified: buildrom-devel/packages/busybox/busybox.mk
===================================================================
--- buildrom-devel/packages/busybox/busybox.mk	2008-02-13 16:36:55 UTC (rev 115)
+++ buildrom-devel/packages/busybox/busybox.mk	2008-02-13 21:30:35 UTC (rev 116)
@@ -78,7 +78,7 @@

busybox-extract: $(BUSYBOX_STAMP_DIR)/.patched

-busybox-config: $(BUSYBOX_STAMP_DIR)/.patched
+busybox-config: | $(BUSYBOX_SRC_DIR)/.config
 ifeq ($(shell if [ -f $(PACKAGE_DIR)/busybox/conf/customconfig--$(PAYLOAD)--$(COREBOOT_VENDOR)-$(COREBOOT_BOARD) ]; then echo 1; fi),1)
    @ cp -f $(PACKAGE_DIR)/busybox/conf/customconfig--$(PAYLOAD)--$(COREBOOT_VENDOR)-$(COREBOOT_BOARD) $(BUSYBOX_SRC_DIR)/.config
 endif

Modified: buildrom-devel/packages/coreboot-v3/coreboot-v3.mk
===================================================================
--- buildrom-devel/packages/coreboot-v3/coreboot-v3.mk	2008-02-13 16:36:55 UTC (rev 115)
+++ buildrom-devel/packages/coreboot-v3/coreboot-v3.mk	2008-02-13 21:30:35 UTC (rev 116)
@@ -80,7 +80,7 @@
    @ rm -rf $(CBV3_DIR)/*
    @ rm -rf $(STAGING_DIR)/bin/lar

-coreboot-v3-config: $(CBV3_STAMP_DIR)/.unpacked
+coreboot-v3-config: | $(CBV3_STAMP_DIR)/.configured
 ifeq ($(shell if [ -f $(PACKAGE_DIR)/coreboot-v3/conf/customconfig--$(PAYLOAD)--$(COREBOOT_VENDOR)-$(COREBOOT_BOARD) ]; then echo 1; fi),1)
    @ cp -f $(PACKAGE_DIR)/coreboot-v3/conf/customconfig--$(PAYLOAD)--$(COREBOOT_VENDOR)-$(COREBOOT_BOARD) $(CBV3_SRC_DIR)/.config
 endif

Modified: buildrom-devel/packages/filo/filo.mk
===================================================================
--- buildrom-devel/packages/filo/filo.mk	2008-02-13 16:36:55 UTC (rev 115)
+++ buildrom-devel/packages/filo/filo.mk	2008-02-13 21:30:35 UTC (rev 116)
@@ -75,7 +75,7 @@

filo-extract: $(FILO_STAMP_DIR)/.patched

-filo-config: $(FILO_STAMP_DIR)/.unpacked
+filo-config: | $(FILO_STAMP_DIR)/.configured
 ifeq ($(shell if [ -f $(PACKAGE_DIR)/filo/conf/customconfig--$(PAYLOAD)--$(COREBOOT_VENDOR)-$(COREBOOT_BOARD) ]; then echo 1; fi),1)
    @ echo
    @ echo "Found an existing custom configuration file:"

Modified: buildrom-devel/packages/uclibc/uclibc.mk
===================================================================
--- buildrom-devel/packages/uclibc/uclibc.mk	2008-02-13 16:36:55 UTC (rev 115)
+++ buildrom-devel/packages/uclibc/uclibc.mk	2008-02-13 21:30:35 UTC (rev 116)
@@ -92,7 +92,7 @@

uclibc-extract: $(UCLIBC_STAMP_DIR)/.unpacked

-uclibc-config: $(UCLIBC_STAMP_DIR)/.unpacked
+uclibc-config: | $(UCLIBC_SRC_DIR)/.config
 ifeq ($(shell if [ -f $(PACKAGE_DIR)/uclibc/conf/customconfig--$(PAYLOAD)--$(UCLIBC_ARCH)--$(COREBOOT_VENDOR)-$(COREBOOT_BOARD) ]; then echo 1; fi),1)
    @ cp -f $(PACKAGE_DIR)/uclibc/conf/customconfig--$(PAYLOAD)--$(UCLIBC_ARCH)--$(COREBOOT_VENDOR)-$(COREBOOT_BOARD) $(UCLIBC_SRC_DIR)/.config
 endif