From ec997d3d56008c66683ebbda94ac22ee790ae176 Mon Sep 17 00:00:00 2001 From: Sven Luther Date: Mon, 8 Aug 2005 06:59:19 +0000 Subject: [PATCH] Added flavours list in common header package. Cleaned up changelog entry waldi had left un-nice :) svn path=/trunk/kernel/source/linux-2.6/; revision=3733 --- debian/Makefile | 1 + debian/changelog | 10 ++++++---- debian/templates/header-install.in | 5 +++++ 3 files changed, 12 insertions(+), 4 deletions(-) diff --git a/debian/Makefile b/debian/Makefile index 336c3bf83..adc306ee2 100644 --- a/debian/Makefile +++ b/debian/Makefile @@ -142,6 +142,7 @@ binary: binary-indep binary-arch header-install-$(subarch): templates/header-install.in sed -e 's,@kbpkg@,$(kbpkg),g' \ -e 's,@ksource_dir@,$(CURDIR)/$(kdir),g' \ + -e 's,@flavours@,$(flavours),g' \ -e 's,@headers_dirs@,$(headers_dirs),g' \ templates/header-install.in > header-install-$(subarch) chmod u+x header-install-$(subarch) diff --git a/debian/changelog b/debian/changelog index aa817d4f3..759c10a0b 100644 --- a/debian/changelog +++ b/debian/changelog @@ -44,16 +44,18 @@ linux-2.6 (2.6.12-2) UNRELEASED; urgency=low * Enable CONFIG_6PACK=m for all archs (Andres Salomon) (closes: #319646) - * [powerpc] Fixed minor problems with the powerpc image : - - typo made the ams-ppc and asm-ppc64 headers not being included. - * Overhaul the generation of the control file. Now it is handled by debian/bin/gencontrol.py. The debian/control target in rules also fails now, since we don't want the control file generated during build. Arch-specific Depends and suggests are now generated correctly. (Bastian Blank) (Closes: #319896) - -- Sven Luther Sun, 7 Aug 2005 09:12:51 +0200 + * [powerpc] Fixed typo which made asm-ppc and asm-ppc64 not being included + in the header package. (Sven Luther) (Closes: #320817) + + * Added list of flavours built to common header package. (Sven Luther) + + -- Sven Luther Mon, 8 Aug 2005 08:54:03 +0200 linux-2.6 (2.6.12-1) unstable; urgency=low diff --git a/debian/templates/header-install.in b/debian/templates/header-install.in index 7397497bb..8bb78a85c 100644 --- a/debian/templates/header-install.in +++ b/debian/templates/header-install.in @@ -11,6 +11,10 @@ set -e # archs do some *very* strange things... rm -rf scripts +# Let's add the flavours that are built for a given arch. +# XXX: will probably need rethinking once the common headers are Arch: all. +echo @flavours@ >flavours + # XXX: once we're using a linux-headers-$(version)-$(debnum) that's Arch: all, # we'll want to drop this bit of code. The asm-* directories should remain. @@ -26,3 +30,4 @@ for i in asm-*; do esac done ${remove:+rm -r $remove} +