January 2016 - openSUSE Commits - openSUSE Mailing Lists

commit libXi for openSUSE:Factory
by root＠hilbert.suse.de 05 Jan '16

05 Jan '16

Hello community, here is the log from the commit of package libXi for openSUSE:Factory checked in at 2016-01-05 09:40:25 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/libXi (Old) and /work/SRC/openSUSE:Factory/.libXi.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "libXi" Changes: -------- --- /work/SRC/openSUSE:Factory/libXi/libXi.changes 2015-09-24 06:12:50.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.libXi.new/libXi.changes 2016-01-05 09:40:58.000000000 +0100 @@ -1,0 +2,11 @@ +Tue Dec 22 17:34:13 UTC 2015 - tobias.johannes.klausmann(a)mni.thm.de + +- Update to version 1.7.6: + One significant change here: libXi was using raw serial numbers in event + cookies, the one read off the wire. All other events don't use that number + but a Xlib-internal serial number which is similar but not always the same. + This could cause events to look out of order. With this release, libXi is + now using the same serial number for event cookies as it uses for all other + events. + +------------------------------------------------------------------- Old: ---- libXi-1.7.5.tar.bz2 New: ---- libXi-1.7.6.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ libXi.spec ++++++ --- /var/tmp/diff_new_pack.g0TZX6/_old 2016-01-05 09:40:59.000000000 +0100 +++ /var/tmp/diff_new_pack.g0TZX6/_new 2016-01-05 09:40:59.000000000 +0100 @@ -18,7 +18,7 @@ Name: libXi %define lname libXi6 -Version: 1.7.5 +Version: 1.7.6 Release: 0 Summary: X Input Extension library License: MIT ++++++ libXi-1.7.5.tar.bz2 -> libXi-1.7.6.tar.bz2 ++++++ ++++ 25908 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/libXi-1.7.5/ChangeLog new/libXi-1.7.6/ChangeLog --- old/libXi-1.7.5/ChangeLog 2015-09-09 17:17:33.000000000 +0200 +++ new/libXi-1.7.6/ChangeLog 2015-12-22 02:21:12.000000000 +0100 @@ -1,3 +1,44 @@ +commit 2286282f965064176b3b1492646c6e2e0f4ab7dd +Author: Peter Hutterer <peter.hutterer(a)who-t.net> +Date: Tue Dec 22 11:20:01 2015 +1000 + + libXi 1.7.6 + + Signed-off-by: Peter Hutterer <peter.hutterer(a)who-t.net> + +commit 13f25bfb55f4a0bc1f614cbf9b0b13a50ecad8a0 +Author: Javier Pello <javier.pello(a)urjc.es> +Date: Wed Oct 7 12:41:01 2015 +0200 + + Fix const compiler warnings + + When invoking Data, Data16 and Data32 from XChangeDeviceProperty, + we must cast the data pointer to the right type, but we do not need + to cast constness away. This change allows to enable -Wcast-qual on + the build and have it complete without warnings. + + Signed-off-by: Javier Pello <javier.pello(a)urjc.es> + Signed-off-by: Peter Hutterer <peter.hutterer(a)who-t.net> + +commit 380861589690bcbe8b04b7a2c23b5dd5d10c4bf8 +Author: Peter Hutterer <peter.hutterer(a)who-t.net> +Date: Mon Oct 19 11:46:41 2015 +1000 + + Don't use raw serial numbers in XIEvents + + cookie->serial is an Xlib contoction, provided by _XSetLastRequestRead(). This + serial may be different to the raw serial number from the wire protocol. + This causes issues when the raw serial is used to e.g. compare the event to + other non-XI events. + + Use the cookie's serial number instead. + + https://bugzilla.gnome.org/show_bug.cgi?id=756649 + + See also https://bugs.freedesktop.org/show_bug.cgi?id=64687 + + Signed-off-by: Peter Hutterer <peter.hutterer(a)who-t.net> + commit f180dff710dc54d00e0e26b84de053151f8f207e Author: Peter Hutterer <peter.hutterer(a)who-t.net> Date: Thu Sep 10 01:16:19 2015 +1000 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/libXi-1.7.5/configure.ac new/libXi-1.7.6/configure.ac --- old/libXi-1.7.5/configure.ac 2015-09-09 17:14:59.000000000 +0200 +++ new/libXi-1.7.6/configure.ac 2015-12-22 02:19:42.000000000 +0100 @@ -1,7 +1,7 @@ # Initialize Autoconf AC_PREREQ([2.60]) -AC_INIT([libXi], [1.7.5], +AC_INIT([libXi], [1.7.6], [https://bugs.freedesktop.org/enter_bug.cgi?product=xorg], [libXi]) AC_CONFIG_SRCDIR([Makefile.am]) AC_CONFIG_HEADERS([src/config.h]) 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/libXi-1.7.5/src/XChDProp.c new/libXi-1.7.6/src/XChDProp.c --- old/libXi-1.7.5/src/XChDProp.c 2010-09-07 07:21:04.000000000 +0200 +++ new/libXi-1.7.6/src/XChDProp.c 2015-11-03 00:12:31.000000000 +0100 @@ -74,7 +74,7 @@ len = ((long)nelements + 3) >> 2; if (dpy->bigreq_size || req->length + len <= (unsigned) 65535) { SetReqLen(req, len, len); - Data (dpy, (char *)data, nelements); + Data (dpy, (_Xconst char *)data, nelements); } /* else force BadLength */ break; @@ -83,7 +83,7 @@ if (dpy->bigreq_size || req->length + len <= (unsigned) 65535) { SetReqLen(req, len, len); len = (long)nelements << 1; - Data16 (dpy, (short *) data, len); + Data16 (dpy, (_Xconst short *) data, len); } /* else force BadLength */ break; @@ -92,7 +92,7 @@ if (dpy->bigreq_size || req->length + len <= (unsigned) 65535) { SetReqLen(req, len, len); len = (long)nelements << 2; - Data32 (dpy, (long *) data, len); + Data32 (dpy, (_Xconst long *) data, len); } /* else force BadLength */ break; 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/libXi-1.7.5/src/XExtInt.c new/libXi-1.7.6/src/XExtInt.c --- old/libXi-1.7.5/src/XExtInt.c 2014-11-03 06:28:36.000000000 +0100 +++ new/libXi-1.7.6/src/XExtInt.c 2015-10-19 03:46:32.000000000 +0200 @@ -1521,7 +1521,7 @@ out = next_block(&ptr_lib, sizeof(XIDeviceEvent)); out->display = cookie->display; out->type = in->type; - out->serial = in->sequenceNumber; + out->serial = cookie->serial; out->extension = in->extension; out->evtype = in->evtype; out->send_event = ((in->type & 0x80) != 0); @@ -1794,7 +1794,7 @@ cookie->data = out = malloc(sizeof(XIDeviceChangedEvent) + len); out->type = in->type; - out->serial = in->sequenceNumber; + out->serial = cookie->serial; out->display = cookie->display; out->extension = in->extension; out->evtype = in->evtype; @@ -1827,7 +1827,7 @@ out->info = (XIHierarchyInfo*)&out[1]; out->display = cookie->display; out->type = in->type; - out->serial = in->sequenceNumber; + out->serial = cookie->serial; out->extension = in->extension; out->evtype = in->evtype; out->send_event = ((in->type & 0x80) != 0); @@ -1868,7 +1868,7 @@ out = next_block(&ptr, sizeof(XIRawEvent)); out->type = in->type; - out->serial = in->sequenceNumber; + out->serial = cookie->serial; out->display = cookie->display; out->extension = in->extension; out->evtype = in->evtype; @@ -1919,7 +1919,7 @@ out->buttons.mask = (unsigned char*)&out[1]; out->type = in->type; - out->serial = in->sequenceNumber; + out->serial = cookie->serial; out->display = cookie->display; out->extension = in->extension; out->evtype = in->evtype; @@ -1962,7 +1962,7 @@ cookie->data = out; out->type = in->type; - out->serial = in->sequenceNumber; + out->serial = cookie->serial; out->extension = in->extension; out->evtype = in->evtype; out->send_event = ((in->type & 0x80) != 0); @@ -1983,7 +1983,7 @@ cookie->data = out; out->type = in->type; - out->serial = in->sequenceNumber; + out->serial = cookie->serial; out->display = cookie->display; out->extension = in->extension; out->evtype = in->evtype; @@ -2011,7 +2011,7 @@ out->display = cookie->display; out->type = in->type; - out->serial = in->sequenceNumber; + out->serial = cookie->serial; out->extension = in->extension; out->evtype = in->evtype; out->send_event = ((in->type & 0x80) != 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/libXi-1.7.5/src/config.h.in new/libXi-1.7.6/src/config.h.in --- old/libXi-1.7.5/src/config.h.in 2015-09-09 17:15:28.000000000 +0200 +++ new/libXi-1.7.6/src/config.h.in 2015-12-22 02:20:15.000000000 +0100 @@ -30,8 +30,7 @@ /* Define to 1 if you have the <unistd.h> header file. */ #undef HAVE_UNISTD_H -/* Define to the sub-directory in which libtool stores uninstalled libraries. - */ +/* Define to the sub-directory where libtool stores uninstalled libraries. */ #undef LT_OBJDIR /* Name of package */

1 0

commit bluez for openSUSE:Factory
by root＠hilbert.suse.de 05 Jan '16

05 Jan '16

Hello community, here is the log from the commit of package bluez for openSUSE:Factory checked in at 2016-01-05 09:40:19 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/bluez (Old) and /work/SRC/openSUSE:Factory/.bluez.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "bluez" Changes: -------- --- /work/SRC/openSUSE:Factory/bluez/bluez.changes 2015-11-11 10:28:56.000000000 +0100 +++ /work/SRC/openSUSE:Factory/.bluez.new/bluez.changes 2016-01-05 09:40:56.000000000 +0100 @@ -1,0 +2,12 @@ +Mon Dec 28 08:27:37 UTC 2015 - seife+obs(a)b1-systems.com + +- update to version 5.37: + * Fix issue with registering external profiles. + * Fix issue with connecting external profiles. + * Fix issue with GATT service changed handling. + * Fix issue with not emitting GattServices update. + * Convert to unified HID over GATT profile support. + * Convert to KeyboardDisplay as default IO capability. + * Install btattach utility by default. + +------------------------------------------------------------------- Old: ---- bluez-5.36.tar.xz New: ---- bluez-5.37.tar.xz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ bluez.spec ++++++ --- /var/tmp/diff_new_pack.iXRH4G/_old 2016-01-05 09:40:57.000000000 +0100 +++ /var/tmp/diff_new_pack.iXRH4G/_new 2016-01-05 09:40:57.000000000 +0100 @@ -24,7 +24,7 @@ BuildRequires: systemd-devel BuildRequires: pkgconfig(dbus-1) >= 1.6 %{?systemd_requires} -Version: 5.36 +Version: 5.37 Release: 0 Summary: Bluetooth Stack for Linux License: GPL-2.0+ @@ -119,13 +119,14 @@ # END FIXME %build -# autoreconf -fiv +# --enable-experimental is needed or btattach does not build (bug?) %configure --with-pic \ --enable-pie \ --enable-library \ --enable-tools \ --enable-cups \ --enable-test \ + --enable-experimental \ --enable-datafiles make %{?_smp_mflags} all V=1 @@ -156,7 +157,7 @@ %check %if ! 0%{?qemu_user_space_build} -make check +make %{?_smp_mflags} check %endif %clean @@ -187,6 +188,7 @@ %defattr(-, root, root) %doc AUTHORS COPYING ChangeLog README dbus-apis %{_bindir}/bluemoon +%{_bindir}/btattach %{_bindir}/hcitool %{_bindir}/l2ping %{_bindir}/rfcomm @@ -204,6 +206,7 @@ %{_bindir}/hcidump %{_bindir}/bccmd %{_prefix}/lib/udev/ +%doc %{_mandir}/man1/btattach.1.gz %doc %{_mandir}/man1/hcidump.1.gz %doc %{_mandir}/man1/hciattach.1.gz %doc %{_mandir}/man1/hciconfig.1.gz ++++++ bluez-5.36.tar.xz -> bluez-5.37.tar.xz ++++++ ++++ 17816 lines of diff (skipped)

1 0

commit gnome-session for openSUSE:Factory
by root＠hilbert.suse.de 05 Jan '16

05 Jan '16

Hello community, here is the log from the commit of package gnome-session for openSUSE:Factory checked in at 2016-01-05 09:40:15 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/gnome-session (Old) and /work/SRC/openSUSE:Factory/.gnome-session.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "gnome-session" Changes: -------- --- /work/SRC/openSUSE:Factory/gnome-session/gnome-session.changes 2015-11-12 19:37:37.000000000 +0100 +++ /work/SRC/openSUSE:Factory/.gnome-session.new/gnome-session.changes 2016-01-05 09:40:54.000000000 +0100 @@ -1,0 +2,6 @@ +Thu Nov 26 03:09:47 UTC 2015 - zaitor(a)opensuse.org + +- Add gnome-session-autostart-app-give-every-app-journal-id.patch: + Give every app it's own journald-id. Patch from upstream. + +------------------------------------------------------------------- New: ---- gnome-session-autostart-app-give-every-app-journal-id.patch ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ gnome-session.spec ++++++ --- /var/tmp/diff_new_pack.4VyvEE/_old 2016-01-05 09:40:55.000000000 +0100 +++ /var/tmp/diff_new_pack.4VyvEE/_new 2016-01-05 09:40:55.000000000 +0100 @@ -30,6 +30,8 @@ Source2: gnome.desktop # PATCH-FIX-UPSTREAM gnome-session-ice-auth-for-suid.patch hpj(a)novell.com -- Carries ICE auth over to other UIDs in this session using an env var. Patch0: gnome-session-ice-auth-for-suid.patch +# PATCH-FIX-UPSTREAM gnome-session-autostart-app-give-every-app-journal-id.patch zaitor(a)opensuse.org -- Patch from upstream git. +Patch1: gnome-session-autostart-app-give-every-app-journal-id.patch BuildRequires: fdupes BuildRequires: gnome-common BuildRequires: hicolor-icon-theme @@ -119,6 +121,7 @@ # Disabled, as it fails #translation-update-upstream %patch0 -p1 +%patch1 -p1 %build NOCONFIGURE=1 gnome-autogen.sh ++++++ gnome-session-autostart-app-give-every-app-journal-id.patch ++++++ >From 5449174a1618cc7637f8c3a96c0eeae679c55248 Mon Sep 17 00:00:00 2001 From: Ray Strode <rstrode(a)redhat.com> Date: Thu, 5 Nov 2015 09:41:16 -0500 Subject: autostart-app: give ever app its own journal id Right now all session output gets attributed to gnome-session which isn't very useful. This commit makes sure launched apps each get their own journal identifier. https://bugzilla.gnome.org/show_bug.cgi?id=757571 --- gnome-session/gsm-autostart-app.c | 44 ++++++++++++++++++++++++++++++++++++++- 1 file changed, 43 insertions(+), 1 deletion(-) diff --git a/gnome-session/gsm-autostart-app.c b/gnome-session/gsm-autostart-app.c index 75008fe..08a434b 100644 --- a/gnome-session/gsm-autostart-app.c +++ b/gnome-session/gsm-autostart-app.c @@ -32,6 +32,11 @@ #include <gconf/gconf-client.h> #endif +#ifdef HAVE_SYSTEMD +#include <systemd/sd-journal.h> +#include <systemd/sd-daemon.h> +#endif + #include "gsm-autostart-app.h" #include "gsm-util.h" @@ -1014,6 +1019,34 @@ app_launched (GAppLaunchContext *ctx, app->priv->startup_id = sn_id; } +#ifdef HAVE_SYSTEMD +static void +on_child_setup (GsmAutostartApp *app) +{ + int standard_output, standard_error; + + /* The FALSE means programs aren't expected to prefix each + * line with <n> prefix to specify priority. + */ + standard_output = sd_journal_stream_fd (app->priv->desktop_id, + LOG_INFO, + FALSE); + standard_error = sd_journal_stream_fd (app->priv->desktop_id, + LOG_WARNING, + FALSE); + + if (standard_output >= 0) { + dup2 (standard_output, STDOUT_FILENO); + close (standard_output); + } + + if (standard_error >= 0) { + dup2 (standard_error, STDERR_FILENO); + close (standard_error); + } +} +#endif + static gboolean autostart_app_start_spawn (GsmAutostartApp *app, GError **error) @@ -1022,6 +1055,8 @@ autostart_app_start_spawn (GsmAutostartApp *app, GError *local_error; const char *startup_id; GAppLaunchContext *ctx; + GSpawnChildSetupFunc child_setup_func = NULL; + gpointer child_setup_data = NULL; guint handler; startup_id = gsm_app_peek_startup_id (GSM_APP (app)); @@ -1041,12 +1076,19 @@ autostart_app_start_spawn (GsmAutostartApp *app, g_app_launch_context_setenv (ctx, "DESKTOP_AUTOSTART_ID", startup_id); } +#ifdef HAVE_SYSTEMD + if (sd_booted () > 0) { + child_setup_func = (GSpawnChildSetupFunc) on_child_setup; + child_setup_data = app; + } +#endif + handler = g_signal_connect (ctx, "launched", G_CALLBACK (app_launched), app); success = g_desktop_app_info_launch_uris_as_manager (app->priv->app_info, NULL, ctx, G_SPAWN_DO_NOT_REAP_CHILD | G_SPAWN_SEARCH_PATH, - NULL, NULL, + child_setup_func, child_setup_data, NULL, NULL, &local_error); g_signal_handler_disconnect (ctx, handler); -- cgit v0.11.2

