aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorBastian Blank <waldi@debian.org>2007-05-24 13:07:56 +0000
committerBastian Blank <waldi@debian.org>2007-05-24 13:07:56 +0000
commitdee2b1828260da58dd1eb4966a9d696b76343073 (patch)
treeb2fb872701ff169bcb631dd34790a6c6e84693e0
parent91e81e0850852ef65a038bfe4e3e355961a17c9e (diff)
downloadkernel_replicant_linux-dee2b1828260da58dd1eb4966a9d696b76343073.tar.gz
kernel_replicant_linux-dee2b1828260da58dd1eb4966a9d696b76343073.tar.bz2
kernel_replicant_linux-dee2b1828260da58dd1eb4966a9d696b76343073.zip
* debian/bin/gencontrol.py: Export cflags.
* debian/changelog: Update. * debian/rules.real: Write cflags. svn path=/dists/sid/linux-2.6/; revision=8749
-rwxr-xr-xdebian/bin/gencontrol.py1
-rw-r--r--debian/changelog3
-rw-r--r--debian/rules.real1
3 files changed, 4 insertions, 1 deletions
diff --git a/debian/bin/gencontrol.py b/debian/bin/gencontrol.py
index 430cc38b6f98..a5cbf4f3f989 100755
--- a/debian/bin/gencontrol.py
+++ b/debian/bin/gencontrol.py
@@ -82,6 +82,7 @@ class gencontrol(debian_linux.gencontrol.gencontrol):
def do_flavour_setup(self, vars, makeflags, arch, subarch, flavour, extra):
vars.update(self.config.get(('image', arch, subarch, flavour), {}))
for i in (
+ ('cflags', 'CFLAGS'),
('compiler', 'COMPILER'),
('image-postproc', 'IMAGE_POSTPROC'),
('initramfs', 'INITRAMFS',),
diff --git a/debian/changelog b/debian/changelog
index d7bb1701b4d1..ec47c9e95dee 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -86,8 +86,9 @@ linux-2.6 (2.6.21-3) UNRELEASED; urgency=low
[ Bastian Blank ]
* Fix linux/version.h in linux-libc-dev.
+ * Make it possible to specifiy special CFLAGS.
- -- maximilian attems <maks@debian.org> Thu, 24 May 2007 14:11:54 +0200
+ -- Bastian Blank <waldi@debian.org> Thu, 24 May 2007 15:06:32 +0200
linux-2.6 (2.6.21-2) unstable; urgency=low
diff --git a/debian/rules.real b/debian/rules.real
index 5ff882df8cee..9fd344e8bdc3 100644
--- a/debian/rules.real
+++ b/debian/rules.real
@@ -139,6 +139,7 @@ define SETUP_DIR
echo 'CCACHE = ccache' >> '$(DIR)/.kernelvariables'
echo 'CC = $$(if $$(DEBIAN_KERNEL_USE_CCACHE),$$(CCACHE)) $$(CROSS_COMPILE)$(COMPILER)' >> '$(DIR)/.kernelvariables'
$(SETUP_DIR_HOST_TYPE)
+ echo 'CFLAGS += $(CFLAGS)' >> '$(DIR)/.kernelvariables'
cd '$(DIR)'; $(setup_env) make reportoldconfig
endef