[Modconf-commits] r168 - in trunk/modconf: . debian

[Frank Lichtenheld]

Author: djpig
Date: 2005-04-30 20:41:37 +0000 (Sat, 30 Apr 2005)
New Revision: 168

Modified:
   trunk/modconf/Makefile
   trunk/modconf/debian/changelog
   trunk/modconf/debian/control
   trunk/modconf/debian/mkkerneldesc.pl
   trunk/modconf/debian/rules
Log:
* Finally make the package auto-buildable after some prodding
  by means of RCness ;) (Closes: #235068)
* Some small clean-ups in debian/rules


Modified: trunk/modconf/Makefile
===================================================================
--- trunk/modconf/Makefile	2004-11-13 20:20:15 UTC (rev 167)
+++ trunk/modconf/Makefile	2005-04-30 20:41:37 UTC (rev 168)
@@ -21,6 +21,8 @@
 
 MANPAGES = modconf.8 modconf.8.pl modconf.8.fr modconf.8.es
 
+KERNELTREE=/usr/src/linux
+
 all:	descr.gz $(EVALTARGETS) #eval.gz
 
 install: all
@@ -65,8 +67,8 @@
 	( cat build/kerneldsc ; debian/mkpcmciadesc.pl build/pcmcia-src) | sort | uniq > $@
 
 build/kerneldsc:
-	debian/mkkerneldesc.pl > build/kerneldsc
-	
+	debian/mkkerneldesc.pl "$(KERNELTREE)" > build/kerneldsc
+
 build/pcmcia-src:
 	mkdir -p build/pcmcia-src || true
 	zcat /usr/src/pcmcia-cs.tar.gz | tar -x -C build/pcmcia-src

Modified: trunk/modconf/debian/changelog
===================================================================
--- trunk/modconf/debian/changelog	2004-11-13 20:20:15 UTC (rev 167)
+++ trunk/modconf/debian/changelog	2005-04-30 20:41:37 UTC (rev 168)
@@ -1,7 +1,9 @@
 modconf (0.2.48) unstable; urgency=low
 
   * Fix some XSI:sms in the scripts
-  *
+  * Finally make the package auto-buildable after some prodding
+    by means of RCness ;) (Closes: #235068)
+  * Some small clean-ups in debian/rules
 
  -- Frank Lichtenheld <djpig@debian.org>  Sat, 13 Nov 2004 20:33:30 +0100
 

Modified: trunk/modconf/debian/control
===================================================================
--- trunk/modconf/debian/control	2004-11-13 20:20:15 UTC (rev 167)
+++ trunk/modconf/debian/control	2005-04-30 20:41:37 UTC (rev 168)
@@ -2,7 +2,7 @@
 Section: base
 Priority: optional
 Maintainer: Frank Lichtenheld <djpig@debian.org>
-Build-Depends: pcmcia-source, kernel-source
+Build-Depends: pcmcia-source, kernel-tree-2.4.27
 Standards-Version: 3.6.1
 
 Package: modconf

Modified: trunk/modconf/debian/mkkerneldesc.pl
===================================================================
--- trunk/modconf/debian/mkkerneldesc.pl	2004-11-13 20:20:15 UTC (rev 167)
+++ trunk/modconf/debian/mkkerneldesc.pl	2005-04-30 20:41:37 UTC (rev 168)
@@ -9,19 +9,10 @@
 # Enable/Disable debugging here
 my $opt_d = 0;
 
-my $linux = '';
-my @linux = glob ("/usr/src/kernel-source-*/");
-@linux = ("/usr/src/kernel-source/", "/usr/src/linux/", @linux);
-my $dir;
-foreach $dir (@linux) {
-  if (-f "${dir}Makefile") {
-    $linux = $dir;
-    last;
-  }
-}
-my @sources = glob ("/usr/src/kernel-source-*tar.{bz2,gz}");
-warn "E: You need to install a kernel-source package and unpack the tar it provides!\n" if ( $linux eq '' && scalar(@sources) > 0 ) ;
-die "Cannot find kernel source" if ($linux eq '');
+my $linux = $ARGV[0];
+
+die "No kernel source given" unless $linux;
+die "No Makefile in kernel source found" unless -f "$linux/Makefile";
 warn "I: Will parse kernel Makefiles under \"$linux\".\n";
 if(open(fh, "<$linux/Makefile") && grep(/PATCHLEVEL.*=.*6/, <fh>)) {
    warn "I: Using Kernel 2.6 extraction method.\n";

Modified: trunk/modconf/debian/rules
===================================================================
--- trunk/modconf/debian/rules	2004-11-13 20:20:15 UTC (rev 167)
+++ trunk/modconf/debian/rules	2005-04-30 20:41:37 UTC (rev 168)
@@ -11,15 +11,25 @@
 
 package=modconf
 
+# copied from kernel-image-i386
+version :=  $(shell \
+        sed -n 's/.*kernel-tree-\([^,]*\).*/\1/p; t e; b; :e q' \
+                debian/control \
+)
+
 build: build-stamp
 build-stamp:
 	$(checkdir)
-	make
+	[ -d build ] || mkdir build
+	cd build && tar xjf /usr/src/kernel-source-$(version).tar.bz2
+	cd build/kernel-source-$(version) && \
+		/usr/src/kernel-patches/all/$(version)/apply/debian $(version)
+	$(MAKE) KERNELTREE=$(CURDIR)/build/kernel-source-$(version)
 	touch build-stamp
 
 clean:
 	$(checkdir)
-	-make clean
+	-$(MAKE) clean
 	-rm -f `find . -name "*~"`
 	-rm -rf debian/tmp debian/files* core
 	-rm -f build-stamp
@@ -27,7 +37,7 @@
 binary-indep:	checkroot build
 	$(checkdir)
 	-rm -rf debian/tmp
-	make install DESTDIR=`pwd`/debian/tmp
+	$(MAKE) install DESTDIR=`pwd`/debian/tmp
 	install -d debian/tmp/usr/share/doc/$(package)
 	install -c -m 644 debian/copyright debian/tmp/usr/share/doc/$(package)/
 	install -c -m 644 debian/changelog debian/tmp/usr/share/doc/$(package)/