Hello community, here is the log from the commit of package kiwi for openSUSE:Factory checked in at 2017-11-08 15:10:06 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/kiwi (Old) and /work/SRC/openSUSE:Factory/.kiwi.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "kiwi" Wed Nov 8 15:10:06 2017 rev:659 rq:538082 version:7.04.38 Changes: -------- --- /work/SRC/openSUSE:Factory/kiwi/kiwi.changes 2017-06-02 10:31:15.241524417 +0200 +++ /work/SRC/openSUSE:Factory/.kiwi.new/kiwi.changes 2017-11-08 15:10:21.173567813 +0100 @@ -1,0 +2,213 @@ +Fri Oct 13 09:09:12 CEST 2017 - [email protected] + +- v7.04.38 released + +------------------------------------------------------------------- +Thu Oct 12 13:25:41 CEST 2017 - [email protected] + +- Keep NVMe drivers in the initrd to support systems with the root filesystem + on NVMe devices + +------------------------------------------------------------------- +Wed Oct 4 14:08:48 CEST 2017 - [email protected] + +- Perl 5.26 compatibility: find .kiwirc explicitly in ./ + + Since Perl 5.26, "." is no longer part of @INC thus adding it explicitly + to the .kiwirc path. + +------------------------------------------------------------------- +Wed Oct 4 13:12:03 CEST 2017 - [email protected] + +- v7.04.37 released + +------------------------------------------------------------------- +Wed Oct 4 13:10:09 CEST 2017 - [email protected] + +- Fixup kiwi-tools requirement + + Follow up fix due to the conditional creation of the kiwi-tools + sub package also the requires for the package on the base + package must be conditional. Related to (bsc#1047291) + +------------------------------------------------------------------- +Wed Sep 27 16:11:03 CEST 2017 - [email protected] + +- v7.04.36 released + +------------------------------------------------------------------- +Wed Sep 27 11:30:59 CEST 2017 - [email protected] + +- Fix Travis config file + + This commit forces Travis to make use of Ubuntu Precise as the + build env, since by default it has been upgraded to Trusty and + some tests were failing due to this change. + +------------------------------------------------------------------- +Tue Sep 26 15:53:06 CEST 2017 - [email protected] + +- Fix vmdk disk convertion when using LVM + + This patch fixes bsc#1059715. Calling 'pvs --noheadings -o vg_name <device>' + is not sufficient to get the volume name and to determine if LVM is being + used, as it could happen that udev events are not yet processed, thus the + <device> is not yet properly mapped. With this patch blkid is being used to + determine if the type of the requested partition is LVM and if so it proceeds + to a polling strategy to call pvs tool until it succeeds. Timeout is set to + 30 seconds. + +------------------------------------------------------------------- +Tue Aug 29 17:15:51 CEST 2017 - [email protected] + +- Return 'string' instead of an object + + Commit e75ae3af3588a90db0b6d544fa2f8a7eb866e5e9 changed the returned value + of setupBTRFSSubVolumes to an object resulting in an error to create + the image on btrfs. + +------------------------------------------------------------------- +Tue Jul 18 15:16:04 CEST 2017 - [email protected] + +- v7.04.35 released + +------------------------------------------------------------------- +Tue Jul 18 15:05:19 CEST 2017 - [email protected] + +- Fixed grub bootloader setup for ec2 firmware + + In ec2 Xen is used but not detected as such by kiwi unless + a domain configuration is provided in the image description. + As this is a regression to the former behavior this patch + makes sure the bootloader setup is appropriate depending + on the firmware set to ec2|ec2hvm (bsc#1049178) + +------------------------------------------------------------------- +Mon Jul 17 17:28:58 CEST 2017 - [email protected] + +- Do not include any suffix to the displayname value bsc#1029904 + + If displayname attribute in the description file is used we should + not include any kind of suffix to that value. With this patch + the grub2 menu entry does not include the image type suffix if the + displayname option is used. + + Fixes bsc#1029904 + +------------------------------------------------------------------- +Fri Jul 14 09:39:35 CEST 2017 - [email protected] + +- Follow up spec file fix for kiwi-pxeboot build + + Build failed due to installed but unpackaged tftpboot files + This commit completes the conditional building of the sub + package kiwi-pxeboot. Related to (bsc#1047291) + +------------------------------------------------------------------- +Thu Jul 13 15:30:14 CEST 2017 - [email protected] + +- Limit creation of kiwi-pxeboot sub package + + Create kiwi-pxeboot package only for openSUSE <= 13.2 + and SLE <= SLE12SP2. In any other case the kiwi-pxeboot + package will be provided by the next generation + python-kiwi packages. Related to (bsc#1047291) + +------------------------------------------------------------------- +Tue Jul 11 20:38:48 CEST 2017 - [email protected] + +- Translated using Weblate (Norwegian Nynorsk) + + Currently translated at 3.5% (1 of 28 strings) + +------------------------------------------------------------------- +Tue Jul 11 15:05:47 CEST 2017 - [email protected] + +- v7.04.34 released + +------------------------------------------------------------------- +Tue Jul 11 11:44:07 CEST 2017 - [email protected] + +- Limit creation of kiwi-tools sub package + + Create kiwi-tools package only for openSUSE <= 13.2 + and SLE <= SLE12SP2. In any other case the kiwi-tools + package will be provided by the next generation + python-kiwi packages. Fixes (bsc#1047291) + +------------------------------------------------------------------- +Tue Jun 13 15:05:14 CEST 2017 - [email protected] + +- Translated using Weblate (Spanish) + + Currently translated at 100.0% (28 of 28 strings) + +------------------------------------------------------------------- +Thu Jun 8 18:44:38 CEST 2017 - [email protected] + +- Translated using Weblate (Danish) + + Currently translated at 100.0% (28 of 28 strings) + +------------------------------------------------------------------- +Thu Jun 8 18:43:51 CEST 2017 - [email protected] + +- Translated using Weblate (Danish) + + Currently translated at 100.0% (28 of 28 strings) + +------------------------------------------------------------------- +Sat Jun 3 19:25:50 CEST 2017 - [email protected] + +- Translated using Weblate (Lithuanian) + + Currently translated at 100.0% (28 of 28 strings) + +- Translated using Weblate (Lithuanian) + + Currently translated at 96.4% (27 of 28 strings) + +------------------------------------------------------------------- +Thu Jun 1 09:36:31 CEST 2017 - [email protected] + +- Fix baseSystemdCall method, fixes bsc#1041815 + + This commit fixes the parameters passed to the systemd calls, with + the patch `baseService nfs-server off` can be executed without issues. + +------------------------------------------------------------------- +Mon May 29 22:40:06 CEST 2017 - [email protected] + +- Update README + + Link style fixes + +------------------------------------------------------------------- +Mon May 29 22:37:30 CEST 2017 - [email protected] + +- Update README + + reference next generation code base and docs + +------------------------------------------------------------------- +Mon May 29 22:03:53 CEST 2017 - [email protected] + +- v7.04.33 released + +------------------------------------------------------------------- ++++ 16 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.DY5Kn6/_old 2017-11-08 15:10:22.673513053 +0100 +++ /var/tmp/diff_new_pack.DY5Kn6/_new 2017-11-08 15:10:22.677512907 +0100 @@ -22,12 +22,21 @@ %define perl_version %(eval "`%{__perl} -V:version`"; echo $version) %endif +# in TW and SLE12SP2 python-kiwi provides the kiwi-tools package +%if 0%{?suse_version} > 1320 || 0%{?sle_version} >= 120200 +%bcond_with kiwitools +%bcond_with kiwipxeboot +%else +%bcond_without kiwitools +%bcond_without kiwipxeboot +%endif + Summary: KIWI - Appliance Builder Url: http://github.com/openSUSE/kiwi Name: kiwi License: GPL-2.0 Group: System/Management -Version: 7.04.32 +Version: 7.04.38 Provides: kiwi-schema = 6.2 Provides: kiwi-image:aci Provides: kiwi-image:lxc @@ -76,7 +85,9 @@ Requires: perl >= %{perl_version} Requires: checkmedia Requires: coreutils +%if %{with kiwitools} Requires: kiwi-tools >= %{version} +%endif Requires: libxslt Requires: perl-Class-Singleton Requires: perl-Config-IniFiles >= 2.49 @@ -275,6 +286,7 @@ Thomas Schraitle <[email protected]> Marcus Schaefer <[email protected]> +%if %{with kiwitools} %package -n kiwi-tools Summary: KIWI - Collection of Boot Helper Tools License: GPL-2.0+ @@ -289,9 +301,10 @@ Authors: -------- Marcus Schaefer <[email protected]> +%endif %ifarch %ix86 x86_64 - +%if %{with kiwipxeboot} %package -n kiwi-pxeboot Summary: KIWI - PXE boot structure PreReq: coreutils @@ -318,6 +331,7 @@ -------- Marcus Schaefer <[email protected]> %endif +%endif %ifarch %ix86 x86_64 @@ -688,6 +702,7 @@ install touch kiwi.loader +%if %{with kiwipxeboot} %ifarch %ix86 x86_64 install -m 644 pxeboot/pxelinux.0.config \ $RPM_BUILD_ROOT/srv/tftpboot/pxelinux.cfg/default.default @@ -696,6 +711,10 @@ rm -rf $RPM_BUILD_ROOT/srv/tftpboot rm -rf $RPM_BUILD_ROOT/etc/permissions.d/kiwi %endif +%else + rm -rf $RPM_BUILD_ROOT/srv/tftpboot + rm -rf $RPM_BUILD_ROOT/etc/permissions.d/kiwi +%endif mkdir -p $RPM_BUILD_ROOT/var/cache/kiwi mkdir -p $RPM_BUILD_ROOT/var/cache/kiwi/packages @@ -735,7 +754,14 @@ to track the dependencies. EOF +%if !%{with kiwitools} +shopt -s extglob +rm -f %{buildroot}%{_defaultdocdir}/kiwi/README.tools +rm -f %{buildroot}%{_bindir}/!(livestick) +%endif + %ifarch %ix86 x86_64 +%if %{with kiwipxeboot} %pre -n kiwi-pxeboot #============================================================ # create user and group tftp if they does not exist @@ -755,6 +781,7 @@ /srv/tftpboot/pxelinux.cfg/default fi %endif +%endif %ifarch %ix86 x86_64 ppc ppc64 ppc64le s390 s390x %arm aarch64 @@ -855,7 +882,7 @@ # KIWI-pxeboot files... # ------------------------------------------------ %ifarch %ix86 x86_64 - +%if %{with kiwipxeboot} %files -n kiwi-pxeboot -f kiwi.loader %defattr(-, root, root) %dir %attr(0750,tftp,tftp) /srv/tftpboot @@ -867,16 +894,19 @@ %dir /srv/tftpboot/boot /srv/tftpboot/pxelinux.cfg/default.default %endif +%endif #================================================= # KIWI-tools files... # ------------------------------------------------ +%if %{with kiwitools} %files -n kiwi-tools %defattr(-, root, root) %dir %{_defaultdocdir}/kiwi %doc %{_defaultdocdir}/kiwi/README.tools %exclude /usr/bin/livestick /usr/bin/* +%endif #================================================= # KIWI-desc-* and templates... # ------------------------------------------------ ++++++ kiwi-docu.tar.bz2 ++++++ ++++++ kiwi-repo.tar.bz2 ++++++ ++++++ kiwi.tar.bz2 ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kiwi/.revision new/kiwi/.revision --- old/kiwi/.revision 2016-04-18 16:58:06.610211984 +0200 +++ new/kiwi/.revision 2016-04-18 16:58:06.610211984 +0200 @@ -1 +1 @@ -86b0aae05c1971c0f7655f12a45e6df83b7494a6 +379e18e5e328699eec7e3f677a81101cf350f7ac diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kiwi/.travis.yml new/kiwi/.travis.yml --- old/kiwi/.travis.yml 2016-04-18 16:58:06.462211742 +0200 +++ new/kiwi/.travis.yml 2017-09-27 16:10:50.313580663 +0200 @@ -19,3 +19,4 @@ - cpanm -f -n $(cat .perlmodules | tr "\n" " ") script: make test +dist: precise diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kiwi/README.rst new/kiwi/README.rst --- old/kiwi/README.rst 2016-04-21 16:56:52.099021987 +0200 +++ new/kiwi/README.rst 2017-05-31 10:24:12.096475077 +0200 @@ -1,8 +1,6 @@ KIWI ==== -.. |Doc| replace:: `Documentation <https://suse.github.io/kiwi>`__ - .. topic:: Abstract KIWI, the OS image and appliance builder. @@ -10,13 +8,5 @@ This version of kiwi is in maintenance mode. Further development takes place in the following project: -* https://github.com/SUSE/kiwi - -Installation ------------- - -Packages for kiwi are provided at the openSUSE buildservice: - -* http://download.opensuse.org/repositories/Virtualization:/Appliances/ - -* |Doc| +* `KIWI next generation <https://github.com/SUSE/kiwi>`__ +* `Documentation <https://suse.github.io/kiwi>`__ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kiwi/locale/da/LC_MESSAGES/kiwi.po new/kiwi/locale/da/LC_MESSAGES/kiwi.po --- old/kiwi/locale/da/LC_MESSAGES/kiwi.po 2016-04-18 16:58:06.610211984 +0200 +++ new/kiwi/locale/da/LC_MESSAGES/kiwi.po 2017-07-11 11:33:31.092017155 +0200 @@ -4,15 +4,15 @@ "Project-Id-Version: @PACKAGE@\n" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2005-07-27 16:23+0200\n" -"PO-Revision-Date: 2010-12-31 11:35+0100\n" -"Last-Translator: Martin Schlander <[email protected]>\n" -"Language-Team: Danish <[email protected]>\n" +"PO-Revision-Date: 2017-06-08 18:44+0000\n" +"Last-Translator: scootergrisen <[email protected]>\n" +"Language-Team: Danish <https://l10n.opensuse.org/projects/kiwi/master/da/>\n" "Language: da\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Generator: Lokalize 1.0\n" -"Plural-Forms: nplurals=2; plural=(n != 1);\n" +"Plural-Forms: nplurals=2; plural=n != 1;\n" +"X-Generator: Weblate 2.6\n" #. /.../ #. Copyright (c) 2005 SuSE GmbH Nuernberg, Germany. All rights reserved. @@ -20,7 +20,7 @@ #. boot code for KIWI #. msgid "Boot continues in 10 sec" -msgstr "" +msgstr "Opstart fortsætter om 10 sekunder" msgid "Enter LUKS passphrase" msgstr "Angiv LUKS-adgangsfrase" @@ -76,12 +76,15 @@ msgstr "Afslut" msgid "Bootloader installation has failed" -msgstr "" +msgstr "Bootloader installation er mislykkedes" 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 vil ikke være i stand til at genstarte. Sørg venligst for at rette " +"op på og installere bootloaderen inden næste genstart. Tjek /var/log/" +"boot.kiwi for detaljer" msgid "Please remove the CD/DVD before reboot" msgstr "Fjern venligst cd/dvd før genstart" @@ -105,8 +108,7 @@ msgstr "Vælg %1 partition til installation:" msgid "System will be shutdown. Remove USB stick before power on" -msgstr "" +msgstr "Systemet vil blive lukket ned. Fjern USB-pen inden computeren startes" -#, fuzzy msgid "Please remove the CD/DVD before shutdown" -msgstr "Fjern venligst cd/dvd før genstart" +msgstr "Fjern venligst cd'en/dvd'en inden der lukkes ned" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kiwi/locale/es/LC_MESSAGES/kiwi.po new/kiwi/locale/es/LC_MESSAGES/kiwi.po --- old/kiwi/locale/es/LC_MESSAGES/kiwi.po 2016-04-18 16:58:06.610211984 +0200 +++ new/kiwi/locale/es/LC_MESSAGES/kiwi.po 2017-07-11 11:33:31.092017155 +0200 @@ -13,15 +13,15 @@ "Project-Id-Version: kiwi\n" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: \n" -"PO-Revision-Date: 2016-03-01 14:39+0200\n" -"Last-Translator: Alberto Planas Dominguez <[email protected]>\n" -"Language-Team: Spanish <http://l10n.opensuse.org/projects/kiwi/master/es/>\n" +"PO-Revision-Date: 2017-06-13 15:05+0000\n" +"Last-Translator: Javier Llorente <[email protected]>\n" +"Language-Team: Spanish <https://l10n.opensuse.org/projects/kiwi/master/es/>\n" "Language: es\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" "Plural-Forms: nplurals=2; plural=n != 1;\n" -"X-Generator: Weblate 2.3\n" +"X-Generator: Weblate 2.6\n" #. /.../ #. Copyright (c) 2005 SuSE GmbH Nuernberg, Germany. All rights reserved. @@ -80,21 +80,21 @@ msgstr "Salir" msgid "Bootloader installation has failed" -msgstr "Falló la instalación del gestor de arranque" +msgstr "La instalación del cargador de arranque ha fallado" 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 "" -"El sistema no podrá reiniciarse. Asegúrese de reparar e instalar el gestor " -"de arranque antes de reiniciar el equipo. Para obtener detalles, revise " -"/var/log/boot.kiwi" +"El sistema no podrá reiniciarse. Asegúrese de reparar e instalar el cargador " +"de arranque antes de reiniciar el equipo. Para obtener más información, " +"revise /var/log/boot.kiwi" msgid "Please remove the CD/DVD before reboot" msgstr "Extraiga el CD/DVD de instalación antes de reiniciar" msgid "Please unplug the USB stick before reboot" -msgstr "Retire el soporte USB de instalación antes de reiniciar" +msgstr "Retire el pincho USB de instalación antes de reiniciar" msgid "Installation..." msgstr "Instalación..." @@ -113,7 +113,7 @@ msgstr "Seleccionar la partición %1 para la instalación:" msgid "System will be shutdown. Remove USB stick before power on" -msgstr "El sistema se apagará. Retire el soporte USB antes de encenderlo" +msgstr "El sistema se apagará. Retire el pincho USB antes de encenderlo" msgid "Please remove the CD/DVD before shutdown" msgstr "Extraiga el CD/DVD de instalación antes de apagar" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kiwi/locale/lt/LC_MESSAGES/kiwi.po new/kiwi/locale/lt/LC_MESSAGES/kiwi.po --- old/kiwi/locale/lt/LC_MESSAGES/kiwi.po 2016-04-18 16:58:06.610211984 +0200 +++ new/kiwi/locale/lt/LC_MESSAGES/kiwi.po 2017-07-11 11:33:31.092017155 +0200 @@ -10,16 +10,17 @@ "Project-Id-Version: kiwi.lt\n" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2006-05-15 15:07+0200\n" -"PO-Revision-Date: 2012-04-07 14:44+0300\n" +"PO-Revision-Date: 2017-06-24 19:06+0000\n" "Last-Translator: Mindaugas Baranauskas <[email protected]>\n" -"Language-Team: Lithuanian <[email protected]>\n" +"Language-Team: Lithuanian " +"<https://l10n.opensuse.org/projects/kiwi/master/lt/>\n" "Language: lt\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"Plural-Forms: nplurals=4; plural=(n%10==1 ? 0 : n%10==1 && n%100!=11 ? 1 : n" -"%10>=2 && (n%100<10 || n%100>=20) ? 2 : 3);\n" -"X-Generator: Lokalize 1.4\n" +"Plural-Forms: nplurals=4; plural=(n==1 ? 0 : n%10>=2 && (n%100<10 || " +"n%100>=20) ? 1 : n%10==0 || (n%100>10 && n%100<20) ? 2 : 3);\n" +"X-Generator: Weblate 2.13.1\n" #. /.../ #. Copyright (c) 2005 SuSE GmbH Nuernberg, Germany. All rights reserved. @@ -27,7 +28,7 @@ #. boot code for KIWI #. msgid "Boot continues in 10 sec" -msgstr "" +msgstr "Pasileis po 10 sek." msgid "Enter LUKS passphrase" msgstr "Įveskite LUKS slaptąją frazę" @@ -80,12 +81,15 @@ msgstr "Išeiti" msgid "Bootloader installation has failed" -msgstr "" +msgstr "Nepavyko įdiegti paleidyklės" 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 "" +"Sistemos nepavyks iš naujo paleisti. Prieš paleisdami iš naujo, būtinai " +"įdiekite paleidyklę ir sutvarkykite ją. Daugiau informacijos " +"/var/log/boot.kiwi" # msgid "Please remove the CD/DVD before reboot" @@ -113,9 +117,8 @@ msgstr "Pasirinkite %1 skaidinį diegimui:" msgid "System will be shutdown. Remove USB stick before power on" -msgstr "" +msgstr "Sistema išsijungs. Prieš įjungdami, ištraukite atmintuką" # -#, fuzzy msgid "Please remove the CD/DVD before shutdown" -msgstr "Prieš perkraudami pašalinkite CD/DVD" +msgstr "Prieš išjungdami pašalinkite CD/DVD" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kiwi/locale/nn/LC_MESSAGES/kiwi.po new/kiwi/locale/nn/LC_MESSAGES/kiwi.po --- old/kiwi/locale/nn/LC_MESSAGES/kiwi.po 2016-04-18 16:58:06.610211984 +0200 +++ new/kiwi/locale/nn/LC_MESSAGES/kiwi.po 2017-07-13 09:45:39.983893865 +0200 @@ -1,22 +1,20 @@ # @TITLE@ # Copyright (C) 2011, SUSE Linux GmbH, Nuremberg # This file is distributed under the same license as @PACKAGE@ package. FIRST -# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR. -# -# +# Karl Ove Hufthammer <[email protected]>, 2017. msgid "" msgstr "" "Project-Id-Version: @PACKAGE@\n" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2005-07-27 16:23+0200\n" -"PO-Revision-Date: 2005-08-11 20:37+0200\n" -"Last-Translator: nynorsk <[email protected]>\n" -"Language-Team: nn <[email protected]>\n" -"Language: \n" +"PO-Revision-Date: 2017-07-11 21:53+0100\n" +"Last-Translator: Karl Ove Hufthammer <[email protected]>\n" +"Language-Team: NorwegianNynorsk <[email protected]>\n" +"Language: nn\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"Plural-Forms: nplurals=2; plural=(n != 1);\n" +"Plural-Forms: nplurals=2; plural=n != 1;\n" "X-Generator: Lokalize 2.0\n" #. /.../ @@ -90,7 +88,7 @@ msgstr "" msgid "Installation..." -msgstr "" +msgstr "Installering …" msgid "Loading %1" msgstr "" 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 2017-05-08 13:45:46.297275585 +0200 +++ new/kiwi/modules/KIWIBoot.pm 2017-07-18 15:16:25.751772498 +0200 @@ -4296,11 +4296,14 @@ my $failsafe = 1; my $cmdline; my $title; + my $label_is_displayname = 0; #========================================== # set empty label if not defined #------------------------------------------ if (! $label) { $label = ""; + } elsif ($label eq $xml -> getImageDisplayName()) { + $label_is_displayname = 1; } #========================================== # Failsafe boot options @@ -4313,7 +4316,7 @@ 'powersaved=off', 'nohz=off', 'highres=off', - 'processsor.max+cstate=1', + 'processor.max+cstate=1', 'nomodeset', 'x11failsafe' ); @@ -4583,8 +4586,10 @@ # # If you encounter that we need a prefix setup for Xen HVM images # it has to be addressed here - if ((! $isxen) || ($isxen && $xendomain eq "dom0")) { - print $FD 'set prefix=($root)'.$bootpath.'/grub2'."\n"; + if ($firmware !~ /ec2/) { + if ((! $isxen) || ($isxen && $xendomain eq "dom0")) { + print $FD 'set prefix=($root)'.$bootpath.'/grub2'."\n"; + } } # print $FD "set debug=all\n"; print $FD 'set linux=linux'."\n"; @@ -4675,7 +4680,11 @@ print $FD '}'."\n"; $title = $this -> quoteLabel ("Install $label"); } else { - $title = $this -> quoteLabel ("$label [ $topic ]"); + if ($label_is_displayname) { + $title = $this -> quoteLabel ("$label"); + } else { + $title = $this -> quoteLabel ("$label [ $topic ]"); + } } print $FD 'menuentry "'.$title.'"'; print $FD ' --class opensuse --class os {'."\n"; @@ -6857,7 +6866,7 @@ # return the size of the given disk or disk # partition in Kb. If the call fails the function # returns 0 - # --- + # --- my $this = shift; my $pdev = shift; if ((! $pdev) || (! -e $pdev)) { 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 2016-04-18 16:58:06.618212018 +0200 +++ new/kiwi/modules/KIWIConfig.sh 2017-07-11 11:33:31.092017155 +0200 @@ -66,7 +66,7 @@ local service_name=$1; shift local service=$(baseSystemdServiceInstalled "$service_name") if [ ! -z "$service" ];then - systemctl "$@" "$service" + systemctl "$@" "$service_name" fi } 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 2017-05-19 17:17:54.918082540 +0200 +++ new/kiwi/modules/KIWIGlobals.pm 2017-10-13 09:09:07.162081549 +0200 @@ -1031,7 +1031,7 @@ } } if (! %phash) { - return $this; + return $path; } $kiwi -> info ("Creating btrfs pool\n"); my $data = KIWIQX::qxx ('btrfs subvolume create '.$path.'/@ 2>&1'); @@ -1108,7 +1108,7 @@ $kiwi -> failed(); return; } - return $this; + return $path; } #========================================== @@ -1274,8 +1274,19 @@ return; } my @UmountStack = @{$this->{UmountStack}}; + $_ = KIWIQX::qxx ("blkid $sdev 2>/dev/null"); my $vgname = KIWIQX::qxx ("pvs --noheadings -o vg_name $sdev 2>/dev/null"); my $result = $? >> 8; + if (/LVM2/) { + for my $i (0..5) { + if ($result == 0) { + last; + } + KIWIQX::qxx ("sleep 5"); + $vgname = KIWIQX::qxx ("pvs --noheadings -o vg_name $sdev 2>/dev/null"); + $result = $? >> 8; + } + } if ($result != 0) { return $sdev; } @@ -2034,7 +2045,7 @@ # Globals (generic) #------------------------------------------ my %data; - $data{Version} = "7.04.32"; + $data{Version} = "7.04.38"; $data{Publisher} = "SUSE LINUX GmbH"; $data{Preparer} = "KIWI - http://opensuse.github.com/kiwi";; $data{ConfigName} = "config.xml"; @@ -2052,8 +2063,8 @@ # Read .kiwirc #-------------------------------------------- my $file; - if (-f '.kiwirc') { - $file = '.kiwirc'; + if (-f './.kiwirc') { + $file = './.kiwirc'; } elsif (($ENV{'HOME'}) && (-f $ENV{'HOME'}.'/.kiwirc')) { $file = "$ENV{'HOME'}/.kiwirc"; 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 2017-05-08 13:45:46.297275585 +0200 +++ new/kiwi/modules/KIWIImage.pm 2017-05-29 22:05:13.920000302 +0200 @@ -1165,7 +1165,7 @@ 'powersaved=off', 'nohz=off', 'highres=off', - 'processsor.max+cstate=1', + 'processor.max+cstate=1', 'nomodeset', 'x11failsafe' ); 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 2017-05-19 17:17:05.981826443 +0200 +++ new/kiwi/modules/KIWILinuxRC.sh 2017-07-18 14:54:37.007674430 +0200 @@ -107,7 +107,7 @@ #-------------------------------------- failsafe="ide=nodma apm=off noresume edd=off" failsafe="$failsafe powersaved=off nohz=off" -failsafe="$failsafe highres=off processsor.max+cstate=1" +failsafe="$failsafe highres=off processor.max+cstate=1" failsafe="$failsafe nomodeset x11failsafe" #====================================== @@ -2349,7 +2349,7 @@ elif [ -z "$kiwi_oemtitle" ];then title=$(makeLabel "$kname [ $gfix ]") else - title=$(makeLabel "$kiwi_oemtitle [ $gfix ]") + title=$(makeLabel "$kiwi_oemtitle") fi #====================================== # check for kernel options @@ -3092,7 +3092,7 @@ elif [ -z "$kiwi_oemtitle" ];then title=$(makeLabel "$kname [ $gfix ]") else - title=$(makeLabel "$kiwi_oemtitle [ $gfix ]") + title=$(makeLabel "$kiwi_oemtitle") fi #====================================== # check for kernel options @@ -5434,10 +5434,7 @@ grep -q "fixed-address" /var/lib/dhclient/${try_iface}.lease then export PXE_IFACE=$try_iface - export IPADDR=$( - cat /var/lib/dhclient/${try_iface}.lease |\ - grep 'fixed-address'| awk '{print $2}' | tr -d ';' - ) + dhclientImportInfo "$PXE_IFACE" break fi done @@ -5445,10 +5442,6 @@ # setup selected interface #-------------------------------------- setupNic lo 127.0.0.1/8 255.0.0.0 - if [ -f /var/lib/dhclient/$PXE_IFACE.lease ] && - grep -q "fixed-address" /var/lib/dhclient/$PXE_IFACE.lease; then - dhclientImportInfo "$PXE_IFACE" - fi } #====================================== # setupNetwork diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kiwi/system/boot/ix86/netboot/suse-SLES12/config.xml new/kiwi/system/boot/ix86/netboot/suse-SLES12/config.xml --- old/kiwi/system/boot/ix86/netboot/suse-SLES12/config.xml 2016-04-18 16:58:06.638212050 +0200 +++ new/kiwi/system/boot/ix86/netboot/suse-SLES12/config.xml 2017-10-13 09:08:50.834014710 +0200 @@ -44,6 +44,8 @@ <file name="drivers/md/*"/> <file name="drivers/message/fusion/*"/> <file name="drivers/net/*"/> + <file name="drivers/nvme/*"/> + <file name="drivers/nvmem/*"/> <file name="drivers/parport/*"/> <file name="drivers/scsi/*"/> <file name="drivers/staging/hv/*"/> diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kiwi/system/boot/ix86/oemboot/suse-SLES12/config.xml new/kiwi/system/boot/ix86/oemboot/suse-SLES12/config.xml --- old/kiwi/system/boot/ix86/oemboot/suse-SLES12/config.xml 2016-04-18 16:58:06.642212045 +0200 +++ new/kiwi/system/boot/ix86/oemboot/suse-SLES12/config.xml 2017-10-13 09:08:50.834014710 +0200 @@ -45,6 +45,8 @@ <file name="drivers/md/*"/> <file name="drivers/message/fusion/*"/> <file name="drivers/net/*"/> + <file name="drivers/nvme/*"/> + <file name="drivers/nvmem/*"/> <file name="drivers/parport/*"/> <file name="drivers/scsi/*"/> <file name="drivers/staging/hv/*"/> diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kiwi/system/boot/ix86/vmxboot/suse-SLES12/config.xml new/kiwi/system/boot/ix86/vmxboot/suse-SLES12/config.xml --- old/kiwi/system/boot/ix86/vmxboot/suse-SLES12/config.xml 2016-04-18 16:58:06.642212045 +0200 +++ new/kiwi/system/boot/ix86/vmxboot/suse-SLES12/config.xml 2017-10-13 09:08:50.834014710 +0200 @@ -37,6 +37,8 @@ <file name="drivers/message/fusion/*"/> <file name="drivers/net/virtio_net.ko"/> <file name="drivers/net/hyperv/hv_netvsc.ko"/> + <file name="drivers/nvme/*"/> + <file name="drivers/nvmem/*"/> <file name="drivers/scsi/*"/> <file name="drivers/staging/hv/*"/> <file name="drivers/virtio/*"/> diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kiwi/tools/livestick/livestick new/kiwi/tools/livestick/livestick --- old/kiwi/tools/livestick/livestick 2016-04-18 16:58:06.678212090 +0200 +++ new/kiwi/tools/livestick/livestick 2017-05-29 22:05:13.924000324 +0200 @@ -167,7 +167,7 @@ cmdline_std="$cmdline_std ramdisk_size=512000 ramdisk_blocksize=4096" cmdline_fsf="$cmdline_std ide=nodma apm=off noresume edd=off powersaved=off" -cmdline_fsf="$cmdline_fsf nohz=off highres=off processsor.max+cstate=1" +cmdline_fsf="$cmdline_fsf nohz=off highres=off processor.max+cstate=1" cmdline_fsf="$cmdline_fsf nomodeseet x11failsafe" cat > $conf << EOF
