Commit Graph

123 Commits

Author SHA1 Message Date
Ben Hutchings 59bbce5f61 Convert source package format to 3.0 (quilt)
svn path=/dists/sid/linux/; revision=19098
2012-06-08 12:33:39 +00:00
Ben Hutchings f4932e3768 Replace patch series lists with one main series and one per featureset
Change patch.apply.in to apply a single patch series without
filtering.  Move series/base to series-all and series/base-extra to
series-rt and series-none (the latter empty).

Remove the redundant status file support from patch.apply.in, and
convert it into a static file rather than a template.

Remove the redundant patch series list support from patches.py.

svn path=/dists/sid/linux/; revision=19071
2012-06-03 22:03:33 +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
Ben Hutchings 751cd05a5f linux-patch-debian: Remove
It is no longer necessary for GPL compliance and does not work with our
current patch management.

svn path=/dists/sid/linux/; revision=19068
2012-06-03 19:50:07 +00:00
Ben Hutchings ecd24ebe78 Fix regexp for binNMU detection
In basic regular expressions, the correct way to match a literal '+'
is just '+'.

svn path=/dists/trunk/linux-2.6/; revision=18674
2012-02-10 02:32:52 +00:00
Ben Hutchings b6177993e9 Add debian/installer/package-list to debian/control source files
svn path=/dists/trunk/linux-2.6/; revision=18352
2011-12-05 01:42:04 +00:00
Bastian Blank 381d952cef debian/rules, debian/rules.real: Move job definition into main makefile.
svn path=/dists/trunk/linux-2.6/; revision=18200
2011-10-28 22:28:39 +00:00
Bastian Blank 22e412e9c1 * debian/changelog: Update.
* debian/rules, debian/rules.real: Remove linux-tools build and removal.
* debian/templates/control.main.in: Remove linux-tools-* package.

svn path=/dists/trunk/linux-2.6/; revision=18195
2011-10-28 20:42:34 +00:00
Ben Hutchings ed776fb227 Build udebs for the installer
Use kernel-wedge in gencontrol.py and during the build process to
generate the udeb packages required by debian-installer.

Add the kernel-wedge configuration files from all the current
linux-kernel-di-$arch-2.6 packages.

svn path=/dists/trunk/linux-2.6/; revision=18121
2011-09-25 03:12:12 +00:00
Ben Hutchings 8aff3c1a42 Clean up old xen-linux-system package build directories
svn path=/dists/trunk/linux-2.6/; revision=18084
2011-09-13 13:49:20 +00:00
Ben Hutchings 319de86657 debian/rules: Change 'clean' rule to remove package build directories even after a version bump, thanks to Timo Juhani Lindfors
svn path=/dists/trunk/linux-2.6/; revision=16576
2010-11-20 19:08:42 +00:00
Ben Hutchings 04b38ec92d Merge changes from 2.6.32-16
Add patches that were added in 2.6.32-16 and are not in 2.6.35-rc3.
Update configuration.
Update maintainer scripts and debconf templates.
Add linux-tools-<version> package.

svn path=/dists/trunk/linux-2.6/; revision=15934
2010-07-04 21:07:52 +00:00
Ben Hutchings b43829337c Remove template-generated files in clean rule
svn path=/dists/sid/linux-2.6/; revision=15804
2010-05-28 23:47:07 +00:00
Bastian Blank e5a47ef568 debian/rules: Don't remove versioned files in maintainerclean.
svn path=/dists/sid/linux-2.6/; revision=15635
2010-05-07 14:59:36 +00:00
Bastian Blank 0b4b97ab23 debian/rules: Disallow all rules to run parallel.
svn path=/dists/trunk/linux-2.6/; revision=14194
2009-08-28 21:01:54 +00:00
Bastian Blank 77e9d16753 debian/rules
- Cleanup variables.
- Remove usage of directory creations rules.

