February 2015 - openSUSE Commits - openSUSE Mailing Lists

commit maxima for openSUSE:Factory
by root＠hilbert.suse.de 22 Feb '15

22 Feb '15

Hello community, here is the log from the commit of package maxima for openSUSE:Factory checked in at 2015-02-22 17:25:58 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/maxima (Old) and /work/SRC/openSUSE:Factory/.maxima.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "maxima" Changes: -------- --- /work/SRC/openSUSE:Factory/maxima/maxima.changes 2014-12-29 00:30:53.000000000 +0100 +++ /work/SRC/openSUSE:Factory/.maxima.new/maxima.changes 2015-02-22 17:25:59.000000000 +0100 @@ -1,0 +2,5 @@ +Wed Feb 18 15:42:14 UTC 2015 - dimstar(a)opensuse.org + +- Fix references to .info files in post/postun scriptlets. + +------------------------------------------------------------------- ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ maxima.spec ++++++ --- /var/tmp/diff_new_pack.CWEuQs/_old 2015-02-22 17:26:00.000000000 +0100 +++ /var/tmp/diff_new_pack.CWEuQs/_new 2015-02-22 17:26:00.000000000 +0100 @@ -1,7 +1,7 @@ # # spec file for package maxima # -# Copyright (c) 2014 SUSE LINUX Products GmbH, Nuernberg, Germany. +# Copyright (c) 2015 SUSE LINUX GmbH, Nuernberg, Germany. # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -234,28 +234,28 @@ %install_info_delete --info-dir=%{_infodir} %{_infodir}/xmaxima.info %post lang-de-utf8 -%install_info --info-dir=%{_infodir} %{_infodir}/de.utf8.info +%install_info --info-dir=%{_infodir} %{_infodir}/de.utf8/maxima.info %postun lang-de-utf8 -%install_info_delete --info-dir=%{_infodir} %{_infodir}/de.utf8.info +%install_info_delete --info-dir=%{_infodir} %{_infodir}/de.utf8/maxima.info %post lang-es-utf8 -%install_info --info-dir=%{_infodir} %{_infodir}/es.utf8.info +%install_info --info-dir=%{_infodir} %{_infodir}/es.utf8/maxima.info %postun lang-es-utf8 -%install_info_delete --info-dir=%{_infodir} %{_infodir}/es.utf8.info +%install_info_delete --info-dir=%{_infodir} %{_infodir}/es.utf8/maxima.info %post lang-pt-utf8 -%install_info --info-dir=%{_infodir} %{_infodir}/pt.utf8.info +%install_info --info-dir=%{_infodir} %{_infodir}/pt.utf8/maxima.info %postun lang-pt-utf8 -%install_info_delete --info-dir=%{_infodir} %{_infodir}/pt.utf8.info +%install_info_delete --info-dir=%{_infodir} %{_infodir}/pt.utf8/maxima.info %post lang-pt_BR-utf8 -%install_info --info-dir=%{_infodir} %{_infodir}/pt_BR.utf8.info +%install_info --info-dir=%{_infodir} %{_infodir}/pt_BR.utf8/maxima.info %postun lang-pt_BR-utf8 -%install_info_delete --info-dir=%{_infodir} %{_infodir}/pt_BR.utf8.info +%install_info_delete --info-dir=%{_infodir} %{_infodir}/pt_BR.utf8/maxima.info %endif %clean -- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0

commit iksemel for openSUSE:Factory
by root＠hilbert.suse.de 22 Feb '15

22 Feb '15

Hello community, here is the log from the commit of package iksemel for openSUSE:Factory checked in at 2015-02-22 17:25:56 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/iksemel (Old) and /work/SRC/openSUSE:Factory/.iksemel.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "iksemel" Changes: -------- --- /work/SRC/openSUSE:Factory/iksemel/iksemel.changes 2012-06-01 07:20:21.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.iksemel.new/iksemel.changes 2015-02-22 17:25:57.000000000 +0100 @@ -1,0 +2,9 @@ +Wed Feb 18 14:40:02 UTC 2015 - dimstar(a)opensuse.org + +- Fix references to the info files in rpm scriptlets: the file + installed is called iksemel.gz, NOT iksemel.info.gz (info still + finds this file). +- Move install_info_delete from postun to preun: the file should + be present during removal, so it can be parsed. + +------------------------------------------------------------------- ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ iksemel.spec ++++++ --- /var/tmp/diff_new_pack.L03Rn5/_old 2015-02-22 17:25:58.000000000 +0100 +++ /var/tmp/diff_new_pack.L03Rn5/_new 2015-02-22 17:25:58.000000000 +0100 @@ -1,7 +1,7 @@ # # spec file for package iksemel # -# Copyright (c) 2012 SUSE LINUX Products GmbH, Nuernberg, Germany. +# Copyright (c) 2015 SUSE LINUX GmbH, Nuernberg, Germany. # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -73,10 +73,10 @@ find "%buildroot" -type f -name "*.la" -delete %post -%install_info --info-dir=%_infodir %_infodir/%name.info.gz +%install_info --info-dir=%_infodir %_infodir/%name.gz -%postun -%install_info_delete --info-dir=%_infodir %_infodir/%name.info.gz +%preun +%install_info_delete --info-dir=%_infodir %_infodir/%name.gz %post -n %lname -p /sbin/ldconfig @@ -85,7 +85,7 @@ %files %defattr(-,root,root) %doc AUTHORS ChangeLog COPYING INSTALL NEWS README TODO -%_infodir/iksemel* +%_infodir/iksemel.gz %_bindir/ikslint %_bindir/iksperf %_bindir/iksroster -- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0

commit rubygem-axiom-types for openSUSE:Factory
by root＠hilbert.suse.de 22 Feb '15

22 Feb '15

Hello community, here is the log from the commit of package rubygem-axiom-types for openSUSE:Factory checked in at 2015-02-22 17:25:51 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/rubygem-axiom-types (Old) and /work/SRC/openSUSE:Factory/.rubygem-axiom-types.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "rubygem-axiom-types" Changes: -------- New Changes file: --- /dev/null 2014-12-25 22:38:16.200041506 +0100 +++ /work/SRC/openSUSE:Factory/.rubygem-axiom-types.new/rubygem-axiom-types.changes 2015-02-22 17:25:52.000000000 +0100 @@ -0,0 +1,5 @@ +------------------------------------------------------------------- +Thu Dec 18 13:32:33 UTC 2014 - tboerger(a)suse.com + +- Initial packaging of 0.1.1 + New: ---- axiom-types-0.1.1.gem gem2rpm.yml rubygem-axiom-types.changes rubygem-axiom-types.spec ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ rubygem-axiom-types.spec ++++++ # # spec file for package rubygem-axiom-types # # Copyright (c) 2014 SUSE LINUX Products GmbH, Nuernberg, Germany. # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed # upon. The license for this file, and modifications and additions to the # file, is the same license as for the pristine package itself (unless the # license for the pristine package is not an Open Source License, in which # case the license is the MIT License). An "Open Source License" is a # license that conforms to the Open Source Definition (Version 1.9) # published by the Open Source Initiative. # Please submit bugfixes or comments via http://bugs.opensuse.org/ # # # This file was generated with a gem2rpm.yml and not just plain gem2rpm. # All sections marked as MANUAL, license headers, summaries and descriptions # can be maintained in that file. Please consult this file before editing any # of those fields # Name: rubygem-axiom-types Version: 0.1.1 Release: 0 %define mod_name axiom-types %define mod_full_name %{mod_name}-%{version} BuildRoot: %{_tmppath}/%{name}-%{version}-build BuildRequires: ruby-macros >= 5 BuildRequires: %{ruby >= 1.9.3} BuildRequires: %{rubygem gem2rpm} Url: https://github.com/dkubb/axiom-types Source: http://rubygems.org/gems/%{mod_full_name}.gem Source1: gem2rpm.yml Summary: Abstract types for logic programming License: MIT Group: Development/Languages/Ruby %description Define types with optional constraints for use within axiom and other libraries. %prep %build %install %gem_install \ --doc-files="LICENSE README.md" \ -f %gem_packages %changelog ++++++ gem2rpm.yml ++++++ # --- # ## used by gem2rpm # :summary: this is a custom summary # ## used by gem2rpm # :description: |- # this is a custom description # # it can be multiline # ## used by gem2rpm # :license: MIT or Ruby # ## used by gem2rpm and gem_packages # :version_suffix: -x_y # ## used by gem2rpm and gem_packages # :disable_docs: true # ## used by gem2rpm # :disable_automatic_rdoc_dep: true # ## used by gem2rpm # :preamble: |- # BuildRequires: foobar # Requires: foobar # ## used by gem2rpm # :patches: # foo.patch: -p1 # bar.patch: # ## used by gem2rpm # :sources: # - foo.desktop # - bar.desktop # :gem_install_args: '....' # ## used by gem2rpm # :pre_install: |- # %if 0%{?use_system_libev} # export USE_VENDORED_LIBEV="no" # %endif # ## used by gem2rpm # :post_install: |- # # delete custom files here or do other fancy stuff # install -D -m 0644 %{S:1} %{buildroot}%{_bindir}/gem2rpm-opensuse # ## used by gem2rpm # :testsuite_command: |- # (pushd %{buildroot}%{gem_base}/gems/%{mod_full_name} && rake test) # ## used by gem2rpm # :filelist: |- # /usr/bin/gem2rpm-opensuse # ## used by gem2rpm # :scripts: # :post: |- # /bin/echo foo # ## used by gem_packages # :main: # :preamble: |- # Requires: util-linux # Recommends: pwgen # :filelist: |- # /usr/bin/gem2rpm-opensuse # ## used by gem_packages # :custom: # apache: # :preamble: |- # Requires: ..... # :filelist: |- # /etc/apache2/conf.d/passenger.conf # :summary: Custom summary is optional # :description: |- # Custom description is optional # # bar # :post: |- # /bin/echo foo # --- :sources: -- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0

commit python-Genshi for openSUSE:Factory
by root＠hilbert.suse.de 22 Feb '15

22 Feb '15

Hello community, here is the log from the commit of package python-Genshi for openSUSE:Factory checked in at 2015-02-22 17:25:48 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/python-Genshi (Old) and /work/SRC/openSUSE:Factory/.python-Genshi.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "python-Genshi" Changes: -------- --- /work/SRC/openSUSE:Factory/python-Genshi/python-Genshi.changes 2013-10-23 13:11:13.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.python-Genshi.new/python-Genshi.changes 2015-02-22 17:25:49.000000000 +0100 @@ -1,0 +2,5 @@ +Tue Feb 17 10:53:23 UTC 2015 - opensuse(a)dstoecker.de + +- backport fix for bug 566 (pop from empty) from 0.7 devel (changeset_r1242.diff) + +------------------------------------------------------------------- New: ---- changeset_r1242.diff ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ python-Genshi.spec ++++++ --- /var/tmp/diff_new_pack.grzT98/_old 2015-02-22 17:25:50.000000000 +0100 +++ /var/tmp/diff_new_pack.grzT98/_new 2015-02-22 17:25:50.000000000 +0100 @@ -1,7 +1,7 @@ # # spec file for package python-Genshi # -# Copyright (c) 2013 SUSE LINUX Products GmbH, Nuernberg, Germany. +# Copyright (c) 2015 SUSE LINUX Products GmbH, Nuernberg, Germany. # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -18,19 +18,21 @@ Name: python-Genshi Version: 0.7 -Release: 1 +Release: 0 Url: http://genshi.edgewall.org/ Summary: A toolkit for generation of output for the web License: BSD-3-Clause Group: Development/Languages/Python Source: http://ftp.edgewall.com/pub/genshi/Genshi-%{version}.tar.gz +# FIX-UPSTREAM http://genshi.edgewall.org/ticket/566 +Patch1: changeset_r1242.diff BuildRoot: %{_tmppath}/%{name}-%{version}-build -BuildRequires: python-devel BuildRequires: python-Babel +BuildRequires: python-devel BuildRequires: python-setuptools BuildRequires: python-xml -Requires: python-xml Requires: python-Babel +Requires: python-xml Provides: python-genshi = %{version} Obsoletes: python-genshi < %{version} %if 0%{?suse_version} <= 1110 @@ -60,6 +62,7 @@ %prep %setup -q -n Genshi-%{version} +%patch1 -p2 sed -i "1d" examples/{basic/run,basic/kidrun,tutorial/geddit/controller}.py # Fix non-excutable bits %build ++++++ changeset_r1242.diff ++++++ Index: /trunk/genshi/filters/tests/i18n.py =================================================================== --- /trunk/genshi/filters/tests/i18n.py (revision 1177) +++ /trunk/genshi/filters/tests/i18n.py (revision 1242) @@ -928,4 +928,16 @@ """</p></html>""", tmpl.generate(first="FIRST", second="SECOND").render()) + + def test_translate_i18n_msg_ticket_404_regression(self): + tmpl = MarkupTemplate("""<html xmlns:py="http://genshi.edgewall.org/" + xmlns:i18n="http://genshi.edgewall.org/i18n"> + <h1 i18n:msg="name">text <a>$name</a></h1> + </html>""") + gettext = lambda s: u'head [1:%(name)s] tail' + translator = Translator(gettext) + translator.setup(tmpl) + self.assertEqual("""<html> + <h1>head <a>NAME</a> tail</h1> + </html>""", tmpl.generate(name='NAME').render()) Index: /trunk/genshi/filters/i18n.py =================================================================== --- /trunk/genshi/filters/i18n.py (revision 1177) +++ /trunk/genshi/filters/i18n.py (revision 1242) @@ -1049,5 +1049,11 @@ while parts: order, string = parts.pop(0) - events = self.events[order].pop(0) + events = self.events[order] + if events: + events = events.pop(0) + else: + # create a dummy empty text event so any remaining + # part of the translation can be processed. + events = [(TEXT, "", (None, -1, -1))] parts_counter[order].pop() -- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0

