gunnar: server Makefile,1.104,1.105
cvs at kolab.org
cvs at kolab.org
Fri Feb 12 20:45:15 CET 2010
Author: gunnar
Update of /kolabrepository/server
In directory doto:/tmp/cvs-serv20344
Modified Files:
Makefile
Log Message:
Correct the update target. I found no clean upgrade path yet and still have to use --force and --nodeps. OpenPKG is just broken. Or I just don't understand it. Probably the latter.
Index: Makefile
===================================================================
RCS file: /kolabrepository/server/Makefile,v
retrieving revision 1.104
retrieving revision 1.105
diff -u -d -r1.104 -r1.105
--- Makefile 9 Feb 2010 16:18:55 -0000 1.104
+++ Makefile 12 Feb 2010 19:45:13 -0000 1.105
@@ -187,7 +187,7 @@
# The core target that builds the server packages.
.PHONY: dist
-dist: dist-base dist-pear-channel dist-kolab dist-pear-only dist-pear-horde dist-pear-kolab dist-client files
+dist: $(KOLABDIR) dist-base dist-pear-channel dist-kolab dist-pear-only dist-pear-horde dist-pear-kolab dist-client files
# Clean up all directories.
.PHONY: clean
@@ -477,6 +477,12 @@
@sleep 5
/kolab/bin/openpkg rpm -e `/kolab/bin/openpkg rpm -qa`
rm -rf $(KOLABDIR)
+else
+# If we are not in a test environment then we assume the Kolab server has
+# been installed manually. This target should never be invoked as there
+# is already a check in make-helpers/kolab.mk
+$(KOLABDIR):
+ @echo "The Kolab server installation is missing from $(KOLABDIR)."
endif
####################
@@ -493,20 +499,9 @@
ifeq "x$(TEST_ENVIRONMENT)" "xYES"
.PHONY: update
-update: dist stage/update/source
-
-stage/release/source:
- mkdir -p stage/release/source
- cd stage/release/source && wget -r -l1 -nd --no-parent $(CURRENT_SOURCE_RELEASE)
-
-stage/update/source: stage/release/source
- rm -rf stage/update/source
- mkdir -p stage/update/source
- rsync -avz stage/release/source/ stage/update/source/
- rsync -avz stage/source/ stage/update/source/
- chown -R $(KOLABUSR)\: stage/update/source
- cd stage/update/source && sh install-kolab.sh -X
- cd stage/update/source && sh install-kolab.sh 2>&1 | tee kolab-update.log
+update: dist
+ cd stage/$(PLATTAG) && \
+ openpkg rpm -Uhv --force --nodeps *.rpm
endif
####################
More information about the commits
mailing list