r3684 - in trunk/kernel/powerpc/kernel-patch-powerpc-2.6.8-2.6.8: .
debian
Simon Horman
horms at costa.debian.org
Thu Aug 4 01:59:47 UTC 2005
Author: horms
Date: 2005-08-04 01:59:46 +0000 (Thu, 04 Aug 2005)
New Revision: 3684
Modified:
trunk/kernel/powerpc/kernel-patch-powerpc-2.6.8-2.6.8/debian/changelog
trunk/kernel/powerpc/kernel-patch-powerpc-2.6.8-2.6.8/debian/control
trunk/kernel/powerpc/kernel-patch-powerpc-2.6.8-2.6.8/debian/rules
trunk/kernel/powerpc/kernel-patch-powerpc-2.6.8-2.6.8/header-install
Log:
+ * Fix headers package brokenness
+ - Add provides kernel-headers-flavour to make the headers
+ easier to find - ppc uses kernel-build-flavour,
+ other arches use kernel-headers-flavour.
+ - Also symlink kernel-build-flavour to kernel-headers-flavour in source.
+ - Add missing asm-ppc headers files
+ - (closes: #308639)
Modified: trunk/kernel/powerpc/kernel-patch-powerpc-2.6.8-2.6.8/debian/changelog
===================================================================
--- trunk/kernel/powerpc/kernel-patch-powerpc-2.6.8-2.6.8/debian/changelog 2005-08-04 01:57:46 UTC (rev 3683)
+++ trunk/kernel/powerpc/kernel-patch-powerpc-2.6.8-2.6.8/debian/changelog 2005-08-04 01:59:46 UTC (rev 3684)
@@ -1,10 +1,17 @@
-kernel-patch-powerpc-2.6.8 (2.6.8-17) unstable; urgency=low
+kernel-patch-powerpc-2.6.8 (2.6.8-17) UNRELEASED; urgency=low
* Build against kernel-tree-2.6.8-17 (Simon Horman)
* Require gcc-3.3, the default on Sarge, but not
the default in unstable any more.
+ * Fix headers package brokenness
+ - Add provides kernel-headers-flavour to make the headers
+ easier to find - ppc uses kernel-build-flavour,
+ other arches use kernel-headers-flavour.
+ - Also symlink kernel-build-flavour to kernel-headers-flavour in source.
+ - Add missing asm-ppc headers files
+ - (closes: #308639)
- -- Simon Horman <horms at debian.org> Fri, 29 Jul 2005 19:54:40 +0900
+ -- Simon Horman <horms at debian.org> Mon, 1 Aug 2005 13:15:52 +0900
kernel-patch-powerpc-2.6.8 (2.6.8-16) unstable; urgency=low
Modified: trunk/kernel/powerpc/kernel-patch-powerpc-2.6.8-2.6.8/debian/control
===================================================================
--- trunk/kernel/powerpc/kernel-patch-powerpc-2.6.8-2.6.8/debian/control 2005-08-04 01:57:46 UTC (rev 3683)
+++ trunk/kernel/powerpc/kernel-patch-powerpc-2.6.8-2.6.8/debian/control 2005-08-04 01:59:46 UTC (rev 3684)
@@ -15,6 +15,7 @@
Package: kernel-build-2.6.8-power3
Architecture: powerpc
Depends: kernel-headers-2.6.8
+Provides: kernel-heders-2.6.8-power3
Description: build infrastructure for kernel version 2.6.8-power3
.
Together with kernel-headers-2.6.8, this package provides the
@@ -35,6 +36,7 @@
Package: kernel-build-2.6.8-power3-smp
Architecture: powerpc
Depends: kernel-headers-2.6.8
+Provides: kernel-heders-2.6.8-power3-smp
Description: build infrastructure for kernel version 2.6.8-power3-smp
.
Together with kernel-headers-2.6.8, this package provides the
@@ -55,6 +57,7 @@
Package: kernel-build-2.6.8-power4
Architecture: powerpc
Depends: kernel-headers-2.6.8
+Provides: kernel-heders-2.6.8-power4
Description: build infrastructure for kernel version 2.6.8-power4
.
Together with kernel-headers-2.6.8, this package provides the
@@ -75,6 +78,7 @@
Package: kernel-build-2.6.8-power4-smp
Architecture: powerpc
Depends: kernel-headers-2.6.8
+Provides: kernel-heders-2.6.8-power4-smp
Description: build infrastructure for kernel version 2.6.8-power4-smp
.
Together with kernel-headers-2.6.8, this package provides the
@@ -97,6 +101,7 @@
Package: kernel-build-2.6.8-powerpc
Architecture: powerpc
Depends: kernel-headers-2.6.8
+Provides: kernel-heders-2.6.8-powerpc
Description: build infrastructure for kernel version 2.6.8-powerpc
.
Together with kernel-headers-2.6.8, this package provides the
@@ -117,6 +122,7 @@
Package: kernel-build-2.6.8-powerpc-smp
Architecture: powerpc
Depends: kernel-headers-2.6.8
+Provides: kernel-heders-2.6.8-powerpc-smp
Description: build infrastructure for kernel version 2.6.8-powerpc-smp
.
Together with kernel-headers-2.6.8, this package provides the
Modified: trunk/kernel/powerpc/kernel-patch-powerpc-2.6.8-2.6.8/debian/rules
===================================================================
--- trunk/kernel/powerpc/kernel-patch-powerpc-2.6.8-2.6.8/debian/rules 2005-08-04 01:57:46 UTC (rev 3683)
+++ trunk/kernel/powerpc/kernel-patch-powerpc-2.6.8-2.6.8/debian/rules 2005-08-04 01:59:46 UTC (rev 3684)
@@ -223,6 +223,11 @@
# copy build infrastructure for kernel modules
mkdir -p $(KSRC)/include/linux
+ # For some reason ppc images put headers in kernel-build-x-y,
+ # add a symlink to kernel-headers-x-y, which is where
+ # other arches put stuff
+ cd $(KBUILD)/usr/src && ln -s kernel-build-$(kernel)-$(flavour) \
+ kernel-headers-$(kernel)-$(flavour)
cd $(KFLAVOUR) && cp -a .config $(KSRC)
cd $(KFLAVOUR) && cp -a Module.symvers $(KSRC)
@@ -237,7 +242,7 @@
cd $(KFLAVOUR)/include && find . -mindepth 1 -maxdepth 1 \
! -name config -a ! -name linux -a \( \
! -name 'asm-*' -o -name asm-generic -o -name asm-ppc \) \
- -printf "../../kernel-build-$(kernel)/include/%f\n" | \
+ -printf "../../kernel-headers-$(kernel)/include/%f\n" | \
xargs ln -s --target-directory=$(KSRC)/include
cd $(KFLAVOUR)/include && cp -a config $(KSRC)/include
Modified: trunk/kernel/powerpc/kernel-patch-powerpc-2.6.8-2.6.8/header-install
===================================================================
--- trunk/kernel/powerpc/kernel-patch-powerpc-2.6.8-2.6.8/header-install 2005-08-04 01:57:46 UTC (rev 3683)
+++ trunk/kernel/powerpc/kernel-patch-powerpc-2.6.8-2.6.8/header-install 2005-08-04 01:59:46 UTC (rev 3684)
@@ -2,23 +2,32 @@
set -e
-cd $KSOURCE
-{
- find . -path './scripts/*' -prune -o \
- -path './Documentation/*' -prune -o \
- -path './debian/*' -prune -o \
- -type f \( -name Makefile -o -name 'Kconfig*' \) -print
- find . \( -type f -or -type l \) -path './scripts/*' ! -name '*.o'
- echo arch/$DEB_HOST_ARCH/kernel/asm-offsets.s
-} | cpio -pd --preserve-modification-time $OLDPWD
-> $OLDPWD/scripts/Makefile
-cd - > /dev/null
+# As of make-kpkg 9.002 these files are added automatically
+# This foo is to allow this package to build on Sarge
+# (kernel-package 8.135) and unstable, and to produce
+# packages with the same file layout as the original
+# sarge kernel-header packages.
+kpkg_version=`dpkg -p kernel-package | sed -ne 's/Version: //; T; p; q'`
+if dpkg --compare-versions "$kpkg_version" "<" "9.002"; then
+ cd $KSOURCE
+ {
+ find . -path './scripts/*' -prune -o \
+ -path './Documentation/*' -prune -o \
+ -path './debian/*' -prune -o \
+ -type f \( -name Makefile -o -name 'Kconfig*' \) -print
+ find . \( -type f -or -type l \) \
+ -path './scripts/*' ! -name '*.o'
+ echo arch/$DEB_HOST_ARCH/kernel/asm-offsets.s
+ } | cpio -pd --preserve-modification-time $OLDPWD
+ > $OLDPWD/scripts/Makefile
+ cd - > /dev/null
+fi
remove=
cd include
for i in asm-*; do
case ${i#asm-} in
- generic | $DEB_HOST_ARCH)
+ generic | ppc)
;;
*)
remove="$remove $i"
More information about the Kernel-svn-changes
mailing list