diff --git a/sysadm/deployment/howto-debian-packaging.rst b/sysadm/deployment/howto-debian-packaging.rst --- a/sysadm/deployment/howto-debian-packaging.rst +++ b/sysadm/deployment/howto-debian-packaging.rst @@ -406,7 +406,7 @@ .. code:: - gbp buildpackage --git-builder=sbuild -As --no-clean-source + gbp buildpackage --git-builder=sbuild -As --no-clean-source --build-dep-resolver=aptitude ``gbp buildpackage`` passes all options not starting with ``--git-`` to the builder. Some useful options are the following: @@ -432,21 +432,46 @@ See ``gbp help buildpackage`` and ``man sbuild`` for a full description of all options -for example: +For **sid**, it would be: .. code:: - gbp buildpackage --git-builder=sbuild -As --no-clean-source --force-orig-source \ - --extra-repository='deb [trusted=yes] https://debian.softwareheritage.org/ buster-swh main' + git checkout debian/unstable-swh + gbp buildpackage --git-builder=sbuild -As --build-dep-resolver=aptitude \ + --no-clean-source --force-orig-source \ + --extra-repository='deb [trusted=yes] https://debian.softwareheritage.org/ unstable main' -or if you need some third-party repository, say for cassandra: +or if you need some third-party repository, say cassandra (for swh-storage): .. code:: - gbp buildpackage --git-builder=sbuild -As --no-clean-source --force-orig-source \ - --extra-repository='deb [trusted=yes] https://debian.softwareheritage.org/ buster-swh main' \ + gbp buildpackage --git-builder=sbuild -As --build-dep-resolver=aptitude \ + --no-clean-source --force-orig-source \ + --extra-repository='deb [trusted=yes] https://debian.softwareheritage.org/ unstable main' \ --extra-repository='deb [arch=amd64 trusted=yes] https://downloads.apache.org/cassandra/debian/ 40x main' +For **buster**, it would be: + +.. code:: + + git checkout debian/buster-swh + gbp buildpackage --git-builder=sbuild -As --build-dep-resolver=aptitude \ + --no-clean-source --force-orig-source \ + --extra-repository='deb https://deb.debian.org/ buster-backports main' \ + --extra-repository='deb [trusted=yes] https://debian.softwareheritage.org/ buster-swh main' + +For **bullseye**, it would be: + +.. code:: + + git checkout debian/bullseye-swh + gbp buildpackage --git-builder=sbuild -As --build-dep-resolver=aptitude \ + --no-clean-source --force-orig-source \ + --extra-repository='deb https://deb.debian.org/ bullseye-backports main' \ + --extra-repository='deb [trusted=yes] https://debian.softwareheritage.org/ bullseye-swh main' + +.. Warning:: At time of writing, most software packages have no bullseye branch yet. + **TODO**: Rewrite bin/make-package as bin/swh-gbp-buildpackage wrapping ``gbp buildpackage`` with the most common options.