[kernel] r18192 - in dists/trunk/linux-2.6/debian: . bin templates
Bastian Blank
waldi at alioth.debian.org
Fri Oct 28 19:02:11 UTC 2011
Author: waldi
Date: Fri Oct 28 19:02:10 2011
New Revision: 18192
Log:
debian/bin/gencontrol.py, debian/templates, debian/rules.real:
Make ABINAME always include the complete version.
Modified:
dists/trunk/linux-2.6/debian/bin/gencontrol.py
dists/trunk/linux-2.6/debian/rules.real
dists/trunk/linux-2.6/debian/templates/control.headers.arch.in
dists/trunk/linux-2.6/debian/templates/control.headers.featureset.in
dists/trunk/linux-2.6/debian/templates/control.headers.in
dists/trunk/linux-2.6/debian/templates/control.image-dbg.in
dists/trunk/linux-2.6/debian/templates/control.image.type-modulesextra.in
dists/trunk/linux-2.6/debian/templates/control.image.type-plain.in
dists/trunk/linux-2.6/debian/templates/control.image.type-standalone.in
dists/trunk/linux-2.6/debian/templates/control.main.in
dists/trunk/linux-2.6/debian/templates/control.xen-linux-system.in
dists/trunk/linux-2.6/debian/templates/image.xen.postinst.in
dists/trunk/linux-2.6/debian/templates/image.xen.prerm.in
dists/trunk/linux-2.6/debian/templates/patch.apply.in
Modified: dists/trunk/linux-2.6/debian/bin/gencontrol.py
==============================================================================
--- dists/trunk/linux-2.6/debian/bin/gencontrol.py Fri Oct 28 18:47:00 2011 (r18191)
+++ dists/trunk/linux-2.6/debian/bin/gencontrol.py Fri Oct 28 19:02:10 2011 (r18192)
@@ -25,6 +25,7 @@
'VERSION': self.version.linux_version,
'UPSTREAMVERSION': self.version.linux_upstream,
'ABINAME': self.abiname,
+ 'ABINAME_PART': self.abiname_part,
'SOURCEVERSION': self.version.complete,
})
@@ -76,7 +77,7 @@
kw_env['KW_CONFIG_DIR'] = installer_dir
kw_proc = subprocess.Popen(
['kernel-wedge', 'gen-control',
- self.version.linux_upstream + vars['abiname']],
+ self.abiname],
stdout=subprocess.PIPE,
env=kw_env)
udeb_packages = read_control(kw_proc.stdout)
@@ -343,9 +344,11 @@
self.versions = versions
version = self.version = self.changelog[0].version
if self.version.linux_modifier is not None:
- self.abiname = ''
+ self.abiname = self.version.linux_upstream
+ self.abiname_part = ''
else:
- self.abiname = '-%s' % self.config['abi',]['abiname']
+ self.abiname_part = '-%s' % self.config['abi',]['abiname']
+ self.abiname = self.version.linux_upstream + self.abiname_part
self.vars = {
'upstreamversion': self.version.linux_upstream,
'version': self.version.linux_version,
Modified: dists/trunk/linux-2.6/debian/rules.real
==============================================================================
--- dists/trunk/linux-2.6/debian/rules.real Fri Oct 28 18:47:00 2011 (r18191)
+++ dists/trunk/linux-2.6/debian/rules.real Fri Oct 28 19:02:10 2011 (r18192)
@@ -32,7 +32,7 @@
JOBS_ARG = -j$(DEBIAN_KERNEL_JOBS)
endif
-setup_env := env -u ABINAME -u ARCH -u FEATURESET -u FLAVOUR -u VERSION -u LOCALVERSION
+setup_env := env -u ABINAME -u ABINAME_PART -u ARCH -u FEATURESET -u FLAVOUR -u VERSION -u LOCALVERSION
setup_env += DISTRIBUTION_OFFICIAL_BUILD=1 DISTRIBUTION_UPLOADER=$(UPLOADER) DISTRIBUTION_VERSION="$(SOURCEVERSION)"
MAKE_CLEAN = $(setup_env) $(MAKE)
@@ -112,7 +112,7 @@
rm -rf '$(DIR)'
mkdir '$(DIR)'
cp '$(CONFIG)' '$(DIR)/.config'
- echo '$(ABINAME)$(LOCALVERSION_IMAGE)' > '$(DIR)/localversion'
+ echo '$(ABINAME_PART)$(LOCALVERSION_IMAGE)' > '$(DIR)/localversion'
echo 'override ARCH = $(KERNEL_ARCH)' >> '$(DIR)/.kernelvariables'
echo 'CCACHE = ccache' >> '$(DIR)/.kernelvariables'
echo 'CC = $$(if $$(DEBIAN_KERNEL_USE_CCACHE),$$(CCACHE)) $$(CROSS_COMPILE)$(COMPILER)' >> '$(DIR)/.kernelvariables'
@@ -207,14 +207,14 @@
find $(DIR)/Documentation/DocBook/man/ -name '*.9' | xargs dh_installman
+$(MAKE_SELF) install-base
-install-headers_$(ARCH): PACKAGE_NAMES = linux-headers-$(UPSTREAMVERSION)$(ABINAME)-all linux-headers-$(UPSTREAMVERSION)$(ABINAME)-all-$(ARCH)
+install-headers_$(ARCH): PACKAGE_NAMES = linux-headers-$(ABINAME)-all linux-headers-$(ABINAME)-all-$(ARCH)
install-headers_$(ARCH): DH_OPTIONS = $(foreach p, $(PACKAGE_NAMES), -p$(p))
install-headers_$(ARCH):
dh_testdir
dh_testroot
+$(MAKE_SELF) install-base GENCONTROL_ARGS='-Vkernel:Arch=$(ARCH)'
-install-headers_$(ARCH)_$(FEATURESET): PACKAGE_NAME = linux-headers-$(UPSTREAMVERSION)$(ABINAME)-common$(LOCALVERSION_HEADERS)
+install-headers_$(ARCH)_$(FEATURESET): PACKAGE_NAME = linux-headers-$(ABINAME)-common$(LOCALVERSION_HEADERS)
install-headers_$(ARCH)_$(FEATURESET): PACKAGE_NAME_KBUILD = linux-kbuild-$(VERSION)
install-headers_$(ARCH)_$(FEATURESET): DH_OPTIONS = -p$(PACKAGE_NAME)
install-headers_$(ARCH)_$(FEATURESET): BASE_DIR = /usr/src/$(PACKAGE_NAME)
@@ -243,9 +243,9 @@
+$(MAKE_SELF) install-base
-install-headers_$(ARCH)_$(FEATURESET)_$(FLAVOUR): REAL_VERSION = $(UPSTREAMVERSION)$(ABINAME)$(LOCALVERSION)
+install-headers_$(ARCH)_$(FEATURESET)_$(FLAVOUR): REAL_VERSION = $(ABINAME)$(LOCALVERSION)
install-headers_$(ARCH)_$(FEATURESET)_$(FLAVOUR): PACKAGE_NAME = linux-headers-$(REAL_VERSION)
-install-headers_$(ARCH)_$(FEATURESET)_$(FLAVOUR): PACKAGE_NAME_COMMON = linux-headers-$(UPSTREAMVERSION)$(ABINAME)-common$(LOCALVERSION_HEADERS)
+install-headers_$(ARCH)_$(FEATURESET)_$(FLAVOUR): PACKAGE_NAME_COMMON = linux-headers-$(ABINAME)-common$(LOCALVERSION_HEADERS)
install-headers_$(ARCH)_$(FEATURESET)_$(FLAVOUR): PACKAGE_NAME_KBUILD = linux-kbuild-$(VERSION)
install-headers_$(ARCH)_$(FEATURESET)_$(FLAVOUR): DH_OPTIONS = -p$(PACKAGE_NAME)
install-headers_$(ARCH)_$(FEATURESET)_$(FLAVOUR): BASE_DIR = /usr/src/$(PACKAGE_NAME)
@@ -321,7 +321,7 @@
+$(MAKE_SELF) install-base
-install-support: PACKAGE_NAME = linux-support-$(UPSTREAMVERSION)$(ABINAME)
+install-support: PACKAGE_NAME = linux-support-$(ABINAME)
install-support: DH_OPTIONS = -p$(PACKAGE_NAME)
install-support: PACKAGE_DIR = debian/$(PACKAGE_NAME)
install-support: PACKAGE_ROOT = /usr/share/$(PACKAGE_NAME)
@@ -338,7 +338,7 @@
dh_link $(PACKAGE_ROOT) /usr/src/$(PACKAGE_NAME)
+$(MAKE_SELF) install-base
-install-image_$(ARCH)_$(FEATURESET)_$(FLAVOUR)_$(TYPE): REAL_VERSION = $(UPSTREAMVERSION)$(ABINAME)$(LOCALVERSION)
+install-image_$(ARCH)_$(FEATURESET)_$(FLAVOUR)_$(TYPE): REAL_VERSION = $(ABINAME)$(LOCALVERSION)
install-image_$(ARCH)_$(FEATURESET)_$(FLAVOUR)_$(TYPE): PACKAGE_NAME = linux-image-$(REAL_VERSION)
install-image_$(ARCH)_$(FEATURESET)_$(FLAVOUR)_$(TYPE): PACKAGE_DIR = debian/$(PACKAGE_NAME)
install-image_$(ARCH)_$(FEATURESET)_$(FLAVOUR)_$(TYPE): INSTALL_DIR = $(PACKAGE_DIR)/boot
@@ -477,7 +477,7 @@
echo /var/lib/$(PACKAGE_NAME)/xen-versions >> $(PACKAGE_DIR)/DEBIAN/conffiles
+$(MAKE_SELF) install-base DH_OPTIONS='-p$(PACKAGE_NAME) -p$(MODULES_PACKAGE_NAME)'
-install-image-dbg_$(ARCH)_$(FEATURESET)_$(FLAVOUR): REAL_VERSION = $(UPSTREAMVERSION)$(ABINAME)$(LOCALVERSION)
+install-image-dbg_$(ARCH)_$(FEATURESET)_$(FLAVOUR): REAL_VERSION = $(ABINAME)$(LOCALVERSION)
install-image-dbg_$(ARCH)_$(FEATURESET)_$(FLAVOUR): PACKAGE_NAME = linux-image-$(REAL_VERSION)-dbg
install-image-dbg_$(ARCH)_$(FEATURESET)_$(FLAVOUR): PACKAGE_DIR = debian/$(PACKAGE_NAME)
install-image-dbg_$(ARCH)_$(FEATURESET)_$(FLAVOUR): DEBUG_DIR = $(PACKAGE_DIR)/usr/lib/debug
@@ -504,7 +504,7 @@
install-udeb_$(ARCH):
dh_testdir
dh_prep
- kernel-wedge install-files $(UPSTREAMVERSION)$(ABINAME)
+ kernel-wedge install-files $(ABINAME)
kernel-wedge check $(PACKAGE_NAMES)
dh_fixperms
dh_gencontrol
Modified: dists/trunk/linux-2.6/debian/templates/control.headers.arch.in
==============================================================================
--- dists/trunk/linux-2.6/debian/templates/control.headers.arch.in Fri Oct 28 18:47:00 2011 (r18191)
+++ dists/trunk/linux-2.6/debian/templates/control.headers.arch.in Fri Oct 28 19:02:10 2011 (r18192)
@@ -1,11 +1,11 @@
-Package: linux-headers- at upstreamversion@@abiname at -all
-Depends: linux-headers- at upstreamversion@@abiname at -all-${kernel:Arch} (= ${binary:Version}), ${misc:Depends}
+Package: linux-headers- at abiname@-all
+Depends: linux-headers- at abiname@-all-${kernel:Arch} (= ${binary:Version}), ${misc:Depends}
Description: All header files for Linux @version@ (meta-package)
This package depends against all architecture-specific kernel header files
for Linux kernel version @upstreamversion@, generally used for building out-of-tree
kernel modules.
-Package: linux-headers- at upstreamversion@@abiname at -all-@arch@
+Package: linux-headers- at abiname@-all- at arch@
Depends: ${misc:Depends}
Description: All header files for Linux @version@ (meta-package)
This package depends against all architecture-specific kernel header files
Modified: dists/trunk/linux-2.6/debian/templates/control.headers.featureset.in
==============================================================================
--- dists/trunk/linux-2.6/debian/templates/control.headers.featureset.in Fri Oct 28 18:47:00 2011 (r18191)
+++ dists/trunk/linux-2.6/debian/templates/control.headers.featureset.in Fri Oct 28 19:02:10 2011 (r18192)
@@ -1,8 +1,8 @@
-Package: linux-headers- at upstreamversion@@abiname at -common@localversion_headers@
+Package: linux-headers- at abiname@-common at localversion_headers@
Depends: ${misc:Depends}
-Description: Common header files for Linux @upstreamversion@@abiname@@localversion_headers@
+Description: Common header files for Linux @abiname@@localversion_headers@
This package provides the architecture-specific common kernel header files
- for Linux kernel version @upstreamversion@@abiname@@localversion_headers@, generally used for building out-of-tree
+ for Linux kernel version @abiname@@localversion_headers@, 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 upstreamversion@@abiname at -(flavour) package, matching the
+ the linux-headers- at abiname@-(flavour) package, matching the
flavour of the kernel you intend the build for.
Modified: dists/trunk/linux-2.6/debian/templates/control.headers.in
==============================================================================
--- dists/trunk/linux-2.6/debian/templates/control.headers.in Fri Oct 28 18:47:00 2011 (r18191)
+++ dists/trunk/linux-2.6/debian/templates/control.headers.in Fri Oct 28 19:02:10 2011 (r18192)
@@ -1,10 +1,10 @@
-Package: linux-headers- at upstreamversion@@abiname@@localversion@
-Depends: linux-headers- at upstreamversion@@abiname at -common@localversion_headers@ (= ${binary:Version}), linux-kbuild- at version@, ${misc:Depends}
+Package: linux-headers- at abiname@@localversion@
+Depends: linux-headers- at abiname@-common at localversion_headers@ (= ${binary:Version}), linux-kbuild- at version@, ${misc:Depends}
Provides: linux-headers
-Description: Header files for Linux @upstreamversion@@abiname@@localversion@
+Description: Header files for Linux @abiname@@localversion@
This package provides the architecture-specific kernel header files
- for Linux kernel @upstreamversion@@abiname@@localversion@, generally
+ for Linux kernel @abiname@@localversion@, generally
used for building out-of-tree kernel modules. These files are going to be
- installed into /usr/src/linux-headers- at upstreamversion@@abiname@@localversion@, and can
+ installed into /usr/src/linux-headers- at abiname@@localversion@, and can
be used for building modules that load into the kernel provided by the
- linux-image- at upstreamversion@@abiname@@localversion@ package.
+ linux-image- at abiname@@localversion@ package.
Modified: dists/trunk/linux-2.6/debian/templates/control.image-dbg.in
==============================================================================
--- dists/trunk/linux-2.6/debian/templates/control.image-dbg.in Fri Oct 28 18:47:00 2011 (r18191)
+++ dists/trunk/linux-2.6/debian/templates/control.image-dbg.in Fri Oct 28 19:02:10 2011 (r18192)
@@ -1,7 +1,7 @@
-Package: linux-image- at upstreamversion@@abiname@@localversion at -dbg
-Depends: linux-image- at upstreamversion@@abiname@@localversion@, ${misc:Depends}
+Package: linux-image- at abiname@@localversion at -dbg
+Depends: linux-image- at abiname@@localversion@, ${misc:Depends}
Section: debug
Priority: extra
-Description: Debugging infos for Linux @upstreamversion@@abiname@@localversion@
+Description: Debugging infos for Linux @abiname@@localversion@
This package provides the binary debug image and pre-built debug loadable
modules for Linux kernel @upstreamversion@ on @longclass@ machines.
Modified: dists/trunk/linux-2.6/debian/templates/control.image.type-modulesextra.in
==============================================================================
--- dists/trunk/linux-2.6/debian/templates/control.image.type-modulesextra.in Fri Oct 28 18:47:00 2011 (r18191)
+++ dists/trunk/linux-2.6/debian/templates/control.image.type-modulesextra.in Fri Oct 28 19:02:10 2011 (r18192)
@@ -1,11 +1,11 @@
-Package: linux-image- at upstreamversion@@abiname@@localversion@
+Package: linux-image- at abiname@@localversion@
Provides: linux-image
-Depends: linux-modules- at upstreamversion@@abiname@@localversion@ (= ${binary:Version}), ${misc:Depends}
+Depends: linux-modules- at abiname@@localversion@ (= ${binary:Version}), ${misc:Depends}
Suggests: linux-doc- at version@
Description: Linux @upstreamversion@ for @class@
The Linux kernel @upstreamversion@ for use on @longclass at .
-Package: linux-modules- at upstreamversion@@abiname@@localversion@
+Package: linux-modules- at abiname@@localversion@
Depends: module-init-tools, ${misc:Depends}
Description: Linux @upstreamversion@ modules for @class@
Modules for Linux kernel @upstreamversion@ for use on @longclass at .
Modified: dists/trunk/linux-2.6/debian/templates/control.image.type-plain.in
==============================================================================
--- dists/trunk/linux-2.6/debian/templates/control.image.type-plain.in Fri Oct 28 18:47:00 2011 (r18191)
+++ dists/trunk/linux-2.6/debian/templates/control.image.type-plain.in Fri Oct 28 19:02:10 2011 (r18192)
@@ -1,5 +1,5 @@
-Package: linux-image- at upstreamversion@@abiname@@localversion@
-Provides: linux-image, linux-modules- at upstreamversion@@abiname@@localversion@
+Package: linux-image- at abiname@@localversion@
+Provides: linux-image, linux-modules- at abiname@@localversion@
Pre-Depends: debconf | debconf-2.0
Depends: module-init-tools, linux-base (>= 3~), ${shlibs:Depends}, ${misc:Depends}
Recommends: firmware-linux-free (>= 3~)
Modified: dists/trunk/linux-2.6/debian/templates/control.image.type-standalone.in
==============================================================================
--- dists/trunk/linux-2.6/debian/templates/control.image.type-standalone.in Fri Oct 28 18:47:00 2011 (r18191)
+++ dists/trunk/linux-2.6/debian/templates/control.image.type-standalone.in Fri Oct 28 19:02:10 2011 (r18192)
@@ -1,4 +1,4 @@
-Package: linux-image- at upstreamversion@@abiname@@localversion@
+Package: linux-image- at abiname@@localversion@
Provides: linux-image
Suggests: linux-doc- at version@
Depends: ${shlibs:Depends}, ${misc:Depends}
Modified: dists/trunk/linux-2.6/debian/templates/control.main.in
==============================================================================
--- dists/trunk/linux-2.6/debian/templates/control.main.in Fri Oct 28 18:47:00 2011 (r18191)
+++ dists/trunk/linux-2.6/debian/templates/control.main.in Fri Oct 28 19:02:10 2011 (r18192)
@@ -55,7 +55,7 @@
Package: linux-patch-debian- at version@
Architecture: all
-Depends: bzip2, linux-support- at upstreamversion@@abiname@, python, ${misc:Depends}
+Depends: bzip2, linux-support- at abiname@, python, ${misc:Depends}
Suggests: linux-source- at version@
Description: Debian patches to version @version@ of the Linux kernel
This package includes the patches used to produce the prepackaged
@@ -66,7 +66,7 @@
Linux @version@ kernel but only against the kernel tarball
@source_package at _@source_upstream at .orig.tar.gz from the Debian archive.
-Package: linux-support- at upstreamversion@@abiname@
+Package: linux-support- at abiname@
Architecture: all
Section: devel
Depends: ${python:Depends}, ${misc:Depends}
Modified: dists/trunk/linux-2.6/debian/templates/control.xen-linux-system.in
==============================================================================
--- dists/trunk/linux-2.6/debian/templates/control.xen-linux-system.in Fri Oct 28 18:47:00 2011 (r18191)
+++ dists/trunk/linux-2.6/debian/templates/control.xen-linux-system.in Fri Oct 28 19:02:10 2011 (r18192)
@@ -1,5 +1,5 @@
-Package: xen-linux-system- at upstreamversion@@abiname@@localversion@
-Depends: linux-image- at upstreamversion@@abiname@@localversion@ (= ${binary:Version}), ${misc:Depends}
+Package: xen-linux-system- at abiname@@localversion@
+Depends: linux-image- at abiname@@localversion@ (= ${binary:Version}), ${misc:Depends}
Description: Xen system with Linux @upstreamversion@ on @class@ (meta-package)
This package depends on the binary Linux image and hypervisors.
Modified: dists/trunk/linux-2.6/debian/templates/image.xen.postinst.in
==============================================================================
--- dists/trunk/linux-2.6/debian/templates/image.xen.postinst.in Fri Oct 28 18:47:00 2011 (r18191)
+++ dists/trunk/linux-2.6/debian/templates/image.xen.postinst.in Fri Oct 28 19:02:10 2011 (r18192)
@@ -5,9 +5,9 @@
case "$1" in
configure)
if [ "$2" ]; then
- update-initramfs -u -k @upstreamversion@@abiname@@localversion@
+ update-initramfs -u -k @abiname@@localversion@
else
- update-initramfs -c -t -k @upstreamversion@@abiname@@localversion@
+ update-initramfs -c -t -k @abiname@@localversion@
command -v update-grub > /dev/null && update-grub
fi
;;
Modified: dists/trunk/linux-2.6/debian/templates/image.xen.prerm.in
==============================================================================
--- dists/trunk/linux-2.6/debian/templates/image.xen.prerm.in Fri Oct 28 18:47:00 2011 (r18191)
+++ dists/trunk/linux-2.6/debian/templates/image.xen.prerm.in Fri Oct 28 19:02:10 2011 (r18192)
@@ -4,7 +4,7 @@
case "$1" in
remove)
- update-initramfs -d -k @upstreamversion@@abiname@@localversion@ || true
+ update-initramfs -d -k @abiname@@localversion@ || true
;;
upgrade|deconfigure|failed-upgrade)
Modified: dists/trunk/linux-2.6/debian/templates/patch.apply.in
==============================================================================
--- dists/trunk/linux-2.6/debian/templates/patch.apply.in Fri Oct 28 18:47:00 2011 (r18191)
+++ dists/trunk/linux-2.6/debian/templates/patch.apply.in Fri Oct 28 19:02:10 2011 (r18192)
@@ -3,7 +3,7 @@
import os, os.path, re, sys
from warnings import warn
-sys.path.append("/usr/share/linux-support- at linux_upstream@@abiname@/lib/python")
+sys.path.append("/usr/share/linux-support- at abiname@/lib/python")
from debian_linux.patches import PatchSeries, PatchSeriesList
More information about the Kernel-svn-changes
mailing list