[kernel] r5217 - people/waldi/linux-2.6/debian

[Bastian Blank]

Author: waldi
Date: Tue Jan  3 23:54:38 2006
New Revision: 5217

Modified:
   people/waldi/linux-2.6/debian/rules.real
Log:
debian/rules.real
- Append subarch to kernel version.
- Fix base of kconfig.ml call.


Modified: people/waldi/linux-2.6/debian/rules.real
==============================================================================
--- people/waldi/linux-2.6/debian/rules.real	(original)
+++ people/waldi/linux-2.6/debian/rules.real	Tue Jan  3 23:54:38 2006
@@ -17,8 +17,10 @@
 #
 ifeq ($(SUBARCH),none)
   basedir := debian/arch/$(ARCH)
+  append := $(FLAVOUR)
 else
   basedir := debian/arch/$(ARCH)/$(SUBARCH)
+  append := $(SUBARCH)-$(FLAVOUR)
 endif
 
 -include $(basedir)/Makefile.inc
@@ -36,7 +38,7 @@
 kpkg_header += --arch '$(ARCH)'
 kpkg_header += --stem linux
 kpkg_header += --config defconfig
-kpkg_image := make-kpkg --append-to-version '$(KPKG_ABINAME)-$(FLAVOUR)'
+kpkg_image := make-kpkg --append-to-version '$(KPKG_ABINAME)-$(append)'
 kpkg_image += --arch '$(ARCH)'
 kpkg_image += --stem linux
 kpkg_image += --initrd
@@ -88,7 +90,7 @@
 endif
 $(BUILD_DIR)/config.$(ARCH)-$(SUBARCH)-$(FLAVOUR): $(basedir)/config.$(FLAVOUR) $(config_common)
 	@echo "Generating configuration file $@:"
-	ocaml debian/bin/kconfig.ml -ba -b "$(basedir)" -a "$(ARCH)" -s "$(SUBARCH)" -f "$(FLAVOUR)" > '$@'
+	ocaml debian/bin/kconfig.ml -b "debian/arch" -a "$(ARCH)" -s "$(SUBARCH)" -f "$(FLAVOUR)" > '$@'
 
 $(BUILD_DIR)/linux-source-$(UPSTREAM_VERSION).tar.bz2: SOURCE_DIR=$(BUILD_DIR)/source
 $(BUILD_DIR)/linux-source-$(UPSTREAM_VERSION).tar.bz2: DIR = $(BUILD_DIR)/linux-source-$(UPSTREAM_VERSION)