Author: waldi
Date: Fri Mar 9 21:37:14 2007
New Revision: 8345
Modified:
dists/trunk/linux-2.6/debian/rules.real
dists/trunk/linux-2.6/debian/templates/control.headers.arch.in
Log:
* debian/rules.real: Build linux-libc-headers.
* debian/templates/control.headers.arch.in: Add linux-libc-headers.
Modified: dists/trunk/linux-2.6/debian/rules.real
==============================================================================
--- dists/trunk/linux-2.6/debian/rules.real (original)
+++ dists/trunk/linux-2.6/debian/rules.real Fri Mar 9 21:37:14 2007
@@ -58,6 +58,7 @@
# Targets
#
binary-arch-arch: install-headers-$(ARCH)
+binary-arch-arch: install-headers-libc_$(ARCH)
binary-arch-subarch: install-headers-$(ARCH)-$(SUBARCH)
binary-arch-flavour: install-image-$(ARCH)-$(SUBARCH)-$(FLAVOUR)-$(TYPE)
ifeq ($(MODULES),True)
@@ -179,6 +180,13 @@
$(setup_env) make -C '$(DIR)' $(JOBS_ARG) htmldocs mandocs
touch '$@'
+$(STAMPS_DIR)/build-headers: SOURCE_DIR = $(BUILD_DIR)/source
+$(STAMPS_DIR)/build-headers: DIR = $(BUILD_DIR)/build-headers
+$(STAMPS_DIR)/build-headers:
+ rm -rf '$(DIR)'
+ cp -al '$(SOURCE_DIR)' '$(DIR)'
+ touch '$@'
+
install-base:
dh_installchangelogs
dh_installdocs
@@ -230,6 +238,26 @@
dh_testroot
$(MAKE) -f debian/rules.real install-base
GENCONTROL_ARGS='-Vkernel:Arch=$(ARCH)'
+install-headers-libc_$(ARCH): PACKAGE_NAME = linux-libc-headers
+install-headers-libc_$(ARCH): DH_OPTIONS = -p$(PACKAGE_NAME)
+install-headers-libc_$(ARCH): SOURCE_DIR = $(BUILD_DIR)/build-headers
+install-headers-libc_$(ARCH): DIR = $(CURDIR)/debian/$(PACKAGE_NAME)/usr
+install-headers-libc_$(ARCH): $(STAMPS_DIR)/build-headers
+ dh_testdir
+ dh_testroot
+ dh_clean -d -k
+ make -C '$(SOURCE_DIR)' headers_check ARCH=$(HEADERS_ARCH)
+ make -C '$(SOURCE_DIR)' headers_install ARCH=$(HEADERS_ARCH)
INSTALL_HDR_PATH='$(DIR)'
+ $(MAKE) -f debian/rules.real install-base
+
+# XXX: This needs to be moved into the config
+install-headers-libc_$(ARCH): HEADERS_ARCH = $(ARCH)
+install-headers-libc_amd64 \
+install-headers-libc_i386: HEADERS_ARCH = x86_64
+install-headers-libc_hppa: HEADERS_ARCH = parisc
+install-headers-libc_mipsel: HEADERS_ARCH = mips
+install-headers-libc_sparc: HEADERS_ARCH = sparc64
+
install-headers-$(ARCH)-$(SUBARCH): PACKAGE_NAME =
linux-headers-$(UPSTREAMVERSION)$(ABINAME)$(LOCALVERSION_HEADERS)
install-headers-$(ARCH)-$(SUBARCH): DH_OPTIONS = -p$(PACKAGE_NAME)
install-headers-$(ARCH)-$(SUBARCH): BASE_DIR = /usr/src/$(PACKAGE_NAME)
Modified: dists/trunk/linux-2.6/debian/templates/control.headers.arch.in
==============================================================================
--- dists/trunk/linux-2.6/debian/templates/control.headers.arch.in
(original)
+++ dists/trunk/linux-2.6/debian/templates/control.headers.arch.in Fri Mar
9 21:37:14 2007
@@ -1,3 +1,13 @@
+Package: linux-libc-headers
+Section: devel
+Priority: optional
+Provides: linux-kernel-headers
+Replaces: linux-kernel-headers
+Conflicts: linux-kernel-headers
+Description: Linux Kernel Headers for development
+ This package provides headers from the Linux kernel. These headers
+ are used by the installed headers for GNU glibc and other system libraries.
+
Package: [EMAIL PROTECTED]@@[EMAIL PROTECTED]
Section: devel
Priority: optional
_______________________________________________
Kernel-svn-changes mailing list
[email protected]
http://lists.alioth.debian.org/mailman/listinfo/kernel-svn-changes
