Commit Graph

90 Commits

Author SHA1 Message Date
Ben Hutchings 09f2b8df70 gencontrol: Introduce and use arch/featureset/flavour iterator functions 2019-03-05 19:11:48 +00:00
Ben Hutchings 8b0aacdc26 debian/lib/python/debian_linux/gencontrol.py: Delete broken methods
MakeFlags.__repr__ references a "flags" type (probably meant to be
MakeFlags).  Gencontrol.write_config references the "file" type which
was removed in Python 3.  Clearly neither of these methods are
actually used, so delete them.
2018-10-01 21:59:58 +01:00
Ben Hutchings 8cafaf07ae debian/bin, debian/lib/python: Delete write-only vars reported by pyflakes 2018-10-01 21:50:59 +01:00
Ben Hutchings 169ec06045 debian/bin, debian/lib/python: Clean up imports based on pyflakes report
- Add explicit imports for all needed modules, rather than indirectly
  (accidentally!) importing them with "from ... import *"
- Replace all "from ... import *" statements, which inhibit static
  checking, with explicit lists of names to import
- Delete the remaining unneeded imports reported by pyflakes
2018-10-01 21:45:55 +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 db8e7a2186 Add support for specifying build-dependencies in binary package templates
This will allow removing a lot of the repetition introduced in the
preceding commits.
2018-09-11 01:12:58 +01:00
Ben Hutchings 1d4211ef97 debian/lib/python/debian_linux/gencontrol.py: Don't override source name
We set the source package name from debian/changelog, which is not
appropriate when generating a source package template for a signed image
package.  Only set the source package name if it's not in the control
template.
2018-04-08 10:31:19 +02:00
Ben Hutchings e120f06587 debian/lib/python/debian_linux/gencontrol.py: Allow overriding output filenames 2018-04-08 10:31:19 +02:00
Ben Hutchings 48f370b3c2 debian_linux.gencontrol: Add support for arch-indep per-featureset packages 2016-12-01 19:49:59 +00:00
Ben Hutchings fb5d796272 Move merge_packages function from debian/bin/gencontrol.py to gencontrol module
linux-signed will use this function in future.
2016-06-08 23:24:07 +01:00
Ben Hutchings 7b9f22feef debian_linux.gencontrol: Allow variable substitutions in control.source.in
linux-signed may need this feature.
2016-04-04 10:41:48 +01:00
Ben Hutchings 0b7b6d7a62 debian/control: Make field ordering consistent again
This regressed when switching to Python 3 and not consistently
replacing use of iter*() methods.
2015-10-31 22:04:13 +00:00
Ben Hutchings 6b977589fb debian/bin,debian/control,debian/lib/python: Use Python 3 2015-08-29 21:48:39 +01:00
Bastian Blank f23e810882 debian/lib/python/debian_linux/gencontrol.py:
Allow numbers in templates.

svn path=/dists/sid/linux/; revision=22007
2014-10-31 15:05:54 +00:00
Bastian Blank b142d22431 debian/lib/python/debian_linux: More Python 3 support.
svn path=/dists/trunk/linux/; revision=20954
2014-01-02 22:18:35 +00:00
Ben Hutchings 08a7d92f2b [arm,x86,s390,s390x] Introduce linux-compiler meta-packages to allow use of foreign linux-headers packages with a native multilib compiler
svn path=/dists/trunk/linux/; revision=20799
2013-11-21 01:15:15 +00:00
Bastian Blank 5a0ab9759f Support build-arch and build-indep make targets
* debian/rules, debian/rules.real:
  Support build-indep, rename build to build-arch.
* debian/bin/gencontrol.py, debian/lib/python/debian_linux/gencontrol.py:
  Add build-arch and build-indep.
* debian/changelog: Update.

svn path=/dists/sid/linux/; revision=19148
2012-06-14 14:39:30 +00:00
Bastian Blank 7a338d9536 debian/bin/gencontrol.py:
Move some package specific stuff from lib/python/debian_linux/gencontrol.py.

svn path=/dists/sid/linux/; revision=19145
2012-06-13 21:54:55 +00:00
Ben Hutchings d5fa98077e linux-source: Add single patch for each featureset
svn path=/dists/sid/linux/; revision=19114
2012-06-10 02:14:51 +00:00
Ben Hutchings aac2076873 Remove support for per-architecture patches
We have not used per-architecture patches for many years.  This is a
step toward using a more standard patch system.

