| 1 |
Author: rieggepp |
| 2 |
Date: Mon Jun 23 09:15:08 2008 |
| 3 |
New Revision: 122 |
| 4 |
|
| 5 |
Modified: |
| 6 |
trunk/tools/rebuild_stages/Makefile |
| 7 |
|
| 8 |
Log: |
| 9 |
Some bugfixes. |
| 10 |
|
| 11 |
Modified: trunk/tools/rebuild_stages/Makefile |
| 12 |
============================================================================== |
| 13 |
--- trunk/tools/rebuild_stages/Makefile (original) |
| 14 |
+++ trunk/tools/rebuild_stages/Makefile Mon Jun 23 09:15:08 2008 |
| 15 |
@@ -9,7 +9,7 @@ |
| 16 |
|
| 17 |
# Autogenerated Configuration Files |
| 18 |
CATALYST_CONF = catalyst.conf |
| 19 |
-CATALYST_RC = catalyst.rc |
| 20 |
+CATALYST_RC = catalystrc |
| 21 |
|
| 22 |
# Stage Target Filenames |
| 23 |
STAGE1 = stage1-$(SUBARCH)-$(VERSION).tar.bz2 |
| 24 |
@@ -195,35 +195,35 @@ |
| 25 |
mkdir -p $(CATALYST_STORE_DIR)/snapshots |
| 26 |
cp "$(PORTAGE_SNAPSHOT)" "$(CATALYST_STORE_DIR)/snapshots/portage-$(VERSION).tar.bz2" |
| 27 |
|
| 28 |
-$(STAGEDIR)/$(STAGE1): $(STAGE1_SPEC) $(STAGEDIR)/$(SEEDSTAGE) $(CATALYST_STORE_DIR)/snapshots/portage-$(VERSION).tar.bz2 |
| 29 |
+$(STAGEDIR)/$(STAGE1): $(STAGE1_SPEC) $(STAGEDIR)/$(SEEDSTAGE) |
| 30 |
$(CATALYST_STORE_DIR)/snapshots/portage-$(VERSION).tar.bz2 $(CATALYST_CONF) |
| 31 |
$(CATALYST_BIN) -c $(WORK_DIR)/$(CATALYST_CONF) -f $(STAGE1_SPEC) |
| 32 |
|
| 33 |
$(STAGE1): $(STAGEDIR)/$(STAGE1) |
| 34 |
cp "$(STAGEDIR)/$(STAGE1)" $@ |
| 35 |
|
| 36 |
-$(STAGEDIR)/$(STAGE2): $(STAGE2_SPEC) $(STAGEDIR)/$(STAGE1) $(CATALYST_STORE_DIR)/snapshots/portage-$(VERSION).tar.bz2 |
| 37 |
+$(STAGEDIR)/$(STAGE2): $(STAGE2_SPEC) $(STAGEDIR)/$(STAGE1) |
| 38 |
$(CATALYST_STORE_DIR)/snapshots/portage-$(VERSION).tar.bz2 $(CATALYST_CONF) |
| 39 |
$(CATALYST_BIN) -c $(WORK_DIR)/$(CATALYST_CONF) -f $(STAGE2_SPEC) |
| 40 |
|
| 41 |
$(STAGE2): $(STAGEDIR)/$(STAGE2) |
| 42 |
cp "$(STAGEDIR)/$(STAGE2)" $@ |
| 43 |
|
| 44 |
-$(STAGEDIR)/$(STAGE3): $(STAGE3_SPEC) $(STAGEDIR)/$(STAGE2) $(CATALYST_STORE_DIR)/snapshots/portage-$(VERSION).tar.bz2 |
| 45 |
+$(STAGEDIR)/$(STAGE3): $(STAGE3_SPEC) $(STAGEDIR)/$(STAGE2) |
| 46 |
$(CATALYST_STORE_DIR)/snapshots/portage-$(VERSION).tar.bz2 $(CATALYST_CONF) |
| 47 |
$(CATALYST_BIN) -c $(WORK_DIR)/$(CATALYST_CONF) -f $(STAGE3_SPEC) |
| 48 |
|
| 49 |
$(STAGE3): $(STAGEDIR)/$(STAGE3) |
| 50 |
cp "$(STAGEDIR)/$(STAGE3)" $@ |
| 51 |
|
| 52 |
-$(STAGEDIR)/$(STAGE4): $(STAGE4_SPEC) $(STAGEDIR)/$(STAGE3) $(CATALYST_STORE_DIR)/snapshots/portage-$(VERSION).tar.bz2 |
| 53 |
+$(STAGEDIR)/$(STAGE4): $(STAGE4_SPEC) $(STAGEDIR)/$(STAGE3) |
| 54 |
$(CATALYST_STORE_DIR)/snapshots/portage-$(VERSION).tar.bz2 $(CATALYST_CONF) |
| 55 |
$(CATALYST_BIN) -c $(WORK_DIR)/$(CATALYST_CONF) -f $(STAGE4_SPEC) |
| 56 |
|
| 57 |
$(STAGE4): $(STAGEDIR)/$(STAGE4) |
| 58 |
cp "$(STAGEDIR)/$(STAGE4)" $@ |
| 59 |
|
| 60 |
-livecd-stage1: $(LIVECD_STAGE1_SPEC) $(STAGEDIR)/$(STAGE3) $(CATALYST_STORE_DIR)/snapshots/portage-$(VERSION).tar.bz2 |
| 61 |
+livecd-stage1: $(LIVECD_STAGE1_SPEC) $(STAGEDIR)/$(STAGE3) |
| 62 |
$(CATALYST_STORE_DIR)/snapshots/portage-$(VERSION).tar.bz2 $(CATALYST_CONF) |
| 63 |
$(CATALYST_BIN) -c $(WORK_DIR)/$(CATALYST_CONF) -f $(LIVECD_STAGE1_SPEC) |
| 64 |
|
| 65 |
-livecd-stage2: $(LIVECD_STAGE2_SPEC) $(STAGEDIR)/$(STAGE3) $(CATALYST_STORE_DIR)/snapshots/portage-$(VERSION).tar.bz2 |
| 66 |
+livecd-stage2: $(LIVECD_STAGE2_SPEC) $(STAGEDIR)/$(STAGE3) |
| 67 |
$(CATALYST_STORE_DIR)/snapshots/portage-$(VERSION).tar.bz2 $(CATALYST_CONF) |
| 68 |
$(CATALYST_BIN) -c $(WORK_DIR)/$(CATALYST_CONF) -f $(LIVECD_STAGE2_SPEC) |
| 69 |
|
| 70 |
-tinderbox: $(TINDERBOX_SPEC) $(STAGEDIR)/$(STAGE3) $(CATALYST_STORE_DIR)/snapshots/portage-$(VERSION).tar.bz2 |
| 71 |
+tinderbox: $(TINDERBOX_SPEC) $(STAGEDIR)/$(STAGE3) |
| 72 |
$(CATALYST_STORE_DIR)/snapshots/portage-$(VERSION).tar.bz2 $(CATALYST_CONF) |
| 73 |
$(CATALYST_BIN) -c $(WORK_DIR)/$(CATALYST_CONF) -f $(TINDERBOX_SPEC) |
| 74 |
-- |
| 75 |
gnap-dev@l.g.o mailing list |
Archives