svn path=/dists/trunk/linux-2.6/; revision=14008
2009-07-25 10:05:31 +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 ed1ce90bd4 debian/rules: Use make instead of shell magic for control check.
svn path=/dists/trunk/linux-2.6/; revision=9626
2007-10-10 14:08:21 +00:00
Bastian Blank 116b9b64a2 debian/rules: Also find orig tarball in ../orig.
svn path=/dists/trunk/linux-2.6/; revision=9625
2007-10-10 14:02:54 +00:00
Bastian Blank ad993eef7a debian/rules: Remove long unused config check targets.
svn path=/dists/trunk/linux-2.6/; revision=9579
2007-09-27 17:33:35 +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 c3e4166f1a debian/rules: Also exclude .svk for floating svk checkouts.
svn path=/dists/trunk/linux-2.6/; revision=9410
2007-08-29 11:37:09 +00:00
Bastian Blank 236826c2eb * debian/config: Move from debian/arch.
* debian/bin/abicheck.py, debian/bin/abiupdate.py, debian/bin/kconfig.py,
  debian/lib/python/debian_linux/gencontrol.py, debian/rules,
  debian/rules.real: Use debian/config instead of debian/arch.

svn path=/dists/trunk/linux-2.6/; revision=9187
2007-07-24 18:31:40 +00:00
Bastian Blank a7f33e29ac debian/rules: Ignore changelog changes for binnmus.
svn path=/dists/trunk/linux-2.6/; revision=8336
2007-03-08 23:18:38 +00:00
Bastian Blank 8705f87118 debian/rules: Use md5sum --check.
svn path=/dists/trunk/linux-2.6/; revision=8335
2007-03-08 23:02:33 +00:00
Bastian Blank 059d3a6155 debian/rules: Ignore more things in debian/templates.
svn path=/dists/trunk/linux-2.6/; revision=8230
2007-01-27 20:55:34 +00:00
Bastian Blank 88c56779b8 Merge /dists/sid/linux-2.6.
svn path=/dists/trunk/linux-2.6/; revision=8229
2007-01-27 19:52:51 +00:00
Bastian Blank 5f42ef6a2f debian/rules: Fix.
svn path=/dists/trunk/linux-2.6/; revision=8141
2007-01-08 18:22:10 +00:00
Bastian Blank 0c8c083cc0 debian/rules
- Also extract the source package name from the changelog.
- Simplify tar extraction.

svn path=/dists/trunk/linux-2.6/; revision=8139
2007-01-08 18:17:35 +00:00
Bastian Blank 772ce121dc * debian/bin: Update svn:ignore propery.
* debian/bin/gencontrol.py: Install as bin/patch.*.
* debian/rules: Clean correct files.
* debian/rules.real: Use bin/patch.*.

svn path=/dists/trunk/linux-2.6/; revision=7368
2006-09-08 08:30:49 +00:00
Bastian Blank 61c4bbd140 Merge /dists/sid/linux-2.6.
svn path=/dists/trunk/linux-2.6/; revision=7262
2006-08-29 09:53:31 +00:00
Bastian Blank cd2fb4369a debian/rules: Fix prequisites of binary-indep.
svn path=/dists/trunk/linux-2.6/; revision=6718
2006-05-27 07:35:22 +00:00
Bastian Blank 3aa3f46969 debian/rules: Fix prequisites.
svn path=/dists/trunk/linux-2.6/; revision=6512
2006-04-30 20:51:57 +00:00
Bastian Blank 6f59375dcb debian/rules: Use variables in orig targets.
svn path=/dists/trunk/linux-2.6/; revision=6491
2006-04-28 22:03:51 +00:00
Bastian Blank 4027080008 Merge /dists/sid/linux-2.6.
svn path=/dists/trunk/linux-2.6/; revision=6490
2006-04-28 22:01:54 +00:00
Bastian Blank 0d6efc7fce debian/rules: Also clean files from gencontrol in maintainerclean.
svn path=/dists/trunk/linux-2.6/; revision=6233
2006-03-20 11:27:05 +00:00
Bastian Blank 87979d3e41 Revert r6140.
svn path=/dists/trunk/linux-2.6/; revision=6175
2006-03-13 11:48:48 +00:00
Jurij Smakov c77a1dbbf6 Make both binary-indep and binary-arch depend
on $(BUILD_DIR) and $(STAMPS_DIR) to fix build
failure.

