x/cloud-init
Code Issues Proposed changes

update tools/bddeb and debian.trunk packaging

Browse Source 
* debian.trunk/changelog: increase debian version to '1' to avoid lintian
   error
 * debian.trunk/control: bump standards version
 * debian.trunk/rules: remove cloud-init-run-module symlink (been deprecated
   for some time)
 * tools/bddeb: read version from ChangeLog rather than setup.py
This commit is contained in:
Scott Moser 2012-06-20 16:24:24 -04:00
parent e928d74318
commit d221d29fb2
5 changed files with 6 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
debian.trunk/changelog
View File

@ -1,4 +1,4 @@
cloud-init (VERSION~REVNO-0) UNRELEASED; urgency=low cloud-init (VERSION~REVNO-1) UNRELEASED; urgency=low
* build * build

2
debian.trunk/control
View File

@ -10,7 +10,7 @@ Build-Depends: cdbs,
pylint, pylint,
python-mocker, python-mocker,
XS-Python-Version: all XS-Python-Version: all
Standards-Version: 3.9.1 Standards-Version: 3.9.3
Package: cloud-init Package: cloud-init
Architecture: all Architecture: all

1
debian.trunk/rules
View File

@ -13,7 +13,6 @@ cloud-init-fixups:
for x in $(DEB_DESTDIR)/usr/bin/*.py; do mv "$$x" "$${x%.py}"; done for x in $(DEB_DESTDIR)/usr/bin/*.py; do mv "$$x" "$${x%.py}"; done
install -d $(DEB_DESTDIR)/etc/rsyslog.d install -d $(DEB_DESTDIR)/etc/rsyslog.d
cp tools/21-cloudinit.conf $(DEB_DESTDIR)/etc/rsyslog.d/21-cloudinit.conf cp tools/21-cloudinit.conf $(DEB_DESTDIR)/etc/rsyslog.d/21-cloudinit.conf
ln -sf cloud-init-per $(DEB_DESTDIR)/usr/bin/cloud-init-run-module
# You only need to run this immediately after checking out the package from # You only need to run this immediately after checking out the package from
# revision control. # revision control.

3
setup.py
View File

@ -70,8 +70,7 @@ setup(name='cloud-init',
author_email='scott.moser@canonical.com', author_email='scott.moser@canonical.com',
url='http://launchpad.net/cloud-init/', url='http://launchpad.net/cloud-init/',
packages=find_packages(), packages=find_packages(),
scripts=['bin/cloud-init.py', scripts=['bin/cloud-init',
'bin/cloud-init-cfg.py',
'tools/cloud-init-per', 'tools/cloud-init-per',
], ],
data_files=[('/etc/cloud', glob('config/*.cfg')), data_files=[('/etc/cloud', glob('config/*.cfg')),

6
tools/bddeb
View File

@ -8,8 +8,8 @@ set -e
trap "rm -Rf '${TEMP_D}'" exit trap "rm -Rf '${TEMP_D}'" exit
files=$(bzr ls --versioned) files=$(bzr ls --versioned)
revno=$(bzr revno) revno=$(bzr revno)
version=$(awk \ version=$(awk -F: \
-F= '$1 ~ /version$/ { gsub("[^0-9.]","",$2); print $2; }' setup.py) '$1 ~ /[0-9][.][0-9]+[.][0-9]+/ { print $1 ; exit(0); }' ChangeLog )
mkdir "${TEMP_D}/cloud-init" mkdir "${TEMP_D}/cloud-init"
otar="$TEMP_D/cloud-init_$version~bzr${revno}.orig.tar.gz" otar="$TEMP_D/cloud-init_$version~bzr${revno}.orig.tar.gz"
tar -czf - ${files} > "$otar" tar -czf - ${files} > "$otar"
@ -25,7 +25,7 @@ debuild "$@"
#for x in ../*.deb; do #for x in ../*.deb; do
# echo wrote ${x##*/} # echo wrote ${x##*/}
#done #done
debname="cloud-init_${version}~bzr${revno}-0_all.deb" debname="cloud-init_${version}~bzr${revno}-1_all.deb"
mv "../$debname" "$start" mv "../$debname" "$start"
link="$start/cloud-init_all.deb" link="$start/cloud-init_all.deb"
echo "wrote $debname" echo "wrote $debname"