r2916 - trunk/kernel/source/kernel-source-nonfree-2.6.11-2.6.11/debian
Sven Luther
luther@costa.debian.org
Mon, 04 Apr 2005 08:38:48 +0000
Author: luther
Date: 2005-04-04 08:38:48 +0000 (Mon, 04 Apr 2005)
New Revision: 2916
Added:
trunk/kernel/source/kernel-source-nonfree-2.6.11-2.6.11/debian/control-common.m4
trunk/kernel/source/kernel-source-nonfree-2.6.11-2.6.11/debian/control-flavour.m4
trunk/kernel/source/kernel-source-nonfree-2.6.11-2.6.11/debian/flavours
trunk/kernel/source/kernel-source-nonfree-2.6.11-2.6.11/debian/gen-control
Removed:
trunk/kernel/source/kernel-source-nonfree-2.6.11-2.6.11/debian/control
Modified:
trunk/kernel/source/kernel-source-nonfree-2.6.11-2.6.11/debian/rules
Log:
Adapted kernel-source-nonfree debian/control generation to handle mutli-arch
more gracefully.
Deleted: 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-04-04 06:56:39 UTC (rev 2915)
+++ trunk/kernel/source/kernel-source-nonfree-2.6.11-2.6.11/debian/control 2005-04-04 08:38:48 UTC (rev 2916)
@@ -1,117 +0,0 @@
-Source: kernel-source-nonfree-2.6.11
-Section: non-free/devel
-Priority: optional
-Maintainer: Debian Kernel Team <debian-kernel@lists.debian.org>
-Uploaders: Andres Salomon <dilinger@debian.org>
-Standards-Version: 3.6.1
-Build-Depends: bzip2, cdbs, debhelper (>> 4.1.0), fakeroot, module-assistant, kernel-headers-2.6.11-1-i386 [i386], kernel-headers-2.6.11-9-amd64 [amd64]
-
-Package: kernel-nonfree-source
-Architecture: all
-Depends: module-assistant, bzip2, coreutils | fileutils (>= 4.0), debhelper (>> 4.1.0)
-Description: Linux kernel module source for non-free 2.6.11 drivers
- This package provides the source code for the Linux kernel modules
- contained in 2.6.11 that are considered non-free by Debian. Some of
- the modules contained within this package include acenic, tg3, keyspan, and
- the various qla2xxx modules.
-
-Package: kernel-nonfree-modules-2.6.11-1-386
-Architecture: i386
-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 acenic, tg3, keyspan, and the various
- qla2xxx modules.
- .
- This package contains the compiled kernel modules for 2.6.11-1-386.
-
-Package: kernel-nonfree-modules-2.6.11-1-686
-Architecture: i386
-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 acenic, tg3, keyspan, and the various
- qla2xxx modules.
- .
- This package contains the compiled kernel modules for 2.6.11-1-686.
-
-Package: kernel-nonfree-modules-2.6.11-1-686-smp
-Architecture: i386
-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 acenic, tg3, keyspan, and the various
- qla2xxx modules.
- .
- This package contains the compiled kernel modules for 2.6.11-1-686-smp.
-
-Package: kernel-nonfree-modules-2.6.11-1-k7
-Architecture: i386
-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 acenic, tg3, keyspan, and the various
- qla2xxx modules.
- .
- This package contains the compiled kernel modules for 2.6.11-1-k7.
-
-Package: kernel-nonfree-modules-2.6.11-1-k7-smp
-Architecture: i386
-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 acenic, tg3, keyspan, and the various
- qla2xxx modules.
- .
- This package contains the compiled kernel modules for 2.6.11-1-k7-smp.
-
-Package: kernel-nonfree-modules-2.6.11-1-amd64-generic
-Architecture: amd64
-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 acenic, tg3, keyspan, and the various
- qla2xxx modules.
- .
- This package contains the compiled kernel modules for 2.6.11-1-amd64-generic.
-
-Package: kernel-nonfree-modules-2.6.11-1-amd64-k8
-Architecture: amd64
-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 acenic, tg3, keyspan, and the various
- qla2xxx modules.
- .
- This package contains the compiled kernel modules for 2.6.11-1-amd64-k8.
-
-Package: kernel-nonfree-modules-2.6.11-1-amd64-k8-smp
-Architecture: amd64
-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 acenic, tg3, keyspan, and the various
- qla2xxx modules.
- .
- This package contains the compiled kernel modules for 2.6.11-1-amd64-k8-smp.
-
-Package: kernel-nonfree-modules-2.6.11-1-em64t-p4
-Architecture: amd64
-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 acenic, tg3, keyspan, and the various
- qla2xxx modules.
- .
- This package contains the compiled kernel modules for 2.6.11-1-em64t-p4.
-
-Package: kernel-nonfree-modules-2.6.11-1-em64t-p4-smp
-Architecture: amd64
-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 acenic, tg3, keyspan, and the various
- qla2xxx modules.
- .
- This package contains the compiled kernel modules for 2.6.11-1-em64t-p4-smp.
-
Added: trunk/kernel/source/kernel-source-nonfree-2.6.11-2.6.11/debian/control-common.m4
===================================================================
--- trunk/kernel/source/kernel-source-nonfree-2.6.11-2.6.11/debian/control-common.m4 2005-04-04 06:56:39 UTC (rev 2915)
+++ trunk/kernel/source/kernel-source-nonfree-2.6.11-2.6.11/debian/control-common.m4 2005-04-04 08:38:48 UTC (rev 2916)
@@ -0,0 +1,17 @@
+Source: kernel-source-nonfree-M4UPSTREAM
+Section: non-free/devel
+Priority: optional
+Maintainer: Debian Kernel Team <debian-kernel@lists.debian.org>
+Uploaders: Andres Salomon <dilinger@debian.org>
+Standards-Version: 3.6.1
+Build-Depends: bzip2, cdbs, debhelper (>> 4.1.0), fakeroot, module-assistant M4BUILDDEP
+
+Package: kernel-nonfree-source
+Architecture: all
+Depends: module-assistant, bzip2, coreutils | fileutils (>= 4.0), debhelper (>> 4.1.0), m4
+Description: Linux kernel module source for non-free M4UPSTREAM drivers
+ This package provides the source code for the Linux kernel modules
+ contained in M4UPSTREAM that are considered non-free by Debian. Some of
+ the modules contained within this package include acenic, tg3, keyspan, and
+ the various qla2xxx modules.
+
Added: trunk/kernel/source/kernel-source-nonfree-2.6.11-2.6.11/debian/control-flavour.m4
===================================================================
--- trunk/kernel/source/kernel-source-nonfree-2.6.11-2.6.11/debian/control-flavour.m4 2005-04-04 06:56:39 UTC (rev 2915)
+++ trunk/kernel/source/kernel-source-nonfree-2.6.11-2.6.11/debian/control-flavour.m4 2005-04-04 08:38:48 UTC (rev 2916)
@@ -0,0 +1,10 @@
+Package: kernel-nonfree-modules-M4VERSION-M4FLAVOUR
+Architecture: M4ARCH
+Description: Linux kernel driver non-free modules from M4UPSTREAM
+ This package provides Linux kernel modules from M4UPSTREAM that are
+ considered non-free by Debian. Some of the modules contained
+ within this package include acenic, tg3, keyspan, and the various
+ qla2xxx modules.
+ .
+ This package contains the compiled kernel modules for M4VERSION-M4FLAVOUR
+
Added: trunk/kernel/source/kernel-source-nonfree-2.6.11-2.6.11/debian/flavours
===================================================================
--- trunk/kernel/source/kernel-source-nonfree-2.6.11-2.6.11/debian/flavours 2005-04-04 06:56:39 UTC (rev 2915)
+++ trunk/kernel/source/kernel-source-nonfree-2.6.11-2.6.11/debian/flavours 2005-04-04 08:38:48 UTC (rev 2916)
@@ -0,0 +1,22 @@
+# This file contains the arches, subarches and flavours we are handling.
+archs: powerpc i386 amd64
+
+# powerpc arch
+build-dep powerpc: flavour
+build-dep-name powerpc: build
+subarchs powerpc: powerpc
+flavours powerpc: powerpc powerpc-smp power4 power4-smp power3 power3-smp
+
+# i386 arch
+abi i386: 1
+build-dep i386: arch
+build-dep-name i386: headers
+subarchs i386: i386
+flavours i386: 386 686 686-smp k7 k7-smp
+
+# amd64 arch
+abi amd64: 9
+build-dep amd64: arch
+build-dep-name amd64: headers
+subarchs amd64: amd64
+flavours amd64: amd64-generic amd64-k8 amd64-k8-smp em64t-p4 em64t-p4-smp
Added: trunk/kernel/source/kernel-source-nonfree-2.6.11-2.6.11/debian/gen-control
===================================================================
--- trunk/kernel/source/kernel-source-nonfree-2.6.11-2.6.11/debian/gen-control 2005-04-04 06:56:39 UTC (rev 2915)
+++ trunk/kernel/source/kernel-source-nonfree-2.6.11-2.6.11/debian/gen-control 2005-04-04 08:38:48 UTC (rev 2916)
@@ -0,0 +1,43 @@
+#!/bin/sh
+
+cp debian/control-common.m4 control.m4
+upstream=`dpkg-parsechangelog | grep ^Version: | sed -e 's/Version: //' -e 's/-.*$//'`
+builddepend=""
+archs_tmp=`grep "^archs:" debian/flavours`
+archs=${archs_tmp#archs: *}
+for arch in $archs; do
+ subarchs_tmp=`grep "^subarchs $arch:" debian/flavours`
+ subarchs=${subarchs_tmp#subarchs $arch: *}
+ abi_tmp=`grep "^abi $arch:" debian/flavours`
+ abi=${abi_tmp#abi $arch: *}
+ builddep_tmp=`grep "^build-dep $arch:" debian/flavours`
+ builddep=${builddep_tmp#build-dep $arch: *}
+ builddepname_tmp=`grep "^build-dep-name $arch:" debian/flavours`
+ builddepname=${builddepname_tmp#build-dep-name $arch: *}
+ if [ "$abi" ]; then
+ version=$upstream-$abi
+ else
+ version=$upstream
+ fi
+ if [ "$builddep" = "arch" ]; then
+ builddepend="$builddepend, kernel-$builddepname-$version-$arch [$arch]"
+ fi
+ for subarch in $subarchs; do
+ flavours_tmp=`grep "^flavours $subarch:" debian/flavours`
+ flavours=${flavours_tmp#flavours $subarch: *}
+ if [ "$builddep" = "subarch" ]; then
+ builddepend="$builddepend, kernel-$builddepname-$version-$subarch [$arch]"
+ fi
+ for flavour in $flavours; do \
+ if [ "$builddep" = "flavour" ]; then
+ builddepend="$builddepend, kernel-$builddepname-$version-$flavour [$arch]"
+ fi
+ m4 -DM4UPSTREAM="$upstream" -DM4ABI="$abi" -DM4VERSION="$version" \
+ -DM4ARCH="$arch" -DM4SUBARCH="$subarch" -DM4FLAVOUR="$flavour" \
+ debian/control-flavour.m4 >>debian/control.m4
+ done
+ done
+done
+m4 -DM4UPSTREAM="$upstream" -DM4BUILDDEP="$builddepend" debian/control.m4 >debian/control
+
+
Property changes on: trunk/kernel/source/kernel-source-nonfree-2.6.11-2.6.11/debian/gen-control
___________________________________________________________________
Name: svn:executable
+ *
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 06:56:39 UTC (rev 2915)
+++ trunk/kernel/source/kernel-source-nonfree-2.6.11-2.6.11/debian/rules 2005-04-04 08:38:48 UTC (rev 2916)
@@ -3,8 +3,18 @@
include /usr/share/cdbs/1/rules/debhelper.mk
include /usr/share/cdbs/1/rules/simple-patchsys.mk
+# the archs, subarchs and flavours we are building for
+archs := $(shell grep ^archs: debian/flavours | sed -e 's/^archs: *//')
+arch := $(DEB_HOST_ARCH)
+#subarchs := $(shell grep "^subarchs $(arch):" debian/flavours | sed -e 's/^subarchs $(arch): *//')
+#flavours := $(shell grep "^flavours $(subarch):" debian/flavours | sed -e # 's/^flavours $(subarch): *//')
+abi := $(shell grep "^abi $(arch):" debian/flavours | sed -e 's/^abi $(arch): *//')
+
upstream := $(shell dpkg-parsechangelog | sed -n 's/^Version: \?\([0-9\.]\+\)-[0-9]\+$$/\1/p')
+#| some files in debian/ get version numbers and stuff updated on the fly
+M4 = m4 -DM4UPSTREAM="$(upstram)" -DM4ABI="$(abi)" -DM4ARCH="$(arch)" -DM4SUBARCH="$(subarch)" -DM4FLAVOUR="$(flavour)"
+
mod-src-dir:
mkdir -p modules/kernel-nonfree-source/debian
cp -ra *.[ch] Makefile debian modules/kernel-nonfree-source
@@ -28,3 +38,6 @@
install/kernel-nonfree-source:: mod-src-dir
mkdir -p debian/kernel-nonfree-source/usr/src
tar jcf debian/kernel-nonfree-source/usr/src/kernel-nonfree-source.tar.bz2 modules
+
+debian/control:: debian/control-common.m4 debian/control-flavour.m4
+ debian/gen-control