svn path=/dists/trunk/linux-2.6/; revision=6140
2006-03-12 20:37:41 +00:00
Bastian Blank e9154b49c4 debian/rules: source-all is no file.
svn path=/dists/trunk/linux-2.6/; revision=6129
2006-03-11 18:10:48 +00:00
Bastian Blank 06a5a91032 debian/rules: Delete files with leading dot also for maintainer clean.
svn path=/dists/trunk/linux-2.6/; revision=6077
2006-03-05 23:13:13 +00:00
Bastian Blank a4ecf9c185 * debian/bin/gencontrol.py: Add source target.
* debian/lib/python/debian_linux/gencontrol.py: Support source target.
* debian/rules: Add source and source-all target.
* debian/rules.real: Use source rules.

svn path=/dists/trunk/linux-2.6/; revision=6056
2006-03-04 13:48:18 +00:00
Bastian Blank af103c7938 debian/rules: Don't make build a prequisite from binary-{arch,indep}.
svn path=/dists/trunk/linux-2.6/; revision=6038
2006-03-03 09:24:53 +00:00
Bastian Blank 8917fde5a2 debian/rules: Only provide the patched tree for config checks.
svn path=/dists/trunk/linux-2.6/; revision=5353
2006-01-08 15:08:51 +00:00
Bastian Blank f871491b62 debian/rules
- Fix dependencies in config check code.
- Use BUILD_DIR variable.

svn path=/dists/trunk/linux-2.6/; revision=5352
2006-01-08 14:57:10 +00:00
Bastian Blank 71eead7d81 debian/rules: Use prepatched sources for config check.
svn path=/dists/trunk/linux-2.6/; revision=5349
2006-01-08 14:39:20 +00:00
Sven Luther e88ab311eb Now calculate SOURCE_VERSION and REVISIONS from the changelog, not the most efficient way, but hey :)
svn path=/dists/trunk/linux-2.6/; revision=5348
2006-01-08 14:33:15 +00:00
Sven Luther 5e85a1c04a Commented buslogic-pci-id-table.patch out from series, i suppose someone did forget to check in the patch when modifying the series.
svn path=/dists/trunk/linux-2.6/; revision=5344
2006-01-08 10:01:44 +00:00
Sven Luther d7272204ee Added debian/rules target to check the configs and call bin/kconfig.ml accordingly, not yet finished though.
svn path=/dists/trunk/linux-2.6/; revision=5343
2006-01-08 09:48:08 +00:00
Bastian Blank f5ea6ce508 * Move most parts of debian/bin/gencontrol.py to debian/lib.
* Implement subarch.
* Rewrite patch handling to integrate arch and subarch specific patches. 

r4300:  waldi | 2005-10-03 22:23:02 +0200
debian/rules.real: Remove old definitions.

r4304:  waldi | 2005-10-03 23:02:13 +0200
Move template reading to lib.

* debian/bin/gencontrol.py
  - Remove RFC822 routines.
  - Use templates class.
* debian/lib/python/debian_linux.py: Add templates class.

r4738:  waldi | 2005-11-07 15:51:30 +0100
debian/bin/gencontrol.py: Set TYPE.

r4796:  waldi | 2005-11-13 15:09:40 +0100
* debian/bin/gencontrol.py: Use config_reader.
* debian/lib/python/debian_linux: Add directory.
* debian/lib/python/debian_linux/__init__.py: Move from debian/lib/python/python/debian_linux.py.
* debian/lib/python/debian_linux/config.py: Add config_reader and config_parser.

r4797:  waldi | 2005-11-13 15:45:12 +0100
* debian/bin/gencontrol.py: Move code away. For now only use imported code.
* debian/lib/python/debian_linux/__init__.py: Remove utils.
* debian/lib/python/debian_linux/config.py: Update.
* debian/lib/python/debian_linux/debian.py: Add debian packaging specific code.
* debian/lib/python/debian_linux/gencontrol.py: Add code.
* debian/lib/python/debian_linux/utils.py: Add utils.

