Commit Graph

43 Commits

Author SHA1 Message Date
Ben Hutchings 9cfb948048 debian/bin, debian/rules.real: Add symlink to Python package directory instead of editing path
This fixes one of the remaining classes of pycodestyle errors.
2018-10-01 21:41:58 +01:00
Ben Hutchings af0098b10a debian/bin, debian/lib/python: Fix most errors reported by pycodestyle
Fix coding style violations reported by pycodestyle.  This is
mostly a matter of reformatting code, particularly to eliminate
over-long lines.  I also rename one variable ("l" is considered
visually ambiguous) and change a bare "except" to explicitly
catch all exceptions.

There are three types of error or warning remaining:

- debian/bin/...: E402 module level import not at top of file
  Scripts in debian/bin need to modify the import path before
  importing from debian/lib/python.
- E127 continuation line over-indented for visual indent
  This seems to be a false positive.  pycodestyle doesn't seem to be
  happy with any level of indent (including 0) on a continuation line
  in a "with" statement.
- debian/lib/python/debian_linux/debian.py:15:2: W291 trailing whitespace
  This is a false positive.  The trailing spaces are in a long
  string and are intentional.
2018-10-01 21:41:23 +01:00
Ben Hutchings 6033fc28e8 debian/bin: Change "#!/usr/bin/env python3" to "#!/usr/bin/python3" 2018-08-25 23:19:09 +01:00
Ben Hutchings fac6a14424 Remove our private patch system, which is no longer needed
I converted the main patch series to quilt format in 3.2.20-1, but
this patch system was still used by genorig.py.  One useful
feature that was not available elsewhere was using patch + unifdef
to exclude only part of a source file.  However no source files
have needed this since 3.16-rc4 and I don't expect this to ever
be needed again.

The preceding changes moved the file removal/exclusion list into
debian/copyright and the disabling of broken features into the
main patch series, so the private patch system isn't doing
anything.

So we can now remove it completely.
2018-08-11 13:27:04 +01:00
Ben Hutchings 4aa097dc5e debian/bin/genorig.py: Add support for debian/copyright Files-Excluded field
This isn't part of the machine-readable copyright format 1.0, but is
an extension supported by mk-origtargz.
2018-08-10 14:30:18 +01:00
Bastian Blank 228a2446d1 genorig.py: Provide xz parameters to tar itself 2018-06-13 10:18:32 +02:00
Bastian Blank ea024852d4 debian/bin/genorig.py: Use --sort option for reproducible tar
Since Stretch, tar can sort the files by name itself.
2018-05-25 10:18:09 +02:00
Bastian Blank 91d3209f78 debian/bin/genorig.py: Allow xz to use all cpu cores 2018-05-25 10:08:33 +02:00
Ben Hutchings f5af248fc0 genorig.py: Verify tag signatures (based on work by Yves-Alexis Perez)
I changed the wrapper to call gpgv instead of gpg.  It is much easier
and cleaner to use local configuration this way, and it won't produce
a warning that the key isn't trusted.

