Hello community,
here is the log from the commit of package yast2-bootloader
checked in at Tue Jul 3 16:37:18 CEST 2007.
--------
--- yast2-bootloader/yast2-bootloader.changes 2007-06-21 17:37:01.000000000 +0200
+++ /mounts/work_src_done/STABLE/yast2-bootloader/yast2-bootloader.changes 2007-07-03 16:34:35.000000000 +0200
@@ -1,0 +2,5 @@
+Tue Jul 3 16:34:02 CEST 2007 - od@suse.de
+
+- moved Bootloader_API.pm from limal-bootloader to yast2-bootloader
+
+-------------------------------------------------------------------
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ yast2-bootloader.spec ++++++
--- /var/tmp/diff_new_pack.nZ9432/_old 2007-07-03 16:36:58.000000000 +0200
+++ /var/tmp/diff_new_pack.nZ9432/_new 2007-07-03 16:36:58.000000000 +0200
@@ -12,15 +12,15 @@
Name: yast2-bootloader
Version: 2.15.8
-Release: 44
-License: GNU General Public License (GPL)
+Release: 46
+License: GPL v2 or later
Group: System/YaST
BuildRoot: %{_tmppath}/%{name}-%{version}-build
Source0: yast2-bootloader-2.15.8.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-storage yast2-testsuite
+BuildRequires: docbook-xsl-stylesheets doxygen gcc-c++ libxslt perl-Bootloader perl-XML-Writer perl-gettext sgml-skel swig update-alternatives update-desktop-files yast2-devel yast2-devtools yast2-installation yast2-perl-bindings yast2-storage yast2-testsuite
PreReq: /bin/sed %fillup_prereq
-Requires: yast2 yast2-core yast2-storage perl-Bootloader limal-bootloader parted perl-Compress-Zlib
+Requires: yast2 yast2-core yast2-storage perl-Bootloader parted perl-Compress-Zlib
%ifarch %ix86 x86_64
Requires: master-boot-code
%endif
@@ -91,6 +91,8 @@
/usr/share/YaST2/schema/autoyast/rnc/bootloader.rnc
%changelog
+* Tue Jul 03 2007 - od@suse.de
+- moved Bootloader_API.pm from limal-bootloader to yast2-bootloader
* Thu Jun 21 2007 - adrian@suse.de
- fix changelog entry order
* Wed Apr 11 2007 - aosthof@suse.de
++++++ yast2-bootloader-2.15.8.tar.bz2 ++++++
++++ 10730 lines of diff (skipped)
++++ retrying with extended exclude list
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/yast2-bootloader-2.15.8/configure.in new/yast2-bootloader-2.15.8/configure.in
--- old/yast2-bootloader-2.15.8/configure.in 2007-01-23 10:29:08.000000000 +0100
+++ new/yast2-bootloader-2.15.8/configure.in 2007-07-03 14:50:07.000000000 +0200
@@ -1,9 +1,9 @@
dnl configure.in for yast2-bootloader
dnl
-dnl -- This file is generated by y2autoconf 2.14.0 - DO NOT EDIT! --
+dnl -- This file is generated by y2autoconf 2.15.0 - DO NOT EDIT! --
dnl (edit configure.in.in instead)
-AC_INIT(yast2-bootloader, 2.15.3, http://bugs.opensuse.org/, yast2-bootloader)
+AC_INIT(yast2-bootloader, 2.15.8, http://bugs.opensuse.org/, 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.15.3"
+VERSION="2.15.8"
RPMNAME="yast2-bootloader"
MAINTAINER="Olaf Dabrunz "
@@ -160,8 +160,8 @@
AC_PROG_CC
AC_PROG_CPP
-CFLAGS="${CFLAGS} -Wall -Wformat -Wmissing-prototypes"
-CXXFLAGS="${CXXFLAGS} -Wall -Wformat"
+CFLAGS="${CFLAGS} -Wall -Wformat=2 -Wmissing-prototypes"
+CXXFLAGS="${CXXFLAGS} -Wall -Wformat=2"
: ${AGENT_LIBADD:='-L$(libdir) -lscr'}
AC_SUBST(AGENT_LIBADD)
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/yast2-bootloader-2.15.8/missing new/yast2-bootloader-2.15.8/missing
--- old/yast2-bootloader-2.15.8/missing 2007-01-23 10:29:19.000000000 +0100
+++ new/yast2-bootloader-2.15.8/missing 2007-07-03 14:50:22.000000000 +0200
@@ -1,9 +1,9 @@
#! /bin/sh
# Common stub for a few missing GNU programs while installing.
-scriptversion=2005-06-08.21
+scriptversion=2006-05-10.23
-# Copyright (C) 1996, 1997, 1999, 2000, 2002, 2003, 2004, 2005
+# Copyright (C) 1996, 1997, 1999, 2000, 2002, 2003, 2004, 2005, 2006
# Free Software Foundation, Inc.
# Originally by Fran,cois Pinard , 1996.
@@ -33,6 +33,8 @@
fi
run=:
+sed_output='s/.* --output[ =]\([^ ]*\).*/\1/p'
+sed_minuso='s/.* -o \([^ ]*\).*/\1/p'
# In the cases where this matters, `missing' is being run in the
# srcdir already.
@@ -44,7 +46,7 @@
msg="missing on your system"
-case "$1" in
+case $1 in
--run)
# Try to run requested program, and just exit if it succeeds.
run=
@@ -77,6 +79,7 @@
aclocal touch file \`aclocal.m4'
autoconf touch file \`configure'
autoheader touch file \`config.h.in'
+ autom4te touch the output file, or create a stub one
automake touch all \`Makefile.in' files
bison create \`y.tab.[ch]', if possible, from existing .[ch]
flex create \`lex.yy.c', if possible, from existing .c
@@ -106,7 +109,7 @@
# Now exit if we have it, but it failed. Also exit now if we
# don't have it and --version was passed (most likely to detect
# the program).
-case "$1" in
+case $1 in
lex|yacc)
# Not GNU programs, they don't have --version.
;;
@@ -135,7 +138,7 @@
# If it does not exist, or fails to run (possibly an outdated version),
# try to emulate it.
-case "$1" in
+case $1 in
aclocal*)
echo 1>&2 "\
WARNING: \`$1' is $msg. You should only need it if
@@ -164,7 +167,7 @@
test -z "$files" && files="config.h"
touch_files=
for f in $files; do
- case "$f" in
+ case $f in
*:*) touch_files="$touch_files "`echo "$f" |
sed -e 's/^[^:]*://' -e 's/:.*//'`;;
*) touch_files="$touch_files $f.in";;
@@ -192,8 +195,8 @@
You can get \`$1' as part of \`Autoconf' from any GNU
archive site."
- file=`echo "$*" | sed -n 's/.*--output[ =]*\([^ ]*\).*/\1/p'`
- test -z "$file" && file=`echo "$*" | sed -n 's/.*-o[ ]*\([^ ]*\).*/\1/p'`
+ file=`echo "$*" | sed -n "$sed_output"`
+ test -z "$file" && file=`echo "$*" | sed -n "$sed_minuso"`
if test -f "$file"; then
touch $file
else
@@ -214,25 +217,25 @@
in order for those modifications to take effect. You can get
\`Bison' from any GNU archive site."
rm -f y.tab.c y.tab.h
- if [ $# -ne 1 ]; then
+ if test $# -ne 1; then
eval LASTARG="\${$#}"
- case "$LASTARG" in
+ case $LASTARG in
*.y)
SRCFILE=`echo "$LASTARG" | sed 's/y$/c/'`
- if [ -f "$SRCFILE" ]; then
+ if test -f "$SRCFILE"; then
cp "$SRCFILE" y.tab.c
fi
SRCFILE=`echo "$LASTARG" | sed 's/y$/h/'`
- if [ -f "$SRCFILE" ]; then
+ if test -f "$SRCFILE"; then
cp "$SRCFILE" y.tab.h
fi
;;
esac
fi
- if [ ! -f y.tab.h ]; then
+ if test ! -f y.tab.h; then
echo >y.tab.h
fi
- if [ ! -f y.tab.c ]; then
+ if test ! -f y.tab.c; then
echo 'main() { return 0; }' >y.tab.c
fi
;;
@@ -244,18 +247,18 @@
in order for those modifications to take effect. You can get
\`Flex' from any GNU archive site."
rm -f lex.yy.c
- if [ $# -ne 1 ]; then
+ if test $# -ne 1; then
eval LASTARG="\${$#}"
- case "$LASTARG" in
+ case $LASTARG in
*.l)
SRCFILE=`echo "$LASTARG" | sed 's/l$/c/'`
- if [ -f "$SRCFILE" ]; then
+ if test -f "$SRCFILE"; then
cp "$SRCFILE" lex.yy.c
fi
;;
esac
fi
- if [ ! -f lex.yy.c ]; then
+ if test ! -f lex.yy.c; then
echo 'main() { return 0; }' >lex.yy.c
fi
;;
@@ -267,11 +270,9 @@
\`Help2man' package in order for those modifications to take
effect. You can get \`Help2man' from any GNU archive site."
- file=`echo "$*" | sed -n 's/.*-o \([^ ]*\).*/\1/p'`
- if test -z "$file"; then
- file=`echo "$*" | sed -n 's/.*--output=\([^ ]*\).*/\1/p'`
- fi
- if [ -f "$file" ]; then
+ file=`echo "$*" | sed -n "$sed_output"`
+ test -z "$file" && file=`echo "$*" | sed -n "$sed_minuso"`
+ if test -f "$file"; then
touch $file
else
test -z "$file" || exec >$file
@@ -289,11 +290,17 @@
DU, IRIX). You might want to install the \`Texinfo' package or
the \`GNU make' package. Grab either from any GNU archive site."
# The file to touch is that specified with -o ...
- file=`echo "$*" | sed -n 's/.*-o \([^ ]*\).*/\1/p'`
+ file=`echo "$*" | sed -n "$sed_output"`
+ test -z "$file" && file=`echo "$*" | sed -n "$sed_minuso"`
if test -z "$file"; then
# ... or it is the one specified with @setfilename ...
infile=`echo "$*" | sed 's/.* \([^ ]*\) *$/\1/'`
- file=`sed -n '/^@setfilename/ { s/.* \([^ ]*\) *$/\1/; p; q; }' $infile`
+ file=`sed -n '
+ /^@setfilename/{
+ s/.* \([^ ]*\) *$/\1/
+ p
+ q
+ }' $infile`
# ... or it is derived from the source name (dir/f.texi becomes f.info)
test -z "$file" && file=`echo "$infile" | sed 's,.*/,,;s,.[^.]*$,,'`.info
fi
@@ -317,13 +324,13 @@
fi
firstarg="$1"
if shift; then
- case "$firstarg" in
+ case $firstarg in
*o*)
firstarg=`echo "$firstarg" | sed s/o//`
tar "$firstarg" "$@" && exit 0
;;
esac
- case "$firstarg" in
+ case $firstarg in
*h*)
firstarg=`echo "$firstarg" | sed s/h//`
tar "$firstarg" "$@" && exit 0
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/yast2-bootloader-2.15.8/src/modules/Bootloader_API.pm new/yast2-bootloader-2.15.8/src/modules/Bootloader_API.pm
--- old/yast2-bootloader-2.15.8/src/modules/Bootloader_API.pm 1970-01-01 01:00:00.000000000 +0100
+++ new/yast2-bootloader-2.15.8/src/modules/Bootloader_API.pm 2007-07-03 14:23:08.000000000 +0200
@@ -0,0 +1,284 @@
+#!/usr/bin/perl -w
+
+#
+# Interface to perl-Bootloader library
+#
+
+package Bootloader_API;
+
+use strict;
+
+use Bootloader::Library;
+use LIMAL::LogHelper;
+
+our %TYPEINFO;
+
+BEGIN { $TYPEINFO{ALL_METHODS} = 0; }
+
+# create a new bootloader object
+my $lib_ref = Bootloader::Library->new();
+
+my @lines_cache = ();
+my $lines_cache_index = 0;
+
+# Log collected log messages
+sub DumpLog {
+ foreach my $rec (@{$lib_ref->GetLogRecords() || []})
+ {
+ if ($rec->{"level"} eq "debug")
+ {
+ LIMAL::LogHelper::logDebug ($rec->{"message"});
+ }
+ elsif ($rec->{"level"} eq "milestone")
+ {
+ LIMAL::LogHelper::logInfo ($rec->{"message"});
+ }
+ elsif ($rec->{"level"} eq "warning")
+ {
+ LIMAL::LogHelper::logError ("WARNING: " . $rec->{"message"});
+ }
+ elsif ($rec->{"level"} eq "error")
+ {
+ LIMAL::LogHelper::logError ($rec->{"message"});
+ }
+ else
+ {
+ LIMAL::LogHelper::logError ("Incomplete log record");
+ LIMAL::LogHelper::logError ($rec->{"message"});
+ }
+ }
+}
+
+
+BEGIN { $TYPEINFO{setLoaderType} = ["function", "void", "string"]; }
+# do library initialization for a specific bootloader type
+sub setLoaderType($) {
+ my ($lt) = @_;
+ my $ret = $lib_ref->SetLoaderType($lt);
+
+ @lines_cache = ();
+ $lines_cache_index = 0;
+ DumpLog();
+ return $ret;
+}
+
+BEGIN { $TYPEINFO{updateBootloader} = ["function", "boolean", "boolean"]; }
+sub updateBootloader() {
+ my ($avoid_init) = @_;
+ my $ret = $lib_ref->UpdateBootloader($avoid_init);
+
+ DumpLog();
+ return $ret;
+}
+
+BEGIN { $TYPEINFO{initializeBootloader} = ["function", "boolean"]; }
+# first time initialization of firmware/bios specific code
+sub initializeBootloader() {
+ my $ret = $lib_ref->InitializeBootloader();
+
+ DumpLog();
+ return $ret;
+}
+
+BEGIN { $TYPEINFO{readSettings} = ["function", "boolean"]; }
+# read configuration
+sub readSettings() {
+ my $ret = $lib_ref->ReadSettings();
+
+ DumpLog();
+ return $ret ? "true" : "false";
+}
+
+BEGIN { $TYPEINFO{writeSettings} = ["function", "boolean"]; }
+# write settings to the files
+sub writeSettings() {
+ my $ret = $lib_ref->WriteSettings();
+ DumpLog();
+
+ return $ret;
+}
+
+
+BEGIN { $TYPEINFO{getMetaData} = ["function", ["map", "string", "string"]]; }
+# get data format and type description as far as available for
+# specific bootloader
+sub getMetaData() {
+ my $mdat_ref = $lib_ref->GetMetaData() || {};
+
+ # copy the hash and encode meta tags
+ my %metadata=();
+ while ((my $key, my $value) = each ( %{$mdat_ref} )) {
+ if (ref($value)) {
+ if (ref($value) eq "HASH") {
+ foreach my $k (keys %$value) {
+ $metadata{"%" . $key . "%" . $k} = $value->{$k};
+ }
+ }
+ elsif (ref($value) eq "ARRAY") {
+ foreach my $i (0 .. $#$value) {
+ $metadata{"#" . $key . "#" . $i} = $value->[$i];
+ }
+ }
+ }
+ else {
+ $metadata{$key} = $value;
+ }
+ }
+
+ DumpLog();
+ return \%metadata;
+}
+
+
+BEGIN { $TYPEINFO{getDeviceMapping} = ["function", ["map", "string", "string"]]; }
+sub getDeviceMapping() {
+ my $devmap = $lib_ref->GetDeviceMapping () || {};
+ DumpLog();
+ return $devmap;
+}
+
+BEGIN { $TYPEINFO{setDeviceMapping} = ["function", "boolean", ["map", "string", "string"]]; }
+sub setDeviceMapping($) {
+ my ($dm) = @_;
+
+ my $ret = $lib_ref->SetDeviceMapping ($dm);
+ DumpLog();
+ return $ret;
+}
+
+BEGIN { $TYPEINFO{getGlobalSettings} = ["function", ["map", "string", "string"]]; }
+sub getGlobalSettings() {
+ my %globalsettings = %{$lib_ref->GetGlobalSettings () || {}};
+
+ # remove "__lines" key - it's internal
+ my $idx = $lines_cache_index++;
+ $globalsettings{"lines_cache_id"} = $idx;
+ $lines_cache[$idx] = delete( $globalsettings{'__lines'} );
+
+ # if there is "stage1_dev" key then convert the values to single string
+ if (defined $globalsettings{'stage1_dev'})
+ {
+ my $string = join(",",@{$globalsettings{'stage1_dev'}}) ;
+ $globalsettings{'stage1_dev'} = $string;
+ }
+
+ my %ret;
+ # convert data to string type
+ while ((my $key, my $value) = each %globalsettings) {
+ $ret{"$key"} = "$value";
+ }
+
+ return \%ret;
+}
+
+BEGIN { $TYPEINFO{setGlobalSettings} = ["function", "boolean", ["map", "string", "string"]]; }
+sub setGlobalSettings($) {
+ my ($globals) = @_;
+ my %globalsettings = %{$globals};
+
+ # if there is "stage1_dev" key then convert the value from single
+ # string back to an array
+ if (defined $globalsettings{'stage1_dev'}) {
+ # split device string into a list
+ my @devices = split(',', $globalsettings{'stage1_dev'});
+ $globalsettings{'stage1_dev'} = \@devices;
+ }
+
+
+ my $index = exists($globalsettings{"lines_cache_id"}) ?
+ $globalsettings{"lines_cache_id"} : undef;
+ if (defined($index)) {
+ $globalsettings{"__lines"} = $lines_cache[$index];
+ }
+
+ my $ret = $lib_ref->SetGlobalSettings (\%globalsettings);
+ DumpLog();
+ return $ret;
+}
+
+BEGIN { $TYPEINFO{getSections} = ["function", ["list", ["map", "string", "string"]]]; }
+sub getSections() {
+ my @sections = @{$lib_ref->GetSections () || []};
+
+ # remove "__lines" key - it's internal
+ # FIXME: this should be done in Bootloader::Core which can do
+ # house holding of its internals by itself!!
+ foreach my $section (@sections) {
+ my $index = $lines_cache_index++;
+ $lines_cache[$index] = $section->{'__lines'};
+ delete $section->{'__lines'};
+ $section->{"lines_cache_id"} = $index;
+ }
+ DumpLog();
+ return \@sections;
+}
+
+BEGIN { $TYPEINFO{setSections} = ["function", "boolean", ["list", ["map", "string", "string"]]]; }
+sub setSections($) {
+ my ($sections) = @_;
+
+ my @sections = @{$sections || []};
+ foreach my $section (@sections) {
+ my $index = exists($section->{"lines_cache_id"}) ?
+ $section->{"lines_cache_id"} : undef;
+ if (defined($index))
+ {
+ $section->{"__lines"} = $lines_cache[$index];
+ }
+ }
+ my $ret = $lib_ref->SetSections($sections);
+ DumpLog();
+ return $ret;
+}
+
+# handle native config file text
+#
+BEGIN { $TYPEINFO{setFilesContents} = ["function", "boolean", ["map", "string", "string"]]; }
+sub setFilesContents($) {
+ my ($contents) = @_;
+
+ my $ret = $lib_ref->SetFilesContents($contents);
+
+ DumpLog();
+ return $ret;
+}
+
+BEGIN { $TYPEINFO{getFilesContents} = ["function", ["map", "string", "string"]]; }
+sub getFilesContents() {
+ my $ret = $lib_ref->GetFilesContents();
+
+ DumpLog();
+ return $ret;
+}
+
+
+BEGIN { $TYPEINFO{setMountPoints} = ["function", "boolean", ["map", "string", "string"]]; }
+sub setMountPoints($) {
+ my ($dm) = @_;
+ my $ret = $lib_ref->DefineMountPoints ($dm);
+
+ DumpLog();
+ return $ret;
+}
+
+BEGIN { $TYPEINFO{setPartitions} = ["function", "boolean", ["list", ["list", "string"]]]; }
+sub setPartitions($) {
+ my ($dm) = @_;
+ my $ret = $lib_ref->DefinePartitions($dm);
+
+ DumpLog();
+ return $ret;
+}
+
+BEGIN { $TYPEINFO{setMDArrays} = ["function", "boolean", ["map", "string", ["list", "string"]]]; }
+sub setMDArrays($) {
+ my ($dm) = @_;
+ my $ret = $lib_ref->DefineMDArrays($dm);
+
+ DumpLog();
+ return $ret;
+}
+
+
+# import fails if we cannot create the object
+$lib_ref;
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/yast2-bootloader-2.15.8/src/modules/Makefile.am new/yast2-bootloader-2.15.8/src/modules/Makefile.am
--- old/yast2-bootloader-2.15.8/src/modules/Makefile.am 2007-01-23 10:23:53.000000000 +0100
+++ new/yast2-bootloader-2.15.8/src/modules/Makefile.am 2007-07-03 14:40:25.000000000 +0200
@@ -13,14 +13,15 @@
BootGRUB.ycp \
BootLILO.ycp \
BootPOWERLILO.ycp \
- BootZIPL.ycp
+ BootZIPL.ycp \
+ Bootloader_API.pm
# BootS390.ycp \
# BootMILO.ycp \
# BootABOOT.ycp
Bootloader_API.pm:
- test -f Bootloader_API.pm || ln -sf `find /usr/lib/perl5 -name Bootloader_API.pm | tail -1`
+ test -f Bootloader_API.pm || exit 1
EXTRA_DIST = \
@@ -35,10 +36,6 @@
BootCommon.ybc: Bootloader_API.pm
-install: install_Bootloader_API install-am
-
-install_Bootloader_API:
- test -d ${RPM_BUILD_ROOT}/@moduledir@ || mkdir -p ${RPM_BUILD_ROOT}/@moduledir@
- /bin/cp -f -d Bootloader_API.pm ${RPM_BUILD_ROOT}/@moduledir@
+install: install-am
include $(top_srcdir)/Makefile.am.common
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Remember to have fun...
---------------------------------------------------------------------
To unsubscribe, e-mail: opensuse-commit+unsubscribe@opensuse.org
For additional commands, e-mail: opensuse-commit+help@opensuse.org