[kernel] r6005 - in people/waldi/linux-2.6/debian: .
lib/python/debian_linux templates
Bastian Blank
waldi at costa.debian.org
Thu Mar 2 10:06:42 UTC 2006
Author: waldi
Date: Thu Mar 2 10:06:40 2006
New Revision: 6005
Modified:
people/waldi/linux-2.6/debian/lib/python/debian_linux/gencontrol.py
people/waldi/linux-2.6/debian/rules.real
people/waldi/linux-2.6/debian/templates/control.headers.arch.in
people/waldi/linux-2.6/debian/templates/control.headers.in
people/waldi/linux-2.6/debian/templates/control.headers.latest.in
people/waldi/linux-2.6/debian/templates/control.headers.subarch.in
people/waldi/linux-2.6/debian/templates/control.image.in
people/waldi/linux-2.6/debian/templates/control.image.latest.in
Log:
* debian/lib/python/debian_linux/gencontrol.py:
Populate UPSTREAMVERSION, ABINAME and LOCALVERSION in an stable fashion.
* debian/rules.real: Use UPSTREAMVERSION, ABINAME and LOCALVERSION.
* debian/templates/control.headers.arch.in,
debian/templates/control.headers.in,
debian/templates/control.headers.latest.in,
debian/templates/control.headers.subarch.in,
debian/templates/control.image.in,
debian/templates/control.image.latest.in:
Use upstreamversion and localversion substitutions.
Modified: people/waldi/linux-2.6/debian/lib/python/debian_linux/gencontrol.py
==============================================================================
--- people/waldi/linux-2.6/debian/lib/python/debian_linux/gencontrol.py (original)
+++ people/waldi/linux-2.6/debian/lib/python/debian_linux/gencontrol.py Thu Mar 2 10:06:40 2006
@@ -16,7 +16,7 @@
self.changelog = read_changelog()
self.config = config_reader(underlay)
self.templates = templates()
- self.version, self.abiname, self.kpkg_abiname, self.changelog_vars = self.process_changelog({})
+ self.version, self.abiname, self.changelog_vars = self.process_changelog({})
def __call__(self):
packages = packages_list()
@@ -38,9 +38,8 @@
'VERSION': self.version['version'],
'SOURCE_UPSTREAM': self.version['source_upstream'],
'SOURCE_VERSION': self.version['source'],
- 'UPSTREAM_VERSION': self.version['upstream'],
+ 'UPSTREAMVERSION': self.version['upstream'],
'ABINAME': self.abiname,
- 'KPKG_ABINAME': self.kpkg_abiname,
'REVISIONS': ' '.join([i['Version']['debian'] for i in self.changelog[::-1]]),
}
@@ -97,6 +96,8 @@
extra = {}
makeflags['ARCH'] = arch
+ vars['localversion'] = vars['localversion_headers'] = vars['abiname']
+
self.do_arch_makeflags(makeflags, arch)
self.do_arch_makefile(makefile, arch, makeflags)
self.do_arch_packages(packages, makefile, arch, vars, makeflags, extra)
@@ -121,14 +122,14 @@
pass
def do_subarch(self, packages, makefile, arch, subarch, vars, makeflags, extra):
- if subarch == 'none':
- vars['subarch'] = ''
- else:
- vars['subarch'] = '-%s' % subarch
config_entry = self.config['base', arch, subarch]
vars.update(config_entry)
makeflags['SUBARCH'] = subarch
+ if subarch != 'none':
+ vars['localversion'] += '-' + subarch
+ vars['localversion_headers'] += '-' + subarch
+
self.do_subarch_makeflags(makeflags, arch, subarch)
self.do_subarch_makefile(makefile, arch, subarch, makeflags)
self.do_subarch_packages(packages, makefile, arch, subarch, vars, makeflags, extra)
@@ -169,6 +170,8 @@
packages['source']['Build-Depends'].extend(relations_compiler)
makeflags['FLAVOUR'] = flavour
+ vars['localversion'] += '-' + flavour
+
self.do_flavour_makeflags(makeflags, arch, subarch, flavour)
self.do_flavour_makefile(makefile, arch, subarch, flavour, makeflags)
self.do_flavour_packages(packages, makefile, arch, subarch, flavour, vars, makeflags, extra)
@@ -192,19 +195,17 @@
pass
def process_changelog(self, in_vars):
- ret = [None, None, None, None]
+ ret = [None, None, None]
ret[0] = version = self.changelog[0]['Version']
vars = in_vars.copy()
if version['modifier'] is not None:
- ret[1] = vars['abiname'] = version['modifier']
- ret[2] = ""
+ ret[1] = vars['abiname'] = ''
else:
- ret[1] = vars['abiname'] = self.config['base',]['abiname']
- ret[2] = "-%s" % vars['abiname']
- vars['version'] = version['source']
+ ret[1] = vars['abiname'] = '-%s' % self.config['base',]['abiname']
+ vars['upstreamversion'] = version['upstream']
vars['version'] = version['version']
vars['major'] = version['major']
- ret[3] = vars
+ ret[2] = vars
return ret
def process_relation(self, key, e, in_e, vars):
Modified: people/waldi/linux-2.6/debian/rules.real
==============================================================================
--- people/waldi/linux-2.6/debian/rules.real (original)
+++ people/waldi/linux-2.6/debian/rules.real Thu Mar 2 10:06:40 2006
@@ -33,7 +33,7 @@
# in Makefile.inc. @flavour@ in the expressions is going to be
# replaced by the flavour for which the command is run.
#
-kpkg_image := make-kpkg --append-to-version '$(KPKG_ABINAME)$(LOCALVERSION)'
+kpkg_image := make-kpkg --append-to-version '$(ABINAME)$(LOCALVERSION)'
kpkg_image += --arch '$(ARCH)'
kpkg_image += --stem linux
ifneq ($(INITRD),no)
@@ -80,13 +80,13 @@
@echo "Generating configuration file $@:"
ocaml debian/bin/kconfig.ml -b "debian/arch" -a "$(ARCH)" -s "$(SUBARCH)" -f "$(FLAVOUR)" > '$@'
-$(BUILD_DIR)/linux-source-$(UPSTREAM_VERSION).tar.bz2: SOURCE_DIR=$(BUILD_DIR)/source
-$(BUILD_DIR)/linux-source-$(UPSTREAM_VERSION).tar.bz2: DIR = $(BUILD_DIR)/linux-source-$(UPSTREAM_VERSION)
-$(BUILD_DIR)/linux-source-$(UPSTREAM_VERSION).tar.bz2: $(STAMPS_DIR)/source
+$(BUILD_DIR)/linux-source-$(UPSTREAMVERSION).tar.bz2: SOURCE_DIR=$(BUILD_DIR)/source
+$(BUILD_DIR)/linux-source-$(UPSTREAMVERSION).tar.bz2: DIR = $(BUILD_DIR)/linux-source-$(UPSTREAMVERSION)
+$(BUILD_DIR)/linux-source-$(UPSTREAMVERSION).tar.bz2: $(STAMPS_DIR)/source
rm -rf '$@' '$(DIR)'
cp -al '$(SOURCE_DIR)' '$(DIR)'
chmod -R u+rw,go=rX '$(DIR)'
- cd '$(BUILD_DIR)'; tar -cjf 'linux-source-$(UPSTREAM_VERSION).tar.bz2' 'linux-source-$(UPSTREAM_VERSION)'
+ cd '$(BUILD_DIR)'; tar -cjf 'linux-source-$(UPSTREAMVERSION).tar.bz2' 'linux-source-$(UPSTREAMVERSION)'
rm -rf '$(DIR)'
define patch_cmd
@@ -185,7 +185,7 @@
dh_clean -d -k
$(MAKE) -f debian/rules.real install-base
-install-header-$(ARCH)-$(SUBARCH): PACKAGE_NAME = linux-headers-$(VERSION)-$(ABINAME)$(LOCALVERSION_HEADERS)
+install-header-$(ARCH)-$(SUBARCH): PACKAGE_NAME = linux-headers-$(UPSTREAMVERSION)$(ABINAME)$(LOCALVERSION_HEADERS)
install-header-$(ARCH)-$(SUBARCH): DH_OPTIONS = -p$(PACKAGE_NAME)
install-header-$(ARCH)-$(SUBARCH): BASE_DIR = /usr/src/$(PACKAGE_NAME)
install-header-$(ARCH)-$(SUBARCH): SOURCE_DIR = $(BUILD_DIR)/source-$(ARCH)-$(SUBARCH)
@@ -214,9 +214,9 @@
cpio -pd --preserve-modification-time $(DIR)
$(MAKE) -f debian/rules.real install-base
-install-header-$(ARCH)-$(SUBARCH)-$(FLAVOUR): REAL_VERSION = $(VERSION)-$(ABINAME)$(LOCALVERSION)
+install-header-$(ARCH)-$(SUBARCH)-$(FLAVOUR): REAL_VERSION = $(UPSTREAMVERSION)$(ABINAME)$(LOCALVERSION)
install-header-$(ARCH)-$(SUBARCH)-$(FLAVOUR): PACKAGE_NAME = linux-headers-$(REAL_VERSION)
-install-header-$(ARCH)-$(SUBARCH)-$(FLAVOUR): PACKAGE_NAME_HEADERS = linux-headers-$(VERSION)-$(ABINAME)$(LOCALVERSION_HEADERS)
+install-header-$(ARCH)-$(SUBARCH)-$(FLAVOUR): PACKAGE_NAME_HEADERS = linux-headers-$(UPSTREAMVERSION)$(ABINAME)$(LOCALVERSION_HEADERS)
install-header-$(ARCH)-$(SUBARCH)-$(FLAVOUR): DH_OPTIONS = -p$(PACKAGE_NAME)
install-header-$(ARCH)-$(SUBARCH)-$(FLAVOUR): BASE_DIR = /usr/src/$(PACKAGE_NAME)
install-header-$(ARCH)-$(SUBARCH)-$(FLAVOUR): SOURCE_DIR = $(BUILD_DIR)/build-$(ARCH)-$(SUBARCH)-$(FLAVOUR)
@@ -232,7 +232,7 @@
mkdir -p "${DIR}/include"
cp -a ${SOURCE_DIR}/{.config,Module.symvers} "${DIR}"
# TODO
- echo -${KPKG_ABINAME}$(LOCALVERSION) > "${DIR}/localversion"
+ echo $(ABINAME)$(LOCALVERSION) > "${DIR}/localversion"
cd ${SOURCE_DIR}; \
find . -mindepth 1 -maxdepth 1 \
@@ -353,7 +353,7 @@
$(MAKE) -f debian/rules.real install-base DH_OPTIONS='$(DH_OPTIONS)'
install-source: DH_OPTIONS = -plinux-source-$(VERSION)
-install-source: $(BUILD_DIR)/linux-source-$(UPSTREAM_VERSION).tar.bz2
+install-source: $(BUILD_DIR)/linux-source-$(UPSTREAMVERSION).tar.bz2
dh_testdir
dh_testroot
dh_install $(DH_OPTIONS) '$<' /usr/src
Modified: people/waldi/linux-2.6/debian/templates/control.headers.arch.in
==============================================================================
--- people/waldi/linux-2.6/debian/templates/control.headers.arch.in (original)
+++ people/waldi/linux-2.6/debian/templates/control.headers.arch.in Thu Mar 2 10:06:40 2006
@@ -1,9 +1,9 @@
Package: linux-headers- at version@
Section: devel
Priority: optional
-Provides: linux-headers- at version@- at abiname@-all, linux-headers- at major@-all
+Provides: linux-headers- at upstreamversion@@abiname at -all, linux-headers- at major@-all
Depends: ${kernel:Depends}
Description: All header files for Linux kernel @version@
This package depends against all architecture-specific kernel header files
- for Linux kernel version @version@, generally used for building out-of-tree
+ for Linux kernel version @upstreamversion@, generally used for building out-of-tree
kernel modules.
Modified: people/waldi/linux-2.6/debian/templates/control.headers.in
==============================================================================
--- people/waldi/linux-2.6/debian/templates/control.headers.in (original)
+++ people/waldi/linux-2.6/debian/templates/control.headers.in Thu Mar 2 10:06:40 2006
@@ -1,15 +1,15 @@
-Package: linux-headers- at version@- at abiname@@subarch at -@flavour@
+Package: linux-headers- at upstreamversion@@abiname@@localversion@
Section: devel
Priority: optional
-Depends: linux-headers- at version@- at abiname@@subarch@ (= ${Source-Version})
+Depends: linux-headers- at upstreamversion@@abiname@@localversion_headers@ (= ${Source-Version})
Provides: linux-headers, linux-headers- at major@
Description: Header files for Linux kernel @version@ on @class@ machines
This package provides the architecture-specific kernel header files
for Linux kernel @version@ on @longclass@ machines, generally
used for building out-of-tree kernel modules. These files are going to be
- installed into /usr/src/linux-headers- at version@- at abiname@@subarch at -@flavour@, and can
+ installed into /usr/src/linux-headers- at upstreamversion@@abiname@@localversion@, and can
be used for building modules that load into the kernel provided by the
- linux-image- at version@- at abiname@@subarch at -@flavour@ package.
+ linux-image- at upstreamversion@@abiname@@localversion@ package.
.
This packages is produced using an updated kernel packaging system
and replaces older kernel-headers packages
Modified: people/waldi/linux-2.6/debian/templates/control.headers.latest.in
==============================================================================
--- people/waldi/linux-2.6/debian/templates/control.headers.latest.in (original)
+++ people/waldi/linux-2.6/debian/templates/control.headers.latest.in Thu Mar 2 10:06:40 2006
@@ -1,7 +1,7 @@
-Package: linux-headers- at major@@subarch at -@flavour@
+Package: linux-headers- at major@@localversion@
Section: devel
Priority: optional
-Depends: linux-headers- at version@- at abiname@@subarch at -@flavour@ (= ${Source-Version})
+Depends: linux-headers- at upstreamversion@@abiname@@localversion@ (= ${Source-Version})
Provides: linux-headers, linux-headers- at major@
Description: Architecture-specific header files for Linux kernel @major@ on @class@ machines
This package depends on the architecture-specific header files for the latest
Modified: people/waldi/linux-2.6/debian/templates/control.headers.subarch.in
==============================================================================
--- people/waldi/linux-2.6/debian/templates/control.headers.subarch.in (original)
+++ people/waldi/linux-2.6/debian/templates/control.headers.subarch.in Thu Mar 2 10:06:40 2006
@@ -1,4 +1,4 @@
-Package: linux-headers- at version@- at abiname@@subarch@
+Package: linux-headers- at upstreamversion@@abiname@@localversion_headers@
Section: devel
Priority: optional
Provides: linux-headers, linux-headers- at major@
@@ -6,10 +6,10 @@
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@@subarch at -(flavour) package, matching the
+ the linux-headers- at upstreamversion@@abiname at -(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-$(uname -r)
.
- and it will be unpacked in /usr/src/linux-headers- at version@- at abiname@@subarch at -(flavour).
+ and it will be unpacked in /usr/src/linux-headers- at upstreamversion@@abiname at -(flavour).
Modified: people/waldi/linux-2.6/debian/templates/control.image.in
==============================================================================
--- people/waldi/linux-2.6/debian/templates/control.image.in (original)
+++ people/waldi/linux-2.6/debian/templates/control.image.in Thu Mar 2 10:06:40 2006
@@ -1,4 +1,4 @@
-Package: linux-image- at version@- at abiname@@subarch at -@flavour@
+Package: linux-image- at upstreamversion@@abiname@@localversion@
Section: base
Priority: optional
Provides: linux-image, linux-image- at major@
Modified: people/waldi/linux-2.6/debian/templates/control.image.latest.in
==============================================================================
--- people/waldi/linux-2.6/debian/templates/control.image.latest.in (original)
+++ people/waldi/linux-2.6/debian/templates/control.image.latest.in Thu Mar 2 10:06:40 2006
@@ -1,15 +1,15 @@
-Package: linux-image at subarch@- at flavour@
+Package: linux-image at localversion@
Section: base
Priority: optional
-Depends: linux-image- at major@@subarch at -@flavour@ (= ${Source-Version})
+Depends: linux-image- at major@@localversion@ (= ${Source-Version})
Description: Linux kernel image on @class@ machines
This package depends on the latest binary image for Linux kernel on
@longclass@ machines.
-Package: linux-image- at major@@subarch at -@flavour@
+Package: linux-image- at major@@localversion@
Section: base
Priority: optional
-Depends: linux-image- at version@- at abiname@@subarch at -@flavour@ (= ${Source-Version})
+Depends: linux-image- at upstreamversion@@abiname@@localversion@ (= ${Source-Version})
Description: Linux kernel @major@ image on @class@ machines
This package depends on the latest binary image for Linux kernel @major@
on @longclass@ machines.
More information about the Kernel-svn-changes
mailing list