r3747 - in people/waldi/kernel/source/linux-2.6/debian: . bin
Bastian Blank
waldi at costa.debian.org
Mon Aug 8 16:22:29 UTC 2005
Author: waldi
Date: 2005-08-08 16:22:29 +0000 (Mon, 08 Aug 2005)
New Revision: 3747
Modified:
people/waldi/kernel/source/linux-2.6/debian/Makefile
people/waldi/kernel/source/linux-2.6/debian/bin/gencontrol.py
people/waldi/kernel/source/linux-2.6/debian/rules
Log:
Use generated rules for unpack, effectively remove second flavour resolver.
* debian/Makefile: Updates.
* debian/bin/gencontrol.py: Generate unpack rules.
* debian/rules: Use new rules.
Modified: people/waldi/kernel/source/linux-2.6/debian/Makefile
===================================================================
--- people/waldi/kernel/source/linux-2.6/debian/Makefile 2005-08-08 15:51:26 UTC (rev 3746)
+++ people/waldi/kernel/source/linux-2.6/debian/Makefile 2005-08-08 16:22:29 UTC (rev 3747)
@@ -32,18 +32,18 @@
#
# Build the list of common config files to be included
#
-ifeq ($(subarch),none)
- basedir := arch/$(karch)
+ifeq ($(SUBARCH),none)
+ basedir := arch/$(ARCH)
append :=
else
- basedir := arch/$(karch)/$(subarch)
- append := $(subarch)-
+ basedir := arch/$(ARCH)/$(SUBARCH)
+ append := $(SUBARCH)-
endif
configs := $(notdir $(wildcard $(basedir)/config.*))
configs := $(filter-out config, $(configs))
-tkdir := linux-source-$(version)
-kdir := linux-source-$(version)-$(subarch)
+tkdir := linux-source-$(VERSION)
+kdir := linux-source-$(VERSION)-$(SUBARCH)
ifndef flavours
flavours := $(patsubst config.%,%,$(configs))
endif
@@ -109,9 +109,9 @@
#
# Targets
#
-unpack: unpack-stamp-$(subarch)
-unpack-stamp-$(subarch): $(configs) header-install-$(subarch) $(bdirs)
- touch unpack-stamp-$(subarch)
+unpack: unpack-stamp-$(ARCH)-$(SUBARCH)-$(FLAVOUR)
+unpack-stamp-$(ARCH)-$(SUBARCH)-$(FLAVOUR): build-$(ARCH)-$(SUBARCH)-$(FLAVOUR)
+ touch $@
build: build-stamp-$(subarch)
build-stamp-$(subarch): unpack-stamp-$(subarch) $(bstamps)
@@ -155,11 +155,11 @@
else
extra_command := true
endif
-post-install-$(subarch): templates/post-install.in
+post-install-$(ARCH)-$(SUBARCH): templates/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),' \
- templates/post-install.in > post-install-$(subarch)
+ $< > $@
#
# Generates the kernel config file for a subarch by merging
# the arch-independent config file (arch/config),
@@ -169,7 +169,7 @@
# config file by setting include_common_config = no in the
# arch/$(karch)/Makefile.inc.
#
-config.%:
+config.$(ARCH)-$(SUBARCH)-$(FLAVOUR):
@echo "configs=$(configs)"
@echo "Generating configuration file $@:"
rm -f $@
@@ -179,19 +179,19 @@
fi; \
done
# Flavour config file must be present
- cat $(basedir)/$@ >> $@
+ cat $(basedir)/config.$(FLAVOUR) >> $@
-srcfiles := $(filter-out ../debian ../linux-source-$(version), $(shell echo ../*))
-patches := $(wildcard patches-arch/$(subarch).*)
-patches += $(wildcard patches-arch/$(subarch)_*)
-patches += $(wildcard patches-arch/$(karch).*)
-patches += $(wildcard patches-arch/$(karch)_*)
+srcfiles := $(filter-out ../debian ../linux-source-$(VERSION), $(shell echo ../*))
+patches := $(wildcard patches-arch/$(SUBARCH).*)
+patches += $(wildcard patches-arch/$(SUBARCH)_*)
+patches += $(wildcard patches-arch/$(ARCH).*)
+patches += $(wildcard patches-arch/$(ARCH)_*)
patches := $(strip $(patches))
# substitute() and friends is duplicated in debian/rules; this should
# be cleaned up in the long term. watch out for relative paths, as
# debian/rules runs in the top level directory, while debian/Makefile
# runs from the debian directory!
-$(kdir): post-install-$(subarch) $(wildcard templates/control.*.in)
+$(kdir): post-install-$(ARCH)-$(SUBARCH)
mkdir -p $(tkdir)
cp -al $(srcfiles) $(tkdir)
mkdir -p $(tkdir)/debian
@@ -203,7 +203,7 @@
cd $(tkdir); \
cat $(addprefix ../,$(patches)) | patch -p1; \
fi
- install post-install-$(subarch) $(tkdir)/debian/post-install
+ install $< $(tkdir)/debian/post-install
mv $(tkdir) $@
#
# This target performs a build for a particular flavour. Note
@@ -236,11 +236,11 @@
#
# Creates a build directory for a particular flavour
#
-build-$(subarch)-%: $(kdir) config.%
- if [ ! -d $@ ]; then \
- cp -al $(kdir) $@; \
- cp config.$* $@/.config; \
- fi
+build-$(ARCH)-$(SUBARCH)-$(FLAVOUR): config.$(ARCH)-$(SUBARCH)-$(FLAVOUR) $(kdir)
+ rm -rf $@-tmp
+ cp -al $(kdir) $@-tmp
+ cp $< $@-tmp/.config
+ mv $@-tmp $@
binary-dummy:
dh_testdir
Modified: people/waldi/kernel/source/linux-2.6/debian/bin/gencontrol.py
===================================================================
--- people/waldi/kernel/source/linux-2.6/debian/bin/gencontrol.py 2005-08-08 15:51:26 UTC (rev 3746)
+++ people/waldi/kernel/source/linux-2.6/debian/bin/gencontrol.py 2005-08-08 16:22:29 UTC (rev 3747)
@@ -284,6 +284,9 @@
vars = {}
vars = vars_changelog(vars, changelog)
+
+ version = vars['version']
+
vars.update(config().defaults())
arches = {}
@@ -345,7 +348,7 @@
subarch_text = 'none'
subarch_vars['subarch'] = ''
- for i in ('binary', 'build'):
+ for i in ('binary', 'build', 'unpack'):
makefile.append(("%s-%s:: %s-%s-%s" % (i, arch, i, arch, subarch_text), None))
flavour_list = arches[arch][subarch].keys()
@@ -368,15 +371,17 @@
packages.append(process_real_package(headers[0], flavour_vars))
packages.extend(dummy_packages)
- for i in ('binary', 'build'):
+ for i in ('binary', 'build', 'unpack'):
makefile.append(("%s-%s-%s:: %s-%s-%s-%s" % (i, arch, subarch_text, i, arch, subarch_text, flavour), None))
makefile.append(("%s-%s-%s-%s:: %s-%s-%s-%s-real" % (i, arch, subarch_text, flavour, i, arch, subarch_text, flavour), None))
cmds_binary = []
cmds_binary.append(("$(MAKE) -f debian/Makefile binary-dummy PACKAGES_ARG='%s'" % ' '.join(["-p%s" % i['Package'] for i in dummy_packages]),))
cmds_build = []
cmds_unpack = []
+ cmds_unpack.append(("$(MAKE) -C debian unpack ARCH='%s' SUBARCH='%s' FLAVOUR='%s' VERSION='%s'" % (arch, subarch_text, flavour, version),))
makefile.append(("binary-%s-%s-%s-real:" % (arch, subarch_text, flavour), cmds_binary))
makefile.append(("build-%s-%s-%s-real:" % (arch, subarch_text, flavour), cmds_build))
+ makefile.append(("unpack-%s-%s-%s-real:" % (arch, subarch_text, flavour), cmds_unpack))
extra = read_template("extra")
packages.extend(extra)
Modified: people/waldi/kernel/source/linux-2.6/debian/rules
===================================================================
--- people/waldi/kernel/source/linux-2.6/debian/rules 2005-08-08 15:51:26 UTC (rev 3746)
+++ people/waldi/kernel/source/linux-2.6/debian/rules 2005-08-08 16:22:29 UTC (rev 3747)
@@ -175,12 +175,9 @@
unpack: debian/unpack-stamp
debian/unpack-stamp: debian/patch-stamp
dh_testdir
- cd debian; \
- for i in $(subarchs); do \
- $(MAKE) subarch=$${i} unpack; \
- done
- ln -s $$(command -v touch) debian/bin/touch.orig
- touch debian/unpack-stamp
+ $(MAKE) -f debian/rules.gen unpack-$(DEB_BUILD_ARCH)
+ ln -fs $$(command -v touch) debian/bin/touch.orig
+ touch $@
build: debian/control debian/build-stamp
debian/build-stamp: debian/unpack-stamp
More information about the Kernel-svn-changes
mailing list