Author: waldi
Date: Sat Jan 6 22:01:53 2007
New Revision: 8133
Modified:
dists/sid/linux-2.6/debian/arch/hppa/defines
dists/sid/linux-2.6/debian/bin/gencontrol.py
dists/sid/linux-2.6/debian/changelog
dists/sid/linux-2.6/debian/rules.real
Log:
* debian/arch/hppa/defines: Add host type overrides.
* debian/bin/gencontrol.py: Add new variable.
* debian/changelog: Update.
* debian/rules.real: Set CROSS_COMPILE to overriden host type if applicable.
Modified: dists/sid/linux-2.6/debian/arch/hppa/defines
==============================================================================
--- dists/sid/linux-2.6/debian/arch/hppa/defines (original)
+++ dists/sid/linux-2.6/debian/arch/hppa/defines Sat Jan 6 22:01:53 2007
@@ -18,9 +18,11 @@
[parisc64]
class: 64-bit PA-RISC
+override-host-type: hppa64-linux-gnu
[parisc64-smp]
class: multiprocessor 64-bit PA-RISC
+override-host-type: hppa64-linux-gnu
[relations]
gcc-4.1: gcc-4.1, binutils-hppa64, gcc-4.1-hppa64
Modified: dists/sid/linux-2.6/debian/bin/gencontrol.py
==============================================================================
--- dists/sid/linux-2.6/debian/bin/gencontrol.py (original)
+++ dists/sid/linux-2.6/debian/bin/gencontrol.py Sat Jan 6 22:01:53 2007
@@ -91,6 +91,7 @@
('kpkg-arch', 'KPKG_ARCH'),
('kpkg-subarch', 'KPKG_SUBARCH'),
('localversion', 'LOCALVERSION'),
+ ('override-host-type', 'OVERRIDE_HOST_TYPE'),
('type', 'TYPE'),
):
if vars.has_key(i[0]):
Modified: dists/sid/linux-2.6/debian/changelog
==============================================================================
--- dists/sid/linux-2.6/debian/changelog (original)
+++ dists/sid/linux-2.6/debian/changelog Sat Jan 6 22:01:53 2007
@@ -23,6 +23,7 @@
* Update vserver patch to 2.0.2.2-rc9. (closes: #402743)
* Update xen patch to changeset 36186 from Fedora 2.6.18 branch.
* i386/xen: Build only the pae version. (closes: #390862)
+ * hppa: Override host type when necessary.
[ dann frazier ]
* Fix potential fragmentation attacks in ip6_tables (CVE-2006-4572)
@@ -144,7 +145,7 @@
memory accesses in ehci-hub-control() by adding an alignment attribute
to the tbuf array declaration. Thanks to David Miller for the patch.
- -- maximilian attems <[EMAIL PROTECTED]> Fri, 5 Jan 2007 00:46:22 +0100
+ -- Bastian Blank <[EMAIL PROTECTED]> Sat, 6 Jan 2007 21:58:08 +0100
linux-2.6 (2.6.18-8) unstable; urgency=low
Modified: dists/sid/linux-2.6/debian/rules.real
==============================================================================
--- dists/sid/linux-2.6/debian/rules.real (original)
+++ dists/sid/linux-2.6/debian/rules.real Sat Jan 6 22:01:53 2007
@@ -117,6 +117,18 @@
$(STAMPS_DIR)/setup-$(ARCH)-$(SUBARCH)-$(FLAVOUR)-$(TYPE):
DIR=$(BUILD_DIR)/build-$(ARCH)-$(SUBARCH)-$(FLAVOUR)
$(STAMPS_DIR)/setup-$(ARCH)-$(SUBARCH)-$(FLAVOUR)-$(TYPE):
$(BUILD_DIR)/config.$(ARCH)-$(SUBARCH)-$(FLAVOUR)
$(STAMPS_DIR)/source-$(ARCH)-$(SUBARCH)
+ifdef OVERRIDE_HOST_TYPE
+define SETUP_DIR_HOST_TYPE
+ echo 'override CROSS_COMPILE = $(OVERRIDE_HOST_TYPE)-' >>
'$(DIR)/.kernelvariables'
+endef
+else
+define SETUP_DIR_HOST_TYPE
+ echo 'ifneq ($$(DEB_BUILD_ARCH),$$(DEB_HOST_ARCH))' >>
'$(DIR)/.kernelvariables'
+ echo 'override CROSS_COMPILE = $$(DEB_HOST_GNU_TYPE)-' >>
'$(DIR)/.kernelvariables'
+ echo 'endif' >> '$(DIR)/.kernelvariables'
+endef
+endif
+
define SETUP_DIR
rm -rf '$(DIR)'
cp -al '$(SOURCE_DIR)' '$(DIR)'
@@ -125,9 +137,7 @@
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'
- echo 'ifneq ($$(DEB_BUILD_ARCH),$$(DEB_HOST_ARCH))' >>
'$(DIR)/.kernelvariables'
- echo 'override CROSS_COMPILE = $$(DEB_HOST_GNU_TYPE)-' >>
'$(DIR)/.kernelvariables'
- echo 'endif' >> '$(DIR)/.kernelvariables'
+ $(SETUP_DIR_HOST_TYPE)
cd '$(DIR)'; $(setup_env) make reportoldconfig
endef
_______________________________________________
Kernel-svn-changes mailing list
[email protected]
http://lists.alioth.debian.org/mailman/listinfo/kernel-svn-changes
