Commit 0cbba845 authored by Manoj Srivastava's avatar Manoj Srivastava

[master]: New bugfixing release.

* The underlying kernel tree has long removed support for zImage
  images. This makes bzImage the default, so there is no need to have
  the user specify one or the other, so removed the --zImage and the
  --bzImage options from kernel-package. Removing this also removed code
  that caused confusion in the image names when --bzImage argment was
  used.  (Closes: #574957).
* Modified the manual pages to reflect the changes aboue. Updated the
  po4a .po files and .pot files.  Also clarified the requirements for
  running as root,, and emphasized that fakeroot is th way to go, and
  running as root is not recommended. Clarified that make-kpkg is
  supposed to be run after configuring the kernel. (Closes: #704116).
* Previously, the Debian revision had to contain a digit. Now dpkg
  complains if it does not start with a digit. Updated the  sanity
  checks to test for this new constraint.   (Closes: #674101).
* Removed a versioned dependency on make, for a version older than the
  one present in oldstable.
Signed-off-by: 's avatarManoj Srivastava <srivasta@golden-gryphon.com>
parent 21707ebf
kernel-package (13.008) unstable; urgency=low
* The underlying kernel tree has long removed support for zImage
images. This makes bzImage the default, so there is no need to have
the user specify one or the other, so removed the --zImage and the
--bzImage options from kernel-package. Removing this also removed code
that caused confusion in the image names when --bzImage argment was
used. (Closes: #574957).
* Modified the manual pages to reflect the changes aboue. Updated the
po4a .po files and .pot files. Also clarified the requirements for
running as root,, and emphasized that fakeroot is th way to go, and
running as root is not recommended. Clarified that make-kpkg is
supposed to be run after configuring the kernel. (Closes: #704116).
* Previously, the Debian revision had to contain a digit. Now dpkg
complains if it does not start with a digit. Updated the sanity
checks to test for this new constraint. (Closes: #674101).
* Bug fix #574957: "Installation od XEN kernel images fails.", thanks to
Christian Motschke
* Bug fix #704116: "[make-kpkg] manpage not uptodate", thanks to
Christian Buhtz
* Bug fix #674101: "kernel-package -- please check parameters before you
build compiling", thanks to Kumar Appaiah
-- Manoj Srivastava <srivasta@debian.org> Mon, 12 May 2014 01:05:20 -0700
kernel-package (13.007) unstable; urgency=low
* armel systems show upwith DEB_HOST_ARCH_CPU=arm, same as arm, but with
......
......@@ -20,9 +20,9 @@ Description: utility for building Linux kernel related Debian packages
step once was the initial motivation for this package). Please look at
/usr/share/doc/kernel-package/Rationale.gz for a full list of advantages
of this package.
Depends: build-essential, make (>= 3.80-10), po-debconf, gettext, file,
Depends: build-essential, po-debconf, gettext, file, ${misc:Depends}, bc,
debianutils (>= 2.30), binutils (>= 2.12), util-linux (>= 2.10o),
kmod, ${misc:Depends}, bc
kmod
Recommends: docbook-utils, cpio, uboot-mkimage
Suggests: linux-source, e2fsprogs (>= 1.41.4), libncurses-dev,
xmlto, bzip2, linux-initramfs-tool, grub (>= 0.93) | grub2,
......
######################### -*- Mode: Makefile-Gmake -*- ########################
## config.mk ---
## Author : Manoj Srivastava ( srivasta@glaurung.internal.golden-gryphon.com )
## config.mk ---
## Author : Manoj Srivastava ( srivasta@glaurung.internal.golden-gryphon.com )
## Created On : Mon Oct 31 17:30:53 2005
## Created On Node : glaurung.internal.golden-gryphon.com
## Last Modified By : Manoj Srivastava
......@@ -8,13 +8,13 @@
## Last Machine Used: anzu.internal.golden-gryphon.com
## Update Count : 8
## Status : Unknown, Use with caution!
## HISTORY :
## HISTORY :
## Description : Various internal variable set based on defaults and the
## user configuration files, or from environment vars.
##
##
## arch-tag: 5fac76ea-f1e8-49fe-bd82-12ae6be8d701
##
##
##
##
## This program is free software; you can redistribute it and/or modify
## it under the terms of the GNU General Public License as published by
## the Free Software Foundation; either version 2 of the License, or
......@@ -181,15 +181,11 @@ delete_build_link := NO
endif
endif
ifneq ($(strip $(IMAGE_TYPE)),)
kimage = $(IMAGE_TYPE)
endif
have_new_config_target =
# what kernel config target to run in our configure target.
# The default is empty, unless set in kernel-pkg.conf
ifeq ($(strip $(config_target)),)
# Variable not set in config file.
# Variable not set in config file.
config_target := oldconfig
ifeq ($(strip $(HAVE_CONFIG)),yeS)
ifneq ($(strip $(silentconfig)),)
......
......@@ -36,7 +36,6 @@ my $added_modules = '';
my $append_to_version = '';
my $arch = '';
my $arch_in_name = 0;
my $bzimage;
my $uimage;
my $concurrency = 0;
my $config_target = 'oldconfig';
......@@ -54,9 +53,8 @@ my $stem = '';
my $targ_opt = 0;
my $unsign_changelog = '';
my $unsign_source = '';
my $zimage;
my $mkimage = '';
my $overlay_dir = '';
my $mkimage = '';
my $overlay_dir = '';
my %option_ctl = (
"help" => \$help_opt,
......@@ -80,11 +78,9 @@ my %option_ctl = (
"pgpsign=s" => \$signature,
"key_id=s" => \$key_id,
"targets" => \$targ_opt,
"zimage" => \$zimage,
"rootcmd=s" => \$root_cmd,
"us" => \$unsign_source,
"uc" => \$unsign_changelog,
"bzimage" => \$bzimage,
"uimage" => \$uimage,
"mkimage=s" => \$mkimage,
"jobs|j=i" => \$concurrency
......@@ -306,24 +302,6 @@ does not want, or to take actions other than simple replacement.
=back
=item B<--zimage>
=over 2
Makes a zImage kernel rather than a bzImage kernel (the default).
Useful for people having problems with bzImage kernels.
=back
=item B<--bzimage>
=over 2
Makes a bzImage kernel. Useful for people who want a bzImage kernel
on sites where the default is zImage kernels.
=back
=item B<--uimage>
=over 2
......@@ -378,8 +356,8 @@ This program should be run in a linux kernel source top level directory.
usage: $main::MYNAME [options] target [target ...]
where options are:
--help This message.
--revision number The debian revision number. ([a-zA-Z.~+0-9]) (Must
have digit)
--revision number The debian revision number. ([0-9][a-zA-Z.~+0-9]) (Must
start with a digit)
--append-to-version foo
--append_to_version foo an additional kernel sub-version. ([-a-z.+0-9])
Does not require editing the kernel Makefile
......@@ -406,10 +384,6 @@ usage: $main::MYNAME [options] target [target ...]
--noexec Pass a -n option to the make process
--overlay dir An overlay directory to (re))place file in ./debian
--verbose Pass a V=1 option to the make process
--zimage Create a kernel using zImage rather than bzImage
--bzimage Create a kernel using bzImage (in case the site
wide default is zimage, as set in
/etc/kernel-pkg.conf)
--uimage Create a kernel using uImage rather than zImage
or bzImage
--rootcmd method A command that provides a means of gaining
......@@ -426,8 +400,6 @@ usage: $main::MYNAME [options] target [target ...]
changelog. This is only relevant for the
buildpackage target.
Optionally, use only one of --zimage, --bzimage, or --uimage.
Option Format: The options may be shortened to the smallest unique
string, and may be entered with either a - or a -- prefix, and you may
use a space between an option string and a value. Please refer to man
......@@ -690,14 +662,6 @@ sub main () {
exit 0;
}
if ( ( $bzimage && $zimage )
|| ( $bzimage && $uimage )
|| ( $zimage && $uimage ) ) {
print "Use only one of bzimage, zimage, and uimage options.\n";
print "use --help to display command line syntax help.\n";
exit 1;
} ## end if ( ( $bzimage && $zimage...))
if ( $config_target
!~ /^(?:|silentold|old|menu|n|x|g|rand|def|all(mod|yes|no))(config)?$/ ) {
print
......@@ -821,19 +785,19 @@ EOERR3
$alt_cmd .= "debian";
}
if ( defined($revision) && !( "$revision" eq "" ) ) {
if ($revision) {
if ( $Targets !~ m/^\s*clean\s*$/ )
{ # No need to do all this for just clean
$command .= " DEBIAN_REVISION=$revision ";
$alt_cmd .= " DEBIAN_REVISION=$revision ";
if ( $revision !~ m/^(\d+:)?[a-zA-Z\d\~\.\+\-]+$/o ) {
if ( $revision !~ m/^(\d+:)?\d[a-zA-Z\d\~\.\+\-]*$/o ) {
print STDERR " Error: The revision string may only contain\n";
print STDERR " alphanumerics and the characters ~ + .\n";
print STDERR " If epochs are used, the colon : is also allowed\n";
print STDERR " The current value is: $revision\n";
print STDERR " Aborting.\n";
exit 1;
} ## end if ( $revision !~ m/^(\d+:)?[a-zA-Z\d\~\.\+\-]+$/o)
} ## end if ( $revision !~ m/^(\d+:)?\d[a-zA-Z\d\~\.\+\-]*$/o)
if ( $revision =~ m/\-/o ) {
print STDERR
......@@ -841,7 +805,7 @@ EOERR3
print STDERR " Please ensure that the upstream and debian revision\n";
print STDERR " numbers are policy compliant enough that dpkg and\n";
print STDERR " shall not choke on them at the end of the compile\n";
if ( $revision !~ m/^(\d+:)?[a-zA-Z\d\~\.\+\-]+-\d+[^-]*$/o ) {
if ( $revision !~ m/^(\d+:)?\d[a-zA-Z\d\~\.\+\-]+-\d+[^-]*$/o ) {
die " The revision $revision fails policy compliance, aborting\n";
}
else {
......@@ -849,20 +813,20 @@ EOERR3
}
} ## end if ( $revision =~ m/\-/o)
if ( $revision !~ m/^(\d+:)?.*?\d.*$/ ) {
print STDERR " Error: The revision string must contain digits,\n";
if ( $revision !~ m/^(\d+:)?\d.*$/ ) {
print STDERR " Error: The revision string must start with digits,\n";
print STDERR " or else the package creation scripts complain\n";
print STDERR " The current value is: $revision\n";
print STDERR " Aborting.\n";
exit 1;
} ## end if ( $revision !~ m/^(\d+:)?.*?\d.*$/)
} ## end if ( $revision !~ m/^(\d+:)?\d.*$/)
} ## end if ( $Targets !~ m/^\s*clean\s*$/)
else {
# No checking, since this is the clean target
$command .= " DEBIAN_REVISION=$revision ";
$alt_cmd .= " DEBIAN_REVISION=$revision ";
}
} ## end if ( defined($revision...))
} ## end if ($revision)
if ( $Targets !~ m/^\s*clean\s*$/ ) {
if ($append_to_version) {
......@@ -957,13 +921,7 @@ EOERR3
if ($unsign_source) {
$command .= " UNSIGN_SOURCE=YES ";
}
if ($zimage) {
$command .= " IMAGE_TYPE=zImage ";
}
elsif ($bzimage) {
$command .= " IMAGE_TYPE=bzImage ";
}
elsif ($uimage) {
if ($uimage) {
$command .= " IMAGE_TYPE=uImage ";
}
......
......@@ -44,15 +44,30 @@ file in the current directory, it tries very hard to get an
appropriate one (usually a config file already tailored for Debian
kernels for that architecture), and then calls
.B make oldconfig
to let the user answer any new questions. Typically, you run this
command as root, or under
to let the user answer any new questions. However, this might still
result in an inappropriate configuration, you are encouraged to
confugre the kernel by the usual means before invoking
.B make\-kpkg.
.PP
Typically,
.B make-kpkg
should be run under
.B fakeroot,
.sp 1
.ti +5
make\-kpkg \-\-rootcmd fakeroot kernel_image
.sp 1
but instead you run this command as root (this is not recommended), or
under
.BR fakeroot ,
or tell
.B make\-kpkg
how to become root, like so:
how to become root (not recommended either,
.B fakeroot
is perhaps the safest option), like so:
.sp 1
.ti +5
make\-kpkg \-\-rootcmd fakeroot kernel_image
make\-kpkg \-\-rootcmd sudo kernel_image
.sp 1
The Debian package file is created in the parent directory of the
kernel source directory where this command is run.
......@@ -308,14 +323,6 @@ is populated. The script shall be executed in the
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
Makes a zImage kernel rather than a bzImage kernel (the default).
Useful for people having problems with bzImage kernels.
.TP
.B \-\-bzimage
Makes a bzImage kernel. Useful for people who want a bzImage kernel on
sites where the default is zImage kernels.
.TP
.B \-\-rootcmd foo
The command that provides a means of gaining super user access (for
example, `sudo' or `fakeroot') as needed by dpkg\-buildpackage's \-r
......
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment