[coreboot] r255 - in buildrom-devel/packages: coreboot-v2 coreboot-v3 coreinfo filo geodevsa grub2 libpayload nrv2b ofw openbios

svn at coreboot.org svn at coreboot.org
Fri Dec 5 20:45:09 CET 2008


Author: ward
Date: 2008-12-05 20:45:09 +0100 (Fri, 05 Dec 2008)
New Revision: 255

Modified:
   buildrom-devel/packages/coreboot-v2/coreboot.inc
   buildrom-devel/packages/coreboot-v3/coreboot-v3.mk
   buildrom-devel/packages/coreinfo/coreinfo.mk
   buildrom-devel/packages/filo/filo.mk
   buildrom-devel/packages/geodevsa/openvsa.inc
   buildrom-devel/packages/grub2/grub2.mk
   buildrom-devel/packages/libpayload/libpayload.mk
   buildrom-devel/packages/nrv2b/nrv2b.mk
   buildrom-devel/packages/ofw/ofw.mk
   buildrom-devel/packages/openbios/openbios.mk
Log:

Small makefile fixes:

1. filo's extract target depended on $(FILO_STAMP_DIR)/.patched, which we don't
have anymore. Replaced with a dependency on $(FILO_STAMP_DIR)/.unpacked

2. add dependency on the relevant LOG_DIR in the TARBALL target for a lot of
packages, to avoid errors when that log directory has not been created yet.

This is a trivial patch.

Signed-off-by: Ward Vandewege <ward at gnu.org>
Acked-by: Ward Vandewege <ward at gnu.org>



Modified: buildrom-devel/packages/coreboot-v2/coreboot.inc
===================================================================
--- buildrom-devel/packages/coreboot-v2/coreboot.inc	2008-11-26 21:21:30 UTC (rev 254)
+++ buildrom-devel/packages/coreboot-v2/coreboot.inc	2008-12-05 19:45:09 UTC (rev 255)
@@ -144,7 +144,7 @@
 	@ svn status > $(OUTPUT_DIR)/config/svn/svn.status
 endif
 
-$(SOURCE_DIR)/$(CBV2_TARBALL):
+$(SOURCE_DIR)/$(CBV2_TARBALL): | $(CBV2_LOG_DIR)
 	@ echo "Fetching the coreboot rev $(CBV2_TAG) code..."
 	@ mkdir -p $(SOURCE_DIR)/coreboot
 	@ $(BIN_DIR)/fetchsvn.sh $(CBV2_URL) $(SOURCE_DIR)/coreboot \

Modified: buildrom-devel/packages/coreboot-v3/coreboot-v3.mk
===================================================================
--- buildrom-devel/packages/coreboot-v3/coreboot-v3.mk	2008-11-26 21:21:30 UTC (rev 254)
+++ buildrom-devel/packages/coreboot-v3/coreboot-v3.mk	2008-12-05 19:45:09 UTC (rev 255)
@@ -48,7 +48,7 @@
 
 CBV3_PATCHES ?=
 
-$(SOURCE_DIR)/$(CBV3_TARBALL):
+$(SOURCE_DIR)/$(CBV3_TARBALL): | $(CBV3_LOG_DIR)
 	@ mkdir -p $(SOURCE_DIR)/coreboot-v3
 	@ $(BIN_DIR)/fetchsvn.sh $(CBV3_URL) \
 	$(SOURCE_DIR)/coreboot-v3 $(CBV3_TAG) \

Modified: buildrom-devel/packages/coreinfo/coreinfo.mk
===================================================================
--- buildrom-devel/packages/coreinfo/coreinfo.mk	2008-11-26 21:21:30 UTC (rev 254)
+++ buildrom-devel/packages/coreinfo/coreinfo.mk	2008-12-05 19:45:09 UTC (rev 255)
@@ -22,7 +22,7 @@
 
 COREINFO_TARBALL=coreinfo-svn-$(COREINFO_TAG).tar.gz
 
-$(SOURCE_DIR)/$(COREINFO_TARBALL):
+$(SOURCE_DIR)/$(COREINFO_TARBALL): | $(COREINFO_LOG_DIR)
 	@ mkdir -p $(SOURCE_DIR)/coreinfo
 	@ $(BIN_DIR)/fetchsvn.sh $(COREINFO_URL) $(SOURCE_DIR)/coreinfo \
 	$(COREINFO_TAG) $(SOURCE_DIR)/$(COREINFO_TARBALL) \

Modified: buildrom-devel/packages/filo/filo.mk
===================================================================
--- buildrom-devel/packages/filo/filo.mk	2008-11-26 21:21:30 UTC (rev 254)
+++ buildrom-devel/packages/filo/filo.mk	2008-12-05 19:45:09 UTC (rev 255)
@@ -24,7 +24,7 @@
 	FILO_CONFIG = $(FILO_SRC_DIR)/configs/defconfig
 endif
 
-$(SOURCE_DIR)/$(FILO_TARBALL): 
+$(SOURCE_DIR)/$(FILO_TARBALL): | $(FILO_LOG_DIR)
 	@ mkdir -p $(SOURCE_DIR)/filo
 	@ $(BIN_DIR)/fetchsvn.sh $(FILO_URL) $(SOURCE_DIR)/filo \
 	$(FILO_TAG) $(SOURCE_DIR)/$(FILO_TARBALL) \
