r2243 - in trunk/kernel-2.4/sparc/kernel-image-2.4.27-sparc-2.4.27: . config debian
Joshua Kwan
joshk@costa.debian.org
Sun, 09 Jan 2005 23:14:43 +0100
Author: joshk
Date: 2005-01-09 23:14:42 +0100 (Sun, 09 Jan 2005)
New Revision: 2243
Added:
trunk/kernel-2.4/sparc/kernel-image-2.4.27-sparc-2.4.27/header-install
Modified:
trunk/kernel-2.4/sparc/kernel-image-2.4.27-sparc-2.4.27/config/sparc32
trunk/kernel-2.4/sparc/kernel-image-2.4.27-sparc-2.4.27/config/sparc32-smp
trunk/kernel-2.4/sparc/kernel-image-2.4.27-sparc-2.4.27/debian/changelog
trunk/kernel-2.4/sparc/kernel-image-2.4.27-sparc-2.4.27/debian/control
trunk/kernel-2.4/sparc/kernel-image-2.4.27-sparc-2.4.27/debian/rules
trunk/kernel-2.4/sparc/kernel-image-2.4.27-sparc-2.4.27/post-install
Log:
more work..
Modified: trunk/kernel-2.4/sparc/kernel-image-2.4.27-sparc-2.4.27/config/sparc32
===================================================================
--- trunk/kernel-2.4/sparc/kernel-image-2.4.27-sparc-2.4.27/config/sparc32 2005-01-09 22:02:50 UTC (rev 2242)
+++ trunk/kernel-2.4/sparc/kernel-image-2.4.27-sparc-2.4.27/config/sparc32 2005-01-09 22:14:42 UTC (rev 2243)
@@ -42,7 +42,7 @@
# CONFIG_RWSEM_XCHGADD_ALGORITHM is not set
CONFIG_SUN_PM=y
# CONFIG_SUN4 is not set
-CONFIG_PCI=y
+# CONFIG_PCI is not set
# CONFIG_PCI_NAMES is not set
CONFIG_SUN_OPENPROMFS=m
CONFIG_NET=y
Modified: trunk/kernel-2.4/sparc/kernel-image-2.4.27-sparc-2.4.27/config/sparc32-smp
===================================================================
--- trunk/kernel-2.4/sparc/kernel-image-2.4.27-sparc-2.4.27/config/sparc32-smp 2005-01-09 22:02:50 UTC (rev 2242)
+++ trunk/kernel-2.4/sparc/kernel-image-2.4.27-sparc-2.4.27/config/sparc32-smp 2005-01-09 22:14:42 UTC (rev 2243)
@@ -43,7 +43,7 @@
# CONFIG_RWSEM_XCHGADD_ALGORITHM is not set
CONFIG_SUN_PM=y
# CONFIG_SUN4 is not set
-CONFIG_PCI=y
+# CONFIG_PCI is not set
# CONFIG_PCI_NAMES is not set
CONFIG_SUN_OPENPROMFS=m
CONFIG_NET=y
Modified: trunk/kernel-2.4/sparc/kernel-image-2.4.27-sparc-2.4.27/debian/changelog
===================================================================
--- trunk/kernel-2.4/sparc/kernel-image-2.4.27-sparc-2.4.27/debian/changelog 2005-01-09 22:02:50 UTC (rev 2242)
+++ trunk/kernel-2.4/sparc/kernel-image-2.4.27-sparc-2.4.27/debian/changelog 2005-01-09 22:14:42 UTC (rev 2243)
@@ -3,6 +3,8 @@
* Add missing build-depends on modutils (minor, this package is
never built from source)
* Set CONFIG_DM9102=m, thanks Thomas Michlmayr.
+ * Bump soname to 2 because of security fixes from kernel-tree-2.4.27-7.
+ * Disable CONFIG_PCI, closes: #288140
-- Joshua Kwan <joshk@triplehelix.org> Sun, 28 Nov 2004 00:16:00 -0500
Modified: trunk/kernel-2.4/sparc/kernel-image-2.4.27-sparc-2.4.27/debian/control
===================================================================
--- trunk/kernel-2.4/sparc/kernel-image-2.4.27-sparc-2.4.27/debian/control 2005-01-09 22:02:50 UTC (rev 2242)
+++ trunk/kernel-2.4/sparc/kernel-image-2.4.27-sparc-2.4.27/debian/control 2005-01-09 22:14:42 UTC (rev 2243)
@@ -23,9 +23,20 @@
Depends: coreutils | fileutils (>= 4.0)
Provides: kernel-headers, kernel-headers-2.4
Description: Header files related to Linux kernel version 2.4.27
- This package provides kernel header files for version 2.4.27, for sites
- that want the latest kernel headers. Please read
- /usr/share/doc/kernel-headers-2.4.27-2/debian.README.gz for details
+ This package provides kernel header files for version 2.6.8, 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 three header
+ packages you should really be using for building modules:
+ .
+ - kernel-headers-2.4.27-2-sparc32
+ - kernel-headers-2.4.27-2-sparc32-smp
+ - kernel-headers-2.4.27-2-sparc64
+ - kernel-headers-2.4.27-2-sparc64-smp
+ .
+ For more information you can also read:
+ /usr/share/doc/kernel-headers-2.4.27-2/debian.README.gz.
Package: kernel-headers-2.4.27-2-sparc32
Architecture: sparc
@@ -34,14 +45,12 @@
Depends: coreutils | fileutils (>= 4.0), kernel-headers-2.4.27-2
Provides: kernel-headers, kernel-headers-2.4
Description: Header files for Linux kernel 2.4.27 on uniprocessor 32-bit SPARC
- This package provides kernel header files for version 2.4.27 on
- the SPARC architecture, used to build out-of-tree kernel modules.
- If your CPU is an UltraSPARC, you want kernel-headers-2.4.27-2-sparc64
- instead of this package, or if you have more than one CPU, you want
- kernel-headers-2.4.27-2-sparc32-smp.
+ This package provides kernel header files for version 2.4.27 on the 32-bit
+ SPARC architecture, used to build out-of-tree kernel modules.
.
- Please read /usr/share/doc/kernel-headers-2.4.27-2-sparc32/debian.README.gz
- for details.
+ You need this package to build modules if "uname -r" returns 2.4.27-2-sparc32.
+ Please see the "module-assistant" package for more information on building
+ external kernel modules.
Package: kernel-image-2.4.27-2-sparc32
Section: base
@@ -75,14 +84,12 @@
Depends: coreutils | fileutils (>= 4.0), kernel-headers-2.4.27-2
Provides: kernel-headers, kernel-headers-2.4
Description: Header files for Linux kernel 2.4.27 on multiprocessor 32-bit SPARC
- This package provides kernel header files for version 2.4.27 on
- the SPARC architecture, used to build out-of-tree kernel modules. If you
- have UltraSPARC CPUs, you want the kernel-headers-2.4.27-2-sparc64-smp
- package instead, or if you only have one processor, you want the
- kernel-headers-2.4.27-2-sparc32 package.
+ This package provides kernel header files for version 2.4.27 on the 32-bit
+ SPARC architecture, used to build out-of-tree kernel modules.
.
- Please read /usr/share/doc/kernel-headers-2.4.27-2-sparc32-smp/debian.README.gz
- for details.
+ You need this package to build modules if "uname -r" returns
+ 2.4.27-2-sparc32-smp. Please see the "module-assistant" package for more
+ information on building external kernel modules.
Package: kernel-image-2.4.27-2-sparc32-smp
Section: base
@@ -118,14 +125,12 @@
Depends: coreutils | fileutils (>= 4.0), kernel-headers-2.4.27-2
Provides: kernel-headers, kernel-headers-2.4
Description: Header files for Linux kernel 2.4.27 on uniprocessor 64-bit SPARC
- This package provides kernel header files for version 2.4.27 on the 64-bit
- SPARC architecture, used to build out-of-tree kernel modules. If you
- have a Super/HyperSPARC CPU, you want the kernel-headers-2.4.27-2-sparc32
- package instead, or if you have more than one processor, you want the
- kernel-headers-2.4.27-2-sparc64-smp package.
+ This package provides kernel header files for version 2.4.27 on the 64-bit
+ SPARC architecture, used to build out-of-tree kernel modules.
.
- Please read /usr/share/doc/kernel-headers-2.4.27-2-sparc64/debian.README.gz
- for details.
+ You need this package to build modules if "uname -r" returns 2.4.27-2-sparc64.
+ Please see the "module-assistant" package for more information on building
+ external kernel modules.
Package: kernel-image-2.4.27-2-sparc64
Section: base
@@ -159,14 +164,12 @@
Depends: coreutils | fileutils (>= 4.0), kernel-headers-2.4.27-2
Provides: kernel-headers, kernel-headers-2.4
Description: Header files for Linux kernel 2.4.27 on multiprocessor 64-bit SPARC
- This package provides kernel header files for version 2.4.27 on the 64-bit
- SPARC architecture, used to build out-of-tree kernel modules. If you
- have Super/HyperSPARC CPUs, you want the kernel-headers-2.4.27-2-sparc32-smp
- package instead, or if you only have one processor, you want the
- kernel-headers-2.4.27-2-sparc64 package.
+ This package provides kernel header files for version 2.4.27 on the 32-bit
+ SPARC architecture, used to build out-of-tree kernel modules.
.
- Please read /usr/share/doc/kernel-headers-2.4.27-2-sparc64-smp/debian.README.gz
- for details.
+ You need this package to build modules if "uname -r" returns
+ 2.4.27-2-sparc64-smp. Please see the "module-assistant" package for more
+ information on building external kernel modules.
Package: kernel-image-2.4.27-2-sparc64-smp
Section: base
Modified: trunk/kernel-2.4/sparc/kernel-image-2.4.27-sparc-2.4.27/debian/rules
===================================================================
--- trunk/kernel-2.4/sparc/kernel-image-2.4.27-sparc-2.4.27/debian/rules 2005-01-09 22:02:50 UTC (rev 2242)
+++ trunk/kernel-2.4/sparc/kernel-image-2.4.27-sparc-2.4.27/debian/rules 2005-01-09 22:14:42 UTC (rev 2243)
@@ -37,6 +37,8 @@
)
kdir := kernel-source-$(version)
+export DEBIAN_SRCTOP := $(CURDIR)/$(kdir)
+
unpack: unpack-stamp
unpack-stamp:
tar jxf /usr/src/kernel-source-$(version).tar.bz2
@@ -94,7 +96,7 @@
binary-arch: install
dh_testdir
- cd kernel-source-$(version); \
+ cd kernel-source-$(version); HEADER_CLEAN_HOOK=$(CURDIR)/header-install \
make-kpkg --subarch sparc64 $(appvan) kernel-headers
mv kernel-source-$(version)/debian/files debian
Added: trunk/kernel-2.4/sparc/kernel-image-2.4.27-sparc-2.4.27/header-install
===================================================================
--- trunk/kernel-2.4/sparc/kernel-image-2.4.27-sparc-2.4.27/header-install 2005-01-09 22:02:50 UTC (rev 2242)
+++ trunk/kernel-2.4/sparc/kernel-image-2.4.27-sparc-2.4.27/header-install 2005-01-09 22:14:42 UTC (rev 2243)
@@ -0,0 +1,18 @@
+#!/bin/sh
+
+set -e
+
+cd $DEBIAN_SRCTOP
+find . -type f -path './scripts/*' ! -name '*.o' | \
+ cpio -pd --preserve-modification-time $OLDPWD
+cd - > /dev/null
+
+remove=
+cd include
+for i in asm-*; do
+ case ${i#asm-} in
+ generic | sparc | sparc64) ;;
+ *) remove="$remove $i" ;;
+ esac
+done
+${remove:+rm -r $remove}
Property changes on: trunk/kernel-2.4/sparc/kernel-image-2.4.27-sparc-2.4.27/header-install
___________________________________________________________________
Name: svn:executable
+ *
Modified: trunk/kernel-2.4/sparc/kernel-image-2.4.27-sparc-2.4.27/post-install
===================================================================
--- trunk/kernel-2.4/sparc/kernel-image-2.4.27-sparc-2.4.27/post-install 2005-01-09 22:02:50 UTC (rev 2242)
+++ trunk/kernel-2.4/sparc/kernel-image-2.4.27-sparc-2.4.27/post-install 2005-01-09 22:14:42 UTC (rev 2243)
@@ -20,7 +20,10 @@
suffix=${version#*$debnum-}
+karch=${suffix%-smp}
+karch=${karch%32}
prefix=${version%%-*}$debnum
+
pkg=kernel-headers-$version
top=$PWD/debian/$pkg
dir=$top/usr/src/kernel-headers-$version
@@ -31,7 +34,7 @@
cp -a .config $dir
cd include
find . -mindepth 1 -maxdepth 1 \
- ! -name config -a ! -name linux \
+ ! -name config -a ! -name linux -a ! -name asm-$karch \
-printf "../../kernel-headers-$prefix/include/%f\n" |
xargs ln -s --target-directory=$dir/include
cp -a config $dir/include
@@ -39,9 +42,16 @@
! -name autoconf.h -a ! -name modules -a ! -name modversions.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
+ xargs ln -s --target-directory="$dir/include/linux"
cp -a linux/autoconf.h linux/modules linux/modversions.h linux/compile.h \
linux/version.h $dir/include/linux
+mkdir -p $dir/include/asm-$karch
+find asm-$karch -mindepth 1 -maxdepth 1 -not -name asm_offsets.h \
+ -printf "../../../kernel-headers-$prefix/include/asm-$karch/%f\n" |
+ xargs ln -s --target-directory="$dir/include/asm-$karch"
+cp -a asm-$karch/asm_offsets.h $dir/include/asm-$karch/
+ln -sf asm-$karch $dir/include/asm
+
cd ..
mkdir -p $top/lib/modules/$version
@@ -49,7 +59,6 @@
debhelper_post $pkg
-
bpkg=kernel-build-$prefix
top=$PWD/../debian/$bpkg