[PATCH 1/1] UBUNTU: synchronise our linux-libc-dev with the kernel userspace headers

Andy Whitcroft apw at canonical.com
Fri Dec 5 12:36:02 UTC 2008

It seems that the kernel user space headers have expanded to include
some new directories for sound and the like, the full list:

	asm asm-generic linux mtd rdma sound video

We currently explicitly list the headers we will include in our
linux-libc-dev.  Which means we only include the asm* and linux
directories, which makes difficulties for porters.  Debian already
includes all of these in their packages.

It seems appropriate that we include all of the officially exported
userspace headers from the kernel.  Move to taking all of the headers that
the header_install target generates so that we track and furture changes.

Also take this oppotunity to elide a couple of build file which seem to
be being produced, .install and ..install.cmd which seem to be noise.

Signed-off-by: Andy Whitcroft <apw at canonical.com>
 debian/rules.d/2-binary-arch.mk |    8 ++++----
 1 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/debian/rules.d/2-binary-arch.mk b/debian/rules.d/2-binary-arch.mk
index cafb1b0..c0e3be5 100644
--- a/debian/rules.d/2-binary-arch.mk
+++ b/debian/rules.d/2-binary-arch.mk
@@ -178,10 +178,10 @@ install-arch-headers:
 	$(hmake) silentoldconfig
 	$(hmake) headers_install
-	mv $(headers_tmp)/install/include/asm* \
-		$(headers_dir)/usr/include/
-	mv $(headers_tmp)/install/include/linux \
-		$(headers_dir)/usr/include/
+	( cd $(headers_tmp)/install/include/ && \
+		find . -name '.' -o -name '.*' -prune -o -print | \
+                cpio -pvd --preserve-modification-time \
+			$(headers_dir)/usr/include/ )
 	rm -rf $(headers_tmp)

More information about the kernel-team mailing list