Mailinglist Archive: opensuse-commit (554 mails)
| < Previous | Next > |
commit yast2-bootloader
- From: root@xxxxxxx (h_root)
- Date: Thu, 7 Dec 2006 21:41:01 +0100 (CET)
- Message-id: <20061207204101.C1A5319AB0F@xxxxxxxxxxxxxxx>
Hello community,
here is the log from the commit of package yast2-bootloader
checked in at Thu Dec 7 21:41:01 CET 2006.
--------
--- yast2-bootloader/yast2-bootloader.changes 2006-12-01 11:34:51.000000000 +0100
+++ /mounts/work_src_done/STABLE/yast2-bootloader/yast2-bootloader.changes 2006-12-01 16:59:14.000000000 +0100
@@ -1,0 +2,8 @@
+Fri Dec 1 16:58:24 CET 2006 - od@xxxxxxx
+
+- use kernel and initrd softlinks in Failsafe entry again, thus
+ preventing the removal of the Failsafe entry when the kernel is
+ updated (#224481)
+- 2.14.15
+
+-------------------------------------------------------------------
Old:
----
yast2-bootloader-2.14.14.tar.bz2
New:
----
yast2-bootloader-2.14.15.tar.bz2
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ yast2-bootloader.spec ++++++
--- /var/tmp/diff_new_pack.ngk5Nl/_old 2006-12-07 21:40:06.000000000 +0100
+++ /var/tmp/diff_new_pack.ngk5Nl/_new 2006-12-07 21:40:06.000000000 +0100
@@ -1,5 +1,5 @@
#
-# spec file for package yast2-bootloader (Version 2.14.14)
+# spec file for package yast2-bootloader (Version 2.14.15)
#
# 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.14
+Version: 2.14.15
Release: 1
License: GNU General Public License (GPL)
Group: System/YaST
BuildRoot: %{_tmppath}/%{name}-%{version}-build
-Source0: yast2-bootloader-2.14.14.tar.bz2
+Source0: yast2-bootloader-2.14.15.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.14
+%setup -n yast2-bootloader-2.14.15
%build
%{prefix}/bin/y2tool y2autoconf
@@ -112,6 +112,11 @@
/usr/share/YaST2/clients/bootfloppy.ycp
%changelog -n yast2-bootloader
+* Fri Dec 01 2006 - od@xxxxxxx
+- use kernel and initrd softlinks in Failsafe entry again, thus
+ preventing the removal of the Failsafe entry when the kernel is
+ updated (#224481)
+- 2.14.15
* Fri Dec 01 2006 - jplack@xxxxxxx
- signal change of boot loader location so that the boot loader can
be rewritten if needed (#225023)
++++++ yast2-bootloader-2.14.14.tar.bz2 -> yast2-bootloader-2.14.15.tar.bz2 ++++++
++++ 14801 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.14/Makefile.am new/yast2-bootloader-2.14.15/Makefile.am
--- old/yast2-bootloader-2.14.14/Makefile.am 2006-04-03 21:41:46.000000000 +0200
+++ new/yast2-bootloader-2.14.15/Makefile.am 2006-10-16 20:54:55.000000000 +0200
@@ -8,6 +8,7 @@
#where devtools are
PREFIX := $(shell pkg-config --print-errors --variable=prefix yast2-devtools)
+Y2TOOL = $(PREFIX)/bin/y2tool
VERSION = $(shell cat $(srcdir)/VERSION)
RPMNAME = $(shell cat $(srcdir)/RPMNAME)
@@ -66,7 +67,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
+$(RPMNAME).pc: $(RPMNAME).pc.in config.status
./config.status --file=$@:$<
if CREATE_PKGCONFIG_NOARCH
@@ -95,7 +96,7 @@
done
pot:
- y2tool y2makepot -s $(srcdir)
+ $(Y2TOOL) y2makepot -s $(srcdir)
install-pot: pot
@POT_DST=`find -type d -name testsuite -prune , \
@@ -116,7 +117,7 @@
fi
spellcheck: pot
- y2tool pot-spellcheck
+ $(Y2TOOL) pot-spellcheck
# all-local: $(if $(IS_DEVTOOLS),,$(POT_DST))
@@ -143,20 +144,20 @@
rm -f package/*.bak
rm -f package/*.auto
mv $(RPMNAME)-$(VERSION).tar.bz2 package/
- if ! test -x $(PREFIX)/bin/y2tool; then \
- echo "$(PREFIX)/bin/y2tool: not found."; \
+ if ! test -x $(Y2TOOL); then \
+ echo "$(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"`"; \
- $(PREFIX)/bin/y2tool create-spec < $$i > $$here/package/$${newname} ; \
+ $(Y2TOOL) create-spec < $$i > $$here/package/$${newname} ; \
done
package: check-up-to-date check-tagversion check-all-packages check-textdomain package-local
-TAGVERSION = $(PREFIX)/bin/y2tool tagversion
+TAGVERSION = $(Y2TOOL) tagversion
check-up-to-date check-cvs-up-to-date check-svn-up-to-date:
if [ -d $(srcdir)/CVS ]; then \
@@ -200,12 +201,12 @@
fi
check-textdomain:
- $(PREFIX)/bin/y2tool check-textdomain $(srcdir)
+ $(Y2TOOL) check-textdomain $(srcdir)
stable: checkin-stable
checkin-stable: package
- $(PREFIX)/bin/y2tool checkin-stable
+ $(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.14/Makefile.am.common new/yast2-bootloader-2.14.15/Makefile.am.common
--- old/yast2-bootloader-2.14.14/Makefile.am.common 2006-04-03 21:41:46.000000000 +0200
+++ new/yast2-bootloader-2.14.15/Makefile.am.common 2006-10-16 20:54:54.000000000 +0200
@@ -29,7 +29,19 @@
dist-hook: check-syntax
+CHECK_SYNTAX = true
check-syntax: $(client_DATA) $(ycpchook)
- if test "$(client_DATA)"; then $(bindir)/ycpc -qE -M. -I. $(YCPCFLAGS) $(filter %.ycp,$^) || exit 1; fi
+ @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
-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.14/VERSION new/yast2-bootloader-2.14.15/VERSION
--- old/yast2-bootloader-2.14.14/VERSION 2006-12-01 11:34:58.000000000 +0100
+++ new/yast2-bootloader-2.14.15/VERSION 2006-12-01 16:58:15.000000000 +0100
@@ -1 +1 @@
-2.14.14
+2.14.15
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.14/autodocs-ycp.ami new/yast2-bootloader-2.14.15/autodocs-ycp.ami
--- old/yast2-bootloader-2.14.14/autodocs-ycp.ami 2006-04-03 21:41:46.000000000 +0200
+++ new/yast2-bootloader-2.14.15/autodocs-ycp.ami 2006-10-16 20:54:55.000000000 +0200
@@ -1,18 +1,27 @@
# -*- makefile -*- Automake include file
-# $Id: autodocs-ycp.ami 23438 2005-05-17 16:31:21Z mvidner $
+# $Id: autodocs-ycp.ami 32798 2006-09-11 11:25:01Z 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)
+CLEANFILES = $(html_DATA) pod2htm*.tmp
-AUTODOCS_YCP ?= $(srcdir)/../../src/*.ycp
-index.html: $(AUTODOCS_YCP)
- ${YCPDOC} -d. $^
+AUTODOCS_YCP ?= $(wildcard $(srcdir)/../../src/*.ycp)
+AUTODOCS_PM ?= $(wildcard $(srcdir)/../../src/*.pm)
+index.html: $(AUTODOCS_YCP) $(AUTODOCS_PM)
+#including *.pm, for the index
+ ${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.14/config.h.in new/yast2-bootloader-2.14.15/config.h.in
--- old/yast2-bootloader-2.14.14/config.h.in 2006-04-03 21:42:06.000000000 +0200
+++ new/yast2-bootloader-2.14.15/config.h.in 2006-10-16 20:55:20.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 run-time.
+ automatically deduced at runtime.
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.14/configure.in new/yast2-bootloader-2.14.15/configure.in
--- old/yast2-bootloader-2.14.14/configure.in 2006-04-03 21:41:46.000000000 +0200
+++ new/yast2-bootloader-2.14.15/configure.in 2006-10-16 20:54:54.000000000 +0200
@@ -1,9 +1,9 @@
dnl configure.in for yast2-bootloader
dnl
-dnl -- This file is generated by y2autoconf - DO NOT EDIT! --
+dnl -- This file is generated by y2autoconf 2.13.27 - 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.79, 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.13.36"
+VERSION="2.13.79"
RPMNAME="yast2-bootloader"
MAINTAINER="Olaf Dabrunz <od@xxxxxxx>"
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.14/src/modules/Bootloader.ycp new/yast2-bootloader-2.14.15/src/modules/Bootloader.ycp
--- old/yast2-bootloader-2.14.14/src/modules/Bootloader.ycp 2006-11-22 10:17:46.000000000 +0100
+++ new/yast2-bootloader-2.14.15/src/modules/Bootloader.ycp 2006-12-01 16:58:07.000000000 +0100
@@ -11,7 +11,7 @@
* Authors:
* Jiri Srain <jsrain@xxxxxxx>
*
- * $Id: Bootloader.ycp 34538 2006-11-21 13:55:48Z odabrunz $
+ * $Id: Bootloader.ycp 34700 2006-12-01 15:58:04Z odabrunz $
*
*/
@@ -603,9 +603,9 @@
// change only linux, failsafe and xen sections
BootCommon::sections = maplist (map<string,any> s, BootCommon::sections, {
// skip sections that are not linux, xen or failsafe
- if ( !contains ( ["linux", "xen", "failsafe"] , s["original_name"]:"") ||
+ if ( !contains ( ["linux", "xen"] , s["original_name"]:"") ||
!contains ( ["image", "xen"] , s["type"]:"") ) {
- y2milestone("section %1: not linux, xen or failsafe, skipping kernel and initrd remapping",
+ y2milestone("section %1: not linux or xen, skipping kernel and initrd remapping",
s["name"]:"");
return s;
}
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Remember to have fun...
---------------------------------------------------------------------
To unsubscribe, e-mail: opensuse-commit+unsubscribe@xxxxxxxxxxxx
For additional commands, e-mail: opensuse-commit+help@xxxxxxxxxxxx
| < Previous | Next > |