OpenPKG CVS Repository
http://www.openpkg.org/cvsweb/cvsweb.cgi
____________________________________________________________________________
Server: cvs.openpkg.org Name: Ralf S. Engelschall
Root: /e/openpkg/cvs Email: [EMAIL PROTECTED]
Module: openpkg-re Date: 09-Aug-2002 18:04:45
Branch: HEAD Handle: 2002080917044400
Modified files:
openpkg-re/release Makefile
Log:
cleanups and add support for new /ltmp to avoid NFS/filer problems
Summary:
Revision Changes Path
1.4 +50 -10 openpkg-re/release/Makefile
____________________________________________________________________________
Index: openpkg-re/release/Makefile
============================================================
$ cvs diff -u -r1.3 -r1.4 Makefile
--- openpkg-re/release/Makefile 9 Aug 2002 08:35:16 -0000 1.3
+++ openpkg-re/release/Makefile 9 Aug 2002 16:04:44 -0000 1.4
@@ -112,8 +112,15 @@
@hostname=$(HOSTNAME); target=$(TARGET); \
$(SHTOOL) echo -e "%B++ Linking latest OpenPKG-CURRENT master source RPMs
($(WORK)/src/$$hostname-$$target/)%b"; \
$(SHTOOL) mkdir -f -p -m 775 $(WORK)/src/$$hostname-$$target; \
- $(SHTOOL) mkdir -f -p -m 775 $(WORK)/tmp/$$hostname-$$target; \
$(SHTOOL) mkdir -f -p -m 775 $(WORK)/bin/$$hostname-$$target; \
+ $(SHTOOL) mkdir -f -p -m 775 $(WORK)/tmp/$$hostname-$$target; \
+ work="`$$SHELL -c 'cd $$PWD; cd $(WORK); pwd'`"; \
+ if [ -d "/ltmp" ]; then \
+ tmp="/ltmp/openpkg-$$hostname-$$target"; \
+ $(SHTOOL) mkdir -f -p -m 775 $$tmp; \
+ else \
+ tmp="$$work/tmp/$$hostname-$$target"; \
+ fi; \
cp $(WORK)/src/master/Makefile* $(WORK)/src/$$hostname-$$target/; \
rm -f $(WORK)/src/$$hostname-$$target/*.src.rpm; \
for srpm in `ls -1 $(WORK)/src/master/*.src.rpm | sort`; do \
@@ -152,14 +159,17 @@
what=`sed <$$tmpfile -e "1,$${x}d"; sed <$$tmpfile -e "$${y},\\$$""d"`; \
rm $$tmpfile; \
work="`$$SHELL -c 'cd $$PWD; cd $(WORK); pwd'`"; \
+ if [ -d "/ltmp/openpkg-$$hostname-$$target" ]; then \
+ tmp="/ltmp/openpkg-$$hostname-$$target"; \
+ else \
+ tmp="$$work/tmp/$$hostname-$$target"; \
+ fi; \
make=`$(SHTOOL) path make`; \
- echo "$$what" >$$tmpfile.1; \
cd $(WORK)/src/$$hostname-$$target/; \
$$make $(MFLAGS) \
SRC="$$work/src/$$hostname-$$target" \
- TMP="$$work/tmp/$$hostname-$$target" \
DST="$$work/bin/$$hostname-$$target" \
- EXEC_HOST="$$hostname" $$what
+ TMP="$$tmp" EXEC_HOST="$$hostname" $$what
slave-build-final:
@hostname=$(HOSTNAME); target=$(TARGET); \
@@ -168,23 +178,53 @@
fi; \
$(SHTOOL) echo -e "%B++ Building latest OpenPKG-CURRENT slave source RPMs
($(WORK)/src/$$hostname-$$target/)%b"; \
work="`$$SHELL -c 'cd $$PWD; cd $(WORK); pwd'`"; \
+ if [ -d "/ltmp/openpkg-$$hostname-$$target" ]; then \
+ tmp="/ltmp/openpkg-$$hostname-$$target"; \
+ else \
+ tmp="$$work/tmp/$$hostname-$$target"; \
+ fi; \
+ make=`$(SHTOOL) path make`; \
+ cd $(WORK)/src/$$hostname-$$target/; \
+ $$make $(MFLAGS) \
+ SRC="$$work/src/$$hostname-$$target" \
+ DST="$$work/bin/$$hostname-$$target" \
+ TMP="$$tmp" EXEC_HOST="$$hostname"
+
+slave-erase:
+ @hostname=$(HOSTNAME); target=$(TARGET); \
+ if [ ! -f $(WORK)/src/$$hostname-$$target/Makefile ]; then \
+ $(MAKE) $(MFLAGS) slave-prepare; \
+ fi; \
+ $(SHTOOL) echo -e "%B++ Erasing OpenPKG instance ($(PREFIX))%b"; \
+ work="`$$SHELL -c 'cd $$PWD; cd $(WORK); pwd'`"; \
+ if [ -d "/ltmp/openpkg-$$hostname-$$target" ]; then \
+ tmp="/ltmp/openpkg-$$hostname-$$target"; \
+ else \
+ tmp="$$work/tmp/$$hostname-$$target"; \
+ fi; \
make=`$(SHTOOL) path make`; \
cd $(WORK)/src/$$hostname-$$target/; \
$$make $(MFLAGS) \
SRC="$$work/src/$$hostname-$$target" \
- TMP="$$work/tmp/$$hostname-$$target" \
DST="$$work/bin/$$hostname-$$target" \
- EXEC_HOST="$$hostname"
+ TMP="$$tmp" EXEC_HOST="$$hostname" erase
slave-clean:
@hostname=$(HOSTNAME); target=$(TARGET); \
$(SHTOOL) echo -e "%B++ Cleaning up on host $$hostname ($$target)%b"; \
- -rm -rf $(WORK)/tmp/$$hostname-$$target
+ rm -rf $(WORK)/tmp/$$hostname-$$target
slave-realclean:
@hostname=$(HOSTNAME); target=$(TARGET); \
$(SHTOOL) echo -e "%B++ Really cleaning up on host $$hostname ($$target)%b"; \
- -rm -rf $(WORK)/src/$$hostname-$$target; \
- -rm -rf $(WORK)/tmp/$$hostname-$$target; \
- -rm -rf $(WORK)/bin/$$hostname-$$target
+ rm -rf $(WORK)/src/$$hostname-$$target; \
+ rm -rf $(WORK)/bin/$$hostname-$$target; \
+ rm -rf $(WORK)/tmp/$$hostname-$$target; \
+ work="`$$SHELL -c 'cd $$PWD; cd $(WORK); pwd'`"; \
+ if [ -d "/ltmp/openpkg-$$hostname-$$target" ]; then \
+ tmp="/ltmp/openpkg-$$hostname-$$target"; \
+ else \
+ tmp="$$work/tmp/$$hostname-$$target"; \
+ fi; \
+ rm -rf $$tmp
______________________________________________________________________
The OpenPKG Project www.openpkg.org
CVS Repository Commit List [EMAIL PROTECTED]
