[kernel] r19148 - in dists/sid/linux/debian: . bin lib/python/debian_linux
Bastian Blank
waldi at alioth.debian.org
Thu Jun 14 14:39:31 UTC 2012
Author: waldi
Date: Thu Jun 14 14:39:30 2012
New Revision: 19148
Log:
Support build-arch and build-indep make targets
* debian/rules, debian/rules.real:
Support build-indep, rename build to build-arch.
* debian/bin/gencontrol.py, debian/lib/python/debian_linux/gencontrol.py:
Add build-arch and build-indep.
* debian/changelog: Update.
Modified:
dists/sid/linux/debian/bin/gencontrol.py
dists/sid/linux/debian/changelog
dists/sid/linux/debian/lib/python/debian_linux/gencontrol.py
dists/sid/linux/debian/rules
dists/sid/linux/debian/rules.real
Modified: dists/sid/linux/debian/bin/gencontrol.py
==============================================================================
--- dists/sid/linux/debian/bin/gencontrol.py Thu Jun 14 08:30:37 2012 (r19147)
+++ dists/sid/linux/debian/bin/gencontrol.py Thu Jun 14 14:39:30 2012 (r19148)
@@ -342,10 +342,10 @@
cmds_binary_arch = ["$(MAKE) -f debian/rules.real binary-arch-flavour %s" % makeflags]
if packages_dummy:
cmds_binary_arch.append("$(MAKE) -f debian/rules.real install-dummy DH_OPTIONS='%s' %s" % (' '.join(["-p%s" % i['Package'] for i in packages_dummy]), makeflags))
- cmds_build = ["$(MAKE) -f debian/rules.real build %s" % makeflags]
+ cmds_build = ["$(MAKE) -f debian/rules.real build-arch %s" % makeflags]
cmds_setup = ["$(MAKE) -f debian/rules.real setup-flavour %s" % makeflags]
makefile.add('binary-arch_%s_%s_%s_real' % (arch, featureset, flavour), cmds=cmds_binary_arch)
- makefile.add('build_%s_%s_%s_real' % (arch, featureset, flavour), cmds=cmds_build)
+ makefile.add('build-arch_%s_%s_%s_real' % (arch, featureset, flavour), cmds=cmds_build)
makefile.add('setup_%s_%s_%s_real' % (arch, featureset, flavour), cmds=cmds_setup)
def merge_packages(self, packages, new, arch):
Modified: dists/sid/linux/debian/changelog
==============================================================================
--- dists/sid/linux/debian/changelog Thu Jun 14 08:30:37 2012 (r19147)
+++ dists/sid/linux/debian/changelog Thu Jun 14 14:39:30 2012 (r19148)
@@ -10,6 +10,9 @@
* [mips,mipsel] udeb: Remove rivafb and nvidiafb.
* [ppc64]: add udebs, based on powerpc/powerpc64.
+ [ Bastian Blank ]
+ * Support build-arch and build-indep make targets.
+
-- Ben Hutchings <ben at decadent.org.uk> Tue, 12 Jun 2012 06:21:34 +0100
linux (3.2.20-1) unstable; urgency=low
Modified: dists/sid/linux/debian/lib/python/debian_linux/gencontrol.py
==============================================================================
--- dists/sid/linux/debian/lib/python/debian_linux/gencontrol.py Thu Jun 14 08:30:37 2012 (r19147)
+++ dists/sid/linux/debian/lib/python/debian_linux/gencontrol.py Thu Jun 14 14:39:30 2012 (r19148)
@@ -77,7 +77,7 @@
class Gencontrol(object):
- makefile_targets = ('binary-arch', 'build', 'setup')
+ makefile_targets = ('binary-arch', 'build-arch', 'setup')
def __init__(self, config, templates, version=Version):
self.config, self.templates = config, templates
@@ -114,6 +114,7 @@
pass
def do_main_makefile(self, makefile, makeflags, extra):
+ makefile.add('build-indep', cmds=["$(MAKE) -f debian/rules.real build-indep %s" % makeflags])
makefile.add('binary-indep', cmds=["$(MAKE) -f debian/rules.real binary-indep %s" % makeflags])
def do_main_packages(self, packages, vars, makeflags, extra):
Modified: dists/sid/linux/debian/rules
==============================================================================
--- dists/sid/linux/debian/rules Thu Jun 14 08:30:37 2012 (r19147)
+++ dists/sid/linux/debian/rules Thu Jun 14 14:39:30 2012 (r19148)
@@ -32,10 +32,18 @@
$(MAKE) -f debian/rules.gen setup_$(DEB_HOST_ARCH)
@$(stamp)
-build: debian/control $(STAMPS_DIR)/build-base
-$(STAMPS_DIR)/build-base: $(STAMPS_DIR)/setup-base
+build: build-arch build-indep
+
+build-arch: debian/control $(STAMPS_DIR)/build-arch-base
+$(STAMPS_DIR)/build-arch-base: $(STAMPS_DIR)/setup-base
+ dh_testdir
+ $(MAKE) -f debian/rules.gen build-arch_$(DEB_HOST_ARCH)
+ @$(stamp)
+
+build-indep: debian/control $(STAMPS_DIR)/build-indep-base
+$(STAMPS_DIR)/build-indep-base: $(STAMPS_DIR)/setup-base
dh_testdir
- $(MAKE) -f debian/rules.gen build_$(DEB_HOST_ARCH)
+ $(MAKE) -f debian/rules.gen build-indep
@$(stamp)
DIR_ORIG = ../orig/$(SOURCE)-$(VERSION_UPSTREAM)
@@ -63,11 +71,11 @@
rm -rf $(BUILD_DIR) $(STAMPS_DIR) debian/lib/python/debian_linux/*.pyc debian/linux-headers-* debian/linux-image-* debian/linux-support-* debian/linux-source-* debian/linux-doc-* debian/linux-manual-* debian/xen-linux-system-* debian/*-modules-*-di*
dh_clean
-binary-indep: $(STAMPS_DIR)/source-base
+binary-indep: $(STAMPS_DIR)/build-indep-base
dh_testdir
$(MAKE) -f debian/rules.gen binary-indep
-binary-arch: $(STAMPS_DIR)/build-base
+binary-arch: $(STAMPS_DIR)/build-arch-base
dh_testdir
$(MAKE) -f debian/rules.gen binary-arch_$(DEB_HOST_ARCH)
Modified: dists/sid/linux/debian/rules.real
==============================================================================
--- dists/sid/linux/debian/rules.real Thu Jun 14 08:30:37 2012 (r19147)
+++ dists/sid/linux/debian/rules.real Thu Jun 14 14:39:30 2012 (r19148)
@@ -51,7 +51,8 @@
binary-indep: install-source
binary-indep: install-support
-build: $(STAMPS_DIR)/build_$(ARCH)_$(FEATURESET)_$(FLAVOUR)_$(TYPE)
+build-arch: $(STAMPS_DIR)/build_$(ARCH)_$(FEATURESET)_$(FLAVOUR)_$(TYPE)
+build-indep: $(STAMPS_DIR)/build-doc
setup-flavour: $(STAMPS_DIR)/setup_$(ARCH)_$(FEATURESET)_$(FLAVOUR)
More information about the Kernel-svn-changes
mailing list