Commit Graph

521 Commits

Author SHA1 Message Date
Bastian Blank 87d00b6d95 * Add more strict dependency between the headers packages.
* Use own config to define arches, subarches and flavours.
* Aggregate ATM options.
* Add kernel config for s390 tape image.
* Fix subarch setting for sparc.

r3970: waldi | 2005-08-18 17:58:13 +0000
debian/templates/control.headers.in: Add more strict dependency.

r3971: waldi | 2005-08-18 18:02:08 +0000
Use own config to define arches, subarches and flavours.

* debian/arch/defines: Include architecture definitions.
* debian/arch/alpha/defines, debian/arch/amd64/defines, debian/arch/arm/defines,
  debian/arch/hppa/defines, debian/arch/i386/defines, debian/arch/ia64/defines,
  debian/arch/m68k/defines, debian/arch/powerpc/defines, debian/arch/s390/defines,
  debian/arch/sparc/defines: Include flavour definitions.
* debian/bin/gencontrol.py
  - Read all configs at once.
  - Use config definitions for arch, subarch and flavour detection.

r3972: waldi | 2005-08-18 18:50:08 +0000
debian/arch/alpha/config, debian/arch/amd64/config, debian/arch/config,
debian/arch/i386/config, debian/arch/powerpc/config: Aggregate ATM options.

r3973: waldi | 2005-08-18 18:52:30 +0000
Add kernel config for s390 tape image.

* debian/arch/s390/config: Remove IPL options.
* debian/arch/s390/config.s390 debian/arch/s390/config.s390x: Add IPL options.
* debian/arch/s390/config.s390-tape: Add.

r3974: waldi | 2005-08-18 18:55:49 +0000
debian/bin/gencontrol.py: Don't output not available arches.

r3975: waldi | 2005-08-18 18:57:32 +0000
debian/arch/sparc/defines: Set kpkg-subarch to sparc64.

r3976: waldi | 2005-08-18 19:06:23 +0000
* debian/arch/powerpc/Makefile.inc, debian/arch/sparc/Makefile.inc: Remove old subarch settings.
* debian/bin/gencontrol.py: Support per subarch kpkg-subarch.
* debian/rules.real: Use subarch for header builds.

svn path=/trunk/kernel/source/linux-2.6/; revision=3981
2005-08-19 10:31:32 +00:00
maximilian attems 39e4560574 change fuzz factor from default 2 to 1 on patch appliance.
may need a rediff of various patches,
but catches from nasty surprises

svn path=/trunk/kernel/source/linux-2.6/; revision=3910
2005-08-16 07:56:59 +00:00
Bastian Blank 9499f6b605 * Use generated rules, effectively remove second flavour resolver.
* Implement generic support for cross compilation.
* Install generated files in the correct headers packages.

r3745: waldi | 2005-08-08 15:40:20 +0000
* debian/bin/gencontrol.py
  - Rename some variables.
  - Write debian/rules.gen.
* debian/rules: Use debian/rules.gen.

r3746: waldi | 2005-08-08 15:51:26 +0000
debian/bin/gencontrol.py: Simplify rules.

r3747: waldi | 2005-08-08 16:22:29 +0000
Use generated rules for unpack, effectively remove second flavour resolver.

* debian/Makefile: Updates.
* debian/bin/gencontrol.py: Generate unpack rules.
* debian/rules: Use new rules.

r3748: waldi | 2005-08-08 17:03:32 +0000
Use generated rules for build.

* debian/Makefile
  - Updates.
  - Generate bin/touch.orig.
* debian/bin/gencontrol.py: Generate build rules.
* debian/rules: Remove bin/touch.orig creation.

r3752: waldi | 2005-08-08 18:13:27 +0000
Use generated rules for binary target.

* debian/Makefile: Updates.
* debian/bin/gencontrol.py: Generate binary rules.

r3753: waldi | 2005-08-08 19:00:05 +0000
* debian/Makefile
  - Overwrite env.
  - Split binary target.
