r4050 - in people/waldi/kernel/linux-nonfree-2.6/debian: . arch

[Bastian Blank]

Author: waldi
Date: 2005-08-24 17:52:47 +0000 (Wed, 24 Aug 2005)
New Revision: 4050

Added:
   people/waldi/kernel/linux-nonfree-2.6/debian/arch/kconfig
Modified:
   people/waldi/kernel/linux-nonfree-2.6/debian/rules.real
Log:
* debian/arch/kconfig: Add.
* debian/rules.real: Use kconfig and a .config file.


Added: people/waldi/kernel/linux-nonfree-2.6/debian/arch/kconfig
===================================================================
--- people/waldi/kernel/linux-nonfree-2.6/debian/arch/kconfig	2005-08-24 17:49:53 UTC (rev 4049)
+++ people/waldi/kernel/linux-nonfree-2.6/debian/arch/kconfig	2005-08-24 17:52:47 UTC (rev 4050)
@@ -0,0 +1,25 @@
+CONFIG_DGRS=m
+CONFIG_ACENIC=m
+# CONFIG_ACENIC_OMIT_TIGON_I is not set
+CONFIG_USB_SERIAL_KEYSPAN_PDA=m
+CONFIG_USB_SERIAL_KEYSPAN=m
+CONFIG_USB_SERIAL_KEYSPAN_MPR=y
+CONFIG_USB_SERIAL_KEYSPAN_USA28=y
+CONFIG_USB_SERIAL_KEYSPAN_USA28X=y
+CONFIG_USB_SERIAL_KEYSPAN_USA28XA=y
+CONFIG_USB_SERIAL_KEYSPAN_USA28XB=y
+CONFIG_USB_SERIAL_KEYSPAN_USA19=y
+CONFIG_USB_SERIAL_KEYSPAN_USA18X=y
+CONFIG_USB_SERIAL_KEYSPAN_USA19W=y
+CONFIG_USB_SERIAL_KEYSPAN_USA19QW=y
+CONFIG_USB_SERIAL_KEYSPAN_USA19QI=y
+CONFIG_USB_SERIAL_KEYSPAN_USA49W=y
+CONFIG_USB_SERIAL_KEYSPAN_USA49WLC=y
+CONFIG_SCSI_QLA21XX=m
+CONFIG_SCSI_QLA22XX=m
+CONFIG_SCSI_QLA2300=m
+CONFIG_SCSI_QLA2322=m
+CONFIG_SCSI_QLA6312=m
+CONFIG_SCSI_QLA24XX=m
+CONFIG_USB_EMI62=m
+CONFIG_USB_DABUSB=m

Modified: people/waldi/kernel/linux-nonfree-2.6/debian/rules.real
===================================================================
--- people/waldi/kernel/linux-nonfree-2.6/debian/rules.real	2005-08-24 17:49:53 UTC (rev 4049)
+++ people/waldi/kernel/linux-nonfree-2.6/debian/rules.real	2005-08-24 17:52:47 UTC (rev 4050)
@@ -7,7 +7,7 @@
   KPGK_SUBARCH := $(SUBARCH)-
 endif
 
--include $(basedir)/Makefile.inc
+HEADERS_DIR = /usr/src/linux-headers-$(KPGK_SUBARCH)$(UPSTREAM_VERSION)$(KPKG_ABINAME)-$(FLAVOUR)
 
 include debian/rules.defs
 
@@ -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); env -u MAKEFLAGS ARCH=$(KERNEL_ARCH) make DIR=/usr/src/linux-headers-$(KPGK_SUBARCH)$(UPSTREAM_VERSION)$(KPKG_ABINAME)-$(FLAVOUR)
+	cd $(DIR); env -u MAKEFLAGS ARCH=$(KERNEL_ARCH) $(MAKE) DIR=$(HEADERS_DIR) V=1
 	touch $@
 
 $(STAMPS_DIR)/setup-$(ARCH)-$(SUBARCH)-$(FLAVOUR): DIR=$(BUILD_DIR)/build-$(ARCH)-$(SUBARCH)-$(FLAVOUR)
@@ -28,6 +28,18 @@
 	rm -rf $(DIR)
 	mkdir -p $(DIR)
 	cp -al $(filter-out debian, $(wildcard *)) $(DIR)
+	cd $(HEADERS_DIR); \
+	for i in $$(find -follow -name "Kconfig*"); do \
+	  mkdir -p $(CURDIR)/$(DIR)/$$(dirname $$i); \
+	  ln -sf $(HEADERS_DIR)/$$i $(CURDIR)/$(DIR)/$$(dirname $$i); \
+	done
+	cat $(HEADERS_DIR)/.config debian/arch/kconfig > $(DIR)/.config
+	echo "source 'arch/$(KERNEL_ARCH)/Kconfig'" > $(DIR)/Kconfig.include
+	echo "source 'Kconfig'" >> $(DIR)/Kconfig.include
+	rm $(DIR)/Makefile
+	echo "include $(CURDIR)/$(DIR)/.config" > $(DIR)/Makefile
+	echo "include $(CURDIR)/Makefile" >> $(DIR)/Makefile
+	cd $(DIR); $(HEADERS_DIR)/scripts/kconfig/conf -s Kconfig.include
 	touch $@
 
 install-base: