r3753 - in people/waldi/kernel/source/linux-2.6/debian: . bin
Bastian Blank
waldi at costa.debian.org
Mon Aug 8 19:00:06 UTC 2005
Author: waldi
Date: 2005-08-08 19:00:05 +0000 (Mon, 08 Aug 2005)
New Revision: 3753
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:
* debian/Makefile
- Overwrite env.
- Split binary target.
* debian/bin/gencontrol.py: Update.
* debian/rules: Call correct targets.
Modified: people/waldi/kernel/source/linux-2.6/debian/Makefile
===================================================================
--- people/waldi/kernel/source/linux-2.6/debian/Makefile 2005-08-08 18:13:27 UTC (rev 3752)
+++ people/waldi/kernel/source/linux-2.6/debian/Makefile 2005-08-08 19:00:05 UTC (rev 3753)
@@ -75,10 +75,9 @@
ifdef headers_subarch
kpkg_headers_cmd += --subarch $(headers_subarch)
endif
+setup_env := env -i HOME=$(HOME) LOGNAME=$(LOGNAME) PATH=$(PATH)
ifdef build_makeflags
- export_makeflags := MAKEFLAGS=$(build_makeflags)
-else
- export_makeflags :=
+ setup_env += MAKEFLAGS=$(build_makeflags)
endif
kpkg_image_cmd := $(kpkg_build_cmd) --initrd kernel_image
kpkg_build_cmd += build
@@ -95,20 +94,22 @@
build: build-stamp-$(ARCH)-$(SUBARCH)-$(FLAVOUR)
-binary: install-headers-stamp-$(ARCH)-$(SUBARCH) install-stamp-$(ARCH)-$(SUBARCH)-$(FLAVOUR)
+binary-subarch: install-headers-stamp-$(ARCH)-$(SUBARCH)
+binary-flavour: install-stamp-$(ARCH)-$(SUBARCH)-$(FLAVOUR)
+
install-stamp-$(ARCH)-$(SUBARCH)-$(FLAVOUR): DIR=install-$(ARCH)-$(SUBARCH)-$(FLAVOUR)
install-stamp-$(ARCH)-$(SUBARCH)-$(FLAVOUR): build-stamp-$(ARCH)-$(SUBARCH)-$(FLAVOUR)
rm -rf $(DIR)
- cp -al build-$(ARCH)-$(SUBARCH)-$(FLAVOUR) $(DIR);
- cd $(DIR); $(export_makeflags) env -i $(kpkg_image_cmd)
+ cp -al build-$(ARCH)-$(SUBARCH)-$(FLAVOUR) $(DIR)
+ cd $(DIR); $(setup_env) $(kpkg_image_cmd)
cat $(DIR)/debian/files >> files
@for i in $$(awk '{ print $$1; }' $(DIR)/debian/files); do echo mv $$i ../..; mv $$i ../..; done
rm -rf $(DIR)
touch $@
install-headers-stamp-$(ARCH)-$(SUBARCH): $(kdir) header-install-$(SUBARCH)
- cd $(kdir); env -i PATH=$(PATH) $(kpkg_headers_cmd)
+ cd $(kdir); $(setup_env) $(kpkg_headers_cmd)
@for i in $$(awk '{ print $$1; }' $(DIR)/debian/files); do echo mv $$i ../..; mv $$i ../..; done
cat $(kdir)/debian/files >> files
touch $@
@@ -194,9 +195,10 @@
# by the headers-install script.
#
build-stamp-$(ARCH)-$(SUBARCH)-$(FLAVOUR): DIR=build-$(ARCH)-$(SUBARCH)-$(FLAVOUR)
-build-stamp-$(ARCH)-$(SUBARCH)-$(FLAVOUR): unpack-stamp-$(ARCH)-$(SUBARCH)-$(FLAVOUR) bin/touch.orig
+build-stamp-$(ARCH)-$(SUBARCH)-$(FLAVOUR): unpack-stamp-$(ARCH)-$(SUBARCH)-$(FLAVOUR)
+ ln -fs $$(command -v touch) bin/touch.orig
cd $(DIR); \
- env -i PATH=$(CURDIR)/bin:$(PATH) $(export_makeflags) \
+ $(setup_env) PATH=$(CURDIR)/bin:$(PATH) \
$(kpkg_build_cmd); \
$(if $(image_postproc),$(image_postproc),true); \
arch=$$(basename $$(readlink include/asm)); \
@@ -229,7 +231,4 @@
dh_md5sums $(PACKAGES_ARG)
dh_builddeb $(PACKAGES_ARG)
-bin/touch.orig:
- ln -fs $$(command -v touch) bin/touch.orig
-
.PHONY: build unpack binary-indep binary-arch binary
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 18:13:27 UTC (rev 3752)
+++ people/waldi/kernel/source/linux-2.6/debian/bin/gencontrol.py 2005-08-08 19:00:05 UTC (rev 3753)
@@ -350,7 +350,17 @@
for i in ('binary', 'build', 'unpack'):
makefile.append(("%s-%s:: %s-%s-%s" % (i, arch, i, arch, subarch_text), None))
+ makefile.append(("%s-%s-%s:: %s-%s-%s-real" % (i, arch, subarch_text, i, arch, subarch_text), None))
+ subarch_makeflags = "ARCH='%s' SUBARCH='%s' VERSION='%s' DEBNUM='-%s'" % (arch, subarch_text, version, subarch_vars['abiname'])
+ cmds_binary = []
+ cmds_binary.append(("$(MAKE) -C debian binary-subarch %s" % subarch_makeflags,))
+ cmds_build = []
+ cmds_unpack = []
+ makefile.append(("binary-%s-%s-real:" % (arch, subarch_text), cmds_binary))
+ makefile.append(("build-%s-%s-real:" % (arch, subarch_text), cmds_build))
+ makefile.append(("unpack-%s-%s-real:" % (arch, subarch_text), cmds_unpack))
+
flavour_list = arches[arch][subarch].keys()
flavour_list.sort()
for flavour in flavour_list:
@@ -374,14 +384,15 @@
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))
- cmd_args = "ARCH='%s' SUBARCH='%s' FLAVOUR='%s' VERSION='%s' DEBNUM='-%s'" % (arch, subarch_text, flavour, version, flavour_vars['abiname'])
+
+ flavour_makeflags = subarch_makeflags + " FLAVOUR='%s'" % flavour
cmds_binary = []
- cmds_binary.append(("$(MAKE) -C debian binary %s" % cmd_args,))
+ cmds_binary.append(("$(MAKE) -C debian binary-flavour %s" % flavour_makeflags,))
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_build.append(("$(MAKE) -C debian build %s" % cmd_args,))
+ cmds_build.append(("$(MAKE) -C debian build %s" % flavour_makeflags,))
cmds_unpack = []
- cmds_unpack.append(("$(MAKE) -C debian unpack %s" % cmd_args,))
+ cmds_unpack.append(("$(MAKE) -C debian unpack %s" % flavour_makeflags,))
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))
Modified: people/waldi/kernel/source/linux-2.6/debian/rules
===================================================================
--- people/waldi/kernel/source/linux-2.6/debian/rules 2005-08-08 18:13:27 UTC (rev 3752)
+++ people/waldi/kernel/source/linux-2.6/debian/rules 2005-08-08 19:00:05 UTC (rev 3753)
@@ -181,11 +181,8 @@
build: debian/control debian/build-stamp
debian/build-stamp: debian/unpack-stamp
dh_testdir
- cd debian; \
- for i in $(subarchs); do \
- $(MAKE) subarch=$${i} build; \
- done
- touch debian/build-stamp
+ $(MAKE) -f debian/rules.gen build-$(DEB_BUILD_ARCH)
+ touch $@
orig: ../orig/linux-$(major)-$(version)
rsync --delete --exclude debian --exclude .svn -av ../orig/linux-$(major)-$(version)/ .
@@ -212,10 +209,6 @@
binary-indep: source tree patch-debian doc
binary-arch: build
dh_testdir
- cd debian; \
- for i in $(subarchs); do \
- $(MAKE) subarch=$${i} binary; \
- done
$(MAKE) -f debian/rules.gen binary-$(DEB_BUILD_ARCH)
binary: binary-indep binary-arch
More information about the Kernel-svn-changes
mailing list