I also removed used of an environment variable, as we (currently) only
pass one keyring filename here.
2017-01-07 02:57:59 +00:00
Ben Hutchings 0c23e53745 genorig.py: Make orig tarballs really reproducible
- Override umask while extracting/exporting files
- Override user and group names in tarball
2016-01-08 19:31:40 +00:00
Ben Hutchings 44ea8344d6 debian/bin/genorig.py: Make orig tarballs reproducible
Sort the tarball contents and set their mtimes to the upstream
release time.  (In case we're given a tarball and patch, the
release time is unknown and the result is not reproducible.  So
don't do that.)
2015-08-29 23:59:33 +01:00
Ben Hutchings 6b977589fb debian/bin,debian/control,debian/lib/python: Use Python 3 2015-08-29 21:48:39 +01:00
Maximilian Attems 0950a2a259 genorig: double digit version match
Fix patch name match accordingly to tarball match

Signed-off-by: maximilian attems <maks@debian.org>

svn path=/dists/trunk/linux/; revision=21297
2014-05-03 15:47:38 +00:00
Bastian Blank 929894f687 * debian/bin/genorig.py, debian/lib/python/debian_linux/abi.py,
debian/lib/python/debian_linux/debian.py,
  debian/lib/python/debian_linux/patches.py,
  - Support Python 3.
  - Use six if necessary.
* debian/templates/control.main.in, debian/templates/control.source.in:
  Depend on python-six.

svn path=/dists/trunk/linux/; revision=20946
2014-01-01 22:14:11 +00:00
Ben Hutchings 65cc08094e Fix genorig.py --override-version option
svn path=/dists/trunk/linux/; revision=20289
2013-06-24 02:03:26 +00:00
Ben Hutchings 3924ca2a70 debian/bin/genorig.py: Create symlink to tar in "..".
svn path=/dists/trunk/linux/; revision=19888
2013-03-02 16:07:23 +00:00
Ben Hutchings 4ac80f514e debian/bin/genorig.py: Check both return values of git export.
svn path=/dists/trunk/linux/; revision=19887
2013-03-02 16:06:09 +00:00
Ben Hutchings 9c86ce9fbb genorig: Accept xz-compressed upstream tarballs and patches, thanks to Sedat Dilek
svn path=/dists/trunk/linux/; revision=19885
2013-03-02 16:02:15 +00:00
Ben Hutchings 5007f191ed Use xz compression for upstream and Debian tarballs
svn path=/dists/sid/linux/; revision=19099
2012-06-08 12:34:48 +00:00
Ben Hutchings bf51475e7c Move 'orig' series out of the series directory
svn path=/dists/sid/linux/; revision=19069
2012-06-03 19:56:02 +00:00
Ben Hutchings 1c3a69f308 Drop use of multiple orig patch series
We don't need to preserve older versions of the orig patch series any more.

svn path=/dists/sid/linux-2.6/; revision=19056
2012-06-02 20:20:16 +00:00
Ben Hutchings 7b1b408f6d Fix version parsing in debian/bin/genorig.py when using a DFSG number
svn path=/dists/sid/linux-2.6/; revision=19055
2012-06-02 20:17:17 +00:00
Bastian Blank a4a27ffb31 debian/bin: PEP8 and other style fixes.
svn path=/dists/trunk/linux-2.6/; revision=18489
2012-01-11 17:00:17 +00:00
Ben Hutchings 7b78a94974 Drop third version component of 0 from upstream tags and tarball names
Also remove the temporary --override-tag option; we know what the tag
names look like.

svn path=/dists/trunk/linux-2.6/; revision=17992
2011-08-24 14:20:24 +00:00
Ben Hutchings 3ddbbbd725 Add genorig.py option to override git tag
This lets us work around the varying use of 2-component and
3-component versions.

svn path=/dists/trunk/linux-2.6/; revision=17622
2011-06-07 09:37:25 +00:00
Ben Hutchings 6703a557aa Add support for git repo as upstream source
svn path=/dists/trunk/linux-2.6/; revision=14631
2009-11-15 16:07:04 +00:00
Bastian Blank 236dd1129d debian/bin/genorig.py: Remove slipped-in debugging code.
svn path=/dists/trunk/linux-2.6/; revision=13846
2009-06-28 09:49:43 +00:00
Bastian Blank 3fa65fb2cd debian/bin/genorig.py: Use subprocess.
svn path=/dists/trunk/linux-2.6/; revision=13750
2009-06-10 10:20:13 +00:00
Bastian Blank 0fc117342c debian/bin/genorig.py: Cleanup.
svn path=/dists/trunk/linux-2.6/; revision=13749
2009-06-10 08:42:47 +00:00
Maximilian Attems f7c50a1460 Revert "debian/bin, debian/lib: Infrastructure was declared irrelevant, drop it."
as announced revert trunk sabotage

This reverts commit ccf3463f401b082e89a76d3475eff5b30c05622a.

svn path=/dists/trunk/linux-2.6/; revision=11215
2008-05-01 07:54:28 +00:00
Bastian Blank fb5a6dc08c debian/bin, debian/lib: Infrastructure was declared irrelevant, drop it.
svn path=/dists/trunk/linux-2.6/; revision=11213
2008-04-27 06:26:15 +00:00
Bastian Blank dc42c97888 Readd pruning.
svn path=/dists/trunk/linux-2.6/; revision=9624
2007-10-10 13:43:52 +00:00
Bastian Blank 898e603676 debian/bin/genorig.py: Disable debian patches.
svn path=/dists/trunk/linux-2.6/; revision=9589
2007-09-29 08:13:05 +00:00
Bastian Blank 0f772f4b01 debian/bin/genorig.py
- Add help.
- Make it possible to override the version.

svn path=/dists/trunk/linux-2.6/; revision=9569
2007-09-27 08:23:29 +00:00
Bastian Blank 40cba7cf5f debian/bin/genorig.py: Remove output if tar generation is interrupted.
svn path=/dists/trunk/linux-2.6/; revision=9524
2007-09-15 19:04:13 +00:00
Bastian Blank 696ff417a3 * debian/bin/genorig.py: Apply debian patch.
* debian/lib/python/debian_linux/debian.py: Export dfsg version.
* debian/lib/python/debian_linux/patches.py: Add.
* debian/patches/debian/dfsg/drivers-media-video-dabus.patch,
  debian/patches/debian/dfsg/drivers-net-dgrs.patch,
  debian/patches/debian/dfsg/drivers-net-tokenring-3c359-smctr.patch: Fix.
* debian/patches/series/orig-0: Move from debian/patches/series/orig-1.

svn path=/dists/trunk/linux-2.6/; revision=9504
2007-09-12 12:27:17 +00:00
Bastian Blank 33a2a4dbbd debian/bin/genorig.py: Bail out if destination already exists.
svn path=/dists/trunk/linux-2.6/; revision=8984
2007-06-17 11:06:30 +00:00
Bastian Blank 31b860633d debian/bin/genorig.py: Ignore errors in output directory creation.
svn path=/dists/trunk/linux-2.6/; revision=8456
2007-04-10 13:43:10 +00:00
Bastian Blank ede2bc2d0a debian/bin/genorig.py
- Fix detection of uncompressed patch files.
- Create output directory.

svn path=/dists/trunk/linux-2.6/; revision=8455
2007-04-10 13:39:56 +00:00
Bastian Blank c783eb45dd debian/bin/genorig.py
- Adopt new Changelog structure.
- Use rmtree from shutil.

svn path=/dists/trunk/linux-2.6/; revision=8261
2007-02-05 09:34:24 +00:00
Bastian Blank a316c4dff2 debian/bin/genorig.py: Fix permissions of output file.
svn path=/dists/trunk/linux-2.6/; revision=8098
2007-01-04 22:53:54 +00:00
Bastian Blank eb9c35c16e debian/bin/genorig.py: Fix.
svn path=/dists/trunk/linux-2.6/; revision=7823
2006-11-19 12:18:07 +00:00
Bastian Blank 6c05b655a7 debian/bin/genorig.py: Add.
svn path=/dists/trunk/linux-2.6/; revision=7822
2006-11-19 12:14:20 +00:00