r4209 - in dists/trunk/linux-2.6: . debian debian/arch/alpha
debian/arch/arm debian/arch/m68k debian/arch/sparc debian/bin
debian/lib/python debian/templates
Bastian Blank
waldi at costa.debian.org
Wed Sep 14 21:15:39 UTC 2005
Author: waldi
Date: 2005-09-14 21:15:37 +0000 (Wed, 14 Sep 2005)
New Revision: 4209
Modified:
dists/trunk/linux-2.6/
dists/trunk/linux-2.6/debian/arch/alpha/defines
dists/trunk/linux-2.6/debian/arch/arm/defines
dists/trunk/linux-2.6/debian/arch/m68k/defines
dists/trunk/linux-2.6/debian/arch/sparc/defines
dists/trunk/linux-2.6/debian/bin/gencontrol.py
dists/trunk/linux-2.6/debian/lib/python/debian_linux.py
dists/trunk/linux-2.6/debian/rules.real
dists/trunk/linux-2.6/debian/templates/header-install.in
dists/trunk/linux-2.6/debian/templates/post-install.in
Log:
r4203: waldi | 2005-09-14 20:57:40 +0200
Move compiler setting to package config.
* debian/arch/alpha/defines, debian/arch/arm/defines,
debian/arch/m68k/defines, debian/arch/sparc/defines:
Add compiler setting.
* debian/bin/gencontrol.py: Set COMPILER argument.
* debian/lib/python/debian_linux.py: Add support for compiler setting.
* debian/rules.real: Change MAKEFLAGS setup.
r4204: waldi | 2005-09-14 21:43:27 +0200
* debian/rules.real: Update header-install substitution.
* debian/templates/header-install.in: Remove flavours file.
r4205: waldi | 2005-09-14 21:54:56 +0200
* debian/rules.real
- Update post-install substitution.
- Remove append variable.
* debian/templates/post-install.in: Remove append substitution.
Property changes on: dists/trunk/linux-2.6
___________________________________________________________________
Name: svk:merge
- 510b9475-24dd-0310-9b6c-e0eefe99d49f:/people/waldi/linux-2.6:4064
+ 510b9475-24dd-0310-9b6c-e0eefe99d49f:/people/waldi/linux-2.6:4208
Modified: dists/trunk/linux-2.6/debian/arch/alpha/defines
===================================================================
--- dists/trunk/linux-2.6/debian/arch/alpha/defines 2005-09-14 21:13:43 UTC (rev 4208)
+++ dists/trunk/linux-2.6/debian/arch/alpha/defines 2005-09-14 21:15:37 UTC (rev 4209)
@@ -1,4 +1,5 @@
[base]
+compiler: gcc-3.3
flavours: alpha-generic alpha-smp
suggests: aboot, fdutils
Modified: dists/trunk/linux-2.6/debian/arch/arm/defines
===================================================================
--- dists/trunk/linux-2.6/debian/arch/arm/defines 2005-09-14 21:13:43 UTC (rev 4208)
+++ dists/trunk/linux-2.6/debian/arch/arm/defines 2005-09-14 21:15:37 UTC (rev 4209)
@@ -1,4 +1,5 @@
[base]
+compiler: gcc-3.3
flavours:
footbridge
ixp4xx
Modified: dists/trunk/linux-2.6/debian/arch/m68k/defines
===================================================================
--- dists/trunk/linux-2.6/debian/arch/m68k/defines 2005-09-14 21:13:43 UTC (rev 4208)
+++ dists/trunk/linux-2.6/debian/arch/m68k/defines 2005-09-14 21:15:37 UTC (rev 4209)
@@ -1,4 +1,5 @@
[base]
+compiler: gcc-3.3
flavours:
amiga
atari
Modified: dists/trunk/linux-2.6/debian/arch/sparc/defines
===================================================================
--- dists/trunk/linux-2.6/debian/arch/sparc/defines 2005-09-14 21:13:43 UTC (rev 4208)
+++ dists/trunk/linux-2.6/debian/arch/sparc/defines 2005-09-14 21:15:37 UTC (rev 4209)
@@ -1,4 +1,5 @@
[base]
+compiler: gcc-3.3
flavours: sparc64 sparc64-smp
kpkg-subarch: sparc64
suggests: silo, fdutils
Modified: dists/trunk/linux-2.6/debian/bin/gencontrol.py
===================================================================
--- dists/trunk/linux-2.6/debian/bin/gencontrol.py 2005-09-14 21:13:43 UTC (rev 4208)
+++ dists/trunk/linux-2.6/debian/bin/gencontrol.py 2005-09-14 21:15:37 UTC (rev 4209)
@@ -320,8 +320,9 @@
makefile.append(("%s-%s-%s-%s:: %s-%s-%s-%s-real" % (i, arch, subarch, flavour, i, arch, subarch, flavour), None))
makeflags['FLAVOUR'] = flavour
- if config_entry.has_key('kpkg-subarch'):
- makeflags['KPKG_SUBARCH'] = config_entry['kpkg-subarch']
+ for i in (('compiler', 'COMPILER'), ('kpkg-subarch', 'KPKG_SUBARCH')):
+ if config_entry.has_key(i[0]):
+ makeflags[i[1]] = config_entry[i[0]]
makeflags_string = ' '.join(["%s='%s'" % i for i in makeflags.iteritems()])
cmds_binary_arch = []
@@ -413,8 +414,9 @@
makefile.append(("%s-%s-%s:: %s-%s-%s-real" % (i, arch, subarch, i, arch, subarch), None))
makeflags['SUBARCH'] = subarch
- if config_entry.has_key('kpkg-subarch'):
- makeflags['KPKG_SUBARCH'] = config_entry['kpkg-subarch']
+ for i in (('compiler', 'COMPILER'), ('kpkg-subarch', 'KPKG_SUBARCH')):
+ if config_entry.has_key(i[0]):
+ makeflags[i[1]] = config_entry[i[0]]
makeflags_string = ' '.join(["%s='%s'" % i for i in makeflags.iteritems()])
cmds_binary_arch = []
Modified: dists/trunk/linux-2.6/debian/lib/python/debian_linux.py
===================================================================
--- dists/trunk/linux-2.6/debian/lib/python/debian_linux.py 2005-09-14 21:13:43 UTC (rev 4208)
+++ dists/trunk/linux-2.6/debian/lib/python/debian_linux.py 2005-09-14 21:15:37 UTC (rev 4209)
@@ -27,6 +27,7 @@
'arches': schema_item_list,
'available': schema_item_boolean,
'class': schema_item_string,
+ 'compiler': schema_item_string,
'depends': schema_item_string,
'desc': schema_item_string,
'flavours': schema_item_list,
Modified: dists/trunk/linux-2.6/debian/rules.real
===================================================================
--- dists/trunk/linux-2.6/debian/rules.real 2005-09-14 21:13:43 UTC (rev 4208)
+++ dists/trunk/linux-2.6/debian/rules.real 2005-09-14 21:15:37 UTC (rev 4209)
@@ -16,10 +16,8 @@
#
ifeq ($(SUBARCH),none)
basedir := debian/arch/$(ARCH)
- append :=
else
basedir := debian/arch/$(ARCH)/$(SUBARCH)
- append := $(SUBARCH)-
endif
configs := $(notdir $(wildcard $(basedir)/config.*))
@@ -40,7 +38,7 @@
# replaced by the flavour for which the command is run.
#
kpkg_header := HEADER_CLEAN_HOOK='$(CURDIR)/$(BUILD_DIR)/header-install-$(ARCH)-$(SUBARCH)'
-kpkg_header += make-kpkg --append-to-version "$(append)$(KPKG_ABINAME)"
+kpkg_header += make-kpkg --append-to-version "$(KPKG_ABINAME)"
kpkg_header += --arch $(ARCH)
kpkg_header += --stem linux
kpkg_header += --config defconfig
@@ -57,11 +55,11 @@
endif
setup_env := env -u ABINAME -u ARCH -u SUBARCH -u FLAVOUR -u VERSION
setup_env += DEBIAN_ABINAME=$(ABINAME) DEBIAN_FLAVOUR=$(FLAVOUR) DEBIAN_VERSION=$(VERSION)
-ifdef build_makeflags
- setup_env += MAKEFLAGS=$(build_makeflags)
-else
- setup_env += MAKEFLAGS=
+setup_makeflags =
+ifdef COMPILER
+ setup_makeflags += CC=$(COMPILER)
endif
+setup_env += MAKEFLAGS="$(setup_makeflags)"
ifndef headers_dirs
headers_dirs = $(DEB_HOST_ARCH)
endif
@@ -82,11 +80,7 @@
setup-flavour: $(STAMPS_DIR)/setup-$(ARCH)-$(SUBARCH)-$(FLAVOUR)
$(BUILD_DIR)/header-install-$(ARCH)-$(SUBARCH): $(TEMPLATES_DIR)/header-install.in
- sed -e 's, at kbpkg@,$(kbpkg),g' \
- -e 's, at ksource_dir@,$(CURDIR)/$(kdir),g' \
- -e 's, at flavours@,$(flavours),g' \
- -e 's, at headers_dirs@,$(headers_dirs),g' \
- $< > $@
+ sed -e 's, at headers_dirs@,$(headers_dirs),g' $< > $@
chmod u+x $@
#
# The way to make the correct package names is to make a
@@ -99,7 +93,6 @@
endif
$(BUILD_DIR)/post-install-$(ARCH)-$(SUBARCH): $(TEMPLATES_DIR)/post-install.in
sed -e 's, at initrd_modules@,$(initrd_modules),' \
- -e 's, at append_subarch@,$(append),' \
-e 's, at extra_postinstall_command@,$(extra_command),' \
-e 's, at headers_dirs@,$(headers_dirs),g' \
$< > $@
Modified: dists/trunk/linux-2.6/debian/templates/header-install.in
===================================================================
--- dists/trunk/linux-2.6/debian/templates/header-install.in 2005-09-14 21:13:43 UTC (rev 4208)
+++ dists/trunk/linux-2.6/debian/templates/header-install.in 2005-09-14 21:15:37 UTC (rev 4209)
@@ -11,10 +11,6 @@
# archs do some *very* strange things...
rm -rf scripts
-# Let's add the flavours that are built for a given arch.
-# XXX: will probably need rethinking once the common headers are Arch: all.
-echo @flavours@ >flavours
-
# XXX: once we're using a linux-headers-$(version)-$(debnum) that's Arch: all,
# we'll want to drop this bit of code. The asm-* directories should remain.
Modified: dists/trunk/linux-2.6/debian/templates/post-install.in
===================================================================
--- dists/trunk/linux-2.6/debian/templates/post-install.in 2005-09-14 21:13:43 UTC (rev 4208)
+++ dists/trunk/linux-2.6/debian/templates/post-install.in 2005-09-14 21:15:37 UTC (rev 4209)
@@ -30,11 +30,8 @@
# prefix is then used to form a destination directory
# to link to. For cases with subarch we need to link
# to linux-headers-$(subarch)-$(version)-$(abiname),
-# not just linux-headers-$(version)-$(abiname). Note
-# that the append_subarch substitution must contain a
-# trailing dash, if it is non-empty.
+# not just linux-headers-$(version)-$(abiname).
#
-append='@append_subarch@'
prefix=$DEBIAN_VERSION-$DEBIAN_ABINAME
pkg=linux-headers-$prefix-$DEBIAN_FLAVOUR
top=$PWD/debian/$pkg
More information about the Kernel-svn-changes
mailing list