February 2017 - openSUSE Commits - openSUSE Mailing Lists

commit hspec-setup for openSUSE:Factory
by root＠hilbertn.suse.de 24 Feb '17

24 Feb '17

Hello community, here is the log from the commit of package hspec-setup for openSUSE:Factory checked in at 2017-02-25 00:52:21 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/hspec-setup (Old) and /work/SRC/openSUSE:Factory/.hspec-setup.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "hspec-setup" Changes: -------- New Changes file: --- /dev/null 2017-01-26 09:49:33.150892021 +0100 +++ /work/SRC/openSUSE:Factory/.hspec-setup.new/hspec-setup.changes 2017-02-25 00:52:22.539361590 +0100 @@ -0,0 +1,5 @@ +------------------------------------------------------------------- +Sun Jul 10 17:34:24 UTC 2016 - psimons(a)suse.com + +- Update to version 0.1.1.1 revision 0 with cabal2obs. + New: ---- hspec-setup-0.1.1.1.tar.gz hspec-setup.changes hspec-setup.spec ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ hspec-setup.spec ++++++ # # spec file for package hspec-setup # # Copyright (c) 2016 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 # 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/ # Name: hspec-setup Version: 0.1.1.1 Release: 0 Summary: Add an hspec test-suite in one command License: MIT Group: Development/Languages/Other Url: https://hackage.haskell.org/package/%{name} Source0: https://hackage.haskell.org/package/%{name}-%{version}/%{name}-%{version}.t… BuildRequires: ghc-Cabal-devel BuildRequires: ghc-directory-devel BuildRequires: ghc-filepath-devel BuildRequires: ghc-process-devel BuildRequires: ghc-projectroot-devel BuildRequires: ghc-rpm-macros BuildRoot: %{_tmppath}/%{name}-%{version}-build %description 'hspec-setup' is a command-line tool for adding an hspec test-suite with minimal work. See the <https://github.com/yamadapc/haskell-hspec-setup GitHub README> for more information. %prep %setup -q %build %ghc_bin_build %install %ghc_bin_install %files %defattr(-,root,root,-) %doc LICENSE %{_bindir}/%{name} %changelog

1 0

commit ghc-flexible-defaults for openSUSE:Factory
by root＠hilbertn.suse.de 24 Feb '17

24 Feb '17

Hello community, here is the log from the commit of package ghc-flexible-defaults for openSUSE:Factory checked in at 2017-02-25 00:52:12 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/ghc-flexible-defaults (Old) and /work/SRC/openSUSE:Factory/.ghc-flexible-defaults.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "ghc-flexible-defaults" Changes: -------- New Changes file: --- /dev/null 2017-01-26 09:49:33.150892021 +0100 +++ /work/SRC/openSUSE:Factory/.ghc-flexible-defaults.new/ghc-flexible-defaults.changes 2017-02-25 00:52:13.228790378 +0100 @@ -0,0 +1,5 @@ +------------------------------------------------------------------- +Sun Jul 10 17:28:10 UTC 2016 - psimons(a)suse.com + +- Update to version 0.0.1.2 revision 0 with cabal2obs. + New: ---- flexible-defaults-0.0.1.2.tar.gz ghc-flexible-defaults.changes ghc-flexible-defaults.spec ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ ghc-flexible-defaults.spec ++++++ # # spec file for package ghc-flexible-defaults # # Copyright (c) 2016 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 # 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/ # %global pkg_name flexible-defaults Name: ghc-%{pkg_name} Version: 0.0.1.2 Release: 0 Summary: Generate default function implementations for complex type classes License: SUSE-Public-Domain Group: System/Libraries Url: https://hackage.haskell.org/package/%{pkg_name} Source0: https://hackage.haskell.org/package/%{pkg_name}-%{version}/%{pkg_name}-%{ve… BuildRequires: ghc-Cabal-devel # Begin cabal-rpm deps: BuildRequires: ghc-containers-devel BuildRequires: ghc-rpm-macros BuildRequires: ghc-template-haskell-devel BuildRequires: ghc-th-extras-devel BuildRequires: ghc-transformers-devel BuildRoot: %{_tmppath}/%{name}-%{version}-build # End cabal-rpm deps %description Template Haskell code to implement default implementations for type-class functions based on which functions are already implemented. Currently extremely crude but still fairly effective. When defining a type class with many functions, each of which can be implemented based on arbitrary subsets of the others, the standard default-implementation concept breaks down quite badly. This library provides a system by which more complex rules can be described for choosing default implementations based on which ones the user supplies. These implementations can additionally be given "suitability scores", so that when multiple possible choices could be made, the library can choose the "best" one. %package devel Summary: Haskell %{pkg_name} library development files Group: Development/Libraries/Other Requires: %{name} = %{version}-%{release} Requires: ghc-compiler = %{ghc_version} Requires(post): ghc-compiler = %{ghc_version} Requires(postun): ghc-compiler = %{ghc_version} %description devel This package provides the Haskell %{pkg_name} library development files. %prep %setup -q -n %{pkg_name}-%{version} %build %ghc_lib_build %install %ghc_lib_install %post devel %ghc_pkg_recache %postun devel %ghc_pkg_recache %files -f %{name}.files %defattr(-,root,root,-) %files devel -f %{name}-devel.files %defattr(-,root,root,-) %doc examples %changelog

1 0

commit ghc-acid-state for openSUSE:Factory
by root＠hilbertn.suse.de 24 Feb '17

24 Feb '17

Hello community, here is the log from the commit of package ghc-acid-state for openSUSE:Factory checked in at 2017-02-25 00:51:56 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/ghc-acid-state (Old) and /work/SRC/openSUSE:Factory/.ghc-acid-state.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "ghc-acid-state" Changes: -------- New Changes file: --- /dev/null 2017-01-26 09:49:33.150892021 +0100 +++ /work/SRC/openSUSE:Factory/.ghc-acid-state.new/ghc-acid-state.changes 2017-02-25 00:51:57.863148419 +0100 @@ -0,0 +1,5 @@ +------------------------------------------------------------------- +Sun Jul 10 17:07:15 UTC 2016 - psimons(a)suse.com + +- Update to version 0.14.1 revision 0 with cabal2obs. + New: ---- acid-state-0.14.1.tar.gz ghc-acid-state.changes ghc-acid-state.spec ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ ghc-acid-state.spec ++++++ # # spec file for package ghc-acid-state # # Copyright (c) 2016 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 # 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/ # %global pkg_name acid-state Name: ghc-%{pkg_name} Version: 0.14.1 Release: 0 Summary: Add ACID guarantees to any serializable Haskell data structure License: SUSE-Public-Domain Group: System/Libraries Url: https://hackage.haskell.org/package/%{pkg_name} Source0: https://hackage.haskell.org/package/%{pkg_name}-%{version}/%{pkg_name}-%{ve… BuildRequires: ghc-Cabal-devel # Begin cabal-rpm deps: BuildRequires: ghc-array-devel BuildRequires: ghc-bytestring-devel BuildRequires: ghc-cereal-devel BuildRequires: ghc-containers-devel BuildRequires: ghc-directory-devel BuildRequires: ghc-extensible-exceptions-devel BuildRequires: ghc-filepath-devel BuildRequires: ghc-mtl-devel BuildRequires: ghc-network-devel BuildRequires: ghc-rpm-macros BuildRequires: ghc-safecopy-devel BuildRequires: ghc-stm-devel BuildRequires: ghc-template-haskell-devel BuildRequires: ghc-unix-devel BuildRoot: %{_tmppath}/%{name}-%{version}-build # End cabal-rpm deps %description Use regular Haskell data structures as your database and get stronger ACID guarantees than most RDBMS offer. %package devel Summary: Haskell %{pkg_name} library development files Group: Development/Libraries/Other Requires: %{name} = %{version}-%{release} Requires: ghc-compiler = %{ghc_version} Requires(post): ghc-compiler = %{ghc_version} Requires(postun): ghc-compiler = %{ghc_version} %description devel This package provides the Haskell %{pkg_name} library development files. %prep %setup -q -n %{pkg_name}-%{version} %build %ghc_lib_build %install %ghc_lib_install %post devel %ghc_pkg_recache %postun devel %ghc_pkg_recache %files -f %{name}.files %defattr(-,root,root,-) %files devel -f %{name}-devel.files %defattr(-,root,root,-) %doc CHANGELOG.md examples %changelog

1 0

commit libftdi1 for openSUSE:Factory
by root＠hilbertn.suse.de 24 Feb '17

24 Feb '17

Hello community, here is the log from the commit of package libftdi1 for openSUSE:Factory checked in at 2017-02-25 00:49:19 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/libftdi1 (Old) and /work/SRC/openSUSE:Factory/.libftdi1.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "libftdi1" Changes: -------- --- /work/SRC/openSUSE:Factory/libftdi1/libftdi1.changes 2016-07-24 19:42:17.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.libftdi1.new/libftdi1.changes 2017-02-25 00:49:20.379159634 +0100 @@ -1,0 +2,5 @@ +Wed Feb 1 12:52:25 UTC 2017 - adam.majer(a)suse.de + +- use individual libboost-*-devel packages instead of boost-devel + +------------------------------------------------------------------- ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ libftdi1.spec ++++++ --- /var/tmp/diff_new_pack.aLpLtM/_old 2017-02-25 00:49:20.843088922 +0100 +++ /var/tmp/diff_new_pack.aLpLtM/_new 2017-02-25 00:49:20.847088311 +0100 @@ -1,7 +1,7 @@ # # spec file for package libftdi1 # -# Copyright (c) 2016 SUSE LINUX Products GmbH, Nuernberg, Germany. +# Copyright (c) 2017 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 @@ -24,7 +24,11 @@ Group: Hardware/Other Url: http://www.intra2net.com/en/developer/libftdi Source: http://www.intra2net.com/en/developer/libftdi/download/libftdi1-%{version}.… +%if 0%{?suse_version} > 1325 +BuildRequires: libboost_headers-devel +%else BuildRequires: boost-devel +%endif BuildRequires: cmake >= 2.8 BuildRequires: doxygen BuildRequires: gcc-c++

1 0

commit libirman for openSUSE:Factory
by root＠hilbertn.suse.de 24 Feb '17

24 Feb '17

Hello community, here is the log from the commit of package libirman for openSUSE:Factory checked in at 2017-02-25 00:49:09 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/libirman (Old) and /work/SRC/openSUSE:Factory/.libirman.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "libirman" Changes: -------- --- /work/SRC/openSUSE:Factory/libirman/libirman.changes 2016-12-01 10:24:57.000000000 +0100 +++ /work/SRC/openSUSE:Factory/.libirman.new/libirman.changes 2017-02-25 00:49:10.344689121 +0100 @@ -1,0 +2,6 @@ +Tue Feb 21 18:56:28 UTC 2017 - mpluskal(a)suse.com + +- Build lirc plugin +- Rename common and utils subpackages + +------------------------------------------------------------------- ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ libirman.spec ++++++ --- /var/tmp/diff_new_pack.D5TPGz/_old 2017-02-25 00:49:10.916601947 +0100 +++ /var/tmp/diff_new_pack.D5TPGz/_new 2017-02-25 00:49:10.920601338 +0100 @@ -1,7 +1,7 @@ # # spec file for package libirman # -# Copyright (c) 2016 SUSE LINUX GmbH, Nuernberg, Germany. +# Copyright (c) 2017 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 @@ -26,7 +26,7 @@ Url: https://sourceforge.net/projects/libirman/ Source0: https://downloads.sf.net/libirman/libirman-%{version}.tar.gz BuildRequires: pkgconfig -BuildRoot: %{_tmppath}/%{name}-%{version}-build +BuildRequires: pkgconfig(lirc) %description libirman is a general purpose library for programs to use in order to @@ -42,24 +42,37 @@ libirman is a general purpose library for programs to use in order to receive infrared signals via irman-compatible hardware. -%package common +%package -n irman-common Summary: Common files for %{name} License: LGPL-2.0+ Group: Development/Languages/C and C++ Conflicts: %{name}%{sover} < %{version} +Provides: libirman-common = %{version} +Obsoletes: libirman-common < %{version} -%description common +%description -n irman-common Common files for %{name}. -%package utils +%package -n irman-utils Summary: Library for irman access License: GPL-2.0+ Group: Hardware/Other -Requires: %{name}-common = %{version} +Requires: irman-common = %{version} +Provides: libirman-utils = %{version} +Obsoletes: libirman-utils < %{version} -%description utils +%description -n irman-utils Utilities from %{name} from the lirc project. +%package -n lirc-irman +Summary: Lirc plugin for irman +License: GPL-2.0+ +Group: Hardware/Other +Requires: irman-common = %{version} + +%description -n lirc-irman +Lirc plugin for irman. + %package devel Summary: Development files for %{name} License: GPL-2.0+ @@ -88,7 +101,7 @@ %post -n %{name}%{sover} -p /sbin/ldconfig %postun -n %{name}%{sover} -p /sbin/ldconfig -%files utils +%files -n irman-utils %defattr(-,root,root) %doc COPYING %{_bindir}/test_func @@ -102,10 +115,16 @@ %defattr(-,root,root,-) %{_libdir}/%{name}.so.%{sover}* -%files common +%files -n irman-common %defattr(-,root,root) %config %{_sysconfdir}/irman.conf +%files -n lirc-irman +%defattr(-,root,root) +%dir %{_libdir}/lirc +%dir %{_libdir}/lirc/plugins +%{_libdir}/lirc/plugins/irman.so + %files devel %defattr(-,root,root) %doc COPYING COPYING.lib NEWS README

1 0

commit bind for openSUSE:Factory
by root＠hilbertn.suse.de 24 Feb '17

24 Feb '17

Hello community, here is the log from the commit of package bind for openSUSE:Factory checked in at 2017-02-25 00:48:56 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/bind (Old) and /work/SRC/openSUSE:Factory/.bind.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "bind" Changes: -------- --- /work/SRC/openSUSE:Factory/bind/bind.changes 2017-02-18 03:15:02.158783248 +0100 +++ /work/SRC/openSUSE:Factory/.bind.new/bind.changes 2017-02-25 00:48:57.494647786 +0100 @@ -1,0 +2,5 @@ +Sat Feb 18 17:24:58 UTC 2017 - kukuk(a)suse.com + +- Don't require and call insserv if we use systemd + +------------------------------------------------------------------- ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ bind.spec ++++++ --- /var/tmp/diff_new_pack.yTaneV/_old 2017-02-25 00:48:59.150395408 +0100 +++ /var/tmp/diff_new_pack.yTaneV/_new 2017-02-25 00:48:59.154394798 +0100 @@ -57,6 +57,8 @@ BuildRequires: python-base %if 0%{?suse_version} == 0 || 0%{?suse_version} > 1230 BuildRequires: systemd-rpm-macros +%else +PreReq: %insserv_prereq %endif BuildRequires: update-desktop-files Provides: bind8 @@ -66,7 +68,7 @@ Obsoletes: bind9 < %version Requires: %{name}-chrootenv Requires: %{name}-utils -PreReq: %fillup_prereq %insserv_prereq bind-utils /bin/grep /bin/sed /bin/mkdir /usr/bin/tee /bin/chmod /bin/chown /bin/mv /bin/cat /usr/bin/dirname /usr/bin/diff /usr/bin/old +PreReq: %fillup_prereq bind-utils /bin/grep /bin/sed /bin/mkdir /usr/bin/tee /bin/chmod /bin/chown /bin/mv /bin/cat /usr/bin/dirname /usr/bin/diff /usr/bin/old Requires(pre): /usr/sbin/groupadd /usr/sbin/useradd /usr/sbin/usermod Url: http://isc.org/sw/bind/ @@ -598,13 +600,16 @@ %endif %preun -%stop_on_removal named %if 0%{?suse_version} == 0 || 0%{?suse_version} > 1230 %service_del_preun named.service +%else +%stop_on_removal named %endif %post +%if 0%{?suse_version} > 0 && 0%{?suse_version} <= 1230 %{fillup_and_insserv -nf named} +%endif %{fillup_only -nsa named named} if [ ! -f etc/rndc.key ]; then usr/sbin/rndc-confgen -a -b 512 -r dev/urandom @@ -714,20 +719,22 @@ fi # End of 'Are we in update mode?' # Remove TEMP_SYSCONFIG_FILE in any case. rm -f ${TEMP_SYSCONFIG_FILE} +%if 0%{?suse_version} == 0 || 0%{?suse_version} > 1230 +%service_add_post named.service +%else NAMED_ACTIVE_FILE="var/adm/named.was.active" if [ -f ${NAMED_ACTIVE_FILE} ]; then sbin/insserv named test ! -s ${NAMED_ACTIVE_FILE} && rm -f ${NAMED_ACTIVE_FILE} fi -%if 0%{?suse_version} == 0 || 0%{?suse_version} > 1230 -%service_add_post named.service %endif %postun -%restart_on_update named -%insserv_cleanup %if 0%{?suse_version} == 0 || 0%{?suse_version} > 1230 %service_del_postun named.service +%else +%restart_on_update named +%insserv_cleanup %endif %post -n libbind9-140 -p /sbin/ldconfig @@ -777,24 +784,28 @@ if [ ! -s etc/lwresd.conf ]; then rm -f etc/lwresd.conf fi -if [ $1 -le 1 ]; then - %{fillup_and_insserv -fy lwresd} -fi; %if 0%{?suse_version} == 0 || 0%{?suse_version} > 1230 %service_add_post lwresd.service +%else +if [ $1 -le 1 ]; then + %{fillup_and_insserv -fy lwresd} +fi %endif %preun lwresd %stop_on_removal lwresd %if 0%{?suse_version} == 0 || 0%{?suse_version} > 1230 %service_del_preun lwresd.service +%else +%stop_on_removal lwresd %endif %postun lwresd -%restart_on_update lwresd -%insserv_cleanup %if 0%{?suse_version} == 0 || 0%{?suse_version} > 1230 %service_del_postun lwresd.service +%else +%restart_on_update lwresd +%insserv_cleanup %endif %post utils

