Package: release.debian.org Severity: normal User: release.debian....@packages.debian.org Usertags: unblock
Please unblock package kernel-package It's just a documentation (merely formating and typo fixes) and translation upload, that also fixes an important bug via unstable, thanks to Ben Hutchings for the patch. Filtered (without translations) diff attached, the important bug fix is just the line changed in kernel/ruleset/targets/common.mk on top of the diff. unblock kernel-package/12.036+nmu3 Thanks in advance Regards David -- System Information: Debian Release: wheezy/sid APT prefers unstable APT policy: (500, 'unstable'), (500, 'testing'), (500, 'stable'), (1, 'experimental') Architecture: amd64 (x86_64) Foreign Architectures: i386 Kernel: Linux 3.2.0-3-amd64 (SMP w/1 CPU core) Locale: LANG=fr_FR.UTF-8, LC_CTYPE=fr_FR.UTF-8 (charmap=UTF-8) Shell: /bin/sh linked to /bin/dash
diffstat for kernel-package-12.036+nmu2 kernel-package-12.036+nmu3 Makefile | 4 debian/changelog | 12 + kernel-img.conf.5 | 44 +++--- kernel-package.5 | 26 ++-- kernel-packageconfig.8 | 8 - kernel-pkg.conf.5 | 64 ++++----- kernel/ruleset/targets/common.mk | 2 make-kpkg.8 | 253 ++++++++++++++++++++------------------- po4a/po4a.conf | 2 9 files changed, 226 insertions(+), 189 deletions(-) diff -Nru --exclude '*.po' --exclude '*.pot' kernel-package-12.036+nmu2/debian/changelog kernel-package-12.036+nmu3/debian/changelog --- kernel-package-12.036+nmu2/debian/changelog 2012-03-03 21:36:39.000000000 -0400 +++ kernel-package-12.036+nmu3/debian/changelog 2012-08-15 11:49:22.000000000 -0400 @@ -1,3 +1,15 @@ +kernel-package (12.036+nmu3) unstable; urgency=low + + * Non-maintainer upload. + * Fix typos in man pages, thanks to Chris Leick, and other formatting + errors. (Closes: #654451) + * Add German man pages translation by Chris Leick. (Closes: #654315) + * Update man pages French translation. + * kernel/ruleset/targets/common.mk: Allow building > 3.3 kernel, thanks to + Ben Hutchings for the patch. (Closes: #663474) + + -- David Prévot <taf...@debian.org> Wed, 15 Aug 2012 11:46:24 -0400 + kernel-package (12.036+nmu2) unstable; urgency=low * Non-maintainer upload. diff -Nru --exclude '*.po' --exclude '*.pot' kernel-package-12.036+nmu2/kernel/ruleset/targets/common.mk kernel-package-12.036+nmu3/kernel/ruleset/targets/common.mk --- kernel-package-12.036+nmu2/kernel/ruleset/targets/common.mk 2012-03-03 20:03:25.000000000 -0400 +++ kernel-package-12.036+nmu3/kernel/ruleset/targets/common.mk 2012-08-13 15:55:59.000000000 -0400 @@ -64,7 +64,7 @@ echo "YES"; \ fi) -LGUEST_SUBDIR = $(word 1,$(wildcard Documentation/lguest Documentation/virtual/lguest)) +LGUEST_SUBDIR = $(word 1,$(wildcard Documentation/lguest Documentation/virtual/lguest tools/lguest)) define save_upstream_debianization @echo save_upstream_debianization diff -Nru --exclude '*.po' --exclude '*.pot' kernel-package-12.036+nmu2/kernel-img.conf.5 kernel-package-12.036+nmu3/kernel-img.conf.5 --- kernel-package-12.036+nmu2/kernel-img.conf.5 2009-08-20 21:41:07.000000000 -0400 +++ kernel-package-12.036+nmu3/kernel-img.conf.5 2012-08-06 15:00:09.000000000 -0400 @@ -38,11 +38,15 @@ installation, overriding the defaults built into the image itself. .PP The format of the file is a simple -.B VAR = VALUE +.IB VAR = VALUE pair. Boolean values may be specified as -.I Yes, True, 1, +.IR Yes , +.IR True , +.IR 1 , and -.I No, False, 0, +.IR No , +.IR False , +.IR 0 , and are case insensitive. This file is automatically created by the installation script in certain circumstances. @@ -50,7 +54,7 @@ At the moment, the user modifiable variables supported are: .TP .B postinst_hook -.BR DEPRECATED: +.BR DEPRECATED : Set this variable to a script to be executed during installation. The path can be a relative path if the script lives in a safe path -- that is, if it lives in /bin, /sbin, /usr/bin, or /usr/sbin, or must be an @@ -70,8 +74,8 @@ postinst to fail. Since debconf is in use before the script is called, this script should issue no diagnostic messages to stdout -- while the postinst does call -.B db_stop -, debconf does not restore stdout, so messages to stdout disappear. +.BR db_stop , +debconf does not restore stdout, so messages to stdout disappear. An example script for grub users is present in /usr/share/doc/kernel\-package/ directory. This script is run @@ -79,7 +83,7 @@ the scripts in /etc/kernel/postinst.d directory. .TP .B postrm_hook -.BR DEPRECATED: +.BR DEPRECATED : Set this variable to a script to be executed in the postrm (that is, after the image has been removed) after all the remove actions have been performed. The path can be a relative path if the script lives in @@ -97,14 +101,14 @@ warning message, but shall be otherwise ignored. Since debconf is in use before the script is called, this script should issue no diagnostic messages to stdout -- while the postinst does call -.B db_stop -, debconf does not restore stdout, so messages to stdout disappear. +.BR db_stop , +debconf does not restore stdout, so messages to stdout disappear. This script is run .I after the scripts in /etc/kernel/postrm.d directory. .TP .B preinst_hook -.BR DEPRECATED: +.BR DEPRECATED : Set this variable to a script to be executed before the package is unpacked, and can be used to put in additional checks. The path can be a relative path if the script lives in a safe path -- that is, if it @@ -123,7 +127,7 @@ the scripts in /etc/kernel/preinst.d directory. .TP .B prerm_hook -.BR DEPRECATED: +.BR DEPRECATED : Set this variable to a script to be executed before the package files are removed (so any added files may be removed) . The path can be a relative path if the script lives in a safe path -- that is, if it @@ -140,14 +144,14 @@ to fail. Since debconf is in use before the script is called, this script should issue no diagnostic messages to stdout -- while the postinst does call -.B db_stop -, debconf does not restore stdout, so messages to stdout disappear. +.BR db_stop , +debconf does not restore stdout, so messages to stdout disappear. This script is run .I after the scripts in /etc/kernel/prerm.d directory. .TP .B src_postinst_hook -.BR DEPRECATED: +.BR DEPRECATED : Unlike the other hook variables, this is meant for a script run during the post inst of a docs, headers or a source package. Using this hook for the headers package is now being deprecated, at some point the @@ -170,7 +174,7 @@ the scripts in /etc/kernel/src_postinst.d directory. .TP .B header_postinst_hook -.BR DEPRECATED: +.BR DEPRECATED : Unlike the other hook variables, this is meant for a script run during the post inst of a headers package only. The path can be a relative path if the script lives in a safe path -- that is, if it lives in @@ -227,7 +231,7 @@ .B silent_modules This option has been put in for the people who are vastly irritated on being warned about preexisting modules directory -.I /lib/modules/$version +.IR /lib/modules/$version . That directory may belong to an old or defunct kernel image package, in which case problems may arise with leftover modules in that directory tree, or the directory may legitimately exist due to a @@ -236,7 +240,7 @@ the directory is benign. If you set this variable, you shall no longer be given a chance to abort if a preexisting modules directory .I /lib/modules/$version -is detected. This is unset be default. +is detected. This is unset by default. .TP .B ignore_depmod_err If set, does not prompt to continue after a depmod problem in the @@ -245,12 +249,12 @@ issued. This is unset be default. .SH FILES The file described here is -.I /etc/kernel\-img.conf. +.IR /etc/kernel\-img.conf . .SH "SEE ALSO" +.BR make (1), .BR make\-kpkg (1), .BR kernel\-pkg.conf (5), -.BR make (1), -.B The GNU Make manual. +.B The GNU Make manual .SH BUGS There are no bugs. Any resemblance thereof is delirium. Really. .SH AUTHOR diff -Nru --exclude '*.po' --exclude '*.pot' kernel-package-12.036+nmu2/kernel-package.5 kernel-package-12.036+nmu3/kernel-package.5 --- kernel-package-12.036+nmu2/kernel-package.5 2009-10-27 09:44:23.000000000 -0400 +++ kernel-package-12.036+nmu3/kernel-package.5 2012-08-06 14:59:57.000000000 -0400 @@ -27,18 +27,18 @@ .\" NAME should be all caps, SECTION should be 1-8, maybe w/ subsection .\" other parms are allowed: see man(7), man(1) .SH NAME -kernel\-package \- A system for creating kernel related packages +kernel\-package \- system for creating kernel related packages .SH "DESCRIPTION" The .B kernel\-package package grew out of desire to automate the routine steps required to compile and install a custom kernel. If you are looking for instructions on how to use -.B kernel\-package, +.BR kernel\-package , please have a look at the manual -.B make\-kpkg (1). +.BR make\-kpkg (1). Configuring instructions are to be found in -.B kernel\-pkg.conf(5). +.BR kernel\-pkg.conf (5). .SH "Advantages of using kernel\-package" .RS .TP @@ -60,7 +60,7 @@ same kernel version on your machine (you could have a stable 2.0.36 version, and a 2.0.36 version patched with the latest drivers, and not worry about contaminating the modules in -.I /lib/modules). +.IR /lib/modules ). .TP .B iv) Built in defaults It knows that some architectures do not have vmlinuz (using @@ -85,7 +85,7 @@ .B vii) Configuration tracking It keeps track of the configuration file for each kernel image in -.I /boot, +.IR /boot , which is part of the image package, and hence is the kernel image and the configuration file are always together. .TP @@ -123,7 +123,7 @@ kernel image stanzas from the grub menu (example scripts to do this are in the package). There are directories under .I /etc/kernel -where related package may drop off scripts that will be run by the +where related packages may drop off scripts that will be run by the maintainer scripts of the packages created by kernel package. Before running these scripts, the environment variable .B KERNEL_PACKAGE_VERSION @@ -156,15 +156,17 @@ .B super or be root to create a kernel image .deb file (this is not as bad as it used to be before -.B fakeroot) +.BR fakeroot ). .RE .SH FILES -.I /etc/kernel\-pkg.conf. -.I /etc/kernel\-img.conf. +.TP +.I /etc/kernel\-pkg.conf +.TP +.I /etc/kernel\-img.conf .SH "SEE ALSO" -.BR make\-kpkg (1), .BR make (1), -.B The GNU Make manual. +.BR make\-kpkg (1), +.B The GNU Make manual .SH BUGS There are no bugs. Any resemblance thereof is delirium. Really. .SH AUTHOR diff -Nru --exclude '*.po' --exclude '*.pot' kernel-package-12.036+nmu2/kernel-packageconfig.8 kernel-package-12.036+nmu3/kernel-packageconfig.8 --- kernel-package-12.036+nmu2/kernel-packageconfig.8 2008-05-02 01:06:28.000000000 -0400 +++ kernel-package-12.036+nmu3/kernel-packageconfig.8 2012-08-06 15:18:37.000000000 -0400 @@ -26,7 +26,7 @@ .\" .TH KERNEL\-PACKAGECONFIG 8 "Jan 7 1997" "Debian" "Debian GNU/Linux manual" .SH NAME -kernel\-packageconfig \- Internal handler of /etc/kernel\-pkg.conf. +kernel\-packageconfig \- internal handler of /etc/kernel\-pkg.conf .SH SYNOPSIS .B kernel\-packageconfig .SH DESCRIPTION @@ -42,10 +42,10 @@ .SH OPTIONS This utility does not have any options. .SH FILES -The files affected by this program are -.I /etc/kernel\-pkg.conf. +The file affected by this program is +.IR /etc/kernel\-pkg.conf . .SH "SEE ALSO" -.B kernel\-pkg.conf (5) +.BR kernel\-pkg.conf (5) .SH AUTHOR This manual page was written by Manoj Srivastava <sriva...@debian.org>, for the Debian GNU/Linux system. diff -Nru --exclude '*.po' --exclude '*.pot' kernel-package-12.036+nmu2/kernel-pkg.conf.5 kernel-package-12.036+nmu3/kernel-pkg.conf.5 --- kernel-package-12.036+nmu2/kernel-pkg.conf.5 2009-09-11 11:30:20.000000000 -0400 +++ kernel-package-12.036+nmu3/kernel-pkg.conf.5 2012-08-06 16:48:12.000000000 -0400 @@ -44,31 +44,31 @@ sure you know what you are doing). If the per user configuration file .I ~/.kernel\-pkg.conf exists, it is loaded in favor of the system wide configuration file -.I /etc/kernel\-pkg.conf. +.IR /etc/kernel\-pkg.conf . .PP All the variables have reasonable default values, and maybe overridden on a per run or a per individual basis by using environment variables. Some of the variables can further be overridden by options to -.B make\-kpkg. +.BR make\-kpkg . .PP At the moment, the user modifiable variables supported are: .TP .B maintainer -Local kernel (image, header, doc, etc) package maintainer. Set up at +Local kernel (image, header, doc, etc.) package maintainer. Set up at package installation by the -.IR postinst. +.IR postinst . Can be overridden by the environment variable -.B KPKG_MAINTAINER. +.BR KPKG_MAINTAINER . Please note that any apostrophes "'" shall have to be quoted like so: maintainer = John O'\\''Brien. Yes, this is ugly, but this works. .TP .B email The email address of that person. Set up at package installation by the -.IR postinst. +.IR postinst . Can be overridden by the environment variable -.B KPKG_EMAIL. +.BR KPKG_EMAIL . .TP .B pgp A key-ID to use when signing packages. Usually passed along to @@ -77,28 +77,28 @@ .I \-k option, and also third party modules in the .B KMAINT -environment variable, if separate modules (like pcmcia etc) are being +environment variable, if separate modules (like pcmcia, etc.) are being built in -.IR $MODULE_PATH. +.IR $MODULE_PATH . Can be overridden by the environment variable -.B PGP_SIGNATURE, +.BR PGP_SIGNATURE , and is overridden (again) by the .IR \-\-pgpsign option of -.B make\-kpkg. +.BR make\-kpkg . Defaults to -.I maintainer. +.IR maintainer . (Optional) .TP .B debian The version of the kernel packages, includes both the upstream version and the Debian revision. Can be overridden by the environment variable -.B DEBIAN_REVISION, +.BR DEBIAN_REVISION , and is overridden (again) by the .IR \-\-revision option of -.B make\-kpkg. +.BR make\-kpkg . Defaults to .I <VERSION>-10.0.0.Custom (Optional) @@ -106,22 +106,22 @@ .B debian_revision_mandatory Normally unset. If this, or the environment variable .B DEBIAN_REVISION_MANDATORY -are set, then not providing a debian revision results in an error (and +are set, then not providing a Debian revision results in an error (and .B make\-kpkg shall not provide a default value of 10.0.0.Custom) .TP .B kimage The kernel image type (i.e. zImage or bzImage). Can be overridden from the environment variable -.B IMAGE_TYPE, +.BR IMAGE_TYPE , and is overridden (again) by the options .IR \-\-zimage or .IR \-\-bzimage of -.B make\-kpkg. +.BR make\-kpkg . Defaults to -.I bzImage. +.IR bzImage . (Optional) .TP .B config_target @@ -150,9 +150,9 @@ example, .I `sudo' or -.I `fakeroot') +.IR `fakeroot' ) as needed by -.B dpkg\-buildpackages' +.BR dpkg\-buildpackages ' \-r option. The environment variable .B ROOT_CMD overrides this. Use the environment variable @@ -194,18 +194,18 @@ kernel image is packaged. This has no effect on anything other than the image that is being packaged -- if the script operates on the current directory and its children, the original source tree should -remain intact. This is to facilitate massaging of the kernel image +remain intact. This is to facilitate messaging of the kernel image that is packaged. .TP .B source_clean_hook Set to point to an executable, this shall cause that executable to run from the top level of the (temporary) kernel source tree before the sources are packaged, -.I ./debian/tmp\-source/usr/src/kernel\-source\-X.X.XX. +.IR ./debian/tmp\-source/usr/src/kernel\-source\-X.X.XX . This has no effect on anything other than the sources that are being packaged -- if the script operates on the current directory and its children, the original source tree should remain intact. This is to -facilitate massaging of the kernel sources that are packaged (for +facilitate messaging of the kernel sources that are packaged (for example, to remove version control directories, or to prune away unwanted architectures). .TP @@ -215,7 +215,7 @@ packaged. This has no effect on anything other than the sources that are being packaged -- if the script operates on the current directory and its children, the original source tree should remain intact. This -is to facilitate massaging of the kernel headers that are packaged +is to facilitate messaging of the kernel headers that are packaged (for example, to remove version control directories, or to prune away unwanted architectures). .TP @@ -225,7 +225,7 @@ packaged. This has no effect on anything other than the documentation that is being packaged -- if the script operates on the current directory and its children, the original source tree should remain -intact. This is to facilitate massaging of the kernel documentation +intact. This is to facilitate messaging of the kernel documentation that is packaged (for example, to remove version control directories, or to prune away unwanted architectures). .TP @@ -255,7 +255,7 @@ This is meant to be used by the .I libc6 maintainer, when he compiles -.I libc6, +.IR libc6 , to also package up the corresponding headers. .B DO NOT SET THIS unless you know what you are doing, since a mismatch between the @@ -306,7 +306,7 @@ help to .B loadlin users. Defaults to -.I /boot. +.IR /boot . .TP .B MODULE_LOC Set this variable, either in the environment or in the config file, to @@ -321,7 +321,7 @@ customization is done. .IP b) Variables can be set in the config file -.I /etc/kernel\-pkg.conf. +.IR /etc/kernel\-pkg.conf . These values override the defaults. .IP c) Variables can also be set by setting a corresponding environment @@ -337,14 +337,14 @@ This overrides all the above methods. .SH FILES The file described here is -.I /etc/kernel\-pkg.conf. +.I /etc/kernel\-pkg.conf or -.I ~/.kernel\-pkg.conf. +.IR ~/.kernel\-pkg.conf . .SH "SEE ALSO" +.BR make (1), .BR make\-kpkg (1), .BR kernel\-img.conf (5), -.BR make (1), -.B The GNU Make manual. +.B The GNU Make manual .SH BUGS There are no bugs. Any resemblance thereof is delirium. Really. .SH AUTHOR diff -Nru --exclude '*.po' --exclude '*.pot' kernel-package-12.036+nmu2/Makefile kernel-package-12.036+nmu3/Makefile --- kernel-package-12.036+nmu2/Makefile 2010-11-09 19:21:18.000000000 -0400 +++ kernel-package-12.036+nmu3/Makefile 2012-08-06 16:45:36.000000000 -0400 @@ -112,7 +112,7 @@ $(install_file) kernel-package.5 $(MAN5DIR)/kernel-package.5 $(install_file) make-kpkg.8 $(MAN1DIR)/make-kpkg.1 $(install_file) kernel-packageconfig.8 $(MAN8DIR)/ - for lang in fr; do \ + for lang in de fr; do \ test ! -f kernel-pkg.conf.$$lang.5 || test -d $(MANTOP)/$$lang/man5 || \ mkdir -p $(MANTOP)/$$lang/man5; \ test ! -f kernel-pkg.conf.$$lang.5 || \ @@ -158,7 +158,7 @@ chmod 0755 $(prefix)/usr/share/$(package)/rules clean distclean: - for lang in es fr; do \ + for lang in de fr; do \ test ! -f kernel-pkg.conf.$$lang.5 || \ rm kernel-pkg.conf.$$lang.5 ; \ test ! -f kernel-img.conf.$$lang.5 || \ diff -Nru --exclude '*.po' --exclude '*.pot' kernel-package-12.036+nmu2/make-kpkg.8 kernel-package-12.036+nmu3/make-kpkg.8 --- kernel-package-12.036+nmu2/make-kpkg.8 2010-02-14 19:41:27.000000000 -0400 +++ kernel-package-12.036+nmu3/make-kpkg.8 2012-08-13 16:51:13.000000000 -0400 @@ -29,8 +29,8 @@ make\-kpkg \- build Debian kernel packages from Linux kernel sources .SH SYNOPSIS .B make\-kpkg -.I [options] -\&[target [target ...]] +.RI [ options ] +.RI [ target " [" target " ...]]" .SH DESCRIPTION This manual page explains the Debian .B "make\-kpkg" @@ -46,7 +46,7 @@ .B make oldconfig to let the user answer any new questions. Typically, you run this command as root, or under -.B fakeroot, +.BR fakeroot , or tell .B make\-kpkg how to become root, like so: @@ -60,14 +60,14 @@ Also, please note that some versions of gcc do not interact well with the kernel sources (gcc 2.95 has problems compiling the kernel without the flag -.I '\-fno\-strict\-aliasing'. +.IR '\-fno\-strict\-aliasing' . This issue has been taken care of for recent kernels (2.2 and 2.4 series are fine) (I think you may have to edit the makefile for older kernels, or something). You may control which version of gcc used in kernel compilation by setting the Makefile variables CC and HOSTCC in the top level kernel Makefile. You can do this simply by setting the environment variable -.B MAKEFLAGS. +.BR MAKEFLAGS . To observe, try: .PP % KBUILD_VERBOSE=1 MAKEFLAGS="CC=gcc\-4.4" make\-kpkg configure @@ -78,17 +78,18 @@ (please see the top level kernel Makefile for variables that can be set). .PP -.B WARNING: +.BR WARNING : Do NOT set the \-j option in MAKEFLAGS directly, this shall cause the build to fail. Use CONCURRENCY_LEVEL as specified below. There is also a -j flag that can be used. .SH OPTIONS +.TP .B \-\-help Print out a usage message. .TP -.BR \-\-revision " number" +.BI \-\-revision " number" Changes the version number for the packages produced to the argument -.BR number. +.IR number . This has certain constraints: the version may contain only alphanumerics and the characters ~ + . (tilde, full stop and plus) and must contain a digit. (Look at the Policy manual for @@ -99,16 +100,16 @@ .B DEBIAN_REVISION_MANDATORY is set, in which case an error is generated if the revision is not set on the command line or the configuration file. -.BR Hint: +.BR Hint : You may set it to $(version)-<foo> in the configuration file to get the upstream version number prepended to your custom string <foo>. .TP -.BR \-\-append\-to\-version " foo" +.BI \-\-append\-to\-version " foo" .TP -.BR \-\-append_to_version " foo" -This argument ( -.B foo -) is appended to the value of the EXTRAVERSION variable present in +.BI \-\-append_to_version " foo" +This argument +.RI ( foo ) +is appended to the value of the EXTRAVERSION variable present in the kernel Makefile. Since EXTRAVERSION is a component of the kernel version, it is also added to the Debian package name, and, as such must obey the policy governing the package name. That means it may @@ -122,22 +123,22 @@ or in the .I localversion file. -This option over rides the environment variable -.B APPEND_TO_VERSION +This option overrides the environment variable +.BR APPEND_TO_VERSION . .TP -.BR \-\-added\-modules\ foo +.BI \-\-added\-modules \ foo .TP -.BR \-\-added_modules\ foo +.BI \-\-added_modules \ foo The argument should be a comma separated list of additional add\-on modules (not in the main kernel tree) that you wish to build when you invoke the modules_blah targets. You may give full path names of the directory the modules reside in, or just the module name if it can be found in -.B MODULE_LOC, +.BR MODULE_LOC , which defaults to -.I /usr/src/modules. +.IR /usr/src/modules . The default is that all modules in -.B MODULE_LOC, +.BR MODULE_LOC , are compiled when the modules_blah targets are invoked. .TP .BR \-\-arch\ foo @@ -153,9 +154,9 @@ is run on the target machine, or it can be an other architecture in a multi\-arch set (like i386/amd64). .TP -.BR \-\-cross\-compile\ foo +.BI \-\-cross\-compile \ foo .TP -.BR \-\-cross_compile\ foo +.BI \-\-cross_compile \ foo This is useful for setting the target string when you are cross compiling. Use the dummy target "\-" if you are building for other arches of a multiarch set, like i386/amd64. The same effect can be @@ -166,14 +167,14 @@ used. .B CROSS_COMPILE .TP -.BR \-\-subarch\ foo +.BI \-\-subarch \ foo Some architectures (the Alpha, and the m68k) require a different kernel for each sub\-architecture. This option provides a way of specifying it as an argument to \fBmake\-kpkg\fR. \fBPlease note\fR that additional support for sub\-architectures may be required in the kernel sources to actually make this do anything. The same effect can be achieved by setting the environment variable -.B KPKG_SUBARCH +.BR KPKG_SUBARCH . .TP .BR \-\-arch\-in\-name .TP @@ -182,12 +183,12 @@ embedding the sub\-architecture in the image name, so one could write a script to create multiple sub\-architectures one after the other. You may also do this by setting the environment variable -.B ARCH_IN_NAME. +.BR ARCH_IN_NAME . \fBPlease note\fR that only the package .I name is affected, not modules locations etc. .TP -.BR \-\-pgpsign " name" +.BI \-\-pgpsign " name" Set the string used to sign the .B changes file for any external modules in @@ -196,14 +197,14 @@ wide customizations stored in the file .IR /etc/kernel\-pkg.conf or -.IR ~/.kernel\-pkg.conf. +.IR ~/.kernel\-pkg.conf . .TP -.BR \-\-config " target" +.BI \-\-config " target" Change the type of configure done from the default \f(CWoldconfig\fR. \fItarget\fR must be one of \f(CWoldconfig\fR, \f(CWconfig\fR, -\f(CWmenuconfig\fR, \f(CWgconfig\fR, \f(CWxconfig\fR, \f(CWrandconfig\fR,, +\f(CWmenuconfig\fR, \f(CWgconfig\fR, \f(CWxconfig\fR, \f(CWrandconfig\fR, \f(CWdefconfig\fR, \f(CWallmodconfig\fR, \f(CWallyesconfig\fR, -\f(CWallnoconfig\fR; \f(CWold\fR, +\f(CWallnoconfig\fR, \f(CWold\fR, \f(CWmenu\fR, \f(CWg\fR, or \f(CWx\fR. .sp .B Note @@ -242,7 +243,7 @@ package, arrange to convey to the hook scripts run from the post installation maintainer scripts that this image requires an -.I initrd, +.IR initrd , and that the .I initrd generation hook scripts should not short circuit early. Without this @@ -258,15 +259,19 @@ scripts in .I /etc/kernel or added into the hook script parameter of -.I /etc/kernel-img.conf. +.IR /etc/kernel-img.conf , no initrd will be created (the bundled in example scripts are just examples -- user action is required before anything happens). .TP -.B \-\-jobs " number" -.B \-j " number" -Set the environment variable CONCURRENCY_LEVEL to "number". +.BI \-\-jobs " number" +.TP +.BI \-j " number" +Set the environment variable +.B CONCURRENCY_LEVEL +to +.IR number . .TP -.B \-\-overlay\-dir "/path/to/directory" +.BI \-\-overlay\-dir " /path/to/directory" The specified directory should contain files that will be placed in the .I ./debian @@ -275,12 +280,12 @@ .I /usr/share/kernel-package that would normally be placed there, and it is up to the user to make sure that the files in the overlay directory are compatible with -.B make-kpkg. +.BR make-kpkg . If you break .B make-kpkg with an overlay file, you get to keep the pieces. The same effect can be achieved by setting the environment variable -.B KPKG_OVERLAY_DIR. +.BR KPKG_OVERLAY_DIR . .sp Please note that .I overlay\-dir/Control @@ -300,7 +305,7 @@ .I ./debian is populated. The script shall be executed in the .I ./debian -directory. This can be used, For instance, to delete files the user +directory. This can be used, for instance, to delete files the user does not want, or to take actions other than simple replacement. .TP .B \-\-zimage @@ -315,15 +320,18 @@ The command that provides a means of gaining super user access (for example, `sudo' or `fakeroot') as needed by dpkg\-buildpackage's \-r option. This option does not work for three of the targets, namely, -.I binary, binary\-indep, +.IR binary , +.IR binary\-indep , and -.I binary\-arch. +.IR binary\-arch . For those targets the entire .I make\-kpkg command must be run as (fake)root. .TP -.B \-\-stem foo -Call the packages foo\-* instead of kernel\-*. This is useful in +.BI \-\-stem \ foo +Call the packages +.IR foo \-* +instead of kernel\-*. This is useful in helping transition from calling the packages kernel\-* to linux\-* packages, in preparation for non\-linux kernels in the distribution. The default is linux. The stem, since it is the initial @@ -346,7 +354,8 @@ be entered with either a \- or a \-\- prefix, and you may use a space or an = symbol between an option string and a value. You may also use the form option=value; for details these and other variant forms -supported, please read man Getopt::Long (3perl). +supported, please read +.BR Getopt::Long (3perl). .TP .B CONCURRENCY_LEVEL If defined, this environment variable sets the concurrency level of @@ -355,11 +364,14 @@ flags to the sub make in the .B build target of -.B make\-kpkg. +.BR make\-kpkg . Should be a (small) integer, if used. You can get the current number of CPUs using the command: - "grep \-c '^processor' /proc/cpuinfo" -.B WARNING: +.sp 1 +.ti +5 +grep \-c '^processor' /proc/cpuinfo +.sp 1 +.BR WARNING : Do NOT set the \-j option in MAKEFLAGS directly, this shall call the build to fail. It is possible to set \-j as a make-kpkg argument. .SH TARGETS @@ -370,7 +382,7 @@ and runs a make distclean. (Please look at a Linux kernel Makefile for details). Please note that although we take care of the list of current kernel configuration contained in the file -.I .config, +.IR .config , the file .I include/linux/autoconf.h is not preserved. This target should not be combined with other @@ -383,18 +395,18 @@ .TP .B buildpackage This target runs the targets -.B clean, +.BR clean , and -.B binary, +.BR binary , and produces the complete package using -.B dpkg\-buildpackage +.BR dpkg\-buildpackage . .TP .B binary This target produces all four Debian kernel packages by running the targets .B binary\-indep and -.B binary\-arch. +.BR binary\-arch . However, this requires .I make-kpkg to be run as root (or fakeroot), since @@ -404,10 +416,10 @@ .B binary\-indep This target produces the arch independent packages by running the targets -.B kernel_source, +.BR kernel_source , .B kernel_manual and -.B kernel_doc. +.BR kernel_doc . However, this also requires .I make-kpkg to be run as root (or fakeroot), since @@ -419,13 +431,12 @@ targets .B kernel_headers and -.B kernel_image. +.BR kernel_image . However, this also requires .I make-kpkg to be run as root (or fakeroot), since .I \-\-rootcmd will not work. -.B kernel_image. .TP .B kernel_source This target produces a debianised package of the Linux kernel sources. @@ -437,7 +448,7 @@ so people may take any action they see fit (remove arch trees, prune version control directories, .I find . \-type d \-name CVS \-prune \-exec rm \-rf {} \\; -etc). This has no effect on anything +etc.). This has no effect on anything other than the kernel sources that are being packaged -- if the script operates on the current directory and its children, the original source tree should remain intact. The environment variables @@ -478,7 +489,7 @@ .B kernel_image This target produces a Debian package of the Linux kernel source image, and any modules configured in the kernel configuration file -.I .config. +.IR .config . If there is no .I .config file in the kernel source directory, a default configuration is @@ -496,13 +507,13 @@ shall be called on that directory just before the kernel image package is built. The location of the root of the image package being built shall be passed in the environment variable -.B IMAGE_TOP, -and the kernel versions is passed in through the environment variable +.BR IMAGE_TOP , +and the kernel version is passed in through the environment variable .B version for all these scripts. .IP Please see the documentation about hooks in -.B kernel\-img.conf(5). +.BR kernel\-img.conf (5). These hooks are variables that can be pointed by the local sysadmin to scripts that add or remove a line from the grub menu list at kernel image install and remove times. A sample script to add lines to a grub @@ -512,15 +523,15 @@ Apart from hook variables that the local admin may set, there are a set of directories where packages, or the local admin, may drop in script files. The directories are -.I /etc/kernel/preinst.d/, -.I /etc/kernel/postinst.d/, -.I /etc/kernel/prerm.d/, -.I /etc/kernel/postrm.d/, +.IR /etc/kernel/preinst.d/ , +.IR /etc/kernel/postinst.d/ , +.IR /etc/kernel/prerm.d/ , +.IR /etc/kernel/postrm.d/ , +.IR /etc/kernel/preinst.d/<VERSION>/ , +.IR /etc/kernel/postinst.d/<VERSION>/ , +.IR /etc/kernel/prerm.d/<VERSION>/ , and -.I /etc/kernel/preinst.d/<VERSION>/, -.I /etc/kernel/postinst.d/<VERSION>/, -.I /etc/kernel/prerm.d/<VERSION>/, -.I /etc/kernel/postrm.d/<VERSION>/. +.IR /etc/kernel/postrm.d/<VERSION>/ . If they exists, the kernel\-image package shall run a .B run\-parts program over the directory (including the versioned one), giving the @@ -533,7 +544,7 @@ argument (or the default value, linux), and the variable .B KERNEL_PACKAGE_VERSION shall be set to the version of the kernel\-package that created the -package. . These scripts shall be called with two arguments, the first +package. These scripts shall be called with two arguments, the first being the .I version of the kernel image, and the second argument being the @@ -541,16 +552,22 @@ of the kernel image itself. Since debconf is in use before the script is called, this script should issue no diagnostic messages to stdout -- while the postinst does call -.B db_stop -, debconf does not restore stdout, so messages to stdout disappear. +.BR db_stop , +debconf does not restore stdout, so messages to stdout disappear. .IP On installation, it also offers to run the Linux loader, .I LILO (or alternates like -.I loadlin, SILO, QUIK, VMELILO, ZIPL, yaboot, PALO +.IR loadlin , +.IR SILO , +.IR QUIK , +.IR VMELILO , +.IR ZIPL , +.IR yaboot , +.I PALO or -.I GRUB -), creating a configuration file for supported boot loaders +.IR GRUB ), +creating a configuration file for supported boot loaders if needed. At that time it also offers to put the new kernel on a floppy, formatting the floppy if needed. On deletion, the package checks the version of the kernel running, and refuses to delete a @@ -574,8 +591,8 @@ same time you build your kernel image. This target expects to find the modules or packages under /usr/src/modules, and, for all such directories, changes to MODULE_LOC/x (MODULE_LOC defaults to -.I /usr/src/modules. -), and runs the +.IR /usr/src/modules ), +and runs the .B kdist rule in the local .I debian.rules @@ -585,31 +602,31 @@ compressed diff file, with .I md5sums recorded in a changes file using -.B dpkg\-genchanges. +.BR dpkg\-genchanges . The file is signed by the same identity that would be used to sign the kernel packages. This option is used by maintainers uploading the package to the Debian archives. .TP .B modules_config This target allows you to configure all packages under -.B MODULE_LOC, +.BR MODULE_LOC , which defaults to -.B /usr/src/modules. +.BR /usr/src/modules . This is useful if you need to manually modify some aspects of the configuration, or if you want to manually compile the add on modules. This should not be called unless you already have a ./debian directory. .TP .B modules_image This target allows you to build all packages under -.B MODULE_LOC, +.BR MODULE_LOC , which defaults to -.B /usr/src/modules, +.BR /usr/src/modules , but does not create the source or diff files, and does not create and sign a changes file. This is the only modules related option you need if you just want to compile the add on modules image files for installation on one or more machines. Generally called in conjunction with -.B kernel_image, +.BR kernel_image , especially if also using the option .B append_to_version (prevents spurious warnings). @@ -617,21 +634,21 @@ .TP .B modules_clean This target allows you to clean all packages under -.B MODULE_LOC, +.BR MODULE_LOC , which defaults to -.B /usr/src/modules, +.BR /usr/src/modules , and this should be all that is needed to undo the effect of any of the other modules_ targets. This should not be called unless you already have a ./debian directory. .TP .B configure This target runs configure (actually, -.B config_target, +.BR config_target , set by .B \-\-config which defaults to -.I oldconfig -) early, so you may edit files generated by +.IR oldconfig ) +early, so you may edit files generated by .B make config in the kernel source directory and not have them stomped by .B make\-kpkg @@ -658,44 +675,45 @@ package may break your system unless you know what you are doing. You have been warned. .SH "ENVIRONMENT VARIABLES" -.I KPKG_DEBUG, +.BR KPKG_DEBUG , if set, causes make-kpkg to spit out debugging messages about some shell functions executed internally. This is probably of not interest to anyone not debugging -.B make\-kpkg. +.BR make\-kpkg . The following variables (documented above) also affect -.B make\-kpkg: -.I DEBIAN_REVISION_MANDATORY -.I APPEND_TO_VERSION -.I VERSION_H_OK -.I KPKG_ARCH -.I CROSS_COMPILE -.I KPKG_SUBARCH -.I KPKG_OVERLAY_DIR -.I ARCH_IN_NAME -.I INITRD -.I SOURCE_CLEAN_HOOK -.I MODULE_LOC -.I CONCURRENCY_LEVEL -.I IGNORE_UPPERCASE_VERSION +.BR make\-kpkg : +.BR DEBIAN_REVISION_MANDATORY , +.BR APPEND_TO_VERSION , +.BR VERSION_H_OK , +.BR KPKG_ARCH , +.BR CROSS_COMPILE , +.BR KPKG_SUBARCH , +.BR KPKG_OVERLAY_DIR , +.BR ARCH_IN_NAME , +.BR INITRD , +.BR SOURCE_CLEAN_HOOK , +.BR MODULE_LOC , +.B CONCURRENCY_LEVEL +and +.BR IGNORE_UPPERCASE_VERSION . .SH FILES Apart from the runtime options, the .I debian.rules file run by .B make\-kpkg also looks for a per user configuration file -.I ~/.kernel\-pkg.conf. +.IR ~/.kernel\-pkg.conf . Failing that, it looks for site\-wide defaults in the file -.I /etc/kernel\-pkg.conf. +.IR /etc/kernel\-pkg.conf . The default configuration allows there to be a site wide override for the full name and email address of the person responsible for maintaining the kernel packages on the site, but the .I /etc/kernel\-pkg.conf (or -.I ~/.kernel\-pkg.conf. -) file is actually a Makefile snippet, and any legal make directives +.IR ~/.kernel\-pkg.conf ) +file is actually a Makefile snippet, and any legal make directives may be included in there. -.B Note: +.BR Note : Caution is urged with this file, since you can totally change the way that the make is run by suitably editing this file. Please look at .I /usr/share/doc/kernel\-package/Problems.gz @@ -704,16 +722,17 @@ .I /usr/share/doc/kernel\-package/README.gz and it is recommended that one read that before using this utility. .SH "SEE ALSO" -.BR kernel\-pkg.conf (5), -.BR kernel\-img.conf (5), -.BR Getopt::Long (3perl), .BR dpkg\-deb (1), .BR dpkg\-source (1), .BR make (1), -.BR The\ Programmers\ manual, -.BR The\ GNU\ Make\ manual, -and the extensive documentation in the directory -.B /usr/share/doc/kernel\-package +.BR Getopt::Long (3perl), +.BR kernel\-img.conf (5), +.BR kernel\-pkg.conf (5), +.BR The\ Programmers\ manual , +.BR The\ GNU\ Make\ manual , +and the extensive documentation in the +.I /usr/share/doc/kernel\-package +directory .SH AUTHOR This manual page was written by Manoj Srivastava <sriva...@debian.org>, for the Debian GNU/Linux system. Les fichiers binaires /tmp/Spki35atM5/kernel-package-12.036+nmu2/messages.mo et /tmp/uxegQnttOd/kernel-package-12.036+nmu3/messages.mo sont différents diff -Nru --exclude '*.po' --exclude '*.pot' kernel-package-12.036+nmu2/po4a/po4a.conf kernel-package-12.036+nmu3/po4a/po4a.conf --- kernel-package-12.036+nmu2/po4a/po4a.conf 2008-10-13 00:02:55.000000000 -0400 +++ kernel-package-12.036+nmu3/po4a/po4a.conf 2012-08-06 16:44:32.000000000 -0400 @@ -1,4 +1,4 @@ -[po4a_langs] fr +[po4a_langs] de fr # First explain where the translator input files are to be found [po4a_paths] po4a/po/kernel-package.doc.pot $lang:po4a/po/$lang.po