From e5298f35191236559a08487f0a286af11e743e31 Mon Sep 17 00:00:00 2001 From: Jurij Smakov Date: Tue, 31 May 2005 23:38:14 +0000 Subject: [PATCH] * Add dh-kpatches to build-deps-indep. * Copy asm-offsets.s in place instead of symlinking * Make sure DEBIAN does not get into packages. svn path=/branches/kernel-image-2.6.11/; revision=3289 --- debian/Makefile | 2 +- debian/control | 2 +- debian/rules | 2 +- debian/templates/post-install.in | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/debian/Makefile b/debian/Makefile index a92d5d61d..122a427de 100644 --- a/debian/Makefile +++ b/debian/Makefile @@ -210,7 +210,7 @@ build-stamp-$(subarch)-%: build-$(subarch)-% src="arch/$${arch}/kernel/asm-offsets.s"; \ dst="../$(kdir)/$${src}"; \ if [ -f "$${src}" ] && [ ! -e "$${dst}" ]; then \ - ln -s "$$(pwd)/$${src}" "$${dst}"; \ + cp -a "$$(pwd)/$${src}" "$${dst}"; \ fi touch build-stamp-$(subarch)-$* # diff --git a/debian/control b/debian/control index 450c06ef8..2264d0d5f 100644 --- a/debian/control +++ b/debian/control @@ -4,7 +4,7 @@ Priority: optional Maintainer: Debian Kernel Team Standards-Version: 3.6.1.0 Build-Depends: gcc (>= 4:3.3), debhelper (>= 4), kernel-package (>= 8.135), module-init-tools, dpkg-dev (>= 1.10.23), debian-utils (>= 1.6), bzip2, console-tools, sparc-utils [sparc] -Build-Depends-Indep: bzip2, debhelper (>= 4), docbook-utils, gs, kernel-package (>= 8.135), transfig +Build-Depends-Indep: bzip2, debhelper (>= 4), docbook-utils, gs, kernel-package (>= 8.135), transfig, dh-kpatches (>= 0.99.35) Package: linux-source-2.6.11 Architecture: all diff --git a/debian/rules b/debian/rules index e90181ac2..aa2b43c35 100755 --- a/debian/rules +++ b/debian/rules @@ -199,7 +199,7 @@ clean: unpatch cd debian; \ rm -f *-stamp-* *-stamp config.* *.kpatches.arch; \ rm -f header-install-* post-install-* bin/touch.orig; \ - rm -rf kernel-source-* build-* install-* + rm -rf linux-source-* build-* install-* dh_clean binary-indep: source tree patch-debian doc diff --git a/debian/templates/post-install.in b/debian/templates/post-install.in index 6088dcc9f..7bf793525 100644 --- a/debian/templates/post-install.in +++ b/debian/templates/post-install.in @@ -65,7 +65,7 @@ cp -a Module.symvers $dir find . -mindepth 1 -maxdepth 1 \ ! -name debian -a ! -name Documentation -a ! -name include -a \ - ! -name '.*' -a \( \ + ! -name DEBIAN -a ! -name '.*' -a \( \ -name Makefile -o -type d \) \ -printf "../linux-headers-$prefix/%f\n" | xargs ln -s --target-directory="$dir"