1 0

commit kernel-source for openSUSE:Factory
by root＠hilbertn.suse.de 24 Feb '17

24 Feb '17

Hello community, here is the log from the commit of package kernel-source for openSUSE:Factory checked in at 2017-02-25 00:48:09 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/kernel-source (Old) and /work/SRC/openSUSE:Factory/.kernel-source.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "kernel-source" Changes: -------- --- /work/SRC/openSUSE:Factory/kernel-source/dtb-aarch64.changes 2017-02-20 13:10:30.759141290 +0100 +++ /work/SRC/openSUSE:Factory/.kernel-source.new/dtb-aarch64.changes 2017-02-25 00:48:10.729776118 +0100 @@ -1,0 +2,6 @@ +Mon Feb 20 14:08:30 CET 2017 - jeffm(a)suse.com + +- Update to 4.10-final. +- commit 12a7a6d + +------------------------------------------------------------------- @@ -13,0 +20,13 @@ +Thu Feb 16 17:33:27 CET 2017 - jeffm(a)suse.com + +- btrfs: use the new VFS super_block_dev (bnc#865869). +- commit f064a41 + +------------------------------------------------------------------- +Thu Feb 16 17:33:14 CET 2017 - jeffm(a)suse.com + +- fs/super.c: add new super block sub devices super_block_dev + (bnc#865869). +- commit 47c7d30 + +------------------------------------------------------------------- @@ -35,0 +55,15 @@ +Mon Feb 13 15:04:27 CET 2017 - jeffm(a)suse.com + +- Update to 4.10-rc8. +- Eliminated 1 patch. +- commit e195904 + +------------------------------------------------------------------- +Fri Feb 10 10:29:43 CET 2017 - jslaby(a)suse.cz + +- Refresh patches.suse/DWARF-EH-frame-based-stack-unwinding.patch. + Refactoring of the code. It is readable, understandable and a heap + faster. More to come later. +- commit 0a72883 + +------------------------------------------------------------------- @@ -52,0 +87,6 @@ +Tue Feb 7 16:58:58 CET 2017 - afaerber(a)suse.de + +- config: armv6hl: Enable RASPBERRYPI_POWER +- commit 7c28efb + +------------------------------------------------------------------- @@ -57 +97,7 @@ -- commit 25d564c +- commit 12d02bb + +------------------------------------------------------------------- +Tue Feb 7 16:33:47 CET 2017 - afaerber(a)suse.de + +- config: Make VIRTIO_CONSOLE built-in +- commit 2f30d33 @@ -66,0 +113,14 @@ +Tue Feb 7 01:41:38 CET 2017 - jeffm(a)suse.com + +- btrfs: fix btrfs_compat_ioctl failures on non-compat ioctls + (bsc#1018100). +- commit d9294c3 + +------------------------------------------------------------------- +Mon Feb 6 16:59:33 CET 2017 - jeffm(a)suse.com + +- Update to 4.10-rc7. +- Eliminated 1 patch. +- commit bbf896d + +------------------------------------------------------------------- @@ -72,0 +133,8 @@ +Fri Feb 3 00:08:25 CET 2017 - jkosina(a)suse.cz + +- Refresh + patches.fixes/x86-efi-Always-map-the-first-physical-page-into-the-EFI-pagetables.patch: + update references +- commit 4e3d085 + +------------------------------------------------------------------- @@ -81,0 +150,9 @@ +Thu Feb 2 13:07:26 CET 2017 - jslaby(a)suse.cz + +- Update config files. +- Refresh patches.suse/DWARF-EH-frame-based-stack-unwinding.patch. +- fix for save_stack_trace (lockdep et al.) +- depends on !KASAN (too slow) +- commit 2e68dd0 + +------------------------------------------------------------------- @@ -113,0 +191,10 @@ +Tue Jan 31 10:45:34 CET 2017 - jslaby(a)suse.cz + +- Update config files. +- Refresh patches.suse/DWARF-EH-frame-based-stack-unwinding.patch. +- Refresh patches.suse/stack-unwind-disable-kasan.patch. + Update dwarf unwinder. It fixes a build failure when disabled and + moves files around. +- commit 18f6269 + +------------------------------------------------------------------- @@ -124,0 +212,7 @@ +Mon Jan 30 17:46:39 CET 2017 - jeffm(a)suse.com + +- Update to 4.10-rc6. +- Eliminated 1 patch. +- commit 85b893c + +------------------------------------------------------------------- @@ -131,0 +226,7 @@ +Mon Jan 30 10:20:52 CET 2017 - jkosina(a)suse.cz + +- [tip:efi/urgent] x86/efi: Always map the first physical page + into the EFI pagetables. +- commit 33e3495 + +------------------------------------------------------------------- @@ -135 +236 @@ -- commit cf15f28 +- commit c67d673 @@ -157,0 +259,6 @@ +Mon Jan 23 16:14:41 CET 2017 - jeffm(a)suse.com + +- Update to 4.10-rc5. +- commit 7dca981 + +------------------------------------------------------------------- @@ -165,0 +273,11 @@ +Wed Jan 18 14:48:20 CET 2017 - jslaby(a)suse.cz + +- Update config files (bnc#1011884). + Kill FRAME_POINTER. Thanks to the stack traces generation rewrite in + 4.9 & DWARF unwinding port, frame pointers are no longer needed for + stack traces. We can shoot them down now. I am going to implement + generation of DWARF info for assembly rather soon. + If issues occur, please revert this and let me know. +- commit 911f899 + +------------------------------------------------------------------- @@ -183,0 +302,15 @@ +Mon Jan 16 03:39:22 CET 2017 - jeffm(a)suse.com + +- Update to 3.10-rc4. +- commit 4f824f1 + +------------------------------------------------------------------- +Mon Jan 16 03:36:40 CET 2017 - jeffm(a)suse.com + +- Delete + patches.suse/revert-btrfs-fix-lockdep-warning-on-deadlock-against-an-inode-s-log-mutex.patch. +- Delete + patches.suse/revert-btrfs-improve-performance-on-fsync-against-new-inode-after-rename-unlink.patch. +- commit a282581 + +------------------------------------------------------------------- @@ -193 +326,7 @@ -- commit 1a627d7 +- commit 26c1d96 + +------------------------------------------------------------------- +Fri Jan 13 16:42:07 CET 2017 - jeffm(a)suse.com + +- reiserfs: fix race in prealloc discard (bsc#987576). +- commit 5e5739e @@ -201,0 +341,9 @@ +Fri Jan 13 16:29:18 CET 2017 - tiwai(a)suse.de + +- rpm/kernel-docs.spec.in: Fix building docs +- Fix html and pdf creation in Documetation/media/* +- Add graphviz to buildreq for image conversion +- Fix file list to remove REPORTING-BUGS +- commit e189683 + +------------------------------------------------------------------- @@ -213 +361 @@ -- commit 2c7dfab +- commit 1ed7879 @@ -223,0 +372,43 @@ +Wed Jan 11 16:16:15 CET 2017 - jeffm(a)suse.com + +- Delete + patches.suse/btrfs-fix-extent-tree-corruption-due-to-relocation.patch. + The issue being investigated with resolved with upstream commit + 054570a1dc94 (Btrfs: fix relocation incorrectly dropping data references). +- commit ed9b04a + +------------------------------------------------------------------- +Wed Jan 11 11:27:06 CET 2017 - jslaby(a)suse.cz + +- Refresh patches.suse/DWARF-EH-frame-based-stack-unwinding.patch. +- Delete patches.suse/unwind-use-thread_return-on-i386. + Fix a warning and unwinding of blocked tasks. thread_return fix not + needed anymore. +- commit abd21b1 + +------------------------------------------------------------------- +Mon Jan 9 18:07:38 CET 2017 - jeffm(a)suse.com + +- unwind: use thread_return on i386 + This fixes a build failure. I don't have an i386 environment set up for + testing. ++++ 277 more lines (skipped) ++++ between /work/SRC/openSUSE:Factory/kernel-source/dtb-aarch64.changes ++++ and /work/SRC/openSUSE:Factory/.kernel-source.new/dtb-aarch64.changes dtb-armv6l.changes: same change dtb-armv7l.changes: same change kernel-64kb.changes: same change kernel-debug.changes: same change kernel-default.changes: same change kernel-docs.changes: same change kernel-lpae.changes: same change kernel-obs-build.changes: same change kernel-obs-qa.changes: same change kernel-pae.changes: same change kernel-source.changes: same change kernel-syms.changes: same change kernel-syzkaller.changes: same change kernel-vanilla.changes: same change Old: ---- linux-4.9.tar.xz New: ---- linux-4.10.tar.xz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ dtb-aarch64.spec ++++++ --- /var/tmp/diff_new_pack.vD7zvw/_old 2017-02-25 00:48:19.048508077 +0100 +++ /var/tmp/diff_new_pack.vD7zvw/_new 2017-02-25 00:48:19.052507467 +0100 @@ -16,14 +16,15 @@ # -%define patchversion 4.9.11 +%define patchversion 4.10.0 +%define vanilla_only 0 %include %_sourcedir/kernel-spec-macros Name: dtb-aarch64 -Version: 4.9.11 +Version: 4.10.0 %if 0%{?is_kotd} -Release: <RELEASE>.gcf9c670 +Release: <RELEASE>.g81ace5a %else Release: 0 %endif @@ -31,7 +32,11 @@ License: GPL-2.0 Group: System/Boot Url: http://www.kernel.org/ +%if %vanilla_only +BuildRequires: kernel-source-vanilla +%else BuildRequires: kernel-source +%endif ExclusiveArch: aarch64 BuildRequires: cpp BuildRequires: dtc >= 1.4.0 @@ -50,6 +55,15 @@ %description -n dtb-al Device Tree files for Alpine Labs based arm64 systems. +%package -n dtb-allwinner +Summary: Allwinner based arm64 systems +Group: System/Boot +Provides: multiversion(dtb) +Requires(post): coreutils + +%description -n dtb-allwinner +Device Tree files for Allwinner based arm64 systems. + %package -n dtb-altera Summary: Altera based arm64 systems Group: System/Boot @@ -235,18 +249,31 @@ %description -n dtb-xilinx Device Tree files for Xilinx based arm64 systems. +%package -n dtb-zte +Summary: ZTE based arm64 systems +Group: System/Boot +Provides: multiversion(dtb) +Requires(post): coreutils + +%description -n dtb-zte +Device Tree files for ZTE based arm64 systems. + %prep %build -cp %{_prefix}/src/linux/COPYING . +source=/usr/src/linux-%kernelrelease +%if %vanilla_only +source=$source-vanilla +%endif +cp $source/COPYING . mkdir pp PPDIR=`pwd`/pp export DTC_FLAGS="-R 4 -p 0x1000" -cd %{_prefix}/src/linux/arch/arm64/boot/dts -for dts in al/*.dts altera/*.dts amd/*.dts amlogic/*.dts apm/*.dts arm/*.dts broadcom/*.dts cavium/*.dts exynos/*.dts freescale/*.dts hisilicon/*.dts lg/*.dts marvell/*.dts mediatek/*.dts nvidia/*.dts qcom/*.dts renesas/*.dts rockchip/*.dts socionext/*.dts sprd/*.dts xilinx/*.dts ; do +cd $source/arch/arm64/boot/dts +for dts in al/*.dts allwinner/*.dts altera/*.dts amd/*.dts amlogic/*.dts apm/*.dts arm/*.dts broadcom/*.dts cavium/*.dts exynos/*.dts freescale/*.dts hisilicon/*.dts lg/*.dts marvell/*.dts mediatek/*.dts nvidia/*.dts qcom/*.dts renesas/*.dts rockchip/*.dts socionext/*.dts sprd/*.dts xilinx/*.dts zte/*.dts ; do target=${dts%*.dts} mkdir -p $PPDIR/$(dirname $target) cpp -x assembler-with-cpp -undef -D__DTS__ -nostdinc -I. -I./include/ -P $target.dts -o $PPDIR/$target.dts @@ -258,7 +285,7 @@ %install cd pp -for dts in al/*.dts altera/*.dts amd/*.dts amlogic/*.dts apm/*.dts arm/*.dts broadcom/*.dts cavium/*.dts exynos/*.dts freescale/*.dts hisilicon/*.dts lg/*.dts marvell/*.dts mediatek/*.dts nvidia/*.dts qcom/*.dts renesas/*.dts rockchip/*.dts socionext/*.dts sprd/*.dts xilinx/*.dts ; do +for dts in al/*.dts allwinner/*.dts altera/*.dts amd/*.dts amlogic/*.dts apm/*.dts arm/*.dts broadcom/*.dts cavium/*.dts exynos/*.dts freescale/*.dts hisilicon/*.dts lg/*.dts marvell/*.dts mediatek/*.dts nvidia/*.dts qcom/*.dts renesas/*.dts rockchip/*.dts socionext/*.dts sprd/*.dts xilinx/*.dts zte/*.dts ; do target=${dts%*.dts} install -m 700 -d %{buildroot}%{dtbdir}/$(dirname $target) install -m 644 $target.dtb %{buildroot}%{dtbdir}/$(dirname $target) @@ -279,6 +306,13 @@ # Unless /boot/dtb exists as real directory, create a symlink. [ -d dtb ] || ln -sf dtb-%kernelrelease dtb +%post -n dtb-allwinner +cd /boot +# If /boot/dtb is a symlink, remove it, so that we can replace it. +[ -d dtb ] && [ -L dtb ] && rm -f dtb +# Unless /boot/dtb exists as real directory, create a symlink. +[ -d dtb ] || ln -sf dtb-%kernelrelease dtb + %post -n dtb-altera cd /boot # If /boot/dtb is a symlink, remove it, so that we can replace it. @@ -419,6 +453,13 @@ # Unless /boot/dtb exists as real directory, create a symlink. [ -d dtb ] || ln -sf dtb-%kernelrelease dtb +%post -n dtb-zte +cd /boot +# If /boot/dtb is a symlink, remove it, so that we can replace it. +[ -d dtb ] && [ -L dtb ] && rm -f dtb +# Unless /boot/dtb exists as real directory, create a symlink. +[ -d dtb ] || ln -sf dtb-%kernelrelease dtb + %ifarch aarch64 %files -n dtb-al -f dtb-al.list %else @@ -432,6 +473,18 @@ %{dtbdir}/al/*.dtb %ifarch aarch64 +%files -n dtb-allwinner -f dtb-allwinner.list +%else +%files -n dtb-allwinner +%endif +%defattr(-,root,root) +%doc COPYING +%ghost /boot/dtb +%dir %{dtbdir} +%dir %{dtbdir}/allwinner +%{dtbdir}/allwinner/*.dtb + +%ifarch aarch64 %files -n dtb-altera -f dtb-altera.list %else %files -n dtb-altera @@ -671,4 +724,16 @@ %dir %{dtbdir}/xilinx %{dtbdir}/xilinx/*.dtb +%ifarch aarch64 +%files -n dtb-zte -f dtb-zte.list +%else +%files -n dtb-zte +%endif +%defattr(-,root,root) +%doc COPYING +%ghost /boot/dtb +%dir %{dtbdir} +%dir %{dtbdir}/zte +%{dtbdir}/zte/*.dtb + %changelog ++++++ dtb-armv6l.spec ++++++ --- /var/tmp/diff_new_pack.vD7zvw/_old 2017-02-25 00:48:19.088501980 +0100 +++ /var/tmp/diff_new_pack.vD7zvw/_new 2017-02-25 00:48:19.092501371 +0100 @@ -16,14 +16,15 @@ # -%define patchversion 4.9.11 +%define patchversion 4.10.0 +%define vanilla_only 0 %include %_sourcedir/kernel-spec-macros Name: dtb-armv6l -Version: 4.9.11 +Version: 4.10.0 %if 0%{?is_kotd} -Release: <RELEASE>.gcf9c670 +Release: <RELEASE>.g81ace5a %else Release: 0 %endif @@ -31,7 +32,11 @@ License: GPL-2.0 Group: System/Boot Url: http://www.kernel.org/ +%if %vanilla_only +BuildRequires: kernel-source-vanilla +%else BuildRequires: kernel-source +%endif ExclusiveArch: armv6l armv6hl BuildRequires: cpp BuildRequires: dtc >= 1.4.0 @@ -55,12 +60,16 @@ %prep %build -cp %{_prefix}/src/linux/COPYING . +source=/usr/src/linux-%kernelrelease +%if %vanilla_only +source=$source-vanilla +%endif +cp $source/COPYING . mkdir pp PPDIR=`pwd`/pp export DTC_FLAGS="-R 4 -p 0x1000" -cd %{_prefix}/src/linux/arch/arm/boot/dts +cd $source/arch/arm/boot/dts for dts in bcm2835*.dts ; do target=${dts%*.dts} mkdir -p $PPDIR/$(dirname $target) ++++++ dtb-armv7l.spec ++++++ --- /var/tmp/diff_new_pack.vD7zvw/_old 2017-02-25 00:48:19.124496494 +0100 +++ /var/tmp/diff_new_pack.vD7zvw/_new 2017-02-25 00:48:19.128495884 +0100 @@ -16,14 +16,15 @@ # -%define patchversion 4.9.11 +%define patchversion 4.10.0 +%define vanilla_only 0 %include %_sourcedir/kernel-spec-macros Name: dtb-armv7l -Version: 4.9.11 +Version: 4.10.0 %if 0%{?is_kotd} -Release: <RELEASE>.gcf9c670 +Release: <RELEASE>.g81ace5a %else Release: 0 %endif @@ -31,7 +32,11 @@ License: GPL-2.0 Group: System/Boot Url: http://www.kernel.org/ +%if %vanilla_only +BuildRequires: kernel-source-vanilla +%else BuildRequires: kernel-source +%endif ExclusiveArch: armv7l armv7hl BuildRequires: cpp BuildRequires: dtc >= 1.4.0 @@ -268,6 +273,15 @@ %description -n dtb-rk3 Device Tree files for Rockchip RK3xxx based systems. +%package -n dtb-socfpga +Summary: Altera SoC FPGA based systems +Group: System/Boot +Provides: multiversion(dtb) +Requires(post): coreutils + +%description -n dtb-socfpga +Device Tree files for Altera SoC FPGA based systems. + %package -n dtb-ste Summary: ST Ericsson based systems Group: System/Boot @@ -417,13 +431,17 @@ %prep %build -cp %{_prefix}/src/linux/COPYING . +source=/usr/src/linux-%kernelrelease +%if %vanilla_only +source=$source-vanilla +%endif +cp $source/COPYING . mkdir pp PPDIR=`pwd`/pp export DTC_FLAGS="-R 4 -p 0x1000" -cd %{_prefix}/src/linux/arch/arm/boot/dts -for dts in am335x-*.dts am3517*.dts am57xx-*.dts armada-370-*.dts armada-375-*.dts armada-385-*.dts armada-388-*.dts armada-398-*.dts armada-xp-*.dts bcm2836*.dts dove-*.dts exynos4*.dts exynos5*.dts imx5*.dts imx6*.dts imx7*.dts keystone-*.dts meson6-*.dts meson8-*.dts meson8b-*.dts omap3*.dts omap4*.dts omap5*.dts qcom-*.dts rk3*.dts ste-*.dts sun4i-*.dts sun5i-*.dts sun6i-*.dts sun7i-*.dts sun8i-*.dts sun9i-*.dts tegra20-*.dts tegra30-*.dts tegra114-*.dts tegra124-*.dts vexpress-*.dts vf500-*.dts vf610-*.dts xenvm-*.dts zynq-*.dts ; do +cd $source/arch/arm/boot/dts +for dts in am335x-*.dts am3517*.dts am57xx-*.dts armada-370-*.dts armada-375-*.dts armada-385-*.dts armada-388-*.dts armada-398-*.dts armada-xp-*.dts bcm2836*.dts dove-*.dts exynos4*.dts exynos5*.dts imx5*.dts imx6*.dts imx7*.dts keystone-*.dts meson6-*.dts meson8-*.dts meson8b-*.dts omap3*.dts omap4*.dts omap5*.dts qcom-*.dts rk3*.dts socfpga_*.dts ste-*.dts sun4i-*.dts sun5i-*.dts sun6i-*.dts sun7i-*.dts sun8i-*.dts sun9i-*.dts tegra20-*.dts tegra30-*.dts tegra114-*.dts tegra124-*.dts vexpress-*.dts vf500-*.dts vf610-*.dts xenvm-*.dts zynq-*.dts ; do target=${dts%*.dts} mkdir -p $PPDIR/$(dirname $target) cpp -x assembler-with-cpp -undef -D__DTS__ -nostdinc -I. -I./include/ -P $target.dts -o $PPDIR/$target.dts @@ -435,7 +453,7 @@ %install cd pp -for dts in am335x-*.dts am3517*.dts am57xx-*.dts armada-370-*.dts armada-375-*.dts armada-385-*.dts armada-388-*.dts armada-398-*.dts armada-xp-*.dts bcm2836*.dts dove-*.dts exynos4*.dts exynos5*.dts imx5*.dts imx6*.dts imx7*.dts keystone-*.dts meson6-*.dts meson8-*.dts meson8b-*.dts omap3*.dts omap4*.dts omap5*.dts qcom-*.dts rk3*.dts ste-*.dts sun4i-*.dts sun5i-*.dts sun6i-*.dts sun7i-*.dts sun8i-*.dts sun9i-*.dts tegra20-*.dts tegra30-*.dts tegra114-*.dts tegra124-*.dts vexpress-*.dts vf500-*.dts vf610-*.dts xenvm-*.dts zynq-*.dts ; do +for dts in am335x-*.dts am3517*.dts am57xx-*.dts armada-370-*.dts armada-375-*.dts armada-385-*.dts armada-388-*.dts armada-398-*.dts armada-xp-*.dts bcm2836*.dts dove-*.dts exynos4*.dts exynos5*.dts imx5*.dts imx6*.dts imx7*.dts keystone-*.dts meson6-*.dts meson8-*.dts meson8b-*.dts omap3*.dts omap4*.dts omap5*.dts qcom-*.dts rk3*.dts socfpga_*.dts ste-*.dts sun4i-*.dts sun5i-*.dts sun6i-*.dts sun7i-*.dts sun8i-*.dts sun9i-*.dts tegra20-*.dts tegra30-*.dts tegra114-*.dts tegra124-*.dts vexpress-*.dts vf500-*.dts vf610-*.dts xenvm-*.dts zynq-*.dts ; do target=${dts%*.dts} install -m 700 -d %{buildroot}%{dtbdir}/$(dirname $target) install -m 644 $target.dtb %{buildroot}%{dtbdir}/$(dirname $target) @@ -624,6 +642,13 @@ # Unless /boot/dtb exists as real directory, create a symlink. [ -d dtb ] || ln -sf dtb-%kernelrelease dtb +%post -n dtb-socfpga +cd /boot +# If /boot/dtb is a symlink, remove it, so that we can replace it. +[ -d dtb ] && [ -L dtb ] && rm -f dtb +# Unless /boot/dtb exists as real directory, create a symlink. +[ -d dtb ] || ln -sf dtb-%kernelrelease dtb + %post -n dtb-ste cd /boot # If /boot/dtb is a symlink, remove it, so that we can replace it. @@ -1012,6 +1037,17 @@ %{dtbdir}/rk3*.dtb %ifarch aarch64 +%files -n dtb-socfpga -f dtb-socfpga.list +%else +%files -n dtb-socfpga +%endif +%defattr(-,root,root) +%doc COPYING +%ghost /boot/dtb +%dir %{dtbdir} +%{dtbdir}/socfpga_*.dtb + +%ifarch aarch64 %files -n dtb-ste -f dtb-ste.list %else %files -n dtb-ste ++++++ kernel-64kb.spec ++++++ --- /var/tmp/diff_new_pack.vD7zvw/_old 2017-02-25 00:48:19.180487959 +0100 +++ /var/tmp/diff_new_pack.vD7zvw/_new 2017-02-25 00:48:19.184487349 +0100 @@ -17,8 +17,8 @@ # needssslcertforbuild -%define srcversion 4.9 -%define patchversion 4.9.11 +%define srcversion 4.10 +%define patchversion 4.10.0 %define variant %{nil} %define vanilla_only 0 @@ -58,9 +58,9 @@ Summary: Kernel with 64kb PAGE_SIZE License: GPL-2.0 Group: System/Kernel -Version: 4.9.11 +Version: 4.10.0 %if 0%{?is_kotd} -Release: <RELEASE>.gcf9c670 +Release: <RELEASE>.g81ace5a %else Release: 0 %endif @@ -518,16 +518,17 @@ MAKE_ARGS="$MAKE_ARGS D=2" %endif +mkdir -p %_topdir/OTHER +log=%_topdir/OTHER/make-stderr.log while true; do - make all $MAKE_ARGS 2>&1 \ - | tee buildlog + make all $MAKE_ARGS 2> >(tee "$log") if test "${PIPESTATUS[0]}" -eq 0; then break fi # In the linux-next and vanilla branches, we try harder to build a # package. if test 0%vanilla_only -gt 0 && - %_sourcedir/try-disable-staging-driver buildlog; then + %_sourcedir/try-disable-staging-driver "$log"; then echo "Retrying make" else exit 1 kernel-debug.spec: same change kernel-default.spec: same change ++++++ kernel-docs.spec ++++++ --- /var/tmp/diff_new_pack.vD7zvw/_old 2017-02-25 00:48:19.296470279 +0100 +++ /var/tmp/diff_new_pack.vD7zvw/_new 2017-02-25 00:48:19.296470279 +0100 @@ -16,7 +16,7 @@ # -%define patchversion 4.9.11 +%define patchversion 4.10.0 %define variant %{nil} %include %_sourcedir/kernel-spec-macros @@ -29,18 +29,28 @@ %define use_sphinx 0 %endif +# copy the whole tree to generate some images (sigh...) +%define local_copy 1 +%if %local_copy +%define linux_src . +%else +%define linux_src /usr/src/linux%variant +%define make_arg "-C %linux_src" +%endif + Name: kernel-docs Summary: Kernel Documentation (man pages) License: GPL-2.0 Group: Documentation/Man -Version: 4.9.11 +Version: 4.10.0 %if 0%{?is_kotd} -Release: <RELEASE>.gcf9c670 +Release: <RELEASE>.g81ace5a %else Release: 0 %endif BuildRequires: kernel-source%variant %if %use_sphinx +BuildRequires: graphviz BuildRequires: python-Sphinx # rst2pdf is broken with Sphinx 1.3.x, so disabled for now # BuildRequires: python-rst2pdf @@ -98,6 +108,10 @@ EOF %endif %setup -T -c +%if %local_copy +# FIXME: need to copy locally to generate some images... +cp -a /usr/src/linux%variant/* . +%endif %build %if !%use_fop @@ -106,15 +120,15 @@ %endif export LANG=en_US mkdir -p man -make -C /usr/src/linux%variant O=$PWD/man mandocs %{?jobs:-j%jobs} +make %{?make_arg} O=$PWD/man mandocs %{?jobs:-j%jobs} mkdir -p html -make -C /usr/src/linux%variant O=$PWD/html htmldocs %{?jobs:-j%jobs} +make %{?make_arg} O=$PWD/html htmldocs mkdir -p pdf make \ %if %use_fop - XMLTOFLAGS="-m /usr/src/linux%{variant}/Documentation/DocBook/stylesheet.xsl --skip-validation --with-fop" \ + XMLTOFLAGS="-m %linux_src/Documentation/DocBook/stylesheet.xsl --skip-validation --with-fop" \ %endif - -C /usr/src/linux%variant O=$PWD/pdf pdfdocs %{?jobs:-j%jobs} + %{?make_arg} O=$PWD/pdf pdfdocs %install install -d $RPM_BUILD_ROOT/%{_mandir}/man9 @@ -152,14 +166,16 @@ rm -f $RPM_BUILD_ROOT%{_datadir}/doc/kernel/html/DocBook/*/*.proc install -d $RPM_BUILD_ROOT%{_datadir}/doc/kernel/html/rst %if %use_sphinx -cp -a html/Documentation/output/html/* $RPM_BUILD_ROOT%{_datadir}/doc/kernel/html/rst || true +cp -a html/Documentation/output/* $RPM_BUILD_ROOT%{_datadir}/doc/kernel/html/rst || true %endif -cp -a /usr/src/linux%variant/{COPYING,CREDITS,MAINTAINERS,README,REPORTING-BUGS} . +%if !%local_copy +cp -a %linux_src/{COPYING,CREDITS,MAINTAINERS,README} . +%endif %files %defattr(-,root,root) -%doc COPYING CREDITS MAINTAINERS README REPORTING-BUGS +%doc COPYING CREDITS MAINTAINERS README %{_mandir}/man9/* %files pdf ++++++ kernel-lpae.spec ++++++ --- /var/tmp/diff_new_pack.vD7zvw/_old 2017-02-25 00:48:19.328465402 +0100 +++ /var/tmp/diff_new_pack.vD7zvw/_new 2017-02-25 00:48:19.328465402 +0100 @@ -17,8 +17,8 @@ # needssslcertforbuild -%define srcversion 4.9 -%define patchversion 4.9.11 +%define srcversion 4.10 +%define patchversion 4.10.0 %define variant %{nil} %define vanilla_only 0 @@ -58,9 +58,9 @@ Summary: Kernel for LPAE enabled systems License: GPL-2.0 Group: System/Kernel -Version: 4.9.11 +Version: 4.10.0 %if 0%{?is_kotd} -Release: <RELEASE>.gcf9c670 +Release: <RELEASE>.g81ace5a %else Release: 0 %endif @@ -516,16 +516,17 @@ MAKE_ARGS="$MAKE_ARGS D=2" %endif +mkdir -p %_topdir/OTHER +log=%_topdir/OTHER/make-stderr.log while true; do - make all $MAKE_ARGS 2>&1 \ - | tee buildlog + make all $MAKE_ARGS 2> >(tee "$log") if test "${PIPESTATUS[0]}" -eq 0; then break fi # In the linux-next and vanilla branches, we try harder to build a # package. if test 0%vanilla_only -gt 0 && - %_sourcedir/try-disable-staging-driver buildlog; then + %_sourcedir/try-disable-staging-driver "$log"; then echo "Retrying make" else exit 1 ++++++ kernel-obs-build.spec ++++++ --- /var/tmp/diff_new_pack.vD7zvw/_old 2017-02-25 00:48:19.364459916 +0100 +++ /var/tmp/diff_new_pack.vD7zvw/_new 2017-02-25 00:48:19.368459306 +0100 @@ -19,8 +19,9 @@ #!BuildIgnore: post-build-checks -%define patchversion 4.9.11 +%define patchversion 4.10.0 %define variant %{nil} +%define vanilla_only 0 %include %_sourcedir/kernel-spec-macros @@ -30,9 +31,14 @@ BuildRequires: util-linux %if 0%{?suse_version} +%if %vanilla_only +BuildRequires: kernel-vanilla +%define kernel_flavor -vanilla +%else BuildRequires: kernel-default %define kernel_flavor -default %endif +%endif %if 0%{?rhel_version} BuildRequires: kernel @@ -51,9 +57,9 @@ Summary: package kernel and initrd for OBS VM builds License: GPL-2.0 Group: SLES -Version: 4.9.11 +Version: 4.10.0 %if 0%{?is_kotd} -Release: <RELEASE>.gcf9c670 +Release: <RELEASE>.g81ace5a %else Release: 0 %endif ++++++ kernel-obs-qa.spec ++++++ --- /var/tmp/diff_new_pack.vD7zvw/_old 2017-02-25 00:48:19.404453820 +0100 +++ /var/tmp/diff_new_pack.vD7zvw/_new 2017-02-25 00:48:19.408453210 +0100 @@ -17,7 +17,7 @@ # needsrootforbuild -%define patchversion 4.9.11 +%define patchversion 4.10.0 %define variant %{nil} %include %_sourcedir/kernel-spec-macros @@ -36,9 +36,9 @@ Summary: Basic QA tests for the kernel License: GPL-2.0 Group: SLES -Version: 4.9.11 +Version: 4.10.0 %if 0%{?is_kotd} -Release: <RELEASE>.gcf9c670 +Release: <RELEASE>.g81ace5a %else Release: 0 %endif ++++++ kernel-pae.spec ++++++ --- /var/tmp/diff_new_pack.vD7zvw/_old 2017-02-25 00:48:19.448447113 +0100 +++ /var/tmp/diff_new_pack.vD7zvw/_new 2017-02-25 00:48:19.452446504 +0100 @@ -17,8 +17,8 @@ # needssslcertforbuild -%define srcversion 4.9 -%define patchversion 4.9.11 +%define srcversion 4.10 +%define patchversion 4.10.0 %define variant %{nil} %define vanilla_only 0 @@ -58,9 +58,9 @@ Summary: Kernel with PAE Support License: GPL-2.0 Group: System/Kernel -Version: 4.9.11 +Version: 4.10.0 %if 0%{?is_kotd} -Release: <RELEASE>.gcf9c670 +Release: <RELEASE>.g81ace5a %else Release: 0 %endif @@ -544,16 +544,17 @@ MAKE_ARGS="$MAKE_ARGS D=2" %endif +mkdir -p %_topdir/OTHER +log=%_topdir/OTHER/make-stderr.log while true; do - make all $MAKE_ARGS 2>&1 \ - | tee buildlog + make all $MAKE_ARGS 2> >(tee "$log") if test "${PIPESTATUS[0]}" -eq 0; then break fi # In the linux-next and vanilla branches, we try harder to build a # package. if test 0%vanilla_only -gt 0 && - %_sourcedir/try-disable-staging-driver buildlog; then + %_sourcedir/try-disable-staging-driver "$log"; then echo "Retrying make" else exit 1 ++++++ kernel-source.spec ++++++ --- /var/tmp/diff_new_pack.vD7zvw/_old 2017-02-25 00:48:19.476442846 +0100 +++ /var/tmp/diff_new_pack.vD7zvw/_new 2017-02-25 00:48:19.480442236 +0100 @@ -17,8 +17,8 @@ # icecream 0 -%define srcversion 4.9 -%define patchversion 4.9.11 +%define srcversion 4.10 +%define patchversion 4.10.0 %define variant %{nil} %define vanilla_only 0 @@ -30,9 +30,9 @@ Summary: The Linux Kernel Sources License: GPL-2.0 Group: Development/Sources -Version: 4.9.11 +Version: 4.10.0 %if 0%{?is_kotd} -Release: <RELEASE>.gcf9c670 +Release: <RELEASE>.g81ace5a %else Release: 0 %endif ++++++ kernel-syms.spec ++++++ --- /var/tmp/diff_new_pack.vD7zvw/_old 2017-02-25 00:48:19.512437359 +0100 +++ /var/tmp/diff_new_pack.vD7zvw/_new 2017-02-25 00:48:19.516436750 +0100 @@ -24,10 +24,10 @@ Summary: Kernel Symbol Versions (modversions) License: GPL-2.0 Group: Development/Sources -Version: 4.9.11 +Version: 4.10.0 %if %using_buildservice %if 0%{?is_kotd} -Release: <RELEASE>.gcf9c670 +Release: <RELEASE>.g81ace5a %else Release: 0 %endif ++++++ kernel-syzkaller.spec ++++++ --- /var/tmp/diff_new_pack.vD7zvw/_old 2017-02-25 00:48:19.552431263 +0100 +++ /var/tmp/diff_new_pack.vD7zvw/_new 2017-02-25 00:48:19.556430654 +0100 @@ -17,8 +17,8 @@ # needssslcertforbuild -%define srcversion 4.9 -%define patchversion 4.9.11 +%define srcversion 4.10 +%define patchversion 4.10.0 %define variant %{nil} %define vanilla_only 0 @@ -58,9 +58,9 @@ Summary: Kernel used for fuzzing by syzkaller License: GPL-2.0 Group: System/Kernel -Version: 4.9.11 +Version: 4.10.0 %if 0%{?is_kotd} -Release: <RELEASE>.gcf9c670 +Release: <RELEASE>.g81ace5a %else Release: 0 %endif @@ -517,16 +517,17 @@ MAKE_ARGS="$MAKE_ARGS D=2" %endif +mkdir -p %_topdir/OTHER +log=%_topdir/OTHER/make-stderr.log while true; do - make all $MAKE_ARGS 2>&1 \ - | tee buildlog + make all $MAKE_ARGS 2> >(tee "$log") if test "${PIPESTATUS[0]}" -eq 0; then break fi # In the linux-next and vanilla branches, we try harder to build a # package. if test 0%vanilla_only -gt 0 && - %_sourcedir/try-disable-staging-driver buildlog; then + %_sourcedir/try-disable-staging-driver "$log"; then echo "Retrying make" else exit 1 kernel-vanilla.spec: same change ++++++ config.sh ++++++ --- /var/tmp/diff_new_pack.vD7zvw/_old 2017-02-25 00:48:19.860384322 +0100 +++ /var/tmp/diff_new_pack.vD7zvw/_new 2017-02-25 00:48:19.864383711 +0100 @@ -1,5 +1,5 @@ # The version of the main tarball to use -SRCVERSION=4.9 +SRCVERSION=4.10 # variant of the kernel-source package, either empty or "-rt" VARIANT= # buildservice projects to build the kernel against @@ -8,3 +8,6 @@ OBS_PROJECT_PPC=openSUSE:Factory:PowerPC IBS_PROJECT=SUSE:Factory:Head IBS_PROJECT_ARM=Devel:ARM:Factory +# Bugzilla info +BUGZILLA_SERVER="apibugzilla.suse.com" +BUGZILLA_PRODUCT="openSUSE Tumbleweed" ++++++ config.tar.bz2 ++++++ ++++ 13186 lines of diff (skipped) ++++++ dtb.spec.in.in ++++++ --- /var/tmp/diff_new_pack.vD7zvw/_old 2017-02-25 00:48:20.464292267 +0100 +++ /var/tmp/diff_new_pack.vD7zvw/_new 2017-02-25 00:48:20.468291658 +0100 @@ -17,6 +17,7 @@ %define patchversion @PATCHVERSION@ +%define vanilla_only @VANILLA_ONLY@ %include %_sourcedir/kernel-spec-macros @@ -31,7 +32,11 @@ License: GPL-2.0 Group: System/Boot Url: http://www.kernel.org/ +%if %vanilla_only +BuildRequires: kernel-source-vanilla +%else BuildRequires: kernel-source +%endif $ARCH_RESTRICTIONS BuildRequires: cpp BuildRequires: dtc >= 1.4.0 @@ -46,12 +51,16 @@ %prep %build -cp %{_prefix}/src/linux/COPYING . +source=/usr/src/linux-%kernelrelease +%if %vanilla_only +source=$source-vanilla +%endif +cp $source/COPYING . mkdir pp PPDIR=`pwd`/pp export DTC_FLAGS="-R 4 -p 0x1000" -cd %{_prefix}/src/$DTS_folder +cd $source/$DTS_folder for dts in $ALL_SUPPORTED_DTB; do target=${dts%*.dts} mkdir -p $PPDIR/$(dirname $target) ++++++ kernel-binary.spec.in ++++++ --- /var/tmp/diff_new_pack.vD7zvw/_old 2017-02-25 00:48:20.580274588 +0100 +++ /var/tmp/diff_new_pack.vD7zvw/_new 2017-02-25 00:48:20.584273978 +0100 @@ -387,16 +387,17 @@ MAKE_ARGS="$MAKE_ARGS D=2" %endif +mkdir -p %_topdir/OTHER +log=%_topdir/OTHER/make-stderr.log while true; do - make all $MAKE_ARGS 2>&1 \ - | tee buildlog + make all $MAKE_ARGS 2> >(tee "$log") if test "${PIPESTATUS[0]}" -eq 0; then break fi # In the linux-next and vanilla branches, we try harder to build a # package. if test 0%vanilla_only -gt 0 && - %_sourcedir/try-disable-staging-driver buildlog; then + %_sourcedir/try-disable-staging-driver "$log"; then echo "Retrying make" else exit 1 ++++++ kernel-docs.spec.in ++++++ --- /var/tmp/diff_new_pack.vD7zvw/_old 2017-02-25 00:48:20.632266663 +0100 +++ /var/tmp/diff_new_pack.vD7zvw/_new 2017-02-25 00:48:20.632266663 +0100 @@ -29,6 +29,15 @@ %define use_sphinx 0 %endif +# copy the whole tree to generate some images (sigh...) +%define local_copy 1 +%if %local_copy +%define linux_src . +%else +%define linux_src /usr/src/linux%variant +%define make_arg "-C %linux_src" +%endif + Name: kernel-docs@VARIANT@ Summary: Kernel Documentation (man pages) License: GPL-2.0 @@ -41,6 +50,7 @@ %endif BuildRequires: kernel-source%variant %if %use_sphinx +BuildRequires: graphviz BuildRequires: python-Sphinx # rst2pdf is broken with Sphinx 1.3.x, so disabled for now # BuildRequires: python-rst2pdf @@ -98,6 +108,10 @@ EOF %endif %setup -T -c +%if %local_copy +# FIXME: need to copy locally to generate some images... +cp -a /usr/src/linux%variant/* . +%endif %build %if !%use_fop @@ -106,15 +120,15 @@ %endif export LANG=en_US mkdir -p man -make -C /usr/src/linux%variant O=$PWD/man mandocs %{?jobs:-j%jobs} +make %{?make_arg} O=$PWD/man mandocs %{?jobs:-j%jobs} mkdir -p html -make -C /usr/src/linux%variant O=$PWD/html htmldocs %{?jobs:-j%jobs} +make %{?make_arg} O=$PWD/html htmldocs mkdir -p pdf make \ %if %use_fop - XMLTOFLAGS="-m /usr/src/linux%{variant}/Documentation/DocBook/stylesheet.xsl --skip-validation --with-fop" \ + XMLTOFLAGS="-m %linux_src/Documentation/DocBook/stylesheet.xsl --skip-validation --with-fop" \ %endif - -C /usr/src/linux%variant O=$PWD/pdf pdfdocs %{?jobs:-j%jobs} + %{?make_arg} O=$PWD/pdf pdfdocs %install install -d $RPM_BUILD_ROOT/%{_mandir}/man9 @@ -152,14 +166,16 @@ rm -f $RPM_BUILD_ROOT%{_datadir}/doc/kernel/html/DocBook/*/*.proc install -d $RPM_BUILD_ROOT%{_datadir}/doc/kernel/html/rst %if %use_sphinx -cp -a html/Documentation/output/html/* $RPM_BUILD_ROOT%{_datadir}/doc/kernel/html/rst || true +cp -a html/Documentation/output/* $RPM_BUILD_ROOT%{_datadir}/doc/kernel/html/rst || true %endif -cp -a /usr/src/linux%variant/{COPYING,CREDITS,MAINTAINERS,README,REPORTING-BUGS} . +%if !%local_copy +cp -a %linux_src/{COPYING,CREDITS,MAINTAINERS,README} . +%endif %files %defattr(-,root,root) -%doc COPYING CREDITS MAINTAINERS README REPORTING-BUGS +%doc COPYING CREDITS MAINTAINERS README %{_mandir}/man9/* %files pdf ++++++ kernel-obs-build.spec.in ++++++ --- /var/tmp/diff_new_pack.vD7zvw/_old 2017-02-25 00:48:20.688258128 +0100 +++ /var/tmp/diff_new_pack.vD7zvw/_new 2017-02-25 00:48:20.692257518 +0100 @@ -21,6 +21,7 @@ %define patchversion @PATCHVERSION@ %define variant @VARIANT@%{nil} +%define vanilla_only @VANILLA_ONLY@ %include %_sourcedir/kernel-spec-macros @@ -30,9 +31,14 @@ BuildRequires: util-linux %if 0%{?suse_version} +%if %vanilla_only +BuildRequires: kernel-vanilla +%define kernel_flavor -vanilla +%else BuildRequires: kernel-default %define kernel_flavor -default %endif +%endif %if 0%{?rhel_version} BuildRequires: kernel ++++++ kernel-spec-macros ++++++ --- /var/tmp/diff_new_pack.vD7zvw/_old 2017-02-25 00:48:20.792242277 +0100 +++ /var/tmp/diff_new_pack.vD7zvw/_new 2017-02-25 00:48:20.792242277 +0100 @@ -19,7 +19,7 @@ # If the rebuild counter is > 1, obsolete all previous rebuilds (boo#867595) %define obsolete_rebuilds() %( %{verbose:set -x} \ set -- $(echo %release | sed -rn 's/(.*\\.)([0-9]+)($|\\.[^.]*[^.0-9][^.]*$)/\\1 \\2 \\3/p') \ - if test $2 -gt 99; then echo "warning: Rebuild counter too high in %release" >&2; exit 0; fi \ + if test -n "$2" && test "$2" -gt 99; then echo "warning: Rebuild counter too high in %release" >&2; exit 0; fi \ seq 1 $(($2-1)) | sed "s/.*/Obsoletes: %1 = %version-$1&$3/" \ ) %endif ++++++ linux-4.9.tar.xz -> linux-4.10.tar.xz ++++++ /work/SRC/openSUSE:Factory/kernel-source/linux-4.9.tar.xz /work/SRC/openSUSE:Factory/.kernel-source.new/linux-4.10.tar.xz differ: char 25, line 1 ++++++ mkspec ++++++ --- /var/tmp/diff_new_pack.vD7zvw/_old 2017-02-25 00:48:20.948218501 +0100 +++ /var/tmp/diff_new_pack.vD7zvw/_new 2017-02-25 00:48:20.952217892 +0100 @@ -171,29 +171,34 @@ } # kernel-obs-*.spec -{ - my @default_archs = arch2rpm(@{$flavor_archs{default}}); +if (!$variant) { + my @default_archs; + + if ($vanilla_only) { + @default_archs = arch2rpm(@{$flavor_archs{vanilla}}); + } else { + @default_archs = arch2rpm(@{$flavor_archs{default}}); + } # No kernel-obs-* for 32bit ppc @default_archs = grep { $_ ne "ppc" } @default_archs; my $default_archs = join(" ", @default_archs); - if (!$variant) { - do_spec('obs-build', "kernel-obs-build.spec", %macros, - ARCHS => $default_archs); - do_spec('obs-qa', "kernel-obs-qa.spec", %macros, - ARCHS => $default_archs); - } + do_spec('obs-build', "kernel-obs-build.spec", %macros, + ARCHS => $default_archs); + do_spec('obs-qa', "kernel-obs-qa.spec", %macros, + ARCHS => $default_archs); } # dtb-*.spec -do_spec('dtb', "dtb.spec.in", %macros); -print "./mkspec-dtb\n"; -system("./mkspec-dtb\n"); -unlink("$dir/dtb.spec.in"); -if ($?) { - exit(($? >> 8) || ($? & 127 + 128) || 1); +if (!$variant) { + do_spec('dtb', "dtb.spec.in", %macros); + print "./mkspec-dtb\n"; + system("./mkspec-dtb\n"); + unlink("$dir/dtb.spec.in"); + if ($?) { + exit(($? >> 8) || ($? & 127 + 128) || 1); + } } - copy_changes(); # _constraints ++++++ mkspec-dtb ++++++ --- /var/tmp/diff_new_pack.vD7zvw/_old 2017-02-25 00:48:20.988212405 +0100 +++ /var/tmp/diff_new_pack.vD7zvw/_new 2017-02-25 00:48:20.992211796 +0100 @@ -32,6 +32,7 @@ ['dtb-omap5', 'omap5*.dts', "TI OMAP5 based systems"], ['dtb-qcom', 'qcom-*.dts', "Qualcomm Snapdragon based systems"], ['dtb-rk3', 'rk3*.dts', "Rockchip RK3xxx based systems"], + ['dtb-socfpga', 'socfpga_*.dts', "Altera SoC FPGA based systems"], ['dtb-ste', 'ste-*.dts', "ST Ericsson based systems"], ['dtb-sun4i', 'sun4i-*.dts', "Allwinner sun4i based systems"], ['dtb-sun5i', 'sun5i-*.dts', "Allwinner sun5i based systems"], @@ -58,6 +59,7 @@ # DTB packages names my @aarch64_package_list = ( ['dtb-al', 'al/*.dts', "Alpine Labs based arm64 systems"], + ['dtb-allwinner', 'allwinner/*.dts', "Allwinner based arm64 systems"], ['dtb-altera', 'altera/*.dts', "Altera based arm64 systems"], ['dtb-amd', 'amd/*.dts', "AMD based arm64 systems"], ['dtb-amlogic', 'amlogic/*.dts', "Amlogic based arm64 systems"], @@ -78,6 +80,7 @@ ['dtb-socionext', 'socionext/*.dts', "Socionext based arm64 systems"], ['dtb-sprd', 'sprd/*.dts', "Spreadtrum based arm64 systems"], ['dtb-xilinx', 'xilinx/*.dts', "Xilinx based arm64 systems"], + ['dtb-zte', 'zte/*.dts', "ZTE based arm64 systems"], ); sub generate_spec($$$) @@ -97,9 +100,9 @@ my $subpkg_post = ""; my $subpkg_files = ""; my $all_supported_dtb = ""; - my $DTS_folder = "linux/arch/arm/boot/dts"; + my $DTS_folder = "arch/arm/boot/dts"; if ($exclusive_arch =~ /aarch64/) { - $DTS_folder = "linux/arch/arm64/boot/dts"; + $DTS_folder = "arch/arm64/boot/dts"; } foreach my $NAME (@$package_list) { ++++++ patches.drivers.tar.bz2 ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/patches.drivers/drm-reference-count-event-completion new/patches.drivers/drm-reference-count-event-completion --- old/patches.drivers/drm-reference-count-event-completion 2017-02-09 11:55:53.000000000 +0100 +++ new/patches.drivers/drm-reference-count-event-completion 2017-01-30 17:46:39.000000000 +0100 @@ -50,7 +50,7 @@ --- a/drivers/gpu/drm/drm_atomic_helper.c +++ b/drivers/gpu/drm/drm_atomic_helper.c -@@ -1382,6 +1382,15 @@ static int stall_checks(struct drm_crtc +@@ -1389,6 +1389,15 @@ static int stall_checks(struct drm_crtc return ret < 0 ? ret : 0; } @@ -66,7 +66,7 @@ /** * drm_atomic_helper_setup_commit - setup possibly nonblocking commit * @state: new modeset state to be committed -@@ -1474,6 +1483,8 @@ int drm_atomic_helper_setup_commit(struc +@@ -1481,6 +1490,8 @@ int drm_atomic_helper_setup_commit(struc } crtc_state->event->base.completion = &commit->flip_done; @@ -77,7 +77,7 @@ return 0; --- a/drivers/gpu/drm/drm_fops.c +++ b/drivers/gpu/drm/drm_fops.c -@@ -686,8 +686,8 @@ void drm_send_event_locked(struct drm_de +@@ -689,8 +689,8 @@ void drm_send_event_locked(struct drm_de assert_spin_locked(&dev->event_lock); if (e->completion) { @@ -89,11 +89,11 @@ --- a/include/drm/drmP.h +++ b/include/drm/drmP.h -@@ -361,6 +361,7 @@ struct drm_ioctl_desc { +@@ -360,6 +360,7 @@ struct drm_ioctl_desc { /* Event queued up for userspace to read */ struct drm_pending_event { struct completion *completion; + void (*completion_release)(struct completion *completion); struct drm_event *event; - struct fence *fence; + struct dma_fence *fence; struct list_head link; diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/patches.drivers/media-uvcvideo-uvc_scan_fallback-for-webcams-with-br new/patches.drivers/media-uvcvideo-uvc_scan_fallback-for-webcams-with-br --- old/patches.drivers/media-uvcvideo-uvc_scan_fallback-for-webcams-with-br 2017-02-09 11:55:53.000000000 +0100 +++ new/patches.drivers/media-uvcvideo-uvc_scan_fallback-for-webcams-with-br 1970-01-01 01:00:00.000000000 +0100 @@ -1,170 +0,0 @@ -From e950267ab802c8558f1100eafd4087fd039ad634 Mon Sep 17 00:00:00 2001 -From: Henrik Ingo <henrik.ingo(a)avoinelama.fi> -Date: Sun, 29 May 2016 17:58:00 -0300 -Subject: [PATCH] [media] uvcvideo: uvc_scan_fallback() for webcams with broken chain -Git-commit: e950267ab802c8558f1100eafd4087fd039ad634 -Patch-mainline: 4.10-rc1 -References: bsc#1021474 - -Some devices have invalid baSourceID references, causing uvc_scan_chain() -to fail, but if we just take the entities we can find and put them -together in the most sensible chain we can think of, turns out they do -work anyway. Note: This heuristic assumes there is a single chain. - -At the time of writing, devices known to have such a broken chain are - - Acer Integrated Camera (5986:055a) - - Realtek rtl157a7 (0bda:57a7) - -Signed-off-by: Henrik Ingo <henrik.ingo(a)avoinelama.fi> -Signed-off-by: Laurent Pinchart <laurent.pinchart(a)ideasonboard.com> -Signed-off-by: Mauro Carvalho Chehab <mchehab(a)s-opensource.com> -Acked-by: Takashi Iwai <tiwai(a)suse.de> - ---- - drivers/media/usb/uvc/uvc_driver.c | 118 +++++++++++++++++++++++++++++++++++-- - 1 file changed, 112 insertions(+), 6 deletions(-) - ---- a/drivers/media/usb/uvc/uvc_driver.c -+++ b/drivers/media/usb/uvc/uvc_driver.c -@@ -1595,6 +1595,114 @@ static const char *uvc_print_chain(struc - return buffer; - } - -+static struct uvc_video_chain *uvc_alloc_chain(struct uvc_device *dev) -+{ -+ struct uvc_video_chain *chain; -+ -+ chain = kzalloc(sizeof(*chain), GFP_KERNEL); -+ if (chain == NULL) -+ return NULL; -+ -+ INIT_LIST_HEAD(&chain->entities); -+ mutex_init(&chain->ctrl_mutex); -+ chain->dev = dev; -+ v4l2_prio_init(&chain->prio); -+ -+ return chain; -+} -+ -+/* -+ * Fallback heuristic for devices that don't connect units and terminals in a -+ * valid chain. -+ * -+ * Some devices have invalid baSourceID references, causing uvc_scan_chain() -+ * to fail, but if we just take the entities we can find and put them together -+ * in the most sensible chain we can think of, turns out they do work anyway. -+ * Note: This heuristic assumes there is a single chain. -+ * -+ * At the time of writing, devices known to have such a broken chain are -+ * - Acer Integrated Camera (5986:055a) -+ * - Realtek rtl157a7 (0bda:57a7) -+ */ -+static int uvc_scan_fallback(struct uvc_device *dev) -+{ -+ struct uvc_video_chain *chain; -+ struct uvc_entity *iterm = NULL; -+ struct uvc_entity *oterm = NULL; -+ struct uvc_entity *entity; -+ struct uvc_entity *prev; -+ -+ /* -+ * Start by locating the input and output terminals. We only support -+ * devices with exactly one of each for now. -+ */ -+ list_for_each_entry(entity, &dev->entities, list) { -+ if (UVC_ENTITY_IS_ITERM(entity)) { -+ if (iterm) -+ return -EINVAL; -+ iterm = entity; -+ } -+ -+ if (UVC_ENTITY_IS_OTERM(entity)) { -+ if (oterm) -+ return -EINVAL; -+ oterm = entity; -+ } -+ } -+ -+ if (iterm == NULL || oterm == NULL) -+ return -EINVAL; -+ -+ /* Allocate the chain and fill it. */ -+ chain = uvc_alloc_chain(dev); -+ if (chain == NULL) -+ return -ENOMEM; -+ -+ if (uvc_scan_chain_entity(chain, oterm) < 0) -+ goto error; -+ -+ prev = oterm; -+ -+ /* -+ * Add all Processing and Extension Units with two pads. The order -+ * doesn't matter much, use reverse list traversal to connect units in -+ * UVC descriptor order as we build the chain from output to input. This -+ * leads to units appearing in the order meant by the manufacturer for -+ * the cameras known to require this heuristic. -+ */ -+ list_for_each_entry_reverse(entity, &dev->entities, list) { -+ if (entity->type != UVC_VC_PROCESSING_UNIT && -+ entity->type != UVC_VC_EXTENSION_UNIT) -+ continue; -+ -+ if (entity->num_pads != 2) -+ continue; -+ -+ if (uvc_scan_chain_entity(chain, entity) < 0) -+ goto error; -+ -+ prev->baSourceID[0] = entity->id; -+ prev = entity; -+ } -+ -+ if (uvc_scan_chain_entity(chain, iterm) < 0) -+ goto error; -+ -+ prev->baSourceID[0] = iterm->id; -+ -+ list_add_tail(&chain->list, &dev->chains); -+ -+ uvc_trace(UVC_TRACE_PROBE, -+ "Found a video chain by fallback heuristic (%s).\n", -+ uvc_print_chain(chain)); -+ -+ return 0; -+ -+error: -+ kfree(chain); -+ return -EINVAL; -+} -+ - /* - * Scan the device for video chains and register video devices. - * -@@ -1617,15 +1725,10 @@ static int uvc_scan_device(struct uvc_de - if (term->chain.next || term->chain.prev) - continue; - -- chain = kzalloc(sizeof(*chain), GFP_KERNEL); -+ chain = uvc_alloc_chain(dev); - if (chain == NULL) - return -ENOMEM; - -- INIT_LIST_HEAD(&chain->entities); -- mutex_init(&chain->ctrl_mutex); -- chain->dev = dev; -- v4l2_prio_init(&chain->prio); -- - term->flags |= UVC_ENTITY_FLAG_DEFAULT; - - if (uvc_scan_chain(chain, term) < 0) { -@@ -1639,6 +1742,9 @@ static int uvc_scan_device(struct uvc_de - list_add_tail(&chain->list, &dev->chains); - } - -+ if (list_empty(&dev->chains)) -+ uvc_scan_fallback(dev); -+ - if (list_empty(&dev->chains)) { - uvc_printk(KERN_INFO, "No valid video chain found.\n"); - return -1; ++++++ patches.fixes.tar.bz2 ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/patches.fixes/drm-Use-u64-for-intermediate-dotclock-calculations.patch new/patches.fixes/drm-Use-u64-for-intermediate-dotclock-calculations.patch --- old/patches.fixes/drm-Use-u64-for-intermediate-dotclock-calculations.patch 2017-02-18 18:59:27.000000000 +0100 +++ new/patches.fixes/drm-Use-u64-for-intermediate-dotclock-calculations.patch 1970-01-01 01:00:00.000000000 +0100 @@ -1,53 +0,0 @@ -From: Chris Wilson <chris(a)chris-wilson.co.uk> -Date: Fri, 21 Oct 2016 15:15:40 +0100 -Subject: drm: Use u64 for intermediate dotclock calculations -MIME-Version: 1.0 -Content-Type: text/plain; charset=UTF-8 -Content-Transfer-Encoding: 8bit -Git-commit: 8a5bbf327aa16025c78491266a6425807c7fbee0 -Patch-mainline: v4.10-rc1 -References: bnc#1006472 - -We have reached the era where monitor bandwidths now exceed 31bits in -frequency calculations, though as we stored them in kHz units we are -safe from overflow in the modelines for some time. - -[ 48.723720] UBSAN: Undefined behaviour in ../drivers/gpu/drm/drm_modes.c:325:49 -[ 48.726943] signed integer overflow: -[ 48.728503] 2240 * 1000000 cannot be represented in type 'int' - -Reported-by: Martin Liška <marxin.liska(a)gmail.com> -Bugzilla: https://bugs.freedesktop.org/show_bug.cgi?id=98372 -Signed-off-by: Chris Wilson <chris(a)chris-wilson.co.uk> -Reviewed-by: Alex Deucher <alexander.deucher(a)amd.com> -Signed-off-by: Daniel Vetter <daniel.vetter(a)ffwll.ch> -Link: http://patchwork.freedesktop.org/patch/msgid/20161021141540.26837-1-chris@c… -Signed-off-by: Jiri Slaby <jslaby(a)suse.cz> ---- - drivers/gpu/drm/drm_modes.c | 8 ++++++-- - 1 file changed, 6 insertions(+), 2 deletions(-) - ---- a/drivers/gpu/drm/drm_modes.c -+++ b/drivers/gpu/drm/drm_modes.c -@@ -165,6 +165,7 @@ struct drm_display_mode *drm_cvt_mode(st - unsigned int vfieldrate, hperiod; - int hdisplay_rnd, hmargin, vdisplay_rnd, vmargin, vsync; - int interlace; -+ u64 tmp; - - /* allocate the drm_display_mode structure. If failure, we will - * return directly -@@ -322,8 +323,11 @@ struct drm_display_mode *drm_cvt_mode(st - drm_mode->vsync_end = drm_mode->vsync_start + vsync; - } - /* 15/13. Find pixel clock frequency (kHz for xf86) */ -- drm_mode->clock = drm_mode->htotal * HV_FACTOR * 1000 / hperiod; -- drm_mode->clock -= drm_mode->clock % CVT_CLOCK_STEP; -+ tmp = drm_mode->htotal; /* perform intermediate calcs in u64 */ -+ tmp *= HV_FACTOR * 1000; -+ do_div(tmp, hperiod); -+ tmp -= drm_mode->clock % CVT_CLOCK_STEP; -+ drm_mode->clock = tmp; - /* 18/16. Find actual vertical frame frequency */ - /* ignore - just set the mode flag for interlaced */ - if (interlaced) { diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/patches.fixes/ipc-msg-make-msgrcv-work-with-LONG_MIN.patch new/patches.fixes/ipc-msg-make-msgrcv-work-with-LONG_MIN.patch --- old/patches.fixes/ipc-msg-make-msgrcv-work-with-LONG_MIN.patch 2017-02-18 18:59:27.000000000 +0100 +++ new/patches.fixes/ipc-msg-make-msgrcv-work-with-LONG_MIN.patch 1970-01-01 01:00:00.000000000 +0100 @@ -1,67 +0,0 @@ -From: Jiri Slaby <jslaby(a)suse.cz> -Date: Wed, 14 Dec 2016 15:06:07 -0800 -Subject: ipc: msg, make msgrcv work with LONG_MIN -Git-commit: 999898355e08ae3b92dfd0a08db706e0c6703d30 -Patch-mainline: v4.10-rc1 -References: bnc#1005918 - -When LONG_MIN is passed to msgrcv, one would expect to recieve any -message. But convert_mode does *msgtyp = -*msgtyp and -LONG_MIN is -undefined. In particular, with my gcc -LONG_MIN produces -LONG_MIN -again. - -So handle this case properly by assigning LONG_MAX to *msgtyp if -LONG_MIN was specified as msgtyp to msgrcv. - -This code: - long msg[] = { 100, 200 }; - int m = msgget(IPC_PRIVATE, IPC_CREAT | 0644); - msgsnd(m, &msg, sizeof(msg), 0); - msgrcv(m, &msg, sizeof(msg), LONG_MIN, 0); - -produces currently nothing: - - msgget(IPC_PRIVATE, IPC_CREAT|0644) = 65538 - msgsnd(65538, {100, "\310\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0"}, 16, 0) = 0 - msgrcv(65538, ... - -Except a UBSAN warning: - - UBSAN: Undefined behaviour in ipc/msg.c:745:13 - negation of -9223372036854775808 cannot be represented in type 'long int': - -With the patch, I see what I expect: - - msgget(IPC_PRIVATE, IPC_CREAT|0644) = 0 - msgsnd(0, {100, "\310\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0"}, 16, 0) = 0 - msgrcv(0, {100, "\310\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0"}, 16, -9223372036854775808, 0) = 16 - -Link: http://lkml.kernel.org/r/20161024082633.10148-1-jslaby@suse.cz -Signed-off-by: Jiri Slaby <jslaby(a)suse.cz> -Cc: Davidlohr Bueso <dave(a)stgolabs.net> -Cc: Manfred Spraul <manfred(a)colorfullife.com> -Signed-off-by: Andrew Morton <akpm(a)linux-foundation.org> -Signed-off-by: Linus Torvalds <torvalds(a)linux-foundation.org> ---- - ipc/msg.c | 5 ++++- - 1 file changed, 4 insertions(+), 1 deletion(-) - -diff --git a/ipc/msg.c b/ipc/msg.c -index 32e9bd837cde..e3e52ce01123 100644 ---- a/ipc/msg.c -+++ b/ipc/msg.c -@@ -763,7 +763,10 @@ static inline int convert_mode(long *msgtyp, int msgflg) - if (*msgtyp == 0) - return SEARCH_ANY; - if (*msgtyp < 0) { -- *msgtyp = -*msgtyp; -+ if (*msgtyp == LONG_MIN) /* -LONG_MIN is undefined */ -+ *msgtyp = LONG_MAX; -+ else -+ *msgtyp = -*msgtyp; - return SEARCH_LESSEQUAL; - } - if (msgflg & MSG_EXCEPT) --- -2.11.0 - ++++++ patches.kernel.org.tar.bz2 ++++++ ++++ 38256 lines of diff (skipped) ++++++ patches.suse.tar.bz2 ++++++ ++++ 2951 lines of diff (skipped) ++++++ series.conf ++++++ --- /var/tmp/diff_new_pack.vD7zvw/_old 2017-02-25 00:48:21.572123399 +0100 +++ /var/tmp/diff_new_pack.vD7zvw/_new 2017-02-25 00:48:21.580122179 +0100 @@ -27,17 +27,6 @@ # DO NOT MODIFY THEM! # Send separate patches upstream if you find a problem... ######################################################## - patches.kernel.org/patch-4.9.1 - patches.kernel.org/patch-4.9.1-2 - patches.kernel.org/patch-4.9.2-3 - patches.kernel.org/patch-4.9.3-4 - patches.kernel.org/patch-4.9.4-5 - patches.kernel.org/patch-4.9.5-6 - patches.kernel.org/patch-4.9.6-7 - patches.kernel.org/patch-4.9.7-8 - patches.kernel.org/patch-4.9.8-9 - patches.kernel.org/patch-4.9.9-10 - patches.kernel.org/patch-4.9.10-11 ######################################################## # Build fixes that apply to the vanilla kernel too. @@ -153,13 +142,13 @@ ######################################################## patches.arch/arm-OMAP-Fix-missing-usb.h-include.patch - patches.arch/arm-refresh-mach-types.diff ++dmueller patches.arch/arm-refresh-mach-types.diff patches.arch/arm-arndale-usb.patch - patches.arch/arm-exynos-dwmmc-modalias.patch ++agraf patches.arch/arm-exynos-dwmmc-modalias.patch patches.arch/arm64-0006-arm64-Select-reboot-driver-for-X-Gene-platform.patch # arm64 fix efifb to relocate the fb on BAR move - patches.arch/arm64-Relocate-screen_info.lfb_base-on-PCI-BAR-alloc.patch ++agraf patches.arch/arm64-Relocate-screen_info.lfb_base-on-PCI-BAR-alloc.patch ######################################################## # S/390 @@ -179,7 +168,6 @@ ######################################################## # IPC patches ######################################################## - patches.fixes/ipc-msg-make-msgrcv-work-with-LONG_MIN.patch ######################################################## # nfsacl protocol (agruen) @@ -251,10 +239,11 @@ ######################################################## # btrfs ######################################################## + + # SUSE-specific patches.suse/btrfs-provide-super_operations-get_inode_dev - patches.suse/revert-btrfs-fix-lockdep-warning-on-deadlock-against-an-inode-s-log-mutex.patch - patches.suse/revert-btrfs-improve-performance-on-fsync-against-new-inode-after-rename-unlink.patch - patches.suse/btrfs-fix-extent-tree-corruption-due-to-relocation.patch + patches.suse/btrfs-fs-super.c-add-new-super-block-devices-super_block_d.patch + patches.suse/btrfs-btrfs-use-the-new-VFS-super_block_dev.patch ######################################################## # Reiserfs Patches @@ -324,13 +313,11 @@ # DRM/Video ######################################################## patches.fixes/drm-i915-Fix-S4-resume-breakage - patches.fixes/drm-Use-u64-for-intermediate-dotclock-calculations.patch patches.drivers/drm-reference-count-event-completion ######################################################## # video4linux ######################################################## - patches.drivers/media-uvcvideo-uvc_scan_fallback-for-webcams-with-br ######################################################## # Network ++++++ source-timestamp ++++++ --- /var/tmp/diff_new_pack.vD7zvw/_old 2017-02-25 00:48:21.632114254 +0100 +++ /var/tmp/diff_new_pack.vD7zvw/_new 2017-02-25 00:48:21.632114254 +0100 @@ -1,3 +1,3 @@ -2017-02-18 18:59:27 +0100 -GIT Revision: cf9c6703e2b91aab27b2bb654ea57b05ede902de +2017-02-20 17:47:26 +0100 +GIT Revision: 81ace5a7f749b84cf86ee1d200b2561de377319f GIT Branch: stable

1 0

commit lvm2 for openSUSE:Factory
by root＠hilbertn.suse.de 24 Feb '17

24 Feb '17

Hello community, here is the log from the commit of package lvm2 for openSUSE:Factory checked in at 2017-02-25 00:47:16 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/lvm2 (Old) and /work/SRC/openSUSE:Factory/.lvm2.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "lvm2" Changes: -------- --- /work/SRC/openSUSE:Factory/lvm2/device-mapper.changes 2017-02-04 18:01:27.871985763 +0100 +++ /work/SRC/openSUSE:Factory/.lvm2.new/device-mapper.changes 2017-02-25 00:47:16.722008873 +0100 @@ -1,0 +2,29 @@ +Thu Feb 23 06:27:55 UTC 2017 - zren(a)suse.com + +- Enable lvmetad in sync with SLE + +------------------------------------------------------------------- +Wed Feb 22 11:25:01 UTC 2017 - zren(a)suse.com + +- Add systemid feature + * update lvm.conf accordingly + * replace whitespaces with tab in lvm.conf + +------------------------------------------------------------------- +Wed Feb 22 10:43:38 UTC 2017 - zren(a)suse.com + +- Fix several issues about clvmd/cmorriord RAs (bsc#1023283, + bsc#1025560) + * deal with time values passed down with time units + * make correct "return code" + * fix format issue that tab messes up with spaces + +------------------------------------------------------------------- +Wed Feb 22 06:39:27 UTC 2017 - zren(a)suse.com + +- udev: simplify special-case for md in 69-dm-lvm-metadata.rules + * fix regression of bsc#1012973 + * drop remove-special-case-for-md-in-69-dm-lvm-metadata.rul.patch + * add simplify-special-case-for-md-in-69-dm-lvm-metadata.patch + +------------------------------------------------------------------- lvm2-clvm.changes: same change lvm2.changes: same change Old: ---- remove-special-case-for-md-in-69-dm-lvm-metadata.rul.patch New: ---- simplify-special-case-for-md-in-69-dm-lvm-metadata.patch ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ device-mapper.spec ++++++ --- /var/tmp/diff_new_pack.AvOAvS/_old 2017-02-25 00:47:18.097799147 +0100 +++ /var/tmp/diff_new_pack.AvOAvS/_new 2017-02-25 00:47:18.097799147 +0100 @@ -78,8 +78,8 @@ Patch2010: 69-dm-lvm-metad.rules-Do-not-process-rules-for-multi.patch #PATCH-FIX-SUSE, bnc#950089 Patch2011: lvm2-testsuite.patch -# Remove special case for the md rules -Patch2012: remove-special-case-for-md-in-69-dm-lvm-metadata.rul.patch +# simplify special case for the md rules +Patch2012: simplify-special-case-for-md-in-69-dm-lvm-metadata.patch ### COMMON-PATCH-END ### BuildRequires: gcc-c++ BuildRequires: pkgconfig lvm2-clvm.spec: same change ++++++ lvm2.spec ++++++ --- /var/tmp/diff_new_pack.AvOAvS/_old 2017-02-25 00:47:18.157790002 +0100 +++ /var/tmp/diff_new_pack.AvOAvS/_new 2017-02-25 00:47:18.161789393 +0100 @@ -79,8 +79,8 @@ Patch2010: 69-dm-lvm-metad.rules-Do-not-process-rules-for-multi.patch #PATCH-FIX-SUSE, bnc#950089 Patch2011: lvm2-testsuite.patch -# Remove special case for the md rules -Patch2012: remove-special-case-for-md-in-69-dm-lvm-metadata.rul.patch +# simplify special case for the md rules +Patch2012: simplify-special-case-for-md-in-69-dm-lvm-metadata.patch ### COMMON-PATCH-END ### BuildRequires: gcc-c++ BuildRequires: libaio-devel ++++++ clvmd.ocf ++++++ --- /var/tmp/diff_new_pack.AvOAvS/_old 2017-02-25 00:47:18.233778419 +0100 +++ /var/tmp/diff_new_pack.AvOAvS/_new 2017-02-25 00:47:18.237777809 +0100 @@ -1,6 +1,5 @@ #!/bin/bash -# Copyright (c) 2008 Xinwei Hu -# All Rights Reserved. +# Copyright (c) 2008 Xinwei Hu All Rights Reserved. # # This program is free software; you can redistribute it and/or modify # it under the terms of version 2 of the GNU General Public License as @@ -12,7 +11,7 @@ # # Further, this software is distributed without any warranty that it is # free of the rightful claim of any third person regarding infringement -# or the like. Any license provided herein, whether implied or +# or the like. Any license provided herein, whether implied or # otherwise, applies only to this software file. Patent licenses, if # any, provided herein do not apply to combinations of this program with # other software, or any other product whatsoever. @@ -38,161 +37,175 @@ CMIRRORD="${sbindir}/cmirrord" LVMCONF="${sbindir}/lvmconf" +time_to_seconds() { + local val + val=$1 + case $val in + *h) echo $(( $(echo $val | sed -e "s/h$//") * 3600 ));; + *ms) echo $(( $(echo $val | sed -e "s/ms$//") / 1000 ));; + *s) echo $val | sed -e "s/s$//";; + *m) echo $(( $(echo $val | sed -e "s/m$//") * 60 ));; + *) echo "$val";; + esac +} + +OCF_RESKEY_daemon_timeout=$(time_to_seconds ${OCF_RESKEY_daemon_timeout}) + status_daemons() { - PID=`pidofproc "$DAEMON"` + PID=`pidofproc "$DAEMON"` NPID=`pidofproc "$CMIRRORD"` - if [ -n "$PID" -a -n "$NPID" ]; then - return $OCF_SUCCESS - fi - return $OCF_NOT_RUNNING + if [ -n "$PID" -a -n "$NPID" ]; then + return $OCF_SUCCESS + fi + return $OCF_NOT_RUNNING } status_clvmd() { - PID=`pidofproc "$DAEMON"` - if [ -n "$PID" ]; then - return $OCF_SUCCESS - fi - return $OCF_NOT_RUNNING + PID=`pidofproc "$DAEMON"` + if [ -n "$PID" ]; then + return $OCF_SUCCESS + fi + return $OCF_NOT_RUNNING } status_cmirrord() { - PID=`pidofproc "$CMIRRORD"` - if [ -n "$PID" ]; then - return $OCF_SUCCESS - fi - return $OCF_NOT_RUNNING + PID=`pidofproc "$CMIRRORD"` + if [ -n "$PID" ]; then + return $OCF_SUCCESS + fi + return $OCF_NOT_RUNNING } bringup_clvmd() { - if [ ! -e "$DAEMON" ]; then - ocf_log err "Required binary not found: $DAEMON" - return $OCF_ERR_INSTALLED - fi - - start_daemon "$DAEMON" "$OCF_RESKEY_daemon_options"; rc=$? - if [ $rc != 0 ]; then - ocf_log err "Could not start $DAEMON" - return $OCF_ERR_GENERIC - fi - - sleep 1 - COUNT=0 - rc=$OCF_NOT_RUNNING - - while [ $rc = $OCF_NOT_RUNNING ]; do - COUNT=`expr $COUNT + 1` - if [ $COUNT -gt $OCF_RESKEY_daemon_timeout ]; then - ocf_log err "`basename $DAEMON` did not come up" - return $OCF_ERR_GENERIC - fi - status_clvmd; rc=$? - sleep 1 - done + if [ ! -e "$DAEMON" ]; then + ocf_log err "Required binary not found: $DAEMON" + return $OCF_ERR_INSTALLED + fi + + start_daemon "$DAEMON" "$OCF_RESKEY_daemon_options"; rc=$? + if [ $rc != 0 ]; then + ocf_log err "Could not start $DAEMON" + return $OCF_ERR_GENERIC + fi + + sleep 1 + COUNT=0 + rc=$OCF_NOT_RUNNING + + while [ $rc = $OCF_NOT_RUNNING ]; do + COUNT=`expr $COUNT + 1` + if [ $COUNT -gt $OCF_RESKEY_daemon_timeout ]; then + ocf_log err "`basename $DAEMON` did not come up" + return $OCF_ERR_GENERIC + fi + status_clvmd; rc=$? + sleep 1 + done - return $rc + return $rc } bringup_cmirrord() { - if [ ! -e "$CMIRRORD" ]; then - ocf_log err "Required binary not found: $DAEMON" - return $OCF_ERR_INSTALLED - fi - - start_daemon "$CMIRRORD"; rc=$? - if [ $rc != 0 ]; then - ocf_log err "Could not start $CMIRRORD" - return $OCF_ERR_GENERIC - fi - - sleep 1 - COUNT=0 - rc=$OCF_NOT_RUNNING - - while [ $rc = $OCF_NOT_RUNNING ]; do - COUNT=`expr $COUNT + 1` - if [ $COUNT -gt $OCF_RESKEY_daemon_timeout ]; then - ocf_log err "`basename $DAEMON` did not come up" - return $OCF_ERR_GENERIC - fi - status_cmirrord; rc=$? - sleep 1 - done + if [ ! -e "$CMIRRORD" ]; then + ocf_log err "Required binary not found: $DAEMON" + return $OCF_ERR_INSTALLED + fi + + start_daemon "$CMIRRORD"; rc=$? + if [ $rc != 0 ]; then + ocf_log err "Could not start $CMIRRORD" + return $OCF_ERR_GENERIC + fi - return $rc + sleep 1 + COUNT=0 + rc=$OCF_NOT_RUNNING + + while [ $rc = $OCF_NOT_RUNNING ]; do + COUNT=`expr $COUNT + 1` + if [ $COUNT -gt $OCF_RESKEY_daemon_timeout ]; then + ocf_log err "`basename $DAEMON` did not come up" + return $OCF_ERR_GENERIC + fi + status_cmirrord; rc=$? + sleep 1 + done + + return $rc } kill_clvmd() { - status_clvmd; rc=$? - if [ $rc != $OCF_SUCCESS ]; then - return rc - fi - - ocf_log info "Stopping `basename "$DAEMON"`" - killproc -INT "$DAEMON" - - sleep 1 - status_daemons; rc=$? - - COUNT=0 - while [ $rc = $OCF_SUCCESS ]; do - COUNT=`expr $COUNT + 1` - if [ $COUNT -gt $OCF_RESKEY_daemon_timeout ]; then - ocf_log err "`basename $DAEMON` shutdown emergency" - killproc -9 "$DAEMON" + status_clvmd; rc=$? + if [ $rc != $OCF_SUCCESS ]; then + return $rc + fi + + ocf_log info "Stopping `basename "$DAEMON"`" + killproc -INT "$DAEMON" + + sleep 1 + status_daemons; rc=$? + + COUNT=0 + while [ $rc = $OCF_SUCCESS ]; do + COUNT=`expr $COUNT + 1` + if [ $COUNT -gt $OCF_RESKEY_daemon_timeout ]; then + ocf_log err "`basename $DAEMON` shutdown emergency" + killproc -9 "$DAEMON" status_clvmd; rc=$? if [ $rc = $OCF_NOT_RUNNING ]; then return $OCF_SUCCESS else return $OCF_ERR_GENERIC fi - fi + fi killproc -INT "$DAEMON" - sleep 1 + sleep 1 status_clvmd; rc=$? - done + done - return $OCF_SUCCESS + return $OCF_SUCCESS } kill_cmirrord() { - status_cmirrord; rc=$? - if [ $rc != $OCF_SUCCESS ]; then - return rc - fi - - ocf_log info "Stopping `basename "$CMIRRORD"`" - killproc -INT "$CMIRRORD" - - sleep 1 - status_cmirrord; rc=$? - - COUNT=0 - while [ $rc = $OCF_SUCCESS ]; do - COUNT=`expr $COUNT + 1` - if [ $COUNT -gt $OCF_RESKEY_daemon_timeout ]; then - ocf_log err "`basename $CMIRRORD` shutdown emergency" - killproc -9 "$CMIRRORD" + status_cmirrord; rc=$? + if [ $rc != $OCF_SUCCESS ]; then + return $rc + fi + + ocf_log info "Stopping `basename "$CMIRRORD"`" + killproc -INT "$CMIRRORD" + + sleep 1 + status_cmirrord; rc=$? + + COUNT=0 + while [ $rc = $OCF_SUCCESS ]; do + COUNT=`expr $COUNT + 1` + if [ $COUNT -gt $OCF_RESKEY_daemon_timeout ]; then + ocf_log err "`basename $CMIRRORD` shutdown emergency" + killproc -9 "$CMIRRORD" status_cmirrord; rc=$? if [ $rc = $OCF_NOT_RUNNING ]; then return $OCF_SUCCESS else return $OCF_ERR_GENERIC fi - fi + fi killproc -INT "$CMIRRORD" - sleep 1 + sleep 1 status_cmirrord; rc=$? - done + done - return $OCF_SUCCESS + return $OCF_SUCCESS } @@ -201,34 +214,34 @@ clvmd_validate ocf_log info "Starting $OCF_RESOURCE_INSTANCE" - # autoset locking type to clusted when lvmconf tool is available - if [ -x "$LVMCONF" ]; then - $LVMCONF --enable-cluster > /dev/null 2>&1 - fi + # autoset locking type to clusted when lvmconf tool is available + if [ -x "$LVMCONF" ]; then + $LVMCONF --enable-cluster > /dev/null 2>&1 + fi status_clvmd; rc=$? - if [ $rc == $OCF_NOT_RUNNING ]; then - bringup_clvmd; rc=$? - if [ $rc != $OCF_SUCCESS ]; then - return $OCF_ERR_GENERIC - fi + if [ $rc == $OCF_NOT_RUNNING ]; then + bringup_clvmd; rc=$? + if [ $rc != $OCF_SUCCESS ]; then + return $OCF_ERR_GENERIC + fi fi status_cmirrord; rc=$? - if [ $rc == $OCF_NOT_RUNNING ]; then - bringup_cmirrord; rc=$? - if [ $rc != $OCF_SUCCESS ]; then - kill_clvmd - return $OCF_ERR_GENERIC - fi + if [ $rc == $OCF_NOT_RUNNING ]; then + bringup_cmirrord; rc=$? + if [ $rc != $OCF_SUCCESS ]; then + kill_clvmd + return $OCF_ERR_GENERIC + fi fi - return $OCF_SUCCESS + return $OCF_SUCCESS } clvmd_stop() { clvmd_validate - ocf_log info "Stopping $OCF_RESOURCE_INSTANCE" + ocf_log info "Stopping $OCF_RESOURCE_INSTANCE" status_clvmd; rc=$? if [ $rc != $OCF_NOT_RUNNING ]; then @@ -252,28 +265,28 @@ } clvmd_monitor() { - clvmd_validate + clvmd_validate - status_daemons - return $? + status_daemons + return $? } clvmd_usage() { - echo "usage: $0 {start|stop|monitor|validate-all|meta-data}" - echo " Expects to have a fully populated OCF RA-compliant environment set." - echo " In particualr, a value for OCF_ROOT" + echo "usage: $0 {start|stop|monitor|validate-all|meta-data}" + echo " Expects to have a fully populated OCF RA-compliant environment set." + echo " In particualr, a value for OCF_ROOT" } clvmd_validate() { - : TODO: check for globally_unique=true and return OCF_ERR_CONFIGURED - case ${OCF_RESKEY_CRM_meta_globally_unique} in + : TODO: check for globally_unique=true and return OCF_ERR_CONFIGURED + case ${OCF_RESKEY_CRM_meta_globally_unique} in yes|Yes|true|True|1) - ocf_log err "$OCF_RESOURCE_INSTANCE must be configured with the globally_unique=false meta attribute" - exit $OCF_ERR_CONFIGURED - ;; - esac + ocf_log err "$OCF_RESOURCE_INSTANCE must be configured with the globally_unique=false meta attribute" + exit $OCF_ERR_CONFIGURED + ;; + esac - return $OCF_SUCCESS + return $OCF_SUCCESS } meta_data() { @@ -289,30 +302,29 @@ <shortdesc lang="en">clvmd resource agent</shortdesc> <parameters> - <parameter name="daemon_timeout" unique="0"> - <longdesc lang="en"> + <parameter name="daemon_timeout" unique="0"> + <longdesc lang="en"> Number of seconds to allow the control daemon to come up and down - </longdesc> - <shortdesc lang="en">Daemon Timeout</shortdesc> - <content type="string" default="80"/> - </parameter> + </longdesc> + <shortdesc lang="en">Daemon Timeout</shortdesc> + <content type="string" default="80"/> + </parameter> - <parameter name="daemon_options" unique="0"> - <longdesc lang="en"> + <parameter name="daemon_options" unique="0"> + <longdesc lang="en"> Options to clvmd. Refer to clvmd.8 for detailed descriptions. - </longdesc> - <shortdesc lang="en">Daemon Options</shortdesc> - <content type="string" default="-d0"/> - </parameter> - + </longdesc> + <shortdesc lang="en">Daemon Options</shortdesc> + <content type="string" default="-d0"/> + </parameter> </parameters> <actions> - <action name="start" timeout="90" /> - <action name="stop" timeout="100" /> - <action name="monitor" timeout="20" depth="0"/> - <action name="meta-data" timeout="5" /> - <action name="validate-all" timeout="30" /> + <action name="start" timeout="90"/> + <action name="stop" timeout="100"/> + <action name="monitor" timeout="20" depth="0"/> + <action name="meta-data" timeout="5"/> + <action name="validate-all" timeout="30"/> </actions> </resource-agent> END @@ -333,7 +345,7 @@ usage|help) clvmd_usage exit $OCF_SUCCESS ;; -*) clvmd_usage +*) clvmd_usage exit $OCF_ERR_UNIMPLEMENTED ;; esac ++++++ cmirrord.ocf ++++++ --- /var/tmp/diff_new_pack.AvOAvS/_old 2017-02-25 00:47:18.253775370 +0100 +++ /var/tmp/diff_new_pack.AvOAvS/_new 2017-02-25 00:47:18.253775370 +0100 @@ -1,6 +1,5 @@ #!/bin/bash -# Copyright (c) 2008 Xinwei Hu -# All Rights Reserved. +# Copyright (c) 2008 Xinwei Hu All Rights Reserved. # # This program is free software; you can redistribute it and/or modify # it under the terms of version 2 of the GNU General Public License as @@ -12,7 +11,7 @@ # # Further, this software is distributed without any warranty that it is # free of the rightful claim of any third person regarding infringement -# or the like. Any license provided herein, whether implied or +# or the like. Any license provided herein, whether implied or # otherwise, applies only to this software file. Patent licenses, if # any, provided herein do not apply to combinations of this program with # other software, or any other product whatsoever. @@ -35,126 +34,140 @@ # Common variables DAEMON="${sbindir}/cmirrord" +time_to_seconds() { + local val + val=$1 + case $val in + *h) echo $(( $(echo $val | sed -e "s/h$//") * 3600 ));; + *ms) echo $(( $(echo $val | sed -e "s/ms$//") / 1000 ));; + *s) echo $val | sed -e "s/s$//";; + *m) echo $(( $(echo $val | sed -e "s/m$//") * 60 ));; + *) echo "$val";; + esac +} + +OCF_RESKEY_daemon_timeout=$(time_to_seconds ${OCF_RESKEY_daemon_timeout}) + status_daemon() { - PID=`pidofproc "$DAEMON"` - if [ -n "$PID" ]; then - return $OCF_SUCCESS - fi - return $OCF_NOT_RUNNING + PID=`pidofproc "$DAEMON"` + if [ -n "$PID" ]; then + return $OCF_SUCCESS + fi + return $OCF_NOT_RUNNING } bringup_daemon() { - if [ ! -e "$DAEMON" ]; then - ocf_log err "Required binary not found: $DAEMON" - return $OCF_ERR_INSTALLED - fi - - start_daemon "$DAEMON"; rc=$? - if [ $rc != 0 ]; then - ocf_log err "Could not start $DAEMON" - return $OCF_ERR_GENERIC - fi - - sleep 1 - COUNT=0 - rc=$OCF_NOT_RUNNING - - while [ $rc = $OCF_NOT_RUNNING ]; do - COUNT=`expr $COUNT + 1` - if [ $COUNT -gt $OCF_RESKEY_daemon_timeout ]; then - ocf_log err "`basename $DAEMON` did not come up" - return $OCF_ERR_GENERIC - fi - status_daemon; rc=$? - sleep 1 - done + if [ ! -e "$DAEMON" ]; then + ocf_log err "Required binary not found: $DAEMON" + return $OCF_ERR_INSTALLED + fi + + start_daemon "$DAEMON"; rc=$? + if [ $rc != 0 ]; then + ocf_log err "Could not start $DAEMON" + return $OCF_ERR_GENERIC + fi + + sleep 1 + COUNT=0 + rc=$OCF_NOT_RUNNING + + while [ $rc = $OCF_NOT_RUNNING ]; do + COUNT=`expr $COUNT + 1` + if [ $COUNT -gt $OCF_RESKEY_daemon_timeout ]; then + ocf_log err "`basename $DAEMON` did not come up" + return $OCF_ERR_GENERIC + fi + status_daemon; rc=$? + sleep 1 + done - return $rc + return $rc } kill_daemon() { - status_daemon; rc=$? - if [ $rc != $OCF_SUCCESS ]; then - return rc - fi - - ocf_log info "Stopping `basename "$DAEMON"`" - killproc -INT "$DAEMON" - - sleep 1 - status_daemon; rc=$? - - COUNT=0 - while [ $rc = $OCF_SUCCESS ]; do - COUNT=`expr $COUNT + 1` - if [ $COUNT -gt $OCF_RESKEY_daemon_timeout ]; then - ocf_log err "`basename $DAEMON` shutdown emergency" - killproc -9 "$DAEMON" + status_daemon; rc=$? + if [ $rc != $OCF_SUCCESS ]; then + return $rc + fi + + ocf_log info "Stopping `basename "$DAEMON"`" + killproc -INT "$DAEMON" + + sleep 1 + status_daemon; rc=$? + + COUNT=0 + while [ $rc = $OCF_SUCCESS ]; do + COUNT=`expr $COUNT + 1` + if [ $COUNT -gt $OCF_RESKEY_daemon_timeout ]; then + ocf_log err "`basename $DAEMON` shutdown emergency" + killproc -9 "$DAEMON" status_daemon; rc=$? if [ $rc = $OCF_NOT_RUNNING ]; then return $OCF_SUCCESS else return $OCF_ERR_GENERIC fi - fi + fi killproc -INT "$DAEMON" - sleep 1 + sleep 1 status_daemon; rc=$? - done + done - return $OCF_SUCCESS + return $OCF_SUCCESS } cmirrord_start() { - cmirrord_monitor; rc=$? - if [ $rc != $OCF_NOT_RUNNING ]; then - return $rc - fi + cmirrord_monitor; rc=$? + if [ $rc != $OCF_NOT_RUNNING ]; then + return $rc + fi - ocf_log info "Starting $OCF_RESOURCE_INSTANCE" + ocf_log info "Starting $OCF_RESOURCE_INSTANCE" - bringup_daemon - return $? + bringup_daemon + return $? } cmirrord_stop() { - cmirrord_monitor; rc=$? - case $rc in - $OCF_NOT_RUNNING) return $OCF_SUCCESS;; - esac + cmirrord_monitor; rc=$? + case $rc in + $OCF_NOT_RUNNING) return $OCF_SUCCESS;; + esac - ocf_log info "Stopping $OCF_RESOURCE_INSTANCE" + ocf_log info "Stopping $OCF_RESOURCE_INSTANCE" - kill_daemon + kill_daemon } cmirrord_monitor() { - cmirrord_validate + cmirrord_validate - status_daemon - return $? + status_daemon + return $? } cmirrord_usage() { - echo "usage: $0 {start|stop|monitor|validate-all|meta-data}" - echo " Expects to have a fully populated OCF RA-compliant environment set." - echo " In particualr, a value for OCF_ROOT" + echo "usage: $0 {start|stop|monitor|validate-all|meta-data}" + echo " Expects to have a fully populated OCF RA-compliant environment set." + echo " In particualr, a value for OCF_ROOT" } cmirrord_validate() { - : TODO: check for globally_unique=true and return OCF_ERR_CONFIGURED - case ${OCF_RESKEY_CRM_meta_globally_unique} in + : TODO: check for globally_unique=true and return OCF_ERR_CONFIGURED + case ${OCF_RESKEY_CRM_meta_globally_unique} in yes|Yes|true|True|1) - ocf_log err "$OCF_RESOURCE_INSTANCE must be configured with the globally_unique=false meta attribute" - exit $OCF_ERR_CONFIGURED - ;; - esac + ocf_log err "$OCF_RESOURCE_INSTANCE must be configured with the globally_unique=false meta attribute" + exit $OCF_ERR_CONFIGURED + ;; + esac - return $OCF_SUCCESS + return $OCF_SUCCESS } meta_data() { @@ -170,31 +183,30 @@ <shortdesc lang="en">cmirrord resource agent</shortdesc> <parameters> - <parameter name="daemon_timeout" unique="0"> - <longdesc lang="en"> + <parameter name="daemon_timeout" unique="0"> + <longdesc lang="en"> Number of seconds to allow the control daemon to come up and down - </longdesc> - <shortdesc lang="en">Daemon Timeout</shortdesc> - <content type="string" default="80"/> - </parameter> + </longdesc> + <shortdesc lang="en">Daemon Timeout</shortdesc> + <content type="string" default="80"/> + </parameter> - <parameter name="daemon_options" unique="0"> - <longdesc lang="en"> + <parameter name="daemon_options" unique="0"> + <longdesc lang="en"> Options to cmirrord. Cmirrord actually doesn't accept any options for now. - </longdesc> - <shortdesc lang="en">Daemon Options</shortdesc> - <content type="string" default=""/> - </parameter> - + </longdesc> + <shortdesc lang="en">Daemon Options</shortdesc> + <content type="string" default=""/> + </parameter> </parameters> <actions> - <action name="start" timeout="90" /> - <action name="stop" timeout="100" /> - <action name="monitor" timeout="20" depth="0"/> - <action name="meta-data" timeout="5" /> - <action name="validate-all" timeout="30" /> + <action name="start" timeout="90"/> + <action name="stop" timeout="100"/> + <action name="monitor" timeout="20" depth="0"/> + <action name="meta-data" timeout="5"/> + <action name="validate-all" timeout="30"/> </actions> </resource-agent> END ++++++ lvm.conf ++++++ ++++ 2440 lines (skipped) ++++ between /work/SRC/openSUSE:Factory/lvm2/lvm.conf ++++ and /work/SRC/openSUSE:Factory/.lvm2.new/lvm.conf ++++++ simplify-special-case-for-md-in-69-dm-lvm-metadata.patch ++++++ >From 0913b597d61b9b430654d7ab06528cdfcfaf06f4 Mon Sep 17 00:00:00 2001 From: NeilBrown <neilb(a)suse.com> Date: Wed, 4 Jan 2017 14:20:53 +1100 Subject: [PATCH] Simplify special-case for md in 69-dm-lvm-metadata.rules This special casing brings little value. It appears to attempt to determine if the array is active yet or not, and to skip processing if the array has not yet been started. However, if the array hasn't been started, then "blkid" will not have been able to read a signature, so: ENV{ID_FS_TYPE}!="LVM2_member|LVM1_member", GOTO="lvm_end" will have caused all this code to be skipped. Further, this code causes incorrect behaviour in at least one case. It assumes that the first "add" event should be ignored, as it will be followed by a "change" event which indicates the array coming on line. This is consistent with how the kernel sends events, but not always consistent with how this script sees event. Specifically: if the initrd has "mdadm" support installed, but not "lvm2" support, then the initial "add" and "change" events will happen while the initrd is in charge and this file is not available. Once the root filesystem is mountd, this file will be available and "udevadm trigger --action=add" will be run. So the first and only event seen by this script for an md device will be "add", and it will incorrectly ignore it. So replace the special handling with code that simply jumps to lvm_scan on any 'add' or 'change' event. Signed-off-by: NeilBrown <neilb(a)suse.com> --- udev/69-dm-lvm-metad.rules.in | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-) diff --git a/udev/69-dm-lvm-metad.rules.in b/udev/69-dm-lvm-metad.rules.in index bd75fc8efcd5..fcbb7f755eba 100644 --- a/udev/69-dm-lvm-metad.rules.in +++ b/udev/69-dm-lvm-metad.rules.in @@ -51,13 +51,11 @@ ENV{DM_UDEV_PRIMARY_SOURCE_FLAG}=="1", ENV{DM_ACTIVATION}=="1", GOTO="lvm_scan" GOTO="lvm_end" # MD device: +# Need to scan on both 'add' and 'change' LABEL="next" KERNEL!="md[0-9]*", GOTO="next" -IMPORT{db}="LVM_MD_PV_ACTIVATED" -ACTION=="add", ENV{LVM_MD_PV_ACTIVATED}=="1", GOTO="lvm_scan" -ACTION=="change", ENV{LVM_MD_PV_ACTIVATED}!="1", TEST=="md/array_state", ENV{LVM_MD_PV_ACTIVATED}="1", GOTO="lvm_scan" -ACTION=="add", KERNEL=="md[0-9]*p[0-9]*", GOTO="lvm_scan" -ENV{LVM_MD_PV_ACTIVATED}!="1", ENV{SYSTEMD_READY}="0" +ACTION=="add", GOTO="lvm_scan" +ACTION=="change", GOTO="lvm_scan" GOTO="lvm_end" # Loop device: -- 2.11.0

1 0

commit zypper for openSUSE:Factory
by root＠hilbertn.suse.de 24 Feb '17

24 Feb '17

Hello community, here is the log from the commit of package zypper for openSUSE:Factory checked in at 2017-02-25 00:47:04 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/zypper (Old) and /work/SRC/openSUSE:Factory/.zypper.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "zypper" Changes: -------- --- /work/SRC/openSUSE:Factory/zypper/zypper.changes 2017-02-19 00:57:28.545546096 +0100 +++ /work/SRC/openSUSE:Factory/.zypper.new/zypper.changes 2017-02-25 00:47:06.335592192 +0100 @@ -1,0 +2,35 @@ +Wed Feb 22 11:42:05 CET 2017 - ma(a)suse.de + +- Try to exit gracefully after SIGPIPE (bsc#926844) +- BuildRequires: libzypp-devel >= 16.4.3 +- version 1.13.19 + +------------------------------------------------------------------- +Fri Feb 17 14:20:17 UTC 2017 - adam.majer(a)suse.de + +- use individual libboost-*-devel packages instead of boost-devel + +------------------------------------------------------------------- +Fri Feb 17 11:39:43 CET 2017 - ma(a)suse.de + +- dup: add -y command option as alias for --non-interactive global + option to be conssistent with other install commands (bsc#1018873) +- version 1.13.18 + +------------------------------------------------------------------- +Thu Feb 16 18:28:47 CET 2017 - ma(a)suse.de + +- Translation: updated .pot file +- Improve srcpackage info (FATE#321104) +- version 1.13.17 + +------------------------------------------------------------------- +Thu Feb 16 18:13:55 CET 2017 - ma(a)suse.de + +- Improve package info. Show binary packages built from a source + package and for packages the source package it was built from. + If no specific type is requested and no package matches, show + non-package matches if available. (FATE#321104) +- version 1.13.17 + +------------------------------------------------------------------- Old: ---- zypper-1.13.16.tar.bz2 New: ---- zypper-1.13.19.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ zypper.spec ++++++ --- /var/tmp/diff_new_pack.Qr6Q2M/_old 2017-02-25 00:47:07.219457453 +0100 +++ /var/tmp/diff_new_pack.Qr6Q2M/_new 2017-02-25 00:47:07.219457453 +0100 @@ -18,12 +18,16 @@ Name: zypper BuildRequires: augeas-devel >= 0.5.0 +%if 0%{?suse_version} > 1325 +BuildRequires: libboost_headers-devel +%else BuildRequires: boost-devel >= 1.33.1 +%endif BuildRequires: cmake >= 2.4.6 BuildRequires: gcc-c++ >= 4.7 BuildRequires: gettext-devel >= 0.15 BuildRequires: libxml2-devel -BuildRequires: libzypp-devel >= 16.4.2 +BuildRequires: libzypp-devel >= 16.4.3 BuildRequires: readline-devel >= 5.1 Requires: procps %if 0%{?suse_version} @@ -34,7 +38,7 @@ Summary: Command line software manager using libzypp License: GPL-2.0+ Group: System/Packages -Version: 1.13.16 +Version: 1.13.19 Release: 0 Source: %{name}-%{version}.tar.bz2 Source1: %{name}-rpmlintrc ++++++ zypper-1.13.16.tar.bz2 -> zypper-1.13.19.tar.bz2 ++++++ /work/SRC/openSUSE:Factory/zypper/zypper-1.13.16.tar.bz2 /work/SRC/openSUSE:Factory/.zypper.new/zypper-1.13.19.tar.bz2 differ: char 11, line 1

1 0

commit libzypp for openSUSE:Factory
by root＠hilbertn.suse.de 24 Feb '17

24 Feb '17

Hello community, here is the log from the commit of package libzypp for openSUSE:Factory checked in at 2017-02-25 00:46:55 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/libzypp (Old) and /work/SRC/openSUSE:Factory/.libzypp.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "libzypp" Changes: -------- --- /work/SRC/openSUSE:Factory/libzypp/libzypp.changes 2017-02-19 00:57:19.106871234 +0100 +++ /work/SRC/openSUSE:Factory/.libzypp.new/libzypp.changes 2017-02-25 00:46:58.112845688 +0100 @@ -1,0 +2,7 @@ +Mon Feb 20 10:10:43 CET 2017 - ma(a)suse.de + +- PublicKey: Create tmpdirs inside ZYpp::tmpPath (bsc#926844) +- Don't create AnonymousUniqueId in chroot (bsc#1024741) +- version 16.4.3 (0) + +------------------------------------------------------------------- Old: ---- libzypp-16.4.2.tar.bz2 New: ---- libzypp-16.4.3.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ libzypp.spec ++++++ --- /var/tmp/diff_new_pack.U60wPB/_old 2017-02-25 00:46:58.848733507 +0100 +++ /var/tmp/diff_new_pack.U60wPB/_new 2017-02-25 00:46:58.848733507 +0100 @@ -19,7 +19,7 @@ %define force_gcc_46 0 Name: libzypp -Version: 16.4.2 +Version: 16.4.3 Release: 0 Url: git://gitorious.org/opensuse/libzypp.git Summary: Package, Patch, Pattern, and Product Management ++++++ libzypp-16.4.2.tar.bz2 -> libzypp-16.4.3.tar.bz2 ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libzypp-16.4.2/VERSION.cmake new/libzypp-16.4.3/VERSION.cmake --- old/libzypp-16.4.2/VERSION.cmake 2017-02-14 12:11:10.000000000 +0100 +++ new/libzypp-16.4.3/VERSION.cmake 2017-02-20 10:16:09.000000000 +0100 @@ -61,8 +61,8 @@ SET(LIBZYPP_MAJOR "16") SET(LIBZYPP_COMPATMINOR "0") SET(LIBZYPP_MINOR "4") -SET(LIBZYPP_PATCH "2") +SET(LIBZYPP_PATCH "3") # -# LAST RELEASED: 16.4.2 (0) +# LAST RELEASED: 16.4.3 (0) # (The number in parenthesis is LIBZYPP_COMPATMINOR) #======= diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libzypp-16.4.2/package/libzypp.changes new/libzypp-16.4.3/package/libzypp.changes --- old/libzypp-16.4.2/package/libzypp.changes 2017-02-14 12:11:10.000000000 +0100 +++ new/libzypp-16.4.3/package/libzypp.changes 2017-02-20 10:16:09.000000000 +0100 @@ -1,4 +1,11 @@ ------------------------------------------------------------------- +Mon Feb 20 10:10:43 CET 2017 - ma(a)suse.de + +- PublicKey: Create tmpdirs inside ZYpp::tmpPath (bsc#926844) +- Don't create AnonymousUniqueId in chroot (bsc#1024741) +- version 16.4.3 (0) + +------------------------------------------------------------------- Tue Feb 14 12:07:14 CET 2017 - ma(a)suse.de - dumpAsXmlOnL: xml escape node content (bsc#1024909) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libzypp-16.4.2/po/nl.po new/libzypp-16.4.3/po/nl.po --- old/libzypp-16.4.2/po/nl.po 2016-11-29 11:31:52.000000000 +0100 +++ new/libzypp-16.4.3/po/nl.po 2017-02-21 11:31:09.000000000 +0100 @@ -16,10 +16,10 @@ "Project-Id-Version: zypp.nl\n" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2016-11-21 15:07+0100\n" -"PO-Revision-Date: 2016-07-12 14:59+0000\n" -"Last-Translator: Eva van Rein <vistatec(a)globaltextware.nl>\n" -"Language-Team: Dutch <https://l10n.opensuse.org/projects/libzypp/master/nl/" -">\n" +"PO-Revision-Date: 2017-02-21 10:27+0000\n" +"Last-Translator: Freek de Kruijf <freek(a)opensuse.org>\n" +"Language-Team: Dutch <https://l10n.opensuse.org/projects/libzypp/master/nl/>" +"\n" "Language: nl\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -4574,6 +4574,8 @@ "Create attach point: Can't find a writable directory to create an attach " "point" msgstr "" +"Aanknooppunt aanmaken: Kan geen beschrijfbare map vinden om een aanknooppunt " +"aan te maken" #. !\todo add comma to the message for the next release #: zypp/media/MediaCIFS.cc:427 zypp/media/MediaCurl.cc:1687 diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libzypp-16.4.2/tests/zypp/Target_test.cc new/libzypp-16.4.3/tests/zypp/Target_test.cc --- old/libzypp-16.4.2/tests/zypp/Target_test.cc 2016-11-29 11:31:52.000000000 +0100 +++ new/libzypp-16.4.3/tests/zypp/Target_test.cc 2017-02-16 14:21:10.000000000 +0100 @@ -1,5 +1,5 @@ - #include <iostream> +#include <fstream> #include <list> #include <string> @@ -34,9 +34,17 @@ z->initializeTarget( tmp.path() ); - BOOST_CHECK( ! z->target()->anonymousUniqueId().empty() ); + // bsc#1024741: Omit creating a new uid for chrooted systems (if it already has one, fine) + BOOST_CHECK( ! PathInfo( tmp.path() / "/var/lib/zypp/AnonymousUniqueId").isExist() ); + // create an artificial one + { + Pathname f( tmp.path() / "/var/lib/zypp" ); + filesystem::assert_dir( f ); + std::ofstream o( (f/"AnonymousUniqueId").c_str() ); + o << "AnonymousUniqueId"; + } BOOST_CHECK( PathInfo( tmp.path() / "/var/lib/zypp/AnonymousUniqueId").isExist() ); - BOOST_CHECK( PathInfo( tmp.path() / "/var/lib/zypp/AnonymousUniqueId").size() > 0 ); + BOOST_CHECK_EQUAL( z->target()->anonymousUniqueId(), "AnonymousUniqueId" ); // now check the base product BOOST_CHECK_EQUAL( z->target()->targetDistribution(), "sle-10-i586"); diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libzypp-16.4.2/zypp/Digest.cc new/libzypp-16.4.3/zypp/Digest.cc --- old/libzypp-16.4.2/zypp/Digest.cc 2016-11-29 11:31:52.000000000 +0100 +++ new/libzypp-16.4.3/zypp/Digest.cc 2017-02-21 14:26:06.000000000 +0100 @@ -67,7 +67,7 @@ P(); ~P(); - EVP_MD_CTX mdctx; + EVP_MD_CTX *mdctx; const EVP_MD *md; unsigned char md_value[EVP_MAX_MD_SIZE]; @@ -117,9 +117,13 @@ if(!md) return false; - EVP_MD_CTX_init(&mdctx); - - if(!EVP_DigestInit_ex(&mdctx, md, NULL)) +#if OPENSSL_VERSION_NUMBER < 0x10100000L + mdctx = (EVP_MD_CTX*) malloc(sizeof(EVP_MD_CTX)); + EVP_MD_CTX_init(mdctx); +#else + mdctx = EVP_MD_CTX_new(); +#endif + if(!EVP_DigestInit_ex(mdctx, md, NULL)) return false; md_len = 0; @@ -133,7 +137,11 @@ { if(initialized) { - EVP_MD_CTX_cleanup(&mdctx); +#if OPENSSL_VERSION_NUMBER < 0x10100000L + EVP_MD_CTX_cleanup(mdctx); +#else + EVP_MD_CTX_free(mdctx); +#endif initialized = false; finalized = false; } @@ -171,10 +179,10 @@ return false; if(!_dp->finalized) { - (void)EVP_DigestFinal_ex(&_dp->mdctx, _dp->md_value, &_dp->md_len); + (void)EVP_DigestFinal_ex(_dp->mdctx, _dp->md_value, &_dp->md_len); _dp->finalized = true; } - if(!EVP_DigestInit_ex(&_dp->mdctx, _dp->md, NULL)) + if(!EVP_DigestInit_ex(_dp->mdctx, _dp->md, NULL)) return false; _dp->finalized = false; return true; @@ -187,7 +195,7 @@ if(!_dp->finalized) { - if(!EVP_DigestFinal_ex(&_dp->mdctx, _dp->md_value, &_dp->md_len)) + if(!EVP_DigestFinal_ex(_dp->mdctx, _dp->md_value, &_dp->md_len)) return std::string(); _dp->finalized = true; @@ -212,7 +220,7 @@ if(!_dp->finalized) { - if(!EVP_DigestFinal_ex(&_dp->mdctx, _dp->md_value, &_dp->md_len)) + if(!EVP_DigestFinal_ex(_dp->mdctx, _dp->md_value, &_dp->md_len)) return r; _dp->finalized = true; } @@ -239,7 +247,7 @@ return false; } - if(!EVP_DigestUpdate(&_dp->mdctx, reinterpret_cast<const unsigned char*>(bytes), len)) + if(!EVP_DigestUpdate(_dp->mdctx, reinterpret_cast<const unsigned char*>(bytes), len)) return false; return true; diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libzypp-16.4.2/zypp/PublicKey.cc new/libzypp-16.4.3/zypp/PublicKey.cc --- old/libzypp-16.4.2/zypp/PublicKey.cc 2016-11-29 11:31:52.000000000 +0100 +++ new/libzypp-16.4.3/zypp/PublicKey.cc 2017-02-20 10:16:09.000000000 +0100 @@ -24,9 +24,6 @@ #include "zypp/base/Exception.h" #include "zypp/base/LogTools.h" #include "zypp/Date.h" -#include "zypp/TmpPath.h" - -#include <ctime> /** \todo Fix duplicate define in PublicKey/KeyRing */ #define GPG_BINARY "/usr/bin/gpg2" @@ -344,13 +341,15 @@ { return _hiddenKeys; } protected: + std::string _initHomeDir() ///< readFromFile helper to prepare the 'gpg --homedir' + { Pathname ret( zypp::myTmpDir() / "PublicKey" ); filesystem::assert_dir( ret ); return ret.asString(); } + void readFromFile() { PathInfo info( _dataFile.path() ); MIL << "Reading pubkey from " << info.path() << " of size " << info.size() << " and sha1 " << filesystem::checksum(info.path(), "sha1") << endl; - static filesystem::TmpDir dir; - std::string tmppath( dir.path().asString() ); + static std::string tmppath( _initHomeDir() ); std::string datapath( _dataFile.path().asString() ); const char* argv[] = diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libzypp-16.4.2/zypp/TmpPath.h new/libzypp-16.4.3/zypp/TmpPath.h --- old/libzypp-16.4.2/zypp/TmpPath.h 2016-11-29 11:31:52.000000000 +0100 +++ new/libzypp-16.4.3/zypp/TmpPath.h 2017-02-20 10:16:09.000000000 +0100 @@ -196,6 +196,10 @@ /////////////////////////////////////////////////////////////////// } // namespace filesystem + + /** Global access to the zypp.TMPDIR (created on demand, deleted when libzypp is unloaded) */ + Pathname myTmpDir(); // implemented in ZYppImpl.cc + } // namespace zypp #endif // ZYPP_TMPPATH_H diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libzypp-16.4.2/zypp/media/TransferSettings.cc new/libzypp-16.4.3/zypp/media/TransferSettings.cc --- old/libzypp-16.4.2/zypp/media/TransferSettings.cc 2016-11-29 11:31:52.000000000 +0100 +++ new/libzypp-16.4.3/zypp/media/TransferSettings.cc 2017-02-16 14:21:10.000000000 +0100 @@ -95,6 +95,7 @@ void TransferSettings::addHeader( const std::string &header ) { + if ( ! header.empty() ) _impl->_headers.push_back(header); } diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libzypp-16.4.2/zypp/sat/Solvable.cc new/libzypp-16.4.3/zypp/sat/Solvable.cc --- old/libzypp-16.4.2/zypp/sat/Solvable.cc 2017-01-26 13:07:00.000000000 +0100 +++ new/libzypp-16.4.3/zypp/sat/Solvable.cc 2017-02-16 14:21:10.000000000 +0100 @@ -525,7 +525,7 @@ /////////////////////////////////////////////////////////////////// namespace { - /** Expand \ref Capability and call \c fnc_r for each namescpace:language + /** Expand \ref Capability and call \c fnc_r for each namespace:language * dependency. Return #invocations of fnc_r, negative if fnc_r returned * false to indicate abort. */ @@ -566,7 +566,7 @@ return 0; } - /** Expand \ref Capability and call \c fnc_r for each namescpace:language + /** Expand \ref Capability and call \c fnc_r for each namespace:language * dependency. Return #invocations of fnc_r, negative if fnc_r returned * false to indicate abort. */ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libzypp-16.4.2/zypp/target/TargetImpl.cc new/libzypp-16.4.3/zypp/target/TargetImpl.cc --- old/libzypp-16.4.2/zypp/target/TargetImpl.cc 2017-01-26 13:07:00.000000000 +0100 +++ new/libzypp-16.4.3/zypp/target/TargetImpl.cc 2017-02-16 14:21:10.000000000 +0100 @@ -751,9 +751,11 @@ void TargetImpl::createAnonymousId() const { + // bsc#1024741: Omit creating a new uid for chrooted systems (if it already has one, fine) + if ( root() != "/" ) + return; - // create the anonymous unique id - // this value is used for statistics + // Create the anonymous unique id, used for download statistics Pathname idpath( home() / "AnonymousUniqueId"); try @@ -1709,7 +1711,7 @@ } return std::string(); } - } // namescpace + } // namespace /////////////////////////////////////////////////////////////////// Product::constPtr TargetImpl::baseProduct() const @@ -1830,15 +1832,29 @@ } /////////////////////////////////////////////////////////////////// + namespace + { + std::string guessAnonymousUniqueId( const Pathname & root_r ) + { + // bsc#1024741: Omit creating a new uid for chrooted systems (if it already has one, fine) + std::string ret( firstNonEmptyLineIn( root_r / "/var/lib/zypp/AnonymousUniqueId" ) ); + if ( ret.empty() && root_r != "/" ) + { + // if it has nonoe, use the outer systems one + ret = firstNonEmptyLineIn( "/var/lib/zypp/AnonymousUniqueId" ); + } + return ret; + } + } std::string TargetImpl::anonymousUniqueId() const { - return firstNonEmptyLineIn( home() / "AnonymousUniqueId" ); + return guessAnonymousUniqueId( root() ); } // static version: std::string TargetImpl::anonymousUniqueId( const Pathname & root_r ) { - return firstNonEmptyLineIn( staticGuessRoot(root_r) / "/var/lib/zypp/AnonymousUniqueId" ); + return guessAnonymousUniqueId( staticGuessRoot(root_r) ); } /////////////////////////////////////////////////////////////////// diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libzypp-16.4.2/zypp/zypp_detail/ZYppImpl.cc new/libzypp-16.4.3/zypp/zypp_detail/ZYppImpl.cc --- old/libzypp-16.4.2/zypp/zypp_detail/ZYppImpl.cc 2016-11-29 11:31:52.000000000 +0100 +++ new/libzypp-16.4.3/zypp/zypp_detail/ZYppImpl.cc 2017-02-20 10:16:09.000000000 +0100 @@ -204,10 +204,7 @@ { _home_path = path; } Pathname ZYppImpl::tmpPath() const - { - static TmpDir zypp_tmp_dir( TmpPath::defaultLocation(), "zypp." ); - return zypp_tmp_dir.path(); - } + { return zypp::myTmpDir(); } /****************************************************************** ** @@ -222,6 +219,13 @@ ///////////////////////////////////////////////////////////////// } // namespace zypp_detail /////////////////////////////////////////////////////////////////// + + Pathname myTmpDir() // from TmpPath.h + { + static filesystem::TmpDir _tmpdir( TmpPath::defaultLocation(), "zypp." ); + return _tmpdir.path(); + } + ///////////////////////////////////////////////////////////////// } // namespace zypp ///////////////////////////////////////////////////////////////////

1 0