* debian/bin/gencontrol.py: Update.
* debian/rules: Call correct targets.

r3756: waldi | 2005-08-08 20:07:31 +0000
* debian/Makefile
  - Split unpack target.
  - Don't generate stamp files for install targets.
  - Update dir names.
* debian/bin/gencontrol.py: Split unpack target.
* debian/rules: Remove new stamp files.

r3793: waldi | 2005-08-09 19:57:44 +0000
* debian/Makefile
  - Fix directories.
  - Build anything in one subdir.
* debian/bin/gencontrol.py: Call debian/Makefile from package root.
* debian/rules: Updates.

r3794: waldi | 2005-08-09 21:43:07 +0000
debian/bin/gencontrol.py: Updates.

r3795: waldi | 2005-08-09 22:26:53 +0000
* debian/Makefile
  - Include debian/rules.defs.
  - Simplify kpkg command specs.
* debian/rules
  - Move directory definitions to debian/rules.defs.
  - Include debian/rules.defs.
* debian/rules.defs: Add.

r3796: waldi | 2005-08-09 22:30:23 +0000
* debian/bin/gencontrol.py: Use debian/rules.real.
* debian/rules.real: Move from debian/Makefile.

r3797: waldi | 2005-08-09 22:39:24 +0000
debian/bin/gencontrol.py, debian/rules, debian/rules.real:
Rename unpack to setup.

r3798: waldi | 2005-08-09 22:52:43 +0000
debian/bin/gencontrol.py, debian/rules.real: Use DH_OPTIONS.

r3799: waldi | 2005-08-09 22:53:37 +0000
debian/rules: Use host, not build architecture.

r3815: waldi | 2005-08-10 11:53:38 +0000
debian/rules.real: Update targets.

r3816: waldi | 2005-08-10 12:06:13 +0000
debian/rules.real: Move patch rules from debian/rules.

r3817: waldi | 2005-08-10 12:22:26 +0000
debian/bin/gencontrol.py, debian/rules.real: Small fixes.

r3818: waldi | 2005-08-10 12:29:17 +0000
debian/rules.real: Add seperate setup step for headers package.

r3819: waldi | 2005-08-10 12:36:57 +0000
debian/bin/gencontrol.py, debian/rules, debian/rules.real: Add binary-indep.

r3820: waldi | 2005-08-10 12:40:10 +0000
debian/bin/gencontrol.py: Fix typo.

r3821: waldi | 2005-08-10 12:56:58 +0000
* debian/bin/gencontrol.py: Use binary-indep.
* debian/rules.real: Move source package rules from debian/rules.

r3822: waldi | 2005-08-10 13:11:24 +0000
* debian/bin/gencontrol.py: Use install-dummy.
* debian/rules.real: Move tree package rules from debian/rules.

r3823: waldi | 2005-08-10 13:41:30 +0000
* debian/bin/gencontrol.py: Fix typos.
* debian/rules.real
  - Move doc package rules from debian/rules.
  - Fix some installation rules.

r3824: waldi | 2005-08-10 13:55:41 +0000
debian/rules.real: Move patch package rules from debian/rules.

r3825: waldi | 2005-08-10 14:17:33 +0000
debian/rules: Cleanup.

r3826: waldi | 2005-08-10 14:37:03 +0000
debian/rules.real: Fix typos.

r3827: waldi | 2005-08-10 14:57:07 +0000
debian: Update svn:ignore property.

r3828: waldi | 2005-08-10 15:07:29 +0000
debian/rules.real
- Move some install rules.
- Support cross compilation.

r3829: waldi | 2005-08-10 15:39:14 +0000
debian/rules.real: Realy rename the rules.

r3830: waldi | 2005-08-10 17:35:54 +0000
debian/rules.real
- Move one rule.
- Fix permissions of source tar ball.
Closes: 322409

r3832: waldi | 2005-08-10 18:57:51 +0000
debian/templates/control.headers.main.in: Fix command to install headers.

