r3240 - in branches/kernel-image-2.6.11/debian: . templates
Jurij Smakov
jurij-guest@costa.debian.org
Fri, 27 May 2005 01:12:29 +0000
Author: jurij-guest
Date: 2005-05-27 01:12:29 +0000 (Fri, 27 May 2005)
New Revision: 3240
Added:
branches/kernel-image-2.6.11/debian/templates/
branches/kernel-image-2.6.11/debian/templates/control.in
branches/kernel-image-2.6.11/debian/templates/control.main.in
branches/kernel-image-2.6.11/debian/templates/header-install.in
branches/kernel-image-2.6.11/debian/templates/post-install.in
Removed:
branches/kernel-image-2.6.11/debian/control.in
branches/kernel-image-2.6.11/debian/header-install.in
branches/kernel-image-2.6.11/debian/post-install.in
Modified:
branches/kernel-image-2.6.11/debian/Makefile
branches/kernel-image-2.6.11/debian/rules
Log:
Rearrangements in preparation to merge with
kernel-source
Modified: branches/kernel-image-2.6.11/debian/Makefile
===================================================================
--- branches/kernel-image-2.6.11/debian/Makefile 2005-05-26 01:53:38 UTC (rev 3239)
+++ branches/kernel-image-2.6.11/debian/Makefile 2005-05-27 01:12:29 UTC (rev 3240)
@@ -129,21 +129,21 @@
binary: binary-indep binary-arch
-header-install-$(subarch): header-install.in
+header-install-$(subarch): templates/header-install.in
sed -e 's,@kbpkg@,$(kbpkg),g' \
-e 's,@ksource_dir@,$(CURDIR)/$(kdir),g' \
-e 's,@headers_dirs@,$(headers_dirs),g' \
-e 's,@headers_extra@,$(headers_extra),g' \
- header-install.in > header-install-$(subarch)
+ templates/header-install.in > header-install-$(subarch)
chmod u+x header-install-$(subarch)
#
# The way to make the correct package names is to make a
# subarch-specific post-install script...
#
-post-install-$(subarch): post-install.in
+post-install-$(subarch): templates/post-install.in
sed -e 's,@initrd_modules@,$(initrd_modules),' \
-e 's,@append_subarch@,$(append),' \
- post-install.in > post-install-$(subarch)
+ templates/post-install.in > post-install-$(subarch)
#
# Generates the kernel config file for a subarch by merging
# the arch-independent config file (arch/config.common),
Deleted: branches/kernel-image-2.6.11/debian/control.in
===================================================================
--- branches/kernel-image-2.6.11/debian/control.in 2005-05-26 01:53:38 UTC (rev 3239)
+++ branches/kernel-image-2.6.11/debian/control.in 2005-05-27 01:12:29 UTC (rev 3240)
@@ -1,24 +0,0 @@
-Source: kernel-image-@version@
-Section: devel
-Priority: optional
-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-@version@-@ktver@, debhelper (>= 4), kernel-package, module-init-tools, sparc-utils [sparc]
-
-Package: kernel-headers-@version@-@abiname@
-Architecture: any
-Section: devel
-Priority: optional
-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
- 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 subarchitecture
- specific header packages, which should be used for building modules.
- .
- For more information you can also read:
- /usr/share/doc/kernel-headers-@version@-@abiname@/debian.README.gz.
Deleted: branches/kernel-image-2.6.11/debian/header-install.in
===================================================================
--- branches/kernel-image-2.6.11/debian/header-install.in 2005-05-26 01:53:38 UTC (rev 3239)
+++ branches/kernel-image-2.6.11/debian/header-install.in 2005-05-27 01:12:29 UTC (rev 3240)
@@ -1,33 +0,0 @@
-#!/bin/sh
-#
-# This is the make-kpkg hook file, which runs when make-kpkg is invoked
-# (from debian/rules) to create the flavour-independent kernel-headers
-# package. Two major tasks which it performs are a) copying the extra
-# files into the temporary kernel-headers directory and b) removing
-# unneeded include/asm-* directories.
-#
-set -e
-
-cd @ksource_dir@
-{
- 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
-
-remove=
-cd include
-for i in asm-*; do
- case ${i#asm-} in
- generic | @headers_dirs@)
- ;;
- *)
- remove="$remove $i"
- ;;
- esac
-done
-${remove:+rm -r $remove}
Deleted: branches/kernel-image-2.6.11/debian/post-install.in
===================================================================
--- branches/kernel-image-2.6.11/debian/post-install.in 2005-05-26 01:53:38 UTC (rev 3239)
+++ branches/kernel-image-2.6.11/debian/post-install.in 2005-05-27 01:12:29 UTC (rev 3240)
@@ -1,115 +0,0 @@
-#!/bin/sh
-#
-# This is the hook file executed by make-kpkg in the end of creation
-# of the kernel-image for a particular flavour. The major task it performs
-# is the creation of the flavour-specific kernel-headers package.
-#
-set -e
-
-debhelper_pre() {
- dh_clean -k --package="$1"
- dh_installdirs --package="$1"
-}
-
-debhelper_post() {
- dh_installdocs --package="$1"
- dh_installchangelogs --package="$1"
- dh_compress --package="$1"
- dh_fixperms --package="$1"
- dh_installdeb --package="$1"
- dh_gencontrol --package="$1"
- dh_md5sums --package="$1"
- dh_builddeb --package="$1"
-}
-# The version which ends up here is something like
-# $(version)-$(abiname)-$(flavour) and debnum is just
-# -$(abiname), so that the variables get the values:
-# suffix=$(flavour)
-# prefix=$(version)-$(abiname)
-# prefix is then used to form a destination directory
-# to link to. For cases with subarch we need to link
-# to kernel-headers-$(version)-$(abiname)-$(subarch),
-# not just kernel-headers-$(version)-$(abiname). Note
-# that the append_subarch substitution must contain a
-# dash, if it is non-empty.
-#
-append='@append_subarch@'
-suffix=${version#*$debnum-}
-prefix=${version%%-*}${debnum}${append}
-pkg=kernel-headers-$version
-top=$PWD/debian/$pkg
-dir=$top/usr/src/kernel-headers-$version
-#
-# Here we need to find the kernel architecture which
-# is appropriate for the current flavour. It is available
-# in kernel-package as KERNEL_ARCH. Cleanest way is to get
-# make-kpkg export it to this script.
-#
-# Currently we'll have to do some fiddling here For
-# example for sparc we need to map sparc32* to 'sparc'
-# and sparc64* to 'sparc64'. The default for other
-# arches is the name of the architecture.
-#
-case ${DEB_HOST_ARCH} in
- sparc*)
- KERNEL_ARCH=${suffix%-smp}
- KERNEL_ARCH=${KERNEL_ARCH%32}
- ;;
- *)
- KERNEL_ARCH=${DEB_HOST_ARCH}
- ;;
-esac
-
-debhelper_pre $pkg
-
-#
-# Stuff below is ugly as hell, but does the trick so I'm not
-# touching it until we can invent something better.
-#
-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 -a \( \
- ! -name 'asm-*' -o -name asm-generic -o -name asm-${KERNEL_ARCH} \) \
- -printf "../../kernel-headers-$prefix/include/%f\n" |
- xargs ln -s --target-directory=$dir/include
-cp -a config $dir/include
-ln -sf asm-${KERNEL_ARCH} $dir/include/asm
-find linux -mindepth 1 -maxdepth 1 \
- ! -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 \
- linux/version.h $dir/include/linux
-cd ..
-
-mkdir -p $top/lib/modules/$version
-ln -s /usr/src/kernel-headers-$version $top/lib/modules/$version/build
-
-debhelper_post $pkg
-
-#
-# Check whether we should force any modules to be available
-# on the initrd.
-#
-cd ${IMAGE_TOP}/lib/modules/${version}
-modules='@initrd_modules@'
-if [ -n "${modules}" ]; then
- mkdir initrd
- for i in ${modules}; do
- if [ -f "${i}" ]; then
- ln "${i}" initrd
- fi
- done
-fi
Modified: branches/kernel-image-2.6.11/debian/rules
===================================================================
--- branches/kernel-image-2.6.11/debian/rules 2005-05-26 01:53:38 UTC (rev 3239)
+++ branches/kernel-image-2.6.11/debian/rules 2005-05-27 01:12:29 UTC (rev 3240)
@@ -1,7 +1,7 @@
#!/usr/bin/make -f
#
# Required variables
-#
+#
version := 2.6.11
abiname := 1
ktver := 5
Copied: branches/kernel-image-2.6.11/debian/templates/control.in (from rev 3239, branches/kernel-image-2.6.11/debian/control.in)
Added: branches/kernel-image-2.6.11/debian/templates/control.main.in
===================================================================
--- branches/kernel-image-2.6.11/debian/templates/control.main.in 2005-05-26 01:53:38 UTC (rev 3239)
+++ branches/kernel-image-2.6.11/debian/templates/control.main.in 2005-05-27 01:12:29 UTC (rev 3240)
@@ -0,0 +1,100 @@
+Source: linux-world-@version@
+Section: devel
+Priority: optional
+Maintainer: Debian Kernel Team <debian-kernel@lists.debian.org>
+Standards-Version: 3.6.1.0
+Build-Depends: Build-Depends: gcc (>= 4:3.3), debhelper (>= 4), kernel-package, module-init-tools, sparc-utils [sparc]
+
+Package: linux-source-@version@
+Architecture: all
+Section: devel
+Priority: optional
+Provides: linux-source, linux-source-@major@, kernel-source, kernel-source-@major@
+Depends: binutils, bzip2, coreutils | fileutils (>= 4.0)
+Recommends: libc6-dev | libc-dev, gcc, make
+Suggests: libncurses-dev | ncurses-dev, kernel-package, libqt3-mt-dev
+Description: Linux kernel source for version @version@ with Debian patches
+ This package provides the source code for the Linux kernel version 2.6.11.
+ .
+ If you wish to use this package to create a custom Linux kernel, then
+ it is suggested that you investigate the package kernel-package,
+ which has been designed to ease the task of creating kernel image
+ packages.
+
+Package: linux-docs-@version@
+Architecture: all
+Section: doc
+Priority: optional
+Provides: linux-docs-@major@, kernel-doc-@major@
+Depends: coreutils | fileutils (>= 4.0)
+Description: Linux kernel specific documentation for version @version@
+ This package provides the various README files in the @version@ kernel
+ Documentation/ subdirectory: these typically contain kernel-specific
+ installation notes for some drivers for example. See
+ /usr/share/doc/kernel-doc-@version@/Documentation/00-INDEX for a list of what
+ is contained in each file.
+
+Package: linux-patch-debian-@version@
+Architecture: all
+Section: devel
+Priority: optional
+Depends: bzip2
+Suggests: linux-source-@version@
+Description: Debian patches to version @version@ of the Linux kernel
+ This package includes the patches used to produce the prepackaged
+ linux-source-@version@ package. Note that these patches do NOT apply
+ against a pristine Linux @version@ kernel but only against
+ linux-source-@version@_@version@.orig.tar.gz from the Debian archive.
+
+Package: linux-tree-@version@
+Architecture: all
+Section: devel
+Priority: optional
+Depends: linux-patch-debian-@version@ (= @source_version@), @kt_depends@
+Provides: @kt_provides@
+Description: Linux kernel source tree for building Debian kernel images
+ This meta package is used as a build dependency of Debian
+ linux-image packages to prevent a version discrepancy between
+ the linux-image and corresponding linux-sources packages in the
+ fast-moving unstable archive. The package's dependency relations
+ are structured so that a linux-image package's build
+ dependencies can always be satisfied, even if the linux-source
+ package that had been used to compile the image has been
+ superseeded by a newer Debian revision since the last build.
+ .
+ The package provides a list of virtual packages, corresponding to
+ Debian revisions of a linux-source package. The Debian
+ linux-patch contains the information needed to roll back the
+ current linux-source to any of the revisions identified by the
+ provided virtual packages. Therefore, the linux-tree package
+ ensures the availability of the Linux kernel source tree corresponding
+ to each of the virtual packages listed.
+ .
+ The package serves no purpose outside of the Debian build and
+ archive infrastructure.
+
+Package: linux-headers-@version@-@abiname@
+Architecture: all
+Section: devel
+Priority: optional
+Depends: coreutils | fileutils (>= 4.0)
+Provides: linux-headers, linux-headers-@major@, kernel-headers, kernel-headers-@major@
+Description: Architecture-independent header files for Linux kernel @version@
+ This package provides the architecture-independent kernel header files
+ for Linux kernel version @version@, generally used for building out-of-tree
+ kernel modules. It does not include the header files for (sub)architectures
+ which require additional unmerged patches to build, for those separate
+ header packages are provided.
+
+Package: linux-scripts-@version@-@abiname@
+Architecture: any
+Section: devel
+Priority: optional
+Depends: coreutils | fileutils (>= 4.0)
+Description: Architecture-specific header files for Linux kernel @version@
+ This package provides the architecture-specific support files for Linux
+ kernel version @version@, generally used for building out-of-tree
+ kernel modules. It mainly contains the binaries from the script/ kernel
+ directory, as well as other architecture-dependent files such as
+ asm-offsets.s.
+
Copied: branches/kernel-image-2.6.11/debian/templates/header-install.in (from rev 3239, branches/kernel-image-2.6.11/debian/header-install.in)
Copied: branches/kernel-image-2.6.11/debian/templates/post-install.in (from rev 3239, branches/kernel-image-2.6.11/debian/post-install.in)