r3646 - in people/waldi/kernel/source/linux-2.6/debian: . arch
arch/s390 bin templates
Bastian Blank
waldi at costa.debian.org
Sun Jul 31 18:48:40 UTC 2005
Author: waldi
Date: 2005-07-31 18:48:39 +0000 (Sun, 31 Jul 2005)
New Revision: 3646
Added:
people/waldi/kernel/source/linux-2.6/debian/arch/defines
people/waldi/kernel/source/linux-2.6/debian/arch/s390/defines
people/waldi/kernel/source/linux-2.6/debian/arch/s390/defines.s390
people/waldi/kernel/source/linux-2.6/debian/arch/s390/defines.s390x
people/waldi/kernel/source/linux-2.6/debian/bin/gencontrol.py
people/waldi/kernel/source/linux-2.6/debian/templates/control.headers.subarch.in
people/waldi/kernel/source/linux-2.6/debian/templates/control.tree.in
Removed:
people/waldi/kernel/source/linux-2.6/debian/arch/s390/desc.s390
people/waldi/kernel/source/linux-2.6/debian/arch/s390/desc.s390x
people/waldi/kernel/source/linux-2.6/debian/bin/gencontrol
Modified:
people/waldi/kernel/source/linux-2.6/debian/rules
people/waldi/kernel/source/linux-2.6/debian/templates/control.headers.in
people/waldi/kernel/source/linux-2.6/debian/templates/control.image.in
people/waldi/kernel/source/linux-2.6/debian/templates/control.main.in
Log:
* 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.
* 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.
Added: people/waldi/kernel/source/linux-2.6/debian/arch/defines
===================================================================
--- people/waldi/kernel/source/linux-2.6/debian/arch/defines 2005-07-31 18:28:46 UTC (rev 3645)
+++ people/waldi/kernel/source/linux-2.6/debian/arch/defines 2005-07-31 18:48:39 UTC (rev 3646)
@@ -0,0 +1,2 @@
+[DEFAULT]
+abiname: 1
Added: people/waldi/kernel/source/linux-2.6/debian/arch/s390/defines
===================================================================
--- people/waldi/kernel/source/linux-2.6/debian/arch/s390/defines 2005-07-31 18:28:46 UTC (rev 3645)
+++ people/waldi/kernel/source/linux-2.6/debian/arch/s390/defines 2005-07-31 18:48:39 UTC (rev 3646)
@@ -0,0 +1,3 @@
+[DEFAULT]
+desc: This kernel has support to IPL (boot) from a VM reader or DASD device.
+suggests: s390-tools
Added: people/waldi/kernel/source/linux-2.6/debian/arch/s390/defines.s390
===================================================================
--- people/waldi/kernel/source/linux-2.6/debian/arch/s390/defines.s390 2005-07-31 18:28:46 UTC (rev 3645)
+++ people/waldi/kernel/source/linux-2.6/debian/arch/s390/defines.s390 2005-07-31 18:48:39 UTC (rev 3646)
@@ -0,0 +1,2 @@
+[DEFAULT]
+class: IBM S/390
Added: people/waldi/kernel/source/linux-2.6/debian/arch/s390/defines.s390x
===================================================================
--- people/waldi/kernel/source/linux-2.6/debian/arch/s390/defines.s390x 2005-07-31 18:28:46 UTC (rev 3645)
+++ people/waldi/kernel/source/linux-2.6/debian/arch/s390/defines.s390x 2005-07-31 18:48:39 UTC (rev 3646)
@@ -0,0 +1,2 @@
+[DEFAULT]
+class: IBM zSeries
Deleted: people/waldi/kernel/source/linux-2.6/debian/arch/s390/desc.s390
===================================================================
--- people/waldi/kernel/source/linux-2.6/debian/arch/s390/desc.s390 2005-07-31 18:28:46 UTC (rev 3645)
+++ people/waldi/kernel/source/linux-2.6/debian/arch/s390/desc.s390 2005-07-31 18:48:39 UTC (rev 3646)
@@ -1,3 +0,0 @@
-class="IBM S/390-class"
-desc=" .
- This kernel has support to IPL (boot) from a VM reader or DASD device."
Deleted: people/waldi/kernel/source/linux-2.6/debian/arch/s390/desc.s390x
===================================================================
--- people/waldi/kernel/source/linux-2.6/debian/arch/s390/desc.s390x 2005-07-31 18:28:46 UTC (rev 3645)
+++ people/waldi/kernel/source/linux-2.6/debian/arch/s390/desc.s390x 2005-07-31 18:48:39 UTC (rev 3646)
@@ -1,3 +0,0 @@
-class="IBM zSeries-class"
-desc=" .
- This kernel has support to IPL (boot) from a VM reader or DASD device."
Deleted: people/waldi/kernel/source/linux-2.6/debian/bin/gencontrol
===================================================================
--- people/waldi/kernel/source/linux-2.6/debian/bin/gencontrol 2005-07-31 18:28:46 UTC (rev 3645)
+++ people/waldi/kernel/source/linux-2.6/debian/bin/gencontrol 2005-07-31 18:48:39 UTC (rev 3646)
@@ -1,150 +0,0 @@
-#!/bin/sh
-#
-# If the arch/subarch environment variables are set by the caller,
-# we assume that we are called to generate the control file for the
-# particular image build. Otherwise we'll generate master control
-# file, including all arch/subarch/flavour combinations.
-#
-if [ -d debian ]; then
- basedir='debian'
-else
- basedir='.'
-fi
-#
-# This is created by the debian/makevars target in the rules file.
-#
-. ${basedir}/makevars
-#
-# Various arch-specific substitutions to kludge around the fact
-# that we cannot have the arch-specific Depends, Suggests and
-# Recommends. Note that currently Depends and Suggests fields
-# for the images are guaranteed non-empty, but Recommends is
-# only non-empty on i386, so we have to treat it slightly
-# differently.
-#
-arch_depends_amd64='e2fsprogs (>= 1.35-7)'
-arch_depends_hppa='palo'
-arch_depends_powerpc='mkvmlinuz'
-
-arch_suggests_alpha='aboot'
-arch_suggests_amd64='lilo (>= 19.1) | grub'
-arch_suggests_i386='lilo (>= 19.1) | grub'
-arch_suggests_ia64='elilo'
-arch_suggests_m68k='vmelilo'
-arch_suggests_mips='arcboot (>= 0.3.8)'
-arch_suggests_mipsel='colo, delo'
-arch_suggests_s390='s390-tools'
-arch_suggests_sparc='silo'
-
-arch_recommends_i386='irqbalance'
-
-list_arches() {
- find ${basedir}/arch -mindepth 1 -maxdepth 1 \
- ! -name '*.svn*' -type d -printf '%f\n'
-}
-
-#
-# Parameters:
-# ${1} - architecture to list the subarches for
-# ${2} - if non-zero, the value of this argument is returned
-#
-list_subarches() {
- if [ -n "${2}" ]; then
- echo "${2}"
- else
- echo "none"
- find ${basedir}/arch/${1} -mindepth 1 -maxdepth 1 \
- ! -name '*.svn*' -type d -printf '%f\n'
- fi
-}
-
-#
-# Parameters:
-# ${1} - architecture
-# ${2} - subarchitecture ('none' if there are no subarches)
-#
-list_flavours() {
- find ${basedir}/arch/${1}/${2#none} -name 'config.*' \
- ! -name '*.svn*' -printf '%f\n' | sed 's/^config\.//'
-}
-
-#
-# Parameters:
-# ${1} - filename to use as a template
-# ${2} - arch
-# ${3} - subarch ('none', if the subarch is empty)
-# ${4} - flavour
-#
-substitute() {
- if [ "${3}" = "none" ]; then
- sa=""
- sdir="${basedir}/arch/${2}"
- else
- sa="${3}-"
- sdir="${basedir}/arch/${2}/${3}"
- fi
- class="${4}-class"
- longclass=""
- desc=""
- [ -f "${sdir}/desc.${4}" ] && . "${sdir}/desc.${4}"
- [ -z "${longclass}" ] && longclass="${class}"
-
- eval "arch_depends=\${arch_depends_${2}}"
- if [ -n "${arch_depends}" ]; then
- arch_depends=", ${arch_depends}"
- fi
- eval "arch_suggests=\${arch_suggests_${2}}"
- if [ -n "${arch_suggests}" ]; then
- arch_suggests=", ${arch_suggests}"
- fi
- eval "arch_recommends=\${arch_recommends_${2}}"
- if [ -n "${arch_recommends}" ]; then
- arch_recommends="Recommends: ${arch_recommends}"
- fi
-
- cat ${basedir}/templates/control.${1} | \
- sed -e "s#@version@#${version}#g" \
- -e "s#@major@#${major}#g" \
- -e "s#@arch@#${2}#g" \
- -e "s#@subarch@#${sa}#g" \
- -e "s#@flavour@#${4}#g" \
- -e "s#@class@#${class}#g" \
- -e "s#@longclass@#${longclass}#g" \
- -e "s#@ltver@#${ltver}#g" \
- -e "s#@srcver@#${srcver}#g" \
- -e "s#@lt_depends@#${lt_depends}#g" \
- -e "s#@lt_provides@#${lt_provides}#g" \
- -e "s#@abiname@#${abiname}#g" \
- -e "s#@arch_depends@#${arch_depends}#g" \
- -e "s#@arch_suggests@#${arch_suggests}#g" \
- -e "s#@arch_recommends@#${arch_recommends}#g"
- [ -z "${5}" ] || printf "${desc}\n"
-}
-#
-# Main routine
-#
-rm -f control.tmp 2>/dev/null
-
-substitute source.in "" "none" >> control.tmp
-if [ -n "${arch}" ]; then
- test -z "${subarch}" && subarch='none'
-else
- substitute main.in "" "none" >> control.tmp
- arch="$(list_arches)"
-fi
-substitute headers.in "" "none" >> control.tmp
-
-for a in ${arch}; do
- for s in $(list_subarches ${a} ${subarch}); do
- for f in $(list_flavours ${a} ${s}); do
- substitute headers.flavour.in ${a} ${s} ${f} >> control.tmp
- substitute image.in ${a} ${s} ${f} "1" >> control.tmp
- done
- done
-done
-#
-# Output it all to the stdout
-#
-sed -e '/^[[:space:]]*$/d' control.tmp | \
-sed -e 's/^Package:/\n&/g' | grep -v '^#'
-rm -rf control.tmp
Added: people/waldi/kernel/source/linux-2.6/debian/bin/gencontrol.py
===================================================================
--- people/waldi/kernel/source/linux-2.6/debian/bin/gencontrol.py 2005-07-31 18:28:46 UTC (rev 3645)
+++ people/waldi/kernel/source/linux-2.6/debian/bin/gencontrol.py 2005-07-31 18:48:39 UTC (rev 3646)
@@ -0,0 +1,303 @@
+#!/usr/bin/env python
+import os, os.path, re, sys, ConfigParser
+
+class entry(dict):
+ __slots__ = ('_list')
+
+ def __init__(self):
+ super(entry, self).__init__()
+ self._list = []
+
+ def __delitem__(self, key):
+ super(entry, self).__delitem__(key)
+ self._list.remove(key)
+
+ def __setitem__(self, key, value):
+ super(entry, self).__setitem__(key, value)
+ if key.startswith('_'):
+ return
+ if key not in self._list:
+ if 'Description' in self._list:
+ self._list.insert(len(self._list)-1, key)
+ else:
+ self._list.append(key)
+
+ def iterkeys(self):
+ for i in self._list:
+ yield i
+
+ def iteritems(self):
+ for i in self._list:
+ yield (i, self[i])
+
+def config():
+ c = ConfigParser.ConfigParser()
+ c.read("debian/arch/defines")
+ return c
+
+def config_arch(arch):
+ c = config()
+ c.read("debian/arch/%s/defines" % arch)
+ return c
+
+def config_subarch(arch, subarch):
+ c = config_arch(arch)
+ if subarch is not None:
+ c.read("debian/arch/%s/%s/defines" % (arch, subarch))
+ return c
+
+def config_flavour(arch, subarch, flavour):
+ c = config_subarch(arch, subarch)
+ if subarch is not None:
+ c.read("debian/arch/%s/%s/defines.%s" % (arch, subarch, flavour))
+ else:
+ c.read("debian/arch/%s/defines.%s" % (arch, flavour))
+ return c
+ return c
+
+def list_dirs(dir):
+ ret = []
+ for i in os.listdir(dir):
+ if i not in ('.svn',) and os.path.isdir(os.path.join(dir, i)):
+ ret.append(i)
+ ret.sort()
+ return ret
+
+def list_files(dir):
+ ret = []
+ for i in os.listdir(dir):
+ if os.path.isfile(os.path.join(dir, i)):
+ ret.append(i)
+ ret.sort()
+ return ret
+
+def list_arches():
+ return list_dirs("debian/arch")
+
+def list_subarches(arch):
+ ret = [None]
+ ret.extend(list_dirs("debian/arch/%s" % arch))
+ return ret
+
+def list_flavours(arch, subarch):
+ dir = "debian/arch/%s" % arch
+ if subarch is not None:
+ dir += "/%s" % subarch
+ tmp = list_files(dir)
+ ret = []
+ for i in tmp:
+ if i[:7] == 'config.':
+ ret.append(i[7:])
+ return ret
+
+def read_changelog():
+ r = re.compile(r"""
+^
+(
+ (?P<header>
+ (?P<header_source>\w[-+0-9a-z.]+)\ \((?P<header_version>[^\(\)\ \t]+)\)((\s+[-0-9a-zA-Z]+)+)\;
+ )
+)
+""", re.VERBOSE)
+ f = file("debian/changelog")
+ entries = []
+ while True:
+ line = f.readline()
+ if not line:
+ break
+ line = line.strip('\n')
+ match = r.match(line)
+ if not match:
+ continue
+ if match.group('header'):
+ e = entry()
+ e['Source'] = match.group('header_source')
+ e['Version'] = match.group('header_version')
+ entries.append(e)
+ return entries
+
+def read_rfc822(f):
+ entries = []
+
+ while True:
+ e = entry()
+ while True:
+ line = f.readline()
+ if not line:
+ break
+ line = line.strip('\n')
+ if not line:
+ break
+ if line[0] in ' \t':
+ if not last:
+ raise ValueError('Continuation line seen before first header')
+ e[last] += '\n' + line
+ continue
+ i = line.find(':')
+ if i < 0:
+ raise ValueError("Not a header, not a continuation: ``%s''" % line)
+ last = line[:i]
+ e[last] = line[i+1:].lstrip()
+ if not e:
+ break
+
+ entries.append(e)
+
+ return entries
+
+def read_template(name):
+ return read_rfc822(file("debian/templates/control.%s.in" % name))
+
+def parse_version(version):
+ match = re.match("^((\d+\.\d+)\..+?)-([^-]+)$", version)
+ return (match.group(0), match.group(1), match.group(2), match.group(3))
+
+def process_depends(key, e, in_e, vars):
+ in_dep = in_e[key].split(',')
+ dep = []
+ for d in in_dep:
+ d = d.strip()
+ d = substitute(d, vars)
+ if d:
+ dep.append(d)
+ if dep:
+ t = ', '.join(dep)
+ e[key] = t
+
+def process_entry(in_entry, vars):
+ e = entry()
+ for i in in_entry.iterkeys():
+ if i in (('Depends', 'Provides', 'Suggests')):
+ process_depends(i, e, in_entry, vars)
+ else:
+ e[i] = substitute(in_entry[i], vars)
+ return e
+
+def process_entries(in_entries, vars):
+ entries = []
+ for i in in_entries:
+ entries.append(process_entry(i, vars))
+ return entries
+
+def process_real_image(in_entry, vars):
+ entry = process_entry(in_entry, vars)
+ for i in (('Depends', 'Provides', 'Suggests')):
+ value = []
+ tmp = entry.get(i, None)
+ if tmp:
+ tmp = tmp.split(',')
+ for t in tmp:
+ value.append(t.strip())
+ if i == 'Depends':
+ t = vars.get('depends', None)
+ if t is not None:
+ value.append(t)
+ elif i == 'Provides':
+ t = vars.get('provides', None)
+ if t is not None:
+ value.append(t)
+ elif i == 'Suggests':
+ t = vars.get('suggests', None)
+ if t is not None:
+ value.append(t)
+ entry[i] = ', '.join(value)
+ return entry
+
+def process_real_tree(in_entry, changelog, vars):
+ entry = process_entry(in_entry, vars)
+ tmp = changelog[0]['Source']
+ versions = []
+ for i in changelog:
+ if i['Source'] != tmp:
+ break
+ versions.insert(0, i['Version'])
+ for i in (('Depends', 'Provides')):
+ value = []
+ tmp = entry.get(i, None)
+ if tmp:
+ tmp = tmp.split(',')
+ for t in tmp:
+ value.append(t.strip())
+ if i == 'Depends':
+ tmp = []
+ for v in versions:
+ v = parse_version(v)
+ tmp.append("linux-source-%s (= %s)" % (v[1], v[0]))
+ value.append(' | '.join(tmp))
+ elif i == 'Provides':
+ for v in versions:
+ v = parse_version(v)
+ value.append("linux-tree-%s" % v[0])
+ entry[i] = ', '.join(value)
+ return entry
+
+def substitute(s, vars):
+ def subst(match):
+ return vars[match.group(1)]
+ return re.sub(r'@([^@]+)@', subst, s)
+
+def vars_changelog(vars, changelog):
+ version = parse_version(changelog[0]['Version'])
+ vars['srcver'] = version[0]
+ vars['version'] = version[1]
+ vars['major'] = version[2]
+ return vars
+
+def write_control(list):
+ write_rfc822(file("debian/control", 'w'), list)
+
+def write_rfc822(f, list):
+ for i in list:
+ for j in i.iteritems():
+ f.write("%s: %s\n" % j)
+ f.write('\n')
+
+if __name__ == '__main__':
+ changelog = read_changelog()
+
+ vars = {}
+ vars = vars_changelog(vars, changelog)
+ vars.update(config().defaults())
+
+ packages = []
+
+ source = read_template("source")
+ packages.append(process_entry(source[0], vars))
+
+ main = read_template("main")
+ packages.extend(process_entries(main, vars))
+
+ tree = read_template("tree")
+ packages.append(process_real_tree(tree[0], changelog, vars))
+
+ headers = read_template("headers")
+ packages.extend(process_entries(headers, vars))
+
+ headers_flavour = read_template("headers.flavour")
+ image = read_template("image")
+
+ for arch in list_arches():
+ arch_vars = vars.copy()
+ arch_vars['arch'] = arch
+ arch_vars.update(config_arch(arch).defaults())
+ for subarch in list_subarches(arch):
+ subarch_vars = arch_vars.copy()
+ subarch_vars.update(config_subarch(arch, subarch).defaults())
+ if subarch is not None:
+ subarch_vars['subarch'] = '%s-' % subarch
+ else:
+ subarch_vars['subarch'] = ''
+ for flavour in list_flavours(arch, subarch):
+ flavour_vars = subarch_vars.copy()
+ flavour_vars['flavour'] = flavour
+ flavour_vars.update(config_flavour(arch, subarch, flavour).defaults())
+ if not flavour_vars.has_key('class'):
+ flavour_vars['class'] = '%s-class' % flavour
+ if not flavour_vars.has_key('longclass'):
+ flavour_vars['longclass'] = flavour_vars['class']
+
+ packages.extend(process_entries(headers_flavour, flavour_vars))
+ packages.append(process_real_image(image[0], flavour_vars))
+
+ write_control(packages)
+
Property changes on: people/waldi/kernel/source/linux-2.6/debian/bin/gencontrol.py
___________________________________________________________________
Name: svn:executable
+ *
Modified: people/waldi/kernel/source/linux-2.6/debian/rules
===================================================================
--- people/waldi/kernel/source/linux-2.6/debian/rules 2005-07-31 18:28:46 UTC (rev 3645)
+++ people/waldi/kernel/source/linux-2.6/debian/rules 2005-07-31 18:48:39 UTC (rev 3646)
@@ -17,13 +17,6 @@
release := $(version)-$(ltver)
uver := $(subst .,_,$(version))
#
-# Construct depends and provides for the linux-tree
-#
-lt_depends += $(shell seq -f 'linux-source-$(version) (= $(version)-%g)' \
- -s ' | ' 1 $(ltver))
-lt_provides := $(shell seq -f 'linux-tree-$(version)-%g' -s ', ' 1 $(ltver))
-lt_provides := $(strip $(lt_provides))
-#
# If we are not passed a subarchs variable, we obtain the complete
# subarch list as a list of subdirectories in arch/$(karch). We
# also export the flavours variables, which allows to control which
@@ -178,7 +171,7 @@
touch debian/doc-stamp
unpack: debian/unpack-stamp
-debian/unpack-stamp: debian/patch-stamp debian/makevars
+debian/unpack-stamp: debian/patch-stamp
dh_testdir
cd debian; \
for i in $(subarchs); do \
@@ -188,7 +181,7 @@
touch debian/unpack-stamp
build: debian/build-stamp
-debian/build-stamp: debian/unpack-stamp debian/makevars
+debian/build-stamp: debian/unpack-stamp
dh_testdir
cd debian; \
for i in $(subarchs); do \
@@ -215,11 +208,11 @@
cd debian; \
rm -f *-stamp-* *-stamp config.* *.kpatches.arch; \
rm -f header-install-* post-install-* bin/touch.orig; \
- rm -rf linux-source-* build-* install-* makevars
+ rm -rf linux-source-* build-* install-*
dh_clean
binary-indep: source tree patch-debian doc
-binary-arch: build debian/makevars
+binary-arch: build
dh_testdir
cd debian; \
for i in $(subarchs); do \
@@ -232,17 +225,7 @@
# Makes the master debian/control file by substituting
# variable values into the template.
#
-debian/control: $(wildcard debian/templates/control.*.in) debian/makevars
- debian/bin/gencontrol > debian/control
+debian/control: $(wildcard debian/templates/control.*.in)
+ debian/bin/gencontrol.py > debian/control
-debian/makevars:
- echo 'version='\''$(version)'\' > debian/makevars
- echo 'major='\''$(major)'\' >> debian/makevars
- echo 'srcver='\''$(srcver)'\' >> debian/makevars
- echo 'ltver='\''$(ltver)'\' >> debian/makevars
- echo 'lt_depends='\''$(srcver)'\' >> debian/makevars
- echo 'lt_depends='\''$(lt_depends)'\' >> debian/makevars
- echo 'lt_provides='\''$(lt_provides)'\' >> debian/makevars
- echo 'abiname='\''$(abiname)'\' >> debian/makevars
-
.PHONY: clean build unpack binary-indep binary-arch binary patch unpatch source tree
Modified: people/waldi/kernel/source/linux-2.6/debian/templates/control.headers.in
===================================================================
--- people/waldi/kernel/source/linux-2.6/debian/templates/control.headers.in 2005-07-31 18:28:46 UTC (rev 3645)
+++ people/waldi/kernel/source/linux-2.6/debian/templates/control.headers.in 2005-07-31 18:48:39 UTC (rev 3646)
@@ -1,4 +1,4 @@
-Package: linux-headers- at subarch@@version at -@abiname@
+Package: linux-headers- at version@- at abiname@
Architecture: alpha amd64 arm hppa i386 ia64 m68k powerpc s390 sparc
Section: devel
Priority: optional
@@ -11,7 +11,6 @@
the linux-headers- at version@- at abiname@-(flavour) package, matching the
flavour of the kernel you intend the build for. To obtain such a set for the
currently running kernel it is sufficient to run a command
-
apt-get install linux-headers- at version@- at abiname@-$(uname -r)
.
and it will be unpacked in /usr/src/linux-headers- at version@- at abiname@-(flavour).
Copied: people/waldi/kernel/source/linux-2.6/debian/templates/control.headers.subarch.in (from rev 3645, people/waldi/kernel/source/linux-2.6/debian/templates/control.headers.in)
===================================================================
--- people/waldi/kernel/source/linux-2.6/debian/templates/control.headers.in 2005-07-31 18:28:46 UTC (rev 3645)
+++ people/waldi/kernel/source/linux-2.6/debian/templates/control.headers.subarch.in 2005-07-31 18:48:39 UTC (rev 3646)
@@ -0,0 +1,17 @@
+Package: linux-headers- at subarch@@version at -@abiname@
+Architecture: @arch@
+Section: devel
+Priority: optional
+Depends: coreutils | fileutils (>= 4.0)
+Provides: linux-headers, linux-headers- at major@
+Description: Common architecture-specific header files for Linux kernel @version@
+ This package provides the (sub)architecture-specific common kernel header files
+ for Linux kernel version @version@, generally used for building out-of-tree
+ kernel modules. To obtain a complete set of headers you also need to install
+ the linux-headers- at version@- at abiname@-(flavour) package, matching the
+ flavour of the kernel you intend the build for. To obtain such a set for the
+ currently running kernel it is sufficient to run a command
+ .
+ apt-get install linux-headers- at subarch@@version at -@abiname at -$(uname -r)
+ .
+ and it will be unpacked in /usr/src/linux-headers- at subarch@@version at -@abiname at -(flavour).
Modified: people/waldi/kernel/source/linux-2.6/debian/templates/control.image.in
===================================================================
--- people/waldi/kernel/source/linux-2.6/debian/templates/control.image.in 2005-07-31 18:28:46 UTC (rev 3645)
+++ people/waldi/kernel/source/linux-2.6/debian/templates/control.image.in 2005-07-31 18:48:39 UTC (rev 3646)
@@ -1,18 +1,11 @@
-#
-# If you would like to change the arch-specific Depends, Suggests,
-# or Recommends, have a look at the debian/bin/gencontrol file. Note
-# that arch_depends and arch_suggests substitutions will start with
-# a comma and a space if they are non-empty.
-#
Package: linux-image- at subarch@@version at -@abiname at -@flavour@
Architecture: @arch@
Section: base
Priority: optional
Provides: linux-image, linux-image- at major@
-Depends: initrd-tools (>= 0.1.78), coreutils | fileutils (>= 4.0), module-init-tools (>= 0.9.13)@arch_depends@
+Depends: initrd-tools (>= 0.1.78), coreutils | fileutils (>= 4.0), module-init-tools (>= 0.9.13)
Conflicts: hotplug (<< 0.0.20040105-1)
-Suggests: fdutils, linux-doc- at version@ | linux-source- at version@@arch_suggests@
- at arch_recommends@
+Suggests: fdutils, linux-doc- at version@ | linux-source- at version@
Description: Linux kernel @version@ image on @class@ machines
This package provides the binary image and pre-built loadable modules for
Linux kernel @version@ on @class@ machines.
Modified: people/waldi/kernel/source/linux-2.6/debian/templates/control.main.in
===================================================================
--- people/waldi/kernel/source/linux-2.6/debian/templates/control.main.in 2005-07-31 18:28:46 UTC (rev 3645)
+++ people/waldi/kernel/source/linux-2.6/debian/templates/control.main.in 2005-07-31 18:48:39 UTC (rev 3646)
@@ -42,30 +42,3 @@
patches. Note that these patches do NOT apply against a pristine
Linux @version@ kernel but only against the kernel tarball
linux-source- at version@_ at version@.orig.tar.gz from the Debian archive.
-
-Package: linux-tree- at version@
-Architecture: all
-Section: devel
-Priority: optional
-Depends: linux-patch-debian- at version@ (= @srcver@), @lt_depends@
-Provides: @lt_provides@
-Description: Linux kernel source tree for building Debian kernel images
- This meta package is used as a build dependency of Debian
- linux-image packages to prevent a version discrepancy between
- the linux-image and corresponding linux-sources packages in the
- fast-moving unstable archive. The package's dependency relations
- are structured so that a linux-image package's build
- dependencies can always be satisfied, even if the linux-source
- package that had been used to compile the image has been
- superseeded by a newer Debian revision since the last build.
- .
- The package provides a list of virtual packages, corresponding to
- Debian revisions of a linux-source package. The Debian
- linux-patch contains the information needed to roll back the
- current linux-source to any of the revisions identified by the
- provided virtual packages. Therefore, the linux-tree package
- ensures the availability of the Linux kernel source tree corresponding
- to each of the virtual packages listed.
- .
- The package serves no purpose outside of the Debian build and
- archive infrastructure.
Copied: people/waldi/kernel/source/linux-2.6/debian/templates/control.tree.in (from rev 3645, people/waldi/kernel/source/linux-2.6/debian/templates/control.main.in)
===================================================================
--- people/waldi/kernel/source/linux-2.6/debian/templates/control.main.in 2005-07-31 18:28:46 UTC (rev 3645)
+++ people/waldi/kernel/source/linux-2.6/debian/templates/control.tree.in 2005-07-31 18:48:39 UTC (rev 3646)
@@ -0,0 +1,25 @@
+Package: linux-tree- at version@
+Architecture: all
+Section: devel
+Priority: optional
+Depends: linux-patch-debian- at version@ (= @srcver@)
+Description: Linux kernel source tree for building Debian kernel images
+ This meta package is used as a build dependency of Debian
+ linux-image packages to prevent a version discrepancy between
+ the linux-image and corresponding linux-sources packages in the
+ fast-moving unstable archive. The package's dependency relations
+ are structured so that a linux-image package's build
+ dependencies can always be satisfied, even if the linux-source
+ package that had been used to compile the image has been
+ superseeded by a newer Debian revision since the last build.
+ .
+ The package provides a list of virtual packages, corresponding to
+ Debian revisions of a linux-source package. The Debian
+ linux-patch contains the information needed to roll back the
+ current linux-source to any of the revisions identified by the
+ provided virtual packages. Therefore, the linux-tree package
+ ensures the availability of the Linux kernel source tree corresponding
+ to each of the virtual packages listed.
+ .
+ The package serves no purpose outside of the Debian build and
+ archive infrastructure.
More information about the Kernel-svn-changes
mailing list