[cloud-init/f17] Rebase against upstream rev 532
gholms
gholms at fedoraproject.org
Mon Mar 5 22:14:48 UTC 2012
commit 2f7ad5503227881795bebde60ff166f741947235
Author: Garrett Holmstrom <gholms at fedoraproject.org>
Date: Mon Mar 5 13:32:08 2012 -0800
Rebase against upstream rev 532
.gitignore | 1 +
cloud-init-0.6.2-fedora.patch | 41 --------------
cloud-init-0.6.2-filecontext.patch | 82 ----------------------------
cloud-init-0.6.2-localefile.patch | 44 ---------------
cloud-init-0.6.2-puppetenable.patch | 32 -----------
cloud-init-0.6.2-runparts-emptydir.patch | 14 -----
cloud-init-0.6.2-sshkeytypes.patch | 66 -----------------------
cloud-init-0.6.2-sshsvc.patch | 44 ---------------
cloud-init-0.6.2-systemd.patch | 86 ------------------------------
cloud-init-0.6.2-tzsysconfig.patch | 18 ------
cloud-init-0.6.3-fedora.patch | 28 ++++++++++
cloud-init.spec | 45 ++++------------
sources | 1 +
13 files changed, 40 insertions(+), 462 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index 25a48a5..7b9c35c 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,2 +1,3 @@
/cloud-init-0.6.2-bzr450.tar.gz
/cloud-init-0.6.2-bzr457.tar.gz
+/cloud-init-0.6.3-bzr532.tar.gz
diff --git a/cloud-init-0.6.3-fedora.patch b/cloud-init-0.6.3-fedora.patch
new file mode 100644
index 0000000..64fe4f7
--- /dev/null
+++ b/cloud-init-0.6.3-fedora.patch
@@ -0,0 +1,28 @@
+=== modified file 'cloudinit/CloudConfig/cc_keys_to_console.py'
+--- cloudinit/CloudConfig/cc_keys_to_console.py 2012-01-18 14:07:33 +0000
++++ cloudinit/CloudConfig/cc_keys_to_console.py 2012-03-05 21:53:13 +0000
+@@ -26,7 +26,7 @@
+
+
+ def handle(_name, cfg, _cloud, log, _args):
+- cmd = ['/usr/lib/cloud-init/write-ssh-key-fingerprints']
++ cmd = ['/usr/libexec/cloud-init/write-ssh-key-fingerprints']
+ fp_blacklist = util.get_cfg_option_list_or_str(cfg,
+ "ssh_fp_console_blacklist", [])
+ key_blacklist = util.get_cfg_option_list_or_str(cfg,
+
+=== modified file 'setup.py'
+--- setup.py 2011-12-20 16:39:46 +0000
++++ setup.py 2012-03-05 22:00:19 +0000
+@@ -40,9 +40,8 @@
+ data_files=[('/etc/cloud', glob('config/*.cfg')),
+ ('/etc/cloud/cloud.cfg.d', glob('config/cloud.cfg.d/*')),
+ ('/etc/cloud/templates', glob('templates/*')),
+- ('/etc/init', glob('upstart/*.conf')),
+ ('/usr/share/cloud-init', []),
+- ('/usr/lib/cloud-init',
++ ('/usr/libexec/cloud-init',
+ ['tools/uncloud-init', 'tools/write-ssh-key-fingerprints']),
+ ('/usr/share/doc/cloud-init', filter(is_f,glob('doc/*'))),
+ ('/usr/share/doc/cloud-init/examples', filter(is_f,glob('doc/examples/*'))),
+
diff --git a/cloud-init.spec b/cloud-init.spec
index ff8472c..4244be8 100644
--- a/cloud-init.spec
+++ b/cloud-init.spec
@@ -1,38 +1,18 @@
%{!?python_sitelib: %global python_sitelib %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib()")}
Name: cloud-init
-Version: 0.6.2
-Release: 0.8.bzr457%{?dist}
+Version: 0.6.3
+Release: 0.1.bzr532%{?dist}
Summary: Cloud instance init scripts
Group: System Environment/Base
License: GPLv3
URL: http://launchpad.net/cloud-init
-# bzr export -r 457 cloud-init-0.6.2-bzr457.tar.gz lp:cloud-init
-Source0: %{name}-%{version}-bzr457.tar.gz
+# bzr export -r 532 cloud-init-0.6.3-bzr532.tar.gz lp:cloud-init
+Source0: %{name}-%{version}-bzr532.tar.gz
Source1: cloud-init-fedora.cfg
Source2: cloud-init-README.fedora
-Patch0: cloud-init-0.6.2-fedora.patch
-
-# The current patch set is in flux as we stabilize cloud-init on Fedora.
-# It will be submitted upstream as soon as it becomes reasonable to do so.
-
-# Add systemd support (not yet upstream)
-Patch2: cloud-init-0.6.2-systemd.patch
-# Restore created files' selinux contexts (not yet upstream)
-Patch3: cloud-init-0.6.2-filecontext.patch
-# Make locale file location configurable (not yet upstream)
-Patch4: cloud-init-0.6.2-localefile.patch
-# Write timezone data to /etc/sysconfig/clock (not yet upstream)
-Patch5: cloud-init-0.6.2-tzsysconfig.patch
-# Make enabling the puppet service work on Fedora (not yet upstream)
-Patch7: cloud-init-0.6.2-puppetenable.patch
-# Make the types of SSH keys to generate configurable (not yet upstream)
-Patch8: cloud-init-0.6.2-sshkeytypes.patch
-# https://bugs.launchpad.net/cloud-init/+bug/857926
-Patch10: cloud-init-0.6.2-runparts-emptydir.patch
-# Deal with differences between out sshd service and Ubuntu's (not yet upstream)
-Patch11: cloud-init-0.6.2-sshsvc.patch
+Patch0: cloud-init-0.6.3-fedora.patch
BuildArch: noarch
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
@@ -64,16 +44,8 @@ ssh keys and to let the user run various scripts.
%prep
-%setup -q -n %{name}-%{version}-bzr457
-%patch0 -p1
-%patch2 -p1
-%patch3 -p1
-%patch4 -p1
-%patch5 -p1
-%patch7 -p1
-%patch8 -p1
-%patch10 -p1
-%patch11 -p1
+%setup -q -n %{name}-%{version}-bzr532
+%patch0 -p0
cp -p %{SOURCE2} README.fedora
@@ -155,6 +127,9 @@ fi
%changelog
+* Mon Mar 5 2012 Garrett Holmstrom <gholms at fedoraproject.org> - 0.6.3-0.1.bzr532
+- Rebased against upstream rev 532
+
* Thu Jan 12 2012 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.6.2-0.8.bzr457
- Rebuilt for https://fedoraproject.org/wiki/Fedora_17_Mass_Rebuild
diff --git a/sources b/sources
index ed82092..5cb1fec 100644
--- a/sources
+++ b/sources
@@ -1 +1,2 @@
b8c9145213f6642e23270543fba24fb9 cloud-init-0.6.2-bzr457.tar.gz
+c5f118f17683c7aacd8e127e756eb070 cloud-init-0.6.3-bzr532.tar.gz
More information about the scm-commits
mailing list