r3742 - in trunk/kernel/source/linux-2.6/debian: . bin templates

Mon Aug 8 14:54:38 UTC 2005

Author: waldi
Date: 2005-08-08 14:54:38 +0000 (Mon, 08 Aug 2005)
New Revision: 3742

Added:
   trunk/kernel/source/linux-2.6/debian/templates/control.extra.in
Modified:
   trunk/kernel/source/linux-2.6/debian/
   trunk/kernel/source/linux-2.6/debian/bin/gencontrol.py
Log:
Add transition packages from old kernel-latest sources.

* debian/bin/gencontrol.py: Process extra packages.
* debian/templates/control.extra.in: Add.



Property changes on: trunk/kernel/source/linux-2.6/debian
___________________________________________________________________
Name: svk:merge
   - 510b9475-24dd-0310-9b6c-e0eefe99d49f:/people/waldi/kernel/source/linux-2.6/debian:3739
   + 510b9475-24dd-0310-9b6c-e0eefe99d49f:/people/waldi/kernel/source/linux-2.6/debian:3741

Modified: trunk/kernel/source/linux-2.6/debian/bin/gencontrol.py
===================================================================

--- trunk/kernel/source/linux-2.6/debian/bin/gencontrol.py	2005-08-08 14:26:25 UTC (rev 3741)
+++ trunk/kernel/source/linux-2.6/debian/bin/gencontrol.py	2005-08-08 14:54:38 UTC (rev 3742)
@@ -372,6 +372,20 @@
                     makefile.append(("%s-%s-%s:: %s-%s-%s-%s" % (i, arch, subarch_text, i, arch, subarch_text, flavour), None))
                 makefile.append(("binary-%s-%s-%s:" % (arch, subarch_text, flavour), ("$(MAKE) -f debian/Makefile binary-dummy PACKAGES_ARG='%s'" % ' '.join(["-p%s" % i['Package'] for i in dummy_packages]),)))
 
+    extra = read_template("extra")
+    packages.extend(extra)
+    extra_pn = {}
+    for i in extra:
+        a = i['Architecture']
+        pn = extra_pn.get(a, [])
+        pn.append(i['Package'])
+        extra_pn[a] = pn
+    archs = extra_pn.keys()
+    archs.sort()
+    for arch in archs:
+        makefile.append(("binary-%s:: binary-%s-extra" % (arch, arch), None))
+        makefile.append(("binary-%s-extra:" % arch, ("$(MAKE) -f debian/Makefile binary-dummy PACKAGES_ARG='%s'" % ' '.join(["-p%s" % i for i in extra_pn[arch]]),)))
+
     write_control(packages)
     write_makefile(makefile)
 

Added: trunk/kernel/source/linux-2.6/debian/templates/control.extra.in
===================================================================
--- trunk/kernel/source/linux-2.6/debian/templates/control.extra.in	2005-08-08 14:26:25 UTC (rev 3741)
+++ trunk/kernel/source/linux-2.6/debian/templates/control.extra.in	2005-08-08 14:54:38 UTC (rev 3742)
@@ -0,0 +1,121 @@
+Package: kernel-image-2.6-generic
+Architecture: alpha
+Section: base
+Priority: extra
+Depends: linux-image-2.6-alpha-generic
+Description: Linux kernel 2.6 image on Alpha machines - transition package
+ This package is for transition only.
+
+Package: kernel-image-2.6-smp
+Architecture: alpha
+Section: base
+Priority: extra
+Depends: linux-image-2.6-alpha-smp
+Description: Linux kernel 2.6 image on Alpha SMP machines - transition package
+ This package is for transition only.
+
+Package: kernel-image-2.6-386
+Architecture: i386
+Section: base
+Priority: extra
+Depends: linux-image-2.6-386
+Description: Linux kernel 2.6.12 image on 386-class machines - transition package
+ This package is for transition only.
+
+Package: kernel-image-2.6-686
+Architecture: i386
+Section: base
+Priority: extra
+Depends: linux-image-2.6-686
+Description: Linux kernel 2.6 image on PPro/Celeron/PII/PIII/P4 machines - transition package
+ This package is for transition only.
+
+Package: kernel-image-2.6-686-smp
+Architecture: i386
+Section: base
+Priority: extra
+Depends: linux-image-2.6-686-smp
+Description: Linux kernel 2.6 image on PPro/Celeron/PII/PIII/P4 SMP machines - transition package
+ This package is for transition only.
+
+Package: kernel-image-2.6-k7
+Architecture: i386
+Section: base
+Priority: extra
+Depends: linux-image-2.6-k7
+Description: Linux kernel 2.6 image on AMD K7 machines - transition package
+ This package is for transition only.
+
+Package: kernel-image-2.6-k7-smp
+Architecture: i386
+Section: base
+Priority: extra
+Depends: linux-image-2.6-k7-smp
+Description: Linux kernel 2.6 image on AMD K7 SMP machines - transition package
+ This package is for transition only.
+
+Package: kernel-image-powerpc
+Architecture: powerpc
+Section: base
+Priority: extra
+Depends: linux-image-powerpc
+Description: Linux kernel image on powerpc-class machines - transition package
+ This package is for transition only.
+
+Package: kernel-image-2.6-powerpc
+Architecture: powerpc
+Section: base
+Priority: extra
+Depends: linux-image-2.6-powerpc
+Description: Linux kernel 2.6 image on powerpc-class machines - transition package
+ This package is for transition only.
+
+Package: kernel-image-powerpc-smp
+Architecture: powerpc
+Section: base
+Priority: extra
+Depends: linux-image-powerpc-smp
+Description: Linux kernel image on powerpc-smp-class machines - transition package
+ This package is for transition only.
+
+Package: kernel-image-2.6-powerpc-smp
+Architecture: powerpc
+Section: base
+Priority: extra
+Depends: linux-image-2.6-powerpc-smp
+Description: Linux kernel 2.6 image on powerpc-smp-class machines - transition package
+ This package is for transition only.
+
+Package: kernel-image-2.6-s390
+Architecture: s390
+Section: base
+Priority: extra
+Depends: linux-image-2.6-s390
+Description: Linux kernel 2.6 image on IBM S/390 machines - transition package
+ This package is for transition only.
+
+Package: kernel-image-2.6-s390x
+Architecture: s390
+Section: base
+Priority: extra
+Depends: linux-image-2.6-s390x
+Description: Linux kernel 2.6 image on IBM zSeries machines - transition package
+ This package is for transition only.
+
+Package: kernel-image-2.6-sparc64
+Architecture: sparc
+Section: base
+Priority: extra
+Depends: linux-image-2.6-sparc64
+Description: Linux kernel 2.6 image on uniprocessor 64-bit UltraSPARC class machines - transition package
+ This package is for transition only.
+
+Package: kernel-image-2.6-sparc64-smp
+Architecture: sparc
+Section: base
+Priority: extra
+Depends: linux-image-2.6-sparc64-smp
+Description: Linux kernel 2.6 image on multi-processor 64-bit UltraSPARC class machines - transition package
+ This package is for transition only.
+
+


