r4044 - in people/waldi/kernel/linux-nonfree-2.6/debian: . bin

[Bastian Blank]

Author: waldi
Date: 2005-08-23 22:50:32 +0000 (Tue, 23 Aug 2005)
New Revision: 4044

Modified:
   people/waldi/kernel/linux-nonfree-2.6/debian/bin/gencontrol.py
   people/waldi/kernel/linux-nonfree-2.6/debian/rules.real
Log:
* debian/bin/gencontrol.py: Support kernel arch spec.
* debian/rules.real: Update.


Modified: people/waldi/kernel/linux-nonfree-2.6/debian/bin/gencontrol.py
===================================================================
--- people/waldi/kernel/linux-nonfree-2.6/debian/bin/gencontrol.py	2005-08-23 21:56:15 UTC (rev 4043)
+++ people/waldi/kernel/linux-nonfree-2.6/debian/bin/gencontrol.py	2005-08-23 22:50:32 UTC (rev 4044)
@@ -237,8 +237,8 @@
         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']
+    if config_entry.has_key('kernel-arch'):
+        makeflags['KERNEL_ARCH'] = config_entry['kernel-arch']
     makeflags_string = ' '.join(["%s='%s'" % i for i in makeflags.iteritems()])
 
     cmds_binary_arch = []
@@ -257,7 +257,6 @@
         'SOURCE_VERSION': version['source'],
         'UPSTREAM_VERSION': version['upstream'],
         'ABINAME': abiname,
-        'KPKG_ABINAME': kpkg_abiname,
     }
     makeflags_string = ' '.join(["%s='%s'" % i for i in makeflags.iteritems()])
 
@@ -282,8 +281,8 @@
         makefile.append(("%s-%s-%s::" % (i, arch, subarch), None))
 
     makeflags['SUBARCH'] = subarch
-    if config_entry.has_key('kpkg-subarch'):
-        makeflags['KPKG_SUBARCH'] = config_entry['kpkg-subarch']
+    if config_entry.has_key('kernel-arch'):
+        makeflags['KERNEL_ARCH'] = config_entry['kernel-arch']
 
     for flavour in config_entry['flavours']:
         process_real_flavour(packages, makefile, config, arch, subarch, flavour, vars.copy(), makeflags.copy())

Modified: people/waldi/kernel/linux-nonfree-2.6/debian/rules.real
===================================================================
--- people/waldi/kernel/linux-nonfree-2.6/debian/rules.real	2005-08-23 21:56:15 UTC (rev 4043)
+++ people/waldi/kernel/linux-nonfree-2.6/debian/rules.real	2005-08-23 22:50:32 UTC (rev 4044)
@@ -20,7 +20,7 @@
 
 $(STAMPS_DIR)/build-$(ARCH)-$(SUBARCH)-$(FLAVOUR): DIR=$(BUILD_DIR)/build-$(ARCH)-$(SUBARCH)-$(FLAVOUR)
 $(STAMPS_DIR)/build-$(ARCH)-$(SUBARCH)-$(FLAVOUR): $(STAMPS_DIR)/setup-$(ARCH)-$(SUBARCH)-$(FLAVOUR)
-	cd $(DIR); make DIR=/usr/src/linux-headers-$(KPGK_SUBARCH)$(UPSTREAM_VERSION)$(KPKG_ABINAME)-$(FLAVOUR)
+	cd $(DIR); env -u MAKEFLAGS ARCH=$(KERNEL_ARCH) make DIR=/usr/src/linux-headers-$(KPGK_SUBARCH)$(UPSTREAM_VERSION)$(KPKG_ABINAME)-$(FLAVOUR)
 	touch $@
 
 $(STAMPS_DIR)/setup-$(ARCH)-$(SUBARCH)-$(FLAVOUR): DIR=$(BUILD_DIR)/build-$(ARCH)-$(SUBARCH)-$(FLAVOUR)
@@ -30,3 +30,24 @@
 	cp -al $(filter-out debian, $(wildcard *)) $(DIR)
 	touch $@
 
+install-base:
+	dh_compress
+	dh_fixperms
+	dh_installdeb
+	dh_gencontrol -- $(GENCONTROL_ARGS)
+	dh_md5sums
+	dh_builddeb
+
+install-modules-$(ARCH)-$(SUBARCH)-$(FLAVOUR): DIR = $(BUILD_DIR)/build-$(ARCH)-$(SUBARCH)-$(FLAVOUR)
+install-modules-$(ARCH)-$(SUBARCH)-$(FLAVOUR): DEST_DIR = $(CURDIR)/debian/linux-modules-nonfree-$(KPKG_SUBARCH)$(VERSION)-$(ABINAME)-$(FLAVOUR)/lib/modules/$(UPSTREAM_VERSION)$(KPKG_ABINAME)-$(FLAVOUR)
+install-modules-$(ARCH)-$(SUBARCH)-$(FLAVOUR): DH_OPTIONS = -plinux-modules-nonfree-$(KPKG_SUBARCH)$(VERSION)-$(ABINAME)-$(FLAVOUR)
+install-modules-$(ARCH)-$(SUBARCH)-$(FLAVOUR):
+	dh_testdir
+	dh_testroot
+	dh_installdirs $(DH_OPTIONS) 
+	cd $(DIR); env -u MAKEFLAGS ARCH=$(KERNEL_ARCH) make install DIR=/usr/src/linux-headers-$(KPGK_SUBARCH)$(UPSTREAM_VERSION)$(KPKG_ABINAME)-$(FLAVOUR) MODLIB=$(DEST_DIR) INSTALL_MOD_DIR=nonfree
+	dh_installdocs $(DH_OPTIONS)
+	dh_installchangelogs $(DH_OPTIONS)
+	$(MAKE) -f debian/rules.real install-base DH_OPTIONS=$(DH_OPTIONS)
+
+