svn path=/dists/sid/linux/; revision=19070
2012-06-03 20:54:42 +00:00
Bastian Blank 00b9cab893 * debian/lib/python/debian_linux/debian.py: Use unicode.
* debian/lib/python/debian_linux/gencontrol.py: Remove debugging code.

svn path=/dists/trunk/linux-2.6/; revision=18495
2012-01-11 20:01:55 +00:00
Bastian Blank 141957a25b debian/lib/python: Use unicode always.
svn path=/dists/trunk/linux-2.6/; revision=18493
2012-01-11 18:03:27 +00:00
Bastian Blank dad674e6e7 * debian/lib/python/debian_linux/debian.py:
Replace PackageFieldList with PackageArchitecture.
* debian/bin/gencontrol.py,
  debian/lib/python/debian_linux/gencontrol.py: Adopt changes.

svn path=/dists/trunk/linux-2.6/; revision=18492
2012-01-11 17:46:47 +00:00
Bastian Blank e962c1ae2b debian/lib/python: Remove SortedDict, use collections.OrderedDict instead.
svn path=/dists/trunk/linux-2.6/; revision=18491
2012-01-11 17:16:00 +00:00
Bastian Blank 9863acaddd debian/lib/python: PEP8 and other style fixes.
svn path=/dists/trunk/linux-2.6/; revision=18488
2012-01-11 16:52:29 +00:00
Bastian Blank c0e8d4a8be debian/lib/python/debian_linux/gencontrol.py:
Don't remove entries starting with "X-".

svn path=/dists/trunk/linux-2.6/; revision=17835
2011-07-18 16:22:41 +00:00
Bastian Blank 0d4f98db65 debian/lib/python/debian_linux/gencontrol.py: Don't need subst variables.
svn path=/dists/trunk/linux-2.6/; revision=15528
2010-04-20 19:27:18 +00:00
Bastian Blank 2adc7b9fdf debian/lib/python/debian_linux/gencontrol.py: Sort makeflags.
svn path=/dists/trunk/linux-2.6/; revision=15527
2010-04-20 19:22:08 +00:00
Bastian Blank e5436e3974 debian/lib/python/debian_linux/gencontrol.py:
Support arches without featuresets.

svn path=/dists/trunk/linux-2.6/; revision=14973
2010-01-21 16:29:34 +00:00
Bastian Blank e39e268dbd Move all description related config options into its own section.
* debian/bin/gencontrol.py: Handle description parts.
* debian/config: Update.
* debian/lib/python/debian_linux/config.py: Recognize new section.
* debian/lib/python/debian_linux/gencontrol.py: Remove old code.

svn path=/dists/trunk/linux-2.6/; revision=14469
2009-10-27 16:35:16 +00:00
Bastian Blank 33b37eb04a debian/lib/python/debian_linux/gencontrol.py:
Also substitute the relation version.

svn path=/dists/trunk/linux-2.6/; revision=14078
2009-08-03 08:43:32 +00:00
Bastian Blank f298d464c4 debian/lib/python/debian_linux/gencontrol.py: Fix longclass usage.
svn path=/dists/trunk/linux-2.6/; revision=11913
2008-07-26 21:40:08 +00:00
Bastian Blank a85064f716 * debian/bin/gencontrol.py: Python style update.
* debian/lib/python/debian_linux/gencontrol.py
  - Python style update.
  - Never process package entry parts in-place.

svn path=/dists/trunk/linux-2.6/; revision=11358
2008-05-11 18:53:46 +00:00
Bastian Blank b74b0fa3dd debian/lib/python/debian_linux/gencontrol.py: Python style update.
svn path=/dists/trunk/linux-2.6/; revision=11357
2008-05-11 18:45:11 +00:00
Bastian Blank 8aec23954b * debian/bin/gencontrol.py: Fix small problem.
* debian/lib/python/debian_linux/gencontrol.py: Further cleanups.

svn path=/dists/trunk/linux-2.6/; revision=11355
2008-05-11 18:37:03 +00:00
Bastian Blank 97084867c6 * debian/bin/gencontrol.py: Remove further "vars" updates.
* debian/lib/python/debian_linux/gencontrol.py: Cleanup.

