From 48ec119bd68dfa090785db7758c542878ee5fc56 Mon Sep 17 00:00:00 2001 From: Scott Moser Date: Mon, 9 Jul 2012 17:09:04 -0400 Subject: fix bddeb and brpm: by renaming packaging files that are templates In cherry picking the cheetah commit, I missed the rename of these files. packages/debian/changelog => packages/debian/changelog.in packages/debian/control => packages/debian/control.in packages/redhat/cloud-init.spec => packages/redhat/cloud-init.spec.in --- packages/debian/changelog | 6 -- packages/debian/changelog.in | 6 ++ packages/debian/control | 33 ------- packages/debian/control.in | 33 +++++++ packages/redhat/cloud-init.spec | 170 ------------------------------------- packages/redhat/cloud-init.spec.in | 170 +++++++++++++++++++++++++++++++++++++ 6 files changed, 209 insertions(+), 209 deletions(-) delete mode 100644 packages/debian/changelog create mode 100644 packages/debian/changelog.in delete mode 100644 packages/debian/control create mode 100644 packages/debian/control.in delete mode 100644 packages/redhat/cloud-init.spec create mode 100644 packages/redhat/cloud-init.spec.in (limited to 'packages') diff --git a/packages/debian/changelog b/packages/debian/changelog deleted file mode 100644 index eda08c57..00000000 --- a/packages/debian/changelog +++ /dev/null @@ -1,6 +0,0 @@ -## This is a cheetah template -cloud-init (${version}~${revision}-1) UNRELEASED; urgency=low - - * build - - -- Scott Moser Fri, 16 Dec 2011 11:50:25 -0500 diff --git a/packages/debian/changelog.in b/packages/debian/changelog.in new file mode 100644 index 00000000..eda08c57 --- /dev/null +++ b/packages/debian/changelog.in @@ -0,0 +1,6 @@ +## This is a cheetah template +cloud-init (${version}~${revision}-1) UNRELEASED; urgency=low + + * build + + -- Scott Moser Fri, 16 Dec 2011 11:50:25 -0500 diff --git a/packages/debian/control b/packages/debian/control deleted file mode 100644 index 4e151e3e..00000000 --- a/packages/debian/control +++ /dev/null @@ -1,33 +0,0 @@ -## This is a cheetah template -Source: cloud-init -Section: admin -Priority: extra -Maintainer: Scott Moser -Build-Depends: cdbs, - debhelper (>= 5.0.38), - python (>= 2.6.6-3~), - python-nose, - pyflakes, - pylint, - python-setuptools, - python-cheetah, - python-mocker, - python-setuptools -XS-Python-Version: all -Standards-Version: 3.9.3 - -Package: cloud-init -Architecture: all -Depends: cloud-utils, - procps, - python, -#for $r in $requires - ${r}, -#end for - python-software-properties, - \${misc:Depends}, - \${python:Depends} -XB-Python-Version: \${python:Versions} -Description: Init scripts for cloud instances - Cloud instances need special scripts to run during initialisation - to retrieve and install ssh keys and to let the user run various scripts. diff --git a/packages/debian/control.in b/packages/debian/control.in new file mode 100644 index 00000000..4e151e3e --- /dev/null +++ b/packages/debian/control.in @@ -0,0 +1,33 @@ +## This is a cheetah template +Source: cloud-init +Section: admin +Priority: extra +Maintainer: Scott Moser +Build-Depends: cdbs, + debhelper (>= 5.0.38), + python (>= 2.6.6-3~), + python-nose, + pyflakes, + pylint, + python-setuptools, + python-cheetah, + python-mocker, + python-setuptools +XS-Python-Version: all +Standards-Version: 3.9.3 + +Package: cloud-init +Architecture: all +Depends: cloud-utils, + procps, + python, +#for $r in $requires + ${r}, +#end for + python-software-properties, + \${misc:Depends}, + \${python:Depends} +XB-Python-Version: \${python:Versions} +Description: Init scripts for cloud instances + Cloud instances need special scripts to run during initialisation + to retrieve and install ssh keys and to let the user run various scripts. diff --git a/packages/redhat/cloud-init.spec b/packages/redhat/cloud-init.spec deleted file mode 100644 index 35b27beb..00000000 --- a/packages/redhat/cloud-init.spec +++ /dev/null @@ -1,170 +0,0 @@ -## This is a cheetah template -%{!?python_sitelib: %global python_sitelib %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib()")} - -# See: http://www.zarb.org/~jasonc/macros.php -# Or: http://fedoraproject.org/wiki/Packaging:ScriptletSnippets -# Or: http://www.rpm.org/max-rpm/ch-rpm-inside.html - -Name: cloud-init -Version: ${version} -Release: ${release}%{?dist} -Summary: Cloud instance init scripts - -Group: System Environment/Base -License: GPLv3 -URL: http://launchpad.net/cloud-init - -Source0: ${archive_name} -BuildArch: noarch -BuildRoot: %{_tmppath} - -BuildRequires: python-devel -BuildRequires: python-setuptools -BuildRequires: python-cheetah - -# System util packages needed -Requires: shadow-utils -Requires: rsyslog -Requires: iproute -Requires: e2fsprogs -Requires: net-tools -Requires: procps -Requires: shadow-utils - -# Install pypi 'dynamic' requirements -#for $r in $requires -Requires: ${r} -#end for - -#if $sysvinit -Requires(post): chkconfig -Requires(postun): initscripts -Requires(preun): chkconfig -Requires(preun): initscripts -#end if - -#if $systemd -BuildRequires: systemd-units -Requires(post): systemd-units -Requires(postun): systemd-units -Requires(preun): systemd-units -#end if - -%description -Cloud-init is a set of init scripts for cloud instances. Cloud instances -need special scripts to run during initialization to retrieve and install -ssh keys and to let the user run various scripts. - -%prep -%setup -q -n %{name}-%{version}~${release} - -%build -%{__python} setup.py build - -%install -rm -rf \$RPM_BUILD_ROOT -%{__python} setup.py install -O1 \ - --skip-build --root \$RPM_BUILD_ROOT \ - --init-system=${init_sys} - -# Note that /etc/rsyslog.d didn't exist by default until F15. -# el6 request: https://bugzilla.redhat.com/show_bug.cgi?id=740420 -mkdir -p \$RPM_BUILD_ROOT/%{_sysconfdir}/rsyslog.d -cp -p tools/21-cloudinit.conf \ - \$RPM_BUILD_ROOT/%{_sysconfdir}/rsyslog.d/21-cloudinit.conf - -%clean -rm -rf \$RPM_BUILD_ROOT - -%post - -#if $systemd -if [ \$1 -eq 1 ] -then - /bin/systemctl enable cloud-config.service >/dev/null 2>&1 || : - /bin/systemctl enable cloud-final.service >/dev/null 2>&1 || : - /bin/systemctl enable cloud-init.service >/dev/null 2>&1 || : - /bin/systemctl enable cloud-init-local.service >/dev/null 2>&1 || : -fi -#end if - -#if $sysvinit -/sbin/chkconfig --add %{_initrddir}/cloud-init-local -/sbin/chkconfig --add %{_initrddir}/cloud-init -/sbin/chkconfig --add %{_initrddir}/cloud-config -/sbin/chkconfig --add %{_initrddir}/cloud-final -#end if - -%preun - -#if $sysvinit -if [ \$1 -eq 0 ] -then - /sbin/service cloud-init stop >/dev/null 2>&1 || : - /sbin/chkconfig --del cloud-init || : - /sbin/service cloud-init-local stop >/dev/null 2>&1 || : - /sbin/chkconfig --del cloud-init-local || : - /sbin/service cloud-config stop >/dev/null 2>&1 || : - /sbin/chkconfig --del cloud-config || : - /sbin/service cloud-final stop >/dev/null 2>&1 || : - /sbin/chkconfig --del cloud-final || : -fi -#end if - -#if $systemd -if [ \$1 -eq 0 ] -then - /bin/systemctl --no-reload disable cloud-config.service >/dev/null 2>&1 || : - /bin/systemctl --no-reload disable cloud-final.service >/dev/null 2>&1 || : - /bin/systemctl --no-reload disable cloud-init.service >/dev/null 2>&1 || : - /bin/systemctl --no-reload disable cloud-init-local.service >/dev/null 2>&1 || : -fi -#end if - -%postun - -#if $systemd -/bin/systemctl daemon-reload >/dev/null 2>&1 || : -#end if - -%files - -#if $sysvinit -%attr(0755, root, root) %{_initddir}/cloud-config -%attr(0755, root, root) %{_initddir}/cloud-final -%attr(0755, root, root) %{_initddir}/cloud-init-local -%attr(0755, root, root) %{_initddir}/cloud-init -#end if - -#if $systemd -%{_unitdir}/cloud-* -#end if - -# Program binaries -%{_bindir}/cloud-init* - -# There doesn't seem to be an agreed upon place for these -# although it appears the standard says /usr/lib but rpmbuild -# will try /usr/lib64 ?? -/usr/lib/%{name}/uncloud-init -/usr/lib/%{name}/write-ssh-key-fingerprints - -# Docs -%doc TODO LICENSE ChangeLog Requires -%doc %{_defaultdocdir}/cloud-init/* - -# Configs -%config(noreplace) %{_sysconfdir}/cloud/cloud.cfg -%dir %{_sysconfdir}/cloud/cloud.cfg.d -%config(noreplace) %{_sysconfdir}/cloud/cloud.cfg.d/*.cfg -%config(noreplace) %{_sysconfdir}/cloud/cloud.cfg.d/README -%dir %{_sysconfdir}/cloud/templates -%config(noreplace) %{_sysconfdir}/cloud/templates/* -%config(noreplace) %{_sysconfdir}/rsyslog.d/21-cloudinit.conf - -# Python code is here... -%{python_sitelib}/* - -%changelog - -${changelog} diff --git a/packages/redhat/cloud-init.spec.in b/packages/redhat/cloud-init.spec.in new file mode 100644 index 00000000..35b27beb --- /dev/null +++ b/packages/redhat/cloud-init.spec.in @@ -0,0 +1,170 @@ +## This is a cheetah template +%{!?python_sitelib: %global python_sitelib %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib()")} + +# See: http://www.zarb.org/~jasonc/macros.php +# Or: http://fedoraproject.org/wiki/Packaging:ScriptletSnippets +# Or: http://www.rpm.org/max-rpm/ch-rpm-inside.html + +Name: cloud-init +Version: ${version} +Release: ${release}%{?dist} +Summary: Cloud instance init scripts + +Group: System Environment/Base +License: GPLv3 +URL: http://launchpad.net/cloud-init + +Source0: ${archive_name} +BuildArch: noarch +BuildRoot: %{_tmppath} + +BuildRequires: python-devel +BuildRequires: python-setuptools +BuildRequires: python-cheetah + +# System util packages needed +Requires: shadow-utils +Requires: rsyslog +Requires: iproute +Requires: e2fsprogs +Requires: net-tools +Requires: procps +Requires: shadow-utils + +# Install pypi 'dynamic' requirements +#for $r in $requires +Requires: ${r} +#end for + +#if $sysvinit +Requires(post): chkconfig +Requires(postun): initscripts +Requires(preun): chkconfig +Requires(preun): initscripts +#end if + +#if $systemd +BuildRequires: systemd-units +Requires(post): systemd-units +Requires(postun): systemd-units +Requires(preun): systemd-units +#end if + +%description +Cloud-init is a set of init scripts for cloud instances. Cloud instances +need special scripts to run during initialization to retrieve and install +ssh keys and to let the user run various scripts. + +%prep +%setup -q -n %{name}-%{version}~${release} + +%build +%{__python} setup.py build + +%install +rm -rf \$RPM_BUILD_ROOT +%{__python} setup.py install -O1 \ + --skip-build --root \$RPM_BUILD_ROOT \ + --init-system=${init_sys} + +# Note that /etc/rsyslog.d didn't exist by default until F15. +# el6 request: https://bugzilla.redhat.com/show_bug.cgi?id=740420 +mkdir -p \$RPM_BUILD_ROOT/%{_sysconfdir}/rsyslog.d +cp -p tools/21-cloudinit.conf \ + \$RPM_BUILD_ROOT/%{_sysconfdir}/rsyslog.d/21-cloudinit.conf + +%clean +rm -rf \$RPM_BUILD_ROOT + +%post + +#if $systemd +if [ \$1 -eq 1 ] +then + /bin/systemctl enable cloud-config.service >/dev/null 2>&1 || : + /bin/systemctl enable cloud-final.service >/dev/null 2>&1 || : + /bin/systemctl enable cloud-init.service >/dev/null 2>&1 || : + /bin/systemctl enable cloud-init-local.service >/dev/null 2>&1 || : +fi +#end if + +#if $sysvinit +/sbin/chkconfig --add %{_initrddir}/cloud-init-local +/sbin/chkconfig --add %{_initrddir}/cloud-init +/sbin/chkconfig --add %{_initrddir}/cloud-config +/sbin/chkconfig --add %{_initrddir}/cloud-final +#end if + +%preun + +#if $sysvinit +if [ \$1 -eq 0 ] +then + /sbin/service cloud-init stop >/dev/null 2>&1 || : + /sbin/chkconfig --del cloud-init || : + /sbin/service cloud-init-local stop >/dev/null 2>&1 || : + /sbin/chkconfig --del cloud-init-local || : + /sbin/service cloud-config stop >/dev/null 2>&1 || : + /sbin/chkconfig --del cloud-config || : + /sbin/service cloud-final stop >/dev/null 2>&1 || : + /sbin/chkconfig --del cloud-final || : +fi +#end if + +#if $systemd +if [ \$1 -eq 0 ] +then + /bin/systemctl --no-reload disable cloud-config.service >/dev/null 2>&1 || : + /bin/systemctl --no-reload disable cloud-final.service >/dev/null 2>&1 || : + /bin/systemctl --no-reload disable cloud-init.service >/dev/null 2>&1 || : + /bin/systemctl --no-reload disable cloud-init-local.service >/dev/null 2>&1 || : +fi +#end if + +%postun + +#if $systemd +/bin/systemctl daemon-reload >/dev/null 2>&1 || : +#end if + +%files + +#if $sysvinit +%attr(0755, root, root) %{_initddir}/cloud-config +%attr(0755, root, root) %{_initddir}/cloud-final +%attr(0755, root, root) %{_initddir}/cloud-init-local +%attr(0755, root, root) %{_initddir}/cloud-init +#end if + +#if $systemd +%{_unitdir}/cloud-* +#end if + +# Program binaries +%{_bindir}/cloud-init* + +# There doesn't seem to be an agreed upon place for these +# although it appears the standard says /usr/lib but rpmbuild +# will try /usr/lib64 ?? +/usr/lib/%{name}/uncloud-init +/usr/lib/%{name}/write-ssh-key-fingerprints + +# Docs +%doc TODO LICENSE ChangeLog Requires +%doc %{_defaultdocdir}/cloud-init/* + +# Configs +%config(noreplace) %{_sysconfdir}/cloud/cloud.cfg +%dir %{_sysconfdir}/cloud/cloud.cfg.d +%config(noreplace) %{_sysconfdir}/cloud/cloud.cfg.d/*.cfg +%config(noreplace) %{_sysconfdir}/cloud/cloud.cfg.d/README +%dir %{_sysconfdir}/cloud/templates +%config(noreplace) %{_sysconfdir}/cloud/templates/* +%config(noreplace) %{_sysconfdir}/rsyslog.d/21-cloudinit.conf + +# Python code is here... +%{python_sitelib}/* + +%changelog + +${changelog} -- cgit v1.2.3