1 0

commit libpst for openSUSE:Factory
by root＠hilbert.suse.de 05 Jan '16

05 Jan '16

Hello community, here is the log from the commit of package libpst for openSUSE:Factory checked in at 2016-01-05 09:40:09 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/libpst (Old) and /work/SRC/openSUSE:Factory/.libpst.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "libpst" Changes: -------- --- /work/SRC/openSUSE:Factory/libpst/libpst.changes 2015-09-24 06:13:23.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.libpst.new/libpst.changes 2016-01-05 09:40:53.000000000 +0100 @@ -1,0 +2,6 @@ +Sun Dec 27 20:03:58 UTC 2015 - zaitor(a)opensuse.org + +- Update to version 0.6.66: + + Added Content-ID header support. + +------------------------------------------------------------------- Old: ---- libpst-0.6.65.tar.gz New: ---- libpst-0.6.66.tar.gz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ libpst.spec ++++++ --- /var/tmp/diff_new_pack.6R835J/_old 2016-01-05 09:40:54.000000000 +0100 +++ /var/tmp/diff_new_pack.6R835J/_new 2016-01-05 09:40:54.000000000 +0100 @@ -18,7 +18,7 @@ Name: libpst -Version: 0.6.65 +Version: 0.6.66 Release: 0 Summary: A library for reading PST files License: GPL-2.0+ ++++++ libpst-0.6.65.tar.gz -> libpst-0.6.66.tar.gz ++++++ /work/SRC/openSUSE:Factory/libpst/libpst-0.6.65.tar.gz /work/SRC/openSUSE:Factory/.libpst.new/libpst-0.6.66.tar.gz differ: char 5, line 1

1 0

commit php5 for openSUSE:Factory
by root＠hilbert.suse.de 05 Jan '16

05 Jan '16

Hello community, here is the log from the commit of package php5 for openSUSE:Factory checked in at 2016-01-05 09:40:04 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/php5 (Old) and /work/SRC/openSUSE:Factory/.php5.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "php5" Changes: -------- --- /work/SRC/openSUSE:Factory/php5/php5.changes 2015-12-27 01:59:29.000000000 +0100 +++ /work/SRC/openSUSE:Factory/.php5.new/php5.changes 2016-01-05 09:40:50.000000000 +0100 @@ -1,0 +2,5 @@ +Mon Dec 28 12:33:09 UTC 2015 - pgajdos(a)suse.com + +- updated to 5.6.16: Several bugs have been fixed. + +------------------------------------------------------------------- Old: ---- php-5.6.15.tar.xz php-5.6.15.tar.xz.asc New: ---- php-5.6.16.tar.xz php-5.6.16.tar.xz.asc ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ php5.spec ++++++ --- /var/tmp/diff_new_pack.rjqfYW/_old 2016-01-05 09:40:52.000000000 +0100 +++ /var/tmp/diff_new_pack.rjqfYW/_new 2016-01-05 09:40:52.000000000 +0100 @@ -46,7 +46,7 @@ %define need_libxml2_hack %(if [ -e %{_includedir}/libxml/parser.h ]; then if grep -q XML_PARSE_OLDSAX %{_includedir}/libxml/parser.h; then echo 1; else echo 0; fi; else echo 0; fi) Name: php5 -Version: 5.6.15 +Version: 5.6.16 Release: 0 Summary: PHP5 Core Files License: PHP-3.01 ++++++ php-5.6.15.tar.xz -> php-5.6.16.tar.xz ++++++ /work/SRC/openSUSE:Factory/php5/php-5.6.15.tar.xz /work/SRC/openSUSE:Factory/.php5.new/php-5.6.16.tar.xz differ: char 27, line 1

1 0

commit zypper for openSUSE:Factory
by root＠hilbert.suse.de 05 Jan '16

05 Jan '16

Hello community, here is the log from the commit of package zypper for openSUSE:Factory checked in at 2016-01-05 09:39:56 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/zypper (Old) and /work/SRC/openSUSE:Factory/.zypper.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "zypper" Changes: -------- --- /work/SRC/openSUSE:Factory/zypper/zypper.changes 2015-12-13 09:35:53.000000000 +0100 +++ /work/SRC/openSUSE:Factory/.zypper.new/zypper.changes 2016-01-05 09:40:48.000000000 +0100 @@ -1,0 +2,49 @@ +Thu Dec 24 01:13:24 CET 2015 - ma(a)suse.de + +- Update zypper-po.tar.bz2 + +------------------------------------------------------------------- +Wed Dec 23 15:13:34 CET 2015 - ma(a)suse.de + +- ref: don't return 0 if repos were skipped (bsc#959564) +- Fix '-y' command option as alias for --non-interactive global + option (bsc#957862) +- si: Mention location rpm installs source packages to in command + help and man page (bsc#710541) +- man: explain difference between 'dup' and 'dup --from' +- man: Explain meaning of 'System Packages' and '@System' shown in + search results (bsc#953458) +- BuildRequires: libzypp-devel >= 15.19.8 +- version 1.12.28 + +------------------------------------------------------------------- +Sun Dec 20 01:14:29 CET 2015 - ma(a)suse.de + +- Update sle-zypper-po.tar.bz2 + +------------------------------------------------------------------- +Sun Dec 20 01:13:19 CET 2015 - ma(a)suse.de + +- Update zypper-po.tar.bz2 + +------------------------------------------------------------------- +Thu Dec 17 01:14:11 CET 2015 - ma(a)suse.de + +- Update zypper-po.tar.bz2 + +------------------------------------------------------------------- +Thu Dec 10 01:15:00 CET 2015 - ma(a)suse.de + +- Update zypper-po.tar.bz2 + +------------------------------------------------------------------- +Thu Dec 3 01:14:45 CET 2015 - ma(a)suse.de + +- Update sle-zypper-po.tar.bz2 + +------------------------------------------------------------------- +Thu Dec 3 01:13:23 CET 2015 - ma(a)suse.de + +- Update zypper-po.tar.bz2 + +------------------------------------------------------------------- Old: ---- zypper-1.12.27.tar.bz2 New: ---- zypper-1.12.28.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ zypper.spec ++++++ --- /var/tmp/diff_new_pack.BFED8b/_old 2016-01-05 09:40:49.000000000 +0100 +++ /var/tmp/diff_new_pack.BFED8b/_new 2016-01-05 09:40:49.000000000 +0100 @@ -22,7 +22,7 @@ BuildRequires: cmake >= 2.4.6 BuildRequires: gcc-c++ >= 4.7 BuildRequires: gettext-devel >= 0.15 -BuildRequires: libzypp-devel >= 15.19.1 +BuildRequires: libzypp-devel >= 15.19.8 BuildRequires: readline-devel >= 5.1 Requires: procps %if 0%{?suse_version} @@ -33,7 +33,7 @@ Summary: Command line software manager using libzypp License: GPL-2.0+ Group: System/Packages -Version: 1.12.27 +Version: 1.12.28 Release: 0 Source: %{name}-%{version}.tar.bz2 Source1: %{name}-rpmlintrc ++++++ zypper-1.12.27.tar.bz2 -> zypper-1.12.28.tar.bz2 ++++++ /work/SRC/openSUSE:Factory/zypper/zypper-1.12.27.tar.bz2 /work/SRC/openSUSE:Factory/.zypper.new/zypper-1.12.28.tar.bz2 differ: char 11, line 1

1 0

commit libzypp for openSUSE:Factory
by root＠hilbert.suse.de 05 Jan '16

05 Jan '16