commit gpaste for openSUSE:Factory
by root＠hilbert.suse.de 22 Feb '15

22 Feb '15

Hello community, here is the log from the commit of package gpaste for openSUSE:Factory checked in at 2015-02-22 17:25:46 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/gpaste (Old) and /work/SRC/openSUSE:Factory/.gpaste.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "gpaste" Changes: -------- --- /work/SRC/openSUSE:Factory/gpaste/gpaste.changes 2014-12-17 19:15:32.000000000 +0100 +++ /work/SRC/openSUSE:Factory/.gpaste.new/gpaste.changes 2015-02-22 17:25:47.000000000 +0100 @@ -1,0 +2,6 @@ +Wed Feb 18 08:27:58 UTC 2015 - develop7(a)develop7.info + +- Move GPaste.Settings.service out of -devel, enabling regular + users to run GPaste settings. + +------------------------------------------------------------------- ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ gpaste.spec ++++++ --- /var/tmp/diff_new_pack.t9rzGF/_old 2015-02-22 17:25:48.000000000 +0100 +++ /var/tmp/diff_new_pack.t9rzGF/_new 2015-02-22 17:25:48.000000000 +0100 @@ -1,7 +1,7 @@ # # spec file for package gpaste # -# Copyright (c) 2014 SUSE LINUX Products GmbH, Nuernberg, Germany. +# Copyright (c) 2015 SUSE LINUX GmbH, Nuernberg, Germany. # Copyright (c) 2012 Simone Tolotti, <simone.tolotti(a)gmail.com>. # # All modifications and additions to the file contributed by third parties @@ -142,6 +142,7 @@ %{_libexecdir}/gpaste/ %{_datadir}/applications/org.gnome.GPaste.Settings.desktop %{_datadir}/dbus-1/services/org.gnome.GPaste.service +%{_datadir}/dbus-1/services/org.gnome.GPaste.Settings.service %{_datadir}/appdata/org.gnome.GPaste.Settings.appdata.xml %{_datadir}/glib-2.0/schemas/org.gnome.GPaste.gschema.xml %{_datadir}/zsh/site-functions/_gpaste @@ -169,7 +170,6 @@ %dir %{_datadir}/vala/vapi %{_datadir}/vala/vapi/gpaste-1.0.deps %{_datadir}/vala/vapi/gpaste-1.0.vapi -%{_datadir}/dbus-1/services/org.gnome.GPaste.Settings.service %files -n gnome-shell-extension-%{name} %defattr(-,root,root) -- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0

commit snapper for openSUSE:Factory
by root＠hilbert.suse.de 22 Feb '15

22 Feb '15

