* 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
This commit is contained in:
parent
0bb5b5f9d1
commit
d1c7dfb3f1
|
@ -300,14 +300,14 @@ if __name__ == '__main__':
|
||||||
tree = read_template("tree")
|
tree = read_template("tree")
|
||||||
packages.append(process_real_tree(tree[0], changelog, vars))
|
packages.append(process_real_tree(tree[0], changelog, vars))
|
||||||
|
|
||||||
headers = read_template("headers")
|
headers_main = read_template("headers.main")
|
||||||
a = subarches_architecture[None].keys()
|
a = subarches_architecture[None].keys()
|
||||||
a.sort()
|
a.sort()
|
||||||
b = vars.copy()
|
b = vars.copy()
|
||||||
b['arch'] = ' '.join(a)
|
b['arch'] = ' '.join(a)
|
||||||
packages.append(process_real_package(headers[0], b))
|
packages.append(process_real_package(headers_main[0], b))
|
||||||
|
|
||||||
headers_flavour = read_template("headers.flavour")
|
headers = read_template("headers")
|
||||||
headers_latest = read_template("headers.latest")
|
headers_latest = read_template("headers.latest")
|
||||||
image = read_template("image")
|
image = read_template("image")
|
||||||
image_latest = read_template("image.latest")
|
image_latest = read_template("image.latest")
|
||||||
|
@ -341,10 +341,10 @@ if __name__ == '__main__':
|
||||||
if not flavour_vars.has_key('longclass'):
|
if not flavour_vars.has_key('longclass'):
|
||||||
flavour_vars['longclass'] = flavour_vars['class']
|
flavour_vars['longclass'] = flavour_vars['class']
|
||||||
|
|
||||||
packages.append(process_real_package(headers_flavour[0], flavour_vars))
|
packages.extend(process_real_packages(image_latest, flavour_vars))
|
||||||
packages.append(process_real_package(headers_latest[0], flavour_vars))
|
|
||||||
packages.append(process_real_image(image[0], flavour_vars))
|
packages.append(process_real_image(image[0], flavour_vars))
|
||||||
packages.append(process_real_package(image_latest[0], flavour_vars))
|
packages.append(process_real_package(headers_latest[0], flavour_vars))
|
||||||
|
packages.append(process_real_package(headers[0], flavour_vars))
|
||||||
|
|
||||||
write_control(packages)
|
write_control(packages)
|
||||||
|
|
||||||
|
|
|
@ -1,13 +0,0 @@
|
||||||
Package: linux-headers-@subarch@@version@-@abiname@-@flavour@
|
|
||||||
Architecture: @arch@
|
|
||||||
Section: devel
|
|
||||||
Priority: optional
|
|
||||||
Depends: coreutils | fileutils (>= 4.0), linux-headers-@subarch@@version@-@abiname@
|
|
||||||
Provides: linux-headers, linux-headers-@major@
|
|
||||||
Description: Architecture-specific header files for Linux kernel @version@ on @class@ machines
|
|
||||||
This package provides the architecture-specific kernel header files
|
|
||||||
for Linux kernel @version@ on @class@ machines, generally
|
|
||||||
used for building out-of-tree kernel modules. These files are going to be
|
|
||||||
installed into /usr/src/linux-headers-@subarch@@version@-@abiname@-@flavour@, and can
|
|
||||||
be used for building modules that load into the kernel provided by the
|
|
||||||
linux-image-@subarch@@version@-@abiname@-@flavour@ package.
|
|
|
@ -1,17 +1,13 @@
|
||||||
Package: linux-headers-@version@-@abiname@
|
Package: linux-headers-@subarch@@version@-@abiname@-@flavour@
|
||||||
Architecture: @arch@
|
Architecture: @arch@
|
||||||
Section: devel
|
Section: devel
|
||||||
Priority: optional
|
Priority: optional
|
||||||
Depends: coreutils | fileutils (>= 4.0)
|
Depends: coreutils | fileutils (>= 4.0), linux-headers-@subarch@@version@-@abiname@
|
||||||
Provides: linux-headers, linux-headers-@major@
|
Provides: linux-headers, linux-headers-@major@
|
||||||
Description: Common architecture-specific header files for Linux kernel @version@
|
Description: Architecture-specific header files for Linux kernel @version@ on @class@ machines
|
||||||
This package provides the (sub)architecture-specific common kernel header files
|
This package provides the architecture-specific kernel header files
|
||||||
for Linux kernel version @version@, generally used for building out-of-tree
|
for Linux kernel @version@ on @class@ machines, generally
|
||||||
kernel modules. To obtain a complete set of headers you also need to install
|
used for building out-of-tree kernel modules. These files are going to be
|
||||||
the linux-headers-@version@-@abiname@-(flavour) package, matching the
|
installed into /usr/src/linux-headers-@subarch@@version@-@abiname@-@flavour@, and can
|
||||||
flavour of the kernel you intend the build for. To obtain such a set for the
|
be used for building modules that load into the kernel provided by the
|
||||||
currently running kernel it is sufficient to run a command
|
linux-image-@subarch@@version@-@abiname@-@flavour@ package.
|
||||||
.
|
|
||||||
apt-get install linux-headers-@version@-@abiname@-$(uname -r)
|
|
||||||
.
|
|
||||||
and it will be unpacked in /usr/src/linux-headers-@version@-@abiname@-(flavour).
|
|
||||||
|
|
|
@ -0,0 +1,17 @@
|
||||||
|
Package: linux-headers-@version@-@abiname@
|
||||||
|
Architecture: @arch@
|
||||||
|
Section: devel
|
||||||
|
Priority: optional
|
||||||
|
Depends: coreutils | fileutils (>= 4.0)
|
||||||
|
Provides: linux-headers, linux-headers-@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-@version@-@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-@version@-@abiname@-$(uname -r)
|
||||||
|
.
|
||||||
|
and it will be unpacked in /usr/src/linux-headers-@version@-@abiname@-(flavour).
|
|
@ -1,9 +1,17 @@
|
||||||
|
Package: linux-image-@subarch@@flavour@
|
||||||
|
Architecture: @arch@
|
||||||
|
Section: base
|
||||||
|
Priority: optional
|
||||||
|
Depends: linux-image-@subarch@@major@-@flavour@
|
||||||
|
Description: Linux kernel image on @class@ machines
|
||||||
|
This package depends on the latest binary image for Linux kernel on
|
||||||
|
@longclass@ machines.
|
||||||
|
|
||||||
Package: linux-image-@subarch@@major@-@flavour@
|
Package: linux-image-@subarch@@major@-@flavour@
|
||||||
Architecture: @arch@
|
Architecture: @arch@
|
||||||
Section: base
|
Section: base
|
||||||
Priority: optional
|
Priority: optional
|
||||||
Depends: linux-image-@subarch@@version@-@abiname@-@flavour@
|
Depends: linux-image-@subarch@@version@-@abiname@-@flavour@
|
||||||
Suggests: linux-doc-@version@ | linux-source-@version@
|
|
||||||
Description: Linux kernel @major@ image on @class@ machines
|
Description: Linux kernel @major@ image on @class@ machines
|
||||||
This package depends on the latest binary image for Linux kernel @major@
|
This package depends on the latest binary image for Linux kernel @major@
|
||||||
on @longclass@ machines.
|
on @longclass@ machines.
|
||||||
|
|
Loading…
Reference in New Issue