r3833: waldi | 2005-08-10 20:30:48 +0000
* debian/bin/gencontrol.py: Remove dash from ABINAME.
* debian/rules.real
  - Use abiname without dash.
  - Install patches with correct permissions.

r3847: waldi | 2005-08-13 09:11:40 +0000
debian/templates/post-install.in:
Install any executable file and files which matches *.sh and *.pl in the
scripts directory.
Closes: 322612

r3848: waldi | 2005-08-13 09:32:54 +0000
* arch/powerpc/defines: Add pseries definitions.
* arch/powerpc/config.pseries: Move from arch/powerpc/noconfig.pseries.
* bin/gencontrol.py
  - Export KPKG_SUBARCH.
  - Updates.
* rules.real: Use KPKG_SUBARCH.

r3853: waldi | 2005-08-14 10:01:06 +0000
debian/rules.real
- Fix cross compile options for make-kpkg.
- Fix architecture patches.
- Remove asm-offsets.s workaround, pending real fix.

r3854: waldi | 2005-08-14 12:07:36 +0000
debian/rules.real: Export version informations.

r3855: waldi | 2005-08-14 12:39:57 +0000
debian/templates/post-install.in: Always install generated files.

r3858: waldi | 2005-08-14 14:51:28 +0000
debian/rules.real: Integrate headers install fix.

r3859: waldi | 2005-08-14 15:29:21 +0000
* debian/arch/powerpc/config.powerpc64
  - Fix wrong formated entries.
  - Enable vscsi client.
* debian/arch/powerpc/defines: Fix flavour name.
* debian/README.PPC64: Remove.

svn path=/trunk/kernel/source/linux-2.6/; revision=3860
2005-08-14 19:59:43 +00:00
Bastian Blank d543590473 debian/bin/gencontrol.py: Only allow [a-z_] in substitution.
svn path=/trunk/kernel/source/linux-2.6/; revision=3773
2005-08-09 06:38:56 +00:00
Bastian Blank 3555ecfb8c * debian/Makefile: Updata.
* debian/bin/gencontrol.py: Overwrite versions for extra packages.
* debian/changelog: Prepare to release (2.6.12-2).
* debian/templates/control.extra.in: Add overwrite fields.

svn path=/trunk/kernel/source/linux-2.6/; revision=3757
2005-08-08 22:15:27 +00:00
Bastian Blank b78777cf81 Add transition packages from old kernel-latest sources.
* debian/bin/gencontrol.py: Process extra packages.
* debian/templates/control.extra.in: Add.

svn path=/trunk/kernel/source/linux-2.6/; revision=3742
2005-08-08 14:54:38 +00:00
Bastian Blank c4da84d9df Build as much packages as possible at one time.
* debian/Makefile: Update.
* debian/bin/gencontrol.py: Produce only one call per flavour.

svn path=/trunk/kernel/source/linux-2.6/; revision=3740
2005-08-08 13:51:37 +00:00
Bastian Blank 2194b95339 * Build dummy packages.
* Make sure that the build uses an up to date control file.

r3735: waldi | 2005-08-08 08:07:55 +0000
* debian/bin/gencontrol.py: Write informations about dummy packages into
  Makefile.inc.

r3737: waldi | 2005-08-08 12:41:11 +0000
* debian/rules
  - Add debian/bin/gencontrol.py to prequisites of debian/control.
  - Add debian/control to prequisites of build to avoid builds with an out
    of date control file.
  - Call dummy binary targets.

svn path=/trunk/kernel/source/linux-2.6/; revision=3738
2005-08-08 12:42:26 +00:00
Bastian Blank d1c7dfb3f1 * Make template names easier.
* Add general dependency package.

r3721: waldi | 2005-08-07 20:40:12 +0000
* debian/bin/gencontrol.py: Use updates template names.
* debian/templates/control.headers.in: Move from control.headers.flavour.in.
* debian/templates/control.headers.main.in: Move from control.headers.in.

r3722: waldi | 2005-08-07 20:51:49 +0000
* debian/bin/gencontrol.py: Reorder packages.
* debian/templates/control.image.latest.in: Add general dependency package.