@@ -75,7 +75,7 @@
 filo-distclean:
 	@ rm -rf $(FILO_DIR)/*
 
-filo-extract: $(FILO_STAMP_DIR)/.patched
+filo-extract: | $(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)

Modified: buildrom-devel/packages/geodevsa/openvsa.inc
===================================================================
--- buildrom-devel/packages/geodevsa/openvsa.inc	2008-11-26 21:21:30 UTC (rev 254)
+++ buildrom-devel/packages/geodevsa/openvsa.inc	2008-12-05 19:45:09 UTC (rev 255)
@@ -17,7 +17,7 @@
 OPENVSA_FETCH_LOG=$(OPENVSA_LOG_DIR)/fetch.log
 endif
 
-$(SOURCE_DIR)/$(OPENVSA_TARBALL):
+$(SOURCE_DIR)/$(OPENVSA_TARBALL): | $(OPENVSA_LOG_DIR)
 	@ mkdir -p $(SOURCE_DIR)/openvsa
 	@ mkdir -p $(OPENVSA_LOG_DIR)
 	@ echo "Fetching openvsa..."

Modified: buildrom-devel/packages/grub2/grub2.mk
===================================================================
--- buildrom-devel/packages/grub2/grub2.mk	2008-11-26 21:21:30 UTC (rev 254)
+++ buildrom-devel/packages/grub2/grub2.mk	2008-12-05 19:45:09 UTC (rev 255)
@@ -29,7 +29,7 @@
 	GRUB2_CONFIG = $(GRUB2_SRC_DIR)/configs/defconfig
 endif
 
-$(SOURCE_DIR)/$(GRUB2_TARBALL): 
+$(SOURCE_DIR)/$(GRUB2_TARBALL): | $(GRUB2_LOG_DIR)
 	@ mkdir -p $(SOURCE_DIR)/grub2
 	@ $(BIN_DIR)/fetchsvn.sh $(GRUB2_URL) $(SOURCE_DIR)/grub2 \
 	$(GRUB2_TAG) $(SOURCE_DIR)/$(GRUB2_TARBALL) \

Modified: buildrom-devel/packages/libpayload/libpayload.mk
===================================================================
--- buildrom-devel/packages/libpayload/libpayload.mk	2008-11-26 21:21:30 UTC (rev 254)
+++ buildrom-devel/packages/libpayload/libpayload.mk	2008-12-05 19:45:09 UTC (rev 255)
@@ -28,7 +28,7 @@
 
 LIBPAYLOAD_TARBALL=libpayload-svn-$(LIBPAYLOAD_TAG).tar.gz
 
-$(SOURCE_DIR)/$(LIBPAYLOAD_TARBALL):
+$(SOURCE_DIR)/$(LIBPAYLOAD_TARBALL): | $(LIBPAYLOAD_LOG_DIR)
 	@ mkdir -p $(SOURCE_DIR)/libpayload
 	@ $(BIN_DIR)/fetchsvn.sh $(LIBPAYLOAD_URL) $(SOURCE_DIR)/libpayload \
 	$(LIBPAYLOAD_TAG) $(SOURCE_DIR)/$(LIBPAYLOAD_TARBALL) \

Modified: buildrom-devel/packages/nrv2b/nrv2b.mk
===================================================================
--- buildrom-devel/packages/nrv2b/nrv2b.mk	2008-11-26 21:21:30 UTC (rev 254)
+++ buildrom-devel/packages/nrv2b/nrv2b.mk	2008-12-05 19:45:09 UTC (rev 255)
@@ -15,7 +15,7 @@
 NRV2B_FETCH_LOG=$(NRV2B_LOG_DIR)/fetch.log
 endif
 
-$(SOURCE_DIR)/$(NRV2B_TARBALL):
+$(SOURCE_DIR)/$(NRV2B_TARBALL): | $(NRV2B_LOG_DIR)
 	@ mkdir -p $(SOURCE_DIR)/nrv2b
 	@ $(BIN_DIR)/fetchsvn.sh $(NRV2B_URL) $(SOURCE_DIR)/nrv2b \
 	$(NRV2B_TAG) $@ > $(NRV2B_FETCH_LOG) 2>&1

Modified: buildrom-devel/packages/ofw/ofw.mk
===================================================================
--- buildrom-devel/packages/ofw/ofw.mk	2008-11-26 21:21:30 UTC (rev 254)
+++ buildrom-devel/packages/ofw/ofw.mk	2008-12-05 19:45:09 UTC (rev 255)
@@ -26,7 +26,7 @@
 # NOTE - this should be replaced by the GIT fetch or tarball fetch
 # as appropriate
 
-$(SOURCE_DIR)/$(OFW_TARBALL):
+$(SOURCE_DIR)/$(OFW_TARBALL): | $(OFW_LOG_DIR)
 	@ echo "Fetching OpenFirmware..."
 	@ echo "SVN Checkout rev $(OFW_SVN_TAG)"
 	@ $(BIN_DIR)/fetchsvn.sh $(OFW_SVN_URL) $(SOURCE_DIR)/ofw \

Modified: buildrom-devel/packages/openbios/openbios.mk
===================================================================
--- buildrom-devel/packages/openbios/openbios.mk	2008-11-26 21:21:30 UTC (rev 254)
+++ buildrom-devel/packages/openbios/openbios.mk	2008-12-05 19:45:09 UTC (rev 255)
@@ -31,7 +31,7 @@
 $(error To build OpenBIOS, you need to install 'fcode-utils')
 endif
 
-$(SOURCE_DIR)/$(OPENBIOS_TARBALL):
+$(SOURCE_DIR)/$(OPENBIOS_TARBALL): | $(OPENBIOS_LOG_DIR)
 	@ echo "Fetching OpenBIOS..."
 	@ echo "SVN Checkout rev $(OPENBIOS_SVN_TAG)"
 	@ $(BIN_DIR)/fetchsvn.sh $(OPENBIOS_SVN_URL) $(SOURCE_DIR)/openbios \





More information about the coreboot mailing list