[Pkg-libvirt-commits] [libguestfs] 63/384: builder: Add Fedora 21 image, remove RHEL 7 RC image.

[Hilko Bengen]

This is an automated email from the git hooks/post-receive script.

bengen pushed a commit to branch experimental
in repository libguestfs.

commit 7a34855265d66321ff1f7ee7a2bb4c4d69056a20
Author: Richard W.M. Jones <rjones at redhat.com>
Date:   Tue Dec 9 19:16:57 2014 +0000

    builder: Add Fedora 21 image, remove RHEL 7 RC image.
---
 builder/website/fedora.sh |  6 +++++-
 builder/website/index     | 24 ++++++++++++-----------
 builder/website/index.asc | 50 ++++++++++++++++++++++++-----------------------
 3 files changed, 44 insertions(+), 36 deletions(-)

diff --git a/builder/website/fedora.sh b/builder/website/fedora.sh
index 8702f5d..7ef5d48 100755
--- a/builder/website/fedora.sh
+++ b/builder/website/fedora.sh
@@ -30,7 +30,11 @@ if [ $# -ne 1 ]; then
 fi
 
 version=$1
-tree=http://mirror.bytemark.co.uk/fedora/linux/releases/$version/Fedora/x86_64/os/
+if [ $version -lt 21 ]; then
+    tree=http://mirror.bytemark.co.uk/fedora/linux/releases/$version/Fedora/x86_64/os/
+else
+    tree=http://mirror.bytemark.co.uk/fedora/linux/releases/$version/Server/x86_64/os/
+fi
 output=fedora-$version
 tmpname=tmp-$(tr -cd 'a-f0-9' < /dev/urandom | head -c 8)
 
diff --git a/builder/website/index b/builder/website/index
index be1806b..3244601 100644
--- a/builder/website/index
+++ b/builder/website/index
@@ -191,26 +191,28 @@ notes=Fedora 20.
  Fedora and the Infinity design logo are trademarks of Red Hat, Inc.
  Source and further information is available from http://fedoraproject.org/
 
-[rhel-7rc]
-name=Red Hat Enterprise Linux® 7 Release Candidate
+[fedora-21]
+name=Fedora® 21 Server
+osinfo=fedora21
 arch=x86_64
-file=rhel-7rc.xz
-checksum=c4252cfdf7482d4289de24f78e7fd1b9c9b6ff702d717a1c2a54a341b0565c03a5c8e95d32e1f23f7afe5ed2cf5b8e0f0ee3e16c1179e01348a54f82cb552c0f
+file=fedora-21.xz
+revision=1
+checksum=4dc92cbf540d3a0745ffe1fa01ffae15f17e7a8aa45c70ad975a1dda82b7f1ebe42f912be74d91a5866a91ee2ca3be3c2be274b5da29db930fe1ec8c2286575b
 format=raw
-size=6442450944
-compressed_size=210202084
+size=4294967296
+compressed_size=209059864
 expand=/dev/sda3
-notes=Red Hat Enterprise Linux® 7 Release Candidate
+notes=Fedora 21 Server.
  
- This image contains only unmodified @Core group packages.
+ This Fedora image contains only unmodified @Core group packages.
  
  It is thus very minimal.  The kickstart and install script can be
  found in the libguestfs source tree:
  
- builder/website/rhel.sh
+ builder/website/fedora.sh
  
- Red Hat Enterprise Linux is a trademark of Red Hat, Inc.
- Source and further information is available from ftp://ftp.redhat.com
+ Fedora and the Infinity design logo are trademarks of Red Hat, Inc.
+ Source and further information is available from http://fedoraproject.org/
 
 [scientificlinux-6]
 name=Scientific Linux 6.5
diff --git a/builder/website/index.asc b/builder/website/index.asc
index 8baf914..dd9be84 100644
--- a/builder/website/index.asc
+++ b/builder/website/index.asc
@@ -194,26 +194,28 @@ notes=Fedora 20.
  Fedora and the Infinity design logo are trademarks of Red Hat, Inc.
  Source and further information is available from http://fedoraproject.org/
 
-[rhel-7rc]
-name=Red Hat Enterprise Linux® 7 Release Candidate
+[fedora-21]
+name=Fedora® 21 Server
+osinfo=fedora21
 arch=x86_64
-file=rhel-7rc.xz
-checksum=c4252cfdf7482d4289de24f78e7fd1b9c9b6ff702d717a1c2a54a341b0565c03a5c8e95d32e1f23f7afe5ed2cf5b8e0f0ee3e16c1179e01348a54f82cb552c0f
+file=fedora-21.xz
+revision=1
+checksum=4dc92cbf540d3a0745ffe1fa01ffae15f17e7a8aa45c70ad975a1dda82b7f1ebe42f912be74d91a5866a91ee2ca3be3c2be274b5da29db930fe1ec8c2286575b
 format=raw
-size=6442450944
-compressed_size=210202084
+size=4294967296
+compressed_size=209059864
 expand=/dev/sda3
-notes=Red Hat Enterprise Linux® 7 Release Candidate
+notes=Fedora 21 Server.
  
- This image contains only unmodified @Core group packages.
+ This Fedora image contains only unmodified @Core group packages.
  
  It is thus very minimal.  The kickstart and install script can be
  found in the libguestfs source tree:
  
- builder/website/rhel.sh
+ builder/website/fedora.sh
  
- Red Hat Enterprise Linux is a trademark of Red Hat, Inc.
- Source and further information is available from ftp://ftp.redhat.com
+ Fedora and the Infinity design logo are trademarks of Red Hat, Inc.
+ Source and further information is available from http://fedoraproject.org/
 
 [scientificlinux-6]
 name=Scientific Linux 6.5
@@ -321,17 +323,17 @@ notes=Ubuntu 14.04 (Trusty).
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v1
 
-iQIcBAEBAgAGBQJUU5I7AAoJEJFzj3Pht2ig19QQAJmxPP9rpKZFHcJzjp6OUcIq
-WOtN6z9E6KFpVTozshU2Nn1OXtV/6/6mZufJWum/vpSMac+3z05eCzoNpmiS78DW
-K8sCQbVqXYa8qrDmoEu+sogxjsMspyr3X2ZxbWZUyyB+p/tAkRTO7tZ2H0BUWUO/
-IPCGDa4IpexHDeIA4iYL9yVnjEr3YcyyvyTXB3Co/ypE23DqyWHncqG2WQwR/bSw
-nAX/3Ukh1Sf/gK8areBaJIkTvnSzjC2pduROPRwuFyCZ9i774FdnGxj2gff5w5gX
-DXoVNCLRI3io5hgTlpf6JjwIDzvKgf8RQFdcwlbBlDoYO0taywz7Fu1pQdCQd96k
-G5mmJwxrMIEeQIiRwHJ2gZkLhZLE5zEXbNdVZpXc0AYCVy8WwX1m5K5FjHRl7SAH
-kgFhsuV0aLLKkCy4vpowbi1gPjYqAsTcpKX6D5tm2dFRCwIzEbb8W4vTssUadJMy
-AwNt99KF49eO9npMdAas7H+8ujhTNSlFfORHwpkM8QpwScX3bp12mntRI3qgLshS
-7rNArE8pBC5F/CFC10RTHA1ujNcBY7SkN9u/v9s8Q1KSPctFyJuLNdmaFZCcAsZM
-cARKJdCEtx9FJjjsOBfaGcVn7/jIYCMihSOA4yU1T70mMLi7xTYMF2q49/rojdSZ
-bQzbzIxg7XIsKK2yrkRq
-=KiNV
+iQIcBAEBAgAGBQJUh0qYAAoJEJFzj3Pht2igo4gP/jHI52b2SNlKDkIFMjM26ztL
+UxtxHlU+70y8pOq/78beVHuiGYFGpkgmbU6lzPpVDivZP4riX1VWUWDWppmu2eEr
+SatDQEaUI1dlETFULXA2kpebH0Q4HsuALZeTt8y9j2U8l/JbKmqBM95f4YOxZiaf
+/UCfF+Er23Lp0whbPVlKDlWQvEVuGANllhoP0lGzLjaz5AHdjLewC+VcJrax74TO
+Lo/aelcZ6M0IYHyXJKUFHl1MrudoWcPvwvTevS7T9zTWJv4Pr+cfCquRxuZ2WZez
+hlwDcMYAO8XF7GsIjGl5ay2Y2H0Anm9iIFwR/bfGMr2EnLLxYZ0qYmeZeO9ZCQFK
+or57RjBebb4qvl5LQQ6JcagRUBPpQ7V5H0sbKTZgLbTDyuUWy+3xJ1MOIZPlnVvB
+gqVgbim9oPatIAgDUS60v4Gu5IFWoi8rgKoPUbY2eSmCfLd8wf1TeC2wQ4vKYJjj
+pMnnmR74gOUL5uUSFV+kM9PqdO65T5YJEG0Be09WCWqkvXbDsOpWDnBz4d5rfxbA
+78lAILtBcDZJvYk+dEekK2TKcWEBfqOPJ5ecWSoogn8pCdnvx3mMzGDaFzDiiiC+
+75nhFNimJs/akwOFh2DLkML0dfIMoaRwTrSoyAfAY+k9rCXBxNVsR0PtThEXaNYo
+RnA1DWswrHxjgIEj4pao
+=TEYf
 -----END PGP SIGNATURE-----

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-libvirt/libguestfs.git