svn path=/trunk/kernel/source/linux-2.6/; revision=3724
2005-08-07 21:01:54 +00:00
Bastian Blank e490ea6f4c r3705: waldi | 2005-08-06 19:58:56 +0000
* debian/bin/gencontrol.py: Use image.latest template.
* debian/templates/control.image.in: Use longclass in long description.
* debian/templates/control.image.latest.in: Add

r3710: waldi | 2005-08-07 09:12:08 +0000
* bin/gencontrol.py
  - Rewrap descriptions.
  - Support linux-headers latest packages.
* templates/control.image.latest.in: Use major in short description.
* templates/control.headers.latest.in: Add.

r3711: waldi | 2005-08-07 09:35:17 +0000
* bin/gencontrol.py: Hack textwrap to don't split package names.
* templates/control.headers.in: Fix paragraphs.
* templates/control.image.latest.in: Add suggests.

svn path=/trunk/kernel/source/linux-2.6/; revision=3716
2005-08-07 15:29:32 +00:00
Bastian Blank 3da706e69b * Rewrite gencontrol.
* Use debian/arch/defines, debian/arch/$arch/defines,
  debian/arch/$arch/$subarch/defines and
  debian/arch/$arch/$subarch/defines.$flavour to gather values.
* Remove fdutils from global Suggests.

r3646: waldi | 2005-07-31 18:48:39 +0000
* debian/bin/gencontrol.py: Add.
* debian/bin/gencontrol: Remove.
* debian/rules
  - Use new gencontrol.
  - Remove makevars.
* debian/templates/control.headers.in
* debian/templates/control.headers.subarch.in: Add.
* debian/templates/control.image.in: Update.
* debian/templates/control.main.in: Remove kernel-tree entry.
* debian/templates/control.tree.in: Move kernel-tree entry from control.main.in.
* debian/arch/defines, debian/arch/s390/defines, debian/arch/s390/defines.s390,
  debian/arch/s390/defines.s390x: Add.
* debian/arch/s390/desc.s390,debian/arch/s390/desc.s390x: Remove.

r3647: waldi | 2005-07-31 18:57:21 +0000
* debian/bin/gencontrol.py: Support desc keyword.

r3648: waldi | 2005-07-31 19:06:30 +0000
* debian/arch/alpha/defines, debian/arch/amd64/defines,
  debian/arch/i386/defines, debian/arch/i386/defines.686,
  debian/arch/i386/defines.686-smp, debian/arch/i386/defines.k7,
  debian/arch/i386/defines.k7-smp, debian/arch/ia64/defines,
  debian/arch/m68k/defines, debian/arch/powerpc/defines,
  debian/arch/sparc/defines, debian/arch/sparc/defines.sparc64,
  debian/arch/sparc/defines.sparc64-smp: Add.
* debian/arch/i386/desc.686, debian/arch/i386/desc.686-smp,
  debian/arch/i386/desc.k7, debian/arch/i386/desc.k7-smp,
  debian/arch/sparc/desc.sparc64, debian/arch/sparc/desc.sparc64-smp:
  Remove

r3649: waldi | 2005-07-31 19:12:49 +0000
* debian/templates/control.image.in: Remove fdutils from Suggests.
* debian/arch/arm/defines: Add.
* debian/arch/alpha/defines, debian/arch/amd64/defines,
  debian/arch/i386/defines, debian/arch/ia64/defines,
  debian/arch/m68k/defines, debian/arch/powerpc/defines,
  debian/arch/sparc/defines: Update.

r3650: waldi | 2005-07-31 19:44:25 +0000
* debian/bin/gencontrol.py, debian/templates/control.headers.in:
  Update.

r3680: waldi | 2005-08-03 18:12:37 +0000
* debian/bin/gencontrol.py: Update.
* debian/arch/i386/defines, debian/arch/s390/defines,
  debian/arch/sparc/defines: Move settings.
