Skip to content

Remove d/b/genorig.py in favour of uscan

Ben Hutchings requested to merge benh/linux:remove-genorig into master

uscan currently does both:

  1. Generate a tarball from Git, since the upstream for a Debian source package must be a tarball.
  2. Generate a second tarball with file exclusions applied.

This is rather inefficient. However, now that bug #1003251 is fixed, we have the option to make the first tarball uncompressed. Since we don't store the first tarball, this is fine for us.

  • d/salsa-ci.yml: In extract-source, use origtagz instead of genorig.py

    • Install devscripts instead of (directly) installing gpg and gpgv
    • Use the environment variable to make the first tarball uncompressed, since (a) we don't run uscan directly but through origtargz (b) this will be safely ignored when building in an older suite where uscan doesn't support this.
    • Adjust orig tarball handling to work with tarballs in ../ rather than ../orig/.

  • d/README.source: Document running uscan instead of genorig.py.

  • d/rules: Expect orig tarballs to be in ../ and never in ../orig/

Edited by Ben Hutchings

Merge request reports