commit yast2-bootloader

1 Dec 2006

Hello community,

here is the log from the commit of package yast2-bootloader
checked in at Fri Dec 1 12:25:43 CET 2006.

--------

--- yast2-bootloader/yast2-bootloader.changes	2006-11-24 19:39:44.000000000 +0100
+++ /mounts/work_src_done/STABLE/STABLE/yast2-bootloader/yast2-bootloader.changes	2006-12-01 11:34:51.000000000 +0100
@@ -1,0 +2,7 @@
+Fri Dec  1 11:32:49 CET 2006 - jplack@suse.de
+
+- signal change of boot loader location so that the boot loader can
+  be rewritten if needed (#225023)
+- 2.14.14
+
+-------------------------------------------------------------------

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

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

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

Other differences:
------------------
++++++ yast2-bootloader.spec ++++++
--- /var/tmp/diff_new_pack.cR9sCm/_old	2006-12-01 12:24:38.000000000 +0100
+++ /var/tmp/diff_new_pack.cR9sCm/_new	2006-12-01 12:24:38.000000000 +0100
@@ -1,5 +1,5 @@
 #
-# spec file for package yast2-bootloader (Version 2.14.13)
+# spec file for package yast2-bootloader (Version 2.14.14)
 #
 # 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.14.13
+Version:        2.14.14
 Release:        1
 License:        GNU General Public License (GPL)
 Group:          System/YaST
 BuildRoot:      %{_tmppath}/%{name}-%{version}-build
-Source0:        yast2-bootloader-2.14.13.tar.bz2
+Source0:        yast2-bootloader-2.14.14.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.14.13
+%setup -n yast2-bootloader-2.14.14
 
 %build
 %{prefix}/bin/y2tool y2autoconf
@@ -112,6 +112,10 @@
 /usr/share/YaST2/clients/bootfloppy.ycp
 
 %changelog -n yast2-bootloader
+* Fri Dec 01 2006 - jplack@suse.de
+- signal change of boot loader location so that the boot loader can
+  be rewritten if needed (#225023)
+- 2.14.14
 * Fri Nov 24 2006 - aosthof@suse.de
 - fixed usage of function remove()
 - added FIXME

++++++ yast2-bootloader-2.14.13.tar.bz2 -> yast2-bootloader-2.14.14.tar.bz2 ++++++
++++   12766 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.14.13/Makefile.am new/yast2-bootloader-2.14.14/Makefile.am
--- old/yast2-bootloader-2.14.13/Makefile.am	2006-11-21 20:07:47.000000000 +0100
+++ new/yast2-bootloader-2.14.14/Makefile.am	2006-04-03 21:41:46.000000000 +0200
@@ -7,7 +7,7 @@
 #
 
 #where devtools are
-Y2TOOL = $(Y2DEVTOOLS_PREFIX)/bin/y2tool
+PREFIX := $(shell pkg-config --print-errors --variable=prefix yast2-devtools)
 
 VERSION			= $(shell cat $(srcdir)/VERSION)
 RPMNAME 		= $(shell cat $(srcdir)/RPMNAME)
@@ -19,7 +19,7 @@
 # do we do Makefile.am for devtools? It is a little special...
 IS_DEVTOOLS		= $(findstring yast2-devtools,$(RPMNAME))
 
-DEVTOOLS_DIR 		= $(if $(IS_DEVTOOLS),$(srcdir)/devtools,$(Y2DEVTOOLS_PREFIX)/share/YaST2/data/devtools)
+DEVTOOLS_DIR 		= $(if $(IS_DEVTOOLS),$(srcdir)/devtools,$(PREFIX)/share/YaST2/data/devtools)
 ALL_PACKAGES		= $(DEVTOOLS_DIR)/admin/all-packages
 LEGALESE_DIR		= $(if $(HAS_YAST_LICENSE),$(DEVTOOLS_DIR)/admin/copyright/yast,$(DEVTOOLS_DIR)/admin/copyright/gpl)
 
@@ -33,7 +33,7 @@
 AUTOMAKE_OPTIONS = foreign dist-bzip2
 # where devtools instal m4 snippets
 # argh, executed literally
-#ACLOCAL_AMFLAGS = -I $(Y2DEVTOOLS_PREFIX)/share/aclocal
+#ACLOCAL_AMFLAGS = -I $(PREFIX)/share/aclocal
 ACLOCAL_AMFLAGS = -I `if test -d ./devtools/admin; then echo ./devtools/admin; else pkg-config --print-errors --variable=datadir yast2-devtools; fi`/aclocal
 
 Makefile.am.common: $(DEVTOOLS_DIR)/admin/Makefile.am.common
@@ -66,7 +66,7 @@
 # because the prerequisite is made here (not anymore!)
 # and we don't want any paths in y2autoconf
 # info '(autoconf)config.status Invocation'
-$(RPMNAME).pc: $(RPMNAME).pc.in config.status
+$(RPMNAME).pc: $(RPMNAME).pc.in
 	./config.status --file=$@:$<
 
 if CREATE_PKGCONFIG_NOARCH
@@ -95,7 +95,7 @@
 	done
 
 pot:
-	$(Y2TOOL) y2makepot -s $(srcdir)
+	y2tool y2makepot -s $(srcdir)
 
 install-pot: pot
 	@POT_DST=`find -type d -name testsuite -prune , \
@@ -116,7 +116,7 @@
 	fi
 
 spellcheck: pot
-	$(Y2TOOL) pot-spellcheck
+	y2tool pot-spellcheck
 
 # all-local: $(if $(IS_DEVTOOLS),,$(POT_DST))
 
@@ -143,20 +143,20 @@
 	rm -f package/*.bak
 	rm -f package/*.auto
 	mv $(RPMNAME)-$(VERSION).tar.bz2 package/
-	if ! test -x $(Y2TOOL); then \
-	    echo "$(Y2TOOL): not found."; \
+	if ! test -x $(PREFIX)/bin/y2tool; then \
+	    echo "$(PREFIX)/bin/y2tool: not found."; \
 	    echo "You have to install yast2-devtools to making a package"; \
 	    false; \
 	fi
 	here=`pwd`; \
 	cd $(srcdir) && for i in $(RPMNAME)*.spec.in; do \
 	    newname="`echo "$$i" | sed "s/\.in$$//g"`"; \
-	    $(Y2TOOL) create-spec < $$i > $$here/package/$${newname} ; \
+	    $(PREFIX)/bin/y2tool create-spec < $$i > $$here/package/$${newname} ; \
 	done
 
 package: check-up-to-date check-tagversion check-all-packages check-textdomain package-local
 
-TAGVERSION	 = $(Y2TOOL) tagversion
+TAGVERSION	 = $(PREFIX)/bin/y2tool tagversion
 
 check-up-to-date check-cvs-up-to-date check-svn-up-to-date:
 	if [ -d $(srcdir)/CVS ]; then \
@@ -200,12 +200,12 @@
 	fi
 
 check-textdomain:
-	$(Y2TOOL) check-textdomain $(srcdir)
+	$(PREFIX)/bin/y2tool check-textdomain $(srcdir)
 
 stable: checkin-stable
 
 checkin-stable: package
-	$(Y2TOOL) checkin-stable
+	$(PREFIX)/bin/y2tool checkin-stable
 
 
 # For po/ modules
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.14.13/Makefile.am.common new/yast2-bootloader-2.14.14/Makefile.am.common
--- old/yast2-bootloader-2.14.13/Makefile.am.common	2006-11-21 20:07:47.000000000 +0100
+++ new/yast2-bootloader-2.14.14/Makefile.am.common	2006-04-03 21:41:46.000000000 +0200
@@ -29,19 +29,7 @@
 
 dist-hook: check-syntax
 
-CHECK_SYNTAX = true
 check-syntax: $(client_DATA) $(ycpchook)
-	@if test "$(client_DATA)"; then \
-	  if $(CHECK_SYNTAX); then \
-	    TO_CHECK="$(filter %.ycp,$^)"; \
-	    echo "Checking syntax of $${TO_CHECK}"; \
-	    if ! $(YCPC) -qE -M. -I. $(YCPCFLAGS) $${TO_CHECK}; then \
-	      echo "Failed. Disable by 'make ... CHECK_SYNTAX=false' at your own risk"; \
-	      exit 1; \
-	    fi; \
-	  else \
-	    echo "Syntax check disabled"; \
-	  fi; \
-	fi
+	if test "$(client_DATA)"; then $(bindir)/ycpc -qE -M. -I. $(YCPCFLAGS) $(filter %.ycp,$^) || exit 1; fi
 
 -include .dep
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.14.13/VERSION new/yast2-bootloader-2.14.14/VERSION
--- old/yast2-bootloader-2.14.13/VERSION	2006-11-24 19:35:17.000000000 +0100
+++ new/yast2-bootloader-2.14.14/VERSION	2006-12-01 11:34:58.000000000 +0100
@@ -1 +1 @@
-2.14.13
+2.14.14
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.14.13/autodocs-ycp.ami new/yast2-bootloader-2.14.14/autodocs-ycp.ami
--- old/yast2-bootloader-2.14.13/autodocs-ycp.ami	2006-11-21 20:07:47.000000000 +0100
+++ new/yast2-bootloader-2.14.14/autodocs-ycp.ami	2006-04-03 21:41:46.000000000 +0200
@@ -1,27 +1,18 @@
 # -*- makefile -*- Automake include file
-# $Id: autodocs-ycp.ami 33394 2006-10-13 11:51:40Z mvidner $
+# $Id: autodocs-ycp.ami 23438 2005-05-17 16:31:21Z mvidner $
 
 # Builds source documentation for YCP sources
 # Uses ycpdoc
 # PARAMETERS:
 #   AUTODOCS_YCP: Files that the ycp autodocs is built from
 #   		  Optional - the default is $(srcdir)/../../src/*.ycp
-#   AUTODOCS_PM: Files that the perl autodocs is built from
-#   		  Optional - the default is $(srcdir)/../../src/*.pm
 
 htmldir = $(docdir)/autodocs
 
 html_DATA = index.html $(wildcard *.html)
-CLEANFILES = $(html_DATA) pod2htm*.tmp
+CLEANFILES = $(html_DATA)
 
-AUTODOCS_YCP ?= $(wildcard $(srcdir)/../../src/*.ycp)
-AUTODOCS_PM  ?= $(wildcard $(srcdir)/../../src/*.pm)
-
-index.html: $(AUTODOCS_YCP) $(AUTODOCS_PM)
-#including *.pm, for the index
+AUTODOCS_YCP ?= $(srcdir)/../../src/*.ycp
+index.html: $(AUTODOCS_YCP)
 	${YCPDOC} -d. $^
-	for i in $(AUTODOCS_PM); do \
-		b=`basename $$i`; b=$${b%.pm}; \
-		pod2html --title=$$b --infile=$$i --outfile=$$b.html; \
-		echo "<a href='$$b.html'>$$b</a>" > $$b.mod.html; \
-	done
+
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.14.13/config.h.in new/yast2-bootloader-2.14.14/config.h.in
--- old/yast2-bootloader-2.14.13/config.h.in	2006-11-21 20:08:00.000000000 +0100
+++ new/yast2-bootloader-2.14.14/config.h.in	2006-04-03 21:42:06.000000000 +0200
@@ -65,7 +65,7 @@
 
 /* If using the C implementation of alloca, define if you know the
    direction of stack growth for your system; otherwise it will be
-   automatically deduced at runtime.
+   automatically deduced at run-time.
 	STACK_DIRECTION > 0 => grows toward higher addresses
 	STACK_DIRECTION < 0 => grows toward lower addresses
 	STACK_DIRECTION = 0 => direction of growth unknown */
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.14.13/configure.in new/yast2-bootloader-2.14.14/configure.in
--- old/yast2-bootloader-2.14.13/configure.in	2006-11-21 20:07:47.000000000 +0100
+++ new/yast2-bootloader-2.14.14/configure.in	2006-04-03 21:41:46.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 - DO NOT EDIT! --
 dnl    (edit configure.in.in instead)
 
-AC_INIT(yast2-bootloader, 2.14.8, http://bugs.opensuse.org/, 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.14.8"
+VERSION="2.13.36"
 RPMNAME="yast2-bootloader"
 MAINTAINER="Olaf Dabrunz <od@suse.de>"
 
@@ -111,8 +111,6 @@
     AC_MSG_ERROR(xgettext is missing; please install gettext-devel.)
 fi
 
-Y2DEVTOOLS_PREFIX=`pkg-config --print-errors --variable=prefix yast2-devtools`
-AC_SUBST(Y2DEVTOOLS_PREFIX)
 devtools_ybindir=`pkg-config --print-errors --variable=ybindir yast2-devtools`
 devtools_yast2dir=`pkg-config --print-errors --variable=yast2dir yast2-devtools`
 
@@ -145,9 +143,6 @@
 if test "$YCPC" = "false"; then
     AC_MSG_ERROR([ycpc is not installed])
 fi
-AC_CHECK_FILE($devtools_yast2dir/data/testsuite/Makefile.testsuite, [], [
-    AC_MSG_WARN([yast2-testsuite.rpm is not installed])
-])
 
 
 AC_PATH_PROG(YDOXYGEN, ydoxygen, false, $PATH:$devtools_ybindir)
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.14.13/src/generic/boot_loader_locations_widget.ycp new/yast2-bootloader-2.14.14/src/generic/boot_loader_locations_widget.ycp
--- old/yast2-bootloader-2.14.13/src/generic/boot_loader_locations_widget.ycp	2006-11-21 19:34:20.000000000 +0100
+++ new/yast2-bootloader-2.14.14/src/generic/boot_loader_locations_widget.ycp	2006-12-01 12:02:55.000000000 +0100
@@ -11,7 +11,7 @@
  * Authors:
  *      Joachim Plack <jplack@suse.de>
  *
- * $Id: boot_loader_locations_widget.ycp 34177 2006-11-08 17:16:21Z odabrunz $
+ * $Id: boot_loader_locations_widget.ycp 34692 2006-12-01 11:02:52Z jplack $
  *
  */
 
@@ -74,6 +74,9 @@
  * @return symbol always nil
  */
 symbol BLL_Handle (string key, map event) {
+    if (event["EventReason"]:"" == "ValueChanged") {
+        BootCommon::location_changed = true;
+    }
     return generic_Handle (key, event);
 }
 
@@ -125,6 +128,14 @@
     ];
 }
 
-
-
 } // include end
+
+/*
+ * Local variables:
+ *     mode: ycp
+ *     mode: font-lock
+ *     mode: auto-fill
+ *     indent-level: 4
+ *     fill-column: 78
+ * End:
+ */
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.14.13/src/modules/BootGRUB.ycp new/yast2-bootloader-2.14.14/src/modules/BootGRUB.ycp
--- old/yast2-bootloader-2.14.13/src/modules/BootGRUB.ycp	2006-11-21 19:34:18.000000000 +0100
+++ new/yast2-bootloader-2.14.14/src/modules/BootGRUB.ycp	2006-12-01 12:02:55.000000000 +0100
@@ -13,7 +13,7 @@
  *      Jiri Srain <jsrain@suse.cz>
  *      Joachim Plack <jplack@suse.de>
  *
- * $Id: BootGRUB.ycp 34514 2006-11-21 09:17:32Z jplack $
+ * $Id: BootGRUB.ycp 34692 2006-12-01 11:02:52Z jplack $
  *
  */
 
@@ -217,6 +217,10 @@
 			});
 			if (_add)
 			{
+			  // FIXME: fallback to vmlinux and initrd symlink if
+			  // present in the chroot environment of the other
+			  // Linux System ... #224481
+
 			    s["__devs"] = devs;
 			    out = add (out, s);
 			}


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



Remember to have fun...

---------------------------------------------------------------------
To unsubscribe, e-mail: opensuse-commit+unsubscribe@opensuse.org
For additional commands, e-mail: opensuse-commit+help@opensuse.org

    

root＠suse.de

tags

participants (1)