r3121 - in trunk/kernel/powerpc/kernel-patch-powerpc-2.6.8-2.6.8: . debian
Simon Horman
horms@costa.debian.org
Mon, 16 May 2005 08:00:52 +0000
Author: horms
Date: 2005-05-16 08:00:51 +0000 (Mon, 16 May 2005)
New Revision: 3121
Added:
trunk/kernel/powerpc/kernel-patch-powerpc-2.6.8-2.6.8/header-install
Modified:
trunk/kernel/powerpc/kernel-patch-powerpc-2.6.8-2.6.8/debian/flavours
trunk/kernel/powerpc/kernel-patch-powerpc-2.6.8-2.6.8/debian/post-install
trunk/kernel/powerpc/kernel-patch-powerpc-2.6.8-2.6.8/debian/rules
Log:
Another attempt to fix kernel-build/kernel-headers for 2.6.8
Modified: trunk/kernel/powerpc/kernel-patch-powerpc-2.6.8-2.6.8/debian/flavours
===================================================================
--- trunk/kernel/powerpc/kernel-patch-powerpc-2.6.8-2.6.8/debian/flavours 2005-05-16 06:00:26 UTC (rev 3120)
+++ trunk/kernel/powerpc/kernel-patch-powerpc-2.6.8-2.6.8/debian/flavours 2005-05-16 08:00:51 UTC (rev 3121)
@@ -1,3 +1,4 @@
# This file contains the flavours we're building for.
-power3 power3-smp power4 power4-smp powerpc powerpc-smp
+#power3 power3-smp power4 power4-smp powerpc powerpc-smp
+powerpc-smp
Modified: trunk/kernel/powerpc/kernel-patch-powerpc-2.6.8-2.6.8/debian/post-install
===================================================================
--- trunk/kernel/powerpc/kernel-patch-powerpc-2.6.8-2.6.8/debian/post-install 2005-05-16 06:00:26 UTC (rev 3120)
+++ trunk/kernel/powerpc/kernel-patch-powerpc-2.6.8-2.6.8/debian/post-install 2005-05-16 08:00:51 UTC (rev 3121)
@@ -25,6 +25,10 @@
rm -f ${IMAGE_TOP}/boot/vmlinux.coff-${version}
+# get rid of the bogus /lib/modules/${version}/source symlink.
+
+rm -f ${IMAGE_TOP}/lib/modules/${version}/source
+
# add glue for creating bootable compressed kernel images
mkdir -p ${KLIB}/boot
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-05-16 06:00:26 UTC (rev 3120)
+++ trunk/kernel/powerpc/kernel-patch-powerpc-2.6.8-2.6.8/debian/rules 2005-05-16 08:00:51 UTC (rev 3121)
@@ -36,7 +36,7 @@
# build locations - point TMP to a tmpfs for best performance
TMP ?= $(CURDIR)/tmp
-KSOURCE = $(TMP)/kernel-source-$(kernel)
+export KSOURCE = $(TMP)/kernel-source-$(kernel)
KFLAVOUR = $(TMP)/kernel-source-$(kernel)-$(flavour)
KDUMMY = $(TMP)/kernel-image-$(kernel)-$(flavour)_$(version)_powerpc.deb
KHEADERS = $(TMP)/kernel-headers-$(kernel)_$(version)_powerpc.deb
@@ -222,13 +222,42 @@
rm -f $(KIMAGE)/boot/vmlinux.coff-$(kernel)-$(flavour)
# copy build infrastructure for kernel modules
- cd $(KFLAVOUR); find scripts -type f ! -name '*.o' | cpio -pd $(KSRC)
- cat debian/build-files | ( cd $(KFLAVOUR); cpio -pd $(KSRC) )
- for link in `cat debian/build-links`; do \
- ln -sf /usr/src/kernel-headers-$(kernel)-$(flavour)/$$link $(KSRC)/$$link; \
- done
- ln -sf asm-ppc $(KSRC)/include/asm
+ mkdir -p $(KSRC)/include/linux
+ cd $(KFLAVOUR) && cp -a .config $(KSRC)
+ cd $(KFLAVOUR) && cp -a Module.symvers $(KSRC)
+
+ cd $(KFLAVOUR) && find . -mindepth 1 -maxdepth 1 \
+ ! -name debian -a ! -name Documentation -a ! -name include -a \
+ ! -name '.*' -a \( \
+ -name Makefile -o -type d \) \
+ -printf "../kernel-headers-$(kernel)/%f\n" | \
+ xargs ln -s --target-directory=$(KSRC)
+
+ 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" | \
+ xargs ln -s --target-directory=$(KSRC)/include
+
+ cd $(KFLAVOUR)/include && cp -a config $(KSRC)/include
+
+ cd $(KFLAVOUR)/include && find linux -mindepth 1 -maxdepth 1 \
+ ! -name autoconf.h -a \
+ ! -name compile.h -a ! -name version.h \
+ -printf "../../../kernel-headers-$(kernel)/include/linux/%f\n" | \
+ xargs ln -s --target-directory=$(KSRC)/include/linux
+
+ cd $(KFLAVOUR)/include && \
+ cp -a linux/autoconf.h linux/compile.h linux/version.h \
+ $(KSRC)/include/linux/
+
+ mkdir -p $(KBUILD)/lib/modules/$(kernel)-$(flavour)
+ cd $(KBUILD)/lib/modules/$(kernel)-$(flavour) && \
+ ln -sf ../../../usr/src/kernel-build-$(kernel)-$(flavour) build
+ cd $(KBUILD)/lib/modules/$(kernel)-$(flavour) && \
+ ln -sf ../../../usr/src/kernel-build-$(kernel)-$(flavour) source
+
# add some README files and the kernel-source changelog
$(INSTALL_DATA) debian/README.kernel-image $(KIMAGEDOC)/NEWS.Debian
$(INSTALL_DATA) /usr/share/doc/kernel-source-$(kernel)/changelog.Debian.gz \
@@ -286,7 +315,10 @@
# simple call to make-kpkg.
binary-kernel-headers-$(kernel): stamp-install-prepare
- cd $(KSOURCE); APPEND_TO_VERSION='' make-kpkg kernel-headers
+ chmod u+rx $(CURDIR)/header-install
+ cd $(KSOURCE); APPEND_TO_VERSION='' \
+ HEADER_CLEAN_HOOK=$(CURDIR)/header-install \
+ make-kpkg kernel-headers
mv $(KHEADERS) ..
dpkg-distaddfile $(notdir $(KHEADERS)) devel optional
Added: 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-05-16 06:00:26 UTC (rev 3120)
+++ trunk/kernel/powerpc/kernel-patch-powerpc-2.6.8-2.6.8/header-install 2005-05-16 08:00:51 UTC (rev 3121)
@@ -0,0 +1,28 @@
+#!/bin/sh
+
+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
+
+remove=
+cd include
+for i in asm-*; do
+ case ${i#asm-} in
+ generic | $DEB_HOST_ARCH)
+ ;;
+ *)
+ remove="$remove $i"
+ ;;
+ esac
+done
+${remove:+rm -r $remove}