Home | Content | Search | Navigation | Indexes
 

Mailinglist Archive: opensuse-commit (1187 mails)

< Previous Next >
commit yast2-bootloader
  • From: root@xxxxxxx (h_root)
  • Date: Tue, 11 Apr 2006 17:27:37 +0200 (CEST)
  • Message-id: <20060411152737.9519B8BE5F@xxxxxxxxxxxxxxx>

Hello community,

here is the log from the commit of package yast2-bootloader
checked in at Tue Apr 11 17:27:37 CEST 2006.

--------
--- yast2-bootloader/yast2-bootloader.changes 2006-04-11 01:11:22.000000000 +0200
+++ yast2-bootloader/yast2-bootloader.changes 2006-04-11 17:22:11.000000000 +0200
@@ -1,0 +2,6 @@
+Tue Apr 11 17:20:56 CEST 2006 - od@xxxxxxx
+
+- clone activate flag and loader_device for AutoYaST (#151501)
+- 2.13.43
+
+-------------------------------------------------------------------

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

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

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

Other differences:
------------------
++++++ yast2-bootloader.spec ++++++
--- /var/tmp/diff_new_pack.xH8b9O/_old 2006-04-11 17:27:04.000000000 +0200
+++ /var/tmp/diff_new_pack.xH8b9O/_new 2006-04-11 17:27:04.000000000 +0200
@@ -1,5 +1,5 @@
#
-# spec file for package yast2-bootloader (Version 2.13.42)
+# spec file for package yast2-bootloader (Version 2.13.43)
#
# 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.42
+Version: 2.13.43
Release: 1
License: GPL
Group: System/YaST
BuildRoot: %{_tmppath}/%{name}-%{version}-build
-Source0: yast2-bootloader-2.13.42.tar.bz2
+Source0: yast2-bootloader-2.13.43.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.42
+%setup -n yast2-bootloader-2.13.43

%build
%{prefix}/bin/y2tool y2autoconf
@@ -111,6 +111,9 @@
/usr/share/YaST2/clients/bootfloppy.ycp

%changelog -n yast2-bootloader
+* Tue Apr 11 2006 - od@xxxxxxx
+- clone activate flag and loader_device for AutoYaST (#151501)
+- 2.13.43
* Tue Apr 11 2006 - jplack@xxxxxxx
- write config even if no create_efi_entry has been requested
(#163260)

++++++ yast2-bootloader-2.13.42.tar.bz2 -> yast2-bootloader-2.13.43.tar.bz2 ++++++
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-bootloader-2.13.42/Makefile.am new/yast2-bootloader-2.13.43/Makefile.am
--- old/yast2-bootloader-2.13.42/Makefile.am 2006-04-03 21:41:46.000000000 +0200
+++ new/yast2-bootloader-2.13.43/Makefile.am 2006-02-01 16:06:40.000000000 +0100
@@ -154,7 +154,7 @@
$(PREFIX)/bin/y2tool create-spec < $$i > $$here/package/$${newname} ; \
done

-package: check-up-to-date check-tagversion check-all-packages check-textdomain package-local
+package: check-up-to-date check-tagversion check-all-packages package-local

TAGVERSION = $(PREFIX)/bin/y2tool tagversion

@@ -199,9 +199,6 @@
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.42/Makefile.in new/yast2-bootloader-2.13.43/Makefile.in
--- old/yast2-bootloader-2.13.42/Makefile.in 2006-04-03 21:42:13.000000000 +0200
+++ new/yast2-bootloader-2.13.43/Makefile.in 2006-02-01 16:07:00.000000000 +0100
@@ -860,7 +860,7 @@
$(PREFIX)/bin/y2tool create-spec < $$i > $$here/package/$${newname} ; \
done

-package: check-up-to-date check-tagversion check-all-packages check-textdomain package-local
+package: check-up-to-date check-tagversion check-all-packages package-local

check-up-to-date check-cvs-up-to-date check-svn-up-to-date:
if [ -d $(srcdir)/CVS ]; then \
@@ -903,9 +903,6 @@
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.42/VERSION new/yast2-bootloader-2.13.43/VERSION
--- old/yast2-bootloader-2.13.42/VERSION 2006-04-11 01:11:38.000000000 +0200
+++ new/yast2-bootloader-2.13.43/VERSION 2006-04-11 17:20:43.000000000 +0200
@@ -1 +1 @@
-2.13.42
+2.13.43
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-bootloader-2.13.42/configure new/yast2-bootloader-2.13.43/configure
--- old/yast2-bootloader-2.13.42/configure 2006-04-03 21:42:03.000000000 +0200
+++ new/yast2-bootloader-2.13.43/configure 2006-02-01 16:06:53.000000000 +0100
@@ -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.36.
+# Generated by GNU Autoconf 2.59 for yast2-bootloader 2.13.12.
#
# 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.36'
-PACKAGE_STRING='yast2-bootloader 2.13.36'
+PACKAGE_VERSION='2.13.12'
+PACKAGE_STRING='yast2-bootloader 2.13.12'
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.36 to adapt to many kinds of systems.
+\`configure' configures yast2-bootloader 2.13.12 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.36:";;
+ short | recursive ) echo "Configuration of yast2-bootloader 2.13.12:";;
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.36
+yast2-bootloader configure 2.13.12
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.36, which was
+It was created by yast2-bootloader $as_me 2.13.12, 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.36'
+ VERSION='2.13.12'


cat >>confdefs.h <<_ACEOF
@@ -2124,7 +2124,7 @@



-VERSION="2.13.36"
+VERSION="2.13.12"
RPMNAME="yast2-bootloader"
MAINTAINER="Olaf Dabrunz <od@xxxxxxx>"

@@ -20163,7 +20163,7 @@
} >&5
cat >&5 <<_CSEOF

-This file was extended by yast2-bootloader $as_me 2.13.36, which was
+This file was extended by yast2-bootloader $as_me 2.13.12, 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.36
+yast2-bootloader config.status 2.13.12
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.42/configure.in new/yast2-bootloader-2.13.43/configure.in
--- old/yast2-bootloader-2.13.42/configure.in 2006-04-03 21:41:46.000000000 +0200
+++ new/yast2-bootloader-2.13.43/configure.in 2006-02-01 16:06:39.000000000 +0100
@@ -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.36, http://www.suse.de/feedback, yast2-bootloader)
+AC_INIT(yast2-bootloader, 2.13.12, 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.36"
+VERSION="2.13.12"
RPMNAME="yast2-bootloader"
MAINTAINER="Olaf Dabrunz <od@xxxxxxx>"

diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-bootloader-2.13.42/src/routines/lilolike.ycp new/yast2-bootloader-2.13.43/src/routines/lilolike.ycp
--- old/yast2-bootloader-2.13.42/src/routines/lilolike.ycp 2006-04-10 20:35:33.000000000 +0200
+++ new/yast2-bootloader-2.13.43/src/routines/lilolike.ycp 2006-04-11 16:36:15.000000000 +0200
@@ -11,7 +11,7 @@
* Authors:
* Jiri Srain <jsrain@xxxxxxx>
*
- * $Id: lilolike.ycp 29954 2006-04-10 18:00:31Z odabrunz $
+ * $Id: lilolike.ycp 29991 2006-04-11 14:36:14Z odabrunz $
*
*/
{
@@ -231,8 +231,15 @@
}
});*/

- if (Mode::config ())
- return;
+ // #151501: AutoYaST needs to know the activate flag and the
+ // loader_device; jsrain also said this code is probably a bug:
+ // commenting out, but this may need to be changed and made dependend
+ // on a "clone" flag (i.e. make the choice to provide minimal (i.e. let
+ // YaST do partial proposals on the target system) or maximal (i.e.
+ // stay as closely as possible to this system) info in the AutoYaST XML
+ // file)
+ // if (Mode::config ())
+ // return;
map mp = Storage::GetMountPoints();

list mountdata_boot = mp["/boot"]:(mp["/"]:[]);


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



Remember to have fun...


< Previous Next >