* Moved scripts subdirectory to the -headers package

and got rid of all kernel-kbuild references.
* Tested with 686 flavour on i386, packages produce
  file layout identical to official ones.
* Lots of minor fixes.

svn path=/branches/kernel-image-2.6.11/; revision=3201
This commit is contained in:
Jurij Smakov 2005-05-20 05:56:49 +00:00
parent af95f5e28d
commit 54730b8f7f
7 changed files with 24 additions and 6213 deletions

2
TODO
View File

@ -11,3 +11,5 @@ Major TODO items remaining:
* Various remaining kludges (stripping and sparc32/sparc64 stuff on sparc,
for example).
* Get rid of the /lib/modules/<version>/source symlink.

File diff suppressed because it is too large Load Diff

File diff suppressed because it is too large Load Diff

View File

@ -1,59 +1,25 @@
Package: kernel-headers-@version@-@abiname@-386
Package: kernel-headers-2.6.11-1-686
Architecture: i386
Section: devel
Priority: optional
Depends: coreutils | fileutils (>= 4.0), kernel-headers-@version@-@abiname@
Depends: coreutils | fileutils (>= 4.0), kernel-headers-2.6.11-1
Provides: kernel-headers, kernel-headers-2.6
Description: Linux kernel headers @version@ on 386
This package provides kernel header files for version @version@ on 386.
Please read /usr/share/doc/kernel-headers-@version@-@abiname@/debian.README.gz for
details
Package: kernel-image-@version@-@abiname@-386
Architecture: i386
Section: base
Priority: optional
Provides: kernel-image, kernel-image-2.6
Depends: initrd-tools (>= 0.1.76), coreutils | fileutils (>= 4.0), module-init-tools (>= 0.9.13)
Conflicts: hotplug (<< 0.0.20040105-1)
Suggests: lilo (>= 19.1) | grub, fdutils, kernel-doc-@version@ | kernel-source-@version@
Description: Linux kernel image for version @version@ on 386.
This package contains the Linux kernel image for version @version@ on 386,
the corresponding System.map file, and the modules built by the packager.
It also contains scripts that try to ensure that the system is not left in
a unbootable state after an update.
.
If you wish to update a bootdisk, or to use a bootloader to make
installing and using the image easier, we suggest you install the latest
fdutils (for formatting a floppy to be used as boot disk), and LILO, for a
powerful bootloader. Of course, both these are optional.
.
Kernel image packages are generally produced using kernel-package,
and it is suggested that you install that package if you wish to
create a custom kernel from the sources.
Package: kernel-headers-@version@-@abiname@-686
Architecture: i386
Section: devel
Priority: optional
Depends: coreutils | fileutils (>= 4.0), kernel-headers-@version@-@abiname@
Provides: kernel-headers, kernel-headers-2.6
Description: Linux kernel headers @version@ on PPro/Celeron/PII/PIII/P4
This package provides kernel header files for version @version@ on
Description: Linux kernel headers 2.6.11 on PPro/Celeron/PII/PIII/P4
This package provides kernel header files for version 2.6.11 on
Pentium Pro/Celeron/Pentium II/Pentium III/Pentium 4.
Please read /usr/share/doc/kernel-headers-@version@-@abiname@/debian.README.gz for
Please read /usr/share/doc/kernel-headers-2.6.11-1/debian.README.gz for
details
Package: kernel-image-@version@-@abiname@-686
Package: kernel-image-2.6.11-1-686
Architecture: i386
Section: base
Priority: optional
Provides: kernel-image, kernel-image-2.6
Depends: initrd-tools (>= 0.1.76), coreutils | fileutils (>= 4.0), module-init-tools (>= 0.9.13)
Conflicts: hotplug (<< 0.0.20040105-1)
Suggests: lilo (>= 19.1) | grub, fdutils, kernel-doc-@version@ | kernel-source-@version@
Description: Linux kernel image for version @version@ on PPro/Celeron/PII/PIII/P4.
This package contains the Linux kernel image for version @version@ on
Suggests: lilo (>= 19.1) | grub, fdutils, kernel-doc-2.6.11 | kernel-source-2.6.11
Description: Linux kernel image for version 2.6.11 on PPro/Celeron/PII/PIII/P4.
This package contains the Linux kernel image for version 2.6.11 on
Pentium Pro/Celeron/Pentium II/Pentium III/Pentium 4,
the corresponding System.map file, and the modules built by the packager.
It also contains scripts that try to ensure that the system is not left in
@ -67,117 +33,3 @@ Description: Linux kernel image for version @version@ on PPro/Celeron/PII/PIII/P
Kernel image packages are generally produced using kernel-package,
and it is suggested that you install that package if you wish to
create a custom kernel from the sources.
Package: kernel-headers-@version@-@abiname@-686-smp
Architecture: i386
Section: devel
Priority: optional
Depends: coreutils | fileutils (>= 4.0), kernel-headers-@version@-@abiname@
Provides: kernel-headers, kernel-headers-2.6
Description: Linux kernel headers @version@ on PPro/Celeron/PII/PIII/P4 SMP
This package provides kernel header files for version @version@ on
Pentium Pro/Celeron/Pentium II/Pentium III/Pentium 4 with SMP support.
SMP (symmetric multi-processing) is needed if you have multiple processors.
Please read /usr/share/doc/kernel-headers-@version@-@abiname@/debian.README.gz for
details
Package: kernel-image-@version@-@abiname@-686-smp
Architecture: i386
Section: base
Priority: optional
Provides: kernel-image, kernel-image-2.6
Depends: initrd-tools (>= 0.1.76), coreutils | fileutils (>= 4.0), module-init-tools (>= 0.9.13)
Conflicts: hotplug (<< 0.0.20040105-1)
Recommends: irqbalance
Suggests: lilo (>= 19.1) | grub, fdutils, kernel-doc-@version@ | kernel-source-@version@
Description: Linux kernel image for version @version@ on PPro/Celeron/PII/PIII/P4 SMP.
This package contains the Linux kernel image for version @version@ on
Pentium Pro/Celeron/Pentium II/Pentium III/Pentium 4 with SMP support,
the corresponding System.map file, and the modules built by the packager.
SMP (symmetric multi-processing) is needed if you have multiple processors.
It also contains scripts that try to ensure that the system is not left in
a unbootable state after an update.
.
If you wish to update a bootdisk, or to use a bootloader to make
installing and using the image easier, we suggest you install the latest
fdutils (for formatting a floppy to be used as boot disk), and LILO, for a
powerful bootloader. Of course, both these are optional.
.
Kernel image packages are generally produced using kernel-package,
and it is suggested that you install that package if you wish to
create a custom kernel from the sources.
Package: kernel-headers-@version@-@abiname@-k7
Architecture: i386
Section: devel
Priority: optional
Depends: coreutils | fileutils (>= 4.0), kernel-headers-@version@-@abiname@
Provides: kernel-headers, kernel-headers-2.6
Description: Linux kernel headers @version@ on AMD K7
This package provides kernel header files for version @version@ on
32bit AMD Duron/Athlon/AthlonXP.
Please read /usr/share/doc/kernel-headers-@version@-@abiname@/debian.README.gz for
details
Package: kernel-image-@version@-@abiname@-k7
Architecture: i386
Section: base
Priority: optional
Provides: kernel-image, kernel-image-2.6
Depends: initrd-tools (>= 0.1.76), coreutils | fileutils (>= 4.0), module-init-tools (>= 0.9.13)
Conflicts: hotplug (<< 0.0.20040105-1)
Suggests: lilo (>= 19.1) | grub, fdutils, kernel-doc-@version@ | kernel-source-@version@
Description: Linux kernel image for version @version@ on AMD K7.
This package contains the Linux kernel image for version @version@ on
32bit AMD Duron/Athlon/AthlonXP, the corresponding System.map file,
and the modules built by the packager.
It also contains scripts that try to ensure that the system is not left in
a unbootable state after an update.
.
If you wish to update a bootdisk, or to use a bootloader to make
installing and using the image easier, we suggest you install the latest
fdutils (for formatting a floppy to be used as boot disk), and LILO, for a
powerful bootloader. Of course, both these are optional.
.
Kernel image packages are generally produced using kernel-package,
and it is suggested that you install that package if you wish to
create a custom kernel from the sources.
Package: kernel-headers-@version@-@abiname@-k7-smp
Architecture: i386
Section: devel
Priority: optional
Depends: coreutils | fileutils (>= 4.0), kernel-headers-@version@-@abiname@
Provides: kernel-headers, kernel-headers-2.6
Description: Linux kernel headers @version@ on AMD K7 SMP
This package provides kernel header files for version @version@ on
32bit AMD Duron/Athlon/AthlonXP with SMP support.
SMP (symmetric multi-processing) is needed if you have multiple processors.
Please read /usr/share/doc/kernel-headers-@version@-@abiname@/debian.README.gz for
details
Package: kernel-image-@version@-@abiname@-k7-smp
Architecture: i386
Section: base
Priority: optional
Provides: kernel-image, kernel-image-2.6
Depends: initrd-tools (>= 0.1.76), coreutils | fileutils (>= 4.0), module-init-tools (>= 0.9.13)
Conflicts: hotplug (<< 0.0.20040105-1)
Recommends: irqbalance
Suggests: lilo (>= 19.1) | grub, fdutils, kernel-doc-@version@ | kernel-source-@version@
Description: Linux kernel image for version @version@ on AMD K7 SMP.
This package contains the Linux kernel image for version @version@ on
32bit AMD Duron/Athlon/AthlonXP with SMP support, the corresponding
System.map file, and the modules built by the packager.
SMP (symmetric multi-processing) is needed if you have multiple processors.
It also contains scripts that try to ensure that the system is not left in
a unbootable state after an update.
.
If you wish to update a bootdisk, or to use a bootloader to make
installing and using the image easier, we suggest you install the latest
fdutils (for formatting a floppy to be used as boot disk), and LILO, for a
powerful bootloader. Of course, both these are optional.
.
Kernel image packages are generally produced using kernel-package,
and it is suggested that you install that package if you wish to
create a custom kernel from the sources.

