Bug#301313: kernel-package: Plus sign in appended version breaks menu.lst

2005-03-25 Thread Manoj Srivastava
reassign 301313 grub
thanks

Hi,

I  don't think that deprecating legal values for kernel image
 packages to work around a bug in the upgrade-grup script is
 the right thing to do. Instead, upgrade_grub should either use tr on
 the image name, or define some other shceme to store options.

manoj
-- 
Marriage is a feast where the grace is sometimes better than the
feast. Colton
Manoj Srivastava   [EMAIL PROTECTED]  http://www.debian.org/%7Esrivasta/
1024D/BF24424C print 4966 F272 D093 B493 410B  924B 21BA DABB BF24 424C


-- 
To UNSUBSCRIBE, email to [EMAIL PROTECTED]
with a subject of unsubscribe. Trouble? Contact [EMAIL PROTECTED]



Bug#301313: kernel-package: Plus sign in appended version breaks menu.lst

2005-03-24 Thread Jun Inoue
Package: kernel-package
Version: 8.125
Severity: normal


I created a package with make-kpkg --append-to-version=+2005.03.21,
and the corresponding menu.lst entry was:

title   Debian GNU/Linux, kernel 2.6.8+2005.03.21 
root(hd0,4)
kernel  /vmlinuz-2.6.8+2005.03.21 +2005.03.21
initrd  /initrd.img-2.6.8+2005.03.21
savedefault
boot

The kernel option should be `root=/dev/hda8 ro', not `+2005.03.21'.
This happens because update-grub stores options for each kernel in a
shell variable named `kopt_ver', where ver is the version string.
Reference to $kopt_+2005.03.21 is interpreted as an unbound variable
(kopt_) and the string '+2005.03.21' (see get_kernel_opt()).

I think deprecating `+' would do just fine, unless there's an
important reason to do otherwise.


diff -ur org.kernel-package-8.125/make-kpkg kernel-package-8.125/make-kpkg
--- org.kernel-package-8.125/make-kpkg  2005-03-23 23:17:34.0 -0800
+++ kernel-package-8.125/make-kpkg  2005-03-23 23:04:28.0 -0800
@@ -147,8 +147,8 @@
 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 contain only Blowercase alphanumerics and
-the characters - + . (full stop, hyphen, and plus). Uppercase letters
-are not permitted under the Policy for a new package.
+the characters - . (full stop and hyphen). Uppercase letters are not
+permitted under the Policy for a new package.
 
 Please note that you must run a Bmake-kpkg clean after configuring
 the kernel using make (x|menu)?config, since that creates
@@ -164,9 +164,9 @@
 Sets the kernel flavour to the argument Bfoo. The flavour is also
 appended to the package name. You need a patched Makefile to make this
 work properly (see /usr/share/doc/kernel-package/Flavours.gz).  It may
-contain only Blowercase alphanumerics and the characters - + . (full
-stop, hyphen, and plus). Uppercase letters are not permitted under the
-Policy for a new package. BNOTE: Hyphens are discouraged.  (Look at
+contain only Blowercase alphanumerics and the characters - . (full
+stop and hyphen). Uppercase letters are not permitted under the Policy
+for a new package. BNOTE: Hyphens are discouraged.  (Look at
 Chapters 4 of the Policy manual for details).
 
 
@@ -911,9 +911,9 @@
   }
 
   if ($append_to_version){
-if ($append_to_version !~ m/^[a-z\d\.\-\+]+$/o) {
+if ($append_to_version !~ m/^[a-z\d\.\-]+$/o) {
   print STDERR  Error: The extended version may only contain\n;
-  print STDERR  lowercase alphanumerics and  the  characters  - +  .\n;
+  print STDERR  lowercase alphanumerics and  the  characters  - .\n;
   print STDERR  The current value is: $append_to_version\n;
   print STDERR  Aborting.\n;
   exit 1;
diff -ur org.kernel-package-8.125/make-kpkg.8 kernel-package-8.125/make-kpkg.8
--- org.kernel-package-8.125/make-kpkg.82005-03-23 23:17:34.0 
-0800
+++ kernel-package-8.125/make-kpkg.82005-03-24 19:39:50.040284616 -0800
@@ -131,9 +131,9 @@
 must obey the policy governing the package name. That means it may
 contain only 
 .B  lowercase
-alphanumerics and the characters - + . (full stop, hyphen, and
-plus). Uppercase letters are not permitted under the Policy for a new
-package.  If the environment variable
+alphanumerics and the characters - . (full stop and hyphen). Uppercase
+letters are not permitted under the Policy for a new package.  If the
+environment variable
 .B IGNORE_UPPERCASE_VERSION
 is set, make-kpkg shall lower case version numbers set in the Makefile
 or in the 
diff -ur org.kernel-package-8.125/make-kpkg.es.8 
kernel-package-8.125/make-kpkg.es.8
--- org.kernel-package-8.125/make-kpkg.es.8 2005-03-23 23:17:34.0 
-0800
+++ kernel-package-8.125/make-kpkg.es.8 2005-03-24 19:42:21.947191256 -0800
@@ -131,8 +131,8 @@
 que están sujetos los nombres de los paquetes Debian. Esto quiere decir que 
sólo
 puede contener caracteres alfanuméricos en
 .B  minúsculas
-y los caracteres \- + . (guión, signo más y punto). Las Normas no permiten
-letras mayúsculas en los paquetes nuevos. Si la variable de entorno
+y los caracteres \- . (guión y punto). Las Normas no permiten letras
+mayúsculas en los paquetes nuevos. Si la variable de entorno
 .B IGNORE_UPPERCASE_VERSION
 está establecida, make-kpkg pasará a minúsculas los números de versión en el
 Makefile o en el fichero
diff -ur org.kernel-package-8.125/make-kpkg.fr.8 
kernel-package-8.125/make-kpkg.fr.8
--- org.kernel-package-8.125/make-kpkg.fr.8 2005-03-23 23:17:34.0 
-0800
+++ kernel-package-8.125/make-kpkg.fr.8 2005-03-24 19:46:12.856087768 -0800
@@ -133,7 +133,7 @@
 aux contraintes de la charte concernant les noms de paquets. Ce qui veut dire
 qu'il ne doit contenir que des caractères alphanumériques 
 .B  minuscules
-et les caractères -, + et . (trait d'union, plus et point). Les lettres
+et les caractères - et . (trait d'union et point). Les