r4798:  waldi | 2005-11-13 15:56:37 +0100
debian/lib/python/debian_linux/gencontrol.py:
Don't try to generation extra packages if the template does not exist.

r4799:  waldi | 2005-11-13 16:04:25 +0100
debian/lib/python/debian_linux/gencontrol.py:
Begin to split methods in smaller pieces.

r4800:  waldi | 2005-11-13 16:26:03 +0100
debian/lib/python/debian_linux/gencontrol.py: Split more code.

r4802:  waldi | 2005-11-13 16:40:08 +0100
debian/lib/python/debian_linux/gencontrol.py: Also allow strings in makefile write list.

r4806:  waldi | 2005-11-13 16:55:48 +0100
debian/bin/gencontrol.py: Move linux-2.6 specific code from
debian/lib/python/debian_linux/gencontrol.py.

r4807:  waldi | 2005-11-13 17:07:26 +0100
debian/bin/gencontrol.py, debian/lib/python/debian_linux/gencontrol.py: Update.

r4808:  waldi | 2005-11-13 17:08:53 +0100
debian/bin/gencontrol.py: Move code from debian/lib/python/debian_linux/gencontrol.py.

r4810:  waldi | 2005-11-13 17:10:30 +0100
debian/bin/gencontrol.py
- Move code from debian/lib/python/debian_linux/gencontrol.py.
- Update.

r4811:  waldi | 2005-11-13 17:33:47 +0100
debian/bin/gencontrol.py: Move code from debian/lib/python/debian_linux/gencontrol.py.

r4812:  waldi | 2005-11-13 17:36:38 +0100
debian/bin/gencontrol.py: Update.

r4813:  waldi | 2005-11-13 18:36:28 +0100
debian/lib/python/debian_linux/config.py: Remove old code.

r4814:  waldi | 2005-11-13 18:38:50 +0100
* debian/bin/gencontrol.py, debian/lib/python/debian_linux/gencontrol.py,
  debian/lib/python/debian_linux/utils.py: Teach package object how to
  work with list attributes.
* debian/lib/python/debian_linux/debian.py: Don't use utils.entry.

r4815:  waldi | 2005-11-13 18:41:55 +0100
* debian/lib/python/debian_linux/gencontrol.py
  - Use utils.package.
  - Remove debugging code.
* debian/lib/python/debian_linux/utils.py
  - Use utils.package.
  - Remove utils.entry.

r4816:  waldi | 2005-11-13 18:47:46 +0100
debian/lib/python/debian_linux/utils.py: Don't output empty fields.

r4965:  waldi | 2005-12-04 12:36:20 +0100
Rewrite config reader to support more than one section per (arch, subarch, flavour).

* debian/bin/gencontrol.py, debian/lib/python/debian_linux/gencontrol.py:
  Explicitely Use base entries.
* debian/lib/python/debian_linux/config.py
  - Rewrite.
  - Loose support for entry merging for now.

r5175:  waldi | 2006-01-02 20:46:46 +0100
debian/bin/gencontrol.py: Fix.

r5176:  waldi | 2006-01-02 21:09:17 +0100
* debian/bin/apply: Don't expect upstream version in series file names.
* debian/patches-debian/series/0experimental.1:
  Move from debian/patches-debian/series/2.6.14+2.6.15-rc7-0experimental.1.
* debian/patches-debian/series/0experimental.2:
  Move from debian/patches-debian/series/2.6.14+2.6.15-rc7-0experimental.2.

r5177:  waldi | 2006-01-02 22:31:28 +0100
First prototype of improved patch util.

debian/bin/apply.py: Add.

r5178:  waldi | 2006-01-02 23:40:11 +0100
* debian/bin/apply.py: Finish implementation.
* debian/rules.real: Use apply.py.

r5179:  waldi | 2006-01-03 00:15:05 +0100
* debian/bin/apply.py: Implement arch and subarch specific patches.
* debian/bin/unpatch: Remove old code.
* debian/rules.real: Fix patch package installation.

