r2909 - trunk/kernel/source/kernel-source-nonfree-2.6.11-2.6.11/debian

[Andres Salomon]

Author: dilinger
Date: 2005-04-04 04:06:19 +0000 (Mon, 04 Apr 2005)
New Revision: 2909

Modified:
   trunk/kernel/source/kernel-source-nonfree-2.6.11-2.6.11/debian/rules
Log:
build module-image debs in $(CURDIR), and manually distaddfiles


Modified: trunk/kernel/source/kernel-source-nonfree-2.6.11-2.6.11/debian/rules
===================================================================
--- trunk/kernel/source/kernel-source-nonfree-2.6.11-2.6.11/debian/rules	2005-04-04 03:53:09 UTC (rev 2908)
+++ trunk/kernel/source/kernel-source-nonfree-2.6.11-2.6.11/debian/rules	2005-04-04 04:06:19 UTC (rev 2909)
@@ -14,12 +14,17 @@
 
 clean::
 	rm -rf $(CURDIR)/modules
+	rm -f $(CURDIR)/*.deb
 
 $(patsubst %,build/%,$(DEB_ARCH_PACKAGES)):: mod-src-dir
 	cd modules/kernel-nonfree-$(upstream) && \
 		fakeroot debian/rules binary-modules \
-		KSRC=/usr/src/$(patsubst build/kernel-nonfree-$(upstream)-modules-%,kernel-headers-%,$@) DEB_DESTDIR=.. 
+		KSRC=/usr/src/$(patsubst build/kernel-nonfree-$(upstream)-modules-%,kernel-headers-%,$@) DEB_DESTDIR=$(CURDIR)
 
+$(patsubst %,binary/%,$(DEB_ARCH_PACKAGES))::
+	dpkg-distaddfile $(wildcard $(patsubst binary/%,%,$@)_*.deb) non-free/devel optional
+	mv $(wildcard $(patsubst binary/%,%,$@)_*.deb) ..
+
 install/kernel-nonfree-$(upstream)-source:: mod-src-dir
 	mkdir -p debian/kernel-nonfree-$(upstream)-source/usr/src
 	tar jcf debian/kernel-nonfree-$(upstream)-source/usr/src/kernel-nonfree-$(upstream)-source.tar.bz2 modules