svn path=/dists/trunk/linux-2.6/; revision=11354
2008-05-11 18:26:27 +00:00
Bastian Blank 72d6fe9b3c * debian/bin/gencontrol.py: Cleanup.
* debian/lib/python/debian_linux/gencontrol.py
  - Provide all informations for main type functions.
  - Remove some "vars" updates.

svn path=/dists/trunk/linux-2.6/; revision=11352
2008-05-11 18:17:54 +00:00
Daniel Baumann 5920d88945 Reverting previous re-adding of process_version_linux as it is desired to be somewhere else.
svn path=/dists/trunk/linux-2.6/; revision=11308
2008-05-06 11:03:49 +00:00
Daniel Baumann 25eb9d06bf Re-adding dropped process_version_linux argument in linux-support to make conglomeration packages work again.
svn path=/dists/trunk/linux-2.6/; revision=11305
2008-05-06 10:42:03 +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 d899a4c6c6 debian/bin/gencontrol.py:
Move some linux specific code from ebian/lib/python/debian_linux/gencontrol.py.

svn path=/dists/trunk/linux-2.6/; revision=10254
2008-01-29 14:31:16 +00:00
Bastian Blank 0b43b47b10 debian/lib/python/debian_linux/gencontrol.py
- Generate rule for makefile deps.
- Simplify makefile rules generation.
- Don't bail out if extra template is missing.

svn path=/dists/trunk/linux-2.6/; revision=10136
2008-01-18 22:47:02 +00:00
Bastian Blank 96bce0fd9d * debian/lib/python/debian_linux/gencontrol.py:
Generate source package name from changelog.
* debian/templates/control.source.in: Remove generated Source field.

svn path=/dists/trunk/linux-2.6/; revision=9961
2007-12-15 23:34:11 +00:00
Bastian Blank 1afa7ef090 * debian/bin/gencontrol.py: Generate list of versions from changelog.
* debian/lib/python/debian_linux/gencontrol.py: Read changelog.

svn path=/dists/trunk/linux-2.6/; revision=9960
2007-12-15 23:31:06 +00:00
Bastian Blank b4308079b0 * debian/bin/abicheck.py, debian/bin/abiupdate.py: Use config dump.
* debian/bin/gencontrol.py
  - Read real config.
  - Write version infos into config.
  - Generate config dump.
* debian/changelog: Update.
* debian/lib/python/debian_linux/config.py: Support config dumps.
* debian/lib/python/debian_linux/gencontrol.py
  - Don't specify type of config.
  - Split result writing.
* debian/rules: Remove dumped config.
* debian/rules.real
  (install-support)
  - Install only dumped config.
  - Don't install recursive.

svn path=/dists/trunk/linux-2.6/; revision=9664
2007-10-14 14:29:07 +00:00
Bastian Blank 1ef278d181 debian/bin/gencontrol.py, debian/lib/python/debian_linux/gencontrol.py,
debian/modules/gencontrol.py: Use own object for makefile generation.

svn path=/dists/trunk/linux-2.6/; revision=9577
2007-09-27 14:01:41 +00:00
Bastian Blank 8bacccee1a * debian/bin/gencontrol.py, debian/lib/python/debian_linux/gencontrol.py
- Use _ as seperator.
  - Simplify logic.
* debian/modules/gencontrol.py, debian/modules/rules.include, debian/rules:
  Use _ as seperator.

svn path=/dists/trunk/linux-2.6/; revision=9576
2007-09-27 13:14:23 +00:00
Bastian Blank 3858ead071 * debian/bin/gencontrol.py
- Add default settings for config and template dirs.
  - Support more than one config dir.
* debian/bin/kconfig.py: Don't longer prefix files.
* debian/lib/python/debian_linux/gencontrol.py:
  Drop default config and template dirs.
* debian/rules.real: Don't prefix config files.

svn path=/dists/trunk/linux-2.6/; revision=9308
2007-08-16 10:20:09 +00:00
Bastian Blank 5f0d29bcd9 * debian/lib/python/debian_linux/gencontrol.py:
Expect config and template dirs as list and set default.
* debian/lib/python/debian_linux/utils.py:
  Read templates from a list of directories.

svn path=/dists/trunk/linux-2.6/; revision=9305
2007-08-15 14:29:58 +00:00