r2085 - in trunk/kernel/sparc/kernel-image-2.6.9-sparc-2.6.9: . debian
Joshua Kwan
joshk@haydn.debian.org
Tue, 28 Dec 2004 01:29:44 -0700
Author: joshk
Date: 2004-12-28 01:29:30 -0700 (Tue, 28 Dec 2004)
New Revision: 2085
Added:
trunk/kernel/sparc/kernel-image-2.6.9-sparc-2.6.9/header-install
Modified:
trunk/kernel/sparc/kernel-image-2.6.9-sparc-2.6.9/
trunk/kernel/sparc/kernel-image-2.6.9-sparc-2.6.9/debian/changelog
trunk/kernel/sparc/kernel-image-2.6.9-sparc-2.6.9/debian/control
trunk/kernel/sparc/kernel-image-2.6.9-sparc-2.6.9/debian/rules
trunk/kernel/sparc/kernel-image-2.6.9-sparc-2.6.9/post-install
Log:
sync up changes from 2.6.8
Property changes on: trunk/kernel/sparc/kernel-image-2.6.9-sparc-2.6.9
___________________________________________________________________
Name: svn:ignore
- kernel-source-2.6.7
+ kernel-source-2.6.9
build-*
install-*
header-install.out
*.deb
Modified: trunk/kernel/sparc/kernel-image-2.6.9-sparc-2.6.9/debian/changelog
===================================================================
--- trunk/kernel/sparc/kernel-image-2.6.9-sparc-2.6.9/debian/changelog 2004-12-28 08:26:16 UTC (rev 2084)
+++ trunk/kernel/sparc/kernel-image-2.6.9-sparc-2.6.9/debian/changelog 2004-12-28 08:29:30 UTC (rev 2085)
@@ -1,8 +1,10 @@
kernel-image-2.6.9-sparc (2.6.9-1) unstable; urgency=low
- * Build against kernel-tree-2.6.9-3.
+ * New upstream release.
+ * Build against kernel-tree-2.6.9-4.
+ * Bump soname to 2 just for consistency with other arches.
- -- Joshua Kwan <joshk@triplehelix.org> Thu, 25 Nov 2004 22:51:34 -0800
+ -- Joshua Kwan <joshk@triplehelix.org> Tue, 28 Dec 2004 00:28:55 -0800
kernel-image-2.6.8-sparc (2.6.8-3) unstable; urgency=high
Modified: trunk/kernel/sparc/kernel-image-2.6.9-sparc-2.6.9/debian/control
===================================================================
--- trunk/kernel/sparc/kernel-image-2.6.9-sparc-2.6.9/debian/control 2004-12-28 08:26:16 UTC (rev 2084)
+++ trunk/kernel/sparc/kernel-image-2.6.9-sparc-2.6.9/debian/control 2004-12-28 08:29:30 UTC (rev 2085)
@@ -4,49 +4,52 @@
Maintainer: Debian Kernel Team <debian-kernel@lists.debian.org>
Uploaders: Joshua Kwan <joshk@triplehelix.org>, Ben Collins <bcollins@debian.org>
Standards-Version: 3.6.1.0
-Build-Depends: gcc (>= 4:3.3), kernel-tree-2.6.9-3, debhelper (>= 4), kernel-package, sparc-utils, module-init-tools
+Build-Depends: gcc (>= 4:3.3), kernel-tree-2.6.9-4, debhelper (>= 4), kernel-package, sparc-utils, module-init-tools
-Package: kernel-build-2.6.9-1
+Package: kernel-build-2.6.9-2
Architecture: sparc
Section: devel
Priority: optional
-Depends: coreutils | fileutils (>= 4.0), kernel-headers-2.6.9-1-sparc64, kernel-headers-2.6.9-1-sparc64-smp
+Depends: coreutils | fileutils (>= 4.0), kernel-headers-2.6.9-2-sparc64, kernel-headers-2.6.9-2-sparc64-smp
Description: Headers for building modules for Linux 2.6.9
This package provides kernel header files for building modules for the
precompiled kernel images on the 64-bit SPARC architecture (uniprocessor and
multiprocessor.)
-Package: kernel-headers-2.6.9-1
+Package: kernel-headers-2.6.9-2
Architecture: sparc
Section: devel
Priority: optional
Depends: coreutils | fileutils (>= 4.0)
-Provides: kernel-headers, kernel-headers-2.6
+Provides: kernel-headers, kernel-headers-2.6, kernel-kbuild-2.6-3 (>= 2.6.9-2)
Description: Header files related to Linux kernel version 2.6.9
- This package provides kernel header files for version 2.6.9, for sites
- that want the latest kernel headers. Please read
- /usr/share/doc/kernel-headers-2.6.9-1/debian.README.gz for details.
+ This package provides kernel header files for version 2.6.9, generally
+ used for building out-of-tree kernel modules. See the 'module-assistant'
+ package for more information.
.
- This package consists mostly of the common files between the two packages
- you should really be using for kernel headers, kernel-headers-2.6.9-1-sparc64
- and kernel-headers-2.6.9-1-sparc64-smp.
+ This package consists mostly of the common files between the three header
+ packages you should really be using for building modules:
+ .
+ - kernel-headers-2.6.9-2-sparc32
+ - kernel-headers-2.6.9-2-sparc64
+ - kernel-headers-2.6.9-2-sparc64-smp
+ .
+ For more information you can also read:
+ /usr/share/doc/kernel-headers-2.6.9-2/debian.README.gz.
-Package: kernel-headers-2.6.9-1-sparc32
+Package: kernel-headers-2.6.9-2-sparc32
Architecture: sparc
Section: devel
Priority: optional
-Depends: coreutils | fileutils (>= 4.0), kernel-headers-2.6.9-1
+Depends: coreutils | fileutils (>= 4.0), kernel-headers-2.6.9-2
Provides: kernel-headers, kernel-headers-2.6
Description: Header files for Linux kernel 2.6.9 on uniprocessor 32-bit SPARC
This package provides kernel header files for version 2.6.9 on the 32-bit
SPARC architecture, used to build out-of-tree kernel modules. If you have
- more than one processor, you want the kernel-headers-2.6.9-1-sparc64-smp
+ more than one processor, you want the kernel-headers-2.6.9-2-sparc64-smp
package.
- .
- Please read /usr/share/doc/kernel-headers-2.6.9-1-sparc32/debian.README.gz
- for details.
-Package: kernel-image-2.6.9-1-sparc32
+Package: kernel-image-2.6.9-2-sparc32
Section: base
Architecture: sparc
Priority: optional
@@ -72,22 +75,19 @@
systems. If you do not have a SuperSPARC or HyperSPARC CPU, then most likely
you want the sparc64 image. See kernel-image-2.6-sparc64.
-Package: kernel-headers-2.6.9-1-sparc64
+Package: kernel-headers-2.6.9-2-sparc64
Architecture: sparc
Section: devel
Priority: optional
-Depends: coreutils | fileutils (>= 4.0), kernel-headers-2.6.9-1
+Depends: coreutils | fileutils (>= 4.0), kernel-headers-2.6.9-2
Provides: kernel-headers, kernel-headers-2.6
Description: Header files for Linux kernel 2.6.9 on uniprocessor 64-bit SPARC
This package provides kernel header files for version 2.6.9 on the 64-bit
SPARC architecture, used to build out-of-tree kernel modules. If you have
- more than one processor, you want the kernel-headers-2.6.9-1-sparc64-smp
+ more than one processor, you want the kernel-headers-2.6.9-2-sparc64-smp
package.
- .
- Please read /usr/share/doc/kernel-headers-2.6.9-1-sparc64/debian.README.gz
- for details.
-Package: kernel-image-2.6.9-1-sparc64
+Package: kernel-image-2.6.9-2-sparc64
Section: base
Architecture: sparc
Priority: optional
@@ -113,22 +113,19 @@
do not have an UltraSPARC, then most likely you want the sparc32 image. See
kernel-image-2.6-sparc32.
-Package: kernel-headers-2.6.9-1-sparc64-smp
+Package: kernel-headers-2.6.9-2-sparc64-smp
Architecture: sparc
Section: devel
Priority: optional
-Depends: coreutils | fileutils (>= 4.0), kernel-headers-2.6.9-1
+Depends: coreutils | fileutils (>= 4.0), kernel-headers-2.6.9-2
Provides: kernel-headers, kernel-headers-2.6
Description: Header files for Linux kernel 2.6.9 on multiprocessor 64-bit SPARC
This package provides kernel header files for version 2.6.9 on the 64-bit
SPARC architecture, used to build out-of-tree kernel modules. If you only
- have one processor, you want the kernel-headers-2.6.9-1-sparc64 package
+ have one processor, you want the kernel-headers-2.6.9-2-sparc64 package
instead.
- .
- Please read /usr/share/doc/kernel-headers-2.6.9-1-sparc64-smp/debian.README.gz
- for details.
-Package: kernel-image-2.6.9-1-sparc64-smp
+Package: kernel-image-2.6.9-2-sparc64-smp
Section: base
Architecture: sparc
Priority: optional
Modified: trunk/kernel/sparc/kernel-image-2.6.9-sparc-2.6.9/debian/rules
===================================================================
--- trunk/kernel/sparc/kernel-image-2.6.9-sparc-2.6.9/debian/rules 2004-12-28 08:26:16 UTC (rev 2084)
+++ trunk/kernel/sparc/kernel-image-2.6.9-sparc-2.6.9/debian/rules 2004-12-28 08:29:30 UTC (rev 2085)
@@ -24,6 +24,9 @@
appvan := --append_to_version $(debnum)
endif
+export DEBIAN_SRCTOP := $(CURDIR)/kernel-source-$(version)
+export DEBIAN_UPSTREAM_VERSION := $(version)
+
flavours := sparc32 sparc64 sparc64-smp #$(shell \
# find config -maxdepth 1 -type f ! -name default -printf '%f\n' \
#)
@@ -33,6 +36,12 @@
sed -n 's/.*kernel-tree-\([^,]*\).*/\1/p; t e; b; :e q' \
debian/control \
)
+
+kbpkg := $(shell \
+ sed -n 's/^Depends: .*\(kernel-kbuild-[^ ,]*\).*/\1/p; t e; b; :e q' \
+ debian/control \
+)
+
kdir := kernel-source-$(version)
ifeq (,$(DEB_HOST_ARCH))
@@ -67,9 +76,10 @@
done
cp config/default $(kdir)/.config
ln -s `command -v touch` bin/touch.orig
+ sed 's/@kbpkg@/$(kbpkg)/g' header-install > header-install.out
+ chmod u+x header-install.out
+ touch $@
- touch unpack-stamp
-
build: build-stamp
build-stamp: unpack-stamp
PATH=$$PWD/bin:$$PATH; \
@@ -90,8 +100,8 @@
@echo $(debnum)
clean:
- rm -f *-stamp
- rm -rf kernel-source-$(version) build-* install-* bin/touch.orig
+ rm -f *-stamp header-install.out
+ rm -rf $(kdir) build-* install-* bin/touch.orig
dh_clean
install: build
@@ -105,9 +115,15 @@
binary-arch: install
dh_testdir
- cd kernel-source-$(version); \
+# Link asm-offsets.s into main kernel-headers zone
+ for i in $(flavours); do \
+ karch=$${i%-smp}; karch=$${karch%32}; \
+ ln -f build-$$i/arch/$$karch/kernel/asm-offsets.s $(kdir)/arch/$$karch/kernel/; \
+ done
+
+ cd $(kdir); HEADER_CLEAN_HOOK=$(CURDIR)/header-install.out \
make-kpkg --subarch sparc64 $(appvan) kernel-headers
- mv kernel-source-$(version)/debian/files debian
+ mv $(kdir)/debian/files debian
for i in $(flavours); do \
cp -al build-$$i install-$$i; \
Added: trunk/kernel/sparc/kernel-image-2.6.9-sparc-2.6.9/header-install
===================================================================
--- trunk/kernel/sparc/kernel-image-2.6.9-sparc-2.6.9/header-install 2004-12-28 08:26:16 UTC (rev 2084)
+++ trunk/kernel/sparc/kernel-image-2.6.9-sparc-2.6.9/header-install 2004-12-28 08:29:30 UTC (rev 2085)
@@ -0,0 +1,30 @@
+#!/bin/sh
+
+set -e
+
+kbpkg=@kbpkg@
+
+cd $DEBIAN_SRCTOP
+{
+ find . -path './scripts/*' -prune -o \
+ -path './Documentation/*' -prune -o \
+ -path './debian/*' -prune -o \
+ -type f \( -name Makefile -o -name 'Kconfig*' \) -print
+ echo arch/sparc/kernel/asm-offsets.s
+ echo arch/sparc64/kernel/asm-offsets.s
+} | cpio -pd --preserve-modification-time $OLDPWD
+cd - > /dev/null
+ln -s ../$kbpkg/scripts .
+
+remove=
+cd include
+for i in asm-*; do
+ case ${i#asm-} in
+ generic | sparc | sparc64)
+ ;;
+ *)
+ remove="$remove $i"
+ ;;
+ esac
+done
+${remove:+rm -r $remove}
Modified: trunk/kernel/sparc/kernel-image-2.6.9-sparc-2.6.9/post-install
===================================================================
--- trunk/kernel/sparc/kernel-image-2.6.9-sparc-2.6.9/post-install 2004-12-28 08:26:16 UTC (rev 2084)
+++ trunk/kernel/sparc/kernel-image-2.6.9-sparc-2.6.9/post-install 2004-12-28 08:29:30 UTC (rev 2085)
@@ -29,15 +29,25 @@
mkdir -p $dir/include/linux
cp -a .config $dir
+echo $debnum-$suffix > $dir/.extraversion
+cp -a Module.symvers $dir
+
+find . -mindepth 1 -maxdepth 1 \
+ ! -name debian -a ! -name Documentation -a ! -name include -a \
+ ! -name '.*' -a \( \
+ -name Makefile -o -type d \) \
+ -printf "../kernel-headers-$prefix/%f\n" |
+ xargs ln -s --target-directory="$dir"
+
cd include
find . -mindepth 1 -maxdepth 1 \
- ! -name config -a ! -name linux \
+ ! -name config -a ! -name linux -a \( \
+ ! -name 'asm-*' -o -name asm-generic -o -name asm-sparc -o -name asm-sparc64 \) \
-printf "../../kernel-headers-$prefix/include/%f\n" |
xargs ln -s --target-directory=$dir/include
cp -a config $dir/include
find linux -mindepth 1 -maxdepth 1 \
- ! -name autoconf.h -a ! -name modules -a ! -name modversions.h -a \
- ! -name compile.h -a ! -name version.h \
+ ! -name autoconf.h -a ! -name compile.h -a ! -name version.h \
-printf "../../../kernel-headers-$prefix/include/linux/%f\n" |
xargs ln -s --target-directory=$dir/include/linux
cp -a linux/autoconf.h linux/compile.h \