11
debian/control.in vendored
View File

@ -6,20 +6,11 @@ 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-@version@-@ktver@, debhelper (>= 4), kernel-package, module-init-tools, sparc-utils [sparc]
Package: kernel-build-@version@-@abiname@
Architecture: any
Section: devel
Priority: optional
Depends: coreutils | fileutils (>= 4.0), @kbpkg@
Description: Headers for building modules for Linux @version@
This package provides kernel header files for building modules for the
precompiled kernel images on the @karch@ architecture.
Package: kernel-headers-@version@-@abiname@
Architecture: any
Section: devel
Priority: optional
Depends: coreutils | fileutils (>= 4.0), @kbuild_deps@
Depends: coreutils | fileutils (>= 4.0)
Provides: kernel-headers, kernel-headers-2.6
Description: Header files related to Linux kernel version @version@
This package provides kernel header files for version @version@, generally

16
debian/rules.subarch vendored
View File

@ -75,6 +75,7 @@ ifneq (no,$(include_common_config))
ccommon := arch/config.common
endif
ccommon += arch/$(karch)/config.common arch/$(karch)/$(subarch)/config.common
bdirs := $(addprefix build-$(subarch)-, $(flavours))
#
# TODO:
# * Check that make oldconfig does not actually
@ -82,13 +83,8 @@ ccommon += arch/$(karch)/config.common arch/$(karch)/$(subarch)/config.common
# is wrong (missing/extra options, etc).
#
unpack: unpack-stamp-$(subarch)
unpack-stamp-$(subarch): $(kdir) $(configs) header-install-$(subarch)
for i in $(flavours); do \
cp -al $(kdir) build-$(subarch)-$$i; \
cp config.$$i build-$(subarch)-$$i/.config; \
done
# Need to clean out configs so that there is no filename
# clash with other subarches.
unpack-stamp-$(subarch): $(configs) header-install-$(subarch) $(bdirs)
# We remove the configs just in case
rm -f $(configs)
touch unpack-stamp-$(subarch)
#
@ -185,4 +181,10 @@ $(kdir): post-install
# Here we need to do the subarch-specific patching
mv $(tkdir) $@
build-%: $(kdir)
if [ ! -d $@ ]; then \
cp -al $(kdir) $@; \
cp config.$(subst build-$(subarch)-,,$@) $@/.config; \
fi
.PHONY: build unpack binary-indep binary-arch binary

View File

@ -8,20 +8,16 @@
#
set -e
kbpkg=@kbpkg@
cd @ksource_dir@
{
find . -path './scripts/*' -prune -o \
-path './Documentation/*' -prune -o \
-path './debian/*' -prune -o \
-type f \( -name Makefile -o -name 'Kconfig*' \) -print
find . -path './Documentation/*' -prune -o \
-path './debian/*' -prune -o -type f \
\( -name Makefile -o -name 'Kconfig*' -o -path './scripts/*' \) -print
for i in @headers_extra@; do
echo "${i}"
done
} | cpio -pd --preserve-modification-time $OLDPWD
cd - > /dev/null
ln -s ../${kbpkg}/scripts .
remove=
cd include