Differences between revisions 13 and 14
Revision 13 as of 2013-04-06 12:09:49
Size: 3173
Editor: ?JoeHealy
Comment:
Revision 14 as of 2013-04-07 13:41:39
Size: 4173
Editor: ?JoeHealy
Comment:
Deletions are marked like this. Additions are marked like this.
Line 69: Line 69:
=== Removing useless files === === Patching the repository ===

Depending on the need, this should either be done by using quilt (http://www.debian.org/doc/manuals/maint-guide/modify.en.html) or by modifing the {{{debian/rules}}} file.

In a recent (and educational) example, the rm was added at the end of the {{{override_dh_installdocs}}} chunk to delete the .DS_Store file after the files were copied into the temporary packaging location (dh_install/dh_installdocs step) but before being packaged into the .deb file.

{{{rm -r}}} was used rather than {{{rm -rf}}} (force) so that when a fixed upstream release is made, this will fail and the patch can be removed.

The extract from {{{debian/rules}}} can be seen below:
Line 72: Line 80:
rm doc/_themes/saltstack/static/fonts/.DS_Store
rm doc/_build/html/_static/fonts/.DS_Store
override_dh_installdocs:
        dh_installdocs
        # Remove embedded copies of javascript libs
        for f in $(JS_FILES) ; do \
                cd debian/salt-doc/usr/share/doc/salt/html/_static/ \
                  && rm $${f}.js \
                  && ln -s ../../../../javascript/sphinxdoc/1.0/$${f}.js . \
                  && cd $(CURDIR) ; \
        done ;
        # Remove stray .DS_Store file
        rm -r debian/salt-doc/usr/share/doc/salt/html/_static/fonts/.DS_Store
Line 75: Line 92:
This files it's only used on Mac OS Systems and generate a lintian warning.

Salt Packaging Team

It is early days for the salt packaging team, but we are setting up the infrastructure.

Our aims are to package salt and then the other salt tools (salt-api, salt-cloud etc) for debian and subsequently ubuntu.

Our primary aim at this point is firstly getting salt into debian unstable and hopefully being backported to wheezy and squeeze. Following this, we will be repeating this process for the other salt tools.

Most of the information below is for the team to learn, agree and standardize on processes for setting up and working with the repository we will use for packaging. Although it contains information that may be useful for building your own salt packages, that is not the intention at this stage. For the moment, the best reference is probably http://docs.saltstack.com/topics/installation/debian.html.

If you wish to be involved, the best approach is probably to join the mailing list.

Infrastructure

Interacting with the team

Task description

Packaging of Salt (http://saltstack.com) and related projects.

HowTos

Initial Repository Setup

1) download the .tar.gz and dsc files from http://debian.madduck.net/repo/pool/main/s/salt/

dget http://debian.madduck.net/repo/pool/main/s/salt/salt_0.12.1-1~bpo60+1~madduck.2.dsc (or another dsc filename if applicable)

Initiate a new Git directory

git init

or maybe a git clone git+ssh://username-guest@git.debian.org/git/pkg-salt/pkg-salt.git before all this it's a better idea (?)

2) Use git-import-dsc with madducks last 0.12.1 release:

git-import-dsc salt_0.12.1-1~bpo60+1~madduck.2.dsc --pristine-tar

3) Download and import the released 0.14.0 tar.gz from pypi:

cd salt/

Verify new upstream version

uscan --verbose --download

Importing a new salt release

git-import-orig ../salt-0.14.0.tar.gz -u 0.14.0 --pristine-tar

Patching the repository

Depending on the need, this should either be done by using quilt (http://www.debian.org/doc/manuals/maint-guide/modify.en.html) or by modifing the debian/rules file.

In a recent (and educational) example, the rm was added at the end of the override_dh_installdocs chunk to delete the .DS_Store file after the files were copied into the temporary packaging location (dh_install/dh_installdocs step) but before being packaged into the .deb file.

rm -r was used rather than rm -rf (force) so that when a fixed upstream release is made, this will fail and the patch can be removed.

The extract from debian/rules can be seen below:

override_dh_installdocs:
        dh_installdocs
        # Remove embedded copies of javascript libs
        for f in $(JS_FILES) ; do \
                cd debian/salt-doc/usr/share/doc/salt/html/_static/ \
                  && rm $${f}.js \
                  && ln -s ../../../../javascript/sphinxdoc/1.0/$${f}.js . \
                  && cd $(CURDIR) ; \
        done ;
        # Remove stray .DS_Store file
        rm -r debian/salt-doc/usr/share/doc/salt/html/_static/fonts/.DS_Store

Building the packages

Is this the best? Some people use pbuilder - should that be our standard process?

git-dch

git-buildpackage -us -uc

Cloning the repo down

As it is a git-buildpackage repo, the following will clone the branches down properly:

gbp-clone git+ssh://username-guest@git.debian.org/git/pkg-salt/pkg-salt.git

Testing the packages

1. Install on sufficiently clean system

1. Uninstall

1. Install previous version

1. Upgrade to new package

1. Test basic package functionality

Backporting

Decisions

  1. Use of git and git-buildpackage for VCS

Proposed Decisions