r4621 - in dists/trunk/linux-nonfree-2.6/debian: . bin templates

[Bastian Blank]

Author: waldi
Date: 2005-10-23 21:04:57 +0000 (Sun, 23 Oct 2005)
New Revision: 4621

Added:
   dists/trunk/linux-nonfree-2.6/debian/templates/control.main.in
Modified:
   dists/trunk/linux-nonfree-2.6/debian/bin/gencontrol.py
   dists/trunk/linux-nonfree-2.6/debian/rules.real
Log:
* debian/bin/gencontrol.py: Insert main template.
* debian/rules.real: Build linux-nonfree-source package.
* debian/templates/control.main.in: Add linux-nonfree-source package.


Modified: dists/trunk/linux-nonfree-2.6/debian/bin/gencontrol.py
===================================================================
--- dists/trunk/linux-nonfree-2.6/debian/bin/gencontrol.py	2005-10-23 20:00:49 UTC (rev 4620)
+++ dists/trunk/linux-nonfree-2.6/debian/bin/gencontrol.py	2005-10-23 21:04:57 UTC (rev 4621)
@@ -252,6 +252,9 @@
     source = read_template("source")
     packages['source'] = process_package(source[0], vars)
 
+    main = read_template("main")
+    packages.extend(process_packages(main, vars))
+
     makeflags = {
         'VERSION': version['version'],
         'SOURCE_VERSION': version['source'],

Modified: dists/trunk/linux-nonfree-2.6/debian/rules.real
===================================================================
--- dists/trunk/linux-nonfree-2.6/debian/rules.real	2005-10-23 20:00:49 UTC (rev 4620)
+++ dists/trunk/linux-nonfree-2.6/debian/rules.real	2005-10-23 21:04:57 UTC (rev 4621)
@@ -16,18 +16,37 @@
 #
 binary-arch-flavour: install-modules-$(ARCH)-$(SUBARCH)-$(FLAVOUR)
 
+binary-indep: install-source
+
 build: $(STAMPS_DIR)/build-$(ARCH)-$(SUBARCH)-$(FLAVOUR)
 
+$(BUILD_DIR)/linux-nonfree-source-$(UPSTREAM_VERSION).tar.bz2: SOURCE_DIR=$(BUILD_DIR)/source
+$(BUILD_DIR)/linux-nonfree-source-$(UPSTREAM_VERSION).tar.bz2: DIR = $(BUILD_DIR)/linux-nonfree-source-$(UPSTREAM_VERSION)
+$(BUILD_DIR)/linux-nonfree-source-$(UPSTREAM_VERSION).tar.bz2: $(STAMPS_DIR)/source
+	rm -rf '$@' '$(DIR)'
+	cp -al '$(SOURCE_DIR)' '$(DIR)'
+	chmod -R u+rw,go=rX '$(DIR)'
+	cd '$(BUILD_DIR)'; tar -cjf 'linux-nonfree-source-$(UPSTREAM_VERSION).tar.bz2' 'linux-nonfree-source-$(UPSTREAM_VERSION)'
+	rm -rf '$(DIR)'
+
+srcfiles := $(filter-out debian, $(wildcard *))
+$(STAMPS_DIR)/source: DIR=$(BUILD_DIR)/source
+$(STAMPS_DIR)/source:
+	rm -rf '$(DIR)'
+	mkdir -p '$(DIR)'
+	cp -a $(srcfiles) '$(DIR)'
+	touch '$@'
+
 $(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=$(HEADERS_DIR) V=1
+	cd $(DIR); env -u MAKEFLAGS ARCH=$(KERNEL_ARCH) $(MAKE) DIR=$(HEADERS_DIR)
 	touch $@
 
+$(STAMPS_DIR)/setup-$(ARCH)-$(SUBARCH)-$(FLAVOUR): SOURCE_DIR=$(BUILD_DIR)/source
 $(STAMPS_DIR)/setup-$(ARCH)-$(SUBARCH)-$(FLAVOUR): DIR=$(BUILD_DIR)/build-$(ARCH)-$(SUBARCH)-$(FLAVOUR)
-$(STAMPS_DIR)/setup-$(ARCH)-$(SUBARCH)-$(FLAVOUR):
+$(STAMPS_DIR)/setup-$(ARCH)-$(SUBARCH)-$(FLAVOUR): $(STAMPS_DIR)/source
 	rm -rf $(DIR)
-	mkdir -p $(DIR)
-	cp -al $(filter-out debian, $(wildcard *)) $(DIR)
+	cp -al '$(SOURCE_DIR)' '$(DIR)'
 	cd $(HEADERS_DIR); \
 	for i in $$(find -follow -name "Kconfig*"); do \
 	  mkdir -p $(CURDIR)/$(DIR)/$$(dirname $$i); \
@@ -36,7 +55,6 @@
 	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
@@ -62,4 +80,12 @@
 	dh_installchangelogs $(DH_OPTIONS)
 	$(MAKE) -f debian/rules.real install-base DH_OPTIONS=$(DH_OPTIONS)
 
+install-source: DH_OPTIONS = -plinux-nonfree-source-$(VERSION)
+install-source: $(BUILD_DIR)/linux-nonfree-source-$(UPSTREAM_VERSION).tar.bz2
+	dh_testdir
+	dh_testroot
+	dh_install $(DH_OPTIONS) '$<' /usr/src
+	dh_installdocs $(DH_OPTIONS)
+	dh_installchangelogs $(DH_OPTIONS)
+	$(MAKE) -f debian/rules.real install-base DH_OPTIONS='$(DH_OPTIONS)'
 

Added: dists/trunk/linux-nonfree-2.6/debian/templates/control.main.in
===================================================================
--- dists/trunk/linux-nonfree-2.6/debian/templates/control.main.in	2005-10-23 20:00:49 UTC (rev 4620)
+++ dists/trunk/linux-nonfree-2.6/debian/templates/control.main.in	2005-10-23 21:04:57 UTC (rev 4621)
@@ -0,0 +1,10 @@
+Package: linux-nonfree-source- at version@
+Architecture: all
+Section: non-free/devel
+Priority: optional
+Depends: bzip2
+Recommends: gcc, make
+Description: Linux non-free source for version @version@
+ This package provides source code for the non-free parts of the Linux
+ kernel version @version at .  This source closely tracks official Linux
+ kernel releases.