From bc6b5c7f37586baad09b97a788378f1cd9f3faf2 Mon Sep 17 00:00:00 2001 From: Jurij Smakov Date: Fri, 27 May 2005 04:52:42 +0000 Subject: [PATCH] Slow but steady progress towards integration with kernel-source package. svn path=/branches/kernel-image-2.6.11/; revision=3242 --- debian/{Makefile => Makefile.image} | 0 debian/Makefile.source | 16 +++++++ debian/README.Debian | 74 +++++++++++++++++++++++++++++ debian/changelog | 2 +- debian/rules | 72 ++++++++++++++++++---------- debian/templates/control.main.in | 14 +++--- 6 files changed, 146 insertions(+), 32 deletions(-) rename debian/{Makefile => Makefile.image} (100%) create mode 100644 debian/Makefile.source create mode 100644 debian/README.Debian diff --git a/debian/Makefile b/debian/Makefile.image similarity index 100% rename from debian/Makefile rename to debian/Makefile.image diff --git a/debian/Makefile.source b/debian/Makefile.source new file mode 100644 index 000000000..309a9c200 --- /dev/null +++ b/debian/Makefile.source @@ -0,0 +1,16 @@ +# +# This is the Makefile for the binary linux-source +# package. It must be built first, because it makes +# the linux-source-$(version).tar.bz2 available. +# +binary: debian/control + dh_installdirs + dh_fixperms -plinux-source-$(version) + dh_installdocs -plinux-source-$(version) debian/README.Debian + dh_installchangelogs -plinux-source-$(version) + dh_compress -plinux-source-$(version) + dh_installdeb -plinux-source-$(version) + dh_gencontrol -plinux-source-$(version) + dh_builddeb -plinux-source-$(version) + +PHONY: binary diff --git a/debian/README.Debian b/debian/README.Debian new file mode 100644 index 000000000..d5bfe6333 --- /dev/null +++ b/debian/README.Debian @@ -0,0 +1,74 @@ +kernel-source for DEBIAN +------------------------ + +Patches +------- +Debian applies various changes to the kernel source. These are split up +into small patches addressing individual problems. Each of the patch files +contains a description and mentions the author. The patches can be found +at http://svn.debian.org/wsvn/kernel/tags/kernel/source/. + +Rebuilding Adaptec AIC7xxx/79xx firmware +---------------------------------------- +You can rebuild the firmware for the Adaptec AIC7xxx/79xx SCSI Adapters. To +do so you need to set AIC7XXX_BUILD_FIRMWARE/AIC79XX_BUILD_FIRMWARE config +options. Note that this requires to have the development packages for +berkelydb (libdb4.2-dev) installed. + +PS/2 Mice +--------- +If your PS/2 mouse does not work, make sure that the modules psmouse and +mousedev are loaded. + +AMD 768 erratum 10 +------------------ +If you have a motherboard with the AMD 768 chipset, and you are experiencing +IDE errors or lock ups, then you should either connect a PS/2 mouse to the +system or disable APIC. Refer to the following link for details: + +http://lists.insecure.org/lists/linux-kernel/2002/Sep/5966.html + +mem= on 2.4.19 and later +------------------------ +mem=xxxM can no longer be used to enlarge the RAM that the kernel uses. +You must specify the exact memory map. For example, Compaq Proliant users +can specify mem=48M@16M if they have 64M of memory. + +80386 compatibility +------------------- +DRM modules will not work on true 80386 processors. These drivers all assume +that cmpxchg is available. + +IDE bswap option +---------------- +The bswap option is obsolete and may disappear in future. For the moment +it does work provided that you disable dma with the nodma option. + +Additional Drivers +------------------ +* SCSI Media Changer + http://bytesex.org/patches/ +* Amiga Smart Filesystem driver + http://march.home.staszic.waw.pl/asfs/ + +Non-free bits removed +--------------------- +* Keyspan firmware, driver disabled + . drivers/usb/serial/ksyspan_{mpr,usa*}_fw.h +* Emagic EMI 2|6 usb audio interface firmware loader + . drivers/usb/misc/emi62_fw_*.h + +Firmware removed +---------------- +* SMC Token Ring firmware, driver disabled: + . drivers/net/tokenring/smctr_firmware.h +* ACENIC firwmare, driver disabled: + . drivers/net/acenic_firmware.h +* DGRS firmware, driver disabled: + . drivers/net/dgrs_firmware.c +* DAB firmware, driver disabled: + . drivers/usb/media/dabfirmware.h +* QLA2XXX firmware, driver disabled: + . drivers/scsi/qla2xxx/*_fw.c +* TIGON3 firmware: + . drivers/net/tg3.c diff --git a/debian/changelog b/debian/changelog index b9ca0f7fe..20eddfe1c 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,4 +1,4 @@ -kernel-image-2.6.11 (2.6.11-2) UNRELEASED; urgency=low +linux-source-2.6.11 (2.6.11-5) UNRELEASED; urgency=low * New upstream release. * Build against kernel-tree-2.6.11-5. diff --git a/debian/rules b/debian/rules index 59b9daffd..1980ee02c 100755 --- a/debian/rules +++ b/debian/rules @@ -2,16 +2,23 @@ # # Required variables # -version := 2.6.11 -abiname := 1 -ktver := 5 +version := 2.6.11 +abiname := 1 +ktver := 5 # # Generally nothing needs to be modified below this line # -SHELL := sh -e -kbpkg := kernel-kbuild-$(version)-$(abiname) -controls := $(wildcard debian/arch/*/control.in debian/arch/*/*/control.in) -karch := $(shell dpkg-architecture -qDEB_HOST_ARCH) +SHELL := sh -e +controls := $(wildcard debian/arch/*/control.in debian/arch/*/*/control.in) +karch := $(shell dpkg-architecture -qDEB_HOST_ARCH) +major := $(basename $(version)) +srcver := $(shell dpkg-parsechangelog | awk '/^Version:/ {print $$2}') +# +# Construct depends and provides for the linux-tree +# +lt_depends += $(shell seq -f 'linux-source-$(version) (= $(version)-%g)' \ + -s ' | ' 1 $(ktver)) +lt_provides := $(shell seq -f 'linux-tree-$(version)-%g' -s ', ' 1 $(ktver)) # # If we are not passed a subarchs variable, we obtain the complete # subarch list as a list of subdirectories in arch/$(karch). We @@ -30,11 +37,13 @@ endif export version abiname ktver kbuildver flavours -unpack: unpack-stamp + +unpack: debian/linux-source-$(version).tar.bz2 unpack-stamp unpack-stamp: dh_testdir for i in $(subarchs); do \ - cd debian && $(MAKE) subarch=$${i} unpack; \ + cd debian; \ + $(MAKE) -f Makefile.subarch subarch=$${i} unpack; \ done ln -s $$(command -v touch) debian/bin/touch.orig touch unpack-stamp @@ -43,7 +52,8 @@ build: build-stamp build-stamp: unpack-stamp dh_testdir for i in $(subarchs); do \ - cd debian && $(MAKE) subarch=$${i} build; \ + cd debian; \ + $(MAKE) -f Makefile.subarch subarch=$${i} build; \ done touch build-stamp @@ -59,25 +69,39 @@ binary-indep: build binary-arch: build dh_testdir for i in $(subarchs); do \ - cd debian && $(MAKE) subarch=$${i} binary; \ + cd debian; \ + $(MAKE) -f Makefile.subarch subarch=$${i} binary; \ done binary: binary-indep binary-arch # -# Prepares debian/control by cat'ing together all the -# control files, substituting variables, removing all -# empty lines and inserting a newline before every -# line starting with 'Package:' +# Makes the master debian/control file by substituting +# variable values into the template. # -debian/control: - cat debian/control.in $(controls) | \ - sed -e 's,@karch@,$(karch),g' \ - -e 's,@version@,$(version),g' \ - -e 's,@ktver@,$(ktver),g' \ - -e 's,@abiname@,$(abiname),g' \ - -e 's,@kbpkg@,$(kbpkg),g' | \ - sed '/^[[:space:]]*$$/d' | \ +debian/control: debian/templates/control.main.in + cat debian/templates/control.main.in | \ + sed -e 's/@version@/$(version)/g' \ + -e 's/@major@/$(major)/g' \ + -e 's/@ktver@/$(ktver)/g' \ + -e 's/@srcver@/$(srcver)/g' \ + -e 's/@lt_depends@/$(lt_depends)/g' \ + -e 's/@lt_provides@/$(lt_provides)/g' \ + -e 's/@abiname@/$(abiname)/g' | \ + sed '/^[[:space:]]*$$/d' | \ sed 's/^Package:/\n&/g' > debian/control - +# +# If we ended up here, either we need to perform the linux-source +# build, or use the existing linux-source to unpack the kernels. +# This can be controlled by the use_existing_source variable. +# +debian/linux-source-$(version).tar.bz2: debian/Makefile.source + dh_testdir + if [ '$(use_existing_source)' = 'yes' ]; then \ + ln -s /usr/src/linux-source-$(version).tar.bz2 \ + debian/linux-source-$(version).tar.bz2; \ + else \ + $(MAKE) -f debian/Makefile.source binary; \ + fi + .PHONY: clean build unpack binary-indep binary-arch binary diff --git a/debian/templates/control.main.in b/debian/templates/control.main.in index 2bb39391c..9cbfde5f0 100644 --- a/debian/templates/control.main.in +++ b/debian/templates/control.main.in @@ -1,4 +1,4 @@ -Source: linux-world-@version@ +Source: linux-source-@version@ Section: devel Priority: optional Maintainer: Debian Kernel Team @@ -9,7 +9,7 @@ Package: linux-source-@version@ Architecture: all Section: devel Priority: optional -Provides: linux-source, linux-source-@major@, kernel-source, kernel-source-@major@ +Provides: linux-source, linux-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 @@ -25,13 +25,13 @@ Package: linux-docs-@version@ Architecture: all Section: doc Priority: optional -Provides: linux-docs-@major@, kernel-doc-@major@ +Provides: linux-docs-@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 + /usr/share/doc/linux-docs-@version@/Documentation/00-INDEX for a list of what is contained in each file. Package: linux-patch-debian-@version@ @@ -50,8 +50,8 @@ Package: linux-tree-@version@ Architecture: all Section: devel Priority: optional -Depends: linux-patch-debian-@version@ (= @source_version@), @kt_depends@ -Provides: @kt_provides@ +Depends: linux-patch-debian-@version@ (= @srcver@), @lt_depends@ +Provides: @lt_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 @@ -78,7 +78,7 @@ Architecture: all Section: devel Priority: optional Depends: coreutils | fileutils (>= 4.0) -Provides: linux-headers, linux-headers-@major@, kernel-headers, kernel-headers-@major@ +Provides: linux-headers, linux-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