Added preliminary support for arch-specific
patches. svn path=/branches/kernel-image-2.6.11/; revision=3278
This commit is contained in:
Jurij Smakov
parent
068bebcfd6
commit
8f30e870dc
|
|
@ -11,7 +11,6 @@
|
|||
#
|
||||
SHELL := sh -e
|
||||
debver := $(version)-$(abiname)
|
||||
uver := $(subst .,_,$(version))
|
||||
debnum := -$(abiname)
|
||||
#
|
||||
# These variables control the behaviour of make-kpkg
|
||||
|
|
|
|||
|
|
@ -0,0 +1,8 @@
|
|||
#!/bin/sh
|
||||
# $Id: unpatch,v 1.3 2003/06/30 12:49:09 herbert Exp $
|
||||
|
||||
set -e
|
||||
|
||||
upstream=${override_upstream:-@upstream@}
|
||||
|
||||
/usr/src/kernel-patches/all/$upstream/apply/debian $upstream
|
||||
|
|
@ -0,0 +1,86 @@
|
|||
Source: linux-source-2.6.11
|
||||
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-2.6.11
|
||||
Architecture: all
|
||||
Section: devel
|
||||
Priority: optional
|
||||
Provides: linux-source, linux-source-2.6
|
||||
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 2.6.11 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-doc-2.6.11
|
||||
Architecture: all
|
||||
Section: doc
|
||||
Priority: optional
|
||||
Provides: linux-doc-2.6
|
||||
Depends: coreutils | fileutils (>= 4.0)
|
||||
Description: Linux kernel specific documentation for version 2.6.11
|
||||
This package provides the various README files in the 2.6.11 kernel
|
||||
Documentation/ subdirectory: these typically contain kernel-specific
|
||||
installation notes for some drivers for example. See
|
||||
/usr/share/doc/linux-doc-2.6.11/Documentation/00-INDEX for a list of what
|
||||
is contained in each file.
|
||||
|
||||
Package: linux-patch-debian-2.6.11
|
||||
Architecture: all
|
||||
Section: devel
|
||||
Priority: optional
|
||||
Depends: bzip2, ${kpatch:Depends}
|
||||
Suggests: linux-source-2.6.11
|
||||
Description: Debian patches to version 2.6.11 of the Linux kernel
|
||||
This package includes the patches used to produce the prepackaged
|
||||
linux-source-2.6.11 package. Note that these patches do NOT apply
|
||||
against a pristine Linux 2.6.11 kernel but only against
|
||||
linux-source-2.6.11_2.6.11.orig.tar.gz from the Debian archive.
|
||||
|
||||
Package: linux-tree-2.6.11
|
||||
Architecture: all
|
||||
Section: devel
|
||||
Priority: optional
|
||||
Depends: linux-patch-debian-2.6.11 (= 2.6.11-5), linux-source-2.6.11 (= 2.6.11-1) | linux-source-2.6.11 (= 2.6.11-2) | linux-source-2.6.11 (= 2.6.11-3) | linux-source-2.6.11 (= 2.6.11-4) | linux-source-2.6.11 (= 2.6.11-5)
|
||||
Provides: linux-tree-2.6.11-1, linux-tree-2.6.11-2, linux-tree-2.6.11-3, linux-tree-2.6.11-4, linux-tree-2.6.11-5
|
||||
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-scripts-2.6.11-1
|
||||
Architecture: any
|
||||
Section: devel
|
||||
Priority: optional
|
||||
Depends: coreutils | fileutils (>= 4.0)
|
||||
Description: Architecture-specific header files for Linux kernel 2.6.11
|
||||
This package provides the architecture-specific support files for Linux
|
||||
kernel version 2.6.11, 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.
|
||||
File diff suppressed because it is too large
Load Diff
|
|
@ -13,6 +13,7 @@ karch := $(shell dpkg-architecture -qDEB_HOST_ARCH)
|
|||
major := $(basename $(version))
|
||||
srcver := $(shell dpkg-parsechangelog | awk '/^Version:/ {print $$2}')
|
||||
release := $(version)-$(ltver)
|
||||
uver := $(subst .,_,$(version))
|
||||
#
|
||||
# Construct depends and provides for the linux-tree
|
||||
#
|
||||
|
|
@ -41,7 +42,7 @@ endif
|
|||
#
|
||||
source_files = $(filter-out debian linux-source-$(version), $(shell echo *))
|
||||
|
||||
export version abiname ltver kbuildver flavours major
|
||||
export version abiname ltver kbuildver flavours major uver
|
||||
|
||||
patch: debian/patch-stamp
|
||||
debian/patch-stamp: debian/bin/apply
|
||||
|
|
@ -85,6 +86,7 @@ debian/source-stamp: debian/patch-stamp
|
|||
dh_fixperms -p$(spkg)
|
||||
dh_installdeb -p$(spkg)
|
||||
dh_gencontrol -p$(spkg)
|
||||
dh_md5sums -p$(spkg)
|
||||
dh_builddeb -p$(spkg)
|
||||
touch debian/source-stamp
|
||||
#
|
||||
|
|
@ -102,6 +104,7 @@ debian/tree-stamp:
|
|||
dh_fixperms -p$(tpkg)
|
||||
dh_installdeb -p$(tpkg)
|
||||
dh_gencontrol -p$(tpkg)
|
||||
dh_md5sum -p$(tpkg)
|
||||
dh_builddeb -p$(tpkg)
|
||||
touch debian/tree-stamp
|
||||
#
|
||||
|
|
@ -111,23 +114,41 @@ ppkg := linux-patch-debian-$(version)
|
|||
pbase := /usr/src/linux-patches/all/$(version)
|
||||
pfull := debian/$(ppkg)$(pbase)
|
||||
pdirs := $(pbase) $(pbase)/apply $(pbase)/debian $(pbase)/unpatch
|
||||
ptchs := $(notdir $(wildcard debian/patches-arch/*))
|
||||
kptch := debian/$(ppkg).kpatches.arch
|
||||
pcdir := debian/patches-arch
|
||||
patch-debian: debian/patch-debian-stamp
|
||||
debian/patch-debian-stamp: debian/bin/apply debian/bin/unpatch
|
||||
dh_testdir
|
||||
dh_testroot
|
||||
dh_installdirs -p$(ppkg) $(pdirs)
|
||||
dh_install -p$(ppkg) debian/patches/* $(pbase)/debian
|
||||
dh_install -p$(ppkg) debian/patches-debian/* $(pbase)/debian
|
||||
# Install the debian patches
|
||||
sed 's/@version@/$(release)/g' debian/bin/apply > $(pfull)/apply/debian
|
||||
sed 's/@upstream@/$(version)/g' debian/bin/unpatch > $(pfull)/unpatch/debian
|
||||
chmod a+x $(pfull)/apply/debian $(pfull)/unpatch/debian
|
||||
chmod -x $(pfull)/debian/*.patch
|
||||
bzip2 -9 $(pfull)/debian/*.patch
|
||||
# Now the arch/subarch-specific patches
|
||||
for i in $(ptchs); do \
|
||||
rm -f $(kptch); \
|
||||
arch=$${i%%.*}; \
|
||||
echo "Patch-name: $${arch}" >> $(kptch); \
|
||||
echo "Patch-id: $${arch}_$(uver)" >> $(kptch); \
|
||||
echo "Path-strip-level: 1" >> $(kptch); \
|
||||
echo >> $(kptch); \
|
||||
echo "Patch-file: $(pcdir)/$${i}" >> $(kptch); \
|
||||
echo "Architecture: $${arch}" >> $(kptch); \
|
||||
echo "Kernel-version: $(version)" >> $(kptch); \
|
||||
dh_installkpatches -p$(ppkg); \
|
||||
done
|
||||
dh_fixperms -p$(ppkg)
|
||||
dh_installdocs -p$(ppkg)
|
||||
dh_installchangelogs -p$(ppkg)
|
||||
dh_compress -p$(ppkg)
|
||||
dh_installdeb -p$(ppkg)
|
||||
dh_gencontrol -p$(ppkg)
|
||||
dh_md5sums -p$(ppkg)
|
||||
dh_builddeb -p$(ppkg)
|
||||
touch debian/patch-debian-stamp
|
||||
|
||||
|
|
@ -155,7 +176,7 @@ clean: unpatch
|
|||
rm -f version.Debian
|
||||
rm -rf linux-source-$(version)
|
||||
cd debian; \
|
||||
rm -f *-stamp-* *-stamp config.*; \
|
||||
rm -f *-stamp-* *-stamp config.* *.kpatches.arch; \
|
||||
rm -f header-install-* post-install-* bin/touch.orig; \
|
||||
rm -rf kernel-source-* build-* install-*
|
||||
dh_clean
|
||||
|
|
|
|||
|
|
@ -14,24 +14,24 @@ Description: Linux kernel source for version @version@ with Debian patches
|
|||
which has been designed to ease the task of creating kernel image
|
||||
packages.
|
||||
|
||||
Package: linux-docs-@version@
|
||||
Package: linux-doc-@version@
|
||||
Architecture: all
|
||||
Section: doc
|
||||
Priority: optional
|
||||
Provides: linux-docs-@major@
|
||||
Provides: linux-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/linux-docs-@version@/Documentation/00-INDEX for a list of what
|
||||
/usr/share/doc/linux-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
|
||||
Depends: bzip2, ${kpatch:Depends}
|
||||
Suggests: linux-source-@version@
|
||||
Description: Debian patches to version @version@ of the Linux kernel
|
||||
This package includes the patches used to produce the prepackaged
|
||||
|
|
|
|||
Loading…
Reference in New Issue