Mercurial > hg > mercurial-source

changeset 23894:272b1cc3e83e

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
docker: support Fedora 21
author Mads Kiilerich <madski@unity3d.com>
date Sun, 02 Nov 2014 02:36:47 +0100
parents 33471119267b
children 7e71898a7cdc
files Makefile contrib/docker/fedora21
diffstat 2 files changed, 13 insertions(+), 2 deletions(-) [+]
line wrap: on
line diff
--- a/Makefile
+++ b/Makefile
@@ -155,6 +155,17 @@
 	mkdir -p packages/fedora20
 	contrib/dockerrpm fedora20
 
+fedora21:
+	mkdir -p packages/fedora21
+	contrib/buildrpm
+	cp rpmbuild/RPMS/*/* packages/fedora21
+	cp rpmbuild/SRPMS/* packages/fedora21
+	rm -rf rpmbuild
+
+docker-fedora21:
+	mkdir -p packages/fedora21
+	contrib/dockerrpm fedora21
+
 centos5:
 	mkdir -p packages/centos5
 	contrib/buildrpm --withpython
@@ -188,5 +199,5 @@
 .PHONY: help all local build doc clean install install-bin install-doc \
 	install-home install-home-bin install-home-doc \
 	dist dist-notests check tests check-code update-pot \
-	osx fedora20 docker-fedora20 \
+	osx fedora20 docker-fedora20 fedora21 docker-fedora21 \
 	centos5 docker-centos5 centos6 docker-centos6 centos7 docker-centos7
copy from contrib/docker/fedora20
copy to contrib/docker/fedora21
--- a/contrib/docker/fedora20
+++ b/contrib/docker/fedora21
@@ -1,4 +1,4 @@
-FROM fedora:20
+FROM fedora:21
 RUN yum install -y gcc
 RUN yum install -y python-devel python-docutils
 RUN yum install -y make