From a25bcb2c5df227d495bbea153d90d9516fc94f8c Mon Sep 17 00:00:00 2001 From: Vasant Hegde Date: Mar 05 2014 16:26:52 +0000 Subject: Update to latest upstream 1.2.19 Signed-off-by: Vasant Hegde --- diff --git a/.gitignore b/.gitignore index fe6412c..8361597 100644 --- a/.gitignore +++ b/.gitignore @@ -8,3 +8,4 @@ powerpc-utils-1.2.2.tar.gz /powerpc-utils-1.2.16.tar.gz /powerpc-utils-1.2.17.tar.gz /powerpc-utils-1.2.18.tar.gz +/powerpc-utils-1.2.19.tar.gz diff --git a/powerpc-utils-1.2.12-ofpathname-884826.patch b/powerpc-utils-1.2.12-ofpathname-884826.patch deleted file mode 100644 index b3d7acf..0000000 --- a/powerpc-utils-1.2.12-ofpathname-884826.patch +++ /dev/null @@ -1,29 +0,0 @@ -diff -up powerpc-utils-1.2.12/scripts/ofpathname.884826 powerpc-utils-1.2.12/scripts/ofpathname ---- powerpc-utils-1.2.12/scripts/ofpathname.884826 2012-12-13 16:31:42.890057349 +0100 -+++ powerpc-utils-1.2.12/scripts/ofpathname 2012-12-13 16:33:23.929498245 +0100 -@@ -291,6 +291,13 @@ print_aliases() - fi - } - -+get_slave() -+{ -+ cd /sys/class/*/$1 -+ while [[ -n "`ls slaves 2> /dev/null`" ]]; do cd slaves/*; done -+ $FIND /dev -name "`basename $PWD`" -+} -+ - # - # logical_to_ofpathname - # Conversion for logical device name to an Open Firmware device path -@@ -333,6 +340,11 @@ logical_to_ofpathname() - fi ;; - hd*) l2of_ide ;; - fd*) echo "no fd support yet" ;; -+ dm-*) -+ DEVNAME=`get_slave $DEVICE` -+ logical_to_ofpathname -+ exit -+ ;; - esac - - if [[ -z $OF_PATH ]]; then diff --git a/powerpc-utils.spec b/powerpc-utils.spec index f77b411..ab017fb 100644 --- a/powerpc-utils.spec +++ b/powerpc-utils.spec @@ -1,6 +1,6 @@ Name: powerpc-utils -Version: 1.2.18 -Release: 2%{?dist} +Version: 1.2.19 +Release: 1%{?dist} Summary: Utilities for PowerPC platforms Group: System Environment/Base @@ -10,6 +10,7 @@ Source0: http://prdownloads.sourceforge.net/%{name}/%{name}-%{version}.ta Source1: nvsetenv BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRequires: zlib-devel doxygen automake librtas-devel libservicelog-devel >= 1.0.1-2 +BuildRequires: librtas-devel >= 1.3.9 # should be fixed - libservicelog is not right name Requires: libservicelog bc which @@ -82,6 +83,7 @@ rm -rf $RPM_BUILD_ROOT %{_mandir}/man8/ofpathname.8* %{_sbindir}/update_flash +%{_sbindir}/update_flash_nv %{_sbindir}/activate_firmware %{_sbindir}/set_poweron_time %{_sbindir}/rtas_ibm_get_vpd @@ -97,6 +99,7 @@ rm -rf $RPM_BUILD_ROOT %{_sbindir}/ls-veth %{_sbindir}/ls-vscsi %{_sbindir}/lparstat +%{_sbindir}/pseries_platform %{_bindir}/amsstat %{_mandir}/man8/update_flash.8* @@ -127,6 +130,9 @@ rm -rf $RPM_BUILD_ROOT %preun %changelog +* Wed Mar 05 2014 Vasant Hegde - 1.2.19 +- Update to latest upstream 1.2.19 + * Thu Oct 10 2013 Vasant Hegde - 1.2.18-2 - Add ppc64le architecture diff --git a/sources b/sources index 3a3fae0..0be444a 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -7a6ae1f1c9b7284d6fe4a07b842bcdd9 powerpc-utils-1.2.18.tar.gz +41d35315a9342a186d380f2eb5820da6 powerpc-utils-1.2.19.tar.gz