Hello community, here is the log from the commit of package snapper for openSUSE:Factory checked in at 2015-02-22 17:25:37 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/snapper (Old) and /work/SRC/openSUSE:Factory/.snapper.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "snapper" Changes: -------- --- /work/SRC/openSUSE:Factory/snapper/snapper.changes 2015-01-29 09:54:36.000000000 +0100 +++ /work/SRC/openSUSE:Factory/.snapper.new/snapper.changes 2015-02-22 17:25:39.000000000 +0100 @@ -1,0 +2,15 @@ +Fri Feb 20 14:10:01 CET 2015 - aschnell(a)suse.de + +- added comments in helper program + +------------------------------------------------------------------- +Mon Feb 16 12:01:03 CET 2015 - aschnell(a)suse.de + +- added helper to support installation into subvolume (fate#318392) +- added root-prefix parameter for config functions +- pass single struct instead of many values to create and modify + snapshot functions +- removed deprecated functions +- version 0.2.6 + +------------------------------------------------------------------- Old: ---- snapper-0.2.5.tar.bz2 New: ---- snapper-0.2.6.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ snapper.spec ++++++ --- /var/tmp/diff_new_pack.9tUR7L/_old 2015-02-22 17:25:40.000000000 +0100 +++ /var/tmp/diff_new_pack.9tUR7L/_new 2015-02-22 17:25:40.000000000 +0100 @@ -17,7 +17,7 @@ Name: snapper -Version: 0.2.5 +Version: 0.2.6 Release: 0 BuildRoot: %{_tmppath}/%{name}-%{version}-build Source: snapper-%{version}.tar.bz2 @@ -49,7 +49,7 @@ %endif BuildRequires: pam-devel Requires: diffutils -Requires: libsnapper2 = %version +Requires: libsnapper3 = %version %if 0%{?suse_version} Recommends: cron logrotate snapper-zypp-plugin Supplements: btrfsprogs @@ -109,6 +109,7 @@ %defattr(-,root,root) %{prefix}/bin/snapper %{prefix}/sbin/snapperd +%{prefix}/lib/snapper %doc %{_mandir}/*/snapper.8* %doc %{_mandir}/*/snapperd.8* %doc %{_mandir}/*/snapper-configs.5* @@ -118,7 +119,7 @@ %config /etc/dbus-1/system.d/org.opensuse.Snapper.conf %{prefix}/share/dbus-1/system-services/org.opensuse.Snapper.service -%package -n libsnapper2 +%package -n libsnapper3 Summary: Library for filesystem snapshot management Group: System/Libraries Requires: util-linux @@ -126,16 +127,16 @@ PreReq: %fillup_prereq %endif # expands to Obsoletes: libsnapper1 libsnapper2 libsnapper3... -Obsoletes: %(echo `seq -s " " -f "libsnapper%.f" $((2 - 1))`) +Obsoletes: %(echo `seq -s " " -f "libsnapper%.f" $((3 - 1))`) -%description -n libsnapper2 +%description -n libsnapper3 This package contains libsnapper, a library for filesystem snapshot management. Authors: -------- Arvin Schnell <aschnell(a)suse.de> -%files -n libsnapper2 +%files -n libsnapper3 %defattr(-,root,root) %{_libdir}/libsnapper.so.* %dir %{_sysconfdir}/snapper @@ -153,20 +154,20 @@ %config(noreplace) %{_sysconfdir}/sysconfig/snapper %endif -%post -n libsnapper2 +%post -n libsnapper3 /sbin/ldconfig %if 0%{?suse_version} %{fillup_only -n snapper} %endif -%postun -n libsnapper2 +%postun -n libsnapper3 /sbin/ldconfig %package -n libsnapper-devel Requires: boost-devel Requires: gcc-c++ Requires: libacl-devel -Requires: libsnapper2 = %version +Requires: libsnapper3 = %version Requires: libstdc++-devel Requires: libxml2-devel %if 0%{?suse_version} > 1230 ++++++ snapper-0.2.5.tar.bz2 -> snapper-0.2.6.tar.bz2 ++++++ ++++ 3126 lines of diff (skipped) -- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0

commit sssd for openSUSE:Factory
by root＠hilbert.suse.de 22 Feb '15

22 Feb '15

Hello community, here is the log from the commit of package sssd for openSUSE:Factory checked in at 2015-02-22 17:25:31 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/sssd (Old) and /work/SRC/openSUSE:Factory/.sssd.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "sssd" Changes: -------- --- /work/SRC/openSUSE:Factory/sssd/sssd.changes 2015-01-10 23:06:59.000000000 +0100 +++ /work/SRC/openSUSE:Factory/.sssd.new/sssd.changes 2015-02-22 17:25:32.000000000 +0100 @@ -1,0 +2,27 @@ +Thu Feb 19 10:51:22 UTC 2015 - hguo(a)suse.com + +- Update to new upstream release 1.12.4 (Changelog highlights following) +* This is mostly a bug fixing release with only minor enhancements + visible to the end user. +* Contains many fixes and enhancements related to the ID views + functionality of FreeIPA servers. +* Several fixes related to retrieving AD group membership in an + IPA-AD trust scenario. +* Fixes a bug where the GPO access control previously didn't work + at all if debugging was enabled in smb.conf. +* SSSD can now be pinned to a particular AD site instead of + autodiscovering the site. +* A regression that caused setting the SELinux context for IPA users + to fail, was fixed. +* Fixed a potential crash caused by a double-free error when an SSSD + service was killed by the monitor process. + +------------------------------------------------------------------- +Mon Feb 16 10:09:18 UTC 2015 - howard@localhost + +- A minor rpmspec cleanup to get rid of five rpmlint warnings +* Remove mentioning of system-wide dbus configuration file from comments. +* Remove traditional init script. +* Remove compatibility for producing packages on older OpenSUSE releases. + +------------------------------------------------------------------- Old: ---- sssd-1.12.3.tar.gz sssd-1.12.3.tar.gz.asc New: ---- sssd-1.12.4.tar.gz sssd-1.12.4.tar.gz.asc ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ sssd.spec ++++++ --- /var/tmp/diff_new_pack.dP0drd/_old 2015-02-22 17:25:33.000000000 +0100 +++ /var/tmp/diff_new_pack.dP0drd/_new 2015-02-22 17:25:33.000000000 +0100 @@ -17,7 +17,7 @@ Name: sssd -Version: 1.12.3 +Version: 1.12.4 Release: 0 Summary: System Security Services Daemon License: GPL-3.0+ and LGPL-3.0+ @@ -45,13 +45,7 @@ BuildRequires: cifs-utils-devel BuildRequires: cyrus-sasl-devel BuildRequires: docbook-xsl-stylesheets -%if 0%{?suse_version} >= 1320 BuildRequires: krb5-devel >= 1.12 -%define have_localauth 1 -%else -BuildRequires: krb5-devel -%define have_localauth 0 -%endif BuildRequires: libsmbclient-devel BuildRequires: libtool BuildRequires: libxml2-tools @@ -291,8 +285,6 @@ Group: System/Libraries Provides: libsss_sudo-devel = %version-%release Obsoletes: libsss_sudo-devel < %version-%release -# No provides: true obsolete. -Obsoletes: libsss_sudo1 Supplements: packageand(sudo:sssd-client) %description -n libsss_sudo @@ -374,17 +366,10 @@ "$b/%_mandir"/{uk/man5,uk/man8}; install -d "$b/%_sysconfdir/sssd"; install -m600 src/examples/sssd-example.conf "$b/%_sysconfdir/sssd/sssd.conf"; -%if 0%{?_unitdir:1} install -d "$b/%_unitdir"; -# Missing service file in 1.11.5.1 -#install src/sysv/systemd/sssd.service "$b/%_unitdir/sssd.service"; install -m644 %{S:4} "$b/%_unitdir/sssd.service"; rm -Rf "$b/%_initddir" ln -s service "$b/%_sbindir/rcsssd" -%else -install src/sysv/SUSE/sssd "$b/%_sysconfdir/init.d/sssd"; -ln -sf ../../etc/init.d/sssd "$b/usr/sbin/rcsssd" -%endif mkdir -p "$b/%_sysconfdir/ld.so.conf.d" cat >"$b/%_sysconfdir/ld.so.conf.d/sssd-wbclient.conf" <<-EOF @@ -392,48 +377,32 @@ EOF find "$b" -type f -name "*.la" -delete; -%if %suse_version <= 1110 -# remove some unsupported languages, sssd does not contain -# translations for these anyway -rm -Rf "$b/usr/share/locale"/{fa_IR,ja_JP,lt_LT,ta_IN,vi_VN} -%endif - rm -Rf "$b/%_sysconfdir/dbus-1" "$b/%_datadir/dbus-1" %find_lang %name --all-name -%if 0%{?_unitdir:1} %pre %service_add_pre sssd.service -%endif %post # migrate config variable krb5_kdcip to krb5_server (bnc#851048) /bin/sed -i -e 's,^krb5_kdcip =,krb5_server =,g' %_sysconfdir/sssd/sssd.conf /sbin/ldconfig -%if 0%{?_unitdir:1} %service_add_post sssd.service -%endif -%if 0%{?_unitdir:1} %preun %service_del_preun sssd.service -%endif %postun if [ "$1" = "0" ]; then "%_sbindir/pam-config" -d --sss || :; fi; /sbin/ldconfig -%if 0%{?_unitdir:1} # Clear caches, which may have an incompatible format afterwards # (especially, downgrades) rm -f /var/lib/sss/db/*.ldb # del_postun includes a try-restart %service_del_postun sssd.service -%else -%restart_on_update sssd -%endif %insserv_cleanup %post -n libipa_hbac0 -p /sbin/ldconfig @@ -448,11 +417,7 @@ %files -f sssd.lang %defattr(-,root,root) %doc COPYING -%if 0%{?_unitdir:1} %_unitdir -%else -%_initrddir/%name -%endif %_bindir/sss_ssh_* %_sbindir/sssd %_sbindir/rcsssd @@ -507,9 +472,7 @@ /%_lib/security/pam_sss.so %_libdir/cifs-utils/ %_libdir/krb5/ -%if %have_localauth %_libdir/%name/modules/sssd_krb5_localauth_plugin.so -%endif %_mandir/??/man8/pam_sss.8* %_mandir/??/man8/sssd_krb5_locator_plugin.8* %_mandir/man8/pam_sss.8* @@ -537,8 +500,6 @@ %dir %_mandir/??/ %dir %_mandir/??/man5/ %_mandir/??/man5/sssd-ifp.5* -#%_sysconfdir/dbus-1/system.d/org.freedesktop.sssd.infopipe.conf -#%_datadir/dbus-1/system-services/org.freedesktop.sssd.infopipe.service %files ipa %defattr(-,root,root) @@ -610,7 +571,7 @@ %files wbclient %defattr(-,root,root) -%_sysconfdir/ld.so.conf.d/sssd-wbclient.conf +%config %_sysconfdir/ld.so.conf.d/sssd-wbclient.conf %dir %_libdir/sssd/ %dir %_libdir/sssd/modules/ %_libdir/sssd/modules/libwbclient.so.* ++++++ sssd-1.12.3.tar.gz -> sssd-1.12.4.tar.gz ++++++ ++++ 71758 lines of diff (skipped) -- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0

commit wicked for openSUSE:Factory
by root＠hilbert.suse.de 22 Feb '15

22 Feb '15

Hello community, here is the log from the commit of package wicked for openSUSE:Factory checked in at 2015-02-22 17:25:25 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/wicked (Old) and /work/SRC/openSUSE:Factory/.wicked.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "wicked" Changes: -------- --- /work/SRC/openSUSE:Factory/wicked/wicked.changes 2015-01-25 21:14:20.000000000 +0100 +++ /work/SRC/openSUSE:Factory/.wicked.new/wicked.changes 2015-02-22 17:25:27.000000000 +0100 @@ -1,0 +2,32 @@ +Thu Feb 19 10:43:23 UTC 2015 - pwieczorkiewicz(a)suse.com + +- version 0.6.17 +- nanny: fixed a memory-leak on policy load failure +- wickedd: fixed broken dummy0 autocreation workaround + +------------------------------------------------------------------- +Tue Feb 17 10:21:16 UTC 2015 - mt(a)suse.de + +- version 0.6.16 +- ifreload: segfault fix to require argument for --timeout option +- client/nanny: initial handing of link-detection/require-link and + timeout control flags (LINK_REQUIRED, LINK_READY_WAIT variables in + suse ifcfg) to continue setup without ready link when requested in + the config or based on device requirements (bsc#911562,bsc#914792). +- client/nanny: wait for event ACKs from wickedd instead to continue + on successful request results where possible, to minimize the risk + of an event backlog (bsc#905421). +- client/nanny: fsm timer and cleanup related fixes and improvements, + fix to use "device-setup" (MAC, bond/bridge options, ...) as state + name instead of "device-up" and use "device-up" as state when the + device/link is administratively set UP. Separated waitLinkUp method + to wait for link/carrier from linkUp setting it administratively UP. +- wickedd: fix to handle automatically created dummy0 interface +- wireless: consider auth-proto parameter (wpa1|wpa2) (bsc#911299) +- ipv6: add accept-dad sysctl support, fix accept-ra constants +- dhcp4: do not set/query mtu if set in the config (bsc#904323) +- dhcp4: limit MTU to be lower-equal 576 as before +- dhcp4: completed user-class option support permitting an rfc3004 + formatted option or as non-rfc, but widely used string (bsc#909307) + +------------------------------------------------------------------- Old: ---- wicked-0.6.15.tar.bz2 New: ---- wicked-0.6.17.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ wicked.spec ++++++ --- /var/tmp/diff_new_pack.nDRgXA/_old 2015-02-22 17:25:28.000000000 +0100 +++ /var/tmp/diff_new_pack.nDRgXA/_new 2015-02-22 17:25:28.000000000 +0100 @@ -18,7 +18,7 @@ %define release_prefix %{?snapshot:%{snapshot}}%{!?snapshot:0} Name: wicked -Version: 0.6.15 +Version: 0.6.17 Release: %{release_prefix}.0.0 Summary: Network configuration infrastructure License: GPL-2.0 ++++++ wicked-0.6.15.tar.bz2 -> wicked-0.6.17.tar.bz2 ++++++ ++++ 4403 lines of diff (skipped) -- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0

commit yast2-installation for openSUSE:Factory
by root＠hilbert.suse.de 22 Feb '15

22 Feb '15

Hello community, here is the log from the commit of package yast2-installation for openSUSE:Factory checked in at 2015-02-22 17:25:19 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/yast2-installation (Old) and /work/SRC/openSUSE:Factory/.yast2-installation.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "yast2-installation" Changes: -------- --- /work/SRC/openSUSE:Factory/yast2-installation/yast2-installation.changes 2015-02-13 08:34:12.000000000 +0100 +++ /work/SRC/openSUSE:Factory/.yast2-installation.new/yast2-installation.changes 2015-02-22 17:25:23.000000000 +0100 @@ -1,0 +2,13 @@ +Tue Feb 17 14:24:19 CET 2015 - aschnell(a)suse.de + +- get list of mounts from /proc/mounts in umount_finish (for + fate#318392) +- 3.1.134 + +------------------------------------------------------------------- +Mon Feb 16 12:44:16 UTC 2015 - cwh(a)suse.com + +- Delete or copy install.inf as applicable (bnc#897066) +- 3.1.133 + +------------------------------------------------------------------- Old: ---- yast2-installation-3.1.132.tar.bz2 New: ---- yast2-installation-3.1.134.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ yast2-installation.spec ++++++ --- /var/tmp/diff_new_pack.7pyICr/_old 2015-02-22 17:25:24.000000000 +0100 +++ /var/tmp/diff_new_pack.7pyICr/_new 2015-02-22 17:25:24.000000000 +0100 @@ -17,7 +17,7 @@ Name: yast2-installation -Version: 3.1.132 +Version: 3.1.134 Release: 0 BuildRoot: %{_tmppath}/%{name}-%{version}-build ++++++ yast2-installation-3.1.132.tar.bz2 -> yast2-installation-3.1.134.tar.bz2 ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-installation-3.1.132/package/yast2-installation.changes new/yast2-installation-3.1.134/package/yast2-installation.changes --- old/yast2-installation-3.1.132/package/yast2-installation.changes 2015-02-11 10:34:11.000000000 +0100 +++ new/yast2-installation-3.1.134/package/yast2-installation.changes 2015-02-19 12:14:12.000000000 +0100 @@ -1,4 +1,17 @@ ------------------------------------------------------------------- +Tue Feb 17 14:24:19 CET 2015 - aschnell(a)suse.de + +- get list of mounts from /proc/mounts in umount_finish (for + fate#318392) +- 3.1.134 + +------------------------------------------------------------------- +Mon Feb 16 12:44:16 UTC 2015 - cwh(a)suse.com + +- Delete or copy install.inf as applicable (bnc#897066) +- 3.1.133 + +------------------------------------------------------------------- Wed Feb 11 09:03:38 UTC 2015 - lslezak(a)suse.cz - removed redundant initialization label (bnc#878538) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-installation-3.1.132/package/yast2-installation.spec new/yast2-installation-3.1.134/package/yast2-installation.spec --- old/yast2-installation-3.1.132/package/yast2-installation.spec 2015-02-11 10:34:11.000000000 +0100 +++ new/yast2-installation-3.1.134/package/yast2-installation.spec 2015-02-19 12:14:12.000000000 +0100 @@ -1,7 +1,7 @@ # # spec file for package yast2-installation # -# Copyright (c) 2014 SUSE LINUX Products GmbH, Nuernberg, Germany. +# Copyright (c) 2015 SUSE LINUX GmbH, Nuernberg, Germany. # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -17,7 +17,7 @@ Name: yast2-installation -Version: 3.1.132 +Version: 3.1.134 Release: 0 BuildRoot: %{_tmppath}/%{name}-%{version}-build diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-installation-3.1.132/src/clients/copy_files_finish.rb new/yast2-installation-3.1.134/src/clients/copy_files_finish.rb --- old/yast2-installation-3.1.132/src/clients/copy_files_finish.rb 2015-02-11 10:34:11.000000000 +0100 +++ new/yast2-installation-3.1.134/src/clients/copy_files_finish.rb 2015-02-19 12:14:12.000000000 +0100 @@ -127,7 +127,11 @@ # -------------------------------------------------------------- # Copy /etc/install.inf into built system so that the # second phase of the installation can find it. - Linuxrc.SaveInstallInf(Installation.destdir) + if second_stage_required? + Linuxrc.SaveInstallInf(Installation.destdir) + else + SCR.Execute(path(".target.remove"), "/etc/install.inf") + end # Copy control.xml so it can be read once again during continue mode Builtins.y2milestone("Copying YaST control file") diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-installation-3.1.132/src/clients/umount_finish.rb new/yast2-installation-3.1.134/src/clients/umount_finish.rb --- old/yast2-installation-3.1.132/src/clients/umount_finish.rb 2015-02-11 10:34:11.000000000 +0100 +++ new/yast2-installation-3.1.134/src/clients/umount_finish.rb 2015-02-19 12:14:12.000000000 +0100 @@ -20,18 +20,18 @@ # ------------------------------------------------------------------------------ # File: -# umount_finish.ycp +# umount_finish.rb # # Module: # Step of base installation finish # # Authors: # Jiri Srain <jsrain(a)suse.cz> -# -# $Id$ -# + module Yast class UmountFinishClient < Client + include Yast::Logger + def main Yast.import "Pkg" @@ -82,13 +82,6 @@ Pkg.SourceSaveAll Pkg.TargetFinish - # loop over all filesystems - @mountPoints = Convert.convert( - Storage.GetMountPoints, - from: "map", - to: "map <string, list>" - ) - Builtins.y2milestone("Known mount points: %1", @mountPoints) Builtins.y2milestone( "/proc/mounts:\n%1", WFM.Read(path(".local.string"), "/proc/mounts") @@ -98,16 +91,19 @@ WFM.Read(path(".local.string"), "/proc/partitions") ) - @umountList = [] - - # go through mountPoints collecting paths in umountList - # *** umountList is lexically ordered ! - - Builtins.foreach(@mountPoints) do |mountpoint, _mountval| - if mountpoint != "swap" - @umountList = Builtins.add(@umountList, mountpoint) + # get mounts at and in the target from /proc/mounts - do not use + # Storage here since Storage does not know whether other processes, + # e.g. snapper, mounted filesystems in the target + + umount_list = [] + SCR.Read(path(".proc.mounts")).each do |entry| + mountpoint = entry["file"] + if mountpoint.start_with?(Installation.destdir) + umount_list << mountpoint[Installation.destdir.length, mountpoint.length] end end + umount_list.sort! + log.info("umount_list:#{umount_list}") # symlink points to /proc, keep it (bnc#665437) if !FileUtils.IsLink("/etc/mtab") @@ -187,33 +183,33 @@ # first umount all file based crypto fs since they potentially # could mess up umounting of normale filesystems if the crypt # file is not on the root fs - Builtins.y2milestone("umount list %1", @umountList) + Builtins.y2milestone("umount list %1", umount_list) Builtins.foreach( Ops.get_list(@targetMap, ["/dev/loop", "partitions"], []) ) do |e| if Ops.greater_than(Builtins.size(Ops.get_string(e, "mount", "")), 0) Storage.Umount(Ops.get_string(e, "device", ""), true) - @umountList = Builtins.filter(@umountList) do |m| + umount_list = Builtins.filter(umount_list) do |m| m != Ops.get_string(e, "mount", "") end Builtins.y2milestone( "loop umount %1 new list %2", Ops.get_string(e, "mount", ""), - @umountList + umount_list ) end end - # *** umountList is lexically ordered ! + # *** umount_list is lexically ordered ! # now umount in reverse order (guarantees "/" as last umount) - @umountLength = Builtins.size(@umountList) + @umountLength = Builtins.size(umount_list) while Ops.greater_than(@umountLength, 0) @umountLength = Ops.subtract(@umountLength, 1) @tmp = Ops.add( Installation.destdir, - Ops.get(@umountList, @umountLength, "") + Ops.get(umount_list, @umountLength, "") ) Builtins.y2milestone( diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-installation-3.1.132/src/include/installation/inst_inc_first.rb new/yast2-installation-3.1.134/src/include/installation/inst_inc_first.rb --- old/yast2-installation-3.1.132/src/include/installation/inst_inc_first.rb 2015-02-11 10:34:11.000000000 +0100 +++ new/yast2-installation-3.1.134/src/include/installation/inst_inc_first.rb 2015-02-19 12:14:12.000000000 +0100 @@ -172,45 +172,18 @@ end def HandleSecondStageRequired - if Stage.initial - # the current one is 'initial' - run_second_stage = true - if (Mode.autoinst || Mode.autoupgrade) && !AutoinstConfig.second_stage - run_second_stage = false - Builtins.y2milestone("Autoyast: second stage is disabled") - else - # after reboot/kexec it would be 'continue' - stage_to_check = "continue" + # file name + run_yast_at_boot = "#{Installation.destdir}/#{Installation.run_yast_at_boot}" - # for matching the control file - mode_to_check = Mode.mode - - # file name - run_yast_at_boot = Builtins.sformat( - "%1/%2", - Installation.destdir, - Installation.run_yast_at_boot - ) - - Builtins.y2milestone( - "Checking RunRequired (%1, %2)", - stage_to_check, - mode_to_check - ) - run_second_stage = ProductControl.RunRequired(stage_to_check, mode_to_check) - end - - if run_second_stage - Builtins.y2milestone("Running the second stage is required") - WFM.Write(path(".local.string"), run_yast_at_boot, "") - WriteSecondStageRequired(true) - else - Builtins.y2milestone("It is not required to run the second stage") - WFM.Execute(path(".local.remove"), run_yast_at_boot) - WriteSecondStageRequired(false) - end + if second_stage_required? + Builtins.y2milestone("Running the second stage is required") + WFM.Write(path(".local.string"), run_yast_at_boot, "") + WriteSecondStageRequired(true) + else + Builtins.y2milestone("It is not required to run the second stage") + WFM.Execute(path(".local.remove"), run_yast_at_boot) + WriteSecondStageRequired(false) end - nil end end diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-installation-3.1.132/src/include/installation/misc.rb new/yast2-installation-3.1.134/src/include/installation/misc.rb --- old/yast2-installation-3.1.132/src/include/installation/misc.rb 2015-02-11 10:34:11.000000000 +0100 +++ new/yast2-installation-3.1.134/src/include/installation/misc.rb 2015-02-19 12:14:12.000000000 +0100 @@ -365,5 +365,30 @@ nil end + + def second_stage_required? + return false unless Stage.initial + + # the current one is 'initial' + if (Mode.autoinst || Mode.autoupgrade) && !AutoinstConfig.second_stage + run_second_stage = false + Builtins.y2milestone("Autoyast: second stage is disabled") + else + # after reboot/kexec it would be 'continue' + stage_to_check = "continue" + + # for matching the control file + mode_to_check = Mode.mode + + Builtins.y2milestone( + "Checking RunRequired (%1, %2)", + stage_to_check, + mode_to_check + ) + run_second_stage = ProductControl.RunRequired(stage_to_check, mode_to_check) + end + + run_second_stage + end end end diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-installation-3.1.132/test/installation_misc_test.rb new/yast2-installation-3.1.134/test/installation_misc_test.rb --- old/yast2-installation-3.1.132/test/installation_misc_test.rb 1970-01-01 01:00:00.000000000 +0100 +++ new/yast2-installation-3.1.134/test/installation_misc_test.rb 2015-02-19 12:14:12.000000000 +0100 @@ -0,0 +1,97 @@ +#! /usr/bin/env rspec + +require_relative "./test_helper" +require_relative "../src/include/installation/misc" + +# a testing class for includign the "misc" include +class InstallationMiscIncludeTest + include Yast::InstallationMiscInclude +end + +# we need to mock these modules +Yast.import "Stage" +Yast.import "Mode" +Yast.import "AutoinstConfig" +Yast.import "ProductControl" + +def stub_initialstage(bool) + allow(Yast::Stage).to receive(:initial).and_return(bool) +end + +def stub_autoinst(bool) + allow(Yast::Mode).to receive(:autoinst).and_return(bool) +end + +def stub_autoupgrade(bool) + allow(Yast::Mode).to receive(:autoupgrade).and_return(bool) +end + +def stub_secondstage(bool) + allow(Yast::AutoinstConfig).to receive(:second_stage).and_return(bool) +end + +describe Yast::InstallationMiscInclude do + subject { InstallationMiscIncludeTest.new } + describe "#second_stage_required?" do + before { allow(Yast::ProductControl).to receive(:RunRequired).and_return(true) } + + it "returns false when in initial stage" do + stub_initialstage(false) + expect(subject.second_stage_required?).to eq false + end + + context "when in autoinst mode" do + before do + stub_autoinst(true) + stub_autoupgrade(false) + stub_initialstage(true) + end + + it "returns true when second stage is defined in autoinst configuration" do + stub_secondstage(true) + expect(subject.second_stage_required?).to eq true + end + + it "returns false when second stage is not defined in autoinst configuration" do + stub_secondstage(false) + expect(subject.second_stage_required?).to eq false + end + end + + context "when in autoupgrade mode" do + before do + stub_autoinst(false) + stub_autoupgrade(true) + stub_initialstage(true) + end + + it "returns true when second stage is defined in autoinst configuration" do + stub_secondstage(true) + expect(subject.second_stage_required?).to eq true + end + + it "returns false when second stage is not defined in autoinst configuration" do + stub_secondstage(false) + expect(subject.second_stage_required?).to eq false + end + end + + context "when in neiter in autoinst nor in autoupgrade mode" do + before do + stub_autoinst(false) + stub_autoupgrade(false) + stub_initialstage(true) + end + + it "returns true when second stage is defined in autoinst configuration" do + stub_secondstage(true) + expect(subject.second_stage_required?).to eq true + end + + it "returns true when second stage is not defined in autoinst configuration" do + stub_secondstage(false) + expect(subject.second_stage_required?).to eq true + end + end + end +end -- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0

commit kiwi for openSUSE:Factory
by root＠hilbert.suse.de 22 Feb '15

22 Feb '15

Hello community, here is the log from the commit of package kiwi for openSUSE:Factory checked in at 2015-02-22 17:25:11 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ 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-02-10 20:20:46.000000000 +0100 +++ /work/SRC/openSUSE:Factory/.kiwi.new/kiwi.changes 2015-02-22 17:25:13.000000000 +0100 @@ -1,0 +2,43 @@ +Thu Feb 12 11:01:59 CET 2015 - ms(a)suse.de + +- v7.02.26 released + +------------------------------------------------------------------- +Wed Feb 11 17:54:17 CET 2015 - ms(a)suse.de + +- Make sure cleanupRPMDatabase is called correctly + + The function also has to be called if there are packages + to delete in the queue and not only if there are packages + to install in the queue + +------------------------------------------------------------------- +Wed Feb 11 17:32:15 CET 2015 - ms(a)suse.de + +- Explicitly add kbd package to boot images + +------------------------------------------------------------------- +Wed Feb 11 17:12:55 CET 2015 - ms(a)suse.de + +- Make sure the default console font is setup + + While kiwi runs fbiterm the default console font is not + properly restored when the session ends. In order to enter + the system with a correctly initialized console font + kiwi actively calls setfont with the default8x16 font. + This is related to (bnc #879994) + +------------------------------------------------------------------- +Wed Feb 11 15:06:15 CET 2015 - schwab(a)suse.de + +- Remove obsolete 12.2 templates + +------------------------------------------------------------------- +Tue Feb 10 12:19:58 CET 2015 - jmason(a)suse.de + +- Move the vhdfixed tag to 64K offset. + + The tag specification calls for moving the tag from a 16K offset to a 64K + offset to avoid conflicting with the GPT. + +------------------------------------------------------------------- ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ kiwi.spec ++++++ --- /var/tmp/diff_new_pack.bdf2ve/_old 2015-02-22 17:25:15.000000000 +0100 +++ /var/tmp/diff_new_pack.bdf2ve/_new 2015-02-22 17:25:15.000000000 +0100 @@ -26,7 +26,7 @@ Group: System/Management Url: http://github.com/openSUSE/kiwi Name: kiwi -Version: 7.02.25 +Version: 7.02.26 Release: 0 Provides: kiwi-image:lxc Provides: kiwi-image:tbz ++++++ 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 2014-12-19 08:24:00.000000000 +0100 +++ new/kiwi/.revision 2014-12-15 14:32:44.000000000 +0100 @@ -1 +1 @@ -859dc050fac040e3b3bb7fdb3ea81af4fc4bd02a +18a16424da55c8ecd8c1f047b45c248cf2a240d7 diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kiwi/metadata/KIWIConfig.xml new/kiwi/metadata/KIWIConfig.xml --- old/kiwi/metadata/KIWIConfig.xml 2014-12-03 22:03:57.000000000 +0100 +++ new/kiwi/metadata/KIWIConfig.xml 2015-02-11 17:02:34.000000000 +0100 @@ -26,6 +26,7 @@ locations except for the ones listed here --> <strip type="tools"> + <file name="setfont"/> <file name="lvmetad"/> <file name="loadkeys"/> <file name="klogconsole"/> 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-02-09 11:43:23.000000000 +0100 +++ new/kiwi/modules/KIWIGlobals.pm 2015-02-12 11:01:54.000000000 +0100 @@ -1837,7 +1837,7 @@ # Globals (generic) #------------------------------------------ my %data; - $data{Version} = "7.02.25"; + $data{Version} = "7.02.26"; $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/KIWIImageFormat.pm new/kiwi/modules/KIWIImageFormat.pm --- old/kiwi/modules/KIWIImageFormat.pm 2014-12-19 08:24:00.000000000 +0100 +++ new/kiwi/modules/KIWIImageFormat.pm 2015-02-11 16:59:10.000000000 +0100 @@ -1293,13 +1293,13 @@ # /.../ # Azure service uses a tag injected into the disk # image to identify the OS. The tag is 512B long, - # starting with a GUID, and is placed at a 16K offset + # starting with a GUID, and is placed at a 64K offset # from the start of the disk image. # # +------------------------------+ # | jump | GUID(16B)000... | # +------------------------------| - # | 16K offset | TAG (512B) | + # | 64K offset | TAG (512B) | # +------------+-----------------+ # # Fixed-format VHD @@ -1340,10 +1340,10 @@ return; } #========================================== - # seek to 16k offset and zero out 512 byte + # seek to 64k offset and zero out 512 byte #------------------------------------------ sysread ($null_fh,$buffer, 512); close ($null_fh); - seek $FD,16384,0; + seek $FD,65536,0; $done = syswrite ($FD,$buffer); if ((! $done) || ($done != 512)) { $kiwi -> failed (); @@ -1358,9 +1358,9 @@ return; } #========================================== - # seek back to 16k offset + # seek back to 64k offset #------------------------------------------ - seek $FD,16384,0; + seek $FD,65536,0; #========================================== # write 16 bytes GUID #------------------------------------------ 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-01-30 21:18:58.000000000 +0100 +++ new/kiwi/modules/KIWILinuxRC.sh 2015-02-11 17:10:01.000000000 +0100 @@ -22,6 +22,7 @@ export ELOG_FILE=/var/log/boot.kiwi export TRANSFER_ERRORS_FILE=/tmp/transfer.errors export UFONT=/usr/share/fbiterm/fonts/b16.pcf.gz +export CONSOLE_FONT=/usr/share/kbd/consolefonts/default8x16.gz export HYBRID_PERSISTENT_FS=btrfs export HYBRID_PERSISTENT_OPTS="" export HYBRID_PERSISTENT_ID=83 @@ -7787,6 +7788,10 @@ local reboot=no local option=${kernel_cmdline[@]} #====================================== + # Set active console to default font + #-------------------------------------- + setupConsoleFont + #====================================== # check for init kernel option #-------------------------------------- if [ -z "$init" ];then @@ -10345,6 +10350,12 @@ fi } #====================================== +# setupConsoleFont +#-------------------------------------- +function setupConsoleFont { + setfont $CONSOLE_FONT +} +#====================================== # setupConsole #-------------------------------------- function setupConsole { diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kiwi/modules/KIWIManager.pm new/kiwi/modules/KIWIManager.pm --- old/kiwi/modules/KIWIManager.pm 2014-11-12 20:53:42.000000000 +0100 +++ new/kiwi/modules/KIWIManager.pm 2015-02-11 18:06:51.000000000 +0100 @@ -314,6 +314,34 @@ } #========================================== +# setupDeletePackages +#------------------------------------------ +sub setupDeletePackages { + # ... + # create the delete packages list from the information + # of the package types delete. Store the result in the + # object pointer + # --- + my $this = shift; + my $kiwi = $this->{kiwi}; + my $xml = $this->{xml}; + #========================================== + # check cached result + #------------------------------------------ + if (defined $this->{delete_packlist}) { + return @{$this->{delete_packlist}}; + } + my @delete_packs; + my $deletePacks = $xml -> getPackagesToDelete(); + for my $package (@{$deletePacks}) { + my $name = $package -> getName(); + push @delete_packs,$name; + } + $this->{delete_packlist} = \@delete_packs; + return @delete_packs; +} + +#========================================== # setupInstallPackages #------------------------------------------ sub setupInstallPackages { @@ -651,13 +679,14 @@ # ... # try to fix rpm version incompatibility # --- - my $this = shift; - my @kchroot = @{$this->{kchroot}}; - my @packlist = $this -> setupInstallPackages(); + my $this = shift; + my @kchroot = @{$this->{kchroot}}; + my @packlist = $this -> setupInstallPackages(); + my @deletelist = $this -> setupDeletePackages(); #========================================== # cleanup baselibs #------------------------------------------ - if (@packlist) { + if ((@packlist) || (@deletelist)) { if (! $this -> cleanupRPMDatabase()) { return; } diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kiwi/system/boot/armv7l/oemboot/suse-12.3/config.xml new/kiwi/system/boot/armv7l/oemboot/suse-12.3/config.xml --- old/kiwi/system/boot/armv7l/oemboot/suse-12.3/config.xml 2014-08-01 21:00:47.000000000 +0200 +++ new/kiwi/system/boot/armv7l/oemboot/suse-12.3/config.xml 2015-02-11 17:29:51.000000000 +0100 @@ -79,6 +79,7 @@ <source path="obs://openSUSE:/Factory:/ARM/standard"/> </repository> <packages type="bootstrap"> + <package name="kbd"/> <package name="atftp"/> <package name="bc"/> <package name="bind-libs"/> diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kiwi/system/boot/armv7l/oemboot/suse-13.1/config.xml new/kiwi/system/boot/armv7l/oemboot/suse-13.1/config.xml --- old/kiwi/system/boot/armv7l/oemboot/suse-13.1/config.xml 2014-08-01 21:00:47.000000000 +0200 +++ new/kiwi/system/boot/armv7l/oemboot/suse-13.1/config.xml 2015-02-11 17:29:51.000000000 +0100 @@ -79,6 +79,7 @@ <source path="obs://openSUSE:/Factory:/ARM/standard"/> </repository> <packages type="bootstrap"> + <package name="kbd"/> <package name="atftp"/> <package name="bc"/> <package name="bind-libs"/> diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kiwi/system/boot/armv7l/oemboot/suse-13.2/config.xml new/kiwi/system/boot/armv7l/oemboot/suse-13.2/config.xml --- old/kiwi/system/boot/armv7l/oemboot/suse-13.2/config.xml 2014-08-09 18:58:58.000000000 +0200 +++ new/kiwi/system/boot/armv7l/oemboot/suse-13.2/config.xml 2015-02-11 17:29:51.000000000 +0100 @@ -80,6 +80,7 @@ <source path="obs://openSUSE:/Factory:/ARM/standard"/> </repository> <packages type="bootstrap"> + <package name="kbd"/> <package name="atftp"/> <package name="bc"/> <package name="bind-libs"/> diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kiwi/system/boot/ix86/isoboot/rhel-06.0/config.xml new/kiwi/system/boot/ix86/isoboot/rhel-06.0/config.xml --- old/kiwi/system/boot/ix86/isoboot/rhel-06.0/config.xml 2014-11-25 17:19:48.000000000 +0100 +++ new/kiwi/system/boot/ix86/isoboot/rhel-06.0/config.xml 2015-02-11 17:31:44.000000000 +0100 @@ -71,6 +71,7 @@ </packages> <packages type="image" profiles="custom"></packages> <packages type="bootstrap"> + <package name="kbd"/> <package name="basesystem"/> <package name="filesystem"/> </packages> diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kiwi/system/boot/ix86/isoboot/rhel-07.0/config.xml new/kiwi/system/boot/ix86/isoboot/rhel-07.0/config.xml --- old/kiwi/system/boot/ix86/isoboot/rhel-07.0/config.xml 2014-11-25 17:19:51.000000000 +0100 +++ new/kiwi/system/boot/ix86/isoboot/rhel-07.0/config.xml 2015-02-11 17:31:42.000000000 +0100 @@ -78,6 +78,7 @@ </packages> <packages type="image" profiles="custom"></packages> <packages type="bootstrap"> + <package name="kbd"/> <package name="basesystem"/> <package name="filesystem"/> </packages> diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kiwi/system/boot/ix86/isoboot/suse-12.3/config.xml new/kiwi/system/boot/ix86/isoboot/suse-12.3/config.xml --- old/kiwi/system/boot/ix86/isoboot/suse-12.3/config.xml 2014-11-25 17:19:50.000000000 +0100 +++ new/kiwi/system/boot/ix86/isoboot/suse-12.3/config.xml 2015-02-11 17:31:45.000000000 +0100 @@ -100,6 +100,7 @@ </packages> <packages type="image" profiles="custom"></packages> <packages type="bootstrap"> + <package name="kbd"/> <package name="adaptec-firmware"/> <package name="btrfsprogs"/> <package name="bind-libs"/> diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kiwi/system/boot/ix86/isoboot/suse-13.1/config.xml new/kiwi/system/boot/ix86/isoboot/suse-13.1/config.xml --- old/kiwi/system/boot/ix86/isoboot/suse-13.1/config.xml 2014-11-25 17:19:48.000000000 +0100 +++ new/kiwi/system/boot/ix86/isoboot/suse-13.1/config.xml 2015-02-11 17:31:43.000000000 +0100 @@ -101,6 +101,7 @@ </packages> <packages type="image" profiles="custom"></packages> <packages type="bootstrap"> + <package name="kbd"/> <package name="adaptec-firmware"/> <package name="btrfsprogs"/> <package name="bind-libs"/> diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kiwi/system/boot/ix86/isoboot/suse-13.2/config.xml new/kiwi/system/boot/ix86/isoboot/suse-13.2/config.xml --- old/kiwi/system/boot/ix86/isoboot/suse-13.2/config.xml 2014-11-25 17:19:51.000000000 +0100 +++ new/kiwi/system/boot/ix86/isoboot/suse-13.2/config.xml 2015-02-11 17:31:44.000000000 +0100 @@ -100,6 +100,7 @@ </packages> <packages type="image" profiles="custom"></packages> <packages type="bootstrap"> + <package name="kbd"/> <package name="adaptec-firmware"/> <package name="btrfsprogs"/> <package name="bind-libs"/> diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kiwi/system/boot/ix86/isoboot/suse-SLED11/config.xml new/kiwi/system/boot/ix86/isoboot/suse-SLED11/config.xml --- old/kiwi/system/boot/ix86/isoboot/suse-SLED11/config.xml 2014-11-25 17:19:52.000000000 +0100 +++ new/kiwi/system/boot/ix86/isoboot/suse-SLED11/config.xml 2015-02-11 17:31:41.000000000 +0100 @@ -89,6 +89,7 @@ </packages> <packages type="bootstrap" profiles="custom"></packages> <packages type="bootstrap"> + <package name="kbd"/> <package name="bind-libs"/> <package name="bind-utils"/> <package name="bootsplash"/> diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kiwi/system/boot/ix86/isoboot/suse-SLED12/config.xml new/kiwi/system/boot/ix86/isoboot/suse-SLED12/config.xml --- old/kiwi/system/boot/ix86/isoboot/suse-SLED12/config.xml 2014-11-25 17:19:49.000000000 +0100 +++ new/kiwi/system/boot/ix86/isoboot/suse-SLED12/config.xml 2015-02-11 17:31:45.000000000 +0100 @@ -94,6 +94,7 @@ </packages> <packages type="image" profiles="custom"></packages> <packages type="bootstrap"> + <package name="kbd"/> <package name="adaptec-firmware"/> <package name="btrfsprogs"/> <package name="bind-libs"/> diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kiwi/system/boot/ix86/isoboot/suse-SLES11/config.xml new/kiwi/system/boot/ix86/isoboot/suse-SLES11/config.xml --- old/kiwi/system/boot/ix86/isoboot/suse-SLES11/config.xml 2014-11-25 17:19:52.000000000 +0100 +++ new/kiwi/system/boot/ix86/isoboot/suse-SLES11/config.xml 2015-02-11 17:31:43.000000000 +0100 @@ -89,6 +89,7 @@ </packages> <packages type="bootstrap" profiles="custom"></packages> <packages type="bootstrap"> + <package name="kbd"/> <package name="adaptec-firmware"/> <package name="bind-libs"/> <package name="bind-utils"/> diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kiwi/system/boot/ix86/isoboot/suse-SLES12/config.xml new/kiwi/system/boot/ix86/isoboot/suse-SLES12/config.xml --- old/kiwi/system/boot/ix86/isoboot/suse-SLES12/config.xml 2014-11-25 17:19:50.000000000 +0100 +++ new/kiwi/system/boot/ix86/isoboot/suse-SLES12/config.xml 2015-02-11 17:31:42.000000000 +0100 @@ -94,6 +94,7 @@ </packages> <packages type="image" profiles="custom"></packages> <packages type="bootstrap"> + <package name="kbd"/> <package name="adaptec-firmware"/> <package name="btrfsprogs"/> <package name="bind-libs"/> diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kiwi/system/boot/ix86/netboot/suse-12.3/config.xml new/kiwi/system/boot/ix86/netboot/suse-12.3/config.xml --- old/kiwi/system/boot/ix86/netboot/suse-12.3/config.xml 2014-11-25 17:20:00.000000000 +0100 +++ new/kiwi/system/boot/ix86/netboot/suse-12.3/config.xml 2015-02-11 17:31:31.000000000 +0100 @@ -202,6 +202,7 @@ </packages> <packages type="image" profiles="custom"></packages> <packages type="bootstrap"> + <package name="kbd"/> <package name="atftp"/> <package name="bc"/> <package name="busybox"/> diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kiwi/system/boot/ix86/netboot/suse-13.1/config.xml new/kiwi/system/boot/ix86/netboot/suse-13.1/config.xml --- old/kiwi/system/boot/ix86/netboot/suse-13.1/config.xml 2014-11-25 17:19:58.000000000 +0100 +++ new/kiwi/system/boot/ix86/netboot/suse-13.1/config.xml 2015-02-11 17:31:29.000000000 +0100 @@ -203,6 +203,7 @@ </packages> <packages type="image" profiles="custom"></packages> <packages type="bootstrap"> + <package name="kbd"/> <package name="atftp"/> <package name="bc"/> <package name="busybox"/> diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kiwi/system/boot/ix86/netboot/suse-13.2/config.xml new/kiwi/system/boot/ix86/netboot/suse-13.2/config.xml --- old/kiwi/system/boot/ix86/netboot/suse-13.2/config.xml 2014-11-25 17:20:00.000000000 +0100 +++ new/kiwi/system/boot/ix86/netboot/suse-13.2/config.xml 2015-02-11 17:31:30.000000000 +0100 @@ -200,6 +200,7 @@ </packages> <packages type="image" profiles="custom"></packages> <packages type="bootstrap"> + <package name="kbd"/> <package name="atftp"/> <package name="bc"/> <package name="busybox"/> diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kiwi/system/boot/ix86/netboot/suse-SLED11/config.xml new/kiwi/system/boot/ix86/netboot/suse-SLED11/config.xml --- old/kiwi/system/boot/ix86/netboot/suse-SLED11/config.xml 2014-11-25 17:20:01.000000000 +0100 +++ new/kiwi/system/boot/ix86/netboot/suse-SLED11/config.xml 2015-02-11 17:31:28.000000000 +0100 @@ -214,6 +214,7 @@ </packages> <packages type="bootstrap" profiles="custom"></packages> <packages type="bootstrap"> + <package name="kbd"/> <package name="dialog"/> <package name="fbiterm"/> <package name="filesystem"/> diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kiwi/system/boot/ix86/netboot/suse-SLED12/config.xml new/kiwi/system/boot/ix86/netboot/suse-SLED12/config.xml --- old/kiwi/system/boot/ix86/netboot/suse-SLED12/config.xml 2014-11-25 17:19:59.000000000 +0100 +++ new/kiwi/system/boot/ix86/netboot/suse-SLED12/config.xml 2015-02-11 17:31:30.000000000 +0100 @@ -193,6 +193,7 @@ </packages> <packages type="image" profiles="custom"></packages> <packages type="bootstrap"> + <package name="kbd"/> <package name="atftp"/> <package name="bc"/> <package name="busybox"/> diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kiwi/system/boot/ix86/netboot/suse-SLES11/config.xml new/kiwi/system/boot/ix86/netboot/suse-SLES11/config.xml --- old/kiwi/system/boot/ix86/netboot/suse-SLES11/config.xml 2014-11-25 17:20:01.000000000 +0100 +++ new/kiwi/system/boot/ix86/netboot/suse-SLES11/config.xml 2015-02-11 17:31:29.000000000 +0100 @@ -220,6 +220,7 @@ </packages> <packages type="bootstrap" profiles="custom"></packages> <packages type="bootstrap"> + <package name="kbd"/> <package name="dialog"/> <package name="fbiterm"/> <package name="filesystem"/> 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 2014-11-25 17:19:59.000000000 +0100 +++ new/kiwi/system/boot/ix86/netboot/suse-SLES12/config.xml 2015-02-11 17:31:28.000000000 +0100 @@ -193,6 +193,7 @@ </packages> <packages type="image" profiles="custom"></packages> <packages type="bootstrap"> + <package name="kbd"/> <package name="atftp"/> <package name="bc"/> <package name="busybox"/> diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kiwi/system/boot/ix86/oemboot/rhel-06.0/config.xml new/kiwi/system/boot/ix86/oemboot/rhel-06.0/config.xml --- old/kiwi/system/boot/ix86/oemboot/rhel-06.0/config.xml 2014-11-25 17:19:43.000000000 +0100 +++ new/kiwi/system/boot/ix86/oemboot/rhel-06.0/config.xml 2015-02-11 17:31:35.000000000 +0100 @@ -72,6 +72,7 @@ </packages> <packages type="image" profiles="custom"></packages> <packages type="bootstrap"> + <package name="kbd"/> <package name="filesystem"/> <package name="basesystem"/> </packages> diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kiwi/system/boot/ix86/oemboot/rhel-07.0/config.xml new/kiwi/system/boot/ix86/oemboot/rhel-07.0/config.xml --- old/kiwi/system/boot/ix86/oemboot/rhel-07.0/config.xml 2014-11-25 17:19:46.000000000 +0100 +++ new/kiwi/system/boot/ix86/oemboot/rhel-07.0/config.xml 2015-02-11 17:31:32.000000000 +0100 @@ -84,6 +84,7 @@ </packages> <packages type="image" profiles="custom"></packages> <packages type="bootstrap"> + <package name="kbd"/> <package name="filesystem"/> <package name="basesystem"/> </packages> diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kiwi/system/boot/ix86/oemboot/suse-12.3/config.xml new/kiwi/system/boot/ix86/oemboot/suse-12.3/config.xml --- old/kiwi/system/boot/ix86/oemboot/suse-12.3/config.xml 2014-11-25 17:19:45.000000000 +0100 +++ new/kiwi/system/boot/ix86/oemboot/suse-12.3/config.xml 2015-02-11 17:31:36.000000000 +0100 @@ -112,6 +112,7 @@ </packages> <packages type="image" profiles="custom"></packages> <packages type="bootstrap"> + <package name="kbd"/> <package name="adaptec-firmware"/> <package name="atftp"/> <package name="bc"/> diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kiwi/system/boot/ix86/oemboot/suse-13.1/config.xml new/kiwi/system/boot/ix86/oemboot/suse-13.1/config.xml --- old/kiwi/system/boot/ix86/oemboot/suse-13.1/config.xml 2014-11-25 17:19:43.000000000 +0100 +++ new/kiwi/system/boot/ix86/oemboot/suse-13.1/config.xml 2015-02-11 17:31:33.000000000 +0100 @@ -112,6 +112,7 @@ </packages> <packages type="image" profiles="custom"></packages> <packages type="bootstrap"> + <package name="kbd"/> <package name="gptfdisk"/> <package name="adaptec-firmware"/> <package name="atftp"/> diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kiwi/system/boot/ix86/oemboot/suse-13.2/config.xml new/kiwi/system/boot/ix86/oemboot/suse-13.2/config.xml --- old/kiwi/system/boot/ix86/oemboot/suse-13.2/config.xml 2014-11-25 17:19:46.000000000 +0100 +++ new/kiwi/system/boot/ix86/oemboot/suse-13.2/config.xml 2015-02-11 17:31:34.000000000 +0100 @@ -114,6 +114,7 @@ </packages> <packages type="image" profiles="custom"></packages> <packages type="bootstrap"> + <package name="kbd"/> <package name="gptfdisk"/> <package name="adaptec-firmware"/> <package name="atftp"/> diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kiwi/system/boot/ix86/oemboot/suse-SLED11/config.xml new/kiwi/system/boot/ix86/oemboot/suse-SLED11/config.xml --- old/kiwi/system/boot/ix86/oemboot/suse-SLED11/config.xml 2014-11-25 17:19:47.000000000 +0100 +++ new/kiwi/system/boot/ix86/oemboot/suse-SLED11/config.xml 2015-02-11 17:31:31.000000000 +0100 @@ -102,6 +102,7 @@ <package name="kernel-rt-base"/> </packages> <packages type="bootstrap"> + <package name="kbd"/> <package name="bc"/> <package name="bind-libs"/> <package name="bind-utils"/> @@ -143,6 +144,7 @@ </packages> <packages type="bootstrap" profiles="custom"></packages> <packages type="bootstrap"> + <package name="kbd"/> <package name="diffutils"/> <package name="filesystem"/> <package name="glibc"/> diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kiwi/system/boot/ix86/oemboot/suse-SLED12/config.xml new/kiwi/system/boot/ix86/oemboot/suse-SLED12/config.xml --- old/kiwi/system/boot/ix86/oemboot/suse-SLED12/config.xml 2014-11-25 17:19:44.000000000 +0100 +++ new/kiwi/system/boot/ix86/oemboot/suse-SLED12/config.xml 2015-02-11 17:31:35.000000000 +0100 @@ -105,6 +105,7 @@ </packages> <packages type="image" profiles="custom"></packages> <packages type="bootstrap"> + <package name="kbd"/> <package name="gptfdisk"/> <package name="adaptec-firmware"/> <package name="atftp"/> diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kiwi/system/boot/ix86/oemboot/suse-SLES11/config.xml new/kiwi/system/boot/ix86/oemboot/suse-SLES11/config.xml --- old/kiwi/system/boot/ix86/oemboot/suse-SLES11/config.xml 2014-11-25 17:19:47.000000000 +0100 +++ new/kiwi/system/boot/ix86/oemboot/suse-SLES11/config.xml 2015-02-11 17:31:34.000000000 +0100 @@ -105,6 +105,7 @@ <package name="kernel-rt-base"/> </packages> <packages type="bootstrap"> + <package name="kbd"/> <package name="adaptec-firmware"/> <package name="atftp"/> <package name="bc"/> @@ -153,6 +154,7 @@ </packages> <packages type="bootstrap" profiles="custom"></packages> <packages type="bootstrap"> + <package name="kbd"/> <package name="diffutils"/> <package name="filesystem"/> <package name="glibc"/> 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 2014-11-25 17:19:45.000000000 +0100 +++ new/kiwi/system/boot/ix86/oemboot/suse-SLES12/config.xml 2015-02-11 17:31:32.000000000 +0100 @@ -108,6 +108,7 @@ </packages> <packages type="image" profiles="custom"></packages> <packages type="bootstrap"> + <package name="kbd"/> <package name="gptfdisk"/> <package name="adaptec-firmware"/> <package name="atftp"/> diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kiwi/system/boot/ix86/vmxboot/rhel-06.0/config.xml new/kiwi/system/boot/ix86/vmxboot/rhel-06.0/config.xml --- old/kiwi/system/boot/ix86/vmxboot/rhel-06.0/config.xml 2014-11-25 17:19:54.000000000 +0100 +++ new/kiwi/system/boot/ix86/vmxboot/rhel-06.0/config.xml 2015-02-11 17:31:39.000000000 +0100 @@ -67,6 +67,7 @@ </packages> <packages type="image" profiles="custom"></packages> <packages type="bootstrap"> + <package name="kbd"/> <package name="filesystem"/> <package name="basesystem"/> </packages> diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kiwi/system/boot/ix86/vmxboot/rhel-07.0/config.xml new/kiwi/system/boot/ix86/vmxboot/rhel-07.0/config.xml --- old/kiwi/system/boot/ix86/vmxboot/rhel-07.0/config.xml 2014-11-25 17:19:56.000000000 +0100 +++ new/kiwi/system/boot/ix86/vmxboot/rhel-07.0/config.xml 2015-02-11 17:31:37.000000000 +0100 @@ -71,6 +71,7 @@ </packages> <packages type="image" profiles="custom"></packages> <packages type="bootstrap"> + <package name="kbd"/> <package name="filesystem"/> <package name="basesystem"/> </packages> diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kiwi/system/boot/ix86/vmxboot/suse-12.3/config.xml new/kiwi/system/boot/ix86/vmxboot/suse-12.3/config.xml --- old/kiwi/system/boot/ix86/vmxboot/suse-12.3/config.xml 2014-11-25 17:19:55.000000000 +0100 +++ new/kiwi/system/boot/ix86/vmxboot/suse-12.3/config.xml 2015-02-11 17:31:40.000000000 +0100 @@ -99,6 +99,7 @@ </packages> <packages type="image" profiles="custom"></packages> <packages type="bootstrap"> + <package name="kbd"/> <package name="bind-libs"/> <package name="bind-utils"/> <package name="btrfsprogs"/> diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kiwi/system/boot/ix86/vmxboot/suse-13.1/config.xml new/kiwi/system/boot/ix86/vmxboot/suse-13.1/config.xml --- old/kiwi/system/boot/ix86/vmxboot/suse-13.1/config.xml 2014-11-25 17:19:53.000000000 +0100 +++ new/kiwi/system/boot/ix86/vmxboot/suse-13.1/config.xml 2015-02-11 17:31:38.000000000 +0100 @@ -99,6 +99,7 @@ </packages> <packages type="image" profiles="custom"></packages> <packages type="bootstrap"> + <package name="kbd"/> <package name="bind-libs"/> <package name="bind-utils"/> <package name="btrfsprogs"/> diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kiwi/system/boot/ix86/vmxboot/suse-13.2/config.xml new/kiwi/system/boot/ix86/vmxboot/suse-13.2/config.xml --- old/kiwi/system/boot/ix86/vmxboot/suse-13.2/config.xml 2014-11-25 17:19:56.000000000 +0100 +++ new/kiwi/system/boot/ix86/vmxboot/suse-13.2/config.xml 2015-02-11 17:31:39.000000000 +0100 @@ -101,6 +101,7 @@ </packages> <packages type="image" profiles="custom"></packages> <packages type="bootstrap"> + <package name="kbd"/> <package name="bind-libs"/> <package name="bind-utils"/> <package name="btrfsprogs"/> diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kiwi/system/boot/ix86/vmxboot/suse-SLED11/config.xml new/kiwi/system/boot/ix86/vmxboot/suse-SLED11/config.xml --- old/kiwi/system/boot/ix86/vmxboot/suse-SLED11/config.xml 2014-11-25 17:19:57.000000000 +0100 +++ new/kiwi/system/boot/ix86/vmxboot/suse-SLED11/config.xml 2015-02-11 17:31:36.000000000 +0100 @@ -91,6 +91,7 @@ <package name="kernel-ec2-base"/> </packages> <packages type="bootstrap"> + <package name="kbd"/> <package name="bind-libs"/> <package name="bind-utils"/> <package name="bootsplash"/> @@ -121,6 +122,7 @@ </packages> <packages type="bootstrap" profiles="custom"></packages> <packages type="bootstrap"> + <package name="kbd"/> <package name="diffutils"/> <package name="filesystem"/> <package name="glibc"/> diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kiwi/system/boot/ix86/vmxboot/suse-SLED12/config.xml new/kiwi/system/boot/ix86/vmxboot/suse-SLED12/config.xml --- old/kiwi/system/boot/ix86/vmxboot/suse-SLED12/config.xml 2014-11-25 17:19:54.000000000 +0100 +++ new/kiwi/system/boot/ix86/vmxboot/suse-SLED12/config.xml 2015-02-11 17:31:40.000000000 +0100 @@ -92,6 +92,7 @@ </packages> <packages type="image" profiles="custom"></packages> <packages type="bootstrap"> + <package name="kbd"/> <package name="bind-libs"/> <package name="bind-utils"/> <package name="btrfsprogs"/> diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kiwi/system/boot/ix86/vmxboot/suse-SLES11/config.xml new/kiwi/system/boot/ix86/vmxboot/suse-SLES11/config.xml --- old/kiwi/system/boot/ix86/vmxboot/suse-SLES11/config.xml 2014-11-25 17:19:57.000000000 +0100 +++ new/kiwi/system/boot/ix86/vmxboot/suse-SLES11/config.xml 2015-02-11 17:31:38.000000000 +0100 @@ -94,6 +94,7 @@ <package name="kernel-ec2-base"/> </packages> <packages type="bootstrap"> + <package name="kbd"/> <package name="bind-libs"/> <package name="bind-utils"/> <package name="bootsplash"/> @@ -127,6 +128,7 @@ </packages> <packages type="bootstrap" profiles="custom"></packages> <packages type="bootstrap"> + <package name="kbd"/> <package name="diffutils"/> <package name="filesystem"/> <package name="glibc"/> 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 2014-11-25 17:19:55.000000000 +0100 +++ new/kiwi/system/boot/ix86/vmxboot/suse-SLES12/config.xml 2015-02-11 17:31:37.000000000 +0100 @@ -95,6 +95,7 @@ </packages> <packages type="image" profiles="custom"></packages> <packages type="bootstrap"> + <package name="kbd"/> <package name="bind-libs"/> <package name="bind-utils"/> <package name="btrfsprogs"/> diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kiwi/system/boot/ppc/netboot/suse-SLES11/config.xml new/kiwi/system/boot/ppc/netboot/suse-SLES11/config.xml --- old/kiwi/system/boot/ppc/netboot/suse-SLES11/config.xml 2014-08-01 21:00:47.000000000 +0200 +++ new/kiwi/system/boot/ppc/netboot/suse-SLES11/config.xml 2015-02-11 17:29:51.000000000 +0100 @@ -191,6 +191,7 @@ </packages> <packages type="image" profiles="custom"></packages> <packages type="bootstrap"> + <package name="kbd"/> <package name="dialog"/> <package name="fbiterm"/> <package name="filesystem"/> diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kiwi/system/boot/ppc/netboot/suse-SLES12/config.xml new/kiwi/system/boot/ppc/netboot/suse-SLES12/config.xml --- old/kiwi/system/boot/ppc/netboot/suse-SLES12/config.xml 2014-08-09 18:58:58.000000000 +0200 +++ new/kiwi/system/boot/ppc/netboot/suse-SLES12/config.xml 2015-02-11 17:29:51.000000000 +0100 @@ -109,6 +109,7 @@ <package name="xfsprogs"/> </packages> <packages type="bootstrap"> + <package name="kbd"/> <package name="atftp"/> <package name="bc"/> <package name="busybox"/> diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kiwi/system/boot/ppc/oemboot/suse-SLES11/config.xml new/kiwi/system/boot/ppc/oemboot/suse-SLES11/config.xml --- old/kiwi/system/boot/ppc/oemboot/suse-SLES11/config.xml 2014-08-01 21:00:47.000000000 +0200 +++ new/kiwi/system/boot/ppc/oemboot/suse-SLES11/config.xml 2015-02-11 17:29:51.000000000 +0100 @@ -113,6 +113,7 @@ </packages> <packages type="image" profiles="custom"></packages> <packages type="bootstrap"> + <package name="kbd"/> <package name="diffutils"/> <package name="filesystem"/> <package name="glibc"/> diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kiwi/system/boot/ppc/oemboot/suse-SLES12/config.xml new/kiwi/system/boot/ppc/oemboot/suse-SLES12/config.xml --- old/kiwi/system/boot/ppc/oemboot/suse-SLES12/config.xml 2014-08-09 18:58:58.000000000 +0200 +++ new/kiwi/system/boot/ppc/oemboot/suse-SLES12/config.xml 2015-02-11 17:29:51.000000000 +0100 @@ -85,6 +85,7 @@ </packages> <packages type="image" profiles="custom"></packages> <packages type="bootstrap"> + <package name="kbd"/> <package name="atftp"/> <package name="bc"/> <package name="bind-libs"/> diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kiwi/system/boot/ppc/vmxboot/suse-SLES11/config.xml new/kiwi/system/boot/ppc/vmxboot/suse-SLES11/config.xml --- old/kiwi/system/boot/ppc/vmxboot/suse-SLES11/config.xml 2014-08-01 21:00:47.000000000 +0200 +++ new/kiwi/system/boot/ppc/vmxboot/suse-SLES11/config.xml 2015-02-11 17:29:51.000000000 +0100 @@ -97,6 +97,7 @@ </packages> <packages type="image" profiles="custom"></packages> <packages type="bootstrap"> + <package name="kbd"/> <package name="diffutils"/> <package name="filesystem"/> <package name="glibc"/> diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kiwi/system/boot/ppc/vmxboot/suse-SLES12/config.xml new/kiwi/system/boot/ppc/vmxboot/suse-SLES12/config.xml --- old/kiwi/system/boot/ppc/vmxboot/suse-SLES12/config.xml 2014-08-09 18:58:58.000000000 +0200 +++ new/kiwi/system/boot/ppc/vmxboot/suse-SLES12/config.xml 2015-02-11 17:29:51.000000000 +0100 @@ -85,6 +85,7 @@ </packages> <packages type="image" profiles="custom"></packages> <packages type="bootstrap"> + <package name="kbd"/> <package name="atftp"/> <package name="bc"/> <package name="bind-libs"/> diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kiwi/system/boot/s390/netboot/suse-SLES11/config.xml new/kiwi/system/boot/s390/netboot/suse-SLES11/config.xml --- old/kiwi/system/boot/s390/netboot/suse-SLES11/config.xml 2014-08-01 21:00:47.000000000 +0200 +++ new/kiwi/system/boot/s390/netboot/suse-SLES11/config.xml 2015-02-11 17:29:51.000000000 +0100 @@ -105,6 +105,7 @@ </packages> <packages type="image" profiles="custom"></packages> <packages type="bootstrap"> + <package name="kbd"/> <package name="dialog"/> <package name="fbiterm"/> <package name="filesystem"/> diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kiwi/system/boot/s390/netboot/suse-SLES12/config.xml new/kiwi/system/boot/s390/netboot/suse-SLES12/config.xml --- old/kiwi/system/boot/s390/netboot/suse-SLES12/config.xml 2014-08-09 18:58:58.000000000 +0200 +++ new/kiwi/system/boot/s390/netboot/suse-SLES12/config.xml 2015-02-11 17:29:51.000000000 +0100 @@ -109,6 +109,7 @@ </packages> <packages type="image" profiles="custom"></packages> <packages type="bootstrap"> + <package name="kbd"/> <package name="atftp"/> <package name="bc"/> <package name="busybox"/> diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kiwi/system/boot/s390/oemboot/suse-SLES11/config.xml new/kiwi/system/boot/s390/oemboot/suse-SLES11/config.xml --- old/kiwi/system/boot/s390/oemboot/suse-SLES11/config.xml 2014-08-01 21:00:47.000000000 +0200 +++ new/kiwi/system/boot/s390/oemboot/suse-SLES11/config.xml 2015-02-11 17:29:51.000000000 +0100 @@ -102,6 +102,7 @@ </packages> <packages type="image" profiles="custom"></packages> <packages type="bootstrap"> + <package name="kbd"/> <package name="diffutils"/> <package name="filesystem"/> <package name="glibc"/> diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kiwi/system/boot/s390/oemboot/suse-SLES12/config.xml new/kiwi/system/boot/s390/oemboot/suse-SLES12/config.xml --- old/kiwi/system/boot/s390/oemboot/suse-SLES12/config.xml 2014-10-20 08:29:10.000000000 +0200 +++ new/kiwi/system/boot/s390/oemboot/suse-SLES12/config.xml 2015-02-11 17:29:51.000000000 +0100 @@ -86,6 +86,7 @@ </packages> <packages type="image" profiles="custom"></packages> <packages type="bootstrap"> + <package name="kbd"/> <package name="adaptec-firmware"/> <package name="atftp"/> <package name="bc"/> diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kiwi/system/boot/s390/vmxboot/suse-SLES11/config.xml new/kiwi/system/boot/s390/vmxboot/suse-SLES11/config.xml --- old/kiwi/system/boot/s390/vmxboot/suse-SLES11/config.xml 2014-08-01 21:00:47.000000000 +0200 +++ new/kiwi/system/boot/s390/vmxboot/suse-SLES11/config.xml 2015-02-11 17:29:51.000000000 +0100 @@ -86,6 +86,7 @@ </packages> <packages type="image" profiles="custom"></packages> <packages type="bootstrap"> + <package name="kbd"/> <package name="diffutils"/> <package name="filesystem"/> <package name="glibc"/> diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kiwi/system/boot/s390/vmxboot/suse-SLES12/config.xml new/kiwi/system/boot/s390/vmxboot/suse-SLES12/config.xml --- old/kiwi/system/boot/s390/vmxboot/suse-SLES12/config.xml 2014-10-20 08:29:10.000000000 +0200 +++ new/kiwi/system/boot/s390/vmxboot/suse-SLES12/config.xml 2015-02-11 17:29:51.000000000 +0100 @@ -86,6 +86,7 @@ </packages> <packages type="image" profiles="custom"></packages> <packages type="bootstrap"> + <package name="kbd"/> <package name="adaptec-firmware"/> <package name="atftp"/> <package name="bc"/> diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kiwi/template/armv7l/suse-12.2-JeOS/README new/kiwi/template/armv7l/suse-12.2-JeOS/README --- old/kiwi/template/armv7l/suse-12.2-JeOS/README 2014-07-31 23:12:46.000000000 +0200 +++ new/kiwi/template/armv7l/suse-12.2-JeOS/README 1970-01-01 01:00:00.000000000 +0100 @@ -1,5 +0,0 @@ -Build instructions for local build -================================== -* call kiwi: - kiwi --build suse-12.2-JeOS --set-repo /path/to/12.2/repo \ - -d /tmp/myimage diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kiwi/template/armv7l/suse-12.2-JeOS/config.sh new/kiwi/template/armv7l/suse-12.2-JeOS/config.sh --- old/kiwi/template/armv7l/suse-12.2-JeOS/config.sh 2014-02-05 20:54:28.000000000 +0100 +++ new/kiwi/template/armv7l/suse-12.2-JeOS/config.sh 1970-01-01 01:00:00.000000000 +0100 @@ -1,87 +0,0 @@ -#!/bin/bash -#================ -# FILE : config.sh -#---------------- -# PROJECT : OpenSuSE KIWI Image System -# COPYRIGHT : (c) 2006 SUSE LINUX Products GmbH. All rights reserved -# : -# AUTHOR : Marcus Schaefer <ms(a)suse.de> -# : -# BELONGS TO : Operating System images -# : -# DESCRIPTION : configuration script for SUSE based -# : operating systems -# : -# : -# STATUS : BETA -#---------------- -#====================================== -# Functions... -#-------------------------------------- -test -f /.kconfig && . /.kconfig -test -f /.profile && . /.profile - -#====================================== -# Greeting... -#-------------------------------------- -echo "Configure image: [$kiwi_iname]..." - -#====================================== -# Mount system filesystems -#-------------------------------------- -baseMount - -#====================================== -# Setup baseproduct link -#-------------------------------------- -suseSetupProduct - -#====================================== -# Add missing gpg keys to rpm -#-------------------------------------- -suseImportBuildKey - -#====================================== -# Activate services -#-------------------------------------- -suseInsertService sshd -suseInsertService boot.device-mapper -suseRemoveService avahi-dnsconfd -suseRemoveService avahi-daemon - -#========================================== -# remove package docs -#------------------------------------------ -rm -rf /usr/share/doc/packages/* -rm -rf /usr/share/doc/manual/* -rm -rf /opt/kde* - -#====================================== -# only basic version of vim is -# installed; no syntax highlighting -#-------------------------------------- -sed -i -e's/^syntax on/" syntax on/' /etc/vimrc - -#====================================== -# SuSEconfig -#-------------------------------------- -suseConfig - -#====================================== -# Add Factory repo -#-------------------------------------- -baseRepo="http://download.opensuse.org/repositories/openSUSE:/Factory:/ARM/standard" -baseName="suse-factory" -zypper ar $baseRepo $baseName - -#====================================== -# Remove yast if not in use -#-------------------------------------- -suseRemoveYaST - -#====================================== -# Umount kernel filesystems -#-------------------------------------- -baseCleanMount - -exit 0 diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kiwi/template/armv7l/suse-12.2-JeOS/config.xml new/kiwi/template/armv7l/suse-12.2-JeOS/config.xml --- old/kiwi/template/armv7l/suse-12.2-JeOS/config.xml 2014-08-01 21:00:47.000000000 +0200 +++ new/kiwi/template/armv7l/suse-12.2-JeOS/config.xml 1970-01-01 01:00:00.000000000 +0100 @@ -1,112 +0,0 @@ -<?xml version="1.0" encoding="utf-8"?> - -<image schemaversion="6.1" name="LimeJeOS-12.2"> - <description type="system"> - <author>Marcus Schäfer</author> - <contact>ms(a)novell.com</contact> - <specification> - 12.2 JeOS image for arm (panda/beagle/efika) boards - </specification> - </description> - <profiles> - <profile name="pandaFlavour" description="Kernel/Tools setup for panda boards" import="true"/> - <profile name="efikaFlavour" description="Kernel/Tools setup for efika boards"/> - <profile name="beagleFlavour" description="Kernel/Tools setup for beagle boards"/> - </profiles> - <preferences> - <type image="tbz" primary="true"/> - <version>1.12.2</version> - <packagemanager>zypper</packagemanager> - <locale>en_US</locale> - <keytable>us.map.gz</keytable> - <timezone>Europe/Berlin</timezone> - <hwclock>utc</hwclock> - <rpm-excludedocs>true</rpm-excludedocs> - <bootsplash-theme>openSUSE</bootsplash-theme> - <bootloader-theme>openSUSE</bootloader-theme> - </preferences> - <preferences profiles="pandaFlavour"> - <type image="oem" filesystem="ext3" boot="oemboot/suse-12.2" bootloader="uboot" kernelcmdline="console=ttyO2 vram=16M" editbootconfig="uboot-image-setup" editbootinstall="uboot-image-install"> - <systemdisk/> - <oemconfig> - <oem-swapsize>500</oem-swapsize> - <oem-swap>true</oem-swap> - </oemconfig> - </type> - </preferences> - <preferences profiles="efikaFlavour"> - <type image="oem" filesystem="ext3" boot="oemboot/suse-12.2" bootloader="uboot" kernelcmdline="console=ttymxc0,115200 vram=16M" editbootconfig="uboot-image-setup" editbootinstall="uboot-image-install"> - <systemdisk/> - <oemconfig> - <oem-swapsize>500</oem-swapsize> - <oem-swap>true</oem-swap> - </oemconfig> - </type> - </preferences> - <preferences profiles="beagleFlavour"> - <type image="oem" filesystem="ext3" boot="oemboot/suse-12.2" bootloader="uboot" kernelcmdline="console=ttyO2 vram=16M" editbootconfig="uboot-image-setup" editbootinstall="uboot-image-install"> - <systemdisk/> - <oemconfig> - <oem-swapsize>500</oem-swapsize> - <oem-swap>true</oem-swap> - </oemconfig> - </type> - </preferences> - <users group="root"> - <user password="$1$wYJUgpM5$RXMMeASDc035eX.NbYWFl0" home="/root" name="root"/> - </users> - <repository type="rpm-md"> - <source path="obs://openSUSE:/12.2:/ARM/standard"/> - </repository> - <packages type="bootstrap" profiles="pandaFlavour"> - <package name="kernel-omap2plus" bootinclude="true"/> - <package name="u-boot-omap4panda" bootinclude="true"/> - </packages> - <packages type="bootstrap" profiles="efikaFlavour"> - <package name="kernel-imx51" bootinclude="true"/> - </packages> - <packages type="bootstrap" profiles="beagleFlavour"> - <package name="kernel-omap2plus" bootinclude="true"/> - <package name="u-boot-omap3beagle" bootinclude="true"/> - <package name="x-loader-omap3beagle" bootinclude="true"/> - </packages> - - <strip type="tools"> - <file name="qemu-arm-binfmt"/> - <file name="qemu-arm"/> - </strip> - <packages type="bootstrap"> - - <package name="qemu-linux-user-arm" bootinclude="true"/> - - <package name="ifplugd"/> - <package name="iputils"/> - <package name="vim"/> - <package name="lvm2"/> - <package name="filesystem"/> - <package name="glibc-locale"/> - <package name="cracklib-dict-full"/> - <package name="module-init-tools"/> - <package name="kbd"/> - <package name="aaa_base"/> - <package name="hwinfo"/> - <package name="procps"/> - <package name="sysconfig"/> - <package name="pwdutils"/> - <package name="openssh"/> - <package name="dhcpcd"/> - <package name="insserv"/> - <package name="polkit"/> - <package name="netcfg"/> - <package name="rpcbind"/> - <package name="mkinitrd"/> - <package name="rpm"/> - <package name="rsyslog"/> - <package name="systemd-sysvinit"/> - <package name="u-boot-tools"/> - <package name="less"/> - <package name="zypper"/> - - <archive name="uboot-setup.tgz" bootinclude="true"/> - </packages> -</image> diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kiwi/template/armv7l/suse-12.2-JeOS/root/etc/motd new/kiwi/template/armv7l/suse-12.2-JeOS/root/etc/motd --- old/kiwi/template/armv7l/suse-12.2-JeOS/root/etc/motd 2014-08-01 21:00:47.000000000 +0200 +++ new/kiwi/template/armv7l/suse-12.2-JeOS/root/etc/motd 1970-01-01 01:00:00.000000000 +0100 @@ -1,7 +0,0 @@ -This is the Lime-JeOS 12.1 SuSE Linux System. -To upgrade your system call: - - zypper refresh - zypper install -t product openSUSE-12.1 - -Have a lot of fun... diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kiwi/template/armv7l/suse-12.2-JeOS/root/etc/securetty new/kiwi/template/armv7l/suse-12.2-JeOS/root/etc/securetty --- old/kiwi/template/armv7l/suse-12.2-JeOS/root/etc/securetty 2012-05-31 21:23:56.000000000 +0200 +++ new/kiwi/template/armv7l/suse-12.2-JeOS/root/etc/securetty 1970-01-01 01:00:00.000000000 +0100 @@ -1,11 +0,0 @@ -# -# This file contains the device names of tty lines (one per line, -# without leading /dev/) on which root is allowed to login. -# -tty1 -tty2 -tty3 -tty4 -tty5 -tty6 -ttyO2 diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kiwi/template/armv7l/suse-12.2-JeOS/root/etc/sysconfig/network/ifcfg-eth0 new/kiwi/template/armv7l/suse-12.2-JeOS/root/etc/sysconfig/network/ifcfg-eth0 --- old/kiwi/template/armv7l/suse-12.2-JeOS/root/etc/sysconfig/network/ifcfg-eth0 2012-05-31 21:23:56.000000000 +0200 +++ new/kiwi/template/armv7l/suse-12.2-JeOS/root/etc/sysconfig/network/ifcfg-eth0 1970-01-01 01:00:00.000000000 +0100 @@ -1,4 +0,0 @@ -BOOTPROTO='dhcp' -MTU='' -REMOTE_IPADDR='' -STARTMODE='onboot' diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kiwi/template/armv7l/suse-12.2-JeOS/suse-12.2-JeOS.kiwi new/kiwi/template/armv7l/suse-12.2-JeOS/suse-12.2-JeOS.kiwi --- old/kiwi/template/armv7l/suse-12.2-JeOS/suse-12.2-JeOS.kiwi 2015-02-22 17:25:21.000000000 +0100 +++ new/kiwi/template/armv7l/suse-12.2-JeOS/suse-12.2-JeOS.kiwi 1970-01-01 01:00:00.000000000 +0100 @@ -1 +0,0 @@ -symbolic link to config.xml diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kiwi/template/armv7l/suse-12.2-JeOS/uboot-image-install new/kiwi/template/armv7l/suse-12.2-JeOS/uboot-image-install --- old/kiwi/template/armv7l/suse-12.2-JeOS/uboot-image-install 2014-08-01 21:00:47.000000000 +0200 +++ new/kiwi/template/armv7l/suse-12.2-JeOS/uboot-image-install 1970-01-01 01:00:00.000000000 +0100 @@ -1,22 +0,0 @@ -#!/bin/bash - -set -x - -diskname=$1 - -#========================================== -# install MLO as raw -#------------------------------------------ -if [ -f "boot/MLO" ];then - opt="count=1 seek=1 conv=notrunc" - if ! dd if=boot/MLO of=$diskname bs=128k $opt; then - echo "Couldn't install MLO on $diskname" - exit 1 - fi - # /.../ - # To avoid any issues when parted leaves x86 boot code - # in the MBR we better clear that part of the image - # ---- - dd if=/dev/zero of=$diskname bs=440 count=1 conv=notrunc -fi - diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kiwi/template/armv7l/suse-12.2-JeOS/uboot-image-setup new/kiwi/template/armv7l/suse-12.2-JeOS/uboot-image-setup --- old/kiwi/template/armv7l/suse-12.2-JeOS/uboot-image-setup 2014-08-01 21:00:47.000000000 +0200 +++ new/kiwi/template/armv7l/suse-12.2-JeOS/uboot-image-setup 1970-01-01 01:00:00.000000000 +0100 @@ -1,32 +0,0 @@ -#!/bin/bash - -set -x - -bootfs=$1 - -file=boot/boot.script - -echo 'printenv kerneladdr || setenv kerneladdr ${kernel_addr_r}' >> $file -echo 'printenv ramdiskaddr|| setenv ramdiskaddr ${ramdisk_addr_r}' >> $file -echo -n 'setenv bootcmd "' >> $file -if [[ $bootfs =~ fat ]];then - echo -n 'fatload mmc 0:1 ${kerneladdr} boot/linux.vmx; ' >> $file - echo -n 'fatload mmc 0:1 ${ramdiskaddr} boot/initrd.uboot; ' >> $file -else - echo -n 'ext2load mmc 0:1 ${kerneladdr} boot/linux.vmx; ' >> $file - echo -n 'ext2load mmc 0:1 ${ramdiskaddr} boot/initrd.uboot; ' >> $file -fi -echo 'bootm ${kerneladdr} ${ramdiskaddr}";' >> $file -echo 'boot' >> $file - -#========================================== -# Create machine readable uboot format -#------------------------------------------ -mkopts="-A arm -O linux -a 0 -e 0 -T script -C none"; -inputf="boot/boot.script"; -result="boot/boot.scr"; -if ! mkimage $mkopts -n 'Boot-Script' -d $inputf $result;then - echo "Failed to create uboot script image" - exit 1 -fi - Files old/kiwi/template/armv7l/suse-12.2-JeOS/uboot-setup.tgz and new/kiwi/template/armv7l/suse-12.2-JeOS/uboot-setup.tgz differ -- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0