r2753 - trunk/kernel/source/kernel-source-nonfree-2.6.11-2.6.11/debian
Andres Salomon
dilinger-guest@costa.debian.org
Mon, 21 Mar 2005 08:48:11 +0100
Author: dilinger-guest
Date: 2005-03-21 08:48:10 +0100 (Mon, 21 Mar 2005)
New Revision: 2753
Removed:
trunk/kernel/source/kernel-source-nonfree-2.6.11-2.6.11/debian/kernel-source-nonfree-2.6.11.dirs
Modified:
trunk/kernel/source/kernel-source-nonfree-2.6.11-2.6.11/debian/control
trunk/kernel/source/kernel-source-nonfree-2.6.11-2.6.11/debian/rules
Log:
make the headers actually compile.. 'n stuff
Modified: trunk/kernel/source/kernel-source-nonfree-2.6.11-2.6.11/debian/control
===================================================================
--- trunk/kernel/source/kernel-source-nonfree-2.6.11-2.6.11/debian/control 2005-03-20 18:32:12 UTC (rev 2752)
+++ trunk/kernel/source/kernel-source-nonfree-2.6.11-2.6.11/debian/control 2005-03-21 07:48:10 UTC (rev 2753)
@@ -4,7 +4,7 @@
Maintainer: Debian kernel team <debian-kernel@lists.debian.org>
Uploaders: Andres Salomon <dilinger@debian.org>
Standards-Version: 3.6.1
-Build-Depends-Indep: bzip2, cdbs, debhelper (>> 4.1.0)
+Build-Depends-Indep: bzip2, cdbs, debhelper (>> 4.1.0), fakeroot, module-assistant, kernel-build-2.6.11-1
Package: kernel-source-nonfree-2.6.11
Architecture: all
@@ -16,23 +16,53 @@
the modules contained within this package include tg3, keyspan, and
the various qla2xxx modules.
-Package: kernel-modules-nonfree-2.6.11-1-386
+Package: kernel-nonfree-modules-2.6.11-1-386
Architecture: i386
-Description: Linux kernel modules from 2.6.11, containing non-free bits
+Description: Linux kernel driver non-free modules from 2.6.11
+ This package provides Linux kernel modules from 2.6.11 that are
+ considered non-free by Debian. Some of the modules contained
+ within this package include tg3, keyspan, and the various
+ qla2xxx modules.
+ .
+ This package contains the compiled kernel modules for 2.6.11-1-386.
-Package: kernel-modules-nonfree-2.6.11-1-686
+Package: kernel-nonfree-modules-2.6.11-1-686
Architecture: i386
-Description: Linux kernel modules from 2.6.11, containing non-free bits
+Description: Linux kernel driver non-free modules from 2.6.11
+ This package provides Linux kernel modules from 2.6.11 that are
+ considered non-free by Debian. Some of the modules contained
+ within this package include tg3, keyspan, and the various
+ qla2xxx modules.
+ .
+ This package contains the compiled kernel modules for 2.6.11-1-686.
-Package: kernel-modules-nonfree-2.6.11-1-686-smp
+Package: kernel-nonfree-modules-2.6.11-1-686-smp
Architecture: i386
-Description: Linux kernel modules from 2.6.11, containing non-free bits
+Description: Linux kernel driver non-free modules from 2.6.11
+ This package provides Linux kernel modules from 2.6.11 that are
+ considered non-free by Debian. Some of the modules contained
+ within this package include tg3, keyspan, and the various
+ qla2xxx modules.
+ .
+ This package contains the compiled kernel modules for 2.6.11-1-686-smp.
-Package: kernel-modules-nonfree-2.6.11-1-k7
+Package: kernel-nonfree-modules-2.6.11-1-k7
Architecture: i386
-Description: Linux kernel modules from 2.6.11, containing non-free bits
+Description: Linux kernel driver non-free modules from 2.6.11
+ This package provides Linux kernel modules from 2.6.11 that are
+ considered non-free by Debian. Some of the modules contained
+ within this package include tg3, keyspan, and the various
+ qla2xxx modules.
+ .
+ This package contains the compiled kernel modules for 2.6.11-1-k7.
-Package: kernel-modules-nonfree-2.6.11-1-k7-smp
+Package: kernel-nonfree-modules-2.6.11-1-k7-smp
Architecture: i386
-Description: Linux kernel modules from 2.6.11, containing non-free bits
+Description: Linux kernel driver non-free modules from 2.6.11
+ This package provides Linux kernel modules from 2.6.11 that are
+ considered non-free by Debian. Some of the modules contained
+ within this package include tg3, keyspan, and the various
+ qla2xxx modules.
+ .
+ This package contains the compiled kernel modules for 2.6.11-1-k7-smp.
Deleted: trunk/kernel/source/kernel-source-nonfree-2.6.11-2.6.11/debian/kernel-source-nonfree-2.6.11.dirs
===================================================================
--- trunk/kernel/source/kernel-source-nonfree-2.6.11-2.6.11/debian/kernel-source-nonfree-2.6.11.dirs 2005-03-20 18:32:12 UTC (rev 2752)
+++ trunk/kernel/source/kernel-source-nonfree-2.6.11-2.6.11/debian/kernel-source-nonfree-2.6.11.dirs 2005-03-21 07:48:10 UTC (rev 2753)
@@ -1 +0,0 @@
-/usr/src
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-03-20 18:32:12 UTC (rev 2752)
+++ trunk/kernel/source/kernel-source-nonfree-2.6.11-2.6.11/debian/rules 2005-03-21 07:48:10 UTC (rev 2753)
@@ -2,15 +2,23 @@
include /usr/share/cdbs/1/rules/debhelper.mk
include /usr/share/cdbs/1/rules/simple-patchsys.mk
-include /usr/share/cdbs/1/class/makefile.mk
-DEB_MAKE_INVOKE = /bin/true
-
upstream := $(shell dpkg-parsechangelog | sed -n 's/^Version: \?\([0-9\.]\+\)-[0-9]\+$$/\1/p')
-install/kernel-source-nonfree-$(upstream)::
+mod-src-dir:
mkdir -p modules/kernel-source-nonfree-$(upstream)/debian
cp -ra [^m][^o]* modules/kernel-source-nonfree-$(upstream)
install -m755 debian/rules.modules modules/kernel-source-nonfree-$(upstream)/debian/rules
+
+clean::
+ rm -rf $(CURDIR)/modules
+
+$(patsubst %,build/%,$(DEB_ARCH_PACKAGES)):: mod-src-dir
+ MOD_SRCDIR=$(CURDIR) KPKG_DEST_DIR=$(CURDIR)/.. \
+ fakeroot module-assistant --kernel-dir \
+ /usr/src/$(patsubst build/kernel-modules-nonfree-%,kernel-headers-%,$@) \
+ --text-mode build kernel-source-nonfree-$(upstream)
+
+install/kernel-source-nonfree-$(upstream)::
+ mkdir -p debian/kernel-source-nonfree-$(upstream)/usr/src
tar jcf debian/kernel-source-nonfree-$(upstream)/usr/src/kernel-source-nonfree-$(upstream).tar.bz2 modules
- rm -rf modules