r5180:  waldi | 2006-01-03 00:16:05 +0100
debian/bin/apply: Remove.

r5181:  waldi | 2006-01-03 00:16:56 +0100
* debian/bin/gencontrol.py: Readd missing build target.
* debian/lib/python/debian_linux/debian.py: Raise if version is not parsable.

r5192:  waldi | 2006-01-03 15:32:43 +0100
debian/bin/apply.py
- Add version_file class.
- Use correct series for deapply.

r5193:  waldi | 2006-01-03 15:41:53 +0100
debian/bin/apply.py
- Remove extra version handling from series class.
- Add check for extra version in patch setup.

r5194:  waldi | 2006-01-03 15:45:49 +0100
debian/bin/apply.py: Move complete reverse logic into series class.

r5195:  waldi | 2006-01-03 16:14:33 +0100
debian/bin/apply.py: Implement patch per arch and subarch. It is currently done
by completely deapply the arch specific patches if it needs to change set of
general patches.

r5196:  waldi | 2006-01-03 16:18:55 +0100
debian/bin/apply.py: Don't record extra version without patch.

r5197:  waldi | 2006-01-03 16:25:03 +0100
debian/bin/apply.py: Record shortest possible extra version in version file.

r5198:  waldi | 2006-01-03 16:28:00 +0100
* debian/patches-debian/series/0experimental.3-extra: Add.
* debian/patches-debian/hppa-incompatible.patch:
  Move from debian/patches-arch/hppa.diff.
* debian/patches-debian/m68k-incompatible.patch
  Move from debian/patches-arch/m68k.diff.
* debian/patches-arch: Remove.

r5200:  waldi | 2006-01-03 16:30:03 +0100
debian/rules.real: Use new apply script for arch and subarch patches.

r5207:  waldi | 2006-01-03 17:12:52 +0100
* debian/rules.real: Remove old arch patches installation.
* debian/templates/control.source.in: Remove dh-kpatches from Buld-Depends-Indep.

r5208:  waldi | 2006-01-03 17:21:21 +0100
debian/lib/python/debian_linux: Set svn:ignore property.

r5210:  waldi | 2006-01-03 17:24:09 +0100
debian/templates/control.main.in: Fix depends of patch package.

r5212:  waldi | 2006-01-03 17:54:18 +0100
* debian/rules: Fix clean.
* debian/rules.real
  - Remove definition of old arch patches.
  - Use a variable for patch command.

r5213:  waldi | 2006-01-03 20:45:41 +0100
* debian/templates: Move subarch part in package names in front of flavour.
* debian/lib/python/debian_linux/gencontrol.py: Fix subarch text setting.

r5214:  waldi | 2006-01-03 20:46:05 +0100
debian/lib/python/debian_linux/config.py: Support subarches.

r5215:  waldi | 2006-01-04 00:51:46 +0100
Update svn:ignore property.

r5216:  waldi | 2006-01-04 00:53:20 +0100
debian/bin/apply.py
- Use correct length in extra check.
- Check for correct length of extra entries.

r5217:  waldi | 2006-01-04 00:54:38 +0100
debian/rules.real
- Append subarch to kernel version.
- Fix base of kconfig.ml call.

r5234:  waldi | 2006-01-04 15:34:59 +0100
* debian/bin/gencontrol.py: Use config entry merging when needed.
* lib/python/debian_linux/config.py: Readd config entry merging.

r5235:  waldi | 2006-01-04 16:00:38 +0100
* debian/bin/install-image: Use DEBIAN_LOCALVERSION and DEBIAN_LOCALVERSION_HEADERS.
* debian/rules.real: Set LOCALVERSION for scripts.

r5240:  waldi | 2006-01-04 17:50:12 +0100
debian/rules.real: Fix version of subarch headers package.

svn path=/dists/trunk/linux-2.6/; revision=5242
2006-01-04 19:33:32 +00:00
Bastian Blank 65ef5444a0 debian/rules: Add --link-dest option to rsync to avoid copies if possible.
svn path=/dists/trunk/linux-2.6/; revision=4794
2005-11-13 13:34:45 +00:00