Hello community, here is the log from the commit of package libzypp for openSUSE:Factory checked in at 2016-01-05 09:39:51 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/libzypp (Old) and /work/SRC/openSUSE:Factory/.libzypp.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "libzypp" Changes: -------- --- /work/SRC/openSUSE:Factory/libzypp/libzypp.changes 2015-12-13 09:35:47.000000000 +0100 +++ /work/SRC/openSUSE:Factory/.libzypp.new/libzypp.changes 2016-01-05 09:40:45.000000000 +0100 @@ -1,0 +2,24 @@ +Thu Dec 24 01:13:13 CET 2015 - ma(a)suse.de + +- Update zypp-po.tar.bz2 + +------------------------------------------------------------------- +Fri Dec 11 19:07:09 CET 2015 - ma(a)suse.de + +- ResPoolProxy: make begin/end pairs Iterable +- String: Format and FormatNAC classes based on boost::format +- DefaultIntegral: provide initial value +- More specific exception message if GPG binary is missing (bsc#637791) +- version 15.20.0 (19) + +------------------------------------------------------------------- +Thu Dec 10 01:14:50 CET 2015 - ma(a)suse.de + +- Update zypp-po.tar.bz2 + +------------------------------------------------------------------- +Thu Dec 3 01:13:11 CET 2015 - ma(a)suse.de + +- Update zypp-po.tar.bz2 + +------------------------------------------------------------------- Old: ---- libzypp-15.19.7.tar.bz2 New: ---- libzypp-15.20.0.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ libzypp.spec ++++++ --- /var/tmp/diff_new_pack.LQTMEK/_old 2016-01-05 09:40:46.000000000 +0100 +++ /var/tmp/diff_new_pack.LQTMEK/_new 2016-01-05 09:40:46.000000000 +0100 @@ -19,7 +19,7 @@ %define force_gcc_46 0 Name: libzypp -Version: 15.19.7 +Version: 15.20.0 Release: 0 Url: git://gitorious.org/opensuse/libzypp.git Summary: Package, Patch, Pattern, and Product Management ++++++ libzypp-15.19.7.tar.bz2 -> libzypp-15.20.0.tar.bz2 ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libzypp-15.19.7/VERSION.cmake new/libzypp-15.20.0/VERSION.cmake --- old/libzypp-15.19.7/VERSION.cmake 2015-11-16 12:28:57.000000000 +0100 +++ new/libzypp-15.20.0/VERSION.cmake 2015-12-11 19:08:57.000000000 +0100 @@ -60,9 +60,9 @@ # SET(LIBZYPP_MAJOR "15") SET(LIBZYPP_COMPATMINOR "19") -SET(LIBZYPP_MINOR "19") -SET(LIBZYPP_PATCH "7") +SET(LIBZYPP_MINOR "20") +SET(LIBZYPP_PATCH "0") # -# LAST RELEASED: 15.19.7 (19) +# LAST RELEASED: 15.20.0 (19) # (The number in parenthesis is LIBZYPP_COMPATMINOR) #======= diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libzypp-15.19.7/package/libzypp.changes new/libzypp-15.20.0/package/libzypp.changes --- old/libzypp-15.19.7/package/libzypp.changes 2015-11-22 01:18:34.000000000 +0100 +++ new/libzypp-15.20.0/package/libzypp.changes 2015-12-24 01:18:47.000000000 +0100 @@ -1,4 +1,28 @@ ------------------------------------------------------------------- +Thu Dec 24 01:13:13 CET 2015 - ma(a)suse.de + +- Update zypp-po.tar.bz2 + +------------------------------------------------------------------- +Fri Dec 11 19:07:09 CET 2015 - ma(a)suse.de + +- ResPoolProxy: make begin/end pairs Iterable +- String: Format and FormatNAC classes based on boost::format +- DefaultIntegral: provide initial value +- More specific exception message if GPG binary is missing (bsc#637791) +- version 15.20.0 (19) + +------------------------------------------------------------------- +Thu Dec 10 01:14:50 CET 2015 - ma(a)suse.de + +- Update zypp-po.tar.bz2 + +------------------------------------------------------------------- +Thu Dec 3 01:13:11 CET 2015 - ma(a)suse.de + +- Update zypp-po.tar.bz2 + +------------------------------------------------------------------- Sun Nov 22 01:13:29 CET 2015 - ma(a)suse.de - Update zypp-po.tar.bz2 Files old/libzypp-15.19.7/po/zypp-po.tar.bz2 and new/libzypp-15.20.0/po/zypp-po.tar.bz2 differ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libzypp-15.19.7/tools/zypp-NameReqPrv.cc new/libzypp-15.20.0/tools/zypp-NameReqPrv.cc --- old/libzypp-15.19.7/tools/zypp-NameReqPrv.cc 2015-07-06 11:06:37.000000000 +0200 +++ new/libzypp-15.20.0/tools/zypp-NameReqPrv.cc 2015-12-15 15:36:57.000000000 +0100 @@ -40,6 +40,7 @@ cerr << " -o/-O turn on/off looking for obsoletes (default off)" << endl; cerr << " -m/-M turn on/off looking for recommends (default off)" << endl; cerr << " -s/-S turn on/off looking for supplements (default off)" << endl; + cerr << " -e/-E turn on/off looking for enhan./sugg.(default off)" << endl; cerr << " -a short for -n -p -r" << endl; cerr << " -A short for -n -P -R" << endl; cerr << " -D <pkg> dump dependencies of <pkg>" << endl; @@ -197,6 +198,7 @@ bool obsoletes ( false ); bool recommends ( false ); bool supplements ( false ); + bool enhacements ( false ); for ( ; argc; --argc,++argv ) { @@ -231,6 +233,8 @@ case 'M': recommends = false; break; case 's': supplements = true; break; case 'S': supplements = false; break; + case 'e': enhacements = true; break; + case 'E': enhacements = false; break; } continue; } @@ -280,10 +284,16 @@ q.addDependency( sat::SolvAttr::recommends ); if ( supplements ) q.addDependency( sat::SolvAttr::supplements ); + if ( enhacements ) + { + q.addDependency( sat::SolvAttr::enhances ); + q.addDependency( sat::SolvAttr::suggests ); + } } message << *argv << " [" << (ignorecase?'i':'_') << (names?'n':'_') << (requires?'r':'_') << (provides?'p':'_') - << (conflicts?'c':'_') << (obsoletes?'o':'_') << (recommends?'m':'_') << (supplements?'s':'_') << "] {" << endl; + << (conflicts?'c':'_') << (obsoletes?'o':'_') << (recommends?'m':'_') << (supplements?'s':'_') << (enhacements?'e':'_') + << "] {" << endl; for_( it, q.begin(), q.end() ) { diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libzypp-15.19.7/zypp/KeyRing.cc new/libzypp-15.20.0/zypp/KeyRing.cc --- old/libzypp-15.19.7/zypp/KeyRing.cc 2015-07-06 11:06:37.000000000 +0200 +++ new/libzypp-15.20.0/zypp/KeyRing.cc 2015-12-11 19:08:57.000000000 +0100 @@ -15,8 +15,6 @@ #include <cstdio> #include <unistd.h> -#include <boost/format.hpp> - #include "zypp/TmpPath.h" #include "zypp/ZYppFactory.h" #include "zypp/ZYpp.h" @@ -521,9 +519,9 @@ { if ( ! PathInfo( keyfile ).isExist() ) // TranslatorExplanation first %s is key name, second is keyring name - ZYPP_THROW(KeyRingException(boost::str(boost::format( - _("Tried to import not existent key %s into keyring %s")) - % keyfile.asString() % keyring.asString()))); + ZYPP_THROW(KeyRingException( str::Format(_("Tried to import not existent key %s into keyring %s")) + % keyfile.asString() + % keyring.asString() )); const char* argv[] = { @@ -574,8 +572,7 @@ std::string KeyRing::Impl::readSignatureKeyId( const Pathname & signature ) { if ( ! PathInfo( signature ).isFile() ) - ZYPP_THROW(Exception(boost::str(boost::format( - _("Signature file %s not found"))% signature.asString()))); + ZYPP_THROW(Exception( str::Format(_("Signature file %s not found")) % signature.asString() )); MIL << "Determining key id if signature " << signature << endl; // HACK create a tmp keyring with no keys diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libzypp-15.19.7/zypp/Pathname.cc new/libzypp-15.20.0/zypp/Pathname.cc --- old/libzypp-15.19.7/zypp/Pathname.cc 2015-07-06 11:06:37.000000000 +0200 +++ new/libzypp-15.20.0/zypp/Pathname.cc 2015-12-11 19:08:57.000000000 +0100 @@ -73,7 +73,7 @@ } }; - for ( auto ch : name_r ) + for ( char ch : name_r ) { switch ( ch ) { diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libzypp-15.19.7/zypp/PublicKey.cc new/libzypp-15.20.0/zypp/PublicKey.cc --- old/libzypp-15.19.7/zypp/PublicKey.cc 2015-10-05 12:20:31.000000000 +0200 +++ new/libzypp-15.20.0/zypp/PublicKey.cc 2015-12-11 19:08:57.000000000 +0100 @@ -378,12 +378,15 @@ { scanner.scan( line ); } - prog.close(); + int ret = prog.close(); switch ( scanner._keys.size() ) { case 0: - ZYPP_THROW( BadKeyException( "File " + _dataFile.path().asString() + " doesn't contain public key data" , _dataFile.path() ) ); + if ( ret == 129 ) + ZYPP_THROW( Exception( std::string("Can't read public key data: ") + GPG_BINARY + " is not installed!" ) ); + else + ZYPP_THROW( BadKeyException( "File " + _dataFile.path().asString() + " doesn't contain public key data" , _dataFile.path() ) ); break; case 1: diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libzypp-15.19.7/zypp/RepoManager.cc new/libzypp-15.20.0/zypp/RepoManager.cc --- old/libzypp-15.19.7/zypp/RepoManager.cc 2015-10-21 15:53:34.000000000 +0200 +++ new/libzypp-15.20.0/zypp/RepoManager.cc 2015-12-11 19:08:57.000000000 +0100 @@ -224,7 +224,7 @@ bool nonroot( geteuid() != 0 ); if ( nonroot && ! PathInfo(dir).userMayRX() ) { - JobReport::warning( formatNAC(_("Cannot read repo directory '%1%': Permission denied")) % dir ); + JobReport::warning( str::FormatNAC(_("Cannot read repo directory '%1%': Permission denied")) % dir ); } else { @@ -242,7 +242,7 @@ { if ( nonroot && ! PathInfo(*it).userMayR() ) { - JobReport::warning( formatNAC(_("Cannot read repo file '%1%': Permission denied")) % *it ); + JobReport::warning( str::FormatNAC(_("Cannot read repo file '%1%': Permission denied")) % *it ); } else { @@ -770,13 +770,13 @@ // Cleanup orphanded service repos: if ( ! orphanedRepos.empty() ) { - for ( auto & repoInfo : orphanedRepos ) + for ( const auto & repoInfo : orphanedRepos ) { MIL << "Delete orphaned service repo " << repoInfo.alias() << endl; // translators: Cleanup a repository previously owned by a meanwhile unknown (deleted) service. // %1% = service name // %2% = repository name - JobReport::warning( formatNAC(_("Unknown service '%1%': Removing orphaned service repository '%2%'" )) + JobReport::warning( str::FormatNAC(_("Unknown service '%1%': Removing orphaned service repository '%2%'")) % repoInfo.service() % repoInfo.alias() ); try { diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libzypp-15.19.7/zypp/ResPoolProxy.h new/libzypp-15.20.0/zypp/ResPoolProxy.h --- old/libzypp-15.19.7/zypp/ResPoolProxy.h 2015-10-05 12:20:31.000000000 +0200 +++ new/libzypp-15.20.0/zypp/ResPoolProxy.h 2015-12-11 19:08:57.000000000 +0100 @@ -118,6 +118,15 @@ template<class TRes> const_iterator byKindEnd() const { return byKindEnd( ResTraits<TRes>::kind ); } + + + Iterable<const_iterator> byKind( const ResKind & kind_r ) const + { return makeIterable( byKindBegin( kind_r ), byKindEnd( kind_r ) ); } + + template<class TRes> + Iterable<const_iterator> byKind() const + { return makeIterable( byKindBegin<TRes>(), byKindEnd<TRes>() ); } + //@} public: @@ -129,6 +138,9 @@ repository_iterator knownRepositoriesBegin() const; repository_iterator knownRepositoriesEnd() const; + + Iterable<repository_iterator> knownRepositories() const + { return makeIterable( knownRepositoriesBegin(), knownRepositoriesEnd() ); } //@} public: diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libzypp-15.19.7/zypp/ZYppCallbacks.h new/libzypp-15.20.0/zypp/ZYppCallbacks.h --- old/libzypp-15.19.7/zypp/ZYppCallbacks.h 2015-10-05 12:20:31.000000000 +0200 +++ new/libzypp-15.20.0/zypp/ZYppCallbacks.h 2015-12-11 19:08:57.000000000 +0100 @@ -806,27 +806,27 @@ static callback::SendReport<JobReport> & instance(); // impl in ZYppImpl.cc /** send debug message text */ - static bool debug( const MessageString & msg_r, const UserData & userData_r = UserData() ) + static bool debug( const std::string & msg_r, const UserData & userData_r = UserData() ) { return instance()->message( MsgType::debug, msg_r, userData_r ); } /** send message text */ - static bool info( const MessageString & msg_r, const UserData & userData_r = UserData() ) + static bool info( const std::string & msg_r, const UserData & userData_r = UserData() ) { return instance()->message( MsgType::info, msg_r, userData_r ); } /** send warning text */ - static bool warning( const MessageString & msg_r, const UserData & userData_r = UserData() ) + static bool warning( const std::string & msg_r, const UserData & userData_r = UserData() ) { return instance()->message( MsgType::warning, msg_r, userData_r ); } /** send error text */ - static bool error( const MessageString & msg_r, const UserData & userData_r = UserData() ) + static bool error( const std::string & msg_r, const UserData & userData_r = UserData() ) { return instance()->message( MsgType::error, msg_r, userData_r ); } /** send important message text */ - static bool important( const MessageString & msg_r, const UserData & userData_r = UserData() ) + static bool important( const std::string & msg_r, const UserData & userData_r = UserData() ) { return instance()->message( MsgType::important, msg_r, userData_r ); } /** send data message */ - static bool data( const MessageString & msg_r, const UserData & userData_r = UserData() ) + static bool data( const std::string & msg_r, const UserData & userData_r = UserData() ) { return instance()->message( MsgType::data, msg_r, userData_r ); } //@} }; diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libzypp-15.19.7/zypp/base/DefaultIntegral.h new/libzypp-15.20.0/zypp/base/DefaultIntegral.h --- old/libzypp-15.19.7/zypp/base/DefaultIntegral.h 2015-10-05 12:20:31.000000000 +0200 +++ new/libzypp-15.20.0/zypp/base/DefaultIntegral.h 2015-12-11 19:08:57.000000000 +0100 @@ -57,6 +57,9 @@ operator Tp () const { return get(); } //@} + /** The initial value. */ + constexpr Tp initial() const { return TInitial; } + /** Reset to the defined initial value. */ DefaultIntegral & reset() { _val = TInitial; return *this; } diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libzypp-15.19.7/zypp/base/String.h new/libzypp-15.20.0/zypp/base/String.h --- old/libzypp-15.19.7/zypp/base/String.h 2015-10-29 15:42:03.000000000 +0100 +++ new/libzypp-15.20.0/zypp/base/String.h 2015-12-11 19:08:57.000000000 +0100 @@ -31,24 +31,6 @@ /////////////////////////////////////////////////////////////////// /////////////////////////////////////////////////////////////////// -namespace boost -{ - /** A formater with (N)o (A)rgument (C)heck. - * It won't complain about missing or excess arguments. Sometimes - * usefull when dealing with translations or classes providing a - * default formater. - */ - inline format formatNAC( const std::string & string_r ) { - using namespace boost::io; - format fmter( string_r ); - fmter.exceptions( all_error_bits ^ ( too_many_args_bit | too_few_args_bit ) ); - return fmter; - } -} // namespace boost -namespace zypp { using boost::formatNAC; } -/////////////////////////////////////////////////////////////////// - -/////////////////////////////////////////////////////////////////// namespace zypp { /** Request a human readable (translated) string representation of Tp [Tp.asUserString()] @@ -65,16 +47,6 @@ namespace zypp { ///////////////////////////////////////////////////////////////// - struct MessageString : public std::string - { - MessageString() {} - MessageString( const char * str_r ) : std::string( str_r ? str_r : "" ) {} - MessageString( const std::string & str_r ) : std::string( str_r ) {} - // boost::format, std::ostringstream, str::Str ... - template<class TStr> - MessageString( const TStr & str_r ) : std::string( str_r.str() ) {} - }; - /** Convenience \c char* constructible from \c std::string and \c char*, * it maps \c (char*)0 to an empty string. * @@ -224,44 +196,98 @@ }; /////////////////////////////////////////////////////////////////// - /** Convenient building of std::string via std::ostream::operator<<. - * Basically this is an \ref ostringstream which is autocenvertible - * into a \ref string. - * \code - * void fnc( const std::string & txt_r ); - * fnc( str::Str() << "Hello " << 13 ); - * - * std::string txt( str::Str() << 45 ); - * \endcode - */ + /// \class Str + /// \brief Convenient building of std::string via \ref std::ostringstream + /// Basically a \ref std::ostringstream autoconvertible to \ref std::string + /// for building string arguments. + /// \code + /// void fnc( const std::string & txt_r ); + /// fnc( str::Str() << "Hello " << 13 ); + /// + /// std::string txt( str::Str() << 45 ); + /// \endcode + /////////////////////////////////////////////////////////////////// struct Str { template<class Tp> - Str & operator<<( const Tp & val ) - { _str << val; return *this; } + Str & operator<<( Tp && val ) + { _str << std::forward<Tp>(val); return *this; } Str & operator<<( std::ostream& (*iomanip)( std::ostream& ) ) { _str << iomanip; return *this; } - operator std::string() const - { return _str.str(); } + operator std::string() const { return _str.str(); } + std::string str() const { return _str.str(); } - std::string str() const - { return _str.str(); } + const std::ostream & stream() const { return _str; } + std::ostream & stream() { return _str; } - std::ostream & stream() - { return _str; } - - void clear() - { _str.str( std::string() ); } + void clear() { _str.str( std::string() ); } + private: std::ostringstream _str; }; + /** \relates Str Stream output */ inline std::ostream & operator<<( std::ostream & str, const Str & obj ) - { return str << (std::string)obj; } + { return str << obj.str(); } /////////////////////////////////////////////////////////////////// + /// \class Format + /// \brief Convenient building of std::string with \ref boost::format. + /// Basically a \ref boost::format autoconvertible to \ref std::string + /// for building string arguments. + /// \code + /// void fnc( const std::string & txt_r ); + /// fnc( str::Format("Hello %1%") % 13 ); + /// + /// std::string txt( str::Format("Hello %1%") % 13 ); + /// \endcode + /////////////////////////////////////////////////////////////////// + struct Format + { + Format() {} + Format( const std::string & format_r ) : _fmter( format_r ) {} + + template<class Tp> + Format & operator%( Tp && arg ) + { _fmter % std::forward<Tp>(arg); return *this; } + + operator std::string() const { return _fmter.str(); } + std::string asString() const { return _fmter.str(); } + std::string str() const { return _fmter.str(); } + + const boost::format & fmter() const { return _fmter; } + boost::format & fmter() { return _fmter; } + + protected: + boost::format _fmter; + }; + + /** \relates Format Stream output */ + inline std::ostream & operator<<( std::ostream & str, const Format & obj ) + { return str << obj.fmter(); } + + /////////////////////////////////////////////////////////////////// + /// \class FormatNAC + /// \brief \ref Format with (N)o (A)rgument (C)heck. + /// It won't complain about missing or excess arguments. Sometimes + /// usefull when dealing with translations or classes providing a + /// default formater. + /////////////////////////////////////////////////////////////////// + struct FormatNAC : public Format + { + FormatNAC() { relax(); } + FormatNAC( const std::string & format_r ) : Format( format_r ) { relax(); } + + private: + void relax() + { + using namespace boost::io; + _fmter.exceptions( all_error_bits ^ ( too_many_args_bit | too_few_args_bit ) ); + } + }; + /////////////////////////////////////////////////////////////////// /** \name String representation of number. * * Optional second argument sets the minimal string width (' ' padded). diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libzypp-15.19.7/zypp/base/Sysconfig.cc new/libzypp-15.20.0/zypp/base/Sysconfig.cc --- old/libzypp-15.19.7/zypp/base/Sysconfig.cc 2015-07-06 11:06:37.000000000 +0200 +++ new/libzypp-15.20.0/zypp/base/Sysconfig.cc 2015-12-11 19:08:57.000000000 +0100 @@ -120,7 +120,7 @@ std::vector<std::string> lines; str::split( newcomment_r, std::back_inserter(lines), "\r\n" ); o << endl; - for ( auto line : lines ) + for ( const std::string & line : lines ) { if ( line[0] != '#' ) o << "# "; diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libzypp-15.19.7/zypp/media/MediaCurl.cc new/libzypp-15.20.0/zypp/media/MediaCurl.cc --- old/libzypp-15.19.7/zypp/media/MediaCurl.cc 2015-07-06 11:06:37.000000000 +0200 +++ new/libzypp-15.20.0/zypp/media/MediaCurl.cc 2015-12-11 19:08:57.000000000 +0100 @@ -37,7 +37,6 @@ #include <errno.h> #include <dirent.h> #include <unistd.h> -#include <boost/format.hpp> #define DETECT_DIR_INDEX 0 #define CONNECT_TIMEOUT 60 @@ -1687,9 +1686,7 @@ // indicate we have no good credentials from CM cmcred.reset(); - string prompt_msg = boost::str(boost::format( - //!\todo add comma to the message for the next release - _("Authentication required for '%s'")) % _url.asString()); + string prompt_msg = str::Format(_("Authentication required for '%s'")) % _url.asString(); // set available authentication types from the exception // might be needed in prompt diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libzypp-15.19.7/zypp/media/MediaUserAuth.cc new/libzypp-15.20.0/zypp/media/MediaUserAuth.cc --- old/libzypp-15.19.7/zypp/media/MediaUserAuth.cc 2015-07-06 11:06:37.000000000 +0200 +++ new/libzypp-15.20.0/zypp/media/MediaUserAuth.cc 2015-12-11 19:08:57.000000000 +0100 @@ -13,8 +13,6 @@ #include <list> #include <curl/curl.h> -#include <boost/format.hpp> - #include "zypp/base/Gettext.h" #include "zypp/base/String.h" @@ -132,10 +130,7 @@ } else { - std::string msg = boost::str( - boost::format (_("Unsupported HTTP authentication method '%s'")) % *it); - - ZYPP_THROW(MediaException(msg)); + ZYPP_THROW(MediaException(str::Format(_("Unsupported HTTP authentication method '%s'")) % *it)); } } diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libzypp-15.19.7/zypp/sat/FileConflicts.cc new/libzypp-15.20.0/zypp/sat/FileConflicts.cc --- old/libzypp-15.19.7/zypp/sat/FileConflicts.cc 2015-07-06 11:06:37.000000000 +0200 +++ new/libzypp-15.20.0/zypp/sat/FileConflicts.cc 2015-12-11 19:08:57.000000000 +0100 @@ -56,11 +56,10 @@ " conflicts with file from install of\n" " %3%" ) }}; - return( boost::formatNAC( text[lhsSolvable().isSystem()?0:1][rhsSolvable().isSystem()?0:1] ) - % lhsFilename() - % lhsSolvable().asUserString() - % rhsSolvable().asUserString() - ).str(); + return str::FormatNAC( text[lhsSolvable().isSystem()?0:1][rhsSolvable().isSystem()?0:1] ) + % lhsFilename() + % lhsSolvable().asUserString() + % rhsSolvable().asUserString(); } else { @@ -99,12 +98,11 @@ " from install of\n" " %4%" ) }}; - return( boost::formatNAC( text[lhsSolvable().isSystem()?0:1][rhsSolvable().isSystem()?0:1] ) - % lhsFilename() - % lhsSolvable().asUserString() - % rhsFilename() - % rhsSolvable().asUserString() - ).str(); + return str::FormatNAC( text[lhsSolvable().isSystem()?0:1][rhsSolvable().isSystem()?0:1] ) + % lhsFilename() + % lhsSolvable().asUserString() + % rhsFilename() + % rhsSolvable().asUserString(); } } @@ -114,20 +112,20 @@ std::ostream & operator<<( std::ostream & str, const FileConflicts::Conflict & obj ) { if ( obj.lhsFilename() == obj.rhsFilename() ) - return str << boost::format( "%s:\n %s[%s]\n %s[%s]" ) - % obj.lhsFilename() - % obj.lhsSolvable() - % obj.lhsFilemd5() - % obj.rhsSolvable() - % obj.rhsFilemd5(); + return str << str::Format( "%s:\n %s[%s]\n %s[%s]" ) + % obj.lhsFilename() + % obj.lhsSolvable() + % obj.lhsFilemd5() + % obj.rhsSolvable() + % obj.rhsFilemd5(); - return str << boost::format( "%s - %s:\n %s[%s]\n %s[%s]" ) - % obj.lhsFilename() - % obj.rhsFilename() - % obj.lhsSolvable() - % obj.lhsFilemd5() - % obj.rhsSolvable() - % obj.rhsFilemd5(); + return str << str::Format( "%s - %s:\n %s[%s]\n %s[%s]" ) + % obj.lhsFilename() + % obj.rhsFilename() + % obj.lhsSolvable() + % obj.lhsFilemd5() + % obj.rhsSolvable() + % obj.rhsFilemd5(); } diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libzypp-15.19.7/zypp/target/RpmPostTransCollector.cc new/libzypp-15.20.0/zypp/target/RpmPostTransCollector.cc --- old/libzypp-15.19.7/zypp/target/RpmPostTransCollector.cc 2015-07-06 11:06:37.000000000 +0200 +++ new/libzypp-15.20.0/zypp/target/RpmPostTransCollector.cc 2015-12-11 19:08:57.000000000 +0100 @@ -83,7 +83,7 @@ Pathname noRootScriptDir( ZConfig::instance().update_scriptsPath() / tmpDir().basename() ); - for ( auto && script : _scripts ) + for ( const auto & script : _scripts ) { MIL << "EXECUTE posttrans: " << script << endl; ExternalProgram prog( (noRootScriptDir/script).asString(), ExternalProgram::Stderr_To_Stdout, false, -1, true, _root ); @@ -132,7 +132,7 @@ str::Str msg; msg << "%posttrans scripts skipped while aborting:\n"; - for ( auto && script : _scripts ) + for ( const auto & script : _scripts ) { const std::string & pkgident( script.substr( 0, script.size()-6 ) ); // strip tmp file suffix WAR << "UNEXECUTED posttrans: " << script << endl; diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libzypp-15.19.7/zypp/target/rpm/RpmDb.cc new/libzypp-15.20.0/zypp/target/rpm/RpmDb.cc --- old/libzypp-15.19.7/zypp/target/rpm/RpmDb.cc 2015-10-05 12:20:31.000000000 +0200 +++ new/libzypp-15.20.0/zypp/target/rpm/RpmDb.cc 2015-12-11 19:08:57.000000000 +0100 @@ -29,8 +29,6 @@ #include <vector> #include <algorithm> -#include <boost/format.hpp> - #include "zypp/base/Logger.h" #include "zypp/base/String.h" #include "zypp/base/Gettext.h" @@ -1123,9 +1121,9 @@ if ( systemStatus() != 0 ) { //TranslatorExplanation first %s is file name, second is error message - ZYPP_THROW(RpmSubprocessException(boost::str(boost::format( - _("Failed to import public key from file %s: %s")) - % pubkey_r.asString() % error_message))); + ZYPP_THROW(RpmSubprocessException( str::Format(_("Failed to import public key from file %s: %s")) + % pubkey_r.asString() + % error_message )); } else { @@ -1194,9 +1192,9 @@ if ( rpm_status != 0 ) { //TranslatorExplanation first %s is key name, second is error message - ZYPP_THROW(RpmSubprocessException(boost::str(boost::format( - _("Failed to remove public key %s: %s")) % pubkey_r.asString() - % error_message))); + ZYPP_THROW(RpmSubprocessException( str::Format(_("Failed to remove public key %s: %s")) + % pubkey_r.asString() + % error_message )); } else {

1 0

commit kiwi for openSUSE:Factory
by root＠hilbert.suse.de 05 Jan '16

05 Jan '16

Hello community, here is the log from the commit of package kiwi for openSUSE:Factory checked in at 2016-01-05 09:39:46 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/kiwi (Old) and /work/SRC/openSUSE:Factory/.kiwi.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "kiwi" Changes: -------- --- /work/SRC/openSUSE:Factory/kiwi/kiwi.changes 2015-12-03 13:26:57.000000000 +0100 +++ /work/SRC/openSUSE:Factory/.kiwi.new/kiwi.changes 2016-01-05 09:40:35.000000000 +0100 @@ -1,0 +2,367 @@ +Wed Dec 23 10:46:28 CET 2015 - ms(a)suse.de + +- v7.03.48 released + +------------------------------------------------------------------- +Wed Dec 23 10:39:31 CET 2015 - ms(a)suse.de + +- Fixed import of kernel parameters including spaces + + Kernel parameters like PRODUCT_TYPE=âPRODUCT BANANAâ breaks + the code in includeKernelParameters. This patch allows spaces + for values in a way that it replaces the embedded whitespace + with \030 before parsing and then reverting after parsing. + Thanks to Jay Nitikman for providing the patch + +------------------------------------------------------------------- +Wed Dec 23 10:35:02 CET 2015 - ms(a)suse.de + +- Fixed uninstall target for buildroot use case + +------------------------------------------------------------------- +Wed Dec 23 10:29:11 CET 2015 - ms(a)suse.de + +- v7.03.47 released + +------------------------------------------------------------------- +Wed Dec 23 10:27:13 CET 2015 - ms(a)suse.de + +- Fixed LUKS setup for dracut + + The system image has to provide /etc/crypttab to allow dracut + to create a working initrd for reboot. In addition the name + of the luks map must be 'luks' to make dracut happy. + +------------------------------------------------------------------- +Wed Dec 23 10:14:45 CET 2015 - ms(a)suse.de + +- Fixed installation of documentation + +------------------------------------------------------------------- +Wed Dec 23 10:02:58 CET 2015 - ms(a)suse.de + +- Update documentation + + Also put each doc target into its own directory + +------------------------------------------------------------------- +Wed Dec 23 09:34:48 CET 2015 - ms(a)suse.de + +- Delete binary picture data + +------------------------------------------------------------------- +Wed Dec 23 09:31:36 CET 2015 - ms(a)suse.de + +- Delete unmaintained documentation sources + +------------------------------------------------------------------- +Tue Dec 22 22:46:59 CET 2015 - fs(a)suse.de + +- Stylecheck + +------------------------------------------------------------------- +Tue Dec 22 16:08:02 CET 2015 - fs(a)suse.de + +- Specllchecked + +------------------------------------------------------------------- +Tue Dec 22 14:51:55 CET 2015 - fs(a)suse.de + +- Kiwi Doc Revision Pt. 13: Appliance and Migration + +------------------------------------------------------------------- +Tue Dec 22 11:34:13 CET 2015 - fs(a)suse.de + +- Kiwi Doc Revision Pt. 12: XEN chapter + +------------------------------------------------------------------- +Tue Dec 22 01:08:32 CET 2015 - afaerber(a)suse.de + +- Handle /boot/vc files for Raspberry Pi + + openSUSE Tumbleweed raspberrypi-firmware[-branding-openSUSE] packages + have been updated to install files to /boot/vc rather than /boot. + + Ensure that all files in /boot/vc find their way into the vboot partition + and on the boot partition prepare vc as potential mount point. + + Signed-off-by: Andreas FÃ¤rber <afaerber(a)suse.de> + +------------------------------------------------------------------- +Mon Dec 21 17:30:24 CET 2015 - fs(a)suse.de + +- Kiwi Doc Revision Pt. 11: OEM chapter + +------------------------------------------------------------------- +Mon Dec 21 17:29:38 CET 2015 - fs(a)suse.de + +- Kiwi Doc Revision Pt. 10 (final): PXE chapter + +------------------------------------------------------------------- +Mon Dec 21 16:13:14 CET 2015 - ms(a)suse.de + +- Fixed JeOS templates configured for efi boot + + in case of efi the efi modules should be installed to the system. + Even though it's not a problem for kiwi because it takes the modules + from the self build initrd it could become a problem when grub2 + is used for reconfiguration on the system later. It is also + questionable whether it is a good idea from kiwi to install + the efi modules as part of the initrd just for the purpose to + take them from there at build time when they are not really needed + in the initrd at boot time. The new (next generation) kiwi version + will lookup modules from the system if possible and will not + keep them inside of the initrd + +------------------------------------------------------------------- +Mon Dec 21 12:19:45 CET 2015 - ms(a)suse.de + +- Fixed suse-SLE12-community-JeOS description + + kernel-debug is not installed, no need to have it in the + delete section + +------------------------------------------------------------------- +Sat Dec 19 18:56:13 CET 2015 - martin.koegler(a)suse.de + +- Honor RW filesystem type + +------------------------------------------------------------------- +Sat Dec 19 18:13:43 CET 2015 - martin.koegler(a)suse.de + +- Refactor file system check + +------------------------------------------------------------------- +Thu Dec 17 09:41:32 CET 2015 - ms(a)suse.de + +- v7.03.46 released + +------------------------------------------------------------------- +Thu Dec 17 09:40:10 CET 2015 - ms(a)suse.de + +- Update manual page info about targetdevice option + + This is related to (bnc#956484) + +------------------------------------------------------------------- +Thu Dec 17 09:35:59 CET 2015 - ms(a)suse.de + +- use sudo for kiwi when running from git source + +------------------------------------------------------------------- +Thu Dec 17 09:30:01 CET 2015 - ms(a)suse.de + +- Improve validation of targetDevice + + If called with --targetdevice the target must be a device block + special and nothing else, no symlink, no other node type + This fixes (bnc#956484) + +------------------------------------------------------------------- +Wed Dec 16 08:46:31 CET 2015 - martin.koegler(a)suse.de + +- Add label support for xfs + +------------------------------------------------------------------- +Tue Dec 15 16:35:33 CET 2015 - ms(a)suse.de + +- v7.03.45 released + +------------------------------------------------------------------- +Tue Dec 15 15:52:08 CET 2015 - ms(a)suse.de + +- Inform user if dracut is called in background mode + +------------------------------------------------------------------- +Tue Dec 15 15:47:20 CET 2015 - ms(a)suse.de + +- Fixed validation of updates/weak-updates modules + + suseStripKernel took the update and weak-update modules only + into account if they are mentioned in the drivers list. But + these modules are considered p1 and should always be included + and also checked against its dependencies + +------------------------------------------------------------------- +Tue Dec 15 09:12:59 CET 2015 - martin.koegler(a)suse.de + +- Allow xfs as hybrid RW file system + +------------------------------------------------------------------- +Thu Dec 10 15:26:25 CET 2015 - ms(a)suse.de + +- v7.03.44 released + +------------------------------------------------------------------- +Thu Dec 10 15:12:29 CET 2015 - ms(a)suse.de + ++++ 295 more lines (skipped) ++++ between /work/SRC/openSUSE:Factory/kiwi/kiwi.changes ++++ and /work/SRC/openSUSE:Factory/.kiwi.new/kiwi.changes ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ kiwi.spec ++++++ --- /var/tmp/diff_new_pack.TvTbMF/_old 2016-01-05 09:40:37.000000000 +0100 +++ /var/tmp/diff_new_pack.TvTbMF/_new 2016-01-05 09:40:37.000000000 +0100 @@ -27,7 +27,7 @@ Name: kiwi License: GPL-2.0 Group: System/Management -Version: 7.03.37 +Version: 7.03.48 Provides: kiwi-schema = 6.2 Provides: kiwi-image:aci Provides: kiwi-image:lxc @@ -93,7 +93,11 @@ Requires: tar Requires: psmisc Requires: util-linux +%if 0%{?suse_version} == 1110 +Requires: sysvinit +%else Requires: sysvinit-tools +%endif %if 0%{?suse_version} # SUSE specific requires %if 0%{?suse_version} >= 1210 @@ -104,7 +108,7 @@ Requires: satsolver-tools Requires: perl-satsolver >= 0.42 %endif -%if %suse_version == 1110 +%if 0%{?suse_version} == 1110 Requires: virt-utils %else Requires: qemu-tools @@ -134,52 +138,43 @@ # find out about the name scheme of the local system for # the buildservice needed -requires packages. In terms of # problems with this magic ask adrian(a)suse.de for details + %if 0%{?suse_version} %define mysystems %(echo `export VER=%{suse_version}; echo "suse-${VER:0:2}.${VER:2:1}"`) # redefine for the SLES case if no sles_version exists # SLE12: -%if %suse_version == 1315 && !0%{?is_opensuse} -%define mysystems suse-SLES12 -%endif -# SLE12-SP1: -%if %suse_version == 1316 && !0%{?is_opensuse} +%if 0%{?suse_version} == 1315 && !0%{?is_opensuse} %define mysystems suse-SLES12 %endif # Leap 42.1: -%if %suse_version == 1315 && 0%{?is_opensuse} +%if 0%{?suse_version} == 1315 && 0%{?is_opensuse} %define mysystems suse-leap42.1 %endif # Tumbleweed: # Current Tumbleweed version, moving target -%if %suse_version == 1330 +%if 0%{?suse_version} == 1330 %define mysystems suse-tumbleweed %endif # redefine for the SLE11 case if no sles_version exists # SLE11: NOTE: this works only because openSUSE 11.1 is out of scope -%if %suse_version == 1110 +%if 0%{?suse_version} == 1110 %define mysystems suse-SLES11 %endif %endif + # SLES with sles_version macro %if 0%{?sles_version} -%ifarch %ix86 x86_64 -%define mysystems suse-SLES%{sles_version} -%else %define mysystems suse-SLES%{sles_version} %endif -%endif -# RHEL -%if 0%{?rhel_version} == 600 + +# RHEL // CentOS +# use the rhel templates for CentOS, too +%if 0%{?rhel_version} == 600 || 0%{?centos_version} == 600 %define mysystems rhel-06.0 %endif -%if 0%{?rhel_version} == 700 +%if 0%{?rhel_version} == 700 || 0%{?centos_version} == 700 %define mysystems rhel-07.0 %endif -# CentOS -%if 0%{?centos_version} == 600 -# use the rhel templates for CentOS 6 -%define mysystems rhel-06.0 -%endif # find out about my arch name, could be done also via symlinks %define myarch %{_target_cpu} @@ -211,18 +206,20 @@ Provides: kiwi-filesystem:ext3 Provides: kiwi-filesystem:ext4 Provides: kiwi-filesystem:squashfs -Provides: kiwi-packagemanager:zypper Provides: kiwi-image:docker Requires: btrfsprogs Requires: e2fsprogs Requires: kiwi = %{version} -Requires: zypper License: GPL-2.0 Group: System/Management %if 0%{?rhel_version} || 0%{?centos_version} +Provides: kiwi-packagemanager:yum +Requires: yum Requires: squashfs-tools %endif %if 0%{?suse_version} +Provides: kiwi-packagemanager:zypper +Requires: zypper Requires: squashfs %endif %if 0%{?suse_version} > 1120 @@ -371,7 +368,8 @@ Requires: s390-tools %endif %ifarch %ix86 x86_64 -%if 0%{?suse_version} < 1315 +# rhel7 has no grub, only grub2 +%if 0%{?suse_version} < 1315 && 0%{?rhel_version} < 700 && 0%{?centos_version} < 700 Requires: grub %endif %endif @@ -405,7 +403,7 @@ %endif %ifarch %ix86 x86_64 Requires: syslinux -%if 0%{?suse_version} >= 1220 +%if 0%{?suse_version} >= 1220 || 0%{?rhel_version} >= 700 || 0%{?centos_version} >= 700 Requires: grub2 %else Requires: grub @@ -443,10 +441,10 @@ Requires: s390-tools %endif %ifarch %ix86 x86_64 -%if 0%{?suse_version} < 1315 +%if 0%{?suse_version} < 1315 && 0%{?rhel_version} < 700 && 0%{?centos_version} < 700 Requires: grub %endif -%if 0%{?suse_version} >= 1220 +%if 0%{?suse_version} >= 1220 || 0%{?rhel_version} >= 700 || 0%{?centos_version} >= 700 Requires: grub2 %ifarch x86_64 Requires: grub2-x86_64-efi @@ -519,7 +517,7 @@ %endif %ifarch %ix86 x86_64 Requires: syslinux -%if 0%{?suse_version} >= 1220 +%if 0%{?suse_version} >= 1220 || 0%{?rhel_version} >= 700 || 0%{?centos_version} >= 700 Requires: grub2 %else Requires: grub @@ -560,10 +558,10 @@ Requires: s390-tools %endif %ifarch %ix86 x86_64 -%if 0%{?suse_version} < 1315 +%if 0%{?suse_version} < 1315 && 0%{?rhel_version} < 700 && 0%{?centos_version} < 700 Requires: grub %endif -%if 0%{?suse_version} >= 1220 +%if 0%{?suse_version} >= 1220 || 0%{?rhel_version} >= 700 || 0%{?centos_version} >= 700 Requires: grub2 %ifarch x86_64 Requires: grub2-x86_64-efi @@ -665,6 +663,7 @@ %setup -q -n %name -a2 -a3 %build +echo "mysystems set to: %{mysystems}" # empty because of rpmlint warning rpm-buildroot-usage %if 0%{?suse_version} > 1140 @@ -832,10 +831,8 @@ %dir %{_defaultdocdir}/kiwi %{_defaultdocdir}/kiwi/COPYING %{_defaultdocdir}/kiwi/examples -%{_defaultdocdir}/kiwi/images -%{_defaultdocdir}/kiwi/kiwi.pdf -%{_defaultdocdir}/kiwi/kiwi.html -%{_defaultdocdir}/kiwi/susebooks.css +%{_defaultdocdir}/kiwi/html +%{_defaultdocdir}/kiwi/pdf %{_defaultdocdir}/kiwi/schema #================================================= # KIWI instsource... ++++++ kiwi-docu.tar.bz2 ++++++ ++++ 72626 lines of diff (skipped) ++++++ kiwi-repo.tar.bz2 ++++++ ++++++ kiwi.tar.bz2 ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kiwi/.gitignore new/kiwi/.gitignore --- old/kiwi/.gitignore 2015-09-21 16:23:18.000000000 +0200 +++ new/kiwi/.gitignore 2015-12-23 09:26:48.000000000 +0100 @@ -2,6 +2,8 @@ *.ts tests/.timestamps # emacs backup files +\#*# +.#* *~ # localization files *.mo @@ -14,3 +16,7 @@ .revision # d3 css data packed into a tarball metadata/KIWIAnalyse.tgz +# doc build specific stuff +doc/docbook/build/ +# emacs schema definition +doc/docbook/xml/schemas.xml diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kiwi/.revision new/kiwi/.revision --- old/kiwi/.revision 2015-09-14 11:57:46.000000000 +0200 +++ new/kiwi/.revision 2015-12-17 09:28:28.000000000 +0100 @@ -1 +1 @@ -75ba66ddd43a689dd5b7d1d0cc71c704b5d42344 +e7ef2da84a78034424ae14ba4e6b2ebb14592dff diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kiwi/Makefile new/kiwi/Makefile --- old/kiwi/Makefile 2015-09-21 16:23:18.000000000 +0200 +++ new/kiwi/Makefile 2015-12-23 10:32:18.000000000 +0100 @@ -107,20 +107,22 @@ # kiwi documentation and examples #-------------------------------------------- cp -a doc/examples/ ${PACKDOCVZ} - cp -a doc/images/ ${PACKDOCVZ} cp -a doc/schema/ ${PACKDOCVZ} - cp -a doc/kiwi.pdf ${PACKDOCVZ} - cp -a doc/kiwi.html ${PACKDOCVZ} - cp -a doc/*.css ${PACKDOCVZ} + cp -a doc/pdf/ ${PACKDOCVZ} + cp -a doc/html/ ${PACKDOCVZ} cp -a doc/COPYING ${PACKDOCVZ} - test -e doc/ChangeLog && cp -a doc/ChangeLog ${PACKDOCVZ} || true + + rm -rf ${PACKDOCVZ}/html/images + mkdir -p ${PACKDOCVZ}/html/images + cp -a doc/docbook/images/*.png ${PACKDOCVZ}/html/images + cp -a doc/docbook/images/callouts ${PACKDOCVZ}/html/images + rm -f ${PACKDOCVZ}/schema/Makefile - rm -f ${PACKDOCVZ}/schema/susesync #============================================ # kiwi manual pages #-------------------------------------------- - for i in $(shell ls -1 ./doc/*.1);do \ + for i in $(shell ls -1 ./doc/man/*.1);do \ install -m 644 $$i ${MANVZ} ;\ done @@ -278,11 +280,11 @@ uninstall: @echo Uninstalling... - rm -rf /usr/share/kiwi - rm -rf /usr/share/doc/packages/kiwi - rm -f /usr/sbin/kiwi - rm -f /usr/share/emacs/site-lisp/suse-start-kiwi-mode.el - rm -f /etc/bash_completion.d/kiwi.sh + rm -rf ${buildroot}/usr/share/kiwi + rm -rf ${buildroot}/usr/share/doc/packages/kiwi + rm -f ${buildroot}/usr/sbin/kiwi + rm -f ${buildroot}/usr/share/emacs/site-lisp/suse-start-kiwi-mode.el + rm -f ${buildroot}/etc/bash_completion.d/kiwi.sh build: clean ./.doit -p --local diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kiwi/kiwi new/kiwi/kiwi --- old/kiwi/kiwi 2015-09-10 15:20:51.000000000 +0200 +++ new/kiwi/kiwi 2015-12-17 09:35:08.000000000 +0100 @@ -6,7 +6,7 @@ pushd $callpath &>/dev/null if [ ! -f "metadata/KIWIAnalyse.tgz" ];then - su $USER -c "tar -C metadata -czf metadata/KIWIAnalyse.tgz d3" + sudo su $USER -c "tar -C metadata -czf metadata/KIWIAnalyse.tgz d3" fi if [ ! -s ".revision" ];then ./.version > .revision diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kiwi/kiwi.pl new/kiwi/kiwi.pl --- old/kiwi/kiwi.pl 2015-09-14 11:57:46.000000000 +0200 +++ new/kiwi/kiwi.pl 2015-12-17 09:28:28.000000000 +0100 @@ -1483,10 +1483,20 @@ $kiwi -> failed (); kiwiExit (1); } - if (($targetDevice) && (! -b $targetDevice)) { - $kiwi -> error ("Target device $targetDevice doesn't exist"); - $kiwi -> failed (); - kiwiExit (1); + if ($targetDevice) { + if (! -e $targetDevice) { + $kiwi -> error ( + "Target device $targetDevice doesn't exist" + ); + $kiwi -> failed (); + kiwiExit (1); + } elsif ((-l $targetDevice) || (! -b $targetDevice)) { + $kiwi -> error ( + "Target device $targetDevice is not a block device" + ); + $kiwi -> failed (); + kiwiExit (1); + } } if ((defined $IgnoreRepos) && (defined $SetRepository)) { $kiwi -> error ("Can't use ignore repos together with set repos"); @@ -2184,7 +2194,7 @@ $kiwi -> failed (); kiwiExit (1); } - my $cmd = "find -L -type f | grep -v .svn | grep -v .checksum.md5"; + my $cmd = "find -L -type f ! -wholename '*.svn*' ! -name .checksum.md5 | sort"; my $status = KIWIQX::qxx ( "cd $idesc && $cmd | xargs md5sum > .checksum.md5" ); diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kiwi/locale/sv/LC_MESSAGES/kiwi.po new/kiwi/locale/sv/LC_MESSAGES/kiwi.po --- old/kiwi/locale/sv/LC_MESSAGES/kiwi.po 2015-10-13 18:14:52.000000000 +0200 +++ new/kiwi/locale/sv/LC_MESSAGES/kiwi.po 2015-12-11 10:09:28.000000000 +0100 @@ -9,15 +9,15 @@ "Project-Id-Version: @PACKAGE@\n" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2006-05-18 10:26+0200\n" -"PO-Revision-Date: 2005-09-18 19:09+0200\n" -"Last-Translator: Mattias Newzella <newzella(a)linux.se>\n" -"Language-Team: Swedish <sv(a)li.org>\n" +"PO-Revision-Date: 2015-12-06 01:08+0200\n" +"Last-Translator: Jonas Svensson <jonas(a)ekhorva.se>\n" +"Language-Team: Swedish <http://l10n.opensuse.org/projects/kiwi/master/sv/>\n" "Language: sv\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Generator: KBabel 1.10.1\n" -"Plural-Forms: nplurals=2; plural=(n != 1);\n" +"Plural-Forms: nplurals=2; plural=n != 1;\n" +"X-Generator: Weblate 2.3\n" #. /.../ #. Copyright (c) 2005 SuSE GmbH Nuernberg, Germany. All rights reserved. @@ -25,47 +25,42 @@ #. boot code for KIWI #. msgid "Boot continues in 10 sec" -msgstr "" +msgstr "Uppstarten fortsätter om 10 sekunder" msgid "Enter LUKS passphrase" -msgstr "" +msgstr "Skriv in LUKS-lösenord" msgid "Do you accept the license agreement ?" -msgstr "" +msgstr "Accepterar du licensavtalet?" # power-off message -#, fuzzy msgid "Do you want to start the System-Recovery ?" -msgstr "Vill du stänga av datorn nu?" +msgstr "Vill du påbörja systemåterställningen?" # power-off message -#, fuzzy msgid "Do you want to start the System-Restore ?" -msgstr "Vill du stänga av datorn nu?" +msgstr "Vill du starta systemåterställningen?" -#, fuzzy msgid "Restoring base operating system..." -msgstr "Starta om och starta ett annat operativsystem" +msgstr "Återställer grundoperativsystemet..." msgid "Destroying ALL data on %1, continue ?" -msgstr "" +msgstr "ALL data på %1 kommer att förstöras. Vill du fortsätta?" msgid "Clean sweep..." -msgstr "" +msgstr "Raderar..." msgid "%1 files from %2 restored..." -msgstr "" +msgstr "%1 filer från %2 återställda..." msgid "backing up: %1..." -msgstr "" +msgstr "säkerhetskopierar %1..." -#, fuzzy msgid "archiving: %1..." -msgstr "Filen är för stor: %1." +msgstr "arkiverar: %1." -#, fuzzy msgid "restoring: %1..." -msgstr "Filen är för stor: %1." +msgstr "återställer: %1." msgid "Yes" msgstr "Ja" @@ -82,45 +77,44 @@ msgstr "Avbryt" msgid "Exit" -msgstr "" +msgstr "Avsluta" msgid "Bootloader installation has failed" -msgstr "" +msgstr "Installationen av bootloadern misslyckades" msgid "" "The system will not be able to reboot. Please make sure to fixup and install " "the bootloader before next reboot. Check /var/log/boot.kiwi for details" msgstr "" +"Systemet kommer inte att kunna starta. Du måste reparera och installera " +"bootloadern innan nästa omstart. Se /var/log/boot.kiwi för mer information" msgid "Please remove the CD/DVD before reboot" -msgstr "" +msgstr "Avlägsna alla CD/DVD-skivor innan datorn startas om" msgid "Please unplug the USB stick before reboot" -msgstr "" +msgstr "Avlägsna USB-stickan innan omstart" -#, fuzzy msgid "Installation..." -msgstr "Installation" +msgstr "Installation..." -#, fuzzy msgid "Loading %1" -msgstr "Fel vid laddning av %1" +msgstr "Laddar %1" msgid "Verifying %1" -msgstr "" +msgstr "Verifierar %1" # dialog title for hard disk installation -#, fuzzy msgid "Select disk for installation:" -msgstr "Hårddiskinstallation" +msgstr "Välj installationsdisk:" # dialog title for hard disk installation -#, fuzzy msgid "Select %1 partition for installation:" -msgstr "Hårddiskinstallation" +msgstr "Välj %1 partition för installation:" msgid "System will be shutdown. Remove USB stick before power on" msgstr "" +"Systemet kommer att stängas av. Avlägsna USB-stickan innan du slår på datorn" msgid "Please remove the CD/DVD before shutdown" -msgstr "" +msgstr "Avlägsna CD/DVD-skivan innan du stänger av" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kiwi/modules/KIWIBoot.pm new/kiwi/modules/KIWIBoot.pm --- old/kiwi/modules/KIWIBoot.pm 2015-10-20 16:02:48.000000000 +0200 +++ new/kiwi/modules/KIWIBoot.pm 2015-12-22 09:39:43.000000000 +0100 @@ -3894,6 +3894,7 @@ my $core= "$tmpdir/EFI/BOOT/$fo_bin"; my $core_opts; $core_opts = "-O $fo -o $core -c $earlyboot "; + $core_opts.= "-p /boot/grub2 "; $core_opts.= "-d $tmpdir/$stages{efi}{stageSRC}"; $status = KIWIQX::qxx ( "$grub2_mkimage $core_opts @modules 2>&1" @@ -3997,6 +3998,7 @@ my $core = "$tmpdir/boot/grub2/$format/core.elf"; my $core_opts; $core_opts = "-O $format -o $core -c $earlyboot "; + $core_opts.= "-p /boot/grub2 "; $core_opts.= "-d $tmpdir/$stages{ofw}{stageSRC}"; my $status = KIWIQX::qxx ( "$grub2_mkimage $core_opts @modules 2>&1" @@ -4028,6 +4030,7 @@ my $cdcore = "$tmpdir/boot/grub2/$format/cdboot.img"; my $core_opts; $core_opts = "-O $format -o $core -c $earlyboot "; + $core_opts.= "-p /boot/grub2 "; $core_opts.= "-d $tmpdir/$stages{bios}{stageSRC}"; my $status = KIWIQX::qxx ( "$grub2_mkimage $core_opts @modules 2>&1" @@ -5562,7 +5565,7 @@ my $target = $dest; KIWIQX::qxx ("mv $dest/boot/boot.scr $target &>/dev/null"); KIWIQX::qxx ("mv $dest/boot/*.dtb $target &>/dev/null"); - KIWIQX::qxx ("mv $dest/boot/dtb/ $target &>/dev/null"); + KIWIQX::qxx ("mv $dest/boot/dtb* $target &>/dev/null"); if (-f "$dest/boot/MLO") { $status = KIWIQX::qxx ("mv $dest/boot/MLO $target"); $result = $? >> 8; @@ -5588,6 +5591,11 @@ KIWIQX::qxx ("mv $dest/boot/*.img $target &>/dev/null"); KIWIQX::qxx ("mv $dest/boot/*.imx $target &>/dev/null"); KIWIQX::qxx ("mv $dest/boot/*.elf $target &>/dev/null"); + if (-d "$dest/boot/vc") { + # Raspberry Pi VideoCore files + KIWIQX::qxx ("mv $dest/boot/vc/* $target &>/dev/null"); + KIWIQX::qxx ("mv $dest/boot/vc $dest &>/dev/null"); + } } #========================================== # YaBoot diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kiwi/modules/KIWIConfig.sh new/kiwi/modules/KIWIConfig.sh --- old/kiwi/modules/KIWIConfig.sh 2015-11-17 12:53:24.000000000 +0100 +++ new/kiwi/modules/KIWIConfig.sh 2015-12-22 09:39:43.000000000 +0100 @@ -1200,12 +1200,15 @@ if [ -f /boot/MLO ];then mv /boot/MLO /image/loader fi + if [ -d /boot/vc ];then + mv /boot/vc /image/loader + fi mv /boot/*.dat /image/loader &>/dev/null mv /boot/*.bin /image/loader &>/dev/null mv /boot/*.img /image/loader &>/dev/null mv /boot/*.imx /image/loader &>/dev/null mv /boot/*.dtb /image/loader &>/dev/null - mv /boot/dtb/ /image/loader &>/dev/null + mv /boot/dtb* /image/loader &>/dev/null mv /boot/*.elf /image/loader &>/dev/null else # boot loader binaries @@ -1474,17 +1477,22 @@ #========================================== # check for weak-/updates and backup them #------------------------------------------ + stripdir=/tmp/stripped_modules if [ -d $kversion/weak-updates ];then - mv $kversion/weak-updates /tmp + mkdir -pv $stripdir$kversion + mv $kversion/weak-updates $stripdir$kversion + fi + if [ -d $kversion/updates ];then + mkdir -pv $stripdir$kversion + mv $kversion/updates $stripdir$kversion fi #========================================== # strip the modules but take care for deps #------------------------------------------ - stripdir=/tmp/stripped_modules for mod in $(echo $kiwi_drivers | tr , ' '); do - local path=`/usr/bin/dirname $mod` - local base=`/usr/bin/basename $mod` - for d in "." kernel updates;do + local path=$(/usr/bin/dirname $mod) + local base=$(/usr/bin/basename $mod) + for d in "." kernel;do if [ "$base" = "*" ];then if test -d $kversion/$d/$path ; then mkdir -pv $stripdir$kversion/$d/$path @@ -1537,9 +1545,6 @@ if [ -f /tmp/modules.order ];then mv /tmp/modules.order $kversion fi - if [ -d /tmp/weak-updates ];then - mv /tmp/weak-updates $kversion - fi #========================================== # run depmod #------------------------------------------ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kiwi/modules/KIWIConfigure.pm new/kiwi/modules/KIWIConfigure.pm --- old/kiwi/modules/KIWIConfigure.pm 2015-09-21 16:23:18.000000000 +0200 +++ new/kiwi/modules/KIWIConfigure.pm 2015-12-11 10:09:28.000000000 +0100 @@ -736,24 +736,25 @@ my $root = $this->{root}; my $xml = $this->{xml}; my $users = $xml -> getUsers(); - my $adduser = $locator -> getExecPath('useradd', $root); my $chown = $locator -> getExecPath('chown', $root); my $grep = $locator -> getExecPath('grep', $root); - my $moduser = $locator -> getExecPath('usermod', $root); my $numUsers = scalar @{$users}; - if ($numUsers) { - if (! $adduser) { - $kiwi -> error ("Missing useradd command"); - $kiwi -> failed (); - return; - } - if (! $moduser) { - $kiwi -> error ("Missing usermod command"); - $kiwi -> failed (); - return; - } - } + for my $user (@{$users}) { + my $adduser = $locator -> getExecPath('useradd', $root); + my $moduser = $locator -> getExecPath('usermod', $root); + if ($numUsers) { + if (! $adduser) { + $kiwi -> error ("Missing useradd command"); + $kiwi -> failed (); + return; + } + if (! $moduser) { + $kiwi -> error ("Missing usermod command"); + $kiwi -> failed (); + return; + } + } my $group = $user -> getGroupName(); my $gid = $user -> getGroupID(); my $logShell = $user -> getLoginShell(); diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kiwi/modules/KIWIGlobals.pm new/kiwi/modules/KIWIGlobals.pm --- old/kiwi/modules/KIWIGlobals.pm 2015-11-26 09:59:25.000000000 +0100 +++ new/kiwi/modules/KIWIGlobals.pm 2015-12-23 10:50:16.000000000 +0100 @@ -1933,7 +1933,7 @@ # Globals (generic) #------------------------------------------ my %data; - $data{Version} = "7.03.37"; + $data{Version} = "7.03.48"; $data{Publisher} = "SUSE LINUX GmbH"; $data{Preparer} = "KIWI - http://opensuse.github.com/kiwi"; $data{ConfigName} = "config.xml"; diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kiwi/modules/KIWIImage.pm new/kiwi/modules/KIWIImage.pm --- old/kiwi/modules/KIWIImage.pm 2015-10-19 16:09:59.000000000 +0200 +++ new/kiwi/modules/KIWIImage.pm 2015-11-30 12:44:35.000000000 +0100 @@ -2205,7 +2205,7 @@ } elsif ($gzip =~ /^seed/) { print $CFD "UNIONFS_CONFIG='/dev/ram1,loop,seed'\n"; } elsif ($gzip =~ /^overlay/) { - print $CFD "UNIONFS_CONFIG='/dev/ram1,loop,overlay'\n"; + print $CFD "UNIONFS_CONFIG='tmpfs,loop,overlay'\n"; } else { print $CFD "COMBINED_IMAGE=yes\n"; } @@ -4194,6 +4194,11 @@ } KIWIQX::qxx ("rm -rf $imageTree/boot/*"); } + else { + $kiwi -> warning ("--> Can't find kernel for extraction: " . + "did you call suseStripKernel?"); + $kiwi -> skipped (); + } return $name; } diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kiwi/modules/KIWILinuxRC.sh new/kiwi/modules/KIWILinuxRC.sh --- old/kiwi/modules/KIWILinuxRC.sh 2015-10-19 11:50:56.000000000 +0200 +++ new/kiwi/modules/KIWILinuxRC.sh 2015-12-23 10:50:16.000000000 +0100 @@ -1593,12 +1593,22 @@ #-------------------------------------- if [ -x "$dracutExec" ]; then # 1. dracut - Echo "Creating dracut based initrd" params=" -f /boot/initrd-$kernel_version $kernel_version" - if ! $dracutExec -H $params;then - Echo "Can't create initrd with dracut" - systemIntegrity=unknown - bootLoaderOK=0 + if [[ $kiwi_initrdname =~ vmxboot ]];then + Echo "Creating dracut based initrd (background process)" + # run dracut in the background to speed up the boot. + # We loose the status check of the call and reboot is + # only safe after the call has finished. Therefore this + # is only done for simple vmx type images which are + # mostly used in cloud frameworks + $dracutExec -H $params &>/dev/null </dev/null & + else + Echo "Creating dracut based initrd" + if ! $dracutExec -H $params;then + Echo "Can't create initrd with dracut" + systemIntegrity=unknown + bootLoaderOK=0 + fi fi elif [ -x "$mkinitrdExec" ]; then # 2. mkinitrd @@ -1741,6 +1751,22 @@ "reboot" esac setupBootThemes "/config" + if [ "$haveLuks" = "yes" ]; then + setupCryptTab + fi +} +#====================================== +# setupCryptTab +#-------------------------------------- +function setupCryptTab { + local IFS=$IFS_ORIG + local rootdevice=$(ddn $imageDiskDevice $kiwi_RootPart) + local fsuuid=$(blkid $rootdevice -s UUID -o value) + local prefix=$1 + if [ -z "$prefix" ];then + prefix=/mnt + fi + echo "luks UUID=$fsuuid" > $prefix/etc/crypttab } #====================================== # setupBootThemes @@ -3736,13 +3762,10 @@ #====================================== # update config file #-------------------------------------- - for key in INITRD_MODULES DOMU_INITRD_MODULES;do + for key in INITRD_MODULES;do if [ $key = "INITRD_MODULES" ];then val=$INITRD_MODULES fi - if [ $key = "DOMU_INITRD_MODULES" ];then - val=$DOMURD_MODULES - fi if [ -z "$val" ];then continue fi @@ -6209,18 +6232,22 @@ if [ -z "$file" ];then file=/proc/cmdline fi - for i in $(cat $file);do + local cmdline=$( + awk -F\" '{OFS="\"";for(i=2;i<NF;i+=2)gsub(/ /,"\030",$i);print}' <$file + ) + for i in $cmdline;do if ! echo $i | grep -q "=";then continue fi - kernelKey=`echo $i | cut -f1 -d=` + kernelKey=$(echo $i | cut -f1 -d=) #====================================== # convert parameters to lowercase if required #-------------------------------------- if [ "$translate" = "lowercase" ];then kernelKey=`echo $kernelKey | tr [:upper:] [:lower:]` fi - kernelVal=`echo $i | cut -f2 -d=` + kernelVal=$(echo $i | cut -f2 -d=) + kernelVal=$(echo $kernelVal | sed -e 's/\o30/ /g') eval export $kernelKey=$kernelVal done if [ ! -z "$kiwikernelmodule" ];then @@ -6399,35 +6426,23 @@ if [ "$RELOAD_IMAGE" = "yes" ] || \ ! mount -o ro $rwDevice $rwDir &>/dev/null then - #====================================== - # store old FSTYPE value - #-------------------------------------- - if [ ! -z "$FSTYPE" ];then - FSTYPE_SAVE=$FSTYPE - fi - #====================================== - # probe filesystem - #-------------------------------------- - probeFileSystem $rwDevice - if [ ! "$FSTYPE" = "unknown" ];then - Echo "Checking filesystem for RW data on $rwDevice..." - e2fsck -p $rwDevice - fi - #====================================== - # restore FSTYPE - #-------------------------------------- - if [ ! -z "$FSTYPE_SAVE" ];then - FSTYPE=$FSTYPE_SAVE + local hybrid_fs=$HYBRID_PERSISTENT_FS + if [ ! -z "$kiwi_hybridpersistent_filesystem" ];then + hybrid_fs=$kiwi_hybridpersistent_filesystem fi + Echo "Checking filesystem for RW data on $rwDevice..." + checkFilesystem $rwDevice + if [ "$RELOAD_IMAGE" = "yes" ] || \ ! mount -o ro $rwDevice $rwDir &>/dev/null then Echo "Creating filesystem for RW data on $rwDevice..." - if ! mkfs.ext3 -F $rwDevice >/dev/null;then + local exception_handling="false" + if ! createFilesystem $rwDevice "" "" "hybrid" $exception_handling $hybrid_fs; then Echo "Failed to create ext3 filesystem" return 1 fi - e2fsck -p $rwDevice >/dev/null + checkFilesystem $rwDevice >/dev/null fi else umount $rwDevice @@ -8611,7 +8626,7 @@ # no map name set, build it from device #-------------------------------------- if [ -z "$name" ];then - name=luks_$(basename "$ldev") + name=luks fi #====================================== # luks map already exists, return @@ -9705,6 +9720,35 @@ exec kexec -e } #====================================== +# checkFilesystem +#-------------------------------------- +function checkFilesystem { + local device=$1 + local FSTYPE_SAVE=$FS_TYPE + if [ -z "$FSTYPE" ];then + probeFileSystem $device + fi + if [ "$FSTYPE" = "reiserfs" ];then + reiserfsck -y $device + elif [ "$FSTYPE" = "ext2" ];then + e2fsck -p $device + elif [ "$FSTYPE" = "ext3" ];then + e2fsck -p $device + elif [ "$FSTYPE" = "ext4" ];then + e2fsck -p $device + elif [ "$FSTYPE" = "btrfs" ];then + btrfsck $device + elif [ "$FSTYPE" = "xfs" ];then + xfs_repair -n $device + else + FSTYPE=$FSTYPE_SAVE + # don't know how to check this filesystem + Echo "Don't know how to check ${FSTYPE}... skip it" + return + fi + FSTYPE=$FSTYPE_SAVE +} +#====================================== # resizeFilesystem #-------------------------------------- function resizeFilesystem { @@ -9725,22 +9769,18 @@ fi if [ "$FSTYPE" = "reiserfs" ];then resize_fs="resize_reiserfs -q $deviceResize" - check="reiserfsck -y $deviceResize" elif [ "$FSTYPE" = "ext2" ];then resize_fs="resize2fs -f -F -p $deviceResize" - check="e2fsck -p $deviceResize" if [ $ramdisk -eq 1 ];then resize_fs="resize2fs -f $deviceResize" fi elif [ "$FSTYPE" = "ext3" ];then resize_fs="resize2fs -f -F -p $deviceResize" - check="e2fsck -p $deviceResize" if [ $ramdisk -eq 1 ];then resize_fs="resize2fs -f $deviceResize" fi elif [ "$FSTYPE" = "ext4" ];then resize_fs="resize2fs -f -F -p $deviceResize" - check="e2fsck -p $deviceResize" if [ $ramdisk -eq 1 ];then resize_fs="resize2fs -f $deviceResize" fi @@ -9752,11 +9792,9 @@ else resize_fs="$resize_fs btrfsctl -r max $mpoint;umount $mpoint" fi - check="btrfsck $deviceResize" elif [ "$FSTYPE" = "xfs" ];then resize_fs="mount $deviceResize $mpoint &&" resize_fs="$resize_fs xfs_growfs $mpoint;umount $mpoint" - check="xfs_repair -n $deviceResize" elif [ "$FSTYPE" = "zfs" ];then local device=$(getDiskID $deviceResize) resize_fs="zpool import kiwipool && udevPending &&" @@ -9768,9 +9806,9 @@ return fi if [ -z "$callme" ];then - if [ $ramdisk -eq 0 ] && [ ! -z "$check" ];then + if [ $ramdisk -eq 0 ]; then Echo "Checking $FSTYPE filesystem on ${deviceResize}..." - eval $check + checkFilesystem $check fi Echo "Resizing $FSTYPE filesystem on ${deviceResize}..." eval $resize_fs @@ -9864,6 +9902,10 @@ if [ ! -z "$label" ];then opts="$opts -n $label" fi + elif [ "$filesystem" = "xfs" ];then + if [ ! -z "$label" ];then + opts="$opts -L $label" + fi elif [ "$filesystem" = "ntfs" ];then if [ ! -z "$label" ];then opts="$opts -L $label" @@ -9884,8 +9926,10 @@ dd if=/dev/zero of=$deviceCreate bs=1M count=1 conv=notrunc mkfs.btrfs $opts $deviceCreate elif [ "$filesystem" = "xfs" ];then - mkfs.xfs -f $deviceCreate - xfs_admin -U $uuid $deviceCreate + mkfs.xfs $opts -f $deviceCreate + if [ ! -z "$uuid" ];then + xfs_admin -U $uuid $deviceCreate + fi elif [ "$filesystem" = "fat" ];then mkfs.fat $opts $deviceCreate $blocks 1>&2 elif [ "$filesystem" = "ntfs" ];then @@ -11449,6 +11493,7 @@ if [ ! -z "$kiwi_bootloader" ];then export loader=$kiwi_bootloader fi + export kiwi_initrdname=$kiwi_iname fi #====================================== # Check partitioner capabilities diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kiwi/modules/KIWIRoot.pm new/kiwi/modules/KIWIRoot.pm --- old/kiwi/modules/KIWIRoot.pm 2015-09-21 16:23:18.000000000 +0200 +++ new/kiwi/modules/KIWIRoot.pm 2015-12-11 10:09:28.000000000 +0100 @@ -482,6 +482,9 @@ #---------------------------------- $kiwi -> info ("Creating default template files for new root system"); if (! defined $this->{cacheRoot}) { + my $type = $xml -> getImageType(); + my $boot_description = $type -> getBootImageDescript(); + KIWIQX::qxx ("mkdir -p $root/dev"); KIWIQX::qxx ("chown root:root $root/dev"); KIWIQX::qxx ("mkdir -m 755 -p $root/proc"); @@ -505,9 +508,28 @@ KIWIQX::qxx ("mkdir -p $root/etc/sysconfig"); KIWIQX::qxx ("mkdir -m 755 -p $root/var"); KIWIQX::qxx ("chown root:root $root/var"); - KIWIQX::qxx ("mkdir -m 755 -p $root/run"); - KIWIQX::qxx ("chown root:root $root/run"); - KIWIQX::qxx ("ln -s /run $root/var/run"); + + # this is a bad hack to check which system var/run vs. /run structure + # we need. Unfortunately the suse packages does not handle this + # correctly because it depends on the order of the packages + # if the setup is correct or not. We have no influence on the order + # because we pass the package installation to the package manager + # Thus there is at the moment no other way to pro actively create + # filesystem structures which really should not be kiwi's task + # to this extend + if (($boot_description) && ($boot_description =~ /SLES11|rhel-06/)) { + KIWIQX::qxx ("mkdir -m 755 -p $root/var/run"); + KIWIQX::qxx ("chown root:root $root/var/run"); + KIWIQX::qxx ("mkdir -m 755 -p $root/var/run/dbus"); + KIWIQX::qxx ("chown root:root $root/var/run/dbus"); + } else { + KIWIQX::qxx ("mkdir -m 755 -p $root/run"); + KIWIQX::qxx ("chown root:root $root/run"); + KIWIQX::qxx ("mkdir -m 755 -p $root/run/dbus"); + KIWIQX::qxx ("chown root:root $root/run/dbus"); + KIWIQX::qxx ("ln -s ../run $root/var/run"); + } + # for zypper we need a yast log dir if ($packager eq "zypper") { KIWIQX::qxx ("mkdir -p $root/var/log/YaST2"); @@ -1758,11 +1780,13 @@ $kiwi -> skipped (); } } - if (($prefix) && ($item =~ /^$prefix/)) { + if (($prefix) && ($item =~ /^$prefix/) && ($item =~ /base-system/)) { KIWIQX::qxx ("rmdir -p \"$item\" 2>&1"); + } elsif (($prefix) && ($item =~ /^$prefix/)) { + KIWIQX::qxx ("rmdir \"$item\" 2>&1"); } if ($item =~ /^\/tmp\/kiwimount/) { - KIWIQX::qxx ("rmdir -p \"$item\" 2>&1"); + KIWIQX::qxx ("rmdir \"$item\" 2>&1"); } } diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kiwi/modules/KIWISchema.rnc new/kiwi/modules/KIWISchema.rnc --- old/kiwi/modules/KIWISchema.rnc 2015-11-26 09:08:16.000000000 +0100 +++ new/kiwi/modules/KIWISchema.rnc 2015-12-23 09:12:14.000000000 +0100 @@ -1783,7 +1783,7 @@ ## hybrid ISO is used as disk on e.g a USB Stick. By default ## the btrfs filesystem is used attribute hybridpersistent_filesystem { - "btrfs" | "fat" | "ext4" + "btrfs" | "fat" | "ext4" | "xfs" } k.type.image.attribute = ## Specifies the image type diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kiwi/modules/KIWISchema.rng new/kiwi/modules/KIWISchema.rng --- old/kiwi/modules/KIWISchema.rng 2015-11-26 09:08:25.000000000 +0100 +++ new/kiwi/modules/KIWISchema.rng 2015-12-23 09:12:14.000000000 +0100 @@ -2404,6 +2404,7 @@ <value>btrfs</value> <value>fat</value> <value>ext4</value> + <value>xfs</value> </choice> </attribute> </define> diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kiwi/system/boot/armv7l/.md5 new/kiwi/system/boot/armv7l/.md5 --- old/kiwi/system/boot/armv7l/.md5 2015-09-10 15:20:52.000000000 +0200 +++ new/kiwi/system/boot/armv7l/.md5 2015-11-30 10:11:39.000000000 +0100 @@ -3,7 +3,7 @@ for dir in `find -type d`;do if [ -f $dir/config.xml ];then pushd $dir &>/dev/null - find -L -type f | grep -v .svn | grep -v .checksum.md5 |\ + find -L -type f ! -wholename '*.svn*' ! -name .checksum.md5 | sort |\ xargs md5sum > .checksum.md5 popd &>/dev/null fi diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kiwi/system/boot/armv7l/oemboot/suse-linuxrc new/kiwi/system/boot/armv7l/oemboot/suse-linuxrc --- old/kiwi/system/boot/armv7l/oemboot/suse-linuxrc 2015-10-08 10:34:41.000000000 +0200 +++ new/kiwi/system/boot/armv7l/oemboot/suse-linuxrc 2015-12-11 10:09:28.000000000 +0100 @@ -27,7 +27,6 @@ #====================================== # Exports (Booting) #-------------------------------------- -export DOMURD_MODULES="xennet xenblk" export INITRD_MODULES="" export LOCAL_BOOT=no export systemIntegrity="clean" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kiwi/system/boot/armv7l/vmxboot/suse-linuxrc new/kiwi/system/boot/armv7l/vmxboot/suse-linuxrc --- old/kiwi/system/boot/armv7l/vmxboot/suse-linuxrc 2015-10-08 10:34:55.000000000 +0200 +++ new/kiwi/system/boot/armv7l/vmxboot/suse-linuxrc 2015-12-11 10:09:28.000000000 +0100 @@ -27,7 +27,6 @@ #====================================== # Exports (Booting) #-------------------------------------- -export DOMURD_MODULES="xennet xenblk" export INITRD_MODULES="" export LOCAL_BOOT="no" export systemIntegrity="clean" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kiwi/system/boot/ia64/.md5 new/kiwi/system/boot/ia64/.md5 --- old/kiwi/system/boot/ia64/.md5 2015-09-10 15:20:53.000000000 +0200 +++ new/kiwi/system/boot/ia64/.md5 2015-11-30 10:11:39.000000000 +0100 @@ -3,7 +3,7 @@ for dir in `find -type d`;do if [ -f $dir/config.xml ];then pushd $dir &>/dev/null - find -L -type f | grep -v .svn | grep -v .checksum.md5 |\ + find -L -type f ! -wholename '*.svn*' ! -name .checksum.md5 | sort |\ xargs md5sum > .checksum.md5 popd &>/dev/null fi diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kiwi/system/boot/ix86/.md5 new/kiwi/system/boot/ix86/.md5 --- old/kiwi/system/boot/ix86/.md5 2015-09-10 15:20:53.000000000 +0200 +++ new/kiwi/system/boot/ix86/.md5 2015-11-30 10:11:39.000000000 +0100 @@ -3,7 +3,7 @@ for dir in `find -type d`;do if [ -f $dir/config.xml ];then pushd $dir &>/dev/null - find -L -type f | grep -v .svn | grep -v .checksum.md5 |\ + find -L -type f ! -wholename '*.svn*' ! -name .checksum.md5 | sort |\ xargs md5sum > .checksum.md5 popd &>/dev/null fi diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kiwi/system/boot/ix86/isoboot/rhel-linuxrc new/kiwi/system/boot/ix86/isoboot/rhel-linuxrc --- old/kiwi/system/boot/ix86/isoboot/rhel-linuxrc 2015-09-22 13:06:53.000000000 +0200 +++ new/kiwi/system/boot/ix86/isoboot/rhel-linuxrc 2015-11-30 15:09:37.000000000 +0100 @@ -109,7 +109,10 @@ importFile < $LIVECD_CONFIG if [ ! -z "$HYBRID_RW" ];then if [ ! -z "$UNIONFS_CONFIG" ];then - UNIONFS_CONFIG=$(echo $UNIONFS_CONFIG | sed -e s@/dev/ram1@$HYBRID_RW@) + tmp_rwDevice=$(echo $UNIONFS_CONFIG | cut -d , -f 1) + UNIONFS_CONFIG=$( + echo $UNIONFS_CONFIG | sed -e s@$tmp_rwDevice@$HYBRID_RW@ + ) else IMAGE=$(echo $IMAGE | sed -e s@/dev/ram1@$HYBRID_RW@) fi diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kiwi/system/boot/ix86/isoboot/suse-linuxrc new/kiwi/system/boot/ix86/isoboot/suse-linuxrc --- old/kiwi/system/boot/ix86/isoboot/suse-linuxrc 2015-09-22 13:07:01.000000000 +0200 +++ new/kiwi/system/boot/ix86/isoboot/suse-linuxrc 2015-11-30 14:58:51.000000000 +0100 @@ -109,7 +109,10 @@ importFile < $LIVECD_CONFIG if [ ! -z "$HYBRID_RW" ];then if [ ! -z "$UNIONFS_CONFIG" ];then - UNIONFS_CONFIG=$(echo $UNIONFS_CONFIG | sed -e s@/dev/ram1@$HYBRID_RW@) + tmp_rwDevice=$(echo $UNIONFS_CONFIG | cut -d , -f 1) + UNIONFS_CONFIG=$( + echo $UNIONFS_CONFIG | sed -e s@$tmp_rwDevice@$HYBRID_RW@ + ) else IMAGE=$(echo $IMAGE | sed -e s@/dev/ram1@$HYBRID_RW@) fi diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kiwi/system/boot/ix86/netboot/suse-linuxrc new/kiwi/system/boot/ix86/netboot/suse-linuxrc --- old/kiwi/system/boot/ix86/netboot/suse-linuxrc 2015-09-10 15:20:53.000000000 +0200 +++ new/kiwi/system/boot/ix86/netboot/suse-linuxrc 2015-12-11 10:09:29.000000000 +0100 @@ -28,7 +28,6 @@ #====================================== # Exports (Booting) #-------------------------------------- -export DOMURD_MODULES="xennet xenblk" export INITRD_MODULES="" export LOCAL_BOOT="no" export KERNEL_LIST diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kiwi/system/boot/ix86/oemboot/rhel-linuxrc new/kiwi/system/boot/ix86/oemboot/rhel-linuxrc --- old/kiwi/system/boot/ix86/oemboot/rhel-linuxrc 2015-09-21 16:23:19.000000000 +0200 +++ new/kiwi/system/boot/ix86/oemboot/rhel-linuxrc 2015-12-11 10:09:29.000000000 +0100 @@ -27,7 +27,6 @@ #====================================== # Exports (Booting) #-------------------------------------- -export DOMURD_MODULES="xennet xenblk" export INITRD_MODULES="" export LOCAL_BOOT=no export systemIntegrity="clean" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kiwi/system/boot/ix86/oemboot/suse-linuxrc new/kiwi/system/boot/ix86/oemboot/suse-linuxrc --- old/kiwi/system/boot/ix86/oemboot/suse-linuxrc 2015-10-08 10:30:50.000000000 +0200 +++ new/kiwi/system/boot/ix86/oemboot/suse-linuxrc 2015-12-11 10:09:29.000000000 +0100 @@ -27,7 +27,6 @@ #====================================== # Exports (Booting) #-------------------------------------- -export DOMURD_MODULES="xennet xenblk" export INITRD_MODULES="" export LOCAL_BOOT=no export systemIntegrity="clean" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kiwi/system/boot/ix86/vmxboot/rhel-linuxrc new/kiwi/system/boot/ix86/vmxboot/rhel-linuxrc --- old/kiwi/system/boot/ix86/vmxboot/rhel-linuxrc 2015-09-10 15:20:54.000000000 +0200 +++ new/kiwi/system/boot/ix86/vmxboot/rhel-linuxrc 2015-12-11 10:09:29.000000000 +0100 @@ -27,7 +27,6 @@ #====================================== # Exports (Booting) #-------------------------------------- -export DOMURD_MODULES="xennet xenblk" export INITRD_MODULES="" export LOCAL_BOOT="no" export systemIntegrity="clean" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kiwi/system/boot/ix86/vmxboot/suse-linuxrc new/kiwi/system/boot/ix86/vmxboot/suse-linuxrc --- old/kiwi/system/boot/ix86/vmxboot/suse-linuxrc 2015-10-08 10:31:21.000000000 +0200 +++ new/kiwi/system/boot/ix86/vmxboot/suse-linuxrc 2015-12-11 10:09:29.000000000 +0100 @@ -27,7 +27,6 @@ #====================================== # Exports (Booting) #-------------------------------------- -export DOMURD_MODULES="xennet xenblk" export INITRD_MODULES="" export LOCAL_BOOT="no" export systemIntegrity="clean" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kiwi/system/boot/m68k/.md5 new/kiwi/system/boot/m68k/.md5 --- old/kiwi/system/boot/m68k/.md5 2015-09-10 15:20:54.000000000 +0200 +++ new/kiwi/system/boot/m68k/.md5 2015-11-30 10:11:39.000000000 +0100 @@ -3,7 +3,7 @@ for dir in `find -type d`;do if [ -f $dir/config.xml ];then pushd $dir &>/dev/null - find -L -type f | grep -v .svn | grep -v .checksum.md5 |\ + find -L -type f ! -wholename '*.svn*' ! -name .checksum.md5 | sort |\ xargs md5sum > .checksum.md5 popd &>/dev/null fi diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kiwi/system/boot/ppc/.md5 new/kiwi/system/boot/ppc/.md5 --- old/kiwi/system/boot/ppc/.md5 2015-09-10 15:20:54.000000000 +0200 +++ new/kiwi/system/boot/ppc/.md5 2015-11-30 10:11:39.000000000 +0100 @@ -3,7 +3,7 @@ for dir in `find -type d`;do if [ -f $dir/config.xml ];then pushd $dir &>/dev/null - find -L -type f | grep -v .svn | grep -v .checksum.md5 |\ + find -L -type f ! -wholename '*.svn*' ! -name .checksum.md5 | sort |\ xargs md5sum > .checksum.md5 popd &>/dev/null fi diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kiwi/system/boot/ppc/netboot/suse-linuxrc new/kiwi/system/boot/ppc/netboot/suse-linuxrc --- old/kiwi/system/boot/ppc/netboot/suse-linuxrc 2015-09-10 15:20:54.000000000 +0200 +++ new/kiwi/system/boot/ppc/netboot/suse-linuxrc 2015-12-11 10:09:29.000000000 +0100 @@ -28,7 +28,6 @@ #====================================== # Exports (Booting) #-------------------------------------- -export DOMURD_MODULES="xennet xenblk" export INITRD_MODULES="ipr lpfc ibmvscsic" export LOCAL_BOOT="no" export KERNEL_LIST diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kiwi/system/boot/ppc/oemboot/suse-linuxrc new/kiwi/system/boot/ppc/oemboot/suse-linuxrc --- old/kiwi/system/boot/ppc/oemboot/suse-linuxrc 2015-10-08 10:32:15.000000000 +0200 +++ new/kiwi/system/boot/ppc/oemboot/suse-linuxrc 2015-12-11 10:09:29.000000000 +0100 @@ -27,7 +27,6 @@ #====================================== # Exports (Booting) #-------------------------------------- -export DOMURD_MODULES="xennet xenblk" export INITRD_MODULES="ipr lpfc ibmvscsic" export LOCAL_BOOT=no export systemIntegrity="clean" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kiwi/system/boot/ppc/vmxboot/suse-linuxrc new/kiwi/system/boot/ppc/vmxboot/suse-linuxrc --- old/kiwi/system/boot/ppc/vmxboot/suse-linuxrc 2015-10-08 10:33:09.000000000 +0200 +++ new/kiwi/system/boot/ppc/vmxboot/suse-linuxrc 2015-12-11 10:09:29.000000000 +0100 @@ -27,7 +27,6 @@ #====================================== # Exports (Booting) #-------------------------------------- -export DOMURD_MODULES="xennet xenblk" export INITRD_MODULES="ipr lpfc ibmvscsic" export LOCAL_BOOT="no" export systemIntegrity="clean" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kiwi/system/boot/s390/.md5 new/kiwi/system/boot/s390/.md5 --- old/kiwi/system/boot/s390/.md5 2015-09-10 15:20:54.000000000 +0200 +++ new/kiwi/system/boot/s390/.md5 2015-11-30 10:11:39.000000000 +0100 @@ -3,7 +3,7 @@ for dir in `find -type d`;do if [ -f $dir/config.xml ];then pushd $dir &>/dev/null - find -L -type f | grep -v .svn | grep -v .checksum.md5 |\ + find -L -type f ! -wholename '*.svn*' ! -name .checksum.md5 | sort |\ xargs md5sum > .checksum.md5 popd &>/dev/null fi diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kiwi/system/boot/s390/oemboot/suse-linuxrc new/kiwi/system/boot/s390/oemboot/suse-linuxrc --- old/kiwi/system/boot/s390/oemboot/suse-linuxrc 2015-10-08 10:34:10.000000000 +0200 +++ new/kiwi/system/boot/s390/oemboot/suse-linuxrc 2015-12-11 10:09:29.000000000 +0100 @@ -27,7 +27,6 @@ #====================================== # Exports (Booting) #-------------------------------------- -export DOMURD_MODULES="xennet xenblk" export INITRD_MODULES="" export LOCAL_BOOT=no export systemIntegrity="clean" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kiwi/system/boot/s390/vmxboot/suse-linuxrc new/kiwi/system/boot/s390/vmxboot/suse-linuxrc --- old/kiwi/system/boot/s390/vmxboot/suse-linuxrc 2015-10-08 10:34:23.000000000 +0200 +++ new/kiwi/system/boot/s390/vmxboot/suse-linuxrc 2015-12-11 10:09:29.000000000 +0100 @@ -27,7 +27,6 @@ #====================================== # Exports (Booting) #-------------------------------------- -export DOMURD_MODULES="xennet xenblk" export INITRD_MODULES="" export LOCAL_BOOT="no" export systemIntegrity="clean" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kiwi/template/ix86/suse-13.2-JeOS/config.xml new/kiwi/template/ix86/suse-13.2-JeOS/config.xml --- old/kiwi/template/ix86/suse-13.2-JeOS/config.xml 2015-10-13 11:42:26.000000000 +0200 +++ new/kiwi/template/ix86/suse-13.2-JeOS/config.xml 2015-12-21 16:12:56.000000000 +0100 @@ -86,6 +86,7 @@ <package name="iputils"/> <package name="vim"/> <package name="grub2"/> + <package name="grub2-x86_64-efi"/> <package name="syslinux"/> <package name="lvm2"/> <package name="plymouth"/> diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kiwi/template/ix86/suse-SLE12-community-JeOS/config.xml new/kiwi/template/ix86/suse-SLE12-community-JeOS/config.xml --- old/kiwi/template/ix86/suse-SLE12-community-JeOS/config.xml 2015-10-19 12:44:32.000000000 +0200 +++ new/kiwi/template/ix86/suse-SLE12-community-JeOS/config.xml 2015-12-21 16:13:10.000000000 +0100 @@ -113,6 +113,7 @@ <package name="iputils"/> <package name="vim"/> <package name="grub2"/> + <package name="grub2-x86_64-efi"/> <package name="syslinux"/> <package name="lvm2"/> <package name="plymouth"/> @@ -186,7 +187,4 @@ --> <package name="sles-release"/> </packages> - <packages type="delete"> - <package name="kernel-debug"/> - </packages> </image>

1 0

commit libsolv for openSUSE:Factory
by root＠hilbert.suse.de 05 Jan '16

05 Jan '16

Hello community, here is the log from the commit of package libsolv for openSUSE:Factory checked in at 2016-01-05 09:39:41 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/libsolv (Old) and /work/SRC/openSUSE:Factory/.libsolv.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "libsolv" Changes: -------- --- /work/SRC/openSUSE:Factory/libsolv/libsolv.changes 2015-10-19 22:15:10.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.libsolv.new/libsolv.changes 2016-01-05 09:40:31.000000000 +0100 @@ -1,0 +2,23 @@ +Tue Dec 22 11:49:02 CET 2015 - mls(a)suse.de + +- fix update handling of multiversion packages [bnc#957606] +- bump version to 0.6.17 + +------------------------------------------------------------------- +Mon Dec 21 12:59:19 CET 2015 - mls(a)suse.de + +- fix orphan handling for dup with keeporphans set [bnc#957606] +- bump version to 0.6.16 + +------------------------------------------------------------------- +Mon Dec 14 15:48:01 CET 2015 - mls(a)suse.de + +- change product links to also look at timestamps [bnc#956443] +- rework multiversion orphaned handling [bnc#957606] +- support key type changes in repodata_internalize() +- allow serialization of REPOKEY_TYPE_DELETED +- improve appdata handling of installed packages +- improve performance when run under xen +- bump version to 0.6.15 + +------------------------------------------------------------------- Old: ---- libsolv-0.6.14.tar.bz2 New: ---- libsolv-0.6.17.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ libsolv.spec ++++++ --- /var/tmp/diff_new_pack.1o4cYV/_old 2016-01-05 09:40:34.000000000 +0100 +++ /var/tmp/diff_new_pack.1o4cYV/_new 2016-01-05 09:40:34.000000000 +0100 @@ -17,7 +17,7 @@ Name: libsolv -Version: 0.6.14 +Version: 0.6.17 Release: 0 Url: https://github.com/openSUSE/libsolv Source: libsolv-%{version}.tar.bz2 ++++++ libsolv-0.6.14.tar.bz2 -> libsolv-0.6.17.tar.bz2 ++++++ ++++ 3321 lines of diff (skipped)

1 0

commit google-noto-fonts for openSUSE:Factory
by root＠hilbert.suse.de 05 Jan '16

05 Jan '16

Hello community, here is the log from the commit of package google-noto-fonts for openSUSE:Factory checked in at 2016-01-05 09:39:35 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/google-noto-fonts (Old) and /work/SRC/openSUSE:Factory/.google-noto-fonts.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "google-noto-fonts" Changes: -------- --- /work/SRC/openSUSE:Factory/google-noto-fonts/google-noto-fonts.changes 2015-12-16 17:41:23.000000000 +0100 +++ /work/SRC/openSUSE:Factory/.google-noto-fonts.new/google-noto-fonts.changes 2016-01-05 09:40:10.000000000 +0100 @@ -1,0 +2,17 @@ +Tue Dec 22 14:13:56 UTC 2015 - fcrozat(a)suse.com + +- Update to version 20151215: + * Color Emoji are now available in a subpackage. + * Update TaiTham to v1.03 + * Update Coptic to v1.03 + * Update Tifinagh to v1.05 + * Update Thaana to v1.02 + * Update Arimo and Tinos to v1.32 + * Update Khmer to v1.03 + * Update Javanese to v1.05 + * Update Lepcha to v1.03 + * Update Lao to v1.02 + * Update KufiArabic to v1.04 +- Update source url. + +------------------------------------------------------------------- ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ google-noto-fonts.spec ++++++ --- /var/tmp/diff_new_pack.TkR0AJ/_old 2016-01-05 09:40:26.000000000 +0100 +++ /var/tmp/diff_new_pack.TkR0AJ/_new 2016-01-05 09:40:26.000000000 +0100 @@ -17,8 +17,8 @@ %define hyear 2015 -%define hmonth 10 -%define hday 02 +%define hmonth 12 +%define hday 15 %define src_name NotoFonts # DO NOT EDIT THIS SPECFILE DIRECTLY, edit google-noto-fonts.spec.in and run generate-specfile.sh scriptZZ @@ -30,7 +30,7 @@ License: OFL-1.1 Group: System/X11/Fonts Url: https://github.com/googlei18n/noto-fonts -Source0: http://www.google.com/get/noto/pkgs/Noto-hinted.zip +Source0: https://noto-website-2.storage.googleapis.com/pkgs/Noto-hinted.zip Source2: generate-specfile.sh BuildRequires: fontpackages-devel BuildRequires: unzip @@ -49,6 +49,18 @@ %description doc License for Google's Noto fonts. +%package -n noto-coloremoji-fonts +Summary: Noto Font +Group: System/X11/Fonts +Requires: google-noto-fonts-doc +Obsoletes: noto-coloremoji +Provides: noto-coloremoji + +%description -n noto-coloremoji-fonts +Noto's design goal is to achieve visual harmonization (e.g., compatible +heights and stroke thicknesses) across languages. This package contains + font, hinted. + %package -n noto-emoji-fonts Summary: Noto Font Group: System/X11/Fonts @@ -1322,6 +1334,8 @@ cp *.ttf %{buildroot}%{_ttfontsdir}/ cp *.otf %{buildroot}%{_ttfontsdir}/ +%reconfigure_fonts_scriptlets -n noto-coloremoji-fonts + %reconfigure_fonts_scriptlets -n noto-emoji-fonts %reconfigure_fonts_scriptlets -n noto-kufiarabic-fonts @@ -1536,6 +1550,11 @@ %defattr(0644,root,root,755) %doc LICENSE*.txt +%files -n noto-coloremoji-fonts +%defattr(-,root,root) +%dir %{_ttfontsdir} +%{_ttfontsdir}/NotoColorEmoji*.?tf + %files -n noto-emoji-fonts %defattr(-,root,root) %dir %{_ttfontsdir} ++++++ Noto-hinted.zip ++++++ Files /var/tmp/diff_new_pack.TkR0AJ/_old and /var/tmp/diff_new_pack.TkR0AJ/_new differ ++++++ generate-specfile.sh ++++++ --- /var/tmp/diff_new_pack.TkR0AJ/_old 2016-01-05 09:40:30.000000000 +0100 +++ /var/tmp/diff_new_pack.TkR0AJ/_new 2016-01-05 09:40:30.000000000 +0100 @@ -49,7 +49,11 @@ sed -i "s/@SUBPACKAGE_FILELISTS@/%files -n $packagename\n@SUBPACKAGE_FILELISTS@/" $pkg_name.spec sed -i "s/@SUBPACKAGE_FILELISTS@/%defattr(-,root,root)\n@SUBPACKAGE_FILELISTS@/" $pkg_name.spec sed -i "s/@SUBPACKAGE_FILELISTS@/%dir %{_ttfontsdir}\n@SUBPACKAGE_FILELISTS@/" $pkg_name.spec - sed -i "s:@SUBPACKAGE_FILELISTS@:%{_ttfontsdir}/Noto$serif$script$ui-\*.?tf\n@SUBPACKAGE_FILELISTS@:" $pkg_name.spec + if [ $serif != "ColorEmoji" ]; then + sed -i "s:@SUBPACKAGE_FILELISTS@:%{_ttfontsdir}/Noto$serif$script$ui-\*.?tf\n@SUBPACKAGE_FILELISTS@:" $pkg_name.spec + else + sed -i "s:@SUBPACKAGE_FILELISTS@:%{_ttfontsdir}/Noto$serif$script$ui\*.?tf\n@SUBPACKAGE_FILELISTS@:" $pkg_name.spec + fi sed -i "s/@SUBPACKAGE_FILELISTS@/\n@SUBPACKAGE_FILELISTS@/" $pkg_name.spec done done ++++++ google-noto-fonts.spec.in ++++++ --- /var/tmp/diff_new_pack.TkR0AJ/_old 2016-01-05 09:40:30.000000000 +0100 +++ /var/tmp/diff_new_pack.TkR0AJ/_new 2016-01-05 09:40:30.000000000 +0100 @@ -16,8 +16,8 @@ # %define hyear 2015 -%define hmonth 10 -%define hday 02 +%define hmonth 12 +%define hday 15 %define src_name NotoFonts # DO NOT EDIT THIS SPECFILE DIRECTLY, edit google-noto-fonts.spec.in and run generate-specfile.sh scriptZZ @@ -29,7 +29,7 @@ License: OFL-1.1 Group: System/X11/Fonts Url: https://github.com/googlei18n/noto-fonts -Source0: http://www.google.com/get/noto/pkgs/Noto-hinted.zip +Source0: https://noto-website-2.storage.googleapis.com/pkgs/Noto-hinted.zip Source2: generate-specfile.sh BuildRequires: fontpackages-devel BuildRequires: unzip

1 0