r3817 - in people/waldi/kernel/source/linux-2.6/debian: . bin

[Bastian Blank]

Author: waldi
Date: 2005-08-10 12:22:26 +0000 (Wed, 10 Aug 2005)
New Revision: 3817

Modified:
   people/waldi/kernel/source/linux-2.6/debian/bin/gencontrol.py
   people/waldi/kernel/source/linux-2.6/debian/rules.real
Log:
debian/bin/gencontrol.py, debian/rules.real: Small fixes.


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-10 12:06:13 UTC (rev 3816)
+++ people/waldi/kernel/source/linux-2.6/debian/bin/gencontrol.py	2005-08-10 12:22:26 UTC (rev 3817)
@@ -324,6 +324,18 @@
         arch_vars['arch'] = arch
         arch_vars.update(config_arch(arch).defaults())
 
+        for i in ('binary', 'build', 'setup'):
+            makefile.append(("%s-%s:: %s-%s-real" % (i, arch, i, arch), None))
+
+        arch_makeflags = "VERSION='%s' SOURCE_VERSION='%s' ARCH='%s'" % (version, source_version, arch)
+        cmds_binary = []
+        cmds_build = []
+        cmds_setup = []
+        cmds_setup.append(("$(MAKE) -f debian/rules.real setup-arch %s" % arch_makeflags,))
+        makefile.append(("binary-%s-real:" % arch, cmds_binary))
+        makefile.append(("build-%s-real:" % arch, cmds_build))
+        makefile.append(("setup-%s-real:" % arch, cmds_setup))
+
         subarch_list = arches[arch].keys()
         subarch_list.sort()
         for subarch in subarch_list:
@@ -342,7 +354,7 @@
                 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'])
+            subarch_makeflags = arch_makeflags + " SUBARCH='%s' ABINAME='-%s'" % (subarch_text, subarch_vars['abiname'])
             cmds_binary = []
             cmds_binary.append(("$(MAKE) -f debian/rules.real binary-subarch %s" % subarch_makeflags,))
             cmds_build = []

Modified: people/waldi/kernel/source/linux-2.6/debian/rules.real
===================================================================
--- people/waldi/kernel/source/linux-2.6/debian/rules.real	2005-08-10 12:06:13 UTC (rev 3816)
+++ people/waldi/kernel/source/linux-2.6/debian/rules.real	2005-08-10 12:22:26 UTC (rev 3817)
@@ -54,10 +54,10 @@
 # replaced by the flavour for which the command is run. 
 #
 kpkg_headers := HEADER_CLEAN_HOOK='$(CURDIR)/$(BUILD_DIR)/header-install-$(ARCH)-$(SUBARCH)'
-kpkg_headers += make-kpkg --append-to-version $(append)$(DEBNUM)
+kpkg_headers += make-kpkg --append-to-version $(append)$(ABINAME)
 kpkg_headers += --stem linux
 kpkg_headers += --config defconfig
-kpkg_image := make-kpkg --append-to-version $(DEBNUM)-$(FLAVOUR)
+kpkg_image := make-kpkg --append-to-version $(ABINAME)-$(FLAVOUR)
 kpkg_image += --stem linux
 kpkg_image += --initrd
 ifdef build_subarch
@@ -73,7 +73,7 @@
 ifndef headers_dirs
   headers_dirs = $(karch)
 endif
-ccommon = debian/arch/config debian/arch/$(karch)/config debian/arch/$(karch)/$(subarch)/config
+ccommon = debian/arch/config debian/arch/$(ARCH)/config debian/arch/$(ARCH)/$(SUBARCH)/config
 
 #
 # Targets
@@ -83,6 +83,7 @@
 
 build: $(STAMPS_DIR)/build-$(ARCH)-$(SUBARCH)-$(FLAVOUR)
 
+setup-arch: $(STAMPS_DIR)/source
 setup-subarch: $(STAMPS_DIR)/source-$(ARCH)-$(SUBARCH)
 setup-flavour: $(STAMPS_DIR)/setup-$(ARCH)-$(SUBARCH)-$(FLAVOUR)
 
@@ -135,7 +136,7 @@
 # config file by setting include_common_config = no in the
 # arch/$(karch)/Makefile.inc.
 #
-$(BUILD_DIR)/config.$(ARCH)-$(SUBARCH)-$(FLAVOUR):
+$(BUILD_DIR)/config.$(ARCH)-$(SUBARCH)-$(FLAVOUR): $(ccommon) $(basedir)/config.$(FLAVOUR)
 	@echo "configs=$(configs)"
 	@echo "Generating configuration file $@:"
 	rm -f $@
@@ -153,7 +154,7 @@
 	rm -rf $(DIR)
 	mkdir -p $(DIR)
 	cp -al $(srcfiles) $(DIR)
-	cd $(DIR); override_version=$(VERSION)$(DEBNUM) home=$(CURDIR)/debian/patches-debian $(CURDIR)/debian/bin/apply
+	cd $(DIR); override_version=$(SOURCE_VERSION) home=$(CURDIR)/debian/patches-debian $(CURDIR)/debian/bin/apply
 	#make-kpkg does this when building kernel-source.
 	mv $(DIR)/scripts/package/Makefile $(DIR)/scripts/package/Makefile.dist
 	mv $(DIR)/scripts/package/builddeb $(DIR)/scripts/package/builddeb.dist