r196 - in buildrom-devel/packages: coreboot-v2 coreboot-v3 kernel

Author: myles
Date: 2008-05-16 17:45:50 +0200 (Fri, 16 May 2008)
New Revision: 196

Modified:
   buildrom-devel/packages/coreboot-v2/coreboot.inc
   buildrom-devel/packages/coreboot-v3/coreboot-v3.mk
   buildrom-devel/packages/kernel/kernel.inc
Log:
This is a trivial patch that appends the version to the .unpacked stamp for
packages that change versions per platform. It also removes previous unpacked
stamps for coreboot since they can't coexist.

Signed-off-by: Myles Watson 
Acked-by: Myles Watson

Modified: buildrom-devel/packages/coreboot-v2/coreboot.inc
===================================================================
--- buildrom-devel/packages/coreboot-v2/coreboot.inc	2008-05-15 16:16:27 UTC (rev 195)
+++ buildrom-devel/packages/coreboot-v2/coreboot.inc	2008-05-16 15:45:50 UTC (rev 196)
@@ -92,12 +92,13 @@
 $(CBV2_PAYLOAD_TARGET): $(PAYLOAD_TARGET)
    @ cp $< $@

-$(CBV2_STAMP_DIR)/.unpacked: $(SOURCE_DIR)/$(CBV2_TARBALL) | $(CBV2_STAMP_DIR) $(CBV2_LOG_DIR)
+$(CBV2_STAMP_DIR)/.unpacked-$(CBV2_TAG): $(SOURCE_DIR)/$(CBV2_TARBALL) | $(CBV2_STAMP_DIR) $(CBV2_LOG_DIR)
+	@ rm -f $(CBV2_STAMP_DIR)/.unpacked*
    @ echo "Unpacking coreboot ($(CBV2_TARBALL))..."
    @ tar -C $(CBV2_DIR) -zxf $(SOURCE_DIR)/$(CBV2_TARBALL)
    @ touch $@

-$(CBV2_STAMP_DIR)/.patched: $(CBV2_STAMP_DIR)/.unpacked 
+$(CBV2_STAMP_DIR)/.patched: $(CBV2_STAMP_DIR)/.unpacked-$(CBV2_TAG)
    @ echo "Patching coreboot..."
    @ $(BIN_DIR)/doquilt.sh $(CBV2_SRC_DIR) $(CBV2_PATCHES)
    @ touch $@

Modified: buildrom-devel/packages/coreboot-v3/coreboot-v3.mk
===================================================================
--- buildrom-devel/packages/coreboot-v3/coreboot-v3.mk	2008-05-15 16:16:27 UTC (rev 195)
+++ buildrom-devel/packages/coreboot-v3/coreboot-v3.mk	2008-05-16 15:45:50 UTC (rev 196)
@@ -43,13 +43,14 @@
    $(SOURCE_DIR)/coreboot-v3 $(CBV3_TAG) \
    $@ > $(CBV3_FETCH_LOG) 2>&1

-$(CBV3_STAMP_DIR)/.unpacked: $(SOURCE_DIR)/$(CBV3_TARBALL) | $(CBV3_STAMP_DIR)
-	@ echo "Unpacking coreboot v3..."
+$(CBV3_STAMP_DIR)/.unpacked-$(CBV3_TAG): $(SOURCE_DIR)/$(CBV3_TARBALL) | $(CBV3_STAMP_DIR)
+	@ rm -f $(CBV3_STAMP_DIR)/.unpacked*
+	@ echo "Unpacking coreboot v3 ($(CBV3_TAG))..."
    @ mkdir -p $(CBV3_DIR)
    @ tar -C $(CBV3_DIR) -zxf $(SOURCE_DIR)/$(CBV3_TARBALL)
    @ touch $@

-$(CBV3_STAMP_DIR)/.patched: $(CBV3_STAMP_DIR)/.unpacked
+$(CBV3_STAMP_DIR)/.patched: $(CBV3_STAMP_DIR)/.unpacked-$(CBV3_TAG)
    @ echo "Patching coreboot v3..."
    @ $(BIN_DIR)/doquilt.sh $(CBV3_SRC_DIR) $(CBV3_PATCHES)
    @ touch $@

Modified: buildrom-devel/packages/kernel/kernel.inc
===================================================================
--- buildrom-devel/packages/kernel/kernel.inc	2008-05-15 16:16:27 UTC (rev 195)
+++ buildrom-devel/packages/kernel/kernel.inc	2008-05-16 15:45:50 UTC (rev 196)
@@ -31,9 +31,9 @@
 KERNEL_INSTALL_LOG=$(KERNEL_LOG_DIR)/install.log
 endif

-$(KERNEL_STAMP_DIR)/.unpacked: $(SOURCE_DIR)/$(KERNEL_SOURCE) | $(KERNEL_STAMP_DIR)
+$(KERNEL_STAMP_DIR)/.unpacked-$(KERNEL_VERSION): $(SOURCE_DIR)/$(KERNEL_SOURCE) | $(KERNEL_STAMP_DIR)
    @ mkdir -p $(KERNEL_DIR)
-	@ echo "Unpacking kernel..."
+	@ echo "Unpacking kernel ($(KERNEL_VERSION))..."
    @ tar -C $(KERNEL_DIR) -jxf $(SOURCE_DIR)/$(KERNEL_SOURCE)
    @ touch $@

@@ -45,9 +45,9 @@
    @ touch $@

ifneq ($(TINY_SOURCE),)
-$(KERNEL_STAMP_DIR)/.patched: $(KERNEL_STAMP_DIR)/.unpacked $(KERNEL_STAMP_DIR)/.unpacked-tiny
+$(KERNEL_STAMP_DIR)/.patched: $(KERNEL_STAMP_DIR)/.unpacked-$(KERNEL_VERSION) $(KERNEL_STAMP_DIR)/.unpacked-tiny
 else
-$(KERNEL_STAMP_DIR)/.patched: $(KERNEL_STAMP_DIR)/.unpacked
+$(KERNEL_STAMP_DIR)/.patched: $(KERNEL_STAMP_DIR)/.unpacked-$(KERNEL_VERSION)
 endif
    @ echo "Patching kernel..."
    @ $(BIN_DIR)/doquilt.sh $(KERNEL_SRC_DIR) $(KERNEL_PATCHES)