Hello community, here is the log from the commit of package powerpc-utils for openSUSE:Factory checked in at 2018-03-24 16:09:12 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/powerpc-utils (Old) and /work/SRC/openSUSE:Factory/.powerpc-utils.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "powerpc-utils" Sat Mar 24 16:09:12 2018 rev:88 rq:590078 version:1.3.4 Changes: -------- --- /work/SRC/openSUSE:Factory/powerpc-utils/powerpc-utils.changes 2017-12-23 12:17:02.698725783 +0100 +++ /work/SRC/openSUSE:Factory/.powerpc-utils.new/powerpc-utils.changes 2018-03-24 16:09:14.196785267 +0100 @@ -1,0 +2,10 @@ +Thu Mar 22 11:11:15 UTC 2018 - [email protected] + +- Use spec-cleaner to get %license and SPDX-3.0 string + +------------------------------------------------------------------- +Wed Mar 21 16:31:46 UTC 2018 - [email protected] + +- Revert-lsslot-free-lmb_list-on-error.patch (bsc#1086268) + +------------------------------------------------------------------- New: ---- Revert-lsslot-free-lmb_list-on-error.patch ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ powerpc-utils.spec ++++++ --- /var/tmp/diff_new_pack.YwVIII/_old 2018-03-24 16:09:16.076717498 +0100 +++ /var/tmp/diff_new_pack.YwVIII/_new 2018-03-24 16:09:16.084717210 +0100 @@ -1,7 +1,7 @@ # # spec file for package powerpc-utils # -# Copyright (c) 2017 SUSE LINUX GmbH, Nuernberg, Germany. +# Copyright (c) 2018 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 @@ -21,7 +21,7 @@ Version: 1.3.4 Release: 0 Summary: Utilities for PowerPC Hardware -License: GPL-2.0+ +License: GPL-2.0-or-later Group: System/Management Url: https://github.com/ibm-power-utilities/powerpc-utils Source0: https://github.com/ibm-power-utilities/powerpc-utils/archive/v%{version}.tar.gz#/%{name}-%{version}.tar.gz @@ -31,11 +31,13 @@ Patch3: systemd-dir.patch Patch4: libvirt-service-dep.patch Patch5: drmgr-load-rpadlpar_io-on-C-as-well.patch +Patch6: Revert-lsslot-free-lmb_list-on-error.patch BuildRequires: autoconf BuildRequires: automake BuildRequires: librtas-devel +BuildRequires: pkgconfig BuildRequires: systemd-rpm-macros -BuildRequires: zlib-devel +BuildRequires: pkgconfig(zlib) Requires: bc Requires: coreutils Requires: findutils @@ -46,7 +48,6 @@ Requires: udev Requires: util-linux Recommends: powerpc-utils-python -BuildRoot: %{_tmppath}/%{name}-%{version}-build ExclusiveArch: ppc ppc64 ppc64le %{?systemd_requires} @@ -61,6 +62,7 @@ %patch3 -p1 %patch4 -p1 %patch5 -p1 +%patch6 -p1 %build autoreconf -fvi @@ -70,8 +72,7 @@ make CFLAGS="%{optflags}" %{?_smp_mflags} %install -make install \ - DESTDIR=%{buildroot} \ +%make_install \ rasdir=%{_sbindir} \ mandir=%{_mandir} mkdir %{buildroot}/sbin @@ -102,8 +103,8 @@ %service_del_postun smt_off.service %files -%defattr(-,root,root) -%doc README COPYING Changelog +%license COPYING +%doc README Changelog %{_mandir}/man*/* %{_sbindir}/* %{_bindir}/* ++++++ Revert-lsslot-free-lmb_list-on-error.patch ++++++ >From 422613e3fe9b32c05f0c0721b9c787eb4e7b64f0 Mon Sep 17 00:00:00 2001 From: Michal Suchanek <[email protected]> Date: Wed, 21 Mar 2018 17:27:39 +0100 Subject: [PATCH] Revert "lsslot: free lmb_list on error" References: bsc#1086268 Patch-mainline: submitted https://groups.google.com/forum/#!topic/powerpc-utils-devel/ohYJgO5fToU This reverts commit e6f476d32c33f5b8e364f930c467785495eeb0ce. --- src/drmgr/lsslot.c | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/src/drmgr/lsslot.c b/src/drmgr/lsslot.c index 878ca6973889..d297af9af251 100644 --- a/src/drmgr/lsslot.c +++ b/src/drmgr/lsslot.c @@ -798,10 +798,9 @@ int lsslot_chrp_mem(void) int lmb_offset = strlen(OFDT_BASE); lmb_list = get_lmbs(LMB_NORMAL_SORT); - if (lmb_list == NULL || lmb_list->lmbs == NULL) { - free_lmbs(lmb_list); + if (lmb_list == NULL || lmb_list->lmbs == NULL) return -1; - } + if (lmb_list->drconf_buf) { print_drconf_mem(lmb_list); -- 2.13.6
