r3242 - in branches/kernel-image-2.6.11/debian: . templates
Jurij Smakov
jurij-guest@costa.debian.org
Fri, 27 May 2005 04:52:43 +0000
Author: jurij-guest
Date: 2005-05-27 04:52:42 +0000 (Fri, 27 May 2005)
New Revision: 3242
Added:
branches/kernel-image-2.6.11/debian/Makefile.image
branches/kernel-image-2.6.11/debian/Makefile.source
branches/kernel-image-2.6.11/debian/README.Debian
Removed:
branches/kernel-image-2.6.11/debian/Makefile
Modified:
branches/kernel-image-2.6.11/debian/changelog
branches/kernel-image-2.6.11/debian/rules
branches/kernel-image-2.6.11/debian/templates/control.main.in
Log:
Slow but steady progress towards integration
with kernel-source package.
Deleted: branches/kernel-image-2.6.11/debian/Makefile
===================================================================
--- branches/kernel-image-2.6.11/debian/Makefile 2005-05-27 04:06:24 UTC (rev 3241)
+++ branches/kernel-image-2.6.11/debian/Makefile 2005-05-27 04:52:42 UTC (rev 3242)
@@ -1,225 +0,0 @@
-#
-# This Makefile executes the unpack/build/binary targets for a single
-# subarch, which is passed in the subarch variable. Empty subarch
-# variable means that we are building for an arch without the subarch.
-# Additionally, variables version, abiname and ktver are
-# expected to be available (need to be exported from the parent process).
-# It is possible to override the flavours by setting the flavours
-# variable.
-#
-# This Makefile is run from the debian subdir
-#
-SHELL := sh -e
-debver := $(version)-$(abiname)
-uver := $(subst .,_,$(version))
-debnum := -$(abiname)
-kbpkg := kernel-kbuild-$(version)-$(abiname)
-# This will eventually have to be changed to a command, applying
-# the debian's patches from the local tree (arch/patches?)
-kpatch := /usr/src/kernel-patches/all/$(version)/apply/debian $(version)-$(ktver)
-DEBIAN_UPSTREAM_VERSION := $(version)
-ifeq (,$(DEB_HOST_ARCH))
- DEB_HOST_ARCH := $(shell dpkg-architecture -qDEB_HOST_ARCH)
- DEB_BUILD_ARCH := $(shell dpkg-architecture -qDEB_BUILD_ARCH)
-endif
-export version debnum DEBIAN_UPSTREAM_VERSION
-
-karch := $(DEB_HOST_ARCH)
-#
-# Build the list of common config files to be included
-#
-ifeq ($(subarch),none)
- basedir := arch/$(karch)
- append :=
-else
- basedir := arch/$(karch)/$(subarch)
- append := -$(subarch)
-endif
-default := $(basedir)/config.default
-configs := $(notdir $(wildcard $(basedir)/config.*))
-configs := $(filter-out config.common config.default, $(configs))
-tkdir := kernel-source-$(version)
-kdir := kernel-source-$(version)-$(subarch)
-ifndef flavours
- flavours := $(patsubst config.%,%,$(configs))
-endif
-
--include $(basedir)/Makefile.inc
-
-#
-# Here we construct the command lines for different make-kpkg
-# calls (build, kernel-image, kernel-headers) based on the values
-# of variables defined so far and provided by the arch/subarch
-# in Makefile.inc. @flavour@ in the expressions is going to be
-# replaced by the flavour for which the command is run.
-#
-kpkg_headers_cmd := HEADER_CLEAN_HOOK='$(CURDIR)/header-install-$(subarch)'
-kpkg_headers_cmd += make-kpkg --append-to-version $(debnum)$(append)
-kpkg_build_cmd := make-kpkg --append-to-version $(debnum)-@flavour@
-ifdef added_patches
- kpkg_headers_cmd += --added_patches $(subst @uver@,$(uver),$(added_patches))
- kpkg_build_cmd += --added_patches $(subst @uver@,$(uver),$(added_patches))
-endif
-ifdef build_subarch
- kpkg_build_cmd += --subarch $(build_subarch)
-endif
-ifdef headers_subarch
- kpkg_headers_cmd += --subarch $(headers_subarch)
-endif
-ifdef build_makeflags
- kpkg_build_cmd := MAKEFLAGS=$(build_makeflags) $(kpkg_build_cmd)
-endif
-#
-# Note that next variable (kpkg_image_pre) is not going to be evaluated
-# immediately. When referenced, the variable $* will have the current
-# flavour for which the command is executed. So if this flavour will
-# happen to be in the image_prefix_flavours list, the call to make-kpkg
-# will be prepended with contents if image_prefix.
-#
-kpkg_image_pre = $(if $(filter $*,$(image_prefix_flavours)),$(image_prefix))
-kpkg_image_cmd := $(kpkg_build_cmd) --initrd kernel_image
-kpkg_build_cmd += build
-kpkg_headers_cmd += kernel-headers
-ifndef headers_dirs
- headers_dirs = $(karch)
-endif
-ifneq (no,$(include_common_config))
- ccommon := arch/config.common
-endif
-ccommon += arch/$(karch)/config.common arch/$(karch)/$(subarch)/config.common
-#
-# Here we build lists of directories and stamps which we will depend on.
-# For each class of such targets there is a pattern rule which will catch
-# it and do the right thing.
-#
-bdirs := $(addprefix build-$(subarch)-, $(flavours))
-bstamps := $(addprefix build-stamp-$(subarch)-, $(flavours))
-istamps := $(addprefix install-stamp-$(subarch)-, $(flavours))
-#
-# Targets
-#
-unpack: unpack-stamp-$(subarch)
-unpack-stamp-$(subarch): $(configs) header-install-$(subarch) $(bdirs)
- touch unpack-stamp-$(subarch)
-
-build: build-stamp-$(subarch)
-build-stamp-$(subarch): unpack-stamp-$(subarch) $(bstamps)
- touch build-stamp-$(subarch)
-
-binary-indep: build
-binary-arch: build headers-stamp $(istamps)
- mv *.deb ../..
-
-install-stamp-$(subarch)-%: build-$(subarch)-% build-stamp-$(subarch)-%
- cp -al $< install-$*;
- cd install-$*; \
- $(strip $(kpkg_image_pre) $(subst @flavour@,$*,$(kpkg_image_cmd)))
- cat install-$*/debian/files >> files;
- rm -rf install-$*;
- touch install-stamp-$(subarch)-$*
-
-headers-stamp: $(kdir)
- dh_testdir
- dh_clean -k
- dh_installdirs
- cp $(default) $(kdir)/.config
- cd $(kdir); $(kpkg_headers_cmd)
- cat $(kdir)/debian/files >> files
- touch headers-stamp
-
-binary: binary-indep binary-arch
-
-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' \
- 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): templates/post-install.in
- sed -e 's,@initrd_modules@,$(initrd_modules),' \
- -e 's,@append_subarch@,$(append),' \
- 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),
-# arch-specific config file (arch/$(karch)/config.common),
-# and subarch specific one (arch/$(karch)/config.subarch).
-# It is possible to avoid the inclusion of the arch-indep
-# config file by setting include_common_config = no in the
-# arch/$(karch)/Makefile.inc.
-#
-config.%:
- @echo "configs=$(configs)"
- @echo "Generating configuration file $@:"
- rm -f $@
- for i in $(ccommon); do \
- if [ -f $${i} ]; then \
- cat $${i} >> $@; \
- fi; \
- done
-# Flavour config file must be present
- cat $(basedir)/$@ >> $@
-
-$(kdir): post-install-$(subarch)
- dh_testdir
- tar jxf /usr/src/$(tkdir).tar.bz2
- mkdir -p $(tkdir)/debian
- cp debian/changelog $(tkdir)/debian
- cp debian/control $(tkdir)/debian
- cp debian/copyright $(tkdir)/debian
- touch $(tkdir)/debian/official
- install post-install-$(subarch) $(tkdir)/debian/post-install
- cd $(tkdir) && $(kpatch)
-# Arch/subarch-specific patches
- if [ -d $(basedir)/patches ] && \
- [ -s $(basedir)/patches/list ]; then \
- cd $(tkdir); \
- for i in $$(cat ../$(basedir)/patches/list); do \
- patch -p1 < ../$(basedir)/patches/$${i}; \
- done; \
- fi
- mv $(tkdir) $@
-#
-# This target performs a build for a particular flavour. Note
-# that in this file it should be always placed *before* the
-# build-$(subarch)-% target, which creates the build directory.
-#
-# Some arches have extra arch/${ARCH}/kernel/asm-offsets.s files
-# which have to be included in kernel-headers. The problem is that
-# they are only generated during build and we never performed a
-# full build in the directory $(kdir) where kernel-headers are
-# built. So, after build we check whether current build arch has
-# such a file and symlink it into the $(kdir) if necessary.
-# Note that to get into the kernel-headers package the arch/subarch
-# still needs variables headers_dirs and headers_extra set.
-#
-build-stamp-$(subarch)-%: build-$(subarch)-%
- dh_testdir
- PATH=$$PWD/bin:$$PATH; \
- cd $<; \
- $(subst @flavour@,$*,$(kpkg_build_cmd)); \
- $(if $(image_postproc),$(image_postproc),true); \
- arch=$$(basename $$(readlink include/asm)); \
- arch="$${arch#asm-}"; \
- src="arch/$${arch}/kernel/asm-offsets.s"; \
- dst="../$(kdir)/$${src}"; \
- if [ -f "$${src}" ] && [ ! -e "$${dst}" ]; then \
- ln -s "$$(pwd)/$${src}" "$${dst}"; \
- fi
- touch build-stamp-$(subarch)-$*
-#
-# Creates a build directory for a particular flavour
-#
-build-$(subarch)-%: $(kdir) config.%
- dh_testdir
- if [ ! -d $@ ]; then \
- cp -al $(kdir) $@; \
- cp config.$* $@/.config; \
- fi
-
-.PHONY: build unpack binary-indep binary-arch binary
Copied: branches/kernel-image-2.6.11/debian/Makefile.image (from rev 3240, branches/kernel-image-2.6.11/debian/Makefile)
Added: branches/kernel-image-2.6.11/debian/Makefile.source
===================================================================
--- branches/kernel-image-2.6.11/debian/Makefile.source 2005-05-27 04:06:24 UTC (rev 3241)
+++ branches/kernel-image-2.6.11/debian/Makefile.source 2005-05-27 04:52:42 UTC (rev 3242)
@@ -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
Added: branches/kernel-image-2.6.11/debian/README.Debian
===================================================================
--- branches/kernel-image-2.6.11/debian/README.Debian 2005-05-27 04:06:24 UTC (rev 3241)
+++ branches/kernel-image-2.6.11/debian/README.Debian 2005-05-27 04:52:42 UTC (rev 3242)
@@ -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
Modified: branches/kernel-image-2.6.11/debian/changelog
===================================================================
--- branches/kernel-image-2.6.11/debian/changelog 2005-05-27 04:06:24 UTC (rev 3241)
+++ branches/kernel-image-2.6.11/debian/changelog 2005-05-27 04:52:42 UTC (rev 3242)
@@ -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.
Modified: branches/kernel-image-2.6.11/debian/rules
===================================================================
--- branches/kernel-image-2.6.11/debian/rules 2005-05-27 04:06:24 UTC (rev 3241)
+++ branches/kernel-image-2.6.11/debian/rules 2005-05-27 04:52:42 UTC (rev 3242)
@@ -2,17 +2,24 @@
#
# 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
# also export the flavours variables, which allows to control which
@@ -30,11 +37,13 @@
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-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-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
Modified: branches/kernel-image-2.6.11/debian/templates/control.main.in
===================================================================
--- branches/kernel-image-2.6.11/debian/templates/control.main.in 2005-05-27 04:06:24 UTC (rev 3241)
+++ branches/kernel-image-2.6.11/debian/templates/control.main.in 2005-05-27 04:52:42 UTC (rev 3242)
@@ -1,4 +1,4 @@
-Source: linux-world-@version@
+Source: linux-source-@version@
Section: devel
Priority: optional
Maintainer: Debian Kernel Team <debian-kernel@lists.debian.org>
@@ -9,7 +9,7 @@
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 @@
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 @@
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 @@
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