Patchwork [3,of,3] docker: support Fedora 21

login
register
mail settings
Submitter Mads Kiilerich
Date Jan. 16, 2015, 4:01 a.m.
Message ID <068b1653286a295cacf3.1421380877@localhost.localdomain>
Download mbox | patch
Permalink /patch/7483/
State Accepted
Headers show

Comments

Mads Kiilerich - Jan. 16, 2015, 4:01 a.m.
# HG changeset patch
# User Mads Kiilerich <madski@unity3d.com>
# Date 1414892207 -3600
#      Sun Nov 02 02:36:47 2014 +0100
# Node ID 068b1653286a295cacf33b7b1f3563fde1ee4f29
# Parent  b60cd5c10c5053826f565cec73b2e5d7636549a5
docker: support Fedora 21
Pierre-Yves David - Jan. 16, 2015, 8:35 a.m.
On 01/15/2015 08:01 PM, Mads Kiilerich wrote:
> # HG changeset patch
> # User Mads Kiilerich <madski@unity3d.com>
> # Date 1414892207 -3600
> #      Sun Nov 02 02:36:47 2014 +0100
> # Node ID 068b1653286a295cacf33b7b1f3563fde1ee4f29
> # Parent  b60cd5c10c5053826f565cec73b2e5d7636549a5
> docker: support Fedora 21

These patches are push to the clowncopter.

Patch

diff --git a/Makefile b/Makefile
--- a/Makefile
+++ b/Makefile
@@ -155,6 +155,17 @@  docker-fedora20:
 	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 @@  docker-centos7:
 .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
diff --git a/contrib/docker/fedora20 b/contrib/docker/fedora21
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