r916 - in trunk/kernel/sparc/kernel-image-sparc-2.6: . debian
Joshua Kwan
joshk@haydn.debian.org
Tue, 20 Jul 2004 09:56:40 -0600
Author: joshk
Date: 2004-07-20 09:56:34 -0600 (Tue, 20 Jul 2004)
New Revision: 916
Added:
trunk/kernel/sparc/kernel-image-sparc-2.6/header-install
Modified:
trunk/kernel/sparc/kernel-image-sparc-2.6/debian/control
trunk/kernel/sparc/kernel-image-sparc-2.6/debian/rules
Log:
stuff-fixage
Modified: trunk/kernel/sparc/kernel-image-sparc-2.6/debian/control
===================================================================
--- trunk/kernel/sparc/kernel-image-sparc-2.6/debian/control 2004-07-20 15:51:38 UTC (rev 915)
+++ trunk/kernel/sparc/kernel-image-sparc-2.6/debian/control 2004-07-20 15:56:34 UTC (rev 916)
@@ -9,7 +9,7 @@
Package: kernel-image-2.6-sparc64
Section: base
Priority: optional
-Depends: kernel-image-2.6.7-sparc64 (= ${Source-Version})
+Depends: kernel-image-2.6.7-1-sparc64 (= ${Source-Version})
Architecture: sparc
Description: Linux 2.6 kernel binary image for UltraSPARC (sparc64) systems
This package will always depend on the latest 2.6 kernel for uniprocessor
@@ -18,7 +18,7 @@
Package: kernel-image-2.6-sparc64-smp
Section: base
Priority: optional
-Depends: kernel-image-2.6.7-sparc64-smp (= ${Source-Version})
+Depends: kernel-image-2.6.7-1-sparc64-smp (= ${Source-Version})
Architecture: sparc
Description: Linux 2.6 kernel binary image for SMP UltraSPARC (sparc64) systems
This package will always depend on the latest 2.6 kernel for multiprocessor
@@ -28,7 +28,7 @@
Architecture: sparc
Section: devel
Priority: optional
-Depends: kernel-headers-2.6.7-sparc64 (= ${Source-Version})
+Depends: kernel-headers-2.6.7-1-sparc64 (= ${Source-Version})
Description: Linux 2.6 kernel headers for UltraSPARC
This is a dummy package that will always depend on the latest version of
the kernel headers for Linux 2.6.x, uniprocessor sparc64 (UltraSPARC)
@@ -37,11 +37,11 @@
.
Currently the latest version is 2.6.7.
-Package: kernel-headers-2.6.7-sparc64
+Package: kernel-headers-2.6.7-1-sparc64
Architecture: sparc
Section: devel
Priority: optional
-Depends: coreutils | fileutils (>= 4.0), kernel-headers-2.6.7-1
+Depends: coreutils | fileutils (>= 4.0), kernel-kbuild-2.6-3
Provides: kernel-headers, kernel-headers-2.6
Description: Linux 2.6.7 kernel headers for UltraSPARC
This package provides kernel header files for kernel version 2.6.7 on
@@ -49,16 +49,16 @@
from external sources without needing a full copy of the kernel source.
.
If your kernel has more than one processor, you should install the
- kernel-headers-2.6.7-sparc64-smp package instead.
+ kernel-headers-2.6.7-1-sparc64-smp package instead.
.
- Please read /usr/share/doc/kernel-headers-2.6.7-1/debian.README.gz for
- details.
+ Please read /usr/share/doc/kernel-headers-2.6.7-1-sparc64/debian.README.gz
+ for details.
Package: kernel-headers-2.6-sparc64-smp
Architecture: sparc
Section: devel
Priority: optional
-Depends: kernel-headers-2.6.7-sparc64-smp (= ${Source-Version})
+Depends: kernel-headers-2.6.7-1-sparc64-smp (= ${Source-Version})
Description: Linux 2.6 kernel headers for UltraSPARC (SMP)
This is a dummy package that will always depend on the latest version of
the kernel headers for Linux 2.6.x, multiprocessor sparc64 (UltraSPARC)
@@ -67,11 +67,11 @@
.
Currently the latest version is 2.6.7.
-Package: kernel-headers-2.6.7-sparc64-smp
+Package: kernel-headers-2.6.7-1-sparc64-smp
Architecture: sparc
Section: devel
Priority: optional
-Depends: coreutils | fileutils (>= 4.0), kernel-headers-2.6.7-1
+Depends: coreutils | fileutils (>= 4.0), kernel-kbuild-2.6-3
Provides: kernel-headers, kernel-headers-2.6
Description: Linux 2.6.7 kernel headers for UltraSPARC (SMP)
This package provides kernel header files for kernel version 2.6.7 on
@@ -79,17 +79,18 @@
from external sources without needing a full copy of the kernel source.
.
If your kernel has only one processor, you should install the
- kernel-headers-2.6.7-sparc64 package instead.
+ kernel-headers-2.6.7-1-sparc64 package instead.
.
- Please read /usr/share/doc/kernel-headers-2.6.7-1/debian.README.gz for
- details.
+ Please read:
+ /usr/share/doc/kernel-headers-2.6.7-1-sparc64-smp/debian.README.gz
+ for details.
-Package: kernel-image-2.6.7-sparc64
+Package: kernel-image-2.6.7-1-sparc64
Section: base
Architecture: sparc
Priority: optional
Provides: kernel-image, kernel-image-2.6
-Depends: module-init-tools
+Depends: module-init-tools, initrd-tools
Suggests: silo, fdutils, kernel-doc-2.6.7
Description: Linux kernel binary image for UltraSPARC (sparc64) systems
This package contains the Linux kernel image, the System.map file,
@@ -109,7 +110,7 @@
NOTE: This kernel is strictly for UltraSPARC (sparc64) class systems. If you
do not have an UltraSPARC, then most likely you want the sparc32 image.
-Package: kernel-image-2.6.7-sparc64-smp
+Package: kernel-image-2.6.7-1-sparc64-smp
Section: base
Architecture: sparc
Priority: optional
Modified: trunk/kernel/sparc/kernel-image-sparc-2.6/debian/rules
===================================================================
--- trunk/kernel/sparc/kernel-image-sparc-2.6/debian/rules 2004-07-20 15:51:38 UTC (rev 915)
+++ trunk/kernel/sparc/kernel-image-sparc-2.6/debian/rules 2004-07-20 15:56:34 UTC (rev 916)
@@ -13,11 +13,13 @@
KPKG_EMAIL := "debian-kernel@lists.debian.org"
VERSION := 2.6.7
kdir := kernel-source-$(VERSION)
+debnamever := 1
debver := $(shell dpkg-parsechangelog | awk '/^Version:/ {print $$2}' | sed 's/^[0-9]\+://')
SHELL := /bin/bash -e
do_clean := no
SMP_CPU_COUNT := 32
KPKG_ARCH := sparc
+DEBIAN_SRCTOP := $(CURDIR)/$(kdir)
ifneq (root,$(shell whoami))
ROOT := --rootcmd fakeroot
@@ -38,7 +40,7 @@
CROSS_COMPILE := sparc-linux
endif
-export KPKG_MAINTAINER KPKG_EMAIL KPKG_ARCH CROSS_COMPILE do_clean HEADER_CLEAN_HOOK
+export KPKG_MAINTAINER KPKG_EMAIL KPKG_ARCH CROSS_COMPILE do_clean HEADER_CLEAN_HOOK DEBIAN_SRCTOP
all_subarches := $(foreach subarch, $(shell ls config), stamps/build-$(subarch)-stamp stamps/build-$(subarch)-smp-stamp)
all_dummies := $(foreach subarch, $(shell ls config), stamps/build-dummy-2.6-$(subarch)-stamp stamps/build-dummy-2.6-$(subarch)-smp-stamp stamps/build-headers-dummy-2.6-$(subarch)-stamp stamps/build-headers-dummy-2.6-$(subarch)-smp-stamp)
@@ -89,17 +91,17 @@
cp debian/changelog debian/control $(kdir)/debian
echo official > $(kdir)/debian/official
cp config/$* $(kdir)/.config
- $(SHELL) -c "( \
+ subarch=$(subst -smp,,$*) $(SHELL) -c "( \
cd $(kdir); \
make-kpkg $(ROOT) --subarch $* clean; \
- make-kpkg --subarch $* --append-to-version "-$*" build; \
+ make-kpkg --subarch $* --append-to-version "-$(debnamever)-$*" build; \
$(CROSS_COMPILE)-strip -R .comment -R .note -K sun4u_init -K _end -K _start vmlinux; \
- make-kpkg $(ROOT) --initrd --subarch $* --append-to-version "-$*" kernel-image; \
- make-kpkg $(ROOT) --subarch $* --append-to-version "-$*" kernel-headers; \
+ make-kpkg $(ROOT) --initrd --subarch $* --append-to-version "-$(debnamever)-$*" kernel-image; \
+ HEADER_CLEAN_HOOK=$(CURDIR)/header-install make-kpkg $(ROOT) --subarch $* --append-to-version "-$(debnamever)-$*" kernel-headers; \
cat debian/files >> ../debian/files; \
);"
- mv -f kernel-image-$(VERSION)-$*_$(debver)_sparc.deb ../
- mv -f kernel-headers-$(VERSION)-$*_$(debver)_sparc.deb ../
+ mv -f kernel-image-$(VERSION)-$(debnamever)-$*_$(debver)_sparc.deb ../
+ mv -f kernel-headers-$(VERSION)-$(debnamever)-$*_$(debver)_sparc.deb ../
touch $@
config/%-smp: config/%
Added: trunk/kernel/sparc/kernel-image-sparc-2.6/header-install
===================================================================
--- trunk/kernel/sparc/kernel-image-sparc-2.6/header-install 2004-07-20 15:51:38 UTC (rev 915)
+++ trunk/kernel/sparc/kernel-image-sparc-2.6/header-install 2004-07-20 15:56:34 UTC (rev 916)
@@ -0,0 +1,29 @@
+#!/bin/sh
+
+set -e -x
+
+kbpkg=kernel-kbuild-2.6-3
+
+cd $kdir
+{
+ find . -path './scripts/*' -prune -o \
+ -path './Documentation/*' -prune -o \
+ -path './debian/*' -prune -o \
+ -type f \( -name Makefile -o -name 'Kconfig*' \) -print
+ echo arch/$subarch/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 | $subarch)
+ ;;
+ *)
+ remove="$remove $i"
+ ;;
+ esac
+done
+${remove:+rm -r $remove}
Property changes on: trunk/kernel/sparc/kernel-image-sparc-2.6/header-install
___________________________________________________________________
Name: svn:executable
+ *