commit yast2-bootloader

22 May 2006

Hello community,

here is the log from the commit of package yast2-bootloader
checked in at Tue May 23 01:39:32 CEST 2006.

--------

--- yast2-bootloader/yast2-bootloader.changes	2006-05-19 16:07:48.000000000 +0200
+++ yast2-bootloader/yast2-bootloader.changes	2006-05-23 01:38:57.000000000 +0200
@@ -1,0 +2,6 @@
+Mon May 22 18:30:52 CEST 2006 - jplack@suse.de
+
+- add initial support for xenpae (#177051)
+- 2.13.66
+
+-------------------------------------------------------------------

Old:
----
  yast2-bootloader-2.13.65.tar.bz2

New:
----
  yast2-bootloader-2.13.66.tar.bz2

++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++

Other differences:
------------------
++++++ yast2-bootloader.spec ++++++
--- /var/tmp/diff_new_pack.AK0giG/_old	2006-05-23 01:39:17.000000000 +0200
+++ /var/tmp/diff_new_pack.AK0giG/_new	2006-05-23 01:39:17.000000000 +0200
@@ -1,5 +1,5 @@
 #
-# spec file for package yast2-bootloader (Version 2.13.65)
+# spec file for package yast2-bootloader (Version 2.13.66)
 #
 # Copyright (c) 2006 SUSE LINUX Products GmbH, Nuernberg, Germany.
 # This file and all modifications and additions to the pristine
@@ -11,12 +11,12 @@
 # norootforbuild
 
 Name:           yast2-bootloader
-Version:        2.13.65
+Version:        2.13.66
 Release:        1
 License:        GPL
 Group:          System/YaST
 BuildRoot:      %{_tmppath}/%{name}-%{version}-build
-Source0:        yast2-bootloader-2.13.65.tar.bz2
+Source0:        yast2-bootloader-2.13.66.tar.bz2
 prefix:		/usr
 BuildRequires:  docbook-xsl-stylesheets doxygen gcc-c++ libxslt limal-bootloader limal-devel perl-XML-Writer perl-gettext sgml-skel swig update-alternatives update-desktop-files yast2-devel yast2-devtools yast2-installation yast2-perl-bindings yast2-testsuite
 PreReq:         /bin/sed %fillup_prereq
@@ -60,7 +60,7 @@
     Dan Meszaros
 
 %prep
-%setup -n yast2-bootloader-2.13.65
+%setup -n yast2-bootloader-2.13.66
 
 %build
 %{prefix}/bin/y2tool y2autoconf
@@ -111,6 +111,9 @@
 /usr/share/YaST2/clients/bootfloppy.ycp
 
 %changelog -n yast2-bootloader
+* Mon May 22 2006 - jplack@suse.de
+- add initial support for xenpae (#177051)
+- 2.13.66
 * Fri May 19 2006 - od@suse.de
 - added FIXME note to Bootloader.ycp
 - send partitioning info always when Initializer called (#161755)

++++++ yast2-bootloader-2.13.65.tar.bz2 -> yast2-bootloader-2.13.66.tar.bz2 ++++++
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-bootloader-2.13.65/Makefile.am new/yast2-bootloader-2.13.66/Makefile.am
--- old/yast2-bootloader-2.13.65/Makefile.am	2006-02-01 16:06:40.000000000 +0100
+++ new/yast2-bootloader-2.13.66/Makefile.am	2006-04-03 21:41:46.000000000 +0200
@@ -154,7 +154,7 @@
 	    $(PREFIX)/bin/y2tool create-spec < $$i > $$here/package/$${newname} ; \
 	done
 
-package: check-up-to-date check-tagversion check-all-packages package-local
+package: check-up-to-date check-tagversion check-all-packages check-textdomain package-local
 
 TAGVERSION	 = $(PREFIX)/bin/y2tool tagversion
 
@@ -199,6 +199,9 @@
 		false;							\
 	fi
 
+check-textdomain:
+	$(PREFIX)/bin/y2tool check-textdomain $(srcdir)
+
 stable: checkin-stable
 
 checkin-stable: package
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-bootloader-2.13.65/Makefile.in new/yast2-bootloader-2.13.66/Makefile.in
--- old/yast2-bootloader-2.13.65/Makefile.in	2006-02-01 16:07:00.000000000 +0100
+++ new/yast2-bootloader-2.13.66/Makefile.in	2006-04-03 21:42:13.000000000 +0200
@@ -860,7 +860,7 @@
 	    $(PREFIX)/bin/y2tool create-spec < $$i > $$here/package/$${newname} ; \
 	done
 
-package: check-up-to-date check-tagversion check-all-packages package-local
+package: check-up-to-date check-tagversion check-all-packages check-textdomain package-local
 
 check-up-to-date check-cvs-up-to-date check-svn-up-to-date:
 	if [ -d $(srcdir)/CVS ]; then \
@@ -903,6 +903,9 @@
 		false;							\
 	fi
 
+check-textdomain:
+	$(PREFIX)/bin/y2tool check-textdomain $(srcdir)
+
 stable: checkin-stable
 
 checkin-stable: package
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-bootloader-2.13.65/VERSION new/yast2-bootloader-2.13.66/VERSION
--- old/yast2-bootloader-2.13.65/VERSION	2006-05-19 16:05:16.000000000 +0200
+++ new/yast2-bootloader-2.13.66/VERSION	2006-05-22 18:42:13.000000000 +0200
@@ -1 +1 @@
-2.13.65
+2.13.66
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-bootloader-2.13.65/configure new/yast2-bootloader-2.13.66/configure
--- old/yast2-bootloader-2.13.65/configure	2006-02-01 16:06:53.000000000 +0100
+++ new/yast2-bootloader-2.13.66/configure	2006-04-03 21:42:03.000000000 +0200
@@ -1,6 +1,6 @@
 #! /bin/sh
 # Guess values for system-dependent variables and create Makefiles.
-# Generated by GNU Autoconf 2.59 for yast2-bootloader 2.13.12.
+# Generated by GNU Autoconf 2.59 for yast2-bootloader 2.13.36.
 #
 # Report bugs to <http://www.suse.de/feedback>.
 #
@@ -423,8 +423,8 @@
 # Identity of this package.
 PACKAGE_NAME='yast2-bootloader'
 PACKAGE_TARNAME='yast2-bootloader'
-PACKAGE_VERSION='2.13.12'
-PACKAGE_STRING='yast2-bootloader 2.13.12'
+PACKAGE_VERSION='2.13.36'
+PACKAGE_STRING='yast2-bootloader 2.13.36'
 PACKAGE_BUGREPORT='http://www.suse.de/feedback'
 
 ac_unique_file="RPMNAME"
@@ -959,7 +959,7 @@
   # Omit some internal or obsolete options to make the list less imposing.
   # This message is too long to be a string in the A/UX 3.1 sh.
   cat <<_ACEOF
-\`configure' configures yast2-bootloader 2.13.12 to adapt to many kinds of systems.
+\`configure' configures yast2-bootloader 2.13.36 to adapt to many kinds of systems.
 
 Usage: $0 [OPTION]... [VAR=VALUE]...
 
@@ -1026,7 +1026,7 @@
 
 if test -n "$ac_init_help"; then
   case $ac_init_help in
-     short | recursive ) echo "Configuration of yast2-bootloader 2.13.12:";;
+     short | recursive ) echo "Configuration of yast2-bootloader 2.13.36:";;
    esac
   cat <<\_ACEOF
 
@@ -1169,7 +1169,7 @@
 test -n "$ac_init_help" && exit 0
 if $ac_init_version; then
   cat <<\_ACEOF
-yast2-bootloader configure 2.13.12
+yast2-bootloader configure 2.13.36
 generated by GNU Autoconf 2.59
 
 Copyright (C) 2003 Free Software Foundation, Inc.
@@ -1183,7 +1183,7 @@
 This file contains any messages produced by compilers while
 running configure, to aid debugging if configure makes a mistake.
 
-It was created by yast2-bootloader $as_me 2.13.12, which was
+It was created by yast2-bootloader $as_me 2.13.36, which was
 generated by GNU Autoconf 2.59.  Invocation command line was
 
   $ $0 $@
@@ -1913,7 +1913,7 @@
 
 # Define the identity of the package.
  PACKAGE='yast2-bootloader'
- VERSION='2.13.12'
+ VERSION='2.13.36'
 
 
 cat >>confdefs.h <<_ACEOF
@@ -2124,7 +2124,7 @@
 
 
 
-VERSION="2.13.12"
+VERSION="2.13.36"
 RPMNAME="yast2-bootloader"
 MAINTAINER="Olaf Dabrunz <od@suse.de>"
 
@@ -20163,7 +20163,7 @@
 } >&5
 cat >&5 <<_CSEOF
 
-This file was extended by yast2-bootloader $as_me 2.13.12, which was
+This file was extended by yast2-bootloader $as_me 2.13.36, which was
 generated by GNU Autoconf 2.59.  Invocation command line was
 
   CONFIG_FILES    = $CONFIG_FILES
@@ -20226,7 +20226,7 @@
 
 cat >>$CONFIG_STATUS <<_ACEOF
 ac_cs_version="\\
-yast2-bootloader config.status 2.13.12
+yast2-bootloader config.status 2.13.36
 configured by $0, generated by GNU Autoconf 2.59,
   with options \\"`echo "$ac_configure_args" | sed 's/[\\""\`\$]/\\\\&/g'`\\"
 
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-bootloader-2.13.65/configure.in new/yast2-bootloader-2.13.66/configure.in
--- old/yast2-bootloader-2.13.65/configure.in	2006-02-01 16:06:39.000000000 +0100
+++ new/yast2-bootloader-2.13.66/configure.in	2006-04-03 21:41:46.000000000 +0200
@@ -3,7 +3,7 @@
 dnl -- This file is generated by y2autoconf - DO NOT EDIT! --
 dnl    (edit configure.in.in instead)
 
-AC_INIT(yast2-bootloader, 2.13.12, http://www.suse.de/feedback, yast2-bootloader)
+AC_INIT(yast2-bootloader, 2.13.36, http://www.suse.de/feedback, yast2-bootloader)
 dnl Check for presence of file 'RPMNAME'
 AC_CONFIG_SRCDIR([RPMNAME])
 
@@ -17,7 +17,7 @@
 AM_INIT_AUTOMAKE(tar-ustar) dnl searches for some needed programs
 
 dnl Important YaST2 variables
-VERSION="2.13.12"
+VERSION="2.13.36"
 RPMNAME="yast2-bootloader"
 MAINTAINER="Olaf Dabrunz <od@suse.de>"
 
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-bootloader-2.13.65/src/modules/BootCommon.ycp new/yast2-bootloader-2.13.66/src/modules/BootCommon.ycp
--- old/yast2-bootloader-2.13.65/src/modules/BootCommon.ycp	2006-04-28 14:31:55.000000000 +0200
+++ new/yast2-bootloader-2.13.66/src/modules/BootCommon.ycp	2006-05-22 18:54:50.000000000 +0200
@@ -15,7 +15,7 @@
  *      Joachim Plack <jplack@suse.de>
  *      Olaf Dabrunz <od@suse.de>
  *
- * $Id: BootCommon.ycp 30584 2006-04-28 12:31:51Z odabrunz $
+ * $Id: BootCommon.ycp 31102 2006-05-22 16:54:46Z jplack $
  *
  */
 
@@ -287,6 +287,7 @@
 global define string getLoaderType (boolean recheck);
 global define list<string> getBootloaders ();
 global define list<string> Summary ();
+global define boolean UsingXenPae();
 
 include "bootloader/routines/popups.ycp";
 include "bootloader/routines/misc.ycp";
@@ -312,7 +313,16 @@
 	    || (Mode::normal () && Pkg::IsProvided ("xen")
 		&& Pkg::IsProvided ("kernel-xen"))
 	    || (! Mode::normal () && Pkg::IsSelected ("xen")
-		&& Pkg::IsSelected ("kernel-xen")));
+		&& Pkg::IsSelected ("kernel-xen"))
+	    || UsingXenPae());
+}
+
+global boolean UsingXenPae() {
+    if (Mode::test())
+	return true;
+    if (Mode::normal())
+        return Pkg::IsProvided ("kernel-xenpae");
+    return Pkg::IsSelected ("kernel-xenpae");
 }
 
 /**
@@ -398,10 +408,16 @@
     }
     if (title == "xen")
     {
-	ret["xen"] = "/boot/xen.gz";
 	ret["xen_append"] = "";
-	ret["kernel"] = "/boot/" + Kernel::GetBinary () + "-xen";
-	ret["initrd"] = "/boot/initrd-xen";
+        if (UsingXenPae()) {
+	    ret["xen"] = "/boot/xen-pae.gz";
+	    ret["kernel"] = "/boot/" + Kernel::GetBinary () + "-xenpae";
+	    ret["initrd"] = "/boot/initrd-xenpae";
+	} else {
+	    ret["xen"] = "/boot/xen.gz";
+	    ret["kernel"] = "/boot/" + Kernel::GetBinary () + "-xen";
+	    ret["initrd"] = "/boot/initrd-xen";
+	}
     }
     else if (title == "wildcard")
     {
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-bootloader-2.13.65/src/modules/BootGRUB.ycp new/yast2-bootloader-2.13.66/src/modules/BootGRUB.ycp
--- old/yast2-bootloader-2.13.65/src/modules/BootGRUB.ycp	2006-04-21 17:22:16.000000000 +0200
+++ new/yast2-bootloader-2.13.66/src/modules/BootGRUB.ycp	2006-05-22 18:44:03.000000000 +0200
@@ -12,7 +12,7 @@
  * Authors:
  *      Jiri Srain <jsrain@suse.cz>
  *
- * $Id: BootGRUB.ycp 29112 2006-03-17 17:44:27Z jplack $
+ * $Id: BootGRUB.ycp 31101 2006-05-22 16:43:57Z jplack $
  *
  */
 
@@ -96,7 +96,7 @@
 		"test -d %1 || /bin/mkdir %1", tmpdir))
 	    )
 	{
-	    y2milestone ("Detectig other Linux parts");
+	    y2milestone ("Detecting other Linux parts");
 	    list filesystems = maplist (map p, other_l,
 		``(p["used_fs"]:(any)""));
 	    filesystems = toset (filter (any f, filesystems, ``(f != "")));
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-bootloader-2.13.65/src/routines/dialogs.ycp new/yast2-bootloader-2.13.66/src/routines/dialogs.ycp
--- old/yast2-bootloader-2.13.65/src/routines/dialogs.ycp	2006-02-13 04:52:14.000000000 +0100
+++ new/yast2-bootloader-2.13.66/src/routines/dialogs.ycp	2006-05-22 18:54:50.000000000 +0200
@@ -11,7 +11,7 @@
  * Authors:
  *      Jiri Srain <jsrain@suse.cz>
  *
- * $Id: dialogs.ycp 27748 2006-02-08 15:15:11Z jplack $
+ * $Id: dialogs.ycp 31102 2006-05-22 16:54:46Z jplack $
  *
  */
 
@@ -279,12 +279,12 @@
     BootCommon::current_section["__changed"] = true;
     if (BootCommon::current_section["type"]:"" == "xen")
     {
-	BootCommon::current_section = (map<string,any>)union (
-	    $[
-		"xen" : "/boot/xen.gz",
-		"xen_append" : "",
-	    ],
-	    BootCommon::current_section);
+       BootCommon::current_section = (map<string,any>)union (
+           $[
+               "xen" : BootCommon::UsingXenPae() ? "/boot/xen-pae.gz" : "/boot/xen.gz",
+               "xen_append" : "",
+           ],
+           BootCommon::current_section);
     }
     y2milestone ("Storing section: index:  %1, contents: %2",
 	BootCommon::current_section_index,
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-bootloader-2.13.65/src/routines/lilolike.ycp new/yast2-bootloader-2.13.66/src/routines/lilolike.ycp
--- old/yast2-bootloader-2.13.65/src/routines/lilolike.ycp	2006-05-10 19:05:49.000000000 +0200
+++ new/yast2-bootloader-2.13.66/src/routines/lilolike.ycp	2006-05-22 18:54:50.000000000 +0200
@@ -11,7 +11,7 @@
  * Authors:
  *      Jiri Srain <jsrain@suse.cz>
  *
- * $Id: lilolike.ycp 30834 2006-05-10 17:05:45Z odabrunz $
+ * $Id: lilolike.ycp 31102 2006-05-22 16:54:46Z jplack $
  *
  */
 {
@@ -915,7 +915,10 @@
         }
 	else if (type == "xen" && write_settings["insert_initrd"]:false)
 	{
-	    s["initrd"] = "/boot/initrd-xen";
+	    if (BootCommon::UsingXenPae())
+	        s["initrd"] = "/boot/initrd-xenpae";
+	    else
+	        s["initrd"] = "/boot/initrd-xen";
 	}
         if (initrd != "")
         {


++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++



Remember to have fun...

    

root＠suse.de

tags

participants (1)