* debian/arch/i386/defines.686, debian/arch/i386/defines.686-smp, 
  debian/arch/i386/defines.k7, debian/arch/i386/defines.k7-smp,
  debian/arch/s390/defines.s390, debian/arch/s390/defines.s390x,
  debian/arch/sparc/defines.sparc64, adebian/rch/sparc/defines.sparc64-smp:
  Delete.

r3682: waldi | 2005-08-03 22:38:45 +0000
* debian/arch/ia64/defines: Add class definition.s
* debian/arch/ia64/desc.itanium-smp, debian/arch/ia64/desc.itanium
  debian/arch/ia64/desc.mckinley-smp, debian/arch/ia64/desc.mckinley:
  Delete.

r3687: waldi | 2005-08-05 09:11:10 +0000
* debian/Makefile: Copy control file.

r3689: waldi | 2005-08-05 15:36:24 +0000
* debian/rules: Make debian/changelog a prequisite of debian/control.

svn path=/trunk/kernel/source/linux-2.6/; revision=3691
2005-08-05 16:38:58 +00:00
Jurij Smakov 292c8bde8a Made gencontrol general enough to generate
both the master control file and the control
file used for building a specific kernel image.

svn path=/trunk/kernel/source/linux-2.6/; revision=3640
2005-07-31 02:55:53 +00:00
Jurij Smakov b4bef78582 Fixed up the template and gencontrol so that
the case when arch-specific depends and suggests
substitutions are empty, one does not get
dangling commas.

svn path=/trunk/kernel/source/linux-2.6/; revision=3639
2005-07-31 01:42:49 +00:00
Jurij Smakov af5f4ef3e8 * The control.image.in template now supports
arch_depends, arch_suggests and arch_recommends
  substitutions, so that we can generate these
  fields individually for each architecture.
  That should take care of 319896. It's quite
  a rewrite, so please test.
* At the moment the arch-specific depends,
  suggests and recommends are hard-coded into
  the debian/bin/gencontrol. It's not the prettiest
  solution but it works.
* Changed gencontrol to strip all lines starting
  with # from the generated files, so comments
  in templates are now allowed.

svn path=/trunk/kernel/source/linux-2.6/; revision=3638
2005-07-31 00:56:28 +00:00
Jurij Smakov 1de4d541ce The "I hope I did not break anything" commit.
Move the control file generation to a separate
script (debian/bin/gencontrol), unuglifying it
along the way (hi, dilinger :-). This is a
first step towards the solution for 319896.

svn path=/trunk/kernel/source/linux-2.6/; revision=3637
2005-07-31 00:08:59 +00:00
Andres Salomon c6fff45fc2 i am a python GOD
svn path=/trunk/kernel/source/linux-2.6-2.6.12/; revision=3533
2005-07-16 03:31:36 +00:00
Andres Salomon 593e429b6e rename stuff to write out 'config' instead of 'config.common'. This is my
first ever attempt to python hackery.  fear.

svn path=/trunk/kernel/source/linux-2.6-2.6.12/; revision=3520
2005-07-16 02:18:25 +00:00
Jurij Smakov 2cee211e77 A new script for splitting the kernel configs into
common and flavour-specific parts. See source for
description. Will need to be modified to be able to
rebuild the configs after modifications.

svn path=/branches/kernel-image-2.6.11/; revision=3296
2005-06-03 03:50:17 +00:00
Jurij Smakov 8f30e870dc Added preliminary support for arch-specific
patches.

svn path=/branches/kernel-image-2.6.11/; revision=3278
2005-05-31 00:52:12 +00:00
Jurij Smakov 404d37f384 Added prune-non-free and apply scripts.
svn path=/branches/kernel-image-2.6.11/; revision=3254
2005-05-28 18:59:27 +00:00
Jurij Smakov 30edb4652d Moved all stuff to debian/ in preparation for
the integration with kernel-source. Everybody
please SVN UP before changing anything!

svn path=/branches/kernel-image-2.6.11/; revision=3238
2005-05-26 01:42:15 +00:00