diff -Nru powerpc-ibm-utils-1.2.20/aclocal.m4 powerpc-ibm-utils-1.2.22/aclocal.m4 --- powerpc-ibm-utils-1.2.20/aclocal.m4 2014-03-21 20:24:01.000000000 +0000 +++ powerpc-ibm-utils-1.2.22/aclocal.m4 2014-08-13 14:44:26.000000000 +0000 @@ -583,6 +583,40 @@ rm -f confinc confmf ]) +# Copyright (C) 1999, 2000, 2001, 2003, 2004, 2005 +# Free Software Foundation, Inc. +# +# This file is free software; the Free Software Foundation +# gives unlimited permission to copy and/or distribute it, +# with or without modifications, as long as this notice is preserved. + +# serial 5 + +# AM_PROG_CC_C_O +# -------------- +# Like AC_PROG_CC_C_O, but changed for automake. +AC_DEFUN([AM_PROG_CC_C_O], +[AC_REQUIRE([AC_PROG_CC_C_O])dnl +AC_REQUIRE([AM_AUX_DIR_EXPAND])dnl +AC_REQUIRE_AUX_FILE([compile])dnl +# FIXME: we rely on the cache variable name because +# there is no other way. +set dummy $CC +ac_cc=`echo $[2] | sed ['s/[^a-zA-Z0-9_]/_/g;s/^[0-9]/_/']` +if eval "test \"`echo '$ac_cv_prog_cc_'${ac_cc}_c_o`\" != yes"; then + # Losing compiler, so override with the script. + # FIXME: It is wrong to rewrite CC. + # But if we don't then we get into trouble of one sort or another. + # A longer-term fix would be to have automake use am__CC in this case, + # and then we could set am__CC="\$(top_srcdir)/compile \$(CC)" + CC="$am_aux_dir/compile $CC" +fi +dnl Make sure AC_PROG_CC is never called again, or it will override our +dnl setting of CC. +m4_define([AC_PROG_CC], + [m4_fatal([AC_PROG_CC cannot be called after AM_PROG_CC_C_O])]) +]) + # Fake the existence of programs that GNU maintainers use. -*- Autoconf -*- # Copyright (C) 1997, 1999, 2000, 2001, 2003, 2004, 2005 @@ -866,3 +900,8 @@ AC_SUBST([am__untar]) ]) # _AM_PROG_TAR +m4_include([m4/ax_append_compile_flags.m4]) +m4_include([m4/ax_append_flag.m4]) +m4_include([m4/ax_check_compile_flag.m4]) +m4_include([m4/ax_check_link_flag.m4]) +m4_include([m4/ax_require_defined.m4]) diff -Nru powerpc-ibm-utils-1.2.20/build-aux/depcomp powerpc-ibm-utils-1.2.22/build-aux/depcomp --- powerpc-ibm-utils-1.2.20/build-aux/depcomp 2014-03-12 13:05:04.000000000 +0000 +++ powerpc-ibm-utils-1.2.22/build-aux/depcomp 1970-01-01 00:00:00.000000000 +0000 @@ -1,589 +0,0 @@ -#! /bin/sh -# depcomp - compile a program generating dependencies as side-effects - -scriptversion=2007-03-29.01 - -# Copyright (C) 1999, 2000, 2003, 2004, 2005, 2006, 2007 Free Software -# Foundation, Inc. - -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU General Public License as published by -# the Free Software Foundation; either version 2, or (at your option) -# any later version. - -# This program is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU General Public License for more details. - -# You should have received a copy of the GNU General Public License -# along with this program; if not, write to the Free Software -# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA -# 02110-1301, USA. - -# As a special exception to the GNU General Public License, if you -# distribute this file as part of a program that contains a -# configuration script generated by Autoconf, you may include it under -# the same distribution terms that you use for the rest of that program. - -# Originally written by Alexandre Oliva . - -case $1 in - '') - echo "$0: No command. Try \`$0 --help' for more information." 1>&2 - exit 1; - ;; - -h | --h*) - cat <<\EOF -Usage: depcomp [--help] [--version] PROGRAM [ARGS] - -Run PROGRAMS ARGS to compile a file, generating dependencies -as side-effects. - -Environment variables: - depmode Dependency tracking mode. - source Source file read by `PROGRAMS ARGS'. - object Object file output by `PROGRAMS ARGS'. - DEPDIR directory where to store dependencies. - depfile Dependency file to output. - tmpdepfile Temporary file to use when outputing dependencies. - libtool Whether libtool is used (yes/no). - -Report bugs to . -EOF - exit $? - ;; - -v | --v*) - echo "depcomp $scriptversion" - exit $? - ;; -esac - -if test -z "$depmode" || test -z "$source" || test -z "$object"; then - echo "depcomp: Variables source, object and depmode must be set" 1>&2 - exit 1 -fi - -# Dependencies for sub/bar.o or sub/bar.obj go into sub/.deps/bar.Po. -depfile=${depfile-`echo "$object" | - sed 's|[^\\/]*$|'${DEPDIR-.deps}'/&|;s|\.\([^.]*\)$|.P\1|;s|Pobj$|Po|'`} -tmpdepfile=${tmpdepfile-`echo "$depfile" | sed 's/\.\([^.]*\)$/.T\1/'`} - -rm -f "$tmpdepfile" - -# Some modes work just like other modes, but use different flags. We -# parameterize here, but still list the modes in the big case below, -# to make depend.m4 easier to write. Note that we *cannot* use a case -# here, because this file can only contain one case statement. -if test "$depmode" = hp; then - # HP compiler uses -M and no extra arg. - gccflag=-M - depmode=gcc -fi - -if test "$depmode" = dashXmstdout; then - # This is just like dashmstdout with a different argument. - dashmflag=-xM - depmode=dashmstdout -fi - -case "$depmode" in -gcc3) -## gcc 3 implements dependency tracking that does exactly what -## we want. Yay! Note: for some reason libtool 1.4 doesn't like -## it if -MD -MP comes after the -MF stuff. Hmm. -## Unfortunately, FreeBSD c89 acceptance of flags depends upon -## the command line argument order; so add the flags where they -## appear in depend2.am. Note that the slowdown incurred here -## affects only configure: in makefiles, %FASTDEP% shortcuts this. - for arg - do - case $arg in - -c) set fnord "$@" -MT "$object" -MD -MP -MF "$tmpdepfile" "$arg" ;; - *) set fnord "$@" "$arg" ;; - esac - shift # fnord - shift # $arg - done - "$@" - stat=$? - if test $stat -eq 0; then : - else - rm -f "$tmpdepfile" - exit $stat - fi - mv "$tmpdepfile" "$depfile" - ;; - -gcc) -## There are various ways to get dependency output from gcc. Here's -## why we pick this rather obscure method: -## - Don't want to use -MD because we'd like the dependencies to end -## up in a subdir. Having to rename by hand is ugly. -## (We might end up doing this anyway to support other compilers.) -## - The DEPENDENCIES_OUTPUT environment variable makes gcc act like -## -MM, not -M (despite what the docs say). -## - Using -M directly means running the compiler twice (even worse -## than renaming). - if test -z "$gccflag"; then - gccflag=-MD, - fi - "$@" -Wp,"$gccflag$tmpdepfile" - stat=$? - if test $stat -eq 0; then : - else - rm -f "$tmpdepfile" - exit $stat - fi - rm -f "$depfile" - echo "$object : \\" > "$depfile" - alpha=ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz -## The second -e expression handles DOS-style file names with drive letters. - sed -e 's/^[^:]*: / /' \ - -e 's/^['$alpha']:\/[^:]*: / /' < "$tmpdepfile" >> "$depfile" -## This next piece of magic avoids the `deleted header file' problem. -## The problem is that when a header file which appears in a .P file -## is deleted, the dependency causes make to die (because there is -## typically no way to rebuild the header). We avoid this by adding -## dummy dependencies for each header file. Too bad gcc doesn't do -## this for us directly. - tr ' ' ' -' < "$tmpdepfile" | -## Some versions of gcc put a space before the `:'. On the theory -## that the space means something, we add a space to the output as -## well. -## Some versions of the HPUX 10.20 sed can't process this invocation -## correctly. Breaking it into two sed invocations is a workaround. - sed -e 's/^\\$//' -e '/^$/d' -e '/:$/d' | sed -e 's/$/ :/' >> "$depfile" - rm -f "$tmpdepfile" - ;; - -hp) - # This case exists only to let depend.m4 do its work. It works by - # looking at the text of this script. This case will never be run, - # since it is checked for above. - exit 1 - ;; - -sgi) - if test "$libtool" = yes; then - "$@" "-Wp,-MDupdate,$tmpdepfile" - else - "$@" -MDupdate "$tmpdepfile" - fi - stat=$? - if test $stat -eq 0; then : - else - rm -f "$tmpdepfile" - exit $stat - fi - rm -f "$depfile" - - if test -f "$tmpdepfile"; then # yes, the sourcefile depend on other files - echo "$object : \\" > "$depfile" - - # Clip off the initial element (the dependent). Don't try to be - # clever and replace this with sed code, as IRIX sed won't handle - # lines with more than a fixed number of characters (4096 in - # IRIX 6.2 sed, 8192 in IRIX 6.5). We also remove comment lines; - # the IRIX cc adds comments like `#:fec' to the end of the - # dependency line. - tr ' ' ' -' < "$tmpdepfile" \ - | sed -e 's/^.*\.o://' -e 's/#.*$//' -e '/^$/ d' | \ - tr ' -' ' ' >> $depfile - echo >> $depfile - - # The second pass generates a dummy entry for each header file. - tr ' ' ' -' < "$tmpdepfile" \ - | sed -e 's/^.*\.o://' -e 's/#.*$//' -e '/^$/ d' -e 's/$/:/' \ - >> $depfile - else - # The sourcefile does not contain any dependencies, so just - # store a dummy comment line, to avoid errors with the Makefile - # "include basename.Plo" scheme. - echo "#dummy" > "$depfile" - fi - rm -f "$tmpdepfile" - ;; - -aix) - # The C for AIX Compiler uses -M and outputs the dependencies - # in a .u file. In older versions, this file always lives in the - # current directory. Also, the AIX compiler puts `$object:' at the - # start of each line; $object doesn't have directory information. - # Version 6 uses the directory in both cases. - dir=`echo "$object" | sed -e 's|/[^/]*$|/|'` - test "x$dir" = "x$object" && dir= - base=`echo "$object" | sed -e 's|^.*/||' -e 's/\.o$//' -e 's/\.lo$//'` - if test "$libtool" = yes; then - tmpdepfile1=$dir$base.u - tmpdepfile2=$base.u - tmpdepfile3=$dir.libs/$base.u - "$@" -Wc,-M - else - tmpdepfile1=$dir$base.u - tmpdepfile2=$dir$base.u - tmpdepfile3=$dir$base.u - "$@" -M - fi - stat=$? - - if test $stat -eq 0; then : - else - rm -f "$tmpdepfile1" "$tmpdepfile2" "$tmpdepfile3" - exit $stat - fi - - for tmpdepfile in "$tmpdepfile1" "$tmpdepfile2" "$tmpdepfile3" - do - test -f "$tmpdepfile" && break - done - if test -f "$tmpdepfile"; then - # Each line is of the form `foo.o: dependent.h'. - # Do two passes, one to just change these to - # `$object: dependent.h' and one to simply `dependent.h:'. - sed -e "s,^.*\.[a-z]*:,$object:," < "$tmpdepfile" > "$depfile" - # That's a tab and a space in the []. - sed -e 's,^.*\.[a-z]*:[ ]*,,' -e 's,$,:,' < "$tmpdepfile" >> "$depfile" - else - # The sourcefile does not contain any dependencies, so just - # store a dummy comment line, to avoid errors with the Makefile - # "include basename.Plo" scheme. - echo "#dummy" > "$depfile" - fi - rm -f "$tmpdepfile" - ;; - -icc) - # Intel's C compiler understands `-MD -MF file'. However on - # icc -MD -MF foo.d -c -o sub/foo.o sub/foo.c - # ICC 7.0 will fill foo.d with something like - # foo.o: sub/foo.c - # foo.o: sub/foo.h - # which is wrong. We want: - # sub/foo.o: sub/foo.c - # sub/foo.o: sub/foo.h - # sub/foo.c: - # sub/foo.h: - # ICC 7.1 will output - # foo.o: sub/foo.c sub/foo.h - # and will wrap long lines using \ : - # foo.o: sub/foo.c ... \ - # sub/foo.h ... \ - # ... - - "$@" -MD -MF "$tmpdepfile" - stat=$? - if test $stat -eq 0; then : - else - rm -f "$tmpdepfile" - exit $stat - fi - rm -f "$depfile" - # Each line is of the form `foo.o: dependent.h', - # or `foo.o: dep1.h dep2.h \', or ` dep3.h dep4.h \'. - # Do two passes, one to just change these to - # `$object: dependent.h' and one to simply `dependent.h:'. - sed "s,^[^:]*:,$object :," < "$tmpdepfile" > "$depfile" - # Some versions of the HPUX 10.20 sed can't process this invocation - # correctly. Breaking it into two sed invocations is a workaround. - sed 's,^[^:]*: \(.*\)$,\1,;s/^\\$//;/^$/d;/:$/d' < "$tmpdepfile" | - sed -e 's/$/ :/' >> "$depfile" - rm -f "$tmpdepfile" - ;; - -hp2) - # The "hp" stanza above does not work with aCC (C++) and HP's ia64 - # compilers, which have integrated preprocessors. The correct option - # to use with these is +Maked; it writes dependencies to a file named - # 'foo.d', which lands next to the object file, wherever that - # happens to be. - # Much of this is similar to the tru64 case; see comments there. - dir=`echo "$object" | sed -e 's|/[^/]*$|/|'` - test "x$dir" = "x$object" && dir= - base=`echo "$object" | sed -e 's|^.*/||' -e 's/\.o$//' -e 's/\.lo$//'` - if test "$libtool" = yes; then - tmpdepfile1=$dir$base.d - tmpdepfile2=$dir.libs/$base.d - "$@" -Wc,+Maked - else - tmpdepfile1=$dir$base.d - tmpdepfile2=$dir$base.d - "$@" +Maked - fi - stat=$? - if test $stat -eq 0; then : - else - rm -f "$tmpdepfile1" "$tmpdepfile2" - exit $stat - fi - - for tmpdepfile in "$tmpdepfile1" "$tmpdepfile2" - do - test -f "$tmpdepfile" && break - done - if test -f "$tmpdepfile"; then - sed -e "s,^.*\.[a-z]*:,$object:," "$tmpdepfile" > "$depfile" - # Add `dependent.h:' lines. - sed -ne '2,${; s/^ *//; s/ \\*$//; s/$/:/; p;}' "$tmpdepfile" >> "$depfile" - else - echo "#dummy" > "$depfile" - fi - rm -f "$tmpdepfile" "$tmpdepfile2" - ;; - -tru64) - # The Tru64 compiler uses -MD to generate dependencies as a side - # effect. `cc -MD -o foo.o ...' puts the dependencies into `foo.o.d'. - # At least on Alpha/Redhat 6.1, Compaq CCC V6.2-504 seems to put - # dependencies in `foo.d' instead, so we check for that too. - # Subdirectories are respected. - dir=`echo "$object" | sed -e 's|/[^/]*$|/|'` - test "x$dir" = "x$object" && dir= - base=`echo "$object" | sed -e 's|^.*/||' -e 's/\.o$//' -e 's/\.lo$//'` - - if test "$libtool" = yes; then - # With Tru64 cc, shared objects can also be used to make a - # static library. This mechanism is used in libtool 1.4 series to - # handle both shared and static libraries in a single compilation. - # With libtool 1.4, dependencies were output in $dir.libs/$base.lo.d. - # - # With libtool 1.5 this exception was removed, and libtool now - # generates 2 separate objects for the 2 libraries. These two - # compilations output dependencies in $dir.libs/$base.o.d and - # in $dir$base.o.d. We have to check for both files, because - # one of the two compilations can be disabled. We should prefer - # $dir$base.o.d over $dir.libs/$base.o.d because the latter is - # automatically cleaned when .libs/ is deleted, while ignoring - # the former would cause a distcleancheck panic. - tmpdepfile1=$dir.libs/$base.lo.d # libtool 1.4 - tmpdepfile2=$dir$base.o.d # libtool 1.5 - tmpdepfile3=$dir.libs/$base.o.d # libtool 1.5 - tmpdepfile4=$dir.libs/$base.d # Compaq CCC V6.2-504 - "$@" -Wc,-MD - else - tmpdepfile1=$dir$base.o.d - tmpdepfile2=$dir$base.d - tmpdepfile3=$dir$base.d - tmpdepfile4=$dir$base.d - "$@" -MD - fi - - stat=$? - if test $stat -eq 0; then : - else - rm -f "$tmpdepfile1" "$tmpdepfile2" "$tmpdepfile3" "$tmpdepfile4" - exit $stat - fi - - for tmpdepfile in "$tmpdepfile1" "$tmpdepfile2" "$tmpdepfile3" "$tmpdepfile4" - do - test -f "$tmpdepfile" && break - done - if test -f "$tmpdepfile"; then - sed -e "s,^.*\.[a-z]*:,$object:," < "$tmpdepfile" > "$depfile" - # That's a tab and a space in the []. - sed -e 's,^.*\.[a-z]*:[ ]*,,' -e 's,$,:,' < "$tmpdepfile" >> "$depfile" - else - echo "#dummy" > "$depfile" - fi - rm -f "$tmpdepfile" - ;; - -#nosideeffect) - # This comment above is used by automake to tell side-effect - # dependency tracking mechanisms from slower ones. - -dashmstdout) - # Important note: in order to support this mode, a compiler *must* - # always write the preprocessed file to stdout, regardless of -o. - "$@" || exit $? - - # Remove the call to Libtool. - if test "$libtool" = yes; then - while test $1 != '--mode=compile'; do - shift - done - shift - fi - - # Remove `-o $object'. - IFS=" " - for arg - do - case $arg in - -o) - shift - ;; - $object) - shift - ;; - *) - set fnord "$@" "$arg" - shift # fnord - shift # $arg - ;; - esac - done - - test -z "$dashmflag" && dashmflag=-M - # Require at least two characters before searching for `:' - # in the target name. This is to cope with DOS-style filenames: - # a dependency such as `c:/foo/bar' could be seen as target `c' otherwise. - "$@" $dashmflag | - sed 's:^[ ]*[^: ][^:][^:]*\:[ ]*:'"$object"'\: :' > "$tmpdepfile" - rm -f "$depfile" - cat < "$tmpdepfile" > "$depfile" - tr ' ' ' -' < "$tmpdepfile" | \ -## Some versions of the HPUX 10.20 sed can't process this invocation -## correctly. Breaking it into two sed invocations is a workaround. - sed -e 's/^\\$//' -e '/^$/d' -e '/:$/d' | sed -e 's/$/ :/' >> "$depfile" - rm -f "$tmpdepfile" - ;; - -dashXmstdout) - # This case only exists to satisfy depend.m4. It is never actually - # run, as this mode is specially recognized in the preamble. - exit 1 - ;; - -makedepend) - "$@" || exit $? - # Remove any Libtool call - if test "$libtool" = yes; then - while test $1 != '--mode=compile'; do - shift - done - shift - fi - # X makedepend - shift - cleared=no - for arg in "$@"; do - case $cleared in - no) - set ""; shift - cleared=yes ;; - esac - case "$arg" in - -D*|-I*) - set fnord "$@" "$arg"; shift ;; - # Strip any option that makedepend may not understand. Remove - # the object too, otherwise makedepend will parse it as a source file. - -*|$object) - ;; - *) - set fnord "$@" "$arg"; shift ;; - esac - done - obj_suffix="`echo $object | sed 's/^.*\././'`" - touch "$tmpdepfile" - ${MAKEDEPEND-makedepend} -o"$obj_suffix" -f"$tmpdepfile" "$@" - rm -f "$depfile" - cat < "$tmpdepfile" > "$depfile" - sed '1,2d' "$tmpdepfile" | tr ' ' ' -' | \ -## Some versions of the HPUX 10.20 sed can't process this invocation -## correctly. Breaking it into two sed invocations is a workaround. - sed -e 's/^\\$//' -e '/^$/d' -e '/:$/d' | sed -e 's/$/ :/' >> "$depfile" - rm -f "$tmpdepfile" "$tmpdepfile".bak - ;; - -cpp) - # Important note: in order to support this mode, a compiler *must* - # always write the preprocessed file to stdout. - "$@" || exit $? - - # Remove the call to Libtool. - if test "$libtool" = yes; then - while test $1 != '--mode=compile'; do - shift - done - shift - fi - - # Remove `-o $object'. - IFS=" " - for arg - do - case $arg in - -o) - shift - ;; - $object) - shift - ;; - *) - set fnord "$@" "$arg" - shift # fnord - shift # $arg - ;; - esac - done - - "$@" -E | - sed -n -e '/^# [0-9][0-9]* "\([^"]*\)".*/ s:: \1 \\:p' \ - -e '/^#line [0-9][0-9]* "\([^"]*\)".*/ s:: \1 \\:p' | - sed '$ s: \\$::' > "$tmpdepfile" - rm -f "$depfile" - echo "$object : \\" > "$depfile" - cat < "$tmpdepfile" >> "$depfile" - sed < "$tmpdepfile" '/^$/d;s/^ //;s/ \\$//;s/$/ :/' >> "$depfile" - rm -f "$tmpdepfile" - ;; - -msvisualcpp) - # Important note: in order to support this mode, a compiler *must* - # always write the preprocessed file to stdout, regardless of -o, - # because we must use -o when running libtool. - "$@" || exit $? - IFS=" " - for arg - do - case "$arg" in - "-Gm"|"/Gm"|"-Gi"|"/Gi"|"-ZI"|"/ZI") - set fnord "$@" - shift - shift - ;; - *) - set fnord "$@" "$arg" - shift - shift - ;; - esac - done - "$@" -E | - sed -n '/^#line [0-9][0-9]* "\([^"]*\)"/ s::echo "`cygpath -u \\"\1\\"`":p' | sort | uniq > "$tmpdepfile" - rm -f "$depfile" - echo "$object : \\" > "$depfile" - . "$tmpdepfile" | sed 's% %\\ %g' | sed -n '/^\(.*\)$/ s:: \1 \\:p' >> "$depfile" - echo " " >> "$depfile" - . "$tmpdepfile" | sed 's% %\\ %g' | sed -n '/^\(.*\)$/ s::\1\::p' >> "$depfile" - rm -f "$tmpdepfile" - ;; - -none) - exec "$@" - ;; - -*) - echo "Unknown depmode $depmode" 1>&2 - exit 1 - ;; -esac - -exit 0 - -# Local Variables: -# mode: shell-script -# sh-indentation: 2 -# eval: (add-hook 'write-file-hooks 'time-stamp) -# time-stamp-start: "scriptversion=" -# time-stamp-format: "%:y-%02m-%02d.%02H" -# time-stamp-end: "$" -# End: diff -Nru powerpc-ibm-utils-1.2.20/build-aux/install-sh powerpc-ibm-utils-1.2.22/build-aux/install-sh --- powerpc-ibm-utils-1.2.20/build-aux/install-sh 2014-03-12 13:05:04.000000000 +0000 +++ powerpc-ibm-utils-1.2.22/build-aux/install-sh 1970-01-01 00:00:00.000000000 +0000 @@ -1,519 +0,0 @@ -#!/bin/sh -# install - install a program, script, or datafile - -scriptversion=2006-12-25.00 - -# This originates from X11R5 (mit/util/scripts/install.sh), which was -# later released in X11R6 (xc/config/util/install.sh) with the -# following copyright and license. -# -# Copyright (C) 1994 X Consortium -# -# Permission is hereby granted, free of charge, to any person obtaining a copy -# of this software and associated documentation files (the "Software"), to -# deal in the Software without restriction, including without limitation the -# rights to use, copy, modify, merge, publish, distribute, sublicense, and/or -# sell copies of the Software, and to permit persons to whom the Software is -# furnished to do so, subject to the following conditions: -# -# The above copyright notice and this permission notice shall be included in -# all copies or substantial portions of the Software. -# -# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR -# IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, -# FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE -# X CONSORTIUM BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN -# AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNEC- -# TION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. -# -# Except as contained in this notice, the name of the X Consortium shall not -# be used in advertising or otherwise to promote the sale, use or other deal- -# ings in this Software without prior written authorization from the X Consor- -# tium. -# -# -# FSF changes to this file are in the public domain. -# -# Calling this script install-sh is preferred over install.sh, to prevent -# `make' implicit rules from creating a file called install from it -# when there is no Makefile. -# -# This script is compatible with the BSD install script, but was written -# from scratch. - -nl=' -' -IFS=" "" $nl" - -# set DOITPROG to echo to test this script - -# Don't use :- since 4.3BSD and earlier shells don't like it. -doit=${DOITPROG-} -if test -z "$doit"; then - doit_exec=exec -else - doit_exec=$doit -fi - -# Put in absolute file names if you don't have them in your path; -# or use environment vars. - -chgrpprog=${CHGRPPROG-chgrp} -chmodprog=${CHMODPROG-chmod} -chownprog=${CHOWNPROG-chown} -cmpprog=${CMPPROG-cmp} -cpprog=${CPPROG-cp} -mkdirprog=${MKDIRPROG-mkdir} -mvprog=${MVPROG-mv} -rmprog=${RMPROG-rm} -stripprog=${STRIPPROG-strip} - -posix_glob='?' -initialize_posix_glob=' - test "$posix_glob" != "?" || { - if (set -f) 2>/dev/null; then - posix_glob= - else - posix_glob=: - fi - } -' - -posix_mkdir= - -# Desired mode of installed file. -mode=0755 - -chgrpcmd= -chmodcmd=$chmodprog -chowncmd= -mvcmd=$mvprog -rmcmd="$rmprog -f" -stripcmd= - -src= -dst= -dir_arg= -dst_arg= - -copy_on_change=false -no_target_directory= - -usage="\ -Usage: $0 [OPTION]... [-T] SRCFILE DSTFILE - or: $0 [OPTION]... SRCFILES... DIRECTORY - or: $0 [OPTION]... -t DIRECTORY SRCFILES... - or: $0 [OPTION]... -d DIRECTORIES... - -In the 1st form, copy SRCFILE to DSTFILE. -In the 2nd and 3rd, copy all SRCFILES to DIRECTORY. -In the 4th, create DIRECTORIES. - -Options: - --help display this help and exit. - --version display version info and exit. - - -c (ignored) - -C install only if different (preserve the last data modification time) - -d create directories instead of installing files. - -g GROUP $chgrpprog installed files to GROUP. - -m MODE $chmodprog installed files to MODE. - -o USER $chownprog installed files to USER. - -s $stripprog installed files. - -t DIRECTORY install into DIRECTORY. - -T report an error if DSTFILE is a directory. - -Environment variables override the default commands: - CHGRPPROG CHMODPROG CHOWNPROG CMPPROG CPPROG MKDIRPROG MVPROG - RMPROG STRIPPROG -" - -while test $# -ne 0; do - case $1 in - -c) ;; - - -C) copy_on_change=true;; - - -d) dir_arg=true;; - - -g) chgrpcmd="$chgrpprog $2" - shift;; - - --help) echo "$usage"; exit $?;; - - -m) mode=$2 - case $mode in - *' '* | *' '* | *' -'* | *'*'* | *'?'* | *'['*) - echo "$0: invalid mode: $mode" >&2 - exit 1;; - esac - shift;; - - -o) chowncmd="$chownprog $2" - shift;; - - -s) stripcmd=$stripprog;; - - -t) dst_arg=$2 - shift;; - - -T) no_target_directory=true;; - - --version) echo "$0 $scriptversion"; exit $?;; - - --) shift - break;; - - -*) echo "$0: invalid option: $1" >&2 - exit 1;; - - *) break;; - esac - shift -done - -if test $# -ne 0 && test -z "$dir_arg$dst_arg"; then - # When -d is used, all remaining arguments are directories to create. - # When -t is used, the destination is already specified. - # Otherwise, the last argument is the destination. Remove it from $@. - for arg - do - if test -n "$dst_arg"; then - # $@ is not empty: it contains at least $arg. - set fnord "$@" "$dst_arg" - shift # fnord - fi - shift # arg - dst_arg=$arg - done -fi - -if test $# -eq 0; then - if test -z "$dir_arg"; then - echo "$0: no input file specified." >&2 - exit 1 - fi - # It's OK to call `install-sh -d' without argument. - # This can happen when creating conditional directories. - exit 0 -fi - -if test -z "$dir_arg"; then - trap '(exit $?); exit' 1 2 13 15 - - # Set umask so as not to create temps with too-generous modes. - # However, 'strip' requires both read and write access to temps. - case $mode in - # Optimize common cases. - *644) cp_umask=133;; - *755) cp_umask=22;; - - *[0-7]) - if test -z "$stripcmd"; then - u_plus_rw= - else - u_plus_rw='% 200' - fi - cp_umask=`expr '(' 777 - $mode % 1000 ')' $u_plus_rw`;; - *) - if test -z "$stripcmd"; then - u_plus_rw= - else - u_plus_rw=,u+rw - fi - cp_umask=$mode$u_plus_rw;; - esac -fi - -for src -do - # Protect names starting with `-'. - case $src in - -*) src=./$src;; - esac - - if test -n "$dir_arg"; then - dst=$src - dstdir=$dst - test -d "$dstdir" - dstdir_status=$? - else - - # Waiting for this to be detected by the "$cpprog $src $dsttmp" command - # might cause directories to be created, which would be especially bad - # if $src (and thus $dsttmp) contains '*'. - if test ! -f "$src" && test ! -d "$src"; then - echo "$0: $src does not exist." >&2 - exit 1 - fi - - if test -z "$dst_arg"; then - echo "$0: no destination specified." >&2 - exit 1 - fi - - dst=$dst_arg - # Protect names starting with `-'. - case $dst in - -*) dst=./$dst;; - esac - - # If destination is a directory, append the input filename; won't work - # if double slashes aren't ignored. - if test -d "$dst"; then - if test -n "$no_target_directory"; then - echo "$0: $dst_arg: Is a directory" >&2 - exit 1 - fi - dstdir=$dst - dst=$dstdir/`basename "$src"` - dstdir_status=0 - else - # Prefer dirname, but fall back on a substitute if dirname fails. - dstdir=` - (dirname "$dst") 2>/dev/null || - expr X"$dst" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \ - X"$dst" : 'X\(//\)[^/]' \| \ - X"$dst" : 'X\(//\)$' \| \ - X"$dst" : 'X\(/\)' \| . 2>/dev/null || - echo X"$dst" | - sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{ - s//\1/ - q - } - /^X\(\/\/\)[^/].*/{ - s//\1/ - q - } - /^X\(\/\/\)$/{ - s//\1/ - q - } - /^X\(\/\).*/{ - s//\1/ - q - } - s/.*/./; q' - ` - - test -d "$dstdir" - dstdir_status=$? - fi - fi - - obsolete_mkdir_used=false - - if test $dstdir_status != 0; then - case $posix_mkdir in - '') - # Create intermediate dirs using mode 755 as modified by the umask. - # This is like FreeBSD 'install' as of 1997-10-28. - umask=`umask` - case $stripcmd.$umask in - # Optimize common cases. - *[2367][2367]) mkdir_umask=$umask;; - .*0[02][02] | .[02][02] | .[02]) mkdir_umask=22;; - - *[0-7]) - mkdir_umask=`expr $umask + 22 \ - - $umask % 100 % 40 + $umask % 20 \ - - $umask % 10 % 4 + $umask % 2 - `;; - *) mkdir_umask=$umask,go-w;; - esac - - # With -d, create the new directory with the user-specified mode. - # Otherwise, rely on $mkdir_umask. - if test -n "$dir_arg"; then - mkdir_mode=-m$mode - else - mkdir_mode= - fi - - posix_mkdir=false - case $umask in - *[123567][0-7][0-7]) - # POSIX mkdir -p sets u+wx bits regardless of umask, which - # is incompatible with FreeBSD 'install' when (umask & 300) != 0. - ;; - *) - tmpdir=${TMPDIR-/tmp}/ins$RANDOM-$$ - trap 'ret=$?; rmdir "$tmpdir/d" "$tmpdir" 2>/dev/null; exit $ret' 0 - - if (umask $mkdir_umask && - exec $mkdirprog $mkdir_mode -p -- "$tmpdir/d") >/dev/null 2>&1 - then - if test -z "$dir_arg" || { - # Check for POSIX incompatibilities with -m. - # HP-UX 11.23 and IRIX 6.5 mkdir -m -p sets group- or - # other-writeable bit of parent directory when it shouldn't. - # FreeBSD 6.1 mkdir -m -p sets mode of existing directory. - ls_ld_tmpdir=`ls -ld "$tmpdir"` - case $ls_ld_tmpdir in - d????-?r-*) different_mode=700;; - d????-?--*) different_mode=755;; - *) false;; - esac && - $mkdirprog -m$different_mode -p -- "$tmpdir" && { - ls_ld_tmpdir_1=`ls -ld "$tmpdir"` - test "$ls_ld_tmpdir" = "$ls_ld_tmpdir_1" - } - } - then posix_mkdir=: - fi - rmdir "$tmpdir/d" "$tmpdir" - else - # Remove any dirs left behind by ancient mkdir implementations. - rmdir ./$mkdir_mode ./-p ./-- 2>/dev/null - fi - trap '' 0;; - esac;; - esac - - if - $posix_mkdir && ( - umask $mkdir_umask && - $doit_exec $mkdirprog $mkdir_mode -p -- "$dstdir" - ) - then : - else - - # The umask is ridiculous, or mkdir does not conform to POSIX, - # or it failed possibly due to a race condition. Create the - # directory the slow way, step by step, checking for races as we go. - - case $dstdir in - /*) prefix='/';; - -*) prefix='./';; - *) prefix='';; - esac - - eval "$initialize_posix_glob" - - oIFS=$IFS - IFS=/ - $posix_glob set -f - set fnord $dstdir - shift - $posix_glob set +f - IFS=$oIFS - - prefixes= - - for d - do - test -z "$d" && continue - - prefix=$prefix$d - if test -d "$prefix"; then - prefixes= - else - if $posix_mkdir; then - (umask=$mkdir_umask && - $doit_exec $mkdirprog $mkdir_mode -p -- "$dstdir") && break - # Don't fail if two instances are running concurrently. - test -d "$prefix" || exit 1 - else - case $prefix in - *\'*) qprefix=`echo "$prefix" | sed "s/'/'\\\\\\\\''/g"`;; - *) qprefix=$prefix;; - esac - prefixes="$prefixes '$qprefix'" - fi - fi - prefix=$prefix/ - done - - if test -n "$prefixes"; then - # Don't fail if two instances are running concurrently. - (umask $mkdir_umask && - eval "\$doit_exec \$mkdirprog $prefixes") || - test -d "$dstdir" || exit 1 - obsolete_mkdir_used=true - fi - fi - fi - - if test -n "$dir_arg"; then - { test -z "$chowncmd" || $doit $chowncmd "$dst"; } && - { test -z "$chgrpcmd" || $doit $chgrpcmd "$dst"; } && - { test "$obsolete_mkdir_used$chowncmd$chgrpcmd" = false || - test -z "$chmodcmd" || $doit $chmodcmd $mode "$dst"; } || exit 1 - else - - # Make a couple of temp file names in the proper directory. - dsttmp=$dstdir/_inst.$$_ - rmtmp=$dstdir/_rm.$$_ - - # Trap to clean up those temp files at exit. - trap 'ret=$?; rm -f "$dsttmp" "$rmtmp" && exit $ret' 0 - - # Copy the file name to the temp name. - (umask $cp_umask && $doit_exec $cpprog "$src" "$dsttmp") && - - # and set any options; do chmod last to preserve setuid bits. - # - # If any of these fail, we abort the whole thing. If we want to - # ignore errors from any of these, just make sure not to ignore - # errors from the above "$doit $cpprog $src $dsttmp" command. - # - { test -z "$chowncmd" || $doit $chowncmd "$dsttmp"; } && - { test -z "$chgrpcmd" || $doit $chgrpcmd "$dsttmp"; } && - { test -z "$stripcmd" || $doit $stripcmd "$dsttmp"; } && - { test -z "$chmodcmd" || $doit $chmodcmd $mode "$dsttmp"; } && - - # If -C, don't bother to copy if it wouldn't change the file. - if $copy_on_change && - old=`LC_ALL=C ls -dlL "$dst" 2>/dev/null` && - new=`LC_ALL=C ls -dlL "$dsttmp" 2>/dev/null` && - - eval "$initialize_posix_glob" && - $posix_glob set -f && - set X $old && old=:$2:$4:$5:$6 && - set X $new && new=:$2:$4:$5:$6 && - $posix_glob set +f && - - test "$old" = "$new" && - $cmpprog "$dst" "$dsttmp" >/dev/null 2>&1 - then - rm -f "$dsttmp" - else - # Rename the file to the real destination. - $doit $mvcmd -f "$dsttmp" "$dst" 2>/dev/null || - - # The rename failed, perhaps because mv can't rename something else - # to itself, or perhaps because mv is so ancient that it does not - # support -f. - { - # Now remove or move aside any old file at destination location. - # We try this two ways since rm can't unlink itself on some - # systems and the destination file might be busy for other - # reasons. In this case, the final cleanup might fail but the new - # file should still install successfully. - { - test ! -f "$dst" || - $doit $rmcmd -f "$dst" 2>/dev/null || - { $doit $mvcmd -f "$dst" "$rmtmp" 2>/dev/null && - { $doit $rmcmd -f "$rmtmp" 2>/dev/null; :; } - } || - { echo "$0: cannot unlink or rename $dst" >&2 - (exit 1); exit 1 - } - } && - - # Now rename the file to the real destination. - $doit $mvcmd "$dsttmp" "$dst" - } - fi || exit 1 - - trap '' 0 - fi -done - -# Local variables: -# eval: (add-hook 'write-file-hooks 'time-stamp) -# time-stamp-start: "scriptversion=" -# time-stamp-format: "%:y-%02m-%02d.%02H" -# time-stamp-end: "$" -# End: diff -Nru powerpc-ibm-utils-1.2.20/build-aux/missing powerpc-ibm-utils-1.2.22/build-aux/missing --- powerpc-ibm-utils-1.2.20/build-aux/missing 2014-03-12 13:05:04.000000000 +0000 +++ powerpc-ibm-utils-1.2.22/build-aux/missing 1970-01-01 00:00:00.000000000 +0000 @@ -1,367 +0,0 @@ -#! /bin/sh -# Common stub for a few missing GNU programs while installing. - -scriptversion=2006-05-10.23 - -# Copyright (C) 1996, 1997, 1999, 2000, 2002, 2003, 2004, 2005, 2006 -# Free Software Foundation, Inc. -# Originally by Fran,cois Pinard , 1996. - -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU General Public License as published by -# the Free Software Foundation; either version 2, or (at your option) -# any later version. - -# This program is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU General Public License for more details. - -# You should have received a copy of the GNU General Public License -# along with this program; if not, write to the Free Software -# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA -# 02110-1301, USA. - -# As a special exception to the GNU General Public License, if you -# distribute this file as part of a program that contains a -# configuration script generated by Autoconf, you may include it under -# the same distribution terms that you use for the rest of that program. - -if test $# -eq 0; then - echo 1>&2 "Try \`$0 --help' for more information" - exit 1 -fi - -run=: -sed_output='s/.* --output[ =]\([^ ]*\).*/\1/p' -sed_minuso='s/.* -o \([^ ]*\).*/\1/p' - -# In the cases where this matters, `missing' is being run in the -# srcdir already. -if test -f configure.ac; then - configure_ac=configure.ac -else - configure_ac=configure.in -fi - -msg="missing on your system" - -case $1 in ---run) - # Try to run requested program, and just exit if it succeeds. - run= - shift - "$@" && exit 0 - # Exit code 63 means version mismatch. This often happens - # when the user try to use an ancient version of a tool on - # a file that requires a minimum version. In this case we - # we should proceed has if the program had been absent, or - # if --run hadn't been passed. - if test $? = 63; then - run=: - msg="probably too old" - fi - ;; - - -h|--h|--he|--hel|--help) - echo "\ -$0 [OPTION]... PROGRAM [ARGUMENT]... - -Handle \`PROGRAM [ARGUMENT]...' for when PROGRAM is missing, or return an -error status if there is no known handling for PROGRAM. - -Options: - -h, --help display this help and exit - -v, --version output version information and exit - --run try to run the given command, and emulate it if it fails - -Supported PROGRAM values: - aclocal touch file \`aclocal.m4' - autoconf touch file \`configure' - autoheader touch file \`config.h.in' - autom4te touch the output file, or create a stub one - automake touch all \`Makefile.in' files - bison create \`y.tab.[ch]', if possible, from existing .[ch] - flex create \`lex.yy.c', if possible, from existing .c - help2man touch the output file - lex create \`lex.yy.c', if possible, from existing .c - makeinfo touch the output file - tar try tar, gnutar, gtar, then tar without non-portable flags - yacc create \`y.tab.[ch]', if possible, from existing .[ch] - -Send bug reports to ." - exit $? - ;; - - -v|--v|--ve|--ver|--vers|--versi|--versio|--version) - echo "missing $scriptversion (GNU Automake)" - exit $? - ;; - - -*) - echo 1>&2 "$0: Unknown \`$1' option" - echo 1>&2 "Try \`$0 --help' for more information" - exit 1 - ;; - -esac - -# Now exit if we have it, but it failed. Also exit now if we -# don't have it and --version was passed (most likely to detect -# the program). -case $1 in - lex|yacc) - # Not GNU programs, they don't have --version. - ;; - - tar) - if test -n "$run"; then - echo 1>&2 "ERROR: \`tar' requires --run" - exit 1 - elif test "x$2" = "x--version" || test "x$2" = "x--help"; then - exit 1 - fi - ;; - - *) - if test -z "$run" && ($1 --version) > /dev/null 2>&1; then - # We have it, but it failed. - exit 1 - elif test "x$2" = "x--version" || test "x$2" = "x--help"; then - # Could not run --version or --help. This is probably someone - # running `$TOOL --version' or `$TOOL --help' to check whether - # $TOOL exists and not knowing $TOOL uses missing. - exit 1 - fi - ;; -esac - -# If it does not exist, or fails to run (possibly an outdated version), -# try to emulate it. -case $1 in - aclocal*) - echo 1>&2 "\ -WARNING: \`$1' is $msg. You should only need it if - you modified \`acinclude.m4' or \`${configure_ac}'. You might want - to install the \`Automake' and \`Perl' packages. Grab them from - any GNU archive site." - touch aclocal.m4 - ;; - - autoconf) - echo 1>&2 "\ -WARNING: \`$1' is $msg. You should only need it if - you modified \`${configure_ac}'. You might want to install the - \`Autoconf' and \`GNU m4' packages. Grab them from any GNU - archive site." - touch configure - ;; - - autoheader) - echo 1>&2 "\ -WARNING: \`$1' is $msg. You should only need it if - you modified \`acconfig.h' or \`${configure_ac}'. You might want - to install the \`Autoconf' and \`GNU m4' packages. Grab them - from any GNU archive site." - files=`sed -n 's/^[ ]*A[CM]_CONFIG_HEADER(\([^)]*\)).*/\1/p' ${configure_ac}` - test -z "$files" && files="config.h" - touch_files= - for f in $files; do - case $f in - *:*) touch_files="$touch_files "`echo "$f" | - sed -e 's/^[^:]*://' -e 's/:.*//'`;; - *) touch_files="$touch_files $f.in";; - esac - done - touch $touch_files - ;; - - automake*) - echo 1>&2 "\ -WARNING: \`$1' is $msg. You should only need it if - you modified \`Makefile.am', \`acinclude.m4' or \`${configure_ac}'. - You might want to install the \`Automake' and \`Perl' packages. - Grab them from any GNU archive site." - find . -type f -name Makefile.am -print | - sed 's/\.am$/.in/' | - while read f; do touch "$f"; done - ;; - - autom4te) - echo 1>&2 "\ -WARNING: \`$1' is needed, but is $msg. - You might have modified some files without having the - proper tools for further handling them. - You can get \`$1' as part of \`Autoconf' from any GNU - archive site." - - file=`echo "$*" | sed -n "$sed_output"` - test -z "$file" && file=`echo "$*" | sed -n "$sed_minuso"` - if test -f "$file"; then - touch $file - else - test -z "$file" || exec >$file - echo "#! /bin/sh" - echo "# Created by GNU Automake missing as a replacement of" - echo "# $ $@" - echo "exit 0" - chmod +x $file - exit 1 - fi - ;; - - bison|yacc) - echo 1>&2 "\ -WARNING: \`$1' $msg. You should only need it if - you modified a \`.y' file. You may need the \`Bison' package - in order for those modifications to take effect. You can get - \`Bison' from any GNU archive site." - rm -f y.tab.c y.tab.h - if test $# -ne 1; then - eval LASTARG="\${$#}" - case $LASTARG in - *.y) - SRCFILE=`echo "$LASTARG" | sed 's/y$/c/'` - if test -f "$SRCFILE"; then - cp "$SRCFILE" y.tab.c - fi - SRCFILE=`echo "$LASTARG" | sed 's/y$/h/'` - if test -f "$SRCFILE"; then - cp "$SRCFILE" y.tab.h - fi - ;; - esac - fi - if test ! -f y.tab.h; then - echo >y.tab.h - fi - if test ! -f y.tab.c; then - echo 'main() { return 0; }' >y.tab.c - fi - ;; - - lex|flex) - echo 1>&2 "\ -WARNING: \`$1' is $msg. You should only need it if - you modified a \`.l' file. You may need the \`Flex' package - in order for those modifications to take effect. You can get - \`Flex' from any GNU archive site." - rm -f lex.yy.c - if test $# -ne 1; then - eval LASTARG="\${$#}" - case $LASTARG in - *.l) - SRCFILE=`echo "$LASTARG" | sed 's/l$/c/'` - if test -f "$SRCFILE"; then - cp "$SRCFILE" lex.yy.c - fi - ;; - esac - fi - if test ! -f lex.yy.c; then - echo 'main() { return 0; }' >lex.yy.c - fi - ;; - - help2man) - echo 1>&2 "\ -WARNING: \`$1' is $msg. You should only need it if - you modified a dependency of a manual page. You may need the - \`Help2man' package in order for those modifications to take - effect. You can get \`Help2man' from any GNU archive site." - - file=`echo "$*" | sed -n "$sed_output"` - test -z "$file" && file=`echo "$*" | sed -n "$sed_minuso"` - if test -f "$file"; then - touch $file - else - test -z "$file" || exec >$file - echo ".ab help2man is required to generate this page" - exit 1 - fi - ;; - - makeinfo) - echo 1>&2 "\ -WARNING: \`$1' is $msg. You should only need it if - you modified a \`.texi' or \`.texinfo' file, or any other file - indirectly affecting the aspect of the manual. The spurious - call might also be the consequence of using a buggy \`make' (AIX, - DU, IRIX). You might want to install the \`Texinfo' package or - the \`GNU make' package. Grab either from any GNU archive site." - # The file to touch is that specified with -o ... - file=`echo "$*" | sed -n "$sed_output"` - test -z "$file" && file=`echo "$*" | sed -n "$sed_minuso"` - if test -z "$file"; then - # ... or it is the one specified with @setfilename ... - infile=`echo "$*" | sed 's/.* \([^ ]*\) *$/\1/'` - file=`sed -n ' - /^@setfilename/{ - s/.* \([^ ]*\) *$/\1/ - p - q - }' $infile` - # ... or it is derived from the source name (dir/f.texi becomes f.info) - test -z "$file" && file=`echo "$infile" | sed 's,.*/,,;s,.[^.]*$,,'`.info - fi - # If the file does not exist, the user really needs makeinfo; - # let's fail without touching anything. - test -f $file || exit 1 - touch $file - ;; - - tar) - shift - - # We have already tried tar in the generic part. - # Look for gnutar/gtar before invocation to avoid ugly error - # messages. - if (gnutar --version > /dev/null 2>&1); then - gnutar "$@" && exit 0 - fi - if (gtar --version > /dev/null 2>&1); then - gtar "$@" && exit 0 - fi - firstarg="$1" - if shift; then - case $firstarg in - *o*) - firstarg=`echo "$firstarg" | sed s/o//` - tar "$firstarg" "$@" && exit 0 - ;; - esac - case $firstarg in - *h*) - firstarg=`echo "$firstarg" | sed s/h//` - tar "$firstarg" "$@" && exit 0 - ;; - esac - fi - - echo 1>&2 "\ -WARNING: I can't seem to be able to run \`tar' with the given arguments. - You may want to install GNU tar or Free paxutils, or check the - command line arguments." - exit 1 - ;; - - *) - echo 1>&2 "\ -WARNING: \`$1' is needed, and is $msg. - You might have modified some files without having the - proper tools for further handling them. Check the \`README' file, - it often tells you about the needed prerequisites for installing - this package. You may also peek at any GNU archive site, in case - some other package would contain this missing \`$1' program." - exit 1 - ;; -esac - -exit 0 - -# Local variables: -# eval: (add-hook 'write-file-hooks 'time-stamp) -# time-stamp-start: "scriptversion=" -# time-stamp-format: "%:y-%02m-%02d.%02H" -# time-stamp-end: "$" -# End: diff -Nru powerpc-ibm-utils-1.2.20/Changelog powerpc-ibm-utils-1.2.22/Changelog --- powerpc-ibm-utils-1.2.20/Changelog 2014-03-21 20:23:54.000000000 +0000 +++ powerpc-ibm-utils-1.2.22/Changelog 2014-08-13 14:44:05.000000000 +0000 @@ -1,3 +1,388 @@ +powerpc-utils-1.2.22 +===================================================================== +commit 0a67ffbb5d40c49347cd85a74921693457331f82 +Author: Joel Stanley +Date: Wed Aug 13 09:38:20 2014 -0500 + + ppc64_cpu: Be verbose about inconsistant SMT state + + With the use of splitcore, users are more likely to end up in a strange + SMT state. Be kind and display what the online state of all our CPUs is, + and explain how to get out of this hole. + + Signed-off-by: Joel Stanley + +commit d3e016e9e5683a565824b9ec185901ff7feb25ed +Author: Joel Stanley +Date: Wed Aug 13 09:36:27 2014 -0500 + + ppc64_cpu: Remove parameter from do_info + + It is unused. + + Also add a forward declaration at the top so we can call do_info in other + interesting places. + + Signed-off-by: Joel Stanley + +commit 2af3d960442be3d36d8aa8ac914928d4047a0f18 +Author: Aruna Balakrishnaiah +Date: Wed Aug 13 08:39:17 2014 -0500 + + nvram: Handle endianness in the nvram --unzip option. + + Handle endianness of the oops log size in the --unzip + option. + + Signed-off-by: Aruna Balakrishnaiah + Acked-by: Vasant Hegde + +commit 48d45ca2ba2f098a4a565dac6e74cafe8db808f9 +Author: Thomas Falcon +Date: Wed Aug 13 08:35:30 2014 -0500 + + drmgr/lsslot: increase number of max cpu threads. + + The Power8 cpu can support eight threads per cpu core. This + patch increases the maximum number of threads from four to eight. + + Signed-off-by: Thomas Falcon + +commit 23872cbdce2107562b1b997cf306d6279ddf5d50 +Author: Thomas Falcon +Date: Wed Aug 13 08:22:37 2014 -0500 + + lsslot/drmgr: little endian support for memory + + This patch adds some support in retrieving memory slot information + on little endian systems. These changes have only been tested using + lsslot. Adding or removing memory via drmgr has not been attempted. + + Signed-off-by: Thomas Falcon + Signed-off-by: Nathan Fontenot + +commit c0e6665d9da9797df4b7516f2ef14d7a45f5cb81 +Author: Thomas Falcon +Date: Wed Aug 13 08:00:52 2014 -0500 + + lsslot/drmgr: little endian support for cpu + + This patch adds some support in retrieving cpu slot information + on little endian systems. These changes have only been tested using + lsslot. Adding or removing cpu's via drmgr has not been attempted. + + Signed-off-by: Thomas Falcon + +powerpc-utils-1.2.21 +===================================================================== +commit a529515e6a78bc8d39b58122b99e009291048a78 +Author: Nathan Fontenot +Date: Wed Jun 25 16:11:37 2014 -0500 + + uesensor: remove unused platform variable + + Remove the unused platform variable that appears to be + an accidental leftover from updating the platform checking + code. + + This was producing a build warning. + + Signed-off-by: Nathan Fontenot + +commit d840b6a2e4d7ee38b08b15c80c562e699f1f7b79 +Author: Tyrel Datwyler +Date: Wed Jun 25 16:06:17 2014 -0500 + + nvram: restrict --nvram-size to 16 byte multiples + + PAPR defines a 16 byte block size for nvram partitions. This patch restricts + the --nvram-size option to sizes that are multiples of 16. + + Signed-off-by: Tyrel Datwyler + Signed-off-by: Nathan Fontenot + +commit 38f6cab58bd77d75d8bcf52c2b3a4b06002601eb +Author: Tyrel Datwyler +Date: Wed Jun 25 16:01:41 2014 -0500 + + nvram: fix memory corruption when nvram->nbytes is less than actual nvram si +ze + + The nvram_read function always calls read with a 512 byte chunk size. If the + actual nvram size is greater than nvram->nbytes, which can be overriden by t +he + --nvram-size option, the allocated read buffer will be overrun. + + Fixed read logic to only read upto nvram->nbytes of data. + + Signed-off-by: Tyrel Datwyler + +commit ba2c2ad835339f52be8972a3207012ae54749113 +Author: Thomas Falcon +Date: Wed Jun 25 15:58:24 2014 -0500 + + set_power_on: handle endianess reading max latency + + set_power_on reads device-tree to get the max latency value, + which is in a big endian format. This needs to be converted + for little endian architectures. + + Signed-off-by: Thomas Falcon + +commit 562526a14c3121e695ef782dc028c82e6e350bbf +Author: Thomas Falcon +Date: Wed Jun 25 15:31:54 2014 -0500 + + ppc64_cpu: handle endianess in rtas sysparm buffer + + ppc64_cpu passes a buffer to rtas_set_sysparm. The first two + bytes of this buffer must encode a integer denoting the + size of the remaining the buffer. This integer must be in a + big endian format. + + Signed-off-by: Thomas Falcon + +commit 7e781be45fbf87ccd1792a498788b9aaf3256b72 +Author: Thomas Falcon +Date: Wed Jun 25 15:22:51 2014 -0500 + + uesensor: fix endian issues reading device-tree + + The values in /proc/device-tree/rtas/rtas-sensors are + big endian so this needs to be handled for little endian + architectures. + + Signed-off-by: Thomas Falcon + +commit 9bfe5991bf5d8e1c047f45a664b636fa05dca39f +Author: Thomas Falcon +Date: Wed Jun 25 15:18:55 2014 -0500 + + serv_config: handle endianess in sysparm buffer + + rtas_get_sysparm and rtas_set_sysparm commands both + manipulate buffers in which the first two bytes are a big + endian integer indicating the size of the remaining buffer. + This patch makes sure those bytes are in the correct format. + + Signed-off-by: Thomas Falcon + +commit a9f264ab1f84c20f144cba9c971883064e5430dd +Author: Tyrel Datwyler +Date: Wed Jun 25 15:16:31 2014 -0500 + + lsslot: fix segfault when lmb_list->lmbs is NULL + + PowerKVM guests currently do not support dynamically reconfigurable + memory, and as such get_lmbs will return a lmb_list struct whose lmbs + field is NULL. Added a NULL check to avoid segfault for the case where + no LMB drc-names are defined in device tree. + + Signed-off-by: Tyrel Datwyler + +commit d9f6fbcea7feeedf5d72ddddef33295cbbe6d622 +Author: Nathan Fontenot +Date: Mon Jun 9 06:44:58 2014 -0500 + + ppc64_cpu: update access validation routines + + The use of fopen() to check for read/write access of system attribute + files (i.e. sysfs) no longer works with kernels 3.14 and later. The man + page for fopen() states that there is an implied file creation if the + file does not exist. This now causes fopen() to return EACCES instead + of ENOENT for files that do not exist. + + This patch updates ppc64_cpu to use access() to validate file existence + and file read/write permissions. + + Signed-off-by: Nathan Fontenot + Reviewed-by: Joel Stanley + Acked-by: Vasant Hegde + +commit 38005d9cc59a5f81754b93b1479f8538c7151976 +Author: Vasant Hegde +Date: Mon Jun 9 06:42:42 2014 -0500 + + update_flash: Fix typo in man page + + Signed-off-by: Vasant Hegde + +commit cc4589f43ae5ca2fffd9b96997ba09023f9e8999 +Author: Vasant Hegde +Date: Mon Jun 9 06:39:26 2014 -0500 + + update_flash_nv: Display current FW version + + Add support to display current firmware version detail + on PowerKVM host. + + Sample output: + [root@abc123 tmp]# update_flash -d + Current firwmare version : + T side : FW770.20 (ZL770_060) + P side : FW770.20 (ZL770_060) + Boot side : FW770.20 (ZL770_060) + + Suggested-by: Benjamin Herrenschmidt + Signed-off-by: Vasant Hegde + +commit 2dfd19700a0dbe8df0c0cfc2b6c23ef42dbb6c11 +Author: Vasant Hegde +Date: Mon Jun 9 06:37:41 2014 -0500 + + snap: Fix typo in output display + + Signed-off-by: Vasant Hegde +Date: Fri Apr 25 08:24:24 2014 -0500 + + update_flash: Remove some bashisms + + == is a bashism. Replace it with =. + + We also need to add quotes around some variables to avoid: + + local: FW710.00: bad variable name + + Signed-off-by: Anton Blanchard + Reviewed-by: Vasant Hegde + +commit de159805368210c17d01bfe088c157d394406640 +Author: Joel Stanley +Date: Fri Apr 25 08:22:32 2014 -0500 + + ppc64_cpu: Let kernel validate subcore options + + Previously we checked for valid subcore-per-core options, however, the + kernel knows better than we do as to what is valid. Remove the check. + + Signed-off-by: Joel Stanley + +commit 6f11925411d334eb501cc2214e08d4eb596438cd +Author: Aruna Balakrishnaiah +Date: Fri Apr 25 08:21:03 2014 -0500 + + ofpathname: Convert OF path to logical names for usb devices + + Add support to convert a Open Firmware device path to logical + device path for usb device. + + Signed-off-by: Aruna Balakrishnaiah + +commit 655649226d2b60eff1a1ef85f92a3ef5cd1b360b +Author: Aruna Balakrishnaiah +Date: Fri Apr 25 08:20:09 2014 -0500 + + ofpathname: Convert logical device path to OF format for usb devices + + Add support to convert logical device path to Open firmware + device path for usb devices. + + Reported-by: Nikunj A Dadhania + Signed-off-by: Aruna Balakrishnaiah + +commit 852e69a9a099273a3e49ebdfcc2afd13a8e9876e +Author: Nathan Fontenot +Date: Fri Apr 25 08:18:26 2014 -0500 + + drmgr: Update action option validation + + The drmgr command does not do any validation of the action option + specified on the command line, except for some checking for CPU + operations.. The omission of an action option can lead to confusing + error messages or just exiting with an error. + + This patch updates each connector type with a validation check for + their respective valid action options. + + Signed-off-by: Nathan Fontenot + +commit 865171adc9d0f2a327ac892e99bf60add5255315 +Author: Nathan Fontenot +Date: Fri Apr 25 08:08:06 2014 -0500 + + Updating .gitignore fo files that are no longer in git. + + Signed-off-by: Nathan Fontenot + +commit a13ddf3a0bda581984f77c1ca171b34ae90ef83a +Author: Shivaprasad G Bhat +Date: Fri Apr 25 07:59:51 2014 -0500 + + ppc64_cpu: Add option --threads-per-core + + The threads per core calculated in ppc64_cpu is more relaiable than the + same provided by any other utility. Expose the value through an option. + + Signed-off-by: Shivaprasad G Bhat + +commit 6e5dfe8302966568e4e7eff6035d7cc5d46481f9 +Author: Nathan Fontenot +Date: Fri Apr 25 07:49:19 2014 -0500 + + Move librtas error code to common directory. + + Now that we have a src/common directory this patch moves the + librtas_error files to the common directory. + + Signed-off-by: Nathan Fontenot + +commit e07b773c38effae0c9c16ddc20c423a166638194 +Author: Stewart Smith +Date: Tue Apr 8 15:13:39 2014 -0500 + + recursive make considered harmful + + Instead, we can use include/ for makefiles, or because we're a small + project, just put it in one makefile of ~150 lines. + + We also fix up the spec file version substitution to use autofoo. + + With these fixes, make distcheck works correctly. + + Signed-off-by: Stewart Smith + +commit f8b52ffb07006897e2b9df281f6aea83a5667c03 +Author: Stewart Smith +Date: Tue Apr 8 15:07:38 2014 -0500 + + add sys/time.h and gettimeofday detection to configure.ac courtesy autoscan + + Signed-off-by: Stewart Smith + +commit 475e60537c7f872ae44f89e72100d382986e1636 +Author: Stewart Smith +Date: Tue Apr 8 15:04:34 2014 -0500 + + check for and use gcc hardening flags if available + + Signed-off-by: Stewart Smith + +commit 63d6bcc2d79814fb625089b4f01d4fdba703ea03 +Author: Stewart Smith +Date: Tue Apr 8 15:00:48 2014 -0500 + + remove autogenerated files + + files such as Makefile.in and configure should not be checked into + source repositories as they'll be regenerated on build. + + Add a autogen.sh script to run autoreconf + + Signed-off-by: Stewart Smith + +commit 66c23d7323ba26757bd1a6b50b3db6c81c422822 +Author: Stewart Smith +Date: Tue Apr 8 14:44:32 2014 -0500 + + Move subdir-objects options to configure.ac rather than Makefile.am(s) + + Easier to keep it in one place than several + + Signed-off-by: Stewart Smith + powerpc-utils-1.2.20 ===================================================================== commit 73c454bea39418872313cd960d005d4d20262f20 diff -Nru powerpc-ibm-utils-1.2.20/config/compile powerpc-ibm-utils-1.2.22/config/compile --- powerpc-ibm-utils-1.2.20/config/compile 1970-01-01 00:00:00.000000000 +0000 +++ powerpc-ibm-utils-1.2.22/config/compile 2014-08-13 14:44:29.000000000 +0000 @@ -0,0 +1,142 @@ +#! /bin/sh +# Wrapper for compilers which do not understand `-c -o'. + +scriptversion=2005-05-14.22 + +# Copyright (C) 1999, 2000, 2003, 2004, 2005 Free Software Foundation, Inc. +# Written by Tom Tromey . +# +# This program is free software; you can redistribute it and/or modify +# it under the terms of the GNU General Public License as published by +# the Free Software Foundation; either version 2, or (at your option) +# any later version. +# +# This program is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# GNU General Public License for more details. +# +# You should have received a copy of the GNU General Public License +# along with this program; if not, write to the Free Software +# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. + +# As a special exception to the GNU General Public License, if you +# distribute this file as part of a program that contains a +# configuration script generated by Autoconf, you may include it under +# the same distribution terms that you use for the rest of that program. + +# This file is maintained in Automake, please report +# bugs to or send patches to +# . + +case $1 in + '') + echo "$0: No command. Try \`$0 --help' for more information." 1>&2 + exit 1; + ;; + -h | --h*) + cat <<\EOF +Usage: compile [--help] [--version] PROGRAM [ARGS] + +Wrapper for compilers which do not understand `-c -o'. +Remove `-o dest.o' from ARGS, run PROGRAM with the remaining +arguments, and rename the output as expected. + +If you are trying to build a whole package this is not the +right script to run: please start by reading the file `INSTALL'. + +Report bugs to . +EOF + exit $? + ;; + -v | --v*) + echo "compile $scriptversion" + exit $? + ;; +esac + +ofile= +cfile= +eat= + +for arg +do + if test -n "$eat"; then + eat= + else + case $1 in + -o) + # configure might choose to run compile as `compile cc -o foo foo.c'. + # So we strip `-o arg' only if arg is an object. + eat=1 + case $2 in + *.o | *.obj) + ofile=$2 + ;; + *) + set x "$@" -o "$2" + shift + ;; + esac + ;; + *.c) + cfile=$1 + set x "$@" "$1" + shift + ;; + *) + set x "$@" "$1" + shift + ;; + esac + fi + shift +done + +if test -z "$ofile" || test -z "$cfile"; then + # If no `-o' option was seen then we might have been invoked from a + # pattern rule where we don't need one. That is ok -- this is a + # normal compilation that the losing compiler can handle. If no + # `.c' file was seen then we are probably linking. That is also + # ok. + exec "$@" +fi + +# Name of file we expect compiler to create. +cofile=`echo "$cfile" | sed -e 's|^.*/||' -e 's/\.c$/.o/'` + +# Create the lock directory. +# Note: use `[/.-]' here to ensure that we don't use the same name +# that we are using for the .o file. Also, base the name on the expected +# object file name, since that is what matters with a parallel build. +lockdir=`echo "$cofile" | sed -e 's|[/.-]|_|g'`.d +while true; do + if mkdir "$lockdir" >/dev/null 2>&1; then + break + fi + sleep 1 +done +# FIXME: race condition here if user kills between mkdir and trap. +trap "rmdir '$lockdir'; exit 1" 1 2 15 + +# Run the compile. +"$@" +ret=$? + +if test -f "$cofile"; then + mv "$cofile" "$ofile" +elif test -f "${cofile}bj"; then + mv "${cofile}bj" "$ofile" +fi + +rmdir "$lockdir" +exit $ret + +# Local Variables: +# mode: shell-script +# sh-indentation: 2 +# eval: (add-hook 'write-file-hooks 'time-stamp) +# time-stamp-start: "scriptversion=" +# time-stamp-format: "%:y-%02m-%02d.%02H" +# time-stamp-end: "$" +# End: diff -Nru powerpc-ibm-utils-1.2.20/config/depcomp powerpc-ibm-utils-1.2.22/config/depcomp --- powerpc-ibm-utils-1.2.20/config/depcomp 1970-01-01 00:00:00.000000000 +0000 +++ powerpc-ibm-utils-1.2.22/config/depcomp 2014-08-13 14:44:29.000000000 +0000 @@ -0,0 +1,589 @@ +#! /bin/sh +# depcomp - compile a program generating dependencies as side-effects + +scriptversion=2007-03-29.01 + +# Copyright (C) 1999, 2000, 2003, 2004, 2005, 2006, 2007 Free Software +# Foundation, Inc. + +# This program is free software; you can redistribute it and/or modify +# it under the terms of the GNU General Public License as published by +# the Free Software Foundation; either version 2, or (at your option) +# any later version. + +# This program is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# GNU General Public License for more details. + +# You should have received a copy of the GNU General Public License +# along with this program; if not, write to the Free Software +# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA +# 02110-1301, USA. + +# As a special exception to the GNU General Public License, if you +# distribute this file as part of a program that contains a +# configuration script generated by Autoconf, you may include it under +# the same distribution terms that you use for the rest of that program. + +# Originally written by Alexandre Oliva . + +case $1 in + '') + echo "$0: No command. Try \`$0 --help' for more information." 1>&2 + exit 1; + ;; + -h | --h*) + cat <<\EOF +Usage: depcomp [--help] [--version] PROGRAM [ARGS] + +Run PROGRAMS ARGS to compile a file, generating dependencies +as side-effects. + +Environment variables: + depmode Dependency tracking mode. + source Source file read by `PROGRAMS ARGS'. + object Object file output by `PROGRAMS ARGS'. + DEPDIR directory where to store dependencies. + depfile Dependency file to output. + tmpdepfile Temporary file to use when outputing dependencies. + libtool Whether libtool is used (yes/no). + +Report bugs to . +EOF + exit $? + ;; + -v | --v*) + echo "depcomp $scriptversion" + exit $? + ;; +esac + +if test -z "$depmode" || test -z "$source" || test -z "$object"; then + echo "depcomp: Variables source, object and depmode must be set" 1>&2 + exit 1 +fi + +# Dependencies for sub/bar.o or sub/bar.obj go into sub/.deps/bar.Po. +depfile=${depfile-`echo "$object" | + sed 's|[^\\/]*$|'${DEPDIR-.deps}'/&|;s|\.\([^.]*\)$|.P\1|;s|Pobj$|Po|'`} +tmpdepfile=${tmpdepfile-`echo "$depfile" | sed 's/\.\([^.]*\)$/.T\1/'`} + +rm -f "$tmpdepfile" + +# Some modes work just like other modes, but use different flags. We +# parameterize here, but still list the modes in the big case below, +# to make depend.m4 easier to write. Note that we *cannot* use a case +# here, because this file can only contain one case statement. +if test "$depmode" = hp; then + # HP compiler uses -M and no extra arg. + gccflag=-M + depmode=gcc +fi + +if test "$depmode" = dashXmstdout; then + # This is just like dashmstdout with a different argument. + dashmflag=-xM + depmode=dashmstdout +fi + +case "$depmode" in +gcc3) +## gcc 3 implements dependency tracking that does exactly what +## we want. Yay! Note: for some reason libtool 1.4 doesn't like +## it if -MD -MP comes after the -MF stuff. Hmm. +## Unfortunately, FreeBSD c89 acceptance of flags depends upon +## the command line argument order; so add the flags where they +## appear in depend2.am. Note that the slowdown incurred here +## affects only configure: in makefiles, %FASTDEP% shortcuts this. + for arg + do + case $arg in + -c) set fnord "$@" -MT "$object" -MD -MP -MF "$tmpdepfile" "$arg" ;; + *) set fnord "$@" "$arg" ;; + esac + shift # fnord + shift # $arg + done + "$@" + stat=$? + if test $stat -eq 0; then : + else + rm -f "$tmpdepfile" + exit $stat + fi + mv "$tmpdepfile" "$depfile" + ;; + +gcc) +## There are various ways to get dependency output from gcc. Here's +## why we pick this rather obscure method: +## - Don't want to use -MD because we'd like the dependencies to end +## up in a subdir. Having to rename by hand is ugly. +## (We might end up doing this anyway to support other compilers.) +## - The DEPENDENCIES_OUTPUT environment variable makes gcc act like +## -MM, not -M (despite what the docs say). +## - Using -M directly means running the compiler twice (even worse +## than renaming). + if test -z "$gccflag"; then + gccflag=-MD, + fi + "$@" -Wp,"$gccflag$tmpdepfile" + stat=$? + if test $stat -eq 0; then : + else + rm -f "$tmpdepfile" + exit $stat + fi + rm -f "$depfile" + echo "$object : \\" > "$depfile" + alpha=ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz +## The second -e expression handles DOS-style file names with drive letters. + sed -e 's/^[^:]*: / /' \ + -e 's/^['$alpha']:\/[^:]*: / /' < "$tmpdepfile" >> "$depfile" +## This next piece of magic avoids the `deleted header file' problem. +## The problem is that when a header file which appears in a .P file +## is deleted, the dependency causes make to die (because there is +## typically no way to rebuild the header). We avoid this by adding +## dummy dependencies for each header file. Too bad gcc doesn't do +## this for us directly. + tr ' ' ' +' < "$tmpdepfile" | +## Some versions of gcc put a space before the `:'. On the theory +## that the space means something, we add a space to the output as +## well. +## Some versions of the HPUX 10.20 sed can't process this invocation +## correctly. Breaking it into two sed invocations is a workaround. + sed -e 's/^\\$//' -e '/^$/d' -e '/:$/d' | sed -e 's/$/ :/' >> "$depfile" + rm -f "$tmpdepfile" + ;; + +hp) + # This case exists only to let depend.m4 do its work. It works by + # looking at the text of this script. This case will never be run, + # since it is checked for above. + exit 1 + ;; + +sgi) + if test "$libtool" = yes; then + "$@" "-Wp,-MDupdate,$tmpdepfile" + else + "$@" -MDupdate "$tmpdepfile" + fi + stat=$? + if test $stat -eq 0; then : + else + rm -f "$tmpdepfile" + exit $stat + fi + rm -f "$depfile" + + if test -f "$tmpdepfile"; then # yes, the sourcefile depend on other files + echo "$object : \\" > "$depfile" + + # Clip off the initial element (the dependent). Don't try to be + # clever and replace this with sed code, as IRIX sed won't handle + # lines with more than a fixed number of characters (4096 in + # IRIX 6.2 sed, 8192 in IRIX 6.5). We also remove comment lines; + # the IRIX cc adds comments like `#:fec' to the end of the + # dependency line. + tr ' ' ' +' < "$tmpdepfile" \ + | sed -e 's/^.*\.o://' -e 's/#.*$//' -e '/^$/ d' | \ + tr ' +' ' ' >> $depfile + echo >> $depfile + + # The second pass generates a dummy entry for each header file. + tr ' ' ' +' < "$tmpdepfile" \ + | sed -e 's/^.*\.o://' -e 's/#.*$//' -e '/^$/ d' -e 's/$/:/' \ + >> $depfile + else + # The sourcefile does not contain any dependencies, so just + # store a dummy comment line, to avoid errors with the Makefile + # "include basename.Plo" scheme. + echo "#dummy" > "$depfile" + fi + rm -f "$tmpdepfile" + ;; + +aix) + # The C for AIX Compiler uses -M and outputs the dependencies + # in a .u file. In older versions, this file always lives in the + # current directory. Also, the AIX compiler puts `$object:' at the + # start of each line; $object doesn't have directory information. + # Version 6 uses the directory in both cases. + dir=`echo "$object" | sed -e 's|/[^/]*$|/|'` + test "x$dir" = "x$object" && dir= + base=`echo "$object" | sed -e 's|^.*/||' -e 's/\.o$//' -e 's/\.lo$//'` + if test "$libtool" = yes; then + tmpdepfile1=$dir$base.u + tmpdepfile2=$base.u + tmpdepfile3=$dir.libs/$base.u + "$@" -Wc,-M + else + tmpdepfile1=$dir$base.u + tmpdepfile2=$dir$base.u + tmpdepfile3=$dir$base.u + "$@" -M + fi + stat=$? + + if test $stat -eq 0; then : + else + rm -f "$tmpdepfile1" "$tmpdepfile2" "$tmpdepfile3" + exit $stat + fi + + for tmpdepfile in "$tmpdepfile1" "$tmpdepfile2" "$tmpdepfile3" + do + test -f "$tmpdepfile" && break + done + if test -f "$tmpdepfile"; then + # Each line is of the form `foo.o: dependent.h'. + # Do two passes, one to just change these to + # `$object: dependent.h' and one to simply `dependent.h:'. + sed -e "s,^.*\.[a-z]*:,$object:," < "$tmpdepfile" > "$depfile" + # That's a tab and a space in the []. + sed -e 's,^.*\.[a-z]*:[ ]*,,' -e 's,$,:,' < "$tmpdepfile" >> "$depfile" + else + # The sourcefile does not contain any dependencies, so just + # store a dummy comment line, to avoid errors with the Makefile + # "include basename.Plo" scheme. + echo "#dummy" > "$depfile" + fi + rm -f "$tmpdepfile" + ;; + +icc) + # Intel's C compiler understands `-MD -MF file'. However on + # icc -MD -MF foo.d -c -o sub/foo.o sub/foo.c + # ICC 7.0 will fill foo.d with something like + # foo.o: sub/foo.c + # foo.o: sub/foo.h + # which is wrong. We want: + # sub/foo.o: sub/foo.c + # sub/foo.o: sub/foo.h + # sub/foo.c: + # sub/foo.h: + # ICC 7.1 will output + # foo.o: sub/foo.c sub/foo.h + # and will wrap long lines using \ : + # foo.o: sub/foo.c ... \ + # sub/foo.h ... \ + # ... + + "$@" -MD -MF "$tmpdepfile" + stat=$? + if test $stat -eq 0; then : + else + rm -f "$tmpdepfile" + exit $stat + fi + rm -f "$depfile" + # Each line is of the form `foo.o: dependent.h', + # or `foo.o: dep1.h dep2.h \', or ` dep3.h dep4.h \'. + # Do two passes, one to just change these to + # `$object: dependent.h' and one to simply `dependent.h:'. + sed "s,^[^:]*:,$object :," < "$tmpdepfile" > "$depfile" + # Some versions of the HPUX 10.20 sed can't process this invocation + # correctly. Breaking it into two sed invocations is a workaround. + sed 's,^[^:]*: \(.*\)$,\1,;s/^\\$//;/^$/d;/:$/d' < "$tmpdepfile" | + sed -e 's/$/ :/' >> "$depfile" + rm -f "$tmpdepfile" + ;; + +hp2) + # The "hp" stanza above does not work with aCC (C++) and HP's ia64 + # compilers, which have integrated preprocessors. The correct option + # to use with these is +Maked; it writes dependencies to a file named + # 'foo.d', which lands next to the object file, wherever that + # happens to be. + # Much of this is similar to the tru64 case; see comments there. + dir=`echo "$object" | sed -e 's|/[^/]*$|/|'` + test "x$dir" = "x$object" && dir= + base=`echo "$object" | sed -e 's|^.*/||' -e 's/\.o$//' -e 's/\.lo$//'` + if test "$libtool" = yes; then + tmpdepfile1=$dir$base.d + tmpdepfile2=$dir.libs/$base.d + "$@" -Wc,+Maked + else + tmpdepfile1=$dir$base.d + tmpdepfile2=$dir$base.d + "$@" +Maked + fi + stat=$? + if test $stat -eq 0; then : + else + rm -f "$tmpdepfile1" "$tmpdepfile2" + exit $stat + fi + + for tmpdepfile in "$tmpdepfile1" "$tmpdepfile2" + do + test -f "$tmpdepfile" && break + done + if test -f "$tmpdepfile"; then + sed -e "s,^.*\.[a-z]*:,$object:," "$tmpdepfile" > "$depfile" + # Add `dependent.h:' lines. + sed -ne '2,${; s/^ *//; s/ \\*$//; s/$/:/; p;}' "$tmpdepfile" >> "$depfile" + else + echo "#dummy" > "$depfile" + fi + rm -f "$tmpdepfile" "$tmpdepfile2" + ;; + +tru64) + # The Tru64 compiler uses -MD to generate dependencies as a side + # effect. `cc -MD -o foo.o ...' puts the dependencies into `foo.o.d'. + # At least on Alpha/Redhat 6.1, Compaq CCC V6.2-504 seems to put + # dependencies in `foo.d' instead, so we check for that too. + # Subdirectories are respected. + dir=`echo "$object" | sed -e 's|/[^/]*$|/|'` + test "x$dir" = "x$object" && dir= + base=`echo "$object" | sed -e 's|^.*/||' -e 's/\.o$//' -e 's/\.lo$//'` + + if test "$libtool" = yes; then + # With Tru64 cc, shared objects can also be used to make a + # static library. This mechanism is used in libtool 1.4 series to + # handle both shared and static libraries in a single compilation. + # With libtool 1.4, dependencies were output in $dir.libs/$base.lo.d. + # + # With libtool 1.5 this exception was removed, and libtool now + # generates 2 separate objects for the 2 libraries. These two + # compilations output dependencies in $dir.libs/$base.o.d and + # in $dir$base.o.d. We have to check for both files, because + # one of the two compilations can be disabled. We should prefer + # $dir$base.o.d over $dir.libs/$base.o.d because the latter is + # automatically cleaned when .libs/ is deleted, while ignoring + # the former would cause a distcleancheck panic. + tmpdepfile1=$dir.libs/$base.lo.d # libtool 1.4 + tmpdepfile2=$dir$base.o.d # libtool 1.5 + tmpdepfile3=$dir.libs/$base.o.d # libtool 1.5 + tmpdepfile4=$dir.libs/$base.d # Compaq CCC V6.2-504 + "$@" -Wc,-MD + else + tmpdepfile1=$dir$base.o.d + tmpdepfile2=$dir$base.d + tmpdepfile3=$dir$base.d + tmpdepfile4=$dir$base.d + "$@" -MD + fi + + stat=$? + if test $stat -eq 0; then : + else + rm -f "$tmpdepfile1" "$tmpdepfile2" "$tmpdepfile3" "$tmpdepfile4" + exit $stat + fi + + for tmpdepfile in "$tmpdepfile1" "$tmpdepfile2" "$tmpdepfile3" "$tmpdepfile4" + do + test -f "$tmpdepfile" && break + done + if test -f "$tmpdepfile"; then + sed -e "s,^.*\.[a-z]*:,$object:," < "$tmpdepfile" > "$depfile" + # That's a tab and a space in the []. + sed -e 's,^.*\.[a-z]*:[ ]*,,' -e 's,$,:,' < "$tmpdepfile" >> "$depfile" + else + echo "#dummy" > "$depfile" + fi + rm -f "$tmpdepfile" + ;; + +#nosideeffect) + # This comment above is used by automake to tell side-effect + # dependency tracking mechanisms from slower ones. + +dashmstdout) + # Important note: in order to support this mode, a compiler *must* + # always write the preprocessed file to stdout, regardless of -o. + "$@" || exit $? + + # Remove the call to Libtool. + if test "$libtool" = yes; then + while test $1 != '--mode=compile'; do + shift + done + shift + fi + + # Remove `-o $object'. + IFS=" " + for arg + do + case $arg in + -o) + shift + ;; + $object) + shift + ;; + *) + set fnord "$@" "$arg" + shift # fnord + shift # $arg + ;; + esac + done + + test -z "$dashmflag" && dashmflag=-M + # Require at least two characters before searching for `:' + # in the target name. This is to cope with DOS-style filenames: + # a dependency such as `c:/foo/bar' could be seen as target `c' otherwise. + "$@" $dashmflag | + sed 's:^[ ]*[^: ][^:][^:]*\:[ ]*:'"$object"'\: :' > "$tmpdepfile" + rm -f "$depfile" + cat < "$tmpdepfile" > "$depfile" + tr ' ' ' +' < "$tmpdepfile" | \ +## Some versions of the HPUX 10.20 sed can't process this invocation +## correctly. Breaking it into two sed invocations is a workaround. + sed -e 's/^\\$//' -e '/^$/d' -e '/:$/d' | sed -e 's/$/ :/' >> "$depfile" + rm -f "$tmpdepfile" + ;; + +dashXmstdout) + # This case only exists to satisfy depend.m4. It is never actually + # run, as this mode is specially recognized in the preamble. + exit 1 + ;; + +makedepend) + "$@" || exit $? + # Remove any Libtool call + if test "$libtool" = yes; then + while test $1 != '--mode=compile'; do + shift + done + shift + fi + # X makedepend + shift + cleared=no + for arg in "$@"; do + case $cleared in + no) + set ""; shift + cleared=yes ;; + esac + case "$arg" in + -D*|-I*) + set fnord "$@" "$arg"; shift ;; + # Strip any option that makedepend may not understand. Remove + # the object too, otherwise makedepend will parse it as a source file. + -*|$object) + ;; + *) + set fnord "$@" "$arg"; shift ;; + esac + done + obj_suffix="`echo $object | sed 's/^.*\././'`" + touch "$tmpdepfile" + ${MAKEDEPEND-makedepend} -o"$obj_suffix" -f"$tmpdepfile" "$@" + rm -f "$depfile" + cat < "$tmpdepfile" > "$depfile" + sed '1,2d' "$tmpdepfile" | tr ' ' ' +' | \ +## Some versions of the HPUX 10.20 sed can't process this invocation +## correctly. Breaking it into two sed invocations is a workaround. + sed -e 's/^\\$//' -e '/^$/d' -e '/:$/d' | sed -e 's/$/ :/' >> "$depfile" + rm -f "$tmpdepfile" "$tmpdepfile".bak + ;; + +cpp) + # Important note: in order to support this mode, a compiler *must* + # always write the preprocessed file to stdout. + "$@" || exit $? + + # Remove the call to Libtool. + if test "$libtool" = yes; then + while test $1 != '--mode=compile'; do + shift + done + shift + fi + + # Remove `-o $object'. + IFS=" " + for arg + do + case $arg in + -o) + shift + ;; + $object) + shift + ;; + *) + set fnord "$@" "$arg" + shift # fnord + shift # $arg + ;; + esac + done + + "$@" -E | + sed -n -e '/^# [0-9][0-9]* "\([^"]*\)".*/ s:: \1 \\:p' \ + -e '/^#line [0-9][0-9]* "\([^"]*\)".*/ s:: \1 \\:p' | + sed '$ s: \\$::' > "$tmpdepfile" + rm -f "$depfile" + echo "$object : \\" > "$depfile" + cat < "$tmpdepfile" >> "$depfile" + sed < "$tmpdepfile" '/^$/d;s/^ //;s/ \\$//;s/$/ :/' >> "$depfile" + rm -f "$tmpdepfile" + ;; + +msvisualcpp) + # Important note: in order to support this mode, a compiler *must* + # always write the preprocessed file to stdout, regardless of -o, + # because we must use -o when running libtool. + "$@" || exit $? + IFS=" " + for arg + do + case "$arg" in + "-Gm"|"/Gm"|"-Gi"|"/Gi"|"-ZI"|"/ZI") + set fnord "$@" + shift + shift + ;; + *) + set fnord "$@" "$arg" + shift + shift + ;; + esac + done + "$@" -E | + sed -n '/^#line [0-9][0-9]* "\([^"]*\)"/ s::echo "`cygpath -u \\"\1\\"`":p' | sort | uniq > "$tmpdepfile" + rm -f "$depfile" + echo "$object : \\" > "$depfile" + . "$tmpdepfile" | sed 's% %\\ %g' | sed -n '/^\(.*\)$/ s:: \1 \\:p' >> "$depfile" + echo " " >> "$depfile" + . "$tmpdepfile" | sed 's% %\\ %g' | sed -n '/^\(.*\)$/ s::\1\::p' >> "$depfile" + rm -f "$tmpdepfile" + ;; + +none) + exec "$@" + ;; + +*) + echo "Unknown depmode $depmode" 1>&2 + exit 1 + ;; +esac + +exit 0 + +# Local Variables: +# mode: shell-script +# sh-indentation: 2 +# eval: (add-hook 'write-file-hooks 'time-stamp) +# time-stamp-start: "scriptversion=" +# time-stamp-format: "%:y-%02m-%02d.%02H" +# time-stamp-end: "$" +# End: diff -Nru powerpc-ibm-utils-1.2.20/config/install-sh powerpc-ibm-utils-1.2.22/config/install-sh --- powerpc-ibm-utils-1.2.20/config/install-sh 1970-01-01 00:00:00.000000000 +0000 +++ powerpc-ibm-utils-1.2.22/config/install-sh 2014-08-13 14:44:29.000000000 +0000 @@ -0,0 +1,519 @@ +#!/bin/sh +# install - install a program, script, or datafile + +scriptversion=2006-12-25.00 + +# This originates from X11R5 (mit/util/scripts/install.sh), which was +# later released in X11R6 (xc/config/util/install.sh) with the +# following copyright and license. +# +# Copyright (C) 1994 X Consortium +# +# Permission is hereby granted, free of charge, to any person obtaining a copy +# of this software and associated documentation files (the "Software"), to +# deal in the Software without restriction, including without limitation the +# rights to use, copy, modify, merge, publish, distribute, sublicense, and/or +# sell copies of the Software, and to permit persons to whom the Software is +# furnished to do so, subject to the following conditions: +# +# The above copyright notice and this permission notice shall be included in +# all copies or substantial portions of the Software. +# +# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR +# IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, +# FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE +# X CONSORTIUM BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN +# AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNEC- +# TION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. +# +# Except as contained in this notice, the name of the X Consortium shall not +# be used in advertising or otherwise to promote the sale, use or other deal- +# ings in this Software without prior written authorization from the X Consor- +# tium. +# +# +# FSF changes to this file are in the public domain. +# +# Calling this script install-sh is preferred over install.sh, to prevent +# `make' implicit rules from creating a file called install from it +# when there is no Makefile. +# +# This script is compatible with the BSD install script, but was written +# from scratch. + +nl=' +' +IFS=" "" $nl" + +# set DOITPROG to echo to test this script + +# Don't use :- since 4.3BSD and earlier shells don't like it. +doit=${DOITPROG-} +if test -z "$doit"; then + doit_exec=exec +else + doit_exec=$doit +fi + +# Put in absolute file names if you don't have them in your path; +# or use environment vars. + +chgrpprog=${CHGRPPROG-chgrp} +chmodprog=${CHMODPROG-chmod} +chownprog=${CHOWNPROG-chown} +cmpprog=${CMPPROG-cmp} +cpprog=${CPPROG-cp} +mkdirprog=${MKDIRPROG-mkdir} +mvprog=${MVPROG-mv} +rmprog=${RMPROG-rm} +stripprog=${STRIPPROG-strip} + +posix_glob='?' +initialize_posix_glob=' + test "$posix_glob" != "?" || { + if (set -f) 2>/dev/null; then + posix_glob= + else + posix_glob=: + fi + } +' + +posix_mkdir= + +# Desired mode of installed file. +mode=0755 + +chgrpcmd= +chmodcmd=$chmodprog +chowncmd= +mvcmd=$mvprog +rmcmd="$rmprog -f" +stripcmd= + +src= +dst= +dir_arg= +dst_arg= + +copy_on_change=false +no_target_directory= + +usage="\ +Usage: $0 [OPTION]... [-T] SRCFILE DSTFILE + or: $0 [OPTION]... SRCFILES... DIRECTORY + or: $0 [OPTION]... -t DIRECTORY SRCFILES... + or: $0 [OPTION]... -d DIRECTORIES... + +In the 1st form, copy SRCFILE to DSTFILE. +In the 2nd and 3rd, copy all SRCFILES to DIRECTORY. +In the 4th, create DIRECTORIES. + +Options: + --help display this help and exit. + --version display version info and exit. + + -c (ignored) + -C install only if different (preserve the last data modification time) + -d create directories instead of installing files. + -g GROUP $chgrpprog installed files to GROUP. + -m MODE $chmodprog installed files to MODE. + -o USER $chownprog installed files to USER. + -s $stripprog installed files. + -t DIRECTORY install into DIRECTORY. + -T report an error if DSTFILE is a directory. + +Environment variables override the default commands: + CHGRPPROG CHMODPROG CHOWNPROG CMPPROG CPPROG MKDIRPROG MVPROG + RMPROG STRIPPROG +" + +while test $# -ne 0; do + case $1 in + -c) ;; + + -C) copy_on_change=true;; + + -d) dir_arg=true;; + + -g) chgrpcmd="$chgrpprog $2" + shift;; + + --help) echo "$usage"; exit $?;; + + -m) mode=$2 + case $mode in + *' '* | *' '* | *' +'* | *'*'* | *'?'* | *'['*) + echo "$0: invalid mode: $mode" >&2 + exit 1;; + esac + shift;; + + -o) chowncmd="$chownprog $2" + shift;; + + -s) stripcmd=$stripprog;; + + -t) dst_arg=$2 + shift;; + + -T) no_target_directory=true;; + + --version) echo "$0 $scriptversion"; exit $?;; + + --) shift + break;; + + -*) echo "$0: invalid option: $1" >&2 + exit 1;; + + *) break;; + esac + shift +done + +if test $# -ne 0 && test -z "$dir_arg$dst_arg"; then + # When -d is used, all remaining arguments are directories to create. + # When -t is used, the destination is already specified. + # Otherwise, the last argument is the destination. Remove it from $@. + for arg + do + if test -n "$dst_arg"; then + # $@ is not empty: it contains at least $arg. + set fnord "$@" "$dst_arg" + shift # fnord + fi + shift # arg + dst_arg=$arg + done +fi + +if test $# -eq 0; then + if test -z "$dir_arg"; then + echo "$0: no input file specified." >&2 + exit 1 + fi + # It's OK to call `install-sh -d' without argument. + # This can happen when creating conditional directories. + exit 0 +fi + +if test -z "$dir_arg"; then + trap '(exit $?); exit' 1 2 13 15 + + # Set umask so as not to create temps with too-generous modes. + # However, 'strip' requires both read and write access to temps. + case $mode in + # Optimize common cases. + *644) cp_umask=133;; + *755) cp_umask=22;; + + *[0-7]) + if test -z "$stripcmd"; then + u_plus_rw= + else + u_plus_rw='% 200' + fi + cp_umask=`expr '(' 777 - $mode % 1000 ')' $u_plus_rw`;; + *) + if test -z "$stripcmd"; then + u_plus_rw= + else + u_plus_rw=,u+rw + fi + cp_umask=$mode$u_plus_rw;; + esac +fi + +for src +do + # Protect names starting with `-'. + case $src in + -*) src=./$src;; + esac + + if test -n "$dir_arg"; then + dst=$src + dstdir=$dst + test -d "$dstdir" + dstdir_status=$? + else + + # Waiting for this to be detected by the "$cpprog $src $dsttmp" command + # might cause directories to be created, which would be especially bad + # if $src (and thus $dsttmp) contains '*'. + if test ! -f "$src" && test ! -d "$src"; then + echo "$0: $src does not exist." >&2 + exit 1 + fi + + if test -z "$dst_arg"; then + echo "$0: no destination specified." >&2 + exit 1 + fi + + dst=$dst_arg + # Protect names starting with `-'. + case $dst in + -*) dst=./$dst;; + esac + + # If destination is a directory, append the input filename; won't work + # if double slashes aren't ignored. + if test -d "$dst"; then + if test -n "$no_target_directory"; then + echo "$0: $dst_arg: Is a directory" >&2 + exit 1 + fi + dstdir=$dst + dst=$dstdir/`basename "$src"` + dstdir_status=0 + else + # Prefer dirname, but fall back on a substitute if dirname fails. + dstdir=` + (dirname "$dst") 2>/dev/null || + expr X"$dst" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \ + X"$dst" : 'X\(//\)[^/]' \| \ + X"$dst" : 'X\(//\)$' \| \ + X"$dst" : 'X\(/\)' \| . 2>/dev/null || + echo X"$dst" | + sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{ + s//\1/ + q + } + /^X\(\/\/\)[^/].*/{ + s//\1/ + q + } + /^X\(\/\/\)$/{ + s//\1/ + q + } + /^X\(\/\).*/{ + s//\1/ + q + } + s/.*/./; q' + ` + + test -d "$dstdir" + dstdir_status=$? + fi + fi + + obsolete_mkdir_used=false + + if test $dstdir_status != 0; then + case $posix_mkdir in + '') + # Create intermediate dirs using mode 755 as modified by the umask. + # This is like FreeBSD 'install' as of 1997-10-28. + umask=`umask` + case $stripcmd.$umask in + # Optimize common cases. + *[2367][2367]) mkdir_umask=$umask;; + .*0[02][02] | .[02][02] | .[02]) mkdir_umask=22;; + + *[0-7]) + mkdir_umask=`expr $umask + 22 \ + - $umask % 100 % 40 + $umask % 20 \ + - $umask % 10 % 4 + $umask % 2 + `;; + *) mkdir_umask=$umask,go-w;; + esac + + # With -d, create the new directory with the user-specified mode. + # Otherwise, rely on $mkdir_umask. + if test -n "$dir_arg"; then + mkdir_mode=-m$mode + else + mkdir_mode= + fi + + posix_mkdir=false + case $umask in + *[123567][0-7][0-7]) + # POSIX mkdir -p sets u+wx bits regardless of umask, which + # is incompatible with FreeBSD 'install' when (umask & 300) != 0. + ;; + *) + tmpdir=${TMPDIR-/tmp}/ins$RANDOM-$$ + trap 'ret=$?; rmdir "$tmpdir/d" "$tmpdir" 2>/dev/null; exit $ret' 0 + + if (umask $mkdir_umask && + exec $mkdirprog $mkdir_mode -p -- "$tmpdir/d") >/dev/null 2>&1 + then + if test -z "$dir_arg" || { + # Check for POSIX incompatibilities with -m. + # HP-UX 11.23 and IRIX 6.5 mkdir -m -p sets group- or + # other-writeable bit of parent directory when it shouldn't. + # FreeBSD 6.1 mkdir -m -p sets mode of existing directory. + ls_ld_tmpdir=`ls -ld "$tmpdir"` + case $ls_ld_tmpdir in + d????-?r-*) different_mode=700;; + d????-?--*) different_mode=755;; + *) false;; + esac && + $mkdirprog -m$different_mode -p -- "$tmpdir" && { + ls_ld_tmpdir_1=`ls -ld "$tmpdir"` + test "$ls_ld_tmpdir" = "$ls_ld_tmpdir_1" + } + } + then posix_mkdir=: + fi + rmdir "$tmpdir/d" "$tmpdir" + else + # Remove any dirs left behind by ancient mkdir implementations. + rmdir ./$mkdir_mode ./-p ./-- 2>/dev/null + fi + trap '' 0;; + esac;; + esac + + if + $posix_mkdir && ( + umask $mkdir_umask && + $doit_exec $mkdirprog $mkdir_mode -p -- "$dstdir" + ) + then : + else + + # The umask is ridiculous, or mkdir does not conform to POSIX, + # or it failed possibly due to a race condition. Create the + # directory the slow way, step by step, checking for races as we go. + + case $dstdir in + /*) prefix='/';; + -*) prefix='./';; + *) prefix='';; + esac + + eval "$initialize_posix_glob" + + oIFS=$IFS + IFS=/ + $posix_glob set -f + set fnord $dstdir + shift + $posix_glob set +f + IFS=$oIFS + + prefixes= + + for d + do + test -z "$d" && continue + + prefix=$prefix$d + if test -d "$prefix"; then + prefixes= + else + if $posix_mkdir; then + (umask=$mkdir_umask && + $doit_exec $mkdirprog $mkdir_mode -p -- "$dstdir") && break + # Don't fail if two instances are running concurrently. + test -d "$prefix" || exit 1 + else + case $prefix in + *\'*) qprefix=`echo "$prefix" | sed "s/'/'\\\\\\\\''/g"`;; + *) qprefix=$prefix;; + esac + prefixes="$prefixes '$qprefix'" + fi + fi + prefix=$prefix/ + done + + if test -n "$prefixes"; then + # Don't fail if two instances are running concurrently. + (umask $mkdir_umask && + eval "\$doit_exec \$mkdirprog $prefixes") || + test -d "$dstdir" || exit 1 + obsolete_mkdir_used=true + fi + fi + fi + + if test -n "$dir_arg"; then + { test -z "$chowncmd" || $doit $chowncmd "$dst"; } && + { test -z "$chgrpcmd" || $doit $chgrpcmd "$dst"; } && + { test "$obsolete_mkdir_used$chowncmd$chgrpcmd" = false || + test -z "$chmodcmd" || $doit $chmodcmd $mode "$dst"; } || exit 1 + else + + # Make a couple of temp file names in the proper directory. + dsttmp=$dstdir/_inst.$$_ + rmtmp=$dstdir/_rm.$$_ + + # Trap to clean up those temp files at exit. + trap 'ret=$?; rm -f "$dsttmp" "$rmtmp" && exit $ret' 0 + + # Copy the file name to the temp name. + (umask $cp_umask && $doit_exec $cpprog "$src" "$dsttmp") && + + # and set any options; do chmod last to preserve setuid bits. + # + # If any of these fail, we abort the whole thing. If we want to + # ignore errors from any of these, just make sure not to ignore + # errors from the above "$doit $cpprog $src $dsttmp" command. + # + { test -z "$chowncmd" || $doit $chowncmd "$dsttmp"; } && + { test -z "$chgrpcmd" || $doit $chgrpcmd "$dsttmp"; } && + { test -z "$stripcmd" || $doit $stripcmd "$dsttmp"; } && + { test -z "$chmodcmd" || $doit $chmodcmd $mode "$dsttmp"; } && + + # If -C, don't bother to copy if it wouldn't change the file. + if $copy_on_change && + old=`LC_ALL=C ls -dlL "$dst" 2>/dev/null` && + new=`LC_ALL=C ls -dlL "$dsttmp" 2>/dev/null` && + + eval "$initialize_posix_glob" && + $posix_glob set -f && + set X $old && old=:$2:$4:$5:$6 && + set X $new && new=:$2:$4:$5:$6 && + $posix_glob set +f && + + test "$old" = "$new" && + $cmpprog "$dst" "$dsttmp" >/dev/null 2>&1 + then + rm -f "$dsttmp" + else + # Rename the file to the real destination. + $doit $mvcmd -f "$dsttmp" "$dst" 2>/dev/null || + + # The rename failed, perhaps because mv can't rename something else + # to itself, or perhaps because mv is so ancient that it does not + # support -f. + { + # Now remove or move aside any old file at destination location. + # We try this two ways since rm can't unlink itself on some + # systems and the destination file might be busy for other + # reasons. In this case, the final cleanup might fail but the new + # file should still install successfully. + { + test ! -f "$dst" || + $doit $rmcmd -f "$dst" 2>/dev/null || + { $doit $mvcmd -f "$dst" "$rmtmp" 2>/dev/null && + { $doit $rmcmd -f "$rmtmp" 2>/dev/null; :; } + } || + { echo "$0: cannot unlink or rename $dst" >&2 + (exit 1); exit 1 + } + } && + + # Now rename the file to the real destination. + $doit $mvcmd "$dsttmp" "$dst" + } + fi || exit 1 + + trap '' 0 + fi +done + +# Local variables: +# eval: (add-hook 'write-file-hooks 'time-stamp) +# time-stamp-start: "scriptversion=" +# time-stamp-format: "%:y-%02m-%02d.%02H" +# time-stamp-end: "$" +# End: diff -Nru powerpc-ibm-utils-1.2.20/config/missing powerpc-ibm-utils-1.2.22/config/missing --- powerpc-ibm-utils-1.2.20/config/missing 1970-01-01 00:00:00.000000000 +0000 +++ powerpc-ibm-utils-1.2.22/config/missing 2014-08-13 14:44:29.000000000 +0000 @@ -0,0 +1,367 @@ +#! /bin/sh +# Common stub for a few missing GNU programs while installing. + +scriptversion=2006-05-10.23 + +# Copyright (C) 1996, 1997, 1999, 2000, 2002, 2003, 2004, 2005, 2006 +# Free Software Foundation, Inc. +# Originally by Fran,cois Pinard , 1996. + +# This program is free software; you can redistribute it and/or modify +# it under the terms of the GNU General Public License as published by +# the Free Software Foundation; either version 2, or (at your option) +# any later version. + +# This program is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# GNU General Public License for more details. + +# You should have received a copy of the GNU General Public License +# along with this program; if not, write to the Free Software +# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA +# 02110-1301, USA. + +# As a special exception to the GNU General Public License, if you +# distribute this file as part of a program that contains a +# configuration script generated by Autoconf, you may include it under +# the same distribution terms that you use for the rest of that program. + +if test $# -eq 0; then + echo 1>&2 "Try \`$0 --help' for more information" + exit 1 +fi + +run=: +sed_output='s/.* --output[ =]\([^ ]*\).*/\1/p' +sed_minuso='s/.* -o \([^ ]*\).*/\1/p' + +# In the cases where this matters, `missing' is being run in the +# srcdir already. +if test -f configure.ac; then + configure_ac=configure.ac +else + configure_ac=configure.in +fi + +msg="missing on your system" + +case $1 in +--run) + # Try to run requested program, and just exit if it succeeds. + run= + shift + "$@" && exit 0 + # Exit code 63 means version mismatch. This often happens + # when the user try to use an ancient version of a tool on + # a file that requires a minimum version. In this case we + # we should proceed has if the program had been absent, or + # if --run hadn't been passed. + if test $? = 63; then + run=: + msg="probably too old" + fi + ;; + + -h|--h|--he|--hel|--help) + echo "\ +$0 [OPTION]... PROGRAM [ARGUMENT]... + +Handle \`PROGRAM [ARGUMENT]...' for when PROGRAM is missing, or return an +error status if there is no known handling for PROGRAM. + +Options: + -h, --help display this help and exit + -v, --version output version information and exit + --run try to run the given command, and emulate it if it fails + +Supported PROGRAM values: + aclocal touch file \`aclocal.m4' + autoconf touch file \`configure' + autoheader touch file \`config.h.in' + autom4te touch the output file, or create a stub one + automake touch all \`Makefile.in' files + bison create \`y.tab.[ch]', if possible, from existing .[ch] + flex create \`lex.yy.c', if possible, from existing .c + help2man touch the output file + lex create \`lex.yy.c', if possible, from existing .c + makeinfo touch the output file + tar try tar, gnutar, gtar, then tar without non-portable flags + yacc create \`y.tab.[ch]', if possible, from existing .[ch] + +Send bug reports to ." + exit $? + ;; + + -v|--v|--ve|--ver|--vers|--versi|--versio|--version) + echo "missing $scriptversion (GNU Automake)" + exit $? + ;; + + -*) + echo 1>&2 "$0: Unknown \`$1' option" + echo 1>&2 "Try \`$0 --help' for more information" + exit 1 + ;; + +esac + +# Now exit if we have it, but it failed. Also exit now if we +# don't have it and --version was passed (most likely to detect +# the program). +case $1 in + lex|yacc) + # Not GNU programs, they don't have --version. + ;; + + tar) + if test -n "$run"; then + echo 1>&2 "ERROR: \`tar' requires --run" + exit 1 + elif test "x$2" = "x--version" || test "x$2" = "x--help"; then + exit 1 + fi + ;; + + *) + if test -z "$run" && ($1 --version) > /dev/null 2>&1; then + # We have it, but it failed. + exit 1 + elif test "x$2" = "x--version" || test "x$2" = "x--help"; then + # Could not run --version or --help. This is probably someone + # running `$TOOL --version' or `$TOOL --help' to check whether + # $TOOL exists and not knowing $TOOL uses missing. + exit 1 + fi + ;; +esac + +# If it does not exist, or fails to run (possibly an outdated version), +# try to emulate it. +case $1 in + aclocal*) + echo 1>&2 "\ +WARNING: \`$1' is $msg. You should only need it if + you modified \`acinclude.m4' or \`${configure_ac}'. You might want + to install the \`Automake' and \`Perl' packages. Grab them from + any GNU archive site." + touch aclocal.m4 + ;; + + autoconf) + echo 1>&2 "\ +WARNING: \`$1' is $msg. You should only need it if + you modified \`${configure_ac}'. You might want to install the + \`Autoconf' and \`GNU m4' packages. Grab them from any GNU + archive site." + touch configure + ;; + + autoheader) + echo 1>&2 "\ +WARNING: \`$1' is $msg. You should only need it if + you modified \`acconfig.h' or \`${configure_ac}'. You might want + to install the \`Autoconf' and \`GNU m4' packages. Grab them + from any GNU archive site." + files=`sed -n 's/^[ ]*A[CM]_CONFIG_HEADER(\([^)]*\)).*/\1/p' ${configure_ac}` + test -z "$files" && files="config.h" + touch_files= + for f in $files; do + case $f in + *:*) touch_files="$touch_files "`echo "$f" | + sed -e 's/^[^:]*://' -e 's/:.*//'`;; + *) touch_files="$touch_files $f.in";; + esac + done + touch $touch_files + ;; + + automake*) + echo 1>&2 "\ +WARNING: \`$1' is $msg. You should only need it if + you modified \`Makefile.am', \`acinclude.m4' or \`${configure_ac}'. + You might want to install the \`Automake' and \`Perl' packages. + Grab them from any GNU archive site." + find . -type f -name Makefile.am -print | + sed 's/\.am$/.in/' | + while read f; do touch "$f"; done + ;; + + autom4te) + echo 1>&2 "\ +WARNING: \`$1' is needed, but is $msg. + You might have modified some files without having the + proper tools for further handling them. + You can get \`$1' as part of \`Autoconf' from any GNU + archive site." + + file=`echo "$*" | sed -n "$sed_output"` + test -z "$file" && file=`echo "$*" | sed -n "$sed_minuso"` + if test -f "$file"; then + touch $file + else + test -z "$file" || exec >$file + echo "#! /bin/sh" + echo "# Created by GNU Automake missing as a replacement of" + echo "# $ $@" + echo "exit 0" + chmod +x $file + exit 1 + fi + ;; + + bison|yacc) + echo 1>&2 "\ +WARNING: \`$1' $msg. You should only need it if + you modified a \`.y' file. You may need the \`Bison' package + in order for those modifications to take effect. You can get + \`Bison' from any GNU archive site." + rm -f y.tab.c y.tab.h + if test $# -ne 1; then + eval LASTARG="\${$#}" + case $LASTARG in + *.y) + SRCFILE=`echo "$LASTARG" | sed 's/y$/c/'` + if test -f "$SRCFILE"; then + cp "$SRCFILE" y.tab.c + fi + SRCFILE=`echo "$LASTARG" | sed 's/y$/h/'` + if test -f "$SRCFILE"; then + cp "$SRCFILE" y.tab.h + fi + ;; + esac + fi + if test ! -f y.tab.h; then + echo >y.tab.h + fi + if test ! -f y.tab.c; then + echo 'main() { return 0; }' >y.tab.c + fi + ;; + + lex|flex) + echo 1>&2 "\ +WARNING: \`$1' is $msg. You should only need it if + you modified a \`.l' file. You may need the \`Flex' package + in order for those modifications to take effect. You can get + \`Flex' from any GNU archive site." + rm -f lex.yy.c + if test $# -ne 1; then + eval LASTARG="\${$#}" + case $LASTARG in + *.l) + SRCFILE=`echo "$LASTARG" | sed 's/l$/c/'` + if test -f "$SRCFILE"; then + cp "$SRCFILE" lex.yy.c + fi + ;; + esac + fi + if test ! -f lex.yy.c; then + echo 'main() { return 0; }' >lex.yy.c + fi + ;; + + help2man) + echo 1>&2 "\ +WARNING: \`$1' is $msg. You should only need it if + you modified a dependency of a manual page. You may need the + \`Help2man' package in order for those modifications to take + effect. You can get \`Help2man' from any GNU archive site." + + file=`echo "$*" | sed -n "$sed_output"` + test -z "$file" && file=`echo "$*" | sed -n "$sed_minuso"` + if test -f "$file"; then + touch $file + else + test -z "$file" || exec >$file + echo ".ab help2man is required to generate this page" + exit 1 + fi + ;; + + makeinfo) + echo 1>&2 "\ +WARNING: \`$1' is $msg. You should only need it if + you modified a \`.texi' or \`.texinfo' file, or any other file + indirectly affecting the aspect of the manual. The spurious + call might also be the consequence of using a buggy \`make' (AIX, + DU, IRIX). You might want to install the \`Texinfo' package or + the \`GNU make' package. Grab either from any GNU archive site." + # The file to touch is that specified with -o ... + file=`echo "$*" | sed -n "$sed_output"` + test -z "$file" && file=`echo "$*" | sed -n "$sed_minuso"` + if test -z "$file"; then + # ... or it is the one specified with @setfilename ... + infile=`echo "$*" | sed 's/.* \([^ ]*\) *$/\1/'` + file=`sed -n ' + /^@setfilename/{ + s/.* \([^ ]*\) *$/\1/ + p + q + }' $infile` + # ... or it is derived from the source name (dir/f.texi becomes f.info) + test -z "$file" && file=`echo "$infile" | sed 's,.*/,,;s,.[^.]*$,,'`.info + fi + # If the file does not exist, the user really needs makeinfo; + # let's fail without touching anything. + test -f $file || exit 1 + touch $file + ;; + + tar) + shift + + # We have already tried tar in the generic part. + # Look for gnutar/gtar before invocation to avoid ugly error + # messages. + if (gnutar --version > /dev/null 2>&1); then + gnutar "$@" && exit 0 + fi + if (gtar --version > /dev/null 2>&1); then + gtar "$@" && exit 0 + fi + firstarg="$1" + if shift; then + case $firstarg in + *o*) + firstarg=`echo "$firstarg" | sed s/o//` + tar "$firstarg" "$@" && exit 0 + ;; + esac + case $firstarg in + *h*) + firstarg=`echo "$firstarg" | sed s/h//` + tar "$firstarg" "$@" && exit 0 + ;; + esac + fi + + echo 1>&2 "\ +WARNING: I can't seem to be able to run \`tar' with the given arguments. + You may want to install GNU tar or Free paxutils, or check the + command line arguments." + exit 1 + ;; + + *) + echo 1>&2 "\ +WARNING: \`$1' is needed, and is $msg. + You might have modified some files without having the + proper tools for further handling them. Check the \`README' file, + it often tells you about the needed prerequisites for installing + this package. You may also peek at any GNU archive site, in case + some other package would contain this missing \`$1' program." + exit 1 + ;; +esac + +exit 0 + +# Local variables: +# eval: (add-hook 'write-file-hooks 'time-stamp) +# time-stamp-start: "scriptversion=" +# time-stamp-format: "%:y-%02m-%02d.%02H" +# time-stamp-end: "$" +# End: diff -Nru powerpc-ibm-utils-1.2.20/configure powerpc-ibm-utils-1.2.22/configure --- powerpc-ibm-utils-1.2.20/configure 2014-03-21 20:24:03.000000000 +0000 +++ powerpc-ibm-utils-1.2.22/configure 2014-08-13 14:44:28.000000000 +0000 @@ -1,6 +1,6 @@ #! /bin/sh # Guess values for system-dependent variables and create Makefiles. -# Generated by GNU Autoconf 2.63 for powerpc-utils 1.2.20. +# Generated by GNU Autoconf 2.63 for powerpc-utils 1.2.22. # # Report bugs to . # @@ -596,8 +596,8 @@ # Identity of this package. PACKAGE_NAME='powerpc-utils' PACKAGE_TARNAME='powerpc-utils' -PACKAGE_VERSION='1.2.20' -PACKAGE_STRING='powerpc-utils 1.2.20' +PACKAGE_VERSION='1.2.22' +PACKAGE_STRING='powerpc-utils 1.2.22' PACKAGE_BUGREPORT='nfont@linux.vnet.ibm.com' ac_unique_file="src/rtas_ibm_get_vpd.c" @@ -1289,7 +1289,7 @@ # Omit some internal or obsolete options to make the list less imposing. # This message is too long to be a string in the A/UX 3.1 sh. cat <<_ACEOF -\`configure' configures powerpc-utils 1.2.20 to adapt to many kinds of systems. +\`configure' configures powerpc-utils 1.2.22 to adapt to many kinds of systems. Usage: $0 [OPTION]... [VAR=VALUE]... @@ -1355,7 +1355,7 @@ if test -n "$ac_init_help"; then case $ac_init_help in - short | recursive ) echo "Configuration of powerpc-utils 1.2.20:";; + short | recursive ) echo "Configuration of powerpc-utils 1.2.22:";; esac cat <<\_ACEOF @@ -1447,7 +1447,7 @@ test -n "$ac_init_help" && exit $ac_status if $ac_init_version; then cat <<\_ACEOF -powerpc-utils configure 1.2.20 +powerpc-utils configure 1.2.22 generated by GNU Autoconf 2.63 Copyright (C) 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001, @@ -1461,7 +1461,7 @@ This file contains any messages produced by compilers while running configure, to aid debugging if configure makes a mistake. -It was created by powerpc-utils $as_me 1.2.20, which was +It was created by powerpc-utils $as_me 1.2.22, which was generated by GNU Autoconf 2.63. Invocation command line was $ $0 $@ @@ -1833,7 +1833,7 @@ ac_aux_dir= -for ac_dir in build-aux "$srcdir"/build-aux; do +for ac_dir in config "$srcdir"/config; do if test -f "$ac_dir/install-sh"; then ac_aux_dir=$ac_dir ac_install_sh="$ac_aux_dir/install-sh -c" @@ -1849,8 +1849,8 @@ fi done if test -z "$ac_aux_dir"; then - { { $as_echo "$as_me:$LINENO: error: cannot find install-sh or install.sh in build-aux \"$srcdir\"/build-aux" >&5 -$as_echo "$as_me: error: cannot find install-sh or install.sh in build-aux \"$srcdir\"/build-aux" >&2;} + { { $as_echo "$as_me:$LINENO: error: cannot find install-sh or install.sh in config \"$srcdir\"/config" >&5 +$as_echo "$as_me: error: cannot find install-sh or install.sh in config \"$srcdir\"/config" >&2;} { (exit 1); exit 1; }; } fi @@ -1863,6 +1863,8 @@ ac_configure="$SHELL $ac_aux_dir/configure" # Please don't use this var. + + am__api_version='1.10' # Find a good install program. We prefer a C program (faster), @@ -2180,7 +2182,7 @@ # Define the identity of the package. PACKAGE='powerpc-utils' - VERSION='1.2.20' + VERSION='1.2.22' cat >>confdefs.h <<_ACEOF @@ -3522,6 +3524,137 @@ test -z "$INSTALL_DATA" && INSTALL_DATA='${INSTALL} -m 644' +if test "x$CC" != xcc; then + { $as_echo "$as_me:$LINENO: checking whether $CC and cc understand -c and -o together" >&5 +$as_echo_n "checking whether $CC and cc understand -c and -o together... " >&6; } +else + { $as_echo "$as_me:$LINENO: checking whether cc understands -c and -o together" >&5 +$as_echo_n "checking whether cc understands -c and -o together... " >&6; } +fi +set dummy $CC; ac_cc=`$as_echo "$2" | + sed 's/[^a-zA-Z0-9_]/_/g;s/^[0-9]/_/'` +if { as_var=ac_cv_prog_cc_${ac_cc}_c_o; eval "test \"\${$as_var+set}\" = set"; }; then + $as_echo_n "(cached) " >&6 +else + cat >conftest.$ac_ext <<_ACEOF +/* confdefs.h. */ +_ACEOF +cat confdefs.h >>conftest.$ac_ext +cat >>conftest.$ac_ext <<_ACEOF +/* end confdefs.h. */ + +int +main () +{ + + ; + return 0; +} +_ACEOF +# Make sure it works both with $CC and with simple cc. +# We do the test twice because some compilers refuse to overwrite an +# existing .o file with -o, though they will create one. +ac_try='$CC -c conftest.$ac_ext -o conftest2.$ac_objext >&5' +rm -f conftest2.* +if { (case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" +$as_echo "$ac_try_echo") >&5 + (eval "$ac_try") 2>&5 + ac_status=$? + $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); } && + test -f conftest2.$ac_objext && { (case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" +$as_echo "$ac_try_echo") >&5 + (eval "$ac_try") 2>&5 + ac_status=$? + $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); }; +then + eval ac_cv_prog_cc_${ac_cc}_c_o=yes + if test "x$CC" != xcc; then + # Test first that cc exists at all. + if { ac_try='cc -c conftest.$ac_ext >&5' + { (case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" +$as_echo "$ac_try_echo") >&5 + (eval "$ac_try") 2>&5 + ac_status=$? + $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); }; }; then + ac_try='cc -c conftest.$ac_ext -o conftest2.$ac_objext >&5' + rm -f conftest2.* + if { (case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" +$as_echo "$ac_try_echo") >&5 + (eval "$ac_try") 2>&5 + ac_status=$? + $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); } && + test -f conftest2.$ac_objext && { (case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" +$as_echo "$ac_try_echo") >&5 + (eval "$ac_try") 2>&5 + ac_status=$? + $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); }; + then + # cc works too. + : + else + # cc exists but doesn't like -o. + eval ac_cv_prog_cc_${ac_cc}_c_o=no + fi + fi + fi +else + eval ac_cv_prog_cc_${ac_cc}_c_o=no +fi +rm -f core conftest* + +fi +if eval test \$ac_cv_prog_cc_${ac_cc}_c_o = yes; then + { $as_echo "$as_me:$LINENO: result: yes" >&5 +$as_echo "yes" >&6; } +else + { $as_echo "$as_me:$LINENO: result: no" >&5 +$as_echo "no" >&6; } + +cat >>confdefs.h <<\_ACEOF +#define NO_MINUS_C_MINUS_O 1 +_ACEOF + +fi + +# FIXME: we rely on the cache variable name because +# there is no other way. +set dummy $CC +ac_cc=`echo $2 | sed 's/[^a-zA-Z0-9_]/_/g;s/^[0-9]/_/'` +if eval "test \"`echo '$ac_cv_prog_cc_'${ac_cc}_c_o`\" != yes"; then + # Losing compiler, so override with the script. + # FIXME: It is wrong to rewrite CC. + # But if we don't then we get into trouble of one sort or another. + # A longer-term fix would be to have automake use am__CC in this case, + # and then we could set am__CC="\$(top_srcdir)/compile \$(CC)" + CC="$am_aux_dir/compile $CC" +fi + + # Checks for header files. @@ -4161,7 +4294,8 @@ -for ac_header in fcntl.h inttypes.h limits.h locale.h memory.h netinet/in.h nl_types.h stdint.h stdlib.h string.h sys/ioctl.h syslog.h unistd.h linux/perf_event.h + +for ac_header in fcntl.h inttypes.h limits.h locale.h memory.h netinet/in.h nl_types.h stdint.h stdlib.h string.h sys/ioctl.h syslog.h unistd.h linux/perf_event.h sys/time.h do as_ac_Header=`$as_echo "ac_cv_header_$ac_header" | $as_tr_sh` if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then @@ -6571,7 +6705,8 @@ -for ac_func in memset strchr strcspn strdup strerror strrchr strstr strtol strtoul strtoull + +for ac_func in memset strchr strcspn strdup strerror strrchr strstr strtol strtoul strtoull gettimeofday do as_ac_var=`$as_echo "ac_cv_func_$ac_func" | $as_tr_sh` { $as_echo "$as_me:$LINENO: checking for $ac_func" >&5 @@ -6843,10 +6978,693 @@ fi -echo "Configuring powerpc-utils.spec" -sed "s|\@VERSION\@|1.2.20|g" powerpc-utils.spec.in > powerpc-utils.spec -ac_config_files="$ac_config_files Makefile src/Makefile src/drmgr/Makefile scripts/Makefile man/Makefile" +{ $as_echo "$as_me:$LINENO: checking whether the linker accepts " >&5 +$as_echo_n "checking whether the linker accepts ... " >&6; } +if test "${ax_cv_check_ldflags__+set}" = set; then + $as_echo_n "(cached) " >&6 +else + + ax_check_save_flags=$LDFLAGS + LDFLAGS="$LDFLAGS " + cat >conftest.$ac_ext <<_ACEOF +/* confdefs.h. */ +_ACEOF +cat confdefs.h >>conftest.$ac_ext +cat >>conftest.$ac_ext <<_ACEOF +/* end confdefs.h. */ + +int +main () +{ + + ; + return 0; +} +_ACEOF +rm -f conftest.$ac_objext conftest$ac_exeext +if { (ac_try="$ac_link" +case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" +$as_echo "$ac_try_echo") >&5 + (eval "$ac_link") 2>conftest.er1 + ac_status=$? + grep -v '^ *+' conftest.er1 >conftest.err + rm -f conftest.er1 + cat conftest.err >&5 + $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); } && { + test -z "$ac_c_werror_flag" || + test ! -s conftest.err + } && test -s conftest$ac_exeext && { + test "$cross_compiling" = yes || + $as_test_x conftest$ac_exeext + }; then + ax_cv_check_ldflags__=yes +else + $as_echo "$as_me: failed program was:" >&5 +sed 's/^/| /' conftest.$ac_ext >&5 + + ax_cv_check_ldflags__=no +fi + +rm -rf conftest.dSYM +rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ + conftest$ac_exeext conftest.$ac_ext + LDFLAGS=$ax_check_save_flags +fi +{ $as_echo "$as_me:$LINENO: result: $ax_cv_check_ldflags__" >&5 +$as_echo "$ax_cv_check_ldflags__" >&6; } +if test x"$ax_cv_check_ldflags__" = xyes; then + : +else + : +fi + + + + + + +for flag in ; do + as_CACHEVAR=`$as_echo "ax_cv_check_cflags__$flag" | $as_tr_sh` +{ $as_echo "$as_me:$LINENO: checking whether C compiler accepts $flag" >&5 +$as_echo_n "checking whether C compiler accepts $flag... " >&6; } +if { as_var=$as_CACHEVAR; eval "test \"\${$as_var+set}\" = set"; }; then + $as_echo_n "(cached) " >&6 +else + + ax_check_save_flags=$CFLAGS + CFLAGS="$CFLAGS $flag" + cat >conftest.$ac_ext <<_ACEOF +/* confdefs.h. */ +_ACEOF +cat confdefs.h >>conftest.$ac_ext +cat >>conftest.$ac_ext <<_ACEOF +/* end confdefs.h. */ + +int +main () +{ + + ; + return 0; +} +_ACEOF +rm -f conftest.$ac_objext +if { (ac_try="$ac_compile" +case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" +$as_echo "$ac_try_echo") >&5 + (eval "$ac_compile") 2>conftest.er1 + ac_status=$? + grep -v '^ *+' conftest.er1 >conftest.err + rm -f conftest.er1 + cat conftest.err >&5 + $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); } && { + test -z "$ac_c_werror_flag" || + test ! -s conftest.err + } && test -s conftest.$ac_objext; then + eval "$as_CACHEVAR=yes" +else + $as_echo "$as_me: failed program was:" >&5 +sed 's/^/| /' conftest.$ac_ext >&5 + + eval "$as_CACHEVAR=no" +fi + +rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext + CFLAGS=$ax_check_save_flags +fi +ac_res=`eval 'as_val=${'$as_CACHEVAR'} + $as_echo "$as_val"'` + { $as_echo "$as_me:$LINENO: result: $ac_res" >&5 +$as_echo "$ac_res" >&6; } +if test x"`eval 'as_val=${'$as_CACHEVAR'} + $as_echo "$as_val"'`" = xyes; then + if test "${CFLAGS+set}" = set; then + case " $CFLAGS " in + *" $flag "*) + { ($as_echo "$as_me:$LINENO: : CFLAGS already contains \$flag") >&5 + (: CFLAGS already contains $flag) 2>&5 + ac_status=$? + $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); } + ;; + *) + { ($as_echo "$as_me:$LINENO: : CFLAGS=\"\$CFLAGS \$flag\"") >&5 + (: CFLAGS="$CFLAGS $flag") 2>&5 + ac_status=$? + $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); } + CFLAGS="$CFLAGS $flag" + ;; + esac +else + CFLAGS="$flag" +fi + + +else + : +fi + + +done + + + + + ac_ext=c +ac_cpp='$CPP $CPPFLAGS' +ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5' +ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5' +ac_compiler_gnu=$ac_cv_c_compiler_gnu + + + + + +for flag in -Wall; do + as_CACHEVAR=`$as_echo "ax_cv_check_cflags__$flag" | $as_tr_sh` +{ $as_echo "$as_me:$LINENO: checking whether C compiler accepts $flag" >&5 +$as_echo_n "checking whether C compiler accepts $flag... " >&6; } +if { as_var=$as_CACHEVAR; eval "test \"\${$as_var+set}\" = set"; }; then + $as_echo_n "(cached) " >&6 +else + + ax_check_save_flags=$CFLAGS + CFLAGS="$CFLAGS $flag" + cat >conftest.$ac_ext <<_ACEOF +/* confdefs.h. */ +_ACEOF +cat confdefs.h >>conftest.$ac_ext +cat >>conftest.$ac_ext <<_ACEOF +/* end confdefs.h. */ + +int +main () +{ + + ; + return 0; +} +_ACEOF +rm -f conftest.$ac_objext +if { (ac_try="$ac_compile" +case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" +$as_echo "$ac_try_echo") >&5 + (eval "$ac_compile") 2>conftest.er1 + ac_status=$? + grep -v '^ *+' conftest.er1 >conftest.err + rm -f conftest.er1 + cat conftest.err >&5 + $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); } && { + test -z "$ac_c_werror_flag" || + test ! -s conftest.err + } && test -s conftest.$ac_objext; then + eval "$as_CACHEVAR=yes" +else + $as_echo "$as_me: failed program was:" >&5 +sed 's/^/| /' conftest.$ac_ext >&5 + + eval "$as_CACHEVAR=no" +fi + +rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext + CFLAGS=$ax_check_save_flags +fi +ac_res=`eval 'as_val=${'$as_CACHEVAR'} + $as_echo "$as_val"'` + { $as_echo "$as_me:$LINENO: result: $ac_res" >&5 +$as_echo "$ac_res" >&6; } +if test x"`eval 'as_val=${'$as_CACHEVAR'} + $as_echo "$as_val"'`" = xyes; then + if test "${CFLAGS+set}" = set; then + case " $CFLAGS " in + *" $flag "*) + { ($as_echo "$as_me:$LINENO: : CFLAGS already contains \$flag") >&5 + (: CFLAGS already contains $flag) 2>&5 + ac_status=$? + $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); } + ;; + *) + { ($as_echo "$as_me:$LINENO: : CFLAGS=\"\$CFLAGS \$flag\"") >&5 + (: CFLAGS="$CFLAGS $flag") 2>&5 + ac_status=$? + $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); } + CFLAGS="$CFLAGS $flag" + ;; + esac +else + CFLAGS="$flag" +fi + + +else + : +fi + + +done + + + + + +for flag in -D_FORTIFY_SOURCE=2 -fstack-protector-all; do + as_CACHEVAR=`$as_echo "ax_cv_check_cflags__$flag" | $as_tr_sh` +{ $as_echo "$as_me:$LINENO: checking whether C compiler accepts $flag" >&5 +$as_echo_n "checking whether C compiler accepts $flag... " >&6; } +if { as_var=$as_CACHEVAR; eval "test \"\${$as_var+set}\" = set"; }; then + $as_echo_n "(cached) " >&6 +else + + ax_check_save_flags=$CFLAGS + CFLAGS="$CFLAGS $flag" + cat >conftest.$ac_ext <<_ACEOF +/* confdefs.h. */ +_ACEOF +cat confdefs.h >>conftest.$ac_ext +cat >>conftest.$ac_ext <<_ACEOF +/* end confdefs.h. */ + +int +main () +{ + + ; + return 0; +} +_ACEOF +rm -f conftest.$ac_objext +if { (ac_try="$ac_compile" +case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" +$as_echo "$ac_try_echo") >&5 + (eval "$ac_compile") 2>conftest.er1 + ac_status=$? + grep -v '^ *+' conftest.er1 >conftest.err + rm -f conftest.er1 + cat conftest.err >&5 + $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); } && { + test -z "$ac_c_werror_flag" || + test ! -s conftest.err + } && test -s conftest.$ac_objext; then + eval "$as_CACHEVAR=yes" +else + $as_echo "$as_me: failed program was:" >&5 +sed 's/^/| /' conftest.$ac_ext >&5 + + eval "$as_CACHEVAR=no" +fi + +rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext + CFLAGS=$ax_check_save_flags +fi +ac_res=`eval 'as_val=${'$as_CACHEVAR'} + $as_echo "$as_val"'` + { $as_echo "$as_me:$LINENO: result: $ac_res" >&5 +$as_echo "$ac_res" >&6; } +if test x"`eval 'as_val=${'$as_CACHEVAR'} + $as_echo "$as_val"'`" = xyes; then + if test "${CFLAGS+set}" = set; then + case " $CFLAGS " in + *" $flag "*) + { ($as_echo "$as_me:$LINENO: : CFLAGS already contains \$flag") >&5 + (: CFLAGS already contains $flag) 2>&5 + ac_status=$? + $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); } + ;; + *) + { ($as_echo "$as_me:$LINENO: : CFLAGS=\"\$CFLAGS \$flag\"") >&5 + (: CFLAGS="$CFLAGS $flag") 2>&5 + ac_status=$? + $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); } + CFLAGS="$CFLAGS $flag" + ;; + esac +else + CFLAGS="$flag" +fi + + +else + : +fi + + +done + + + + + +for flag in -fwrapv -fPIE -Wstack-protector; do + as_CACHEVAR=`$as_echo "ax_cv_check_cflags__$flag" | $as_tr_sh` +{ $as_echo "$as_me:$LINENO: checking whether C compiler accepts $flag" >&5 +$as_echo_n "checking whether C compiler accepts $flag... " >&6; } +if { as_var=$as_CACHEVAR; eval "test \"\${$as_var+set}\" = set"; }; then + $as_echo_n "(cached) " >&6 +else + + ax_check_save_flags=$CFLAGS + CFLAGS="$CFLAGS $flag" + cat >conftest.$ac_ext <<_ACEOF +/* confdefs.h. */ +_ACEOF +cat confdefs.h >>conftest.$ac_ext +cat >>conftest.$ac_ext <<_ACEOF +/* end confdefs.h. */ + +int +main () +{ + + ; + return 0; +} +_ACEOF +rm -f conftest.$ac_objext +if { (ac_try="$ac_compile" +case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" +$as_echo "$ac_try_echo") >&5 + (eval "$ac_compile") 2>conftest.er1 + ac_status=$? + grep -v '^ *+' conftest.er1 >conftest.err + rm -f conftest.er1 + cat conftest.err >&5 + $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); } && { + test -z "$ac_c_werror_flag" || + test ! -s conftest.err + } && test -s conftest.$ac_objext; then + eval "$as_CACHEVAR=yes" +else + $as_echo "$as_me: failed program was:" >&5 +sed 's/^/| /' conftest.$ac_ext >&5 + + eval "$as_CACHEVAR=no" +fi + +rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext + CFLAGS=$ax_check_save_flags +fi +ac_res=`eval 'as_val=${'$as_CACHEVAR'} + $as_echo "$as_val"'` + { $as_echo "$as_me:$LINENO: result: $ac_res" >&5 +$as_echo "$ac_res" >&6; } +if test x"`eval 'as_val=${'$as_CACHEVAR'} + $as_echo "$as_val"'`" = xyes; then + if test "${CFLAGS+set}" = set; then + case " $CFLAGS " in + *" $flag "*) + { ($as_echo "$as_me:$LINENO: : CFLAGS already contains \$flag") >&5 + (: CFLAGS already contains $flag) 2>&5 + ac_status=$? + $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); } + ;; + *) + { ($as_echo "$as_me:$LINENO: : CFLAGS=\"\$CFLAGS \$flag\"") >&5 + (: CFLAGS="$CFLAGS $flag") 2>&5 + ac_status=$? + $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); } + CFLAGS="$CFLAGS $flag" + ;; + esac +else + CFLAGS="$flag" +fi + + +else + : +fi + + +done + + + + + +for flag in --param=ssp-buffer-size=1; do + as_CACHEVAR=`$as_echo "ax_cv_check_cflags__$flag" | $as_tr_sh` +{ $as_echo "$as_me:$LINENO: checking whether C compiler accepts $flag" >&5 +$as_echo_n "checking whether C compiler accepts $flag... " >&6; } +if { as_var=$as_CACHEVAR; eval "test \"\${$as_var+set}\" = set"; }; then + $as_echo_n "(cached) " >&6 +else + + ax_check_save_flags=$CFLAGS + CFLAGS="$CFLAGS $flag" + cat >conftest.$ac_ext <<_ACEOF +/* confdefs.h. */ +_ACEOF +cat confdefs.h >>conftest.$ac_ext +cat >>conftest.$ac_ext <<_ACEOF +/* end confdefs.h. */ + +int +main () +{ + + ; + return 0; +} +_ACEOF +rm -f conftest.$ac_objext +if { (ac_try="$ac_compile" +case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" +$as_echo "$ac_try_echo") >&5 + (eval "$ac_compile") 2>conftest.er1 + ac_status=$? + grep -v '^ *+' conftest.er1 >conftest.err + rm -f conftest.er1 + cat conftest.err >&5 + $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); } && { + test -z "$ac_c_werror_flag" || + test ! -s conftest.err + } && test -s conftest.$ac_objext; then + eval "$as_CACHEVAR=yes" +else + $as_echo "$as_me: failed program was:" >&5 +sed 's/^/| /' conftest.$ac_ext >&5 + + eval "$as_CACHEVAR=no" +fi + +rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext + CFLAGS=$ax_check_save_flags +fi +ac_res=`eval 'as_val=${'$as_CACHEVAR'} + $as_echo "$as_val"'` + { $as_echo "$as_me:$LINENO: result: $ac_res" >&5 +$as_echo "$ac_res" >&6; } +if test x"`eval 'as_val=${'$as_CACHEVAR'} + $as_echo "$as_val"'`" = xyes; then + if test "${CFLAGS+set}" = set; then + case " $CFLAGS " in + *" $flag "*) + { ($as_echo "$as_me:$LINENO: : CFLAGS already contains \$flag") >&5 + (: CFLAGS already contains $flag) 2>&5 + ac_status=$? + $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); } + ;; + *) + { ($as_echo "$as_me:$LINENO: : CFLAGS=\"\$CFLAGS \$flag\"") >&5 + (: CFLAGS="$CFLAGS $flag") 2>&5 + ac_status=$? + $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); } + CFLAGS="$CFLAGS $flag" + ;; + esac +else + CFLAGS="$flag" +fi + + +else + : +fi + + +done + + { $as_echo "$as_me:$LINENO: checking whether the linker accepts -z relro -z now" >&5 +$as_echo_n "checking whether the linker accepts -z relro -z now... " >&6; } +if test "${ax_cv_check_ldflags___z_relro__z_now+set}" = set; then + $as_echo_n "(cached) " >&6 +else + + ax_check_save_flags=$LDFLAGS + LDFLAGS="$LDFLAGS -z relro -z now" + cat >conftest.$ac_ext <<_ACEOF +/* confdefs.h. */ +_ACEOF +cat confdefs.h >>conftest.$ac_ext +cat >>conftest.$ac_ext <<_ACEOF +/* end confdefs.h. */ + +int +main () +{ + + ; + return 0; +} +_ACEOF +rm -f conftest.$ac_objext conftest$ac_exeext +if { (ac_try="$ac_link" +case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" +$as_echo "$ac_try_echo") >&5 + (eval "$ac_link") 2>conftest.er1 + ac_status=$? + grep -v '^ *+' conftest.er1 >conftest.err + rm -f conftest.er1 + cat conftest.err >&5 + $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); } && { + test -z "$ac_c_werror_flag" || + test ! -s conftest.err + } && test -s conftest$ac_exeext && { + test "$cross_compiling" = yes || + $as_test_x conftest$ac_exeext + }; then + ax_cv_check_ldflags___z_relro__z_now=yes +else + $as_echo "$as_me: failed program was:" >&5 +sed 's/^/| /' conftest.$ac_ext >&5 + + ax_cv_check_ldflags___z_relro__z_now=no +fi + +rm -rf conftest.dSYM +rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ + conftest$ac_exeext conftest.$ac_ext + LDFLAGS=$ax_check_save_flags +fi +{ $as_echo "$as_me:$LINENO: result: $ax_cv_check_ldflags___z_relro__z_now" >&5 +$as_echo "$ax_cv_check_ldflags___z_relro__z_now" >&6; } +if test x"$ax_cv_check_ldflags___z_relro__z_now" = xyes; then + : +else + : +fi + + + { $as_echo "$as_me:$LINENO: checking whether the linker accepts -pie" >&5 +$as_echo_n "checking whether the linker accepts -pie... " >&6; } +if test "${ax_cv_check_ldflags___pie+set}" = set; then + $as_echo_n "(cached) " >&6 +else + + ax_check_save_flags=$LDFLAGS + LDFLAGS="$LDFLAGS -pie" + cat >conftest.$ac_ext <<_ACEOF +/* confdefs.h. */ +_ACEOF +cat confdefs.h >>conftest.$ac_ext +cat >>conftest.$ac_ext <<_ACEOF +/* end confdefs.h. */ + +int +main () +{ + + ; + return 0; +} +_ACEOF +rm -f conftest.$ac_objext conftest$ac_exeext +if { (ac_try="$ac_link" +case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" +$as_echo "$ac_try_echo") >&5 + (eval "$ac_link") 2>conftest.er1 + ac_status=$? + grep -v '^ *+' conftest.er1 >conftest.err + rm -f conftest.er1 + cat conftest.err >&5 + $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); } && { + test -z "$ac_c_werror_flag" || + test ! -s conftest.err + } && test -s conftest$ac_exeext && { + test "$cross_compiling" = yes || + $as_test_x conftest$ac_exeext + }; then + ax_cv_check_ldflags___pie=yes +else + $as_echo "$as_me: failed program was:" >&5 +sed 's/^/| /' conftest.$ac_ext >&5 + + ax_cv_check_ldflags___pie=no +fi + +rm -rf conftest.dSYM +rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ + conftest$ac_exeext conftest.$ac_ext + LDFLAGS=$ax_check_save_flags +fi +{ $as_echo "$as_me:$LINENO: result: $ax_cv_check_ldflags___pie" >&5 +$as_echo "$ax_cv_check_ldflags___pie" >&6; } +if test x"$ax_cv_check_ldflags___pie" = xyes; then + : +else + : +fi + + + ac_ext=c +ac_cpp='$CPP $CPPFLAGS' +ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5' +ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5' +ac_compiler_gnu=$ac_cv_c_compiler_gnu + + + +ac_config_files="$ac_config_files Makefile powerpc-utils.spec" cat >confcache <<\_ACEOF # This file is a shell script that caches the results of configure @@ -7324,7 +8142,7 @@ # report actual input values of CONFIG_FILES etc. instead of their # values after options handling. ac_log=" -This file was extended by powerpc-utils $as_me 1.2.20, which was +This file was extended by powerpc-utils $as_me 1.2.22, which was generated by GNU Autoconf 2.63. Invocation command line was CONFIG_FILES = $CONFIG_FILES @@ -7378,7 +8196,7 @@ _ACEOF cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1 ac_cs_version="\\ -powerpc-utils config.status 1.2.20 +powerpc-utils config.status 1.2.22 configured by $0, generated by GNU Autoconf 2.63, with options \\"`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`\\" @@ -7491,10 +8309,7 @@ case $ac_config_target in "depfiles") CONFIG_COMMANDS="$CONFIG_COMMANDS depfiles" ;; "Makefile") CONFIG_FILES="$CONFIG_FILES Makefile" ;; - "src/Makefile") CONFIG_FILES="$CONFIG_FILES src/Makefile" ;; - "src/drmgr/Makefile") CONFIG_FILES="$CONFIG_FILES src/drmgr/Makefile" ;; - "scripts/Makefile") CONFIG_FILES="$CONFIG_FILES scripts/Makefile" ;; - "man/Makefile") CONFIG_FILES="$CONFIG_FILES man/Makefile" ;; + "powerpc-utils.spec") CONFIG_FILES="$CONFIG_FILES powerpc-utils.spec" ;; *) { { $as_echo "$as_me:$LINENO: error: invalid argument: $ac_config_target" >&5 $as_echo "$as_me: error: invalid argument: $ac_config_target" >&2;} diff -Nru powerpc-ibm-utils-1.2.20/configure.ac powerpc-ibm-utils-1.2.22/configure.ac --- powerpc-ibm-utils-1.2.20/configure.ac 2014-03-21 20:19:29.000000000 +0000 +++ powerpc-ibm-utils-1.2.22/configure.ac 2014-08-13 14:44:14.000000000 +0000 @@ -1,20 +1,23 @@ # -*- Autoconf -*- # Process this file with autoconf to produce a configure script. -m4_define([ppu_version], 1.2.20) +m4_define([ppu_version], 1.2.22) AC_PREREQ([2.63]) AC_INIT([powerpc-utils], ppu_version, [nfont@linux.vnet.ibm.com]) -AC_CONFIG_AUX_DIR([build-aux]) -AM_INIT_AUTOMAKE([1.10 -Wall -Werror foreign]) +AC_CONFIG_AUX_DIR([config]) +AC_CONFIG_MACRO_DIR([m4]) + +AM_INIT_AUTOMAKE([1.10 -Wall subdir-objects -Werror foreign]) m4_ifdef([AM_SILENT_RULES], [AM_SILENT_RULES([yes])]) AC_CONFIG_SRCDIR([src/rtas_ibm_get_vpd.c]) # Checks for programs. AC_PROG_CC AC_PROG_INSTALL +AM_PROG_CC_C_O # Checks for header files. -AC_CHECK_HEADERS([fcntl.h inttypes.h limits.h locale.h memory.h netinet/in.h nl_types.h stdint.h stdlib.h string.h sys/ioctl.h syslog.h unistd.h linux/perf_event.h]) +AC_CHECK_HEADERS([fcntl.h inttypes.h limits.h locale.h memory.h netinet/in.h nl_types.h stdint.h stdlib.h string.h sys/ioctl.h syslog.h unistd.h linux/perf_event.h sys/time.h]) # Checks for typedefs, structures, and compiler characteristics. AC_C_INLINE @@ -32,7 +35,7 @@ AC_FUNC_LSTAT_FOLLOWS_SLASHED_SYMLINK AC_FUNC_MALLOC AC_FUNC_MKTIME -AC_CHECK_FUNCS([memset strchr strcspn strdup strerror strrchr strstr strtol strtoul strtoull]) +AC_CHECK_FUNCS([memset strchr strcspn strdup strerror strrchr strstr strtol strtoul strtoull gettimeofday]) # check for librtas AC_ARG_WITH([librtas], @@ -52,8 +55,19 @@ AM_CONDITIONAL([WITH_LIBRTAS], [test "x$with_librtas" = "xyes"]) -echo "Configuring powerpc-utils.spec" -sed "s|\@VERSION\@|ppu_version|g" powerpc-utils.spec.in > powerpc-utils.spec +AC_DEFUN([LOCAL_CHECK_FLAGS],[ + AC_REQUIRE([AX_CHECK_LINK_FLAG]) + AC_REQUIRE([AX_APPEND_COMPILE_FLAGS]) + AC_LANG_PUSH([C]) + AX_APPEND_COMPILE_FLAGS([-Wall]) + AX_APPEND_COMPILE_FLAGS([-D_FORTIFY_SOURCE=2 -fstack-protector-all]) + AX_APPEND_COMPILE_FLAGS([-fwrapv -fPIE -Wstack-protector]) + AX_APPEND_COMPILE_FLAGS([--param=ssp-buffer-size=1]) + AX_CHECK_LINK_FLAG([-z relro -z now]) + AX_CHECK_LINK_FLAG([-pie]) + AC_LANG_POP +]) +LOCAL_CHECK_FLAGS -AC_CONFIG_FILES([Makefile src/Makefile src/drmgr/Makefile scripts/Makefile man/Makefile]) +AC_CONFIG_FILES([Makefile powerpc-utils.spec]) AC_OUTPUT diff -Nru powerpc-ibm-utils-1.2.20/debian/changelog powerpc-ibm-utils-1.2.22/debian/changelog --- powerpc-ibm-utils-1.2.20/debian/changelog 2014-03-23 18:05:32.000000000 +0000 +++ powerpc-ibm-utils-1.2.22/debian/changelog 2014-11-12 22:22:33.000000000 +0000 @@ -1,3 +1,17 @@ +powerpc-ibm-utils (1.2.22-1~ppa0) trusty; urgency=medium + + * New upstream release, with more little-endian fixes (LP: #1359422) + + -- Adam Conrad Fri, 03 Oct 2014 15:50:11 -0600 + +powerpc-ibm-utils (1.2.21-1) unstable; urgency=medium + + * Adopt powerpc-ibm-utils, in conjuction with IBM (closes: #677761) + * New upstream release, with several endianness and other bug fixes. + * Define the new --threads-per-core option in our ppc64_cpu manpage. + + -- Adam Conrad Sun, 29 Jun 2014 23:03:37 -0600 + powerpc-ibm-utils (1.2.20-1) unstable; urgency=medium * QA Upload. diff -Nru powerpc-ibm-utils-1.2.20/debian/control powerpc-ibm-utils-1.2.22/debian/control --- powerpc-ibm-utils-1.2.20/debian/control 2014-03-12 20:12:26.000000000 +0000 +++ powerpc-ibm-utils-1.2.22/debian/control 2014-11-12 22:21:50.000000000 +0000 @@ -1,7 +1,8 @@ Source: powerpc-ibm-utils Section: utils Priority: important -Maintainer: Debian QA Group +Maintainer: Adam Conrad +Uploaders: Frederic Bonnard Build-Depends: debhelper (>= 9), librtas-dev, librtasevent-dev, zlib1g-dev Standards-Version: 3.9.5 Homepage: http://powerpc-utils.ozlabs.org/ diff -Nru powerpc-ibm-utils-1.2.20/debian/manpages/ppc64_cpu.8 powerpc-ibm-utils-1.2.22/debian/manpages/ppc64_cpu.8 --- powerpc-ibm-utils-1.2.20/debian/manpages/ppc64_cpu.8 2014-03-12 21:28:29.000000000 +0000 +++ powerpc-ibm-utils-1.2.22/debian/manpages/ppc64_cpu.8 2014-11-12 22:21:50.000000000 +0000 @@ -52,6 +52,9 @@ .B \--subcores-per-core=X Set subcores per core to X (1 or 4). .TP +.B \--threads-per-core +Get number of threads per core. +.TP .B \--info Display system state information. .SH AUTHOR diff -Nru powerpc-ibm-utils-1.2.20/m4/ax_append_compile_flags.m4 powerpc-ibm-utils-1.2.22/m4/ax_append_compile_flags.m4 --- powerpc-ibm-utils-1.2.20/m4/ax_append_compile_flags.m4 1970-01-01 00:00:00.000000000 +0000 +++ powerpc-ibm-utils-1.2.22/m4/ax_append_compile_flags.m4 2014-08-13 12:26:23.000000000 +0000 @@ -0,0 +1,65 @@ +# =========================================================================== +# http://www.gnu.org/software/autoconf-archive/ax_append_compile_flags.html +# =========================================================================== +# +# SYNOPSIS +# +# AX_APPEND_COMPILE_FLAGS([FLAG1 FLAG2 ...], [FLAGS-VARIABLE], [EXTRA-FLAGS]) +# +# DESCRIPTION +# +# For every FLAG1, FLAG2 it is checked whether the compiler works with the +# flag. If it does, the flag is added FLAGS-VARIABLE +# +# If FLAGS-VARIABLE is not specified, the current language's flags (e.g. +# CFLAGS) is used. During the check the flag is always added to the +# current language's flags. +# +# If EXTRA-FLAGS is defined, it is added to the current language's default +# flags (e.g. CFLAGS) when the check is done. The check is thus made with +# the flags: "CFLAGS EXTRA-FLAGS FLAG". This can for example be used to +# force the compiler to issue an error when a bad flag is given. +# +# NOTE: This macro depends on the AX_APPEND_FLAG and +# AX_CHECK_COMPILE_FLAG. Please keep this macro in sync with +# AX_APPEND_LINK_FLAGS. +# +# LICENSE +# +# Copyright (c) 2011 Maarten Bosmans +# +# This program is free software: you can redistribute it and/or modify it +# under the terms of the GNU General Public License as published by the +# Free Software Foundation, either version 3 of the License, or (at your +# option) any later version. +# +# This program is distributed in the hope that it will be useful, but +# WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General +# Public License for more details. +# +# You should have received a copy of the GNU General Public License along +# with this program. If not, see . +# +# As a special exception, the respective Autoconf Macro's copyright owner +# gives unlimited permission to copy, distribute and modify the configure +# scripts that are the output of Autoconf when processing the Macro. You +# need not follow the terms of the GNU General Public License when using +# or distributing such scripts, even though portions of the text of the +# Macro appear in them. The GNU General Public License (GPL) does govern +# all other use of the material that constitutes the Autoconf Macro. +# +# This special exception to the GPL applies to versions of the Autoconf +# Macro released by the Autoconf Archive. When you make and distribute a +# modified version of the Autoconf Macro, you may extend this special +# exception to the GPL to apply to your modified version as well. + +#serial 4 + +AC_DEFUN([AX_APPEND_COMPILE_FLAGS], +[AX_REQUIRE_DEFINED([AX_CHECK_COMPILE_FLAG]) +AX_REQUIRE_DEFINED([AX_APPEND_FLAG]) +for flag in $1; do + AX_CHECK_COMPILE_FLAG([$flag], [AX_APPEND_FLAG([$flag], [$2])], [], [$3]) +done +])dnl AX_APPEND_COMPILE_FLAGS diff -Nru powerpc-ibm-utils-1.2.20/m4/ax_append_flag.m4 powerpc-ibm-utils-1.2.22/m4/ax_append_flag.m4 --- powerpc-ibm-utils-1.2.20/m4/ax_append_flag.m4 1970-01-01 00:00:00.000000000 +0000 +++ powerpc-ibm-utils-1.2.22/m4/ax_append_flag.m4 2014-08-13 12:26:23.000000000 +0000 @@ -0,0 +1,69 @@ +# =========================================================================== +# http://www.gnu.org/software/autoconf-archive/ax_append_flag.html +# =========================================================================== +# +# SYNOPSIS +# +# AX_APPEND_FLAG(FLAG, [FLAGS-VARIABLE]) +# +# DESCRIPTION +# +# FLAG is appended to the FLAGS-VARIABLE shell variable, with a space +# added in between. +# +# If FLAGS-VARIABLE is not specified, the current language's flags (e.g. +# CFLAGS) is used. FLAGS-VARIABLE is not changed if it already contains +# FLAG. If FLAGS-VARIABLE is unset in the shell, it is set to exactly +# FLAG. +# +# NOTE: Implementation based on AX_CFLAGS_GCC_OPTION. +# +# LICENSE +# +# Copyright (c) 2008 Guido U. Draheim +# Copyright (c) 2011 Maarten Bosmans +# +# This program is free software: you can redistribute it and/or modify it +# under the terms of the GNU General Public License as published by the +# Free Software Foundation, either version 3 of the License, or (at your +# option) any later version. +# +# This program is distributed in the hope that it will be useful, but +# WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General +# Public License for more details. +# +# You should have received a copy of the GNU General Public License along +# with this program. If not, see . +# +# As a special exception, the respective Autoconf Macro's copyright owner +# gives unlimited permission to copy, distribute and modify the configure +# scripts that are the output of Autoconf when processing the Macro. You +# need not follow the terms of the GNU General Public License when using +# or distributing such scripts, even though portions of the text of the +# Macro appear in them. The GNU General Public License (GPL) does govern +# all other use of the material that constitutes the Autoconf Macro. +# +# This special exception to the GPL applies to versions of the Autoconf +# Macro released by the Autoconf Archive. When you make and distribute a +# modified version of the Autoconf Macro, you may extend this special +# exception to the GPL to apply to your modified version as well. + +#serial 2 + +AC_DEFUN([AX_APPEND_FLAG], +[AC_PREREQ(2.59)dnl for _AC_LANG_PREFIX +AS_VAR_PUSHDEF([FLAGS], [m4_default($2,_AC_LANG_PREFIX[FLAGS])])dnl +AS_VAR_SET_IF(FLAGS, + [case " AS_VAR_GET(FLAGS) " in + *" $1 "*) + AC_RUN_LOG([: FLAGS already contains $1]) + ;; + *) + AC_RUN_LOG([: FLAGS="$FLAGS $1"]) + AS_VAR_SET(FLAGS, ["AS_VAR_GET(FLAGS) $1"]) + ;; + esac], + [AS_VAR_SET(FLAGS,["$1"])]) +AS_VAR_POPDEF([FLAGS])dnl +])dnl AX_APPEND_FLAG diff -Nru powerpc-ibm-utils-1.2.20/m4/ax_check_compile_flag.m4 powerpc-ibm-utils-1.2.22/m4/ax_check_compile_flag.m4 --- powerpc-ibm-utils-1.2.20/m4/ax_check_compile_flag.m4 1970-01-01 00:00:00.000000000 +0000 +++ powerpc-ibm-utils-1.2.22/m4/ax_check_compile_flag.m4 2014-08-13 12:26:23.000000000 +0000 @@ -0,0 +1,74 @@ +# =========================================================================== +# http://www.gnu.org/software/autoconf-archive/ax_check_compile_flag.html +# =========================================================================== +# +# SYNOPSIS +# +# AX_CHECK_COMPILE_FLAG(FLAG, [ACTION-SUCCESS], [ACTION-FAILURE], [EXTRA-FLAGS], [INPUT]) +# +# DESCRIPTION +# +# Check whether the given FLAG works with the current language's compiler +# or gives an error. (Warnings, however, are ignored) +# +# ACTION-SUCCESS/ACTION-FAILURE are shell commands to execute on +# success/failure. +# +# If EXTRA-FLAGS is defined, it is added to the current language's default +# flags (e.g. CFLAGS) when the check is done. The check is thus made with +# the flags: "CFLAGS EXTRA-FLAGS FLAG". This can for example be used to +# force the compiler to issue an error when a bad flag is given. +# +# INPUT gives an alternative input source to AC_COMPILE_IFELSE. +# +# NOTE: Implementation based on AX_CFLAGS_GCC_OPTION. Please keep this +# macro in sync with AX_CHECK_{PREPROC,LINK}_FLAG. +# +# LICENSE +# +# Copyright (c) 2008 Guido U. Draheim +# Copyright (c) 2011 Maarten Bosmans +# +# This program is free software: you can redistribute it and/or modify it +# under the terms of the GNU General Public License as published by the +# Free Software Foundation, either version 3 of the License, or (at your +# option) any later version. +# +# This program is distributed in the hope that it will be useful, but +# WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General +# Public License for more details. +# +# You should have received a copy of the GNU General Public License along +# with this program. If not, see . +# +# As a special exception, the respective Autoconf Macro's copyright owner +# gives unlimited permission to copy, distribute and modify the configure +# scripts that are the output of Autoconf when processing the Macro. You +# need not follow the terms of the GNU General Public License when using +# or distributing such scripts, even though portions of the text of the +# Macro appear in them. The GNU General Public License (GPL) does govern +# all other use of the material that constitutes the Autoconf Macro. +# +# This special exception to the GPL applies to versions of the Autoconf +# Macro released by the Autoconf Archive. When you make and distribute a +# modified version of the Autoconf Macro, you may extend this special +# exception to the GPL to apply to your modified version as well. + +#serial 3 + +AC_DEFUN([AX_CHECK_COMPILE_FLAG], +[AC_PREREQ(2.59)dnl for _AC_LANG_PREFIX +AS_VAR_PUSHDEF([CACHEVAR],[ax_cv_check_[]_AC_LANG_ABBREV[]flags_$4_$1])dnl +AC_CACHE_CHECK([whether _AC_LANG compiler accepts $1], CACHEVAR, [ + ax_check_save_flags=$[]_AC_LANG_PREFIX[]FLAGS + _AC_LANG_PREFIX[]FLAGS="$[]_AC_LANG_PREFIX[]FLAGS $4 $1" + AC_COMPILE_IFELSE([m4_default([$5],[AC_LANG_PROGRAM()])], + [AS_VAR_SET(CACHEVAR,[yes])], + [AS_VAR_SET(CACHEVAR,[no])]) + _AC_LANG_PREFIX[]FLAGS=$ax_check_save_flags]) +AS_IF([test x"AS_VAR_GET(CACHEVAR)" = xyes], + [m4_default([$2], :)], + [m4_default([$3], :)]) +AS_VAR_POPDEF([CACHEVAR])dnl +])dnl AX_CHECK_COMPILE_FLAGS diff -Nru powerpc-ibm-utils-1.2.20/m4/ax_check_link_flag.m4 powerpc-ibm-utils-1.2.22/m4/ax_check_link_flag.m4 --- powerpc-ibm-utils-1.2.20/m4/ax_check_link_flag.m4 1970-01-01 00:00:00.000000000 +0000 +++ powerpc-ibm-utils-1.2.22/m4/ax_check_link_flag.m4 2014-08-13 12:26:23.000000000 +0000 @@ -0,0 +1,73 @@ +# =========================================================================== +# http://www.gnu.org/software/autoconf-archive/ax_check_link_flag.html +# =========================================================================== +# +# SYNOPSIS +# +# AX_CHECK_LINK_FLAG(FLAG, [ACTION-SUCCESS], [ACTION-FAILURE], [EXTRA-FLAGS], [INPUT]) +# +# DESCRIPTION +# +# Check whether the given FLAG works with the linker or gives an error. +# (Warnings, however, are ignored) +# +# ACTION-SUCCESS/ACTION-FAILURE are shell commands to execute on +# success/failure. +# +# If EXTRA-FLAGS is defined, it is added to the linker's default flags +# when the check is done. The check is thus made with the flags: "LDFLAGS +# EXTRA-FLAGS FLAG". This can for example be used to force the linker to +# issue an error when a bad flag is given. +# +# INPUT gives an alternative input source to AC_LINK_IFELSE. +# +# NOTE: Implementation based on AX_CFLAGS_GCC_OPTION. Please keep this +# macro in sync with AX_CHECK_{PREPROC,COMPILE}_FLAG. +# +# LICENSE +# +# Copyright (c) 2008 Guido U. Draheim +# Copyright (c) 2011 Maarten Bosmans +# +# This program is free software: you can redistribute it and/or modify it +# under the terms of the GNU General Public License as published by the +# Free Software Foundation, either version 3 of the License, or (at your +# option) any later version. +# +# This program is distributed in the hope that it will be useful, but +# WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General +# Public License for more details. +# +# You should have received a copy of the GNU General Public License along +# with this program. If not, see . +# +# As a special exception, the respective Autoconf Macro's copyright owner +# gives unlimited permission to copy, distribute and modify the configure +# scripts that are the output of Autoconf when processing the Macro. You +# need not follow the terms of the GNU General Public License when using +# or distributing such scripts, even though portions of the text of the +# Macro appear in them. The GNU General Public License (GPL) does govern +# all other use of the material that constitutes the Autoconf Macro. +# +# This special exception to the GPL applies to versions of the Autoconf +# Macro released by the Autoconf Archive. When you make and distribute a +# modified version of the Autoconf Macro, you may extend this special +# exception to the GPL to apply to your modified version as well. + +#serial 3 + +AC_DEFUN([AX_CHECK_LINK_FLAG], +[AS_VAR_PUSHDEF([CACHEVAR],[ax_cv_check_ldflags_$4_$1])dnl +AC_CACHE_CHECK([whether the linker accepts $1], CACHEVAR, [ + ax_check_save_flags=$LDFLAGS + LDFLAGS="$LDFLAGS $4 $1" + AC_LINK_IFELSE([m4_default([$5],[AC_LANG_PROGRAM()])], + [AS_VAR_SET(CACHEVAR,[yes])], + [AS_VAR_SET(CACHEVAR,[no])]) + LDFLAGS=$ax_check_save_flags]) +AS_IF([test x"AS_VAR_GET(CACHEVAR)" = xyes], + [m4_default([$2], :)], + [m4_default([$3], :)]) +AS_VAR_POPDEF([CACHEVAR])dnl +])dnl AX_CHECK_LINK_FLAGS diff -Nru powerpc-ibm-utils-1.2.20/m4/ax_require_defined.m4 powerpc-ibm-utils-1.2.22/m4/ax_require_defined.m4 --- powerpc-ibm-utils-1.2.20/m4/ax_require_defined.m4 1970-01-01 00:00:00.000000000 +0000 +++ powerpc-ibm-utils-1.2.22/m4/ax_require_defined.m4 2014-08-13 12:26:23.000000000 +0000 @@ -0,0 +1,37 @@ +# =========================================================================== +# http://www.gnu.org/software/autoconf-archive/ax_require_defined.html +# =========================================================================== +# +# SYNOPSIS +# +# AX_REQUIRE_DEFINED(MACRO) +# +# DESCRIPTION +# +# AX_REQUIRE_DEFINED is a simple helper for making sure other macros have +# been defined and thus are available for use. This avoids random issues +# where a macro isn't expanded. Instead the configure script emits a +# non-fatal: +# +# ./configure: line 1673: AX_CFLAGS_WARN_ALL: command not found +# +# It's like AC_REQUIRE except it doesn't expand the required macro. +# +# Here's an example: +# +# AX_REQUIRE_DEFINED([AX_CHECK_LINK_FLAG]) +# +# LICENSE +# +# Copyright (c) 2014 Mike Frysinger +# +# Copying and distribution of this file, with or without modification, are +# permitted in any medium without royalty provided the copyright notice +# and this notice are preserved. This file is offered as-is, without any +# warranty. + +#serial 1 + +AC_DEFUN([AX_REQUIRE_DEFINED], [dnl + m4_ifndef([$1], [m4_fatal([macro ]$1[ is not defined; is a m4 file missing?])]) +])dnl AX_REQUIRE_DEFINED diff -Nru powerpc-ibm-utils-1.2.20/Makefile.am powerpc-ibm-utils-1.2.22/Makefile.am --- powerpc-ibm-utils-1.2.20/Makefile.am 2014-03-12 14:14:43.000000000 +0000 +++ powerpc-ibm-utils-1.2.22/Makefile.am 2014-08-13 12:26:23.000000000 +0000 @@ -1,16 +1,147 @@ -AUTOMAKE_OPTIONS = foreign subdir-objects -SUBDIRS = src man scripts +ACLOCAL_AMFLAGS = -I m4 + +noinst_HEADERS = +sbin_PROGRAMS = +EXTRA_DIST = docdir = $(datadir)/doc/packages/@PACKAGE@ doc_DATA = README COPYRIGHT -EXTRA_DIST = COPYRIGHT Changelog powerpc-utils.spec.in doc/activate_firmware.doxycfg \ +bin_SCRIPTS = scripts/amsstat + +sbin_SCRIPTS = \ + scripts/update_flash \ + scripts/update_flash_nv \ + scripts/hvcsadmin \ + scripts/rtas_dump \ + scripts/snap \ + scripts/bootlist \ + scripts/ofpathname \ + scripts/lsdevinfo \ + scripts/ls-veth \ + scripts/ls-vscsi \ + scripts/ls-vdev \ + scripts/pseries_platform + +man_MANS = \ + man/activate_firmware.8 \ + man/rtas_ibm_get_vpd.8 \ + man/uesensor.8 \ + man/amsstat.1 \ + man/serv_config.8 \ + man/update_flash.8 \ + man/nvram.8 \ + man/set_poweron_time.8 \ + man/bootlist.8 \ + man/ofpathname.8 \ + man/snap.8 \ + man/hvcsadmin.8 \ + man/rtas_dump.8 \ + man/sys_ident.8 \ + man/lparcfg.5 \ + man/lparstat.8 \ + man/lsslot.8 + +EXTRA_DIST += $(bin_SCRIPTS) $(sbin_SCRIPTS) $(man_MANS) + + +EXTRA_DIST += COPYRIGHT Changelog powerpc-utils.spec.in doc/activate_firmware.doxycfg \ doc/nvram.doxycfg doc/rtas_ibm_get_vpd.doxycfg doc/serv_config.doxycfg \ doc/set_poweron_time.doxycfg doc/uesensor.doxycfg -AC_CLEAN_FILES = aclocal.m4 +sbin_PROGRAMS += src/nvram src/lsprop src/lparstat + +pseries_platform_SOURCES = src/common/pseries_platform.c src/common/pseries_platform.h + +librtas_error_SOURCES = src/common/librtas_error.c src/common/librtas_error.h + +AM_CFLAGS = -Wall -g -I $(top_srcdir)/src/common/ + +if WITH_LIBRTAS +sbin_PROGRAMS += \ + src/activate_firmware \ + src/set_poweron_time \ + src/rtas_ibm_get_vpd \ + src/serv_config \ + src/uesensor \ + src/rtas_event_decode \ + src/sys_ident \ + src/ppc64_cpu + +src_activate_firmware_SOURCES = src/activate_fw.c $(pseries_platform_SOURCES) +src_activate_firmware_LDADD = -lrtas + +src_set_poweron_time_SOURCES = src/set_poweron_time.c $(librtas_error_SOURCES) $(pseries_platform_SOURCES) +src_set_poweron_time_LDADD = -lrtas + +src_rtas_ibm_get_vpd_SOURCES = src/rtas_ibm_get_vpd.c $(librtas_error_SOURCES) $(pseries_platform_SOURCES) +src_rtas_ibm_get_vpd_LDADD = -lrtas + +src_serv_config_SOURCES = src/serv_config.c $(librtas_error_SOURCES) $(pseries_platform_SOURCES) +src_serv_config_LDADD = -lrtas + +src_uesensor_SOURCES = src/uesensor.c $(librtas_error_SOURCES) $(pseries_platform_SOURCES) +src_uesensor_LDADD = -lrtas + +src_rtas_event_decode_SOURCES = src/rtas_event_decode.c $(pseries_platform_SOURCES) +src_rtas_event_decode_LDADD = -lrtasevent + +src_sys_ident_SOURCES = src/sys_ident.c $(pseries_platform_SOURCES) +src_sys_ident_LDADD = -lrtas + +src_ppc64_cpu_SOURCES = src/ppc64_cpu.c $(librtas_error_SOURCES) $(pseries_platform_SOURCES) +src_ppc64_cpu_LDADD = -lrtas -lpthread + +endif + +src_nvram_SOURCES = src/nvram.c src/nvram.h $(pseries_platform_SOURCES) +src_nvram_LDADD = -ldl -lz + +src_lsprop_SOURCES = src/lsprop.c $(pseries_platform_SOURCES) + +src_lparstat_SOURCES = src/lparstat.c src/lparstat.h $(pseries_platform_SOURCES) + +if WITH_LIBRTAS +sbin_PROGRAMS += src/drmgr/drmgr src/drmgr/lsslot +endif + +src_drmgr_drmgr_SOURCES = \ + src/drmgr/common.c \ + src/drmgr/common_cpu.c \ + src/drmgr/common_ofdt.c \ + src/drmgr/common_pci.c \ + src/drmgr/drmgr.c \ + src/drmgr/drmig_chrp_pmig.c \ + src/drmgr/drslot_chrp_cpu.c \ + src/drmgr/drslot_chrp_hea.c \ + src/drmgr/drslot_chrp_mem.c \ + src/drmgr/drslot_chrp_pci.c \ + src/drmgr/drslot_chrp_phb.c \ + src/drmgr/drslot_chrp_slot.c \ + src/drmgr/rtas_calls.c \ + $(pseries_platform_SOURCES) + +noinst_HEADERS += \ + src/drmgr/drcpu.h \ + src/drmgr/dr.h \ + src/drmgr/drmem.h \ + src/drmgr/drpci.h \ + src/drmgr/rtas_calls.h \ + src/drmgr/ofdt.h \ + src/drmgr/lsslot.h \ + src/drmgr/rtas_calls.h + +src_drmgr_drmgr_LDADD = -lrtas + +src_drmgr_lsslot_SOURCES = \ + src/drmgr/lsslot.c \ + src/drmgr/lsslot_chrp_cpu.c \ + src/drmgr/common.c \ + src/drmgr/common_cpu.c \ + src/drmgr/common_pci.c \ + src/drmgr/common_ofdt.c \ + src/drmgr/rtas_calls.c \ + src/drmgr/drslot_chrp_mem.c \ + $(pseries_platform_SOURCES) -really-clean: maintainer-clean - -rm -f powerpc-utils.spec - -rm -f $(AC_CLEAN_FILES) - +src_drmgr_lsslot_LDADD = -lrtas diff -Nru powerpc-ibm-utils-1.2.20/Makefile.in powerpc-ibm-utils-1.2.22/Makefile.in --- powerpc-ibm-utils-1.2.20/Makefile.in 2014-03-21 20:24:03.000000000 +0000 +++ powerpc-ibm-utils-1.2.22/Makefile.in 2014-08-13 14:44:29.000000000 +0000 @@ -14,6 +14,9 @@ @SET_MAKE@ + + + VPATH = @srcdir@ pkgdatadir = $(datadir)/@PACKAGE@ pkglibdir = $(libdir)/@PACKAGE@ @@ -30,41 +33,180 @@ NORMAL_UNINSTALL = : PRE_UNINSTALL = : POST_UNINSTALL = : +sbin_PROGRAMS = src/nvram$(EXEEXT) src/lsprop$(EXEEXT) \ + src/lparstat$(EXEEXT) $(am__EXEEXT_1) +@WITH_LIBRTAS_TRUE@am__append_1 = src/activate_firmware \ +@WITH_LIBRTAS_TRUE@ src/set_poweron_time src/rtas_ibm_get_vpd \ +@WITH_LIBRTAS_TRUE@ src/serv_config src/uesensor \ +@WITH_LIBRTAS_TRUE@ src/rtas_event_decode src/sys_ident \ +@WITH_LIBRTAS_TRUE@ src/ppc64_cpu src/drmgr/drmgr \ +@WITH_LIBRTAS_TRUE@ src/drmgr/lsslot subdir = . -DIST_COMMON = README $(am__configure_deps) $(srcdir)/Makefile.am \ - $(srcdir)/Makefile.in $(top_srcdir)/configure \ - build-aux/depcomp build-aux/install-sh build-aux/missing +DIST_COMMON = README $(am__configure_deps) $(noinst_HEADERS) \ + $(srcdir)/Makefile.am $(srcdir)/Makefile.in \ + $(srcdir)/powerpc-utils.spec.in $(top_srcdir)/configure \ + config/compile config/depcomp config/install-sh config/missing ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 -am__aclocal_m4_deps = $(top_srcdir)/configure.ac +am__aclocal_m4_deps = $(top_srcdir)/m4/ax_append_compile_flags.m4 \ + $(top_srcdir)/m4/ax_append_flag.m4 \ + $(top_srcdir)/m4/ax_check_compile_flag.m4 \ + $(top_srcdir)/m4/ax_check_link_flag.m4 \ + $(top_srcdir)/m4/ax_require_defined.m4 \ + $(top_srcdir)/configure.ac am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ $(ACLOCAL_M4) am__CONFIG_DISTCLEAN_FILES = config.status config.cache config.log \ configure.lineno config.status.lineno mkinstalldirs = $(install_sh) -d -CONFIG_CLEAN_FILES = -SOURCES = -DIST_SOURCES = -RECURSIVE_TARGETS = all-recursive check-recursive dvi-recursive \ - html-recursive info-recursive install-data-recursive \ - install-dvi-recursive install-exec-recursive \ - install-html-recursive install-info-recursive \ - install-pdf-recursive install-ps-recursive install-recursive \ - installcheck-recursive installdirs-recursive pdf-recursive \ - ps-recursive uninstall-recursive +CONFIG_CLEAN_FILES = powerpc-utils.spec +@WITH_LIBRTAS_TRUE@am__EXEEXT_1 = src/activate_firmware$(EXEEXT) \ +@WITH_LIBRTAS_TRUE@ src/set_poweron_time$(EXEEXT) \ +@WITH_LIBRTAS_TRUE@ src/rtas_ibm_get_vpd$(EXEEXT) \ +@WITH_LIBRTAS_TRUE@ src/serv_config$(EXEEXT) \ +@WITH_LIBRTAS_TRUE@ src/uesensor$(EXEEXT) \ +@WITH_LIBRTAS_TRUE@ src/rtas_event_decode$(EXEEXT) \ +@WITH_LIBRTAS_TRUE@ src/sys_ident$(EXEEXT) \ +@WITH_LIBRTAS_TRUE@ src/ppc64_cpu$(EXEEXT) \ +@WITH_LIBRTAS_TRUE@ src/drmgr/drmgr$(EXEEXT) \ +@WITH_LIBRTAS_TRUE@ src/drmgr/lsslot$(EXEEXT) +am__installdirs = "$(DESTDIR)$(sbindir)" "$(DESTDIR)$(bindir)" \ + "$(DESTDIR)$(sbindir)" "$(DESTDIR)$(man1dir)" \ + "$(DESTDIR)$(man5dir)" "$(DESTDIR)$(man8dir)" \ + "$(DESTDIR)$(docdir)" +sbinPROGRAMS_INSTALL = $(INSTALL_PROGRAM) +PROGRAMS = $(sbin_PROGRAMS) +am__src_activate_firmware_SOURCES_DIST = src/activate_fw.c \ + src/common/pseries_platform.c src/common/pseries_platform.h +am__dirstamp = $(am__leading_dot)dirstamp +am__objects_1 = src/common/pseries_platform.$(OBJEXT) +@WITH_LIBRTAS_TRUE@am_src_activate_firmware_OBJECTS = \ +@WITH_LIBRTAS_TRUE@ src/activate_fw.$(OBJEXT) $(am__objects_1) +src_activate_firmware_OBJECTS = $(am_src_activate_firmware_OBJECTS) +src_activate_firmware_DEPENDENCIES = +am_src_drmgr_drmgr_OBJECTS = src/drmgr/common.$(OBJEXT) \ + src/drmgr/common_cpu.$(OBJEXT) src/drmgr/common_ofdt.$(OBJEXT) \ + src/drmgr/common_pci.$(OBJEXT) src/drmgr/drmgr.$(OBJEXT) \ + src/drmgr/drmig_chrp_pmig.$(OBJEXT) \ + src/drmgr/drslot_chrp_cpu.$(OBJEXT) \ + src/drmgr/drslot_chrp_hea.$(OBJEXT) \ + src/drmgr/drslot_chrp_mem.$(OBJEXT) \ + src/drmgr/drslot_chrp_pci.$(OBJEXT) \ + src/drmgr/drslot_chrp_phb.$(OBJEXT) \ + src/drmgr/drslot_chrp_slot.$(OBJEXT) \ + src/drmgr/rtas_calls.$(OBJEXT) $(am__objects_1) +src_drmgr_drmgr_OBJECTS = $(am_src_drmgr_drmgr_OBJECTS) +src_drmgr_drmgr_DEPENDENCIES = +am_src_drmgr_lsslot_OBJECTS = src/drmgr/lsslot.$(OBJEXT) \ + src/drmgr/lsslot_chrp_cpu.$(OBJEXT) src/drmgr/common.$(OBJEXT) \ + src/drmgr/common_cpu.$(OBJEXT) src/drmgr/common_pci.$(OBJEXT) \ + src/drmgr/common_ofdt.$(OBJEXT) src/drmgr/rtas_calls.$(OBJEXT) \ + src/drmgr/drslot_chrp_mem.$(OBJEXT) $(am__objects_1) +src_drmgr_lsslot_OBJECTS = $(am_src_drmgr_lsslot_OBJECTS) +src_drmgr_lsslot_DEPENDENCIES = +am_src_lparstat_OBJECTS = src/lparstat.$(OBJEXT) $(am__objects_1) +src_lparstat_OBJECTS = $(am_src_lparstat_OBJECTS) +src_lparstat_LDADD = $(LDADD) +am_src_lsprop_OBJECTS = src/lsprop.$(OBJEXT) $(am__objects_1) +src_lsprop_OBJECTS = $(am_src_lsprop_OBJECTS) +src_lsprop_LDADD = $(LDADD) +am_src_nvram_OBJECTS = src/nvram.$(OBJEXT) $(am__objects_1) +src_nvram_OBJECTS = $(am_src_nvram_OBJECTS) +src_nvram_DEPENDENCIES = +am__src_ppc64_cpu_SOURCES_DIST = src/ppc64_cpu.c \ + src/common/librtas_error.c src/common/librtas_error.h \ + src/common/pseries_platform.c src/common/pseries_platform.h +am__objects_2 = src/common/librtas_error.$(OBJEXT) +@WITH_LIBRTAS_TRUE@am_src_ppc64_cpu_OBJECTS = src/ppc64_cpu.$(OBJEXT) \ +@WITH_LIBRTAS_TRUE@ $(am__objects_2) $(am__objects_1) +src_ppc64_cpu_OBJECTS = $(am_src_ppc64_cpu_OBJECTS) +src_ppc64_cpu_DEPENDENCIES = +am__src_rtas_event_decode_SOURCES_DIST = src/rtas_event_decode.c \ + src/common/pseries_platform.c src/common/pseries_platform.h +@WITH_LIBRTAS_TRUE@am_src_rtas_event_decode_OBJECTS = \ +@WITH_LIBRTAS_TRUE@ src/rtas_event_decode.$(OBJEXT) \ +@WITH_LIBRTAS_TRUE@ $(am__objects_1) +src_rtas_event_decode_OBJECTS = $(am_src_rtas_event_decode_OBJECTS) +src_rtas_event_decode_DEPENDENCIES = +am__src_rtas_ibm_get_vpd_SOURCES_DIST = src/rtas_ibm_get_vpd.c \ + src/common/librtas_error.c src/common/librtas_error.h \ + src/common/pseries_platform.c src/common/pseries_platform.h +@WITH_LIBRTAS_TRUE@am_src_rtas_ibm_get_vpd_OBJECTS = \ +@WITH_LIBRTAS_TRUE@ src/rtas_ibm_get_vpd.$(OBJEXT) \ +@WITH_LIBRTAS_TRUE@ $(am__objects_2) $(am__objects_1) +src_rtas_ibm_get_vpd_OBJECTS = $(am_src_rtas_ibm_get_vpd_OBJECTS) +src_rtas_ibm_get_vpd_DEPENDENCIES = +am__src_serv_config_SOURCES_DIST = src/serv_config.c \ + src/common/librtas_error.c src/common/librtas_error.h \ + src/common/pseries_platform.c src/common/pseries_platform.h +@WITH_LIBRTAS_TRUE@am_src_serv_config_OBJECTS = \ +@WITH_LIBRTAS_TRUE@ src/serv_config.$(OBJEXT) $(am__objects_2) \ +@WITH_LIBRTAS_TRUE@ $(am__objects_1) +src_serv_config_OBJECTS = $(am_src_serv_config_OBJECTS) +src_serv_config_DEPENDENCIES = +am__src_set_poweron_time_SOURCES_DIST = src/set_poweron_time.c \ + src/common/librtas_error.c src/common/librtas_error.h \ + src/common/pseries_platform.c src/common/pseries_platform.h +@WITH_LIBRTAS_TRUE@am_src_set_poweron_time_OBJECTS = \ +@WITH_LIBRTAS_TRUE@ src/set_poweron_time.$(OBJEXT) \ +@WITH_LIBRTAS_TRUE@ $(am__objects_2) $(am__objects_1) +src_set_poweron_time_OBJECTS = $(am_src_set_poweron_time_OBJECTS) +src_set_poweron_time_DEPENDENCIES = +am__src_sys_ident_SOURCES_DIST = src/sys_ident.c \ + src/common/pseries_platform.c src/common/pseries_platform.h +@WITH_LIBRTAS_TRUE@am_src_sys_ident_OBJECTS = src/sys_ident.$(OBJEXT) \ +@WITH_LIBRTAS_TRUE@ $(am__objects_1) +src_sys_ident_OBJECTS = $(am_src_sys_ident_OBJECTS) +src_sys_ident_DEPENDENCIES = +am__src_uesensor_SOURCES_DIST = src/uesensor.c \ + src/common/librtas_error.c src/common/librtas_error.h \ + src/common/pseries_platform.c src/common/pseries_platform.h +@WITH_LIBRTAS_TRUE@am_src_uesensor_OBJECTS = src/uesensor.$(OBJEXT) \ +@WITH_LIBRTAS_TRUE@ $(am__objects_2) $(am__objects_1) +src_uesensor_OBJECTS = $(am_src_uesensor_OBJECTS) +src_uesensor_DEPENDENCIES = +binSCRIPT_INSTALL = $(INSTALL_SCRIPT) +sbinSCRIPT_INSTALL = $(INSTALL_SCRIPT) +SCRIPTS = $(bin_SCRIPTS) $(sbin_SCRIPTS) +DEFAULT_INCLUDES = -I.@am__isrc@ +depcomp = $(SHELL) $(top_srcdir)/config/depcomp +am__depfiles_maybe = depfiles +COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \ + $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) +CCLD = $(CC) +LINK = $(CCLD) $(AM_CFLAGS) $(CFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@ +SOURCES = $(src_activate_firmware_SOURCES) $(src_drmgr_drmgr_SOURCES) \ + $(src_drmgr_lsslot_SOURCES) $(src_lparstat_SOURCES) \ + $(src_lsprop_SOURCES) $(src_nvram_SOURCES) \ + $(src_ppc64_cpu_SOURCES) $(src_rtas_event_decode_SOURCES) \ + $(src_rtas_ibm_get_vpd_SOURCES) $(src_serv_config_SOURCES) \ + $(src_set_poweron_time_SOURCES) $(src_sys_ident_SOURCES) \ + $(src_uesensor_SOURCES) +DIST_SOURCES = $(am__src_activate_firmware_SOURCES_DIST) \ + $(src_drmgr_drmgr_SOURCES) $(src_drmgr_lsslot_SOURCES) \ + $(src_lparstat_SOURCES) $(src_lsprop_SOURCES) \ + $(src_nvram_SOURCES) $(am__src_ppc64_cpu_SOURCES_DIST) \ + $(am__src_rtas_event_decode_SOURCES_DIST) \ + $(am__src_rtas_ibm_get_vpd_SOURCES_DIST) \ + $(am__src_serv_config_SOURCES_DIST) \ + $(am__src_set_poweron_time_SOURCES_DIST) \ + $(am__src_sys_ident_SOURCES_DIST) \ + $(am__src_uesensor_SOURCES_DIST) +man1dir = $(mandir)/man1 +man5dir = $(mandir)/man5 +man8dir = $(mandir)/man8 +NROFF = nroff +MANS = $(man_MANS) am__vpath_adj_setup = srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; am__vpath_adj = case $$p in \ $(srcdir)/*) f=`echo "$$p" | sed "s|^$$srcdirstrip/||"`;; \ *) f=$$p;; \ esac; am__strip_dir = `echo $$p | sed -e 's|^.*/||'`; -am__installdirs = "$(DESTDIR)$(docdir)" docDATA_INSTALL = $(INSTALL_DATA) DATA = $(doc_DATA) -RECURSIVE_CLEAN_TARGETS = mostlyclean-recursive clean-recursive \ - distclean-recursive maintainer-clean-recursive +HEADERS = $(noinst_HEADERS) ETAGS = etags CTAGS = ctags -DIST_SUBDIRS = $(SUBDIRS) DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) distdir = $(PACKAGE)-$(VERSION) top_distdir = $(distdir) @@ -161,17 +303,106 @@ top_build_prefix = @top_build_prefix@ top_builddir = @top_builddir@ top_srcdir = @top_srcdir@ -AUTOMAKE_OPTIONS = foreign subdir-objects -SUBDIRS = src man scripts +ACLOCAL_AMFLAGS = -I m4 +noinst_HEADERS = src/drmgr/drcpu.h src/drmgr/dr.h src/drmgr/drmem.h \ + src/drmgr/drpci.h src/drmgr/rtas_calls.h src/drmgr/ofdt.h \ + src/drmgr/lsslot.h src/drmgr/rtas_calls.h +EXTRA_DIST = $(bin_SCRIPTS) $(sbin_SCRIPTS) $(man_MANS) COPYRIGHT \ + Changelog powerpc-utils.spec.in doc/activate_firmware.doxycfg \ + doc/nvram.doxycfg doc/rtas_ibm_get_vpd.doxycfg \ + doc/serv_config.doxycfg doc/set_poweron_time.doxycfg \ + doc/uesensor.doxycfg doc_DATA = README COPYRIGHT -EXTRA_DIST = COPYRIGHT Changelog powerpc-utils.spec.in doc/activate_firmware.doxycfg \ - doc/nvram.doxycfg doc/rtas_ibm_get_vpd.doxycfg doc/serv_config.doxycfg \ - doc/set_poweron_time.doxycfg doc/uesensor.doxycfg +bin_SCRIPTS = scripts/amsstat +sbin_SCRIPTS = \ + scripts/update_flash \ + scripts/update_flash_nv \ + scripts/hvcsadmin \ + scripts/rtas_dump \ + scripts/snap \ + scripts/bootlist \ + scripts/ofpathname \ + scripts/lsdevinfo \ + scripts/ls-veth \ + scripts/ls-vscsi \ + scripts/ls-vdev \ + scripts/pseries_platform + +man_MANS = \ + man/activate_firmware.8 \ + man/rtas_ibm_get_vpd.8 \ + man/uesensor.8 \ + man/amsstat.1 \ + man/serv_config.8 \ + man/update_flash.8 \ + man/nvram.8 \ + man/set_poweron_time.8 \ + man/bootlist.8 \ + man/ofpathname.8 \ + man/snap.8 \ + man/hvcsadmin.8 \ + man/rtas_dump.8 \ + man/sys_ident.8 \ + man/lparcfg.5 \ + man/lparstat.8 \ + man/lsslot.8 + +pseries_platform_SOURCES = src/common/pseries_platform.c src/common/pseries_platform.h +librtas_error_SOURCES = src/common/librtas_error.c src/common/librtas_error.h +AM_CFLAGS = -Wall -g -I $(top_srcdir)/src/common/ +@WITH_LIBRTAS_TRUE@src_activate_firmware_SOURCES = src/activate_fw.c $(pseries_platform_SOURCES) +@WITH_LIBRTAS_TRUE@src_activate_firmware_LDADD = -lrtas +@WITH_LIBRTAS_TRUE@src_set_poweron_time_SOURCES = src/set_poweron_time.c $(librtas_error_SOURCES) $(pseries_platform_SOURCES) +@WITH_LIBRTAS_TRUE@src_set_poweron_time_LDADD = -lrtas +@WITH_LIBRTAS_TRUE@src_rtas_ibm_get_vpd_SOURCES = src/rtas_ibm_get_vpd.c $(librtas_error_SOURCES) $(pseries_platform_SOURCES) +@WITH_LIBRTAS_TRUE@src_rtas_ibm_get_vpd_LDADD = -lrtas +@WITH_LIBRTAS_TRUE@src_serv_config_SOURCES = src/serv_config.c $(librtas_error_SOURCES) $(pseries_platform_SOURCES) +@WITH_LIBRTAS_TRUE@src_serv_config_LDADD = -lrtas +@WITH_LIBRTAS_TRUE@src_uesensor_SOURCES = src/uesensor.c $(librtas_error_SOURCES) $(pseries_platform_SOURCES) +@WITH_LIBRTAS_TRUE@src_uesensor_LDADD = -lrtas +@WITH_LIBRTAS_TRUE@src_rtas_event_decode_SOURCES = src/rtas_event_decode.c $(pseries_platform_SOURCES) +@WITH_LIBRTAS_TRUE@src_rtas_event_decode_LDADD = -lrtasevent +@WITH_LIBRTAS_TRUE@src_sys_ident_SOURCES = src/sys_ident.c $(pseries_platform_SOURCES) +@WITH_LIBRTAS_TRUE@src_sys_ident_LDADD = -lrtas +@WITH_LIBRTAS_TRUE@src_ppc64_cpu_SOURCES = src/ppc64_cpu.c $(librtas_error_SOURCES) $(pseries_platform_SOURCES) +@WITH_LIBRTAS_TRUE@src_ppc64_cpu_LDADD = -lrtas -lpthread +src_nvram_SOURCES = src/nvram.c src/nvram.h $(pseries_platform_SOURCES) +src_nvram_LDADD = -ldl -lz +src_lsprop_SOURCES = src/lsprop.c $(pseries_platform_SOURCES) +src_lparstat_SOURCES = src/lparstat.c src/lparstat.h $(pseries_platform_SOURCES) +src_drmgr_drmgr_SOURCES = \ + src/drmgr/common.c \ + src/drmgr/common_cpu.c \ + src/drmgr/common_ofdt.c \ + src/drmgr/common_pci.c \ + src/drmgr/drmgr.c \ + src/drmgr/drmig_chrp_pmig.c \ + src/drmgr/drslot_chrp_cpu.c \ + src/drmgr/drslot_chrp_hea.c \ + src/drmgr/drslot_chrp_mem.c \ + src/drmgr/drslot_chrp_pci.c \ + src/drmgr/drslot_chrp_phb.c \ + src/drmgr/drslot_chrp_slot.c \ + src/drmgr/rtas_calls.c \ + $(pseries_platform_SOURCES) + +src_drmgr_drmgr_LDADD = -lrtas +src_drmgr_lsslot_SOURCES = \ + src/drmgr/lsslot.c \ + src/drmgr/lsslot_chrp_cpu.c \ + src/drmgr/common.c \ + src/drmgr/common_cpu.c \ + src/drmgr/common_pci.c \ + src/drmgr/common_ofdt.c \ + src/drmgr/rtas_calls.c \ + src/drmgr/drslot_chrp_mem.c \ + $(pseries_platform_SOURCES) -AC_CLEAN_FILES = aclocal.m4 -all: all-recursive +src_drmgr_lsslot_LDADD = -lrtas +all: all-am .SUFFIXES: +.SUFFIXES: .c .o .obj am--refresh: @: $(srcdir)/Makefile.in: $(srcdir)/Makefile.am $(am__configure_deps) @@ -205,6 +436,395 @@ cd $(srcdir) && $(AUTOCONF) $(ACLOCAL_M4): $(am__aclocal_m4_deps) cd $(srcdir) && $(ACLOCAL) $(ACLOCAL_AMFLAGS) +powerpc-utils.spec: $(top_builddir)/config.status $(srcdir)/powerpc-utils.spec.in + cd $(top_builddir) && $(SHELL) ./config.status $@ +install-sbinPROGRAMS: $(sbin_PROGRAMS) + @$(NORMAL_INSTALL) + test -z "$(sbindir)" || $(MKDIR_P) "$(DESTDIR)$(sbindir)" + @list='$(sbin_PROGRAMS)'; for p in $$list; do \ + p1=`echo $$p|sed 's/$(EXEEXT)$$//'`; \ + if test -f $$p \ + ; then \ + f=`echo "$$p1" | sed 's,^.*/,,;$(transform);s/$$/$(EXEEXT)/'`; \ + echo " $(INSTALL_PROGRAM_ENV) $(sbinPROGRAMS_INSTALL) '$$p' '$(DESTDIR)$(sbindir)/$$f'"; \ + $(INSTALL_PROGRAM_ENV) $(sbinPROGRAMS_INSTALL) "$$p" "$(DESTDIR)$(sbindir)/$$f" || exit 1; \ + else :; fi; \ + done + +uninstall-sbinPROGRAMS: + @$(NORMAL_UNINSTALL) + @list='$(sbin_PROGRAMS)'; for p in $$list; do \ + f=`echo "$$p" | sed 's,^.*/,,;s/$(EXEEXT)$$//;$(transform);s/$$/$(EXEEXT)/'`; \ + echo " rm -f '$(DESTDIR)$(sbindir)/$$f'"; \ + rm -f "$(DESTDIR)$(sbindir)/$$f"; \ + done + +clean-sbinPROGRAMS: + -test -z "$(sbin_PROGRAMS)" || rm -f $(sbin_PROGRAMS) +src/$(am__dirstamp): + @$(MKDIR_P) src + @: > src/$(am__dirstamp) +src/$(DEPDIR)/$(am__dirstamp): + @$(MKDIR_P) src/$(DEPDIR) + @: > src/$(DEPDIR)/$(am__dirstamp) +src/activate_fw.$(OBJEXT): src/$(am__dirstamp) \ + src/$(DEPDIR)/$(am__dirstamp) +src/common/$(am__dirstamp): + @$(MKDIR_P) src/common + @: > src/common/$(am__dirstamp) +src/common/$(DEPDIR)/$(am__dirstamp): + @$(MKDIR_P) src/common/$(DEPDIR) + @: > src/common/$(DEPDIR)/$(am__dirstamp) +src/common/pseries_platform.$(OBJEXT): src/common/$(am__dirstamp) \ + src/common/$(DEPDIR)/$(am__dirstamp) +src/activate_firmware$(EXEEXT): $(src_activate_firmware_OBJECTS) $(src_activate_firmware_DEPENDENCIES) src/$(am__dirstamp) + @rm -f src/activate_firmware$(EXEEXT) + $(LINK) $(src_activate_firmware_OBJECTS) $(src_activate_firmware_LDADD) $(LIBS) +src/drmgr/$(am__dirstamp): + @$(MKDIR_P) src/drmgr + @: > src/drmgr/$(am__dirstamp) +src/drmgr/$(DEPDIR)/$(am__dirstamp): + @$(MKDIR_P) src/drmgr/$(DEPDIR) + @: > src/drmgr/$(DEPDIR)/$(am__dirstamp) +src/drmgr/common.$(OBJEXT): src/drmgr/$(am__dirstamp) \ + src/drmgr/$(DEPDIR)/$(am__dirstamp) +src/drmgr/common_cpu.$(OBJEXT): src/drmgr/$(am__dirstamp) \ + src/drmgr/$(DEPDIR)/$(am__dirstamp) +src/drmgr/common_ofdt.$(OBJEXT): src/drmgr/$(am__dirstamp) \ + src/drmgr/$(DEPDIR)/$(am__dirstamp) +src/drmgr/common_pci.$(OBJEXT): src/drmgr/$(am__dirstamp) \ + src/drmgr/$(DEPDIR)/$(am__dirstamp) +src/drmgr/drmgr.$(OBJEXT): src/drmgr/$(am__dirstamp) \ + src/drmgr/$(DEPDIR)/$(am__dirstamp) +src/drmgr/drmig_chrp_pmig.$(OBJEXT): src/drmgr/$(am__dirstamp) \ + src/drmgr/$(DEPDIR)/$(am__dirstamp) +src/drmgr/drslot_chrp_cpu.$(OBJEXT): src/drmgr/$(am__dirstamp) \ + src/drmgr/$(DEPDIR)/$(am__dirstamp) +src/drmgr/drslot_chrp_hea.$(OBJEXT): src/drmgr/$(am__dirstamp) \ + src/drmgr/$(DEPDIR)/$(am__dirstamp) +src/drmgr/drslot_chrp_mem.$(OBJEXT): src/drmgr/$(am__dirstamp) \ + src/drmgr/$(DEPDIR)/$(am__dirstamp) +src/drmgr/drslot_chrp_pci.$(OBJEXT): src/drmgr/$(am__dirstamp) \ + src/drmgr/$(DEPDIR)/$(am__dirstamp) +src/drmgr/drslot_chrp_phb.$(OBJEXT): src/drmgr/$(am__dirstamp) \ + src/drmgr/$(DEPDIR)/$(am__dirstamp) +src/drmgr/drslot_chrp_slot.$(OBJEXT): src/drmgr/$(am__dirstamp) \ + src/drmgr/$(DEPDIR)/$(am__dirstamp) +src/drmgr/rtas_calls.$(OBJEXT): src/drmgr/$(am__dirstamp) \ + src/drmgr/$(DEPDIR)/$(am__dirstamp) +src/drmgr/drmgr$(EXEEXT): $(src_drmgr_drmgr_OBJECTS) $(src_drmgr_drmgr_DEPENDENCIES) src/drmgr/$(am__dirstamp) + @rm -f src/drmgr/drmgr$(EXEEXT) + $(LINK) $(src_drmgr_drmgr_OBJECTS) $(src_drmgr_drmgr_LDADD) $(LIBS) +src/drmgr/lsslot.$(OBJEXT): src/drmgr/$(am__dirstamp) \ + src/drmgr/$(DEPDIR)/$(am__dirstamp) +src/drmgr/lsslot_chrp_cpu.$(OBJEXT): src/drmgr/$(am__dirstamp) \ + src/drmgr/$(DEPDIR)/$(am__dirstamp) +src/drmgr/lsslot$(EXEEXT): $(src_drmgr_lsslot_OBJECTS) $(src_drmgr_lsslot_DEPENDENCIES) src/drmgr/$(am__dirstamp) + @rm -f src/drmgr/lsslot$(EXEEXT) + $(LINK) $(src_drmgr_lsslot_OBJECTS) $(src_drmgr_lsslot_LDADD) $(LIBS) +src/lparstat.$(OBJEXT): src/$(am__dirstamp) \ + src/$(DEPDIR)/$(am__dirstamp) +src/lparstat$(EXEEXT): $(src_lparstat_OBJECTS) $(src_lparstat_DEPENDENCIES) src/$(am__dirstamp) + @rm -f src/lparstat$(EXEEXT) + $(LINK) $(src_lparstat_OBJECTS) $(src_lparstat_LDADD) $(LIBS) +src/lsprop.$(OBJEXT): src/$(am__dirstamp) \ + src/$(DEPDIR)/$(am__dirstamp) +src/lsprop$(EXEEXT): $(src_lsprop_OBJECTS) $(src_lsprop_DEPENDENCIES) src/$(am__dirstamp) + @rm -f src/lsprop$(EXEEXT) + $(LINK) $(src_lsprop_OBJECTS) $(src_lsprop_LDADD) $(LIBS) +src/nvram.$(OBJEXT): src/$(am__dirstamp) src/$(DEPDIR)/$(am__dirstamp) +src/nvram$(EXEEXT): $(src_nvram_OBJECTS) $(src_nvram_DEPENDENCIES) src/$(am__dirstamp) + @rm -f src/nvram$(EXEEXT) + $(LINK) $(src_nvram_OBJECTS) $(src_nvram_LDADD) $(LIBS) +src/ppc64_cpu.$(OBJEXT): src/$(am__dirstamp) \ + src/$(DEPDIR)/$(am__dirstamp) +src/common/librtas_error.$(OBJEXT): src/common/$(am__dirstamp) \ + src/common/$(DEPDIR)/$(am__dirstamp) +src/ppc64_cpu$(EXEEXT): $(src_ppc64_cpu_OBJECTS) $(src_ppc64_cpu_DEPENDENCIES) src/$(am__dirstamp) + @rm -f src/ppc64_cpu$(EXEEXT) + $(LINK) $(src_ppc64_cpu_OBJECTS) $(src_ppc64_cpu_LDADD) $(LIBS) +src/rtas_event_decode.$(OBJEXT): src/$(am__dirstamp) \ + src/$(DEPDIR)/$(am__dirstamp) +src/rtas_event_decode$(EXEEXT): $(src_rtas_event_decode_OBJECTS) $(src_rtas_event_decode_DEPENDENCIES) src/$(am__dirstamp) + @rm -f src/rtas_event_decode$(EXEEXT) + $(LINK) $(src_rtas_event_decode_OBJECTS) $(src_rtas_event_decode_LDADD) $(LIBS) +src/rtas_ibm_get_vpd.$(OBJEXT): src/$(am__dirstamp) \ + src/$(DEPDIR)/$(am__dirstamp) +src/rtas_ibm_get_vpd$(EXEEXT): $(src_rtas_ibm_get_vpd_OBJECTS) $(src_rtas_ibm_get_vpd_DEPENDENCIES) src/$(am__dirstamp) + @rm -f src/rtas_ibm_get_vpd$(EXEEXT) + $(LINK) $(src_rtas_ibm_get_vpd_OBJECTS) $(src_rtas_ibm_get_vpd_LDADD) $(LIBS) +src/serv_config.$(OBJEXT): src/$(am__dirstamp) \ + src/$(DEPDIR)/$(am__dirstamp) +src/serv_config$(EXEEXT): $(src_serv_config_OBJECTS) $(src_serv_config_DEPENDENCIES) src/$(am__dirstamp) + @rm -f src/serv_config$(EXEEXT) + $(LINK) $(src_serv_config_OBJECTS) $(src_serv_config_LDADD) $(LIBS) +src/set_poweron_time.$(OBJEXT): src/$(am__dirstamp) \ + src/$(DEPDIR)/$(am__dirstamp) +src/set_poweron_time$(EXEEXT): $(src_set_poweron_time_OBJECTS) $(src_set_poweron_time_DEPENDENCIES) src/$(am__dirstamp) + @rm -f src/set_poweron_time$(EXEEXT) + $(LINK) $(src_set_poweron_time_OBJECTS) $(src_set_poweron_time_LDADD) $(LIBS) +src/sys_ident.$(OBJEXT): src/$(am__dirstamp) \ + src/$(DEPDIR)/$(am__dirstamp) +src/sys_ident$(EXEEXT): $(src_sys_ident_OBJECTS) $(src_sys_ident_DEPENDENCIES) src/$(am__dirstamp) + @rm -f src/sys_ident$(EXEEXT) + $(LINK) $(src_sys_ident_OBJECTS) $(src_sys_ident_LDADD) $(LIBS) +src/uesensor.$(OBJEXT): src/$(am__dirstamp) \ + src/$(DEPDIR)/$(am__dirstamp) +src/uesensor$(EXEEXT): $(src_uesensor_OBJECTS) $(src_uesensor_DEPENDENCIES) src/$(am__dirstamp) + @rm -f src/uesensor$(EXEEXT) + $(LINK) $(src_uesensor_OBJECTS) $(src_uesensor_LDADD) $(LIBS) +install-binSCRIPTS: $(bin_SCRIPTS) + @$(NORMAL_INSTALL) + test -z "$(bindir)" || $(MKDIR_P) "$(DESTDIR)$(bindir)" + @list='$(bin_SCRIPTS)'; for p in $$list; do \ + if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \ + if test -f $$d$$p; then \ + f=`echo "$$p" | sed 's|^.*/||;$(transform)'`; \ + echo " $(binSCRIPT_INSTALL) '$$d$$p' '$(DESTDIR)$(bindir)/$$f'"; \ + $(binSCRIPT_INSTALL) "$$d$$p" "$(DESTDIR)$(bindir)/$$f"; \ + else :; fi; \ + done + +uninstall-binSCRIPTS: + @$(NORMAL_UNINSTALL) + @list='$(bin_SCRIPTS)'; for p in $$list; do \ + f=`echo "$$p" | sed 's|^.*/||;$(transform)'`; \ + echo " rm -f '$(DESTDIR)$(bindir)/$$f'"; \ + rm -f "$(DESTDIR)$(bindir)/$$f"; \ + done +install-sbinSCRIPTS: $(sbin_SCRIPTS) + @$(NORMAL_INSTALL) + test -z "$(sbindir)" || $(MKDIR_P) "$(DESTDIR)$(sbindir)" + @list='$(sbin_SCRIPTS)'; for p in $$list; do \ + if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \ + if test -f $$d$$p; then \ + f=`echo "$$p" | sed 's|^.*/||;$(transform)'`; \ + echo " $(sbinSCRIPT_INSTALL) '$$d$$p' '$(DESTDIR)$(sbindir)/$$f'"; \ + $(sbinSCRIPT_INSTALL) "$$d$$p" "$(DESTDIR)$(sbindir)/$$f"; \ + else :; fi; \ + done + +uninstall-sbinSCRIPTS: + @$(NORMAL_UNINSTALL) + @list='$(sbin_SCRIPTS)'; for p in $$list; do \ + f=`echo "$$p" | sed 's|^.*/||;$(transform)'`; \ + echo " rm -f '$(DESTDIR)$(sbindir)/$$f'"; \ + rm -f "$(DESTDIR)$(sbindir)/$$f"; \ + done + +mostlyclean-compile: + -rm -f *.$(OBJEXT) + -rm -f src/activate_fw.$(OBJEXT) + -rm -f src/common/librtas_error.$(OBJEXT) + -rm -f src/common/pseries_platform.$(OBJEXT) + -rm -f src/drmgr/common.$(OBJEXT) + -rm -f src/drmgr/common_cpu.$(OBJEXT) + -rm -f src/drmgr/common_ofdt.$(OBJEXT) + -rm -f src/drmgr/common_pci.$(OBJEXT) + -rm -f src/drmgr/drmgr.$(OBJEXT) + -rm -f src/drmgr/drmig_chrp_pmig.$(OBJEXT) + -rm -f src/drmgr/drslot_chrp_cpu.$(OBJEXT) + -rm -f src/drmgr/drslot_chrp_hea.$(OBJEXT) + -rm -f src/drmgr/drslot_chrp_mem.$(OBJEXT) + -rm -f src/drmgr/drslot_chrp_pci.$(OBJEXT) + -rm -f src/drmgr/drslot_chrp_phb.$(OBJEXT) + -rm -f src/drmgr/drslot_chrp_slot.$(OBJEXT) + -rm -f src/drmgr/lsslot.$(OBJEXT) + -rm -f src/drmgr/lsslot_chrp_cpu.$(OBJEXT) + -rm -f src/drmgr/rtas_calls.$(OBJEXT) + -rm -f src/lparstat.$(OBJEXT) + -rm -f src/lsprop.$(OBJEXT) + -rm -f src/nvram.$(OBJEXT) + -rm -f src/ppc64_cpu.$(OBJEXT) + -rm -f src/rtas_event_decode.$(OBJEXT) + -rm -f src/rtas_ibm_get_vpd.$(OBJEXT) + -rm -f src/serv_config.$(OBJEXT) + -rm -f src/set_poweron_time.$(OBJEXT) + -rm -f src/sys_ident.$(OBJEXT) + -rm -f src/uesensor.$(OBJEXT) + +distclean-compile: + -rm -f *.tab.c + +@AMDEP_TRUE@@am__include@ @am__quote@src/$(DEPDIR)/activate_fw.Po@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@src/$(DEPDIR)/lparstat.Po@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@src/$(DEPDIR)/lsprop.Po@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@src/$(DEPDIR)/nvram.Po@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@src/$(DEPDIR)/ppc64_cpu.Po@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@src/$(DEPDIR)/rtas_event_decode.Po@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@src/$(DEPDIR)/rtas_ibm_get_vpd.Po@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@src/$(DEPDIR)/serv_config.Po@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@src/$(DEPDIR)/set_poweron_time.Po@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@src/$(DEPDIR)/sys_ident.Po@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@src/$(DEPDIR)/uesensor.Po@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@src/common/$(DEPDIR)/librtas_error.Po@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@src/common/$(DEPDIR)/pseries_platform.Po@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@src/drmgr/$(DEPDIR)/common.Po@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@src/drmgr/$(DEPDIR)/common_cpu.Po@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@src/drmgr/$(DEPDIR)/common_ofdt.Po@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@src/drmgr/$(DEPDIR)/common_pci.Po@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@src/drmgr/$(DEPDIR)/drmgr.Po@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@src/drmgr/$(DEPDIR)/drmig_chrp_pmig.Po@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@src/drmgr/$(DEPDIR)/drslot_chrp_cpu.Po@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@src/drmgr/$(DEPDIR)/drslot_chrp_hea.Po@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@src/drmgr/$(DEPDIR)/drslot_chrp_mem.Po@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@src/drmgr/$(DEPDIR)/drslot_chrp_pci.Po@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@src/drmgr/$(DEPDIR)/drslot_chrp_phb.Po@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@src/drmgr/$(DEPDIR)/drslot_chrp_slot.Po@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@src/drmgr/$(DEPDIR)/lsslot.Po@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@src/drmgr/$(DEPDIR)/lsslot_chrp_cpu.Po@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@src/drmgr/$(DEPDIR)/rtas_calls.Po@am__quote@ + +.c.o: +@am__fastdepCC_TRUE@ depbase=`echo $@ | sed 's|[^/]*$$|$(DEPDIR)/&|;s|\.o$$||'`;\ +@am__fastdepCC_TRUE@ $(COMPILE) -MT $@ -MD -MP -MF $$depbase.Tpo -c -o $@ $< &&\ +@am__fastdepCC_TRUE@ mv -f $$depbase.Tpo $$depbase.Po +@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ +@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ +@am__fastdepCC_FALSE@ $(COMPILE) -c -o $@ $< + +.c.obj: +@am__fastdepCC_TRUE@ depbase=`echo $@ | sed 's|[^/]*$$|$(DEPDIR)/&|;s|\.obj$$||'`;\ +@am__fastdepCC_TRUE@ $(COMPILE) -MT $@ -MD -MP -MF $$depbase.Tpo -c -o $@ `$(CYGPATH_W) '$<'` &&\ +@am__fastdepCC_TRUE@ mv -f $$depbase.Tpo $$depbase.Po +@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ +@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ +@am__fastdepCC_FALSE@ $(COMPILE) -c -o $@ `$(CYGPATH_W) '$<'` +install-man1: $(man1_MANS) $(man_MANS) + @$(NORMAL_INSTALL) + test -z "$(man1dir)" || $(MKDIR_P) "$(DESTDIR)$(man1dir)" + @list='$(man1_MANS) $(dist_man1_MANS) $(nodist_man1_MANS)'; \ + l2='$(man_MANS) $(dist_man_MANS) $(nodist_man_MANS)'; \ + for i in $$l2; do \ + case "$$i" in \ + *.1*) list="$$list $$i" ;; \ + esac; \ + done; \ + for i in $$list; do \ + if test -f $(srcdir)/$$i; then file=$(srcdir)/$$i; \ + else file=$$i; fi; \ + ext=`echo $$i | sed -e 's/^.*\\.//'`; \ + case "$$ext" in \ + 1*) ;; \ + *) ext='1' ;; \ + esac; \ + inst=`echo $$i | sed -e 's/\\.[0-9a-z]*$$//'`; \ + inst=`echo $$inst | sed -e 's/^.*\///'`; \ + inst=`echo $$inst | sed '$(transform)'`.$$ext; \ + echo " $(INSTALL_DATA) '$$file' '$(DESTDIR)$(man1dir)/$$inst'"; \ + $(INSTALL_DATA) "$$file" "$(DESTDIR)$(man1dir)/$$inst"; \ + done +uninstall-man1: + @$(NORMAL_UNINSTALL) + @list='$(man1_MANS) $(dist_man1_MANS) $(nodist_man1_MANS)'; \ + l2='$(man_MANS) $(dist_man_MANS) $(nodist_man_MANS)'; \ + for i in $$l2; do \ + case "$$i" in \ + *.1*) list="$$list $$i" ;; \ + esac; \ + done; \ + for i in $$list; do \ + ext=`echo $$i | sed -e 's/^.*\\.//'`; \ + case "$$ext" in \ + 1*) ;; \ + *) ext='1' ;; \ + esac; \ + inst=`echo $$i | sed -e 's/\\.[0-9a-z]*$$//'`; \ + inst=`echo $$inst | sed -e 's/^.*\///'`; \ + inst=`echo $$inst | sed '$(transform)'`.$$ext; \ + echo " rm -f '$(DESTDIR)$(man1dir)/$$inst'"; \ + rm -f "$(DESTDIR)$(man1dir)/$$inst"; \ + done +install-man5: $(man5_MANS) $(man_MANS) + @$(NORMAL_INSTALL) + test -z "$(man5dir)" || $(MKDIR_P) "$(DESTDIR)$(man5dir)" + @list='$(man5_MANS) $(dist_man5_MANS) $(nodist_man5_MANS)'; \ + l2='$(man_MANS) $(dist_man_MANS) $(nodist_man_MANS)'; \ + for i in $$l2; do \ + case "$$i" in \ + *.5*) list="$$list $$i" ;; \ + esac; \ + done; \ + for i in $$list; do \ + if test -f $(srcdir)/$$i; then file=$(srcdir)/$$i; \ + else file=$$i; fi; \ + ext=`echo $$i | sed -e 's/^.*\\.//'`; \ + case "$$ext" in \ + 5*) ;; \ + *) ext='5' ;; \ + esac; \ + inst=`echo $$i | sed -e 's/\\.[0-9a-z]*$$//'`; \ + inst=`echo $$inst | sed -e 's/^.*\///'`; \ + inst=`echo $$inst | sed '$(transform)'`.$$ext; \ + echo " $(INSTALL_DATA) '$$file' '$(DESTDIR)$(man5dir)/$$inst'"; \ + $(INSTALL_DATA) "$$file" "$(DESTDIR)$(man5dir)/$$inst"; \ + done +uninstall-man5: + @$(NORMAL_UNINSTALL) + @list='$(man5_MANS) $(dist_man5_MANS) $(nodist_man5_MANS)'; \ + l2='$(man_MANS) $(dist_man_MANS) $(nodist_man_MANS)'; \ + for i in $$l2; do \ + case "$$i" in \ + *.5*) list="$$list $$i" ;; \ + esac; \ + done; \ + for i in $$list; do \ + ext=`echo $$i | sed -e 's/^.*\\.//'`; \ + case "$$ext" in \ + 5*) ;; \ + *) ext='5' ;; \ + esac; \ + inst=`echo $$i | sed -e 's/\\.[0-9a-z]*$$//'`; \ + inst=`echo $$inst | sed -e 's/^.*\///'`; \ + inst=`echo $$inst | sed '$(transform)'`.$$ext; \ + echo " rm -f '$(DESTDIR)$(man5dir)/$$inst'"; \ + rm -f "$(DESTDIR)$(man5dir)/$$inst"; \ + done +install-man8: $(man8_MANS) $(man_MANS) + @$(NORMAL_INSTALL) + test -z "$(man8dir)" || $(MKDIR_P) "$(DESTDIR)$(man8dir)" + @list='$(man8_MANS) $(dist_man8_MANS) $(nodist_man8_MANS)'; \ + l2='$(man_MANS) $(dist_man_MANS) $(nodist_man_MANS)'; \ + for i in $$l2; do \ + case "$$i" in \ + *.8*) list="$$list $$i" ;; \ + esac; \ + done; \ + for i in $$list; do \ + if test -f $(srcdir)/$$i; then file=$(srcdir)/$$i; \ + else file=$$i; fi; \ + ext=`echo $$i | sed -e 's/^.*\\.//'`; \ + case "$$ext" in \ + 8*) ;; \ + *) ext='8' ;; \ + esac; \ + inst=`echo $$i | sed -e 's/\\.[0-9a-z]*$$//'`; \ + inst=`echo $$inst | sed -e 's/^.*\///'`; \ + inst=`echo $$inst | sed '$(transform)'`.$$ext; \ + echo " $(INSTALL_DATA) '$$file' '$(DESTDIR)$(man8dir)/$$inst'"; \ + $(INSTALL_DATA) "$$file" "$(DESTDIR)$(man8dir)/$$inst"; \ + done +uninstall-man8: + @$(NORMAL_UNINSTALL) + @list='$(man8_MANS) $(dist_man8_MANS) $(nodist_man8_MANS)'; \ + l2='$(man_MANS) $(dist_man_MANS) $(nodist_man_MANS)'; \ + for i in $$l2; do \ + case "$$i" in \ + *.8*) list="$$list $$i" ;; \ + esac; \ + done; \ + for i in $$list; do \ + ext=`echo $$i | sed -e 's/^.*\\.//'`; \ + case "$$ext" in \ + 8*) ;; \ + *) ext='8' ;; \ + esac; \ + inst=`echo $$i | sed -e 's/\\.[0-9a-z]*$$//'`; \ + inst=`echo $$inst | sed -e 's/^.*\///'`; \ + inst=`echo $$inst | sed '$(transform)'`.$$ext; \ + echo " rm -f '$(DESTDIR)$(man8dir)/$$inst'"; \ + rm -f "$(DESTDIR)$(man8dir)/$$inst"; \ + done install-docDATA: $(doc_DATA) @$(NORMAL_INSTALL) test -z "$(docdir)" || $(MKDIR_P) "$(DESTDIR)$(docdir)" @@ -223,76 +843,6 @@ rm -f "$(DESTDIR)$(docdir)/$$f"; \ done -# This directory's subdirectories are mostly independent; you can cd -# into them and run `make' without going through this Makefile. -# To change the values of `make' variables: instead of editing Makefiles, -# (1) if the variable is set in `config.status', edit `config.status' -# (which will cause the Makefiles to be regenerated when you run `make'); -# (2) otherwise, pass the desired values on the `make' command line. -$(RECURSIVE_TARGETS): - @failcom='exit 1'; \ - for f in x $$MAKEFLAGS; do \ - case $$f in \ - *=* | --[!k]*);; \ - *k*) failcom='fail=yes';; \ - esac; \ - done; \ - dot_seen=no; \ - target=`echo $@ | sed s/-recursive//`; \ - list='$(SUBDIRS)'; for subdir in $$list; do \ - echo "Making $$target in $$subdir"; \ - if test "$$subdir" = "."; then \ - dot_seen=yes; \ - local_target="$$target-am"; \ - else \ - local_target="$$target"; \ - fi; \ - (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \ - || eval $$failcom; \ - done; \ - if test "$$dot_seen" = "no"; then \ - $(MAKE) $(AM_MAKEFLAGS) "$$target-am" || exit 1; \ - fi; test -z "$$fail" - -$(RECURSIVE_CLEAN_TARGETS): - @failcom='exit 1'; \ - for f in x $$MAKEFLAGS; do \ - case $$f in \ - *=* | --[!k]*);; \ - *k*) failcom='fail=yes';; \ - esac; \ - done; \ - dot_seen=no; \ - case "$@" in \ - distclean-* | maintainer-clean-*) list='$(DIST_SUBDIRS)' ;; \ - *) list='$(SUBDIRS)' ;; \ - esac; \ - rev=''; for subdir in $$list; do \ - if test "$$subdir" = "."; then :; else \ - rev="$$subdir $$rev"; \ - fi; \ - done; \ - rev="$$rev ."; \ - target=`echo $@ | sed s/-recursive//`; \ - for subdir in $$rev; do \ - echo "Making $$target in $$subdir"; \ - if test "$$subdir" = "."; then \ - local_target="$$target-am"; \ - else \ - local_target="$$target"; \ - fi; \ - (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \ - || eval $$failcom; \ - done && test -z "$$fail" -tags-recursive: - list='$(SUBDIRS)'; for subdir in $$list; do \ - test "$$subdir" = . || (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) tags); \ - done -ctags-recursive: - list='$(SUBDIRS)'; for subdir in $$list; do \ - test "$$subdir" = . || (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) ctags); \ - done - ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES) list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ unique=`for i in $$list; do \ @@ -303,23 +853,10 @@ mkid -fID $$unique tags: TAGS -TAGS: tags-recursive $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ +TAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ $(TAGS_FILES) $(LISP) tags=; \ here=`pwd`; \ - if ($(ETAGS) --etags-include --version) >/dev/null 2>&1; then \ - include_option=--etags-include; \ - empty_fix=.; \ - else \ - include_option=--include; \ - empty_fix=; \ - fi; \ - list='$(SUBDIRS)'; for subdir in $$list; do \ - if test "$$subdir" = .; then :; else \ - test ! -f $$subdir/TAGS || \ - tags="$$tags $$include_option=$$here/$$subdir/TAGS"; \ - fi; \ - done; \ list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ unique=`for i in $$list; do \ if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ @@ -332,7 +869,7 @@ $$tags $$unique; \ fi ctags: CTAGS -CTAGS: ctags-recursive $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ +CTAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ $(TAGS_FILES) $(LISP) tags=; \ list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ @@ -381,24 +918,7 @@ || exit 1; \ fi; \ done - list='$(DIST_SUBDIRS)'; for subdir in $$list; do \ - if test "$$subdir" = .; then :; else \ - test -d "$(distdir)/$$subdir" \ - || $(MKDIR_P) "$(distdir)/$$subdir" \ - || exit 1; \ - distdir=`$(am__cd) $(distdir) && pwd`; \ - top_distdir=`$(am__cd) $(top_distdir) && pwd`; \ - (cd $$subdir && \ - $(MAKE) $(AM_MAKEFLAGS) \ - top_distdir="$$top_distdir" \ - distdir="$$distdir/$$subdir" \ - am__remove_distdir=: \ - am__skip_length_check=: \ - distdir) \ - || exit 1; \ - fi; \ - done - -find $(distdir) -type d ! -perm -777 -exec chmod a+rwx {} \; -o \ + -find $(distdir) -type d ! -perm -755 -exec chmod u+rwx,og+rx {} \; -o \ ! -type d ! -perm -444 -links 1 -exec chmod a+r {} \; -o \ ! -type d ! -perm -400 -exec chmod a+r {} \; -o \ ! -type d ! -perm -444 -exec $(install_sh) -c -m a+r {} {} \; \ @@ -450,7 +970,7 @@ *.zip*) \ unzip $(distdir).zip ;;\ esac - chmod -R a-w $(distdir); chmod a+w $(distdir) + chmod -R a-w $(distdir); chmod u+w $(distdir) mkdir $(distdir)/_build mkdir $(distdir)/_inst chmod a-w $(distdir) @@ -502,22 +1022,21 @@ $(distcleancheck_listfiles) ; \ exit 1; } >&2 check-am: all-am -check: check-recursive -all-am: Makefile $(DATA) -installdirs: installdirs-recursive -installdirs-am: - for dir in "$(DESTDIR)$(docdir)"; do \ +check: check-am +all-am: Makefile $(PROGRAMS) $(SCRIPTS) $(MANS) $(DATA) $(HEADERS) +installdirs: + for dir in "$(DESTDIR)$(sbindir)" "$(DESTDIR)$(bindir)" "$(DESTDIR)$(sbindir)" "$(DESTDIR)$(man1dir)" "$(DESTDIR)$(man5dir)" "$(DESTDIR)$(man8dir)" "$(DESTDIR)$(docdir)"; do \ test -z "$$dir" || $(MKDIR_P) "$$dir"; \ done -install: install-recursive -install-exec: install-exec-recursive -install-data: install-data-recursive -uninstall: uninstall-recursive +install: install-am +install-exec: install-exec-am +install-data: install-data-am +uninstall: uninstall-am install-am: all-am @$(MAKE) $(AM_MAKEFLAGS) install-exec-am install-data-am -installcheck: installcheck-recursive +installcheck: installcheck-am install-strip: $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \ install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \ @@ -529,90 +1048,101 @@ distclean-generic: -test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES) + -rm -f src/$(DEPDIR)/$(am__dirstamp) + -rm -f src/$(am__dirstamp) + -rm -f src/common/$(DEPDIR)/$(am__dirstamp) + -rm -f src/common/$(am__dirstamp) + -rm -f src/drmgr/$(DEPDIR)/$(am__dirstamp) + -rm -f src/drmgr/$(am__dirstamp) maintainer-clean-generic: @echo "This command is intended for maintainers to use" @echo "it deletes files that may require special tools to rebuild." -clean: clean-recursive +clean: clean-am -clean-am: clean-generic mostlyclean-am +clean-am: clean-generic clean-sbinPROGRAMS mostlyclean-am -distclean: distclean-recursive +distclean: distclean-am -rm -f $(am__CONFIG_DISTCLEAN_FILES) + -rm -rf src/$(DEPDIR) src/common/$(DEPDIR) src/drmgr/$(DEPDIR) -rm -f Makefile -distclean-am: clean-am distclean-generic distclean-tags +distclean-am: clean-am distclean-compile distclean-generic \ + distclean-tags -dvi: dvi-recursive +dvi: dvi-am dvi-am: -html: html-recursive +html: html-am -info: info-recursive +info: info-am info-am: -install-data-am: install-docDATA +install-data-am: install-docDATA install-man -install-dvi: install-dvi-recursive +install-dvi: install-dvi-am -install-exec-am: +install-exec-am: install-binSCRIPTS install-sbinPROGRAMS \ + install-sbinSCRIPTS -install-html: install-html-recursive +install-html: install-html-am -install-info: install-info-recursive +install-info: install-info-am -install-man: +install-man: install-man1 install-man5 install-man8 -install-pdf: install-pdf-recursive +install-pdf: install-pdf-am -install-ps: install-ps-recursive +install-ps: install-ps-am installcheck-am: -maintainer-clean: maintainer-clean-recursive +maintainer-clean: maintainer-clean-am -rm -f $(am__CONFIG_DISTCLEAN_FILES) -rm -rf $(top_srcdir)/autom4te.cache + -rm -rf src/$(DEPDIR) src/common/$(DEPDIR) src/drmgr/$(DEPDIR) -rm -f Makefile maintainer-clean-am: distclean-am maintainer-clean-generic -mostlyclean: mostlyclean-recursive +mostlyclean: mostlyclean-am -mostlyclean-am: mostlyclean-generic +mostlyclean-am: mostlyclean-compile mostlyclean-generic -pdf: pdf-recursive +pdf: pdf-am pdf-am: -ps: ps-recursive +ps: ps-am ps-am: -uninstall-am: uninstall-docDATA +uninstall-am: uninstall-binSCRIPTS uninstall-docDATA uninstall-man \ + uninstall-sbinPROGRAMS uninstall-sbinSCRIPTS -.MAKE: $(RECURSIVE_CLEAN_TARGETS) $(RECURSIVE_TARGETS) install-am \ - install-strip +uninstall-man: uninstall-man1 uninstall-man5 uninstall-man8 -.PHONY: $(RECURSIVE_CLEAN_TARGETS) $(RECURSIVE_TARGETS) CTAGS GTAGS \ - all all-am am--refresh check check-am clean clean-generic \ - ctags ctags-recursive dist dist-all dist-bzip2 dist-gzip \ - dist-lzma dist-shar dist-tarZ dist-zip distcheck distclean \ - distclean-generic distclean-tags distcleancheck distdir \ - distuninstallcheck dvi dvi-am html html-am info info-am \ - install install-am install-data install-data-am \ +.MAKE: install-am install-strip + +.PHONY: CTAGS GTAGS all all-am am--refresh check check-am clean \ + clean-generic clean-sbinPROGRAMS ctags dist dist-all \ + dist-bzip2 dist-gzip dist-lzma dist-shar dist-tarZ dist-zip \ + distcheck distclean distclean-compile distclean-generic \ + distclean-tags distcleancheck distdir distuninstallcheck dvi \ + dvi-am html html-am info info-am install install-am \ + install-binSCRIPTS install-data install-data-am \ install-docDATA install-dvi install-dvi-am install-exec \ install-exec-am install-html install-html-am install-info \ - install-info-am install-man install-pdf install-pdf-am \ - install-ps install-ps-am install-strip installcheck \ - installcheck-am installdirs installdirs-am maintainer-clean \ - maintainer-clean-generic mostlyclean mostlyclean-generic pdf \ - pdf-am ps ps-am tags tags-recursive uninstall uninstall-am \ - uninstall-docDATA - + install-info-am install-man install-man1 install-man5 \ + install-man8 install-pdf install-pdf-am install-ps \ + install-ps-am install-sbinPROGRAMS install-sbinSCRIPTS \ + install-strip installcheck installcheck-am installdirs \ + maintainer-clean maintainer-clean-generic mostlyclean \ + mostlyclean-compile mostlyclean-generic pdf pdf-am ps ps-am \ + tags uninstall uninstall-am uninstall-binSCRIPTS \ + uninstall-docDATA uninstall-man uninstall-man1 uninstall-man5 \ + uninstall-man8 uninstall-sbinPROGRAMS uninstall-sbinSCRIPTS -really-clean: maintainer-clean - -rm -f powerpc-utils.spec - -rm -f $(AC_CLEAN_FILES) # Tell versions [3.59,3.63) of GNU make to not export all variables. # Otherwise a system limit (for SysV at least) may be exceeded. .NOEXPORT: diff -Nru powerpc-ibm-utils-1.2.20/man/Makefile.am powerpc-ibm-utils-1.2.22/man/Makefile.am --- powerpc-ibm-utils-1.2.20/man/Makefile.am 2014-03-12 13:05:04.000000000 +0000 +++ powerpc-ibm-utils-1.2.22/man/Makefile.am 1970-01-01 00:00:00.000000000 +0000 @@ -1,6 +0,0 @@ -dist_man_MANS = activate_firmware.8 rtas_ibm_get_vpd.8 \ - uesensor.8 amsstat.1 serv_config.8 \ - update_flash.8 nvram.8 set_poweron_time.8 \ - bootlist.8 ofpathname.8 snap.8 hvcsadmin.8 \ - rtas_dump.8 sys_ident.8 lparcfg.5 lparstat.8 lsslot.8 - diff -Nru powerpc-ibm-utils-1.2.20/man/Makefile.in powerpc-ibm-utils-1.2.22/man/Makefile.in --- powerpc-ibm-utils-1.2.20/man/Makefile.in 2014-03-21 20:24:02.000000000 +0000 +++ powerpc-ibm-utils-1.2.22/man/Makefile.in 1970-01-01 00:00:00.000000000 +0000 @@ -1,445 +0,0 @@ -# Makefile.in generated by automake 1.10.1 from Makefile.am. -# @configure_input@ - -# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, -# 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc. -# This Makefile.in is free software; the Free Software Foundation -# gives unlimited permission to copy and/or distribute it, -# with or without modifications, as long as this notice is preserved. - -# This program is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY, to the extent permitted by law; without -# even the implied warranty of MERCHANTABILITY or FITNESS FOR A -# PARTICULAR PURPOSE. - -@SET_MAKE@ -VPATH = @srcdir@ -pkgdatadir = $(datadir)/@PACKAGE@ -pkglibdir = $(libdir)/@PACKAGE@ -pkgincludedir = $(includedir)/@PACKAGE@ -am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd -install_sh_DATA = $(install_sh) -c -m 644 -install_sh_PROGRAM = $(install_sh) -c -install_sh_SCRIPT = $(install_sh) -c -INSTALL_HEADER = $(INSTALL_DATA) -transform = $(program_transform_name) -NORMAL_INSTALL = : -PRE_INSTALL = : -POST_INSTALL = : -NORMAL_UNINSTALL = : -PRE_UNINSTALL = : -POST_UNINSTALL = : -subdir = man -DIST_COMMON = $(dist_man_MANS) $(srcdir)/Makefile.am \ - $(srcdir)/Makefile.in -ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 -am__aclocal_m4_deps = $(top_srcdir)/configure.ac -am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ - $(ACLOCAL_M4) -mkinstalldirs = $(install_sh) -d -CONFIG_CLEAN_FILES = -SOURCES = -DIST_SOURCES = -man1dir = $(mandir)/man1 -am__installdirs = "$(DESTDIR)$(man1dir)" "$(DESTDIR)$(man5dir)" \ - "$(DESTDIR)$(man8dir)" -man5dir = $(mandir)/man5 -man8dir = $(mandir)/man8 -NROFF = nroff -MANS = $(dist_man_MANS) -DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) -ACLOCAL = @ACLOCAL@ -AMTAR = @AMTAR@ -AUTOCONF = @AUTOCONF@ -AUTOHEADER = @AUTOHEADER@ -AUTOMAKE = @AUTOMAKE@ -AWK = @AWK@ -CC = @CC@ -CCDEPMODE = @CCDEPMODE@ -CFLAGS = @CFLAGS@ -CPP = @CPP@ -CPPFLAGS = @CPPFLAGS@ -CYGPATH_W = @CYGPATH_W@ -DEFS = @DEFS@ -DEPDIR = @DEPDIR@ -ECHO_C = @ECHO_C@ -ECHO_N = @ECHO_N@ -ECHO_T = @ECHO_T@ -EGREP = @EGREP@ -EXEEXT = @EXEEXT@ -GREP = @GREP@ -INSTALL = @INSTALL@ -INSTALL_DATA = @INSTALL_DATA@ -INSTALL_PROGRAM = @INSTALL_PROGRAM@ -INSTALL_SCRIPT = @INSTALL_SCRIPT@ -INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@ -LDFLAGS = @LDFLAGS@ -LIBOBJS = @LIBOBJS@ -LIBS = @LIBS@ -LTLIBOBJS = @LTLIBOBJS@ -MAKEINFO = @MAKEINFO@ -MKDIR_P = @MKDIR_P@ -OBJEXT = @OBJEXT@ -PACKAGE = @PACKAGE@ -PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@ -PACKAGE_NAME = @PACKAGE_NAME@ -PACKAGE_STRING = @PACKAGE_STRING@ -PACKAGE_TARNAME = @PACKAGE_TARNAME@ -PACKAGE_VERSION = @PACKAGE_VERSION@ -PATH_SEPARATOR = @PATH_SEPARATOR@ -SET_MAKE = @SET_MAKE@ -SHELL = @SHELL@ -STRIP = @STRIP@ -VERSION = @VERSION@ -abs_builddir = @abs_builddir@ -abs_srcdir = @abs_srcdir@ -abs_top_builddir = @abs_top_builddir@ -abs_top_srcdir = @abs_top_srcdir@ -ac_ct_CC = @ac_ct_CC@ -am__include = @am__include@ -am__leading_dot = @am__leading_dot@ -am__quote = @am__quote@ -am__tar = @am__tar@ -am__untar = @am__untar@ -bindir = @bindir@ -build_alias = @build_alias@ -builddir = @builddir@ -datadir = @datadir@ -datarootdir = @datarootdir@ -docdir = @docdir@ -dvidir = @dvidir@ -exec_prefix = @exec_prefix@ -host_alias = @host_alias@ -htmldir = @htmldir@ -includedir = @includedir@ -infodir = @infodir@ -install_sh = @install_sh@ -libdir = @libdir@ -libexecdir = @libexecdir@ -localedir = @localedir@ -localstatedir = @localstatedir@ -mandir = @mandir@ -mkdir_p = @mkdir_p@ -oldincludedir = @oldincludedir@ -pdfdir = @pdfdir@ -prefix = @prefix@ -program_transform_name = @program_transform_name@ -psdir = @psdir@ -sbindir = @sbindir@ -sharedstatedir = @sharedstatedir@ -srcdir = @srcdir@ -sysconfdir = @sysconfdir@ -target_alias = @target_alias@ -top_build_prefix = @top_build_prefix@ -top_builddir = @top_builddir@ -top_srcdir = @top_srcdir@ -dist_man_MANS = activate_firmware.8 rtas_ibm_get_vpd.8 \ - uesensor.8 amsstat.1 serv_config.8 \ - update_flash.8 nvram.8 set_poweron_time.8 \ - bootlist.8 ofpathname.8 snap.8 hvcsadmin.8 \ - rtas_dump.8 sys_ident.8 lparcfg.5 lparstat.8 lsslot.8 - -all: all-am - -.SUFFIXES: -$(srcdir)/Makefile.in: $(srcdir)/Makefile.am $(am__configure_deps) - @for dep in $?; do \ - case '$(am__configure_deps)' in \ - *$$dep*) \ - cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \ - && exit 0; \ - exit 1;; \ - esac; \ - done; \ - echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign man/Makefile'; \ - cd $(top_srcdir) && \ - $(AUTOMAKE) --foreign man/Makefile -.PRECIOUS: Makefile -Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status - @case '$?' in \ - *config.status*) \ - cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh;; \ - *) \ - echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)'; \ - cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe);; \ - esac; - -$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES) - cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh - -$(top_srcdir)/configure: $(am__configure_deps) - cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh -$(ACLOCAL_M4): $(am__aclocal_m4_deps) - cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh -install-man1: $(man1_MANS) $(man_MANS) - @$(NORMAL_INSTALL) - test -z "$(man1dir)" || $(MKDIR_P) "$(DESTDIR)$(man1dir)" - @list='$(man1_MANS) $(dist_man1_MANS) $(nodist_man1_MANS)'; \ - l2='$(man_MANS) $(dist_man_MANS) $(nodist_man_MANS)'; \ - for i in $$l2; do \ - case "$$i" in \ - *.1*) list="$$list $$i" ;; \ - esac; \ - done; \ - for i in $$list; do \ - if test -f $(srcdir)/$$i; then file=$(srcdir)/$$i; \ - else file=$$i; fi; \ - ext=`echo $$i | sed -e 's/^.*\\.//'`; \ - case "$$ext" in \ - 1*) ;; \ - *) ext='1' ;; \ - esac; \ - inst=`echo $$i | sed -e 's/\\.[0-9a-z]*$$//'`; \ - inst=`echo $$inst | sed -e 's/^.*\///'`; \ - inst=`echo $$inst | sed '$(transform)'`.$$ext; \ - echo " $(INSTALL_DATA) '$$file' '$(DESTDIR)$(man1dir)/$$inst'"; \ - $(INSTALL_DATA) "$$file" "$(DESTDIR)$(man1dir)/$$inst"; \ - done -uninstall-man1: - @$(NORMAL_UNINSTALL) - @list='$(man1_MANS) $(dist_man1_MANS) $(nodist_man1_MANS)'; \ - l2='$(man_MANS) $(dist_man_MANS) $(nodist_man_MANS)'; \ - for i in $$l2; do \ - case "$$i" in \ - *.1*) list="$$list $$i" ;; \ - esac; \ - done; \ - for i in $$list; do \ - ext=`echo $$i | sed -e 's/^.*\\.//'`; \ - case "$$ext" in \ - 1*) ;; \ - *) ext='1' ;; \ - esac; \ - inst=`echo $$i | sed -e 's/\\.[0-9a-z]*$$//'`; \ - inst=`echo $$inst | sed -e 's/^.*\///'`; \ - inst=`echo $$inst | sed '$(transform)'`.$$ext; \ - echo " rm -f '$(DESTDIR)$(man1dir)/$$inst'"; \ - rm -f "$(DESTDIR)$(man1dir)/$$inst"; \ - done -install-man5: $(man5_MANS) $(man_MANS) - @$(NORMAL_INSTALL) - test -z "$(man5dir)" || $(MKDIR_P) "$(DESTDIR)$(man5dir)" - @list='$(man5_MANS) $(dist_man5_MANS) $(nodist_man5_MANS)'; \ - l2='$(man_MANS) $(dist_man_MANS) $(nodist_man_MANS)'; \ - for i in $$l2; do \ - case "$$i" in \ - *.5*) list="$$list $$i" ;; \ - esac; \ - done; \ - for i in $$list; do \ - if test -f $(srcdir)/$$i; then file=$(srcdir)/$$i; \ - else file=$$i; fi; \ - ext=`echo $$i | sed -e 's/^.*\\.//'`; \ - case "$$ext" in \ - 5*) ;; \ - *) ext='5' ;; \ - esac; \ - inst=`echo $$i | sed -e 's/\\.[0-9a-z]*$$//'`; \ - inst=`echo $$inst | sed -e 's/^.*\///'`; \ - inst=`echo $$inst | sed '$(transform)'`.$$ext; \ - echo " $(INSTALL_DATA) '$$file' '$(DESTDIR)$(man5dir)/$$inst'"; \ - $(INSTALL_DATA) "$$file" "$(DESTDIR)$(man5dir)/$$inst"; \ - done -uninstall-man5: - @$(NORMAL_UNINSTALL) - @list='$(man5_MANS) $(dist_man5_MANS) $(nodist_man5_MANS)'; \ - l2='$(man_MANS) $(dist_man_MANS) $(nodist_man_MANS)'; \ - for i in $$l2; do \ - case "$$i" in \ - *.5*) list="$$list $$i" ;; \ - esac; \ - done; \ - for i in $$list; do \ - ext=`echo $$i | sed -e 's/^.*\\.//'`; \ - case "$$ext" in \ - 5*) ;; \ - *) ext='5' ;; \ - esac; \ - inst=`echo $$i | sed -e 's/\\.[0-9a-z]*$$//'`; \ - inst=`echo $$inst | sed -e 's/^.*\///'`; \ - inst=`echo $$inst | sed '$(transform)'`.$$ext; \ - echo " rm -f '$(DESTDIR)$(man5dir)/$$inst'"; \ - rm -f "$(DESTDIR)$(man5dir)/$$inst"; \ - done -install-man8: $(man8_MANS) $(man_MANS) - @$(NORMAL_INSTALL) - test -z "$(man8dir)" || $(MKDIR_P) "$(DESTDIR)$(man8dir)" - @list='$(man8_MANS) $(dist_man8_MANS) $(nodist_man8_MANS)'; \ - l2='$(man_MANS) $(dist_man_MANS) $(nodist_man_MANS)'; \ - for i in $$l2; do \ - case "$$i" in \ - *.8*) list="$$list $$i" ;; \ - esac; \ - done; \ - for i in $$list; do \ - if test -f $(srcdir)/$$i; then file=$(srcdir)/$$i; \ - else file=$$i; fi; \ - ext=`echo $$i | sed -e 's/^.*\\.//'`; \ - case "$$ext" in \ - 8*) ;; \ - *) ext='8' ;; \ - esac; \ - inst=`echo $$i | sed -e 's/\\.[0-9a-z]*$$//'`; \ - inst=`echo $$inst | sed -e 's/^.*\///'`; \ - inst=`echo $$inst | sed '$(transform)'`.$$ext; \ - echo " $(INSTALL_DATA) '$$file' '$(DESTDIR)$(man8dir)/$$inst'"; \ - $(INSTALL_DATA) "$$file" "$(DESTDIR)$(man8dir)/$$inst"; \ - done -uninstall-man8: - @$(NORMAL_UNINSTALL) - @list='$(man8_MANS) $(dist_man8_MANS) $(nodist_man8_MANS)'; \ - l2='$(man_MANS) $(dist_man_MANS) $(nodist_man_MANS)'; \ - for i in $$l2; do \ - case "$$i" in \ - *.8*) list="$$list $$i" ;; \ - esac; \ - done; \ - for i in $$list; do \ - ext=`echo $$i | sed -e 's/^.*\\.//'`; \ - case "$$ext" in \ - 8*) ;; \ - *) ext='8' ;; \ - esac; \ - inst=`echo $$i | sed -e 's/\\.[0-9a-z]*$$//'`; \ - inst=`echo $$inst | sed -e 's/^.*\///'`; \ - inst=`echo $$inst | sed '$(transform)'`.$$ext; \ - echo " rm -f '$(DESTDIR)$(man8dir)/$$inst'"; \ - rm -f "$(DESTDIR)$(man8dir)/$$inst"; \ - done -tags: TAGS -TAGS: - -ctags: CTAGS -CTAGS: - - -distdir: $(DISTFILES) - @srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \ - topsrcdirstrip=`echo "$(top_srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \ - list='$(DISTFILES)'; \ - dist_files=`for file in $$list; do echo $$file; done | \ - sed -e "s|^$$srcdirstrip/||;t" \ - -e "s|^$$topsrcdirstrip/|$(top_builddir)/|;t"`; \ - case $$dist_files in \ - */*) $(MKDIR_P) `echo "$$dist_files" | \ - sed '/\//!d;s|^|$(distdir)/|;s,/[^/]*$$,,' | \ - sort -u` ;; \ - esac; \ - for file in $$dist_files; do \ - if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \ - if test -d $$d/$$file; then \ - dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \ - if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \ - cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \ - fi; \ - cp -pR $$d/$$file $(distdir)$$dir || exit 1; \ - else \ - test -f $(distdir)/$$file \ - || cp -p $$d/$$file $(distdir)/$$file \ - || exit 1; \ - fi; \ - done -check-am: all-am -check: check-am -all-am: Makefile $(MANS) -installdirs: - for dir in "$(DESTDIR)$(man1dir)" "$(DESTDIR)$(man5dir)" "$(DESTDIR)$(man8dir)"; do \ - test -z "$$dir" || $(MKDIR_P) "$$dir"; \ - done -install: install-am -install-exec: install-exec-am -install-data: install-data-am -uninstall: uninstall-am - -install-am: all-am - @$(MAKE) $(AM_MAKEFLAGS) install-exec-am install-data-am - -installcheck: installcheck-am -install-strip: - $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \ - install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \ - `test -z '$(STRIP)' || \ - echo "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'"` install -mostlyclean-generic: - -clean-generic: - -distclean-generic: - -test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES) - -maintainer-clean-generic: - @echo "This command is intended for maintainers to use" - @echo "it deletes files that may require special tools to rebuild." -clean: clean-am - -clean-am: clean-generic mostlyclean-am - -distclean: distclean-am - -rm -f Makefile -distclean-am: clean-am distclean-generic - -dvi: dvi-am - -dvi-am: - -html: html-am - -info: info-am - -info-am: - -install-data-am: install-man - -install-dvi: install-dvi-am - -install-exec-am: - -install-html: install-html-am - -install-info: install-info-am - -install-man: install-man1 install-man5 install-man8 - -install-pdf: install-pdf-am - -install-ps: install-ps-am - -installcheck-am: - -maintainer-clean: maintainer-clean-am - -rm -f Makefile -maintainer-clean-am: distclean-am maintainer-clean-generic - -mostlyclean: mostlyclean-am - -mostlyclean-am: mostlyclean-generic - -pdf: pdf-am - -pdf-am: - -ps: ps-am - -ps-am: - -uninstall-am: uninstall-man - -uninstall-man: uninstall-man1 uninstall-man5 uninstall-man8 - -.MAKE: install-am install-strip - -.PHONY: all all-am check check-am clean clean-generic distclean \ - distclean-generic distdir dvi dvi-am html html-am info info-am \ - install install-am install-data install-data-am install-dvi \ - install-dvi-am install-exec install-exec-am install-html \ - install-html-am install-info install-info-am install-man \ - install-man1 install-man5 install-man8 install-pdf \ - install-pdf-am install-ps install-ps-am install-strip \ - installcheck installcheck-am installdirs maintainer-clean \ - maintainer-clean-generic mostlyclean mostlyclean-generic pdf \ - pdf-am ps ps-am uninstall uninstall-am uninstall-man \ - uninstall-man1 uninstall-man5 uninstall-man8 - -# Tell versions [3.59,3.63) of GNU make to not export all variables. -# Otherwise a system limit (for SysV at least) may be exceeded. -.NOEXPORT: diff -Nru powerpc-ibm-utils-1.2.20/man/update_flash.8 powerpc-ibm-utils-1.2.22/man/update_flash.8 --- powerpc-ibm-utils-1.2.20/man/update_flash.8 2014-03-12 13:05:04.000000000 +0000 +++ powerpc-ibm-utils-1.2.22/man/update_flash.8 2014-08-13 12:26:23.000000000 +0000 @@ -93,7 +93,7 @@ .SH OPTIONS .TP -.B\-h +.B \-h Print the usage message and exit. .TP \fB\-f \fIfilename diff -Nru powerpc-ibm-utils-1.2.20/powerpc-utils.spec.in powerpc-ibm-utils-1.2.22/powerpc-utils.spec.in --- powerpc-ibm-utils-1.2.20/powerpc-utils.spec.in 2014-03-12 13:05:04.000000000 +0000 +++ powerpc-ibm-utils-1.2.22/powerpc-utils.spec.in 2014-08-13 12:26:23.000000000 +0000 @@ -1,5 +1,5 @@ %define name powerpc-utils -%define version @VERSION@ +%define version @PACKAGE_VERSION@ %define release 2 Summary: Utilities for PowerPC platforms Name: %{name} diff -Nru powerpc-ibm-utils-1.2.20/scripts/Makefile.am powerpc-ibm-utils-1.2.22/scripts/Makefile.am --- powerpc-ibm-utils-1.2.20/scripts/Makefile.am 2014-03-12 13:05:04.000000000 +0000 +++ powerpc-ibm-utils-1.2.22/scripts/Makefile.am 1970-01-01 00:00:00.000000000 +0000 @@ -1,5 +0,0 @@ -dist_bin_SCRIPTS = amsstat - -dist_sbin_SCRIPTS = update_flash update_flash_nv hvcsadmin rtas_dump \ - snap bootlist ofpathname lsdevinfo ls-veth ls-vscsi \ - ls-vdev pseries_platform diff -Nru powerpc-ibm-utils-1.2.20/scripts/Makefile.in powerpc-ibm-utils-1.2.22/scripts/Makefile.in --- powerpc-ibm-utils-1.2.20/scripts/Makefile.in 2014-03-21 20:24:02.000000000 +0000 +++ powerpc-ibm-utils-1.2.22/scripts/Makefile.in 1970-01-01 00:00:00.000000000 +0000 @@ -1,343 +0,0 @@ -# Makefile.in generated by automake 1.10.1 from Makefile.am. -# @configure_input@ - -# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, -# 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc. -# This Makefile.in is free software; the Free Software Foundation -# gives unlimited permission to copy and/or distribute it, -# with or without modifications, as long as this notice is preserved. - -# This program is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY, to the extent permitted by law; without -# even the implied warranty of MERCHANTABILITY or FITNESS FOR A -# PARTICULAR PURPOSE. - -@SET_MAKE@ - -VPATH = @srcdir@ -pkgdatadir = $(datadir)/@PACKAGE@ -pkglibdir = $(libdir)/@PACKAGE@ -pkgincludedir = $(includedir)/@PACKAGE@ -am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd -install_sh_DATA = $(install_sh) -c -m 644 -install_sh_PROGRAM = $(install_sh) -c -install_sh_SCRIPT = $(install_sh) -c -INSTALL_HEADER = $(INSTALL_DATA) -transform = $(program_transform_name) -NORMAL_INSTALL = : -PRE_INSTALL = : -POST_INSTALL = : -NORMAL_UNINSTALL = : -PRE_UNINSTALL = : -POST_UNINSTALL = : -subdir = scripts -DIST_COMMON = $(dist_bin_SCRIPTS) $(dist_sbin_SCRIPTS) \ - $(srcdir)/Makefile.am $(srcdir)/Makefile.in -ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 -am__aclocal_m4_deps = $(top_srcdir)/configure.ac -am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ - $(ACLOCAL_M4) -mkinstalldirs = $(install_sh) -d -CONFIG_CLEAN_FILES = -am__installdirs = "$(DESTDIR)$(bindir)" "$(DESTDIR)$(sbindir)" -dist_binSCRIPT_INSTALL = $(INSTALL_SCRIPT) -dist_sbinSCRIPT_INSTALL = $(INSTALL_SCRIPT) -SCRIPTS = $(dist_bin_SCRIPTS) $(dist_sbin_SCRIPTS) -SOURCES = -DIST_SOURCES = -DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) -ACLOCAL = @ACLOCAL@ -AMTAR = @AMTAR@ -AUTOCONF = @AUTOCONF@ -AUTOHEADER = @AUTOHEADER@ -AUTOMAKE = @AUTOMAKE@ -AWK = @AWK@ -CC = @CC@ -CCDEPMODE = @CCDEPMODE@ -CFLAGS = @CFLAGS@ -CPP = @CPP@ -CPPFLAGS = @CPPFLAGS@ -CYGPATH_W = @CYGPATH_W@ -DEFS = @DEFS@ -DEPDIR = @DEPDIR@ -ECHO_C = @ECHO_C@ -ECHO_N = @ECHO_N@ -ECHO_T = @ECHO_T@ -EGREP = @EGREP@ -EXEEXT = @EXEEXT@ -GREP = @GREP@ -INSTALL = @INSTALL@ -INSTALL_DATA = @INSTALL_DATA@ -INSTALL_PROGRAM = @INSTALL_PROGRAM@ -INSTALL_SCRIPT = @INSTALL_SCRIPT@ -INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@ -LDFLAGS = @LDFLAGS@ -LIBOBJS = @LIBOBJS@ -LIBS = @LIBS@ -LTLIBOBJS = @LTLIBOBJS@ -MAKEINFO = @MAKEINFO@ -MKDIR_P = @MKDIR_P@ -OBJEXT = @OBJEXT@ -PACKAGE = @PACKAGE@ -PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@ -PACKAGE_NAME = @PACKAGE_NAME@ -PACKAGE_STRING = @PACKAGE_STRING@ -PACKAGE_TARNAME = @PACKAGE_TARNAME@ -PACKAGE_VERSION = @PACKAGE_VERSION@ -PATH_SEPARATOR = @PATH_SEPARATOR@ -SET_MAKE = @SET_MAKE@ -SHELL = @SHELL@ -STRIP = @STRIP@ -VERSION = @VERSION@ -abs_builddir = @abs_builddir@ -abs_srcdir = @abs_srcdir@ -abs_top_builddir = @abs_top_builddir@ -abs_top_srcdir = @abs_top_srcdir@ -ac_ct_CC = @ac_ct_CC@ -am__include = @am__include@ -am__leading_dot = @am__leading_dot@ -am__quote = @am__quote@ -am__tar = @am__tar@ -am__untar = @am__untar@ -bindir = @bindir@ -build_alias = @build_alias@ -builddir = @builddir@ -datadir = @datadir@ -datarootdir = @datarootdir@ -docdir = @docdir@ -dvidir = @dvidir@ -exec_prefix = @exec_prefix@ -host_alias = @host_alias@ -htmldir = @htmldir@ -includedir = @includedir@ -infodir = @infodir@ -install_sh = @install_sh@ -libdir = @libdir@ -libexecdir = @libexecdir@ -localedir = @localedir@ -localstatedir = @localstatedir@ -mandir = @mandir@ -mkdir_p = @mkdir_p@ -oldincludedir = @oldincludedir@ -pdfdir = @pdfdir@ -prefix = @prefix@ -program_transform_name = @program_transform_name@ -psdir = @psdir@ -sbindir = @sbindir@ -sharedstatedir = @sharedstatedir@ -srcdir = @srcdir@ -sysconfdir = @sysconfdir@ -target_alias = @target_alias@ -top_build_prefix = @top_build_prefix@ -top_builddir = @top_builddir@ -top_srcdir = @top_srcdir@ -dist_bin_SCRIPTS = amsstat -dist_sbin_SCRIPTS = update_flash update_flash_nv hvcsadmin rtas_dump \ - snap bootlist ofpathname lsdevinfo ls-veth ls-vscsi \ - ls-vdev pseries_platform - -all: all-am - -.SUFFIXES: -$(srcdir)/Makefile.in: $(srcdir)/Makefile.am $(am__configure_deps) - @for dep in $?; do \ - case '$(am__configure_deps)' in \ - *$$dep*) \ - cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \ - && exit 0; \ - exit 1;; \ - esac; \ - done; \ - echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign scripts/Makefile'; \ - cd $(top_srcdir) && \ - $(AUTOMAKE) --foreign scripts/Makefile -.PRECIOUS: Makefile -Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status - @case '$?' in \ - *config.status*) \ - cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh;; \ - *) \ - echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)'; \ - cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe);; \ - esac; - -$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES) - cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh - -$(top_srcdir)/configure: $(am__configure_deps) - cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh -$(ACLOCAL_M4): $(am__aclocal_m4_deps) - cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh -install-dist_binSCRIPTS: $(dist_bin_SCRIPTS) - @$(NORMAL_INSTALL) - test -z "$(bindir)" || $(MKDIR_P) "$(DESTDIR)$(bindir)" - @list='$(dist_bin_SCRIPTS)'; for p in $$list; do \ - if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \ - if test -f $$d$$p; then \ - f=`echo "$$p" | sed 's|^.*/||;$(transform)'`; \ - echo " $(dist_binSCRIPT_INSTALL) '$$d$$p' '$(DESTDIR)$(bindir)/$$f'"; \ - $(dist_binSCRIPT_INSTALL) "$$d$$p" "$(DESTDIR)$(bindir)/$$f"; \ - else :; fi; \ - done - -uninstall-dist_binSCRIPTS: - @$(NORMAL_UNINSTALL) - @list='$(dist_bin_SCRIPTS)'; for p in $$list; do \ - f=`echo "$$p" | sed 's|^.*/||;$(transform)'`; \ - echo " rm -f '$(DESTDIR)$(bindir)/$$f'"; \ - rm -f "$(DESTDIR)$(bindir)/$$f"; \ - done -install-dist_sbinSCRIPTS: $(dist_sbin_SCRIPTS) - @$(NORMAL_INSTALL) - test -z "$(sbindir)" || $(MKDIR_P) "$(DESTDIR)$(sbindir)" - @list='$(dist_sbin_SCRIPTS)'; for p in $$list; do \ - if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \ - if test -f $$d$$p; then \ - f=`echo "$$p" | sed 's|^.*/||;$(transform)'`; \ - echo " $(dist_sbinSCRIPT_INSTALL) '$$d$$p' '$(DESTDIR)$(sbindir)/$$f'"; \ - $(dist_sbinSCRIPT_INSTALL) "$$d$$p" "$(DESTDIR)$(sbindir)/$$f"; \ - else :; fi; \ - done - -uninstall-dist_sbinSCRIPTS: - @$(NORMAL_UNINSTALL) - @list='$(dist_sbin_SCRIPTS)'; for p in $$list; do \ - f=`echo "$$p" | sed 's|^.*/||;$(transform)'`; \ - echo " rm -f '$(DESTDIR)$(sbindir)/$$f'"; \ - rm -f "$(DESTDIR)$(sbindir)/$$f"; \ - done -tags: TAGS -TAGS: - -ctags: CTAGS -CTAGS: - - -distdir: $(DISTFILES) - @srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \ - topsrcdirstrip=`echo "$(top_srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \ - list='$(DISTFILES)'; \ - dist_files=`for file in $$list; do echo $$file; done | \ - sed -e "s|^$$srcdirstrip/||;t" \ - -e "s|^$$topsrcdirstrip/|$(top_builddir)/|;t"`; \ - case $$dist_files in \ - */*) $(MKDIR_P) `echo "$$dist_files" | \ - sed '/\//!d;s|^|$(distdir)/|;s,/[^/]*$$,,' | \ - sort -u` ;; \ - esac; \ - for file in $$dist_files; do \ - if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \ - if test -d $$d/$$file; then \ - dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \ - if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \ - cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \ - fi; \ - cp -pR $$d/$$file $(distdir)$$dir || exit 1; \ - else \ - test -f $(distdir)/$$file \ - || cp -p $$d/$$file $(distdir)/$$file \ - || exit 1; \ - fi; \ - done -check-am: all-am -check: check-am -all-am: Makefile $(SCRIPTS) -installdirs: - for dir in "$(DESTDIR)$(bindir)" "$(DESTDIR)$(sbindir)"; do \ - test -z "$$dir" || $(MKDIR_P) "$$dir"; \ - done -install: install-am -install-exec: install-exec-am -install-data: install-data-am -uninstall: uninstall-am - -install-am: all-am - @$(MAKE) $(AM_MAKEFLAGS) install-exec-am install-data-am - -installcheck: installcheck-am -install-strip: - $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \ - install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \ - `test -z '$(STRIP)' || \ - echo "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'"` install -mostlyclean-generic: - -clean-generic: - -distclean-generic: - -test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES) - -maintainer-clean-generic: - @echo "This command is intended for maintainers to use" - @echo "it deletes files that may require special tools to rebuild." -clean: clean-am - -clean-am: clean-generic mostlyclean-am - -distclean: distclean-am - -rm -f Makefile -distclean-am: clean-am distclean-generic - -dvi: dvi-am - -dvi-am: - -html: html-am - -info: info-am - -info-am: - -install-data-am: - -install-dvi: install-dvi-am - -install-exec-am: install-dist_binSCRIPTS install-dist_sbinSCRIPTS - -install-html: install-html-am - -install-info: install-info-am - -install-man: - -install-pdf: install-pdf-am - -install-ps: install-ps-am - -installcheck-am: - -maintainer-clean: maintainer-clean-am - -rm -f Makefile -maintainer-clean-am: distclean-am maintainer-clean-generic - -mostlyclean: mostlyclean-am - -mostlyclean-am: mostlyclean-generic - -pdf: pdf-am - -pdf-am: - -ps: ps-am - -ps-am: - -uninstall-am: uninstall-dist_binSCRIPTS uninstall-dist_sbinSCRIPTS - -.MAKE: install-am install-strip - -.PHONY: all all-am check check-am clean clean-generic distclean \ - distclean-generic distdir dvi dvi-am html html-am info info-am \ - install install-am install-data install-data-am \ - install-dist_binSCRIPTS install-dist_sbinSCRIPTS install-dvi \ - install-dvi-am install-exec install-exec-am install-html \ - install-html-am install-info install-info-am install-man \ - install-pdf install-pdf-am install-ps install-ps-am \ - install-strip installcheck installcheck-am installdirs \ - maintainer-clean maintainer-clean-generic mostlyclean \ - mostlyclean-generic pdf pdf-am ps ps-am uninstall uninstall-am \ - uninstall-dist_binSCRIPTS uninstall-dist_sbinSCRIPTS - -# Tell versions [3.59,3.63) of GNU make to not export all variables. -# Otherwise a system limit (for SysV at least) may be exceeded. -.NOEXPORT: diff -Nru powerpc-ibm-utils-1.2.20/scripts/ofpathname powerpc-ibm-utils-1.2.22/scripts/ofpathname --- powerpc-ibm-utils-1.2.20/scripts/ofpathname 2014-03-21 14:15:44.000000000 +0000 +++ powerpc-ibm-utils-1.2.22/scripts/ofpathname 2014-08-13 12:26:23.000000000 +0000 @@ -175,6 +175,62 @@ } # +# get_usb_vdisk_no +# Given a path that ends in an HBTL, convert the HBTL values into a +# virtual disk number (not sure what the real terminology is for it). +# To do the conversion, the HBTL (A:B:C:D) is split apart and +# calculated as; +# no = (0x1000000 | (usb_port << 16) | D); +# +# $1 path ending in HBTL +# +get_usb_vdisk_no() +{ + get_hbtl $1 + local usb_port=$2 + local B + + B=$((0x$usb_port << 16)) + + local vdiskno vdisk + vdiskno=$((0x1000000 | $B | $LUN )) + vdisk=${vdiskno##-} + +vdisk=$(bc << END +ibase=10 +obase=16 +$vdisk +END +) + local extrazeroes="00000000" + echo $vdisk$extrazeroes +} + +# +# get_usb_storage_no +# Get usb device storage (port) number which is captured in +# devpath file +# +# $1 starting directory to look for devpath file +get_usb_storage_no() +{ + for dir in `$FIND /sys -name $1`; do + # Move up until we find one with a devpath link + goto_dir $dir "devpath" 0 + if [ $? -eq 0 ]; then + break; + fi + done; + + if [ -f $PWD/devpath ]; then + echo `$CAT $PWD/devpath` + else + err $ERR_NOT_CONFIG + fi + +} + +# # goto_dir # This looks for a given file in a given directory or any parents of the # given directory. @@ -636,7 +692,24 @@ fi fi - if [[ $fc = "fibre-channel" ]]; then + if [[ $fc = "usb" ]]; then + local hub_no storage_no disk_no + + storage_no=`get_usb_storage_no $DEVICE` + if [[ $storage_no = *.* ]]; then + hub_no=${storage_no%%.*} + storage_no=${storage_no##*.} + fi + + disk_no=`get_usb_vdisk_no $device_dir $storage_no` + + if [[ -z $hub_no ]]; then + OF_PATH=$OF_PATH/storage\@$storage_no/disk\@$disk_no + else + OF_PATH=$OF_PATH/hub\@$hub_no/storage\@$storage_no/disk\@$disk_no + fi + + elif [[ $fc = "fibre-channel" ]]; then local wwpn=`get_fc_wwpn "$device_path/../../fc_remote_ports*"` if [[ ! -e /proc/device-tree$OF_PATH/disk ]]; then @@ -775,6 +848,17 @@ DEVTYPE="fc" fi + if [[ $DEVTYPE = "disk" && $FC = "storage" ]]; then + local devpath=$DEVPATH + DEVPATH=${devpath%/*} + DEVTYPE="usb" + + if [[ $DEVNAME = *hub* ]]; then + devpath=$DEVPATH + DEVPATH=${devpath%/*} + fi + fi + # Remove any possible cdrom data from DEVICE if [[ ${DEVICE##*,} = "\ppc\bootinfo.txt" || ${DEVICE##*,} = \ppc\bootinfo.txt ]]; then @@ -798,6 +882,7 @@ eth* | l-lan ) of2l_ethernet ;; hfi-ethernet* ) of2l_hfi ;; disk* ) of2l_ide ;; + usb ) of2l_usb ;; esac if [[ -z $LOGICAL_DEVNAME ]]; then @@ -908,6 +993,50 @@ } # +# of2l_usb +# Conversion routine for OF path => logical names of usb devices +# +of2l_usb() +{ + DEV_HBTL_NO=${DEVICE##*\@} + + local dir + for dir in `$FIND /sys/block -name 's[dr]*'`; do + # go up to find directory with 'device' link + local devdir=`find_dir $dir device` + if [[ -z $devdir ]]; then + continue + fi + + cd $devdir + + local link=`get_link "device"` + local vdisk_no + + if [[ -n $link ]]; then + local port_no storage_no target + + target=${link##*/} + port_no=`get_usb_storage_no $target` + storage_no=${port_no##*.} + + vdisk_no=`get_usb_vdisk_no $target $storage_no` + + cd $link + if [[ $vdisk_no = $DEV_HBTL_NO ]]; then + goto_dir $PWD "devspec" + local devspec=`$CAT ./devspec 2>/dev/null` + + if [[ $devspec = $DEVPATH ]]; then + LOGICAL_DEVNAME=${dir##/*/} + return + fi + fi + fi + done +} + +# # of2l_vscsi # Conversion routine for OF path => logical names of virtual scsi devices # diff -Nru powerpc-ibm-utils-1.2.20/scripts/snap powerpc-ibm-utils-1.2.22/scripts/snap --- powerpc-ibm-utils-1.2.20/scripts/snap 2014-03-21 14:09:35.000000000 +0000 +++ powerpc-ibm-utils-1.2.22/scripts/snap 2014-08-13 12:26:23.000000000 +0000 @@ -322,7 +322,7 @@ =~ /^\s*\{(.*)\}\s*$/mxs; if ($ENV{'platform'} == $ENV{'PLATFORM_UNKNOWN'} || $ENV{'platform'} == $ENV{'PLATFORM_POWERKVM_HOST'}) { - print "rtas_dump: is not supported on the $ENV{'platform_name'} platform\n"; + print "snap: is not supported on the $ENV{'platform_name'} platform\n"; exit 1; } diff -Nru powerpc-ibm-utils-1.2.20/scripts/update_flash powerpc-ibm-utils-1.2.22/scripts/update_flash --- powerpc-ibm-utils-1.2.20/scripts/update_flash 2014-03-12 13:05:04.000000000 +0000 +++ powerpc-ibm-utils-1.2.22/scripts/update_flash 2014-08-13 12:26:23.000000000 +0000 @@ -86,7 +86,7 @@ usage() { local exit_code; - if [ "$1" == $E_SUCCESS ]; then + if [ "$1" = $E_SUCCESS ]; then exit_code=$E_SUCCESS else exit_code=$E_USAGE diff -Nru powerpc-ibm-utils-1.2.20/scripts/update_flash_nv powerpc-ibm-utils-1.2.22/scripts/update_flash_nv --- powerpc-ibm-utils-1.2.20/scripts/update_flash_nv 2014-03-12 13:05:04.000000000 +0000 +++ powerpc-ibm-utils-1.2.22/scripts/update_flash_nv 2014-08-13 12:26:23.000000000 +0000 @@ -32,6 +32,10 @@ SYS_MANAGE_FLASH=/sys/firmware/opal/manage_flash SYS_UPDATE_FLASH=/sys/firmware/opal/update_flash +# Current firmware version files +DT_FW_MI_FILE=/proc/device-tree/ibm,opal/firmware/mi-version +DT_FW_ML_FILE=/proc/device-tree/ibm,opal/firmware/ml-version + # Code update status values FLASH_SUCCESS=0 # Success FLASH_PARAM_ERR=-1 # Parameter error @@ -99,18 +103,19 @@ usage() { local exit_code; - if [ "$1" == $E_SUCCESS ]; then + if [ "$1" = $E_SUCCESS ]; then exit_code=$E_SUCCESS else exit_code=$E_USAGE fi - echo "USAGE: update_flash {-h | -s | -r | -c | [-v|-n] -f }" >&2 + echo "USAGE: update_flash {-h | -s | -r | -c | -d | [-v|-n] -f }" >&2 echo " -h Print this message." >&2 echo " -s Determine if partition has access to" >&2 echo " perform flash image management." >&2 echo " -r Reject temporary image." >&2 echo " -c Commit temporary image." >&2 + echo " -d Display current firmware version." >&2 echo " -v Validate the given image file." >&2 echo " -n Do not overwrite Permanent side" >&2 echo " image automatically." >&2 @@ -200,8 +205,8 @@ echo_validate_return_status() { local output="$1" - local rc=$(echo "$output" | head -n 1) - local opal_buf=$(echo "$output" | tail -n +2) + local rc="$(echo "$output" | head -n 1)" + local opal_buf="$(echo "$output" | tail -n +2)" [ $# -eq 1 ] || error $E_USAGE "echo_validate_return_status(): usage." @@ -363,8 +368,35 @@ exit $E_SUCCESS } +display_current_fw_version() { + + if [ ! -r "$DT_FW_MI_FILE" ] || [ ! -r "$DT_FW_ML_FILE" ]; then + error $E_SYS_FS "Firmware version information is not available" + fi + + echo "Current firwmare version :" + + # P side + local ml_ver=`cat $DT_FW_ML_FILE | head -n 1 | awk ' { print $3 }'` + local mi_ver=`cat $DT_FW_MI_FILE | head -n 1 | awk ' { print $3 }'` + echo " P side : $ml_ver ($mi_ver)" + + # T side + local ml_ver=`cat $DT_FW_ML_FILE | head -n 1 | awk ' { print $2 }'` + local mi_ver=`cat $DT_FW_MI_FILE | head -n 1 | awk ' { print $2 }'` + echo " T side : $ml_ver ($mi_ver)" + + # Boot side + local ml_ver=`cat $DT_FW_ML_FILE | head -n 1 | awk ' { print $4 }'` + local mi_ver=`cat $DT_FW_MI_FILE | head -n 1 | awk ' { print $4 }'` + echo " Boot side : $ml_ver ($mi_ver)" + + exit $E_SUCCESS +} + file="" check_opt=0 +display_opt=0 commit_opt=0 reject_opt=0 validate_opt=0 @@ -372,7 +404,7 @@ file_opt=0 # Only root user can perform firmware update -[ "`whoami`" == "root" ] || error $E_PERM "Must be root to execute this command." +[ "`whoami`" = "root" ] || error $E_PERM "Must be root to execute this command." # Parse command line options while [ -n "$1" ]; do @@ -382,6 +414,7 @@ -q|-l|-D|-S) error $E_USAGE "The $arg option is not implemented.";; -h) usage $E_SUCCESS;; -s) check_opt=1;; + -d) display_opt=1;; -c) commit_opt=1;; -r) reject_opt=1;; -v) validate_opt=1;; @@ -393,7 +426,7 @@ if [ -n "$file" ]; then if [ $commit_opt -eq 1 ] || [ $reject_opt -eq 1 ] || - [ $check_opt -eq 1 ]; then + [ $display_opt -eq 1 ] || [ $check_opt -eq 1 ]; then usage elif [ $validate_opt -eq 1 ] && [ $no_overwrite_opt -eq 1 ]; then usage @@ -404,12 +437,23 @@ fi else if [ $check_opt -eq 1 ]; then - if [ $commit_opt -eq 1 ] || [ $reject_opt -eq 1 ]; then + if [ $commit_opt -eq 1 ] || [ $reject_opt -eq 1 ] || + [ $display_opt -eq 1 ]; then usage else query_flash_support fi fi + + # Display current firmware version + if [ $display_opt -eq 1 ]; then + if [ $commit_opt -eq 1 ] || [ $reject_opt -eq 1 ]; then + usage + else + display_current_fw_version + fi + fi + [ $commit_opt -eq 0 ] && [ $reject_opt -eq 0 ] && usage [ $commit_opt -eq 1 ] && [ $reject_opt -eq 1 ] && usage manage_flash $commit_opt diff -Nru powerpc-ibm-utils-1.2.20/src/common/librtas_error.c powerpc-ibm-utils-1.2.22/src/common/librtas_error.c --- powerpc-ibm-utils-1.2.20/src/common/librtas_error.c 1970-01-01 00:00:00.000000000 +0000 +++ powerpc-ibm-utils-1.2.22/src/common/librtas_error.c 2014-08-13 12:26:23.000000000 +0000 @@ -0,0 +1,80 @@ +/** + * @file librtas_error.c + * @brief Common librtas_error routine for powerpc-utils-papr commands + * + * Copyright (c) 2004 International Business Machines + * Common Public License Version 1.0 (see COPYRIGHT) + * + * @author Nathan Fontenot + */ + +#include +#include + +/** + * librtas_error + * @brief check for librtas specific return codes + * + * This will check the erro value for a librtas specific return code + * and fill in the buffer with the appropraite error message + * + * @param error return code from librtas + * @param buf buffer to fill with error string + * @param size size of "buffer" + */ +void librtas_error(int error, char *buf, size_t size) +{ + switch (error) { + case RTAS_KERNEL_INT: + snprintf(buf, size, "No kernel interface to firmware"); + break; + case RTAS_KERNEL_IMP: + snprintf(buf, size, "No kernel implementation of function"); + break; + case RTAS_PERM: + snprintf(buf, size, "Non-root caller"); + break; + case RTAS_NO_MEM: + snprintf(buf, size, "Out of heap memory"); + break; + case RTAS_NO_LOWMEM: + snprintf(buf, size, "Kernel out of low memory"); + break; + case RTAS_FREE_ERR: + snprintf(buf, size, "Attempt to free nonexistant RMO buffer"); + break; + case RTAS_TIMEOUT: + snprintf(buf, size, "RTAS delay exceeded specified timeout"); + break; + case RTAS_IO_ASSERT: + snprintf(buf, size, "Unexpected librtas I/O error"); + break; + case RTAS_UNKNOWN_OP: + snprintf(buf, size, "No firmware implementation of function"); + break; + default: + snprintf(buf, size, "Unknown librtas error %d", error); + } + + return; +} + +int is_librtas_error(int error) +{ + int rc = 0; + + switch (error) { + case RTAS_KERNEL_INT: + case RTAS_KERNEL_IMP: + case RTAS_PERM: + case RTAS_NO_MEM: + case RTAS_NO_LOWMEM: + case RTAS_FREE_ERR: + case RTAS_TIMEOUT: + case RTAS_IO_ASSERT: + case RTAS_UNKNOWN_OP: + rc = 1; + } + + return rc; +} diff -Nru powerpc-ibm-utils-1.2.20/src/common/librtas_error.h powerpc-ibm-utils-1.2.22/src/common/librtas_error.h --- powerpc-ibm-utils-1.2.20/src/common/librtas_error.h 1970-01-01 00:00:00.000000000 +0000 +++ powerpc-ibm-utils-1.2.22/src/common/librtas_error.h 2014-08-13 12:26:23.000000000 +0000 @@ -0,0 +1,17 @@ +/** + * @file librtas_error.h + * @brief Common librtas_error routine for powerpc-utils-papr commands + * + * Copyright (c) 2004 International Business Machines + * Common Public License Version 1.0 (see COPYRIGHT) + * + * @author Nathan Fontenot + */ + +#ifndef _LIBRTAS_ERROR_H +#define _LIBRTAS_ERROR_H + +void librtas_error(int, char *, size_t); +int is_librtas_error(int); + +#endif diff -Nru powerpc-ibm-utils-1.2.20/src/drmgr/common_cpu.c powerpc-ibm-utils-1.2.22/src/drmgr/common_cpu.c --- powerpc-ibm-utils-1.2.20/src/drmgr/common_cpu.c 2014-03-12 13:05:04.000000000 +0000 +++ powerpc-ibm-utils-1.2.22/src/drmgr/common_cpu.c 2014-08-13 13:00:02.000000000 +0000 @@ -205,7 +205,7 @@ { struct stat sb; char intserv_path[DR_PATH_MAX]; - int rc; + int rc, i; if (path) { snprintf(cpu->ofdt_path, DR_PATH_MAX, "%s", path); @@ -220,11 +220,15 @@ /* Skip past CPU_OFDT_BASE plus the '/' */ cpu->name = cpu->ofdt_path + strlen(CPU_OFDT_BASE) + 1; - memset(&cpu->cpu_intserv_nums, -1, sizeof(cpu->cpu_intserv_nums)); rc = get_property(cpu->ofdt_path, "ibm,ppc-interrupt-server#s", &cpu->cpu_intserv_nums, sizeof(cpu->cpu_intserv_nums)); + + /* Making sure the intserv_nums are in correct endian format */ + for (i = 0; i < MAX_CPU_INTSERV_NUMS; i++) + cpu->cpu_intserv_nums[i] = be32toh(cpu->cpu_intserv_nums[i]); + if (rc) { say(ERROR, "Could not retrieve ibm,ppc-interrupt-server#s " "property for %s\n", cpu->name); @@ -244,8 +248,7 @@ else cpu->cpu_nthreads = sb.st_size / 4; - rc = get_property(cpu->ofdt_path, "reg", &cpu->cpu_reg, - sizeof(cpu->cpu_reg)); + rc = get_ofdt_uint_property(cpu->ofdt_path, "reg", &cpu->cpu_reg); if (rc) { say(ERROR, "Could not retrieve reg property for %s\n", cpu->name); @@ -254,8 +257,7 @@ /* l2-cache may not exist */ cpu->cpu_l2cache = 0xffffffff; - get_property(cpu->ofdt_path, "l2-cache", &cpu->cpu_l2cache, - sizeof(cpu->cpu_l2cache)); + get_ofdt_uint_property(cpu->ofdt_path, "l2-cache", &cpu->cpu_l2cache); get_cpu_threads(cpu, dr_info->all_threads); cpu->is_owned = 1; @@ -543,9 +545,8 @@ cache->next = cache_list; cache_list = cache; - rc = get_property(cache->path, "ibm,phandle", - &cache->phandle, - sizeof(cache->phandle)); + rc = get_ofdt_uint_property(cache->path, "ibm,phandle", + &cache->phandle); if (rc) { say(ERROR, "Could not retreive ibm,phandle " "property for %s\n", cache->path); @@ -555,8 +556,8 @@ /* l3-caches do not have a l2-cache property */ cache->l2cache = 0xffffffff; - get_property(cache->path, "l2-cache", &cache->l2cache, - sizeof(cache->l2cache)); + get_ofdt_uint_property(cache->path, "l2-cache", + &cache->l2cache); say(DEBUG, "Found cache %s\n", cache->name); } diff -Nru powerpc-ibm-utils-1.2.20/src/drmgr/drslot_chrp_cpu.c powerpc-ibm-utils-1.2.22/src/drmgr/drslot_chrp_cpu.c --- powerpc-ibm-utils-1.2.20/src/drmgr/drslot_chrp_cpu.c 2014-03-12 13:05:04.000000000 +0000 +++ powerpc-ibm-utils-1.2.22/src/drmgr/drslot_chrp_cpu.c 2014-08-13 12:26:23.000000000 +0000 @@ -278,7 +278,8 @@ opts->quantity = 1; if ((opts->action != ADD) && (opts->action != REMOVE)) { - say(ERROR, "Invalid action specified\n"); + say(ERROR, "The '-r' or '-a' option must be specified for " + "CPU operations.\n"); return -1; } diff -Nru powerpc-ibm-utils-1.2.20/src/drmgr/drslot_chrp_hea.c powerpc-ibm-utils-1.2.22/src/drmgr/drslot_chrp_hea.c --- powerpc-ibm-utils-1.2.20/src/drmgr/drslot_chrp_hea.c 2014-03-12 13:05:04.000000000 +0000 +++ powerpc-ibm-utils-1.2.22/src/drmgr/drslot_chrp_hea.c 2014-08-13 12:26:23.000000000 +0000 @@ -320,6 +320,13 @@ return -1; } + if ((opts->action != ADD) && (opts->action != REMOVE) + && (opts->action != QUERY)) { + say(ERROR, "The '-r', '-a', or '-Q' option must be specified " + "for HEA operations.\n"); + return -1; + } + return 0; } diff -Nru powerpc-ibm-utils-1.2.20/src/drmgr/drslot_chrp_mem.c powerpc-ibm-utils-1.2.22/src/drmgr/drslot_chrp_mem.c --- powerpc-ibm-utils-1.2.20/src/drmgr/drslot_chrp_mem.c 2014-03-12 13:05:04.000000000 +0000 +++ powerpc-ibm-utils-1.2.22/src/drmgr/drslot_chrp_mem.c 2014-08-13 13:19:27.000000000 +0000 @@ -43,18 +43,15 @@ * @param int * pointer to phandle */ int -get_phandle(char *path, int *phandle) +get_phandle(char *path, uint *phandle) { int rc1,rc2; /* get "linux,phandle" property */ - rc1 = get_property(path, "linux,phandle", phandle, - sizeof(*phandle)); + rc1 = get_ofdt_uint_property(path, "linux,phandle", phandle); /* overwrite with "ibm,handle" if it exists */ - rc2 = get_property(path, "ibm,phandle", phandle, - sizeof(*phandle)); - + rc2 = get_ofdt_uint_property(path, "ibm,phandle", phandle); /* return bad if both gets failed */ if (rc1 && rc2) return rc1; @@ -158,7 +155,7 @@ return rc; } - lmb->lmb_size = regs[3]; + lmb->lmb_size = be32toh(regs[3]); return 0; } @@ -263,6 +260,10 @@ rc = get_property(DYNAMIC_RECONFIG_MEM, "ibm,lmb-size", &lmb_sz, sizeof(lmb_sz)); + + /* convert for LE systems */ + lmb_sz = be64toh(lmb_sz); + if (rc) { say(DEBUG, "Could not retrieve drconf LMB size\n"); return rc; @@ -288,12 +289,20 @@ /* The first integer of the buffer is the number of entries */ num_entries = *(int *)lmb_list->drconf_buf; + /* convert for LE systems */ + num_entries = be32toh(num_entries); + /* Followed by the actual entries */ drmem = (struct drconf_mem *) (lmb_list->drconf_buf + sizeof(num_entries)); for (i = 0; i < num_entries; i++) { struct dr_node *lmb; + /* convert for LE systems */ + drmem->address = be64toh(drmem->address); + drmem->drc_index = be32toh(drmem->drc_index); + drmem->flags = be32toh(drmem->flags); + for (lmb = lmb_list->lmbs; lmb; lmb = lmb->next) { if (lmb->drc_index == drmem->drc_index) break; @@ -553,16 +562,24 @@ size_t prop_buf_sz; char *tmp; struct drconf_mem *drmem; - int phandle; + uint phandle; int i, entries; int rc; /* The first int of the buffer is the number of entries */ entries = *(int *)lmb_list->drconf_buf; + /* convert for LE systems */ + entries = be32toh(entries); + drmem = (struct drconf_mem *)(lmb_list->drconf_buf + sizeof(entries)); for (i = 0; i < entries; i++) { + + /* convert for LE systems */ + drmem->drc_index = be32toh(drmem->drc_index); + drmem->flags = be32toh(drmem->flags); + if (drmem->drc_index != lmb->drc_index) { drmem++; continue; @@ -1197,6 +1214,9 @@ if ((opts->quantity == 0) && (opts->usr_drc_name == NULL)) opts->quantity = 1; + if ((opts->action != ADD) && (opts->action != REMOVE)) + say(ERROR, "The '-r' or '-a' option must be specified for " + "memory operations\n"); return 0; } diff -Nru powerpc-ibm-utils-1.2.20/src/drmgr/drslot_chrp_pci.c powerpc-ibm-utils-1.2.22/src/drmgr/drslot_chrp_pci.c --- powerpc-ibm-utils-1.2.20/src/drmgr/drslot_chrp_pci.c 2014-03-12 13:12:39.000000000 +0000 +++ powerpc-ibm-utils-1.2.22/src/drmgr/drslot_chrp_pci.c 2014-08-13 12:26:23.000000000 +0000 @@ -854,6 +854,13 @@ return -1; } + if ((opts->action != ADD) && (opts->action != REMOVE) + && (opts->action != IDENTIFY)) { + say(ERROR, "The '-r', '-a', or '-i' option must be spcified " + "for PCI operations\n"); + return -1; + } + return 0; } diff -Nru powerpc-ibm-utils-1.2.20/src/drmgr/drslot_chrp_phb.c powerpc-ibm-utils-1.2.22/src/drmgr/drslot_chrp_phb.c --- powerpc-ibm-utils-1.2.20/src/drmgr/drslot_chrp_phb.c 2014-03-12 13:05:04.000000000 +0000 +++ powerpc-ibm-utils-1.2.22/src/drmgr/drslot_chrp_phb.c 2014-08-13 12:26:23.000000000 +0000 @@ -448,6 +448,13 @@ return -1; } + if ((opts->action != ADD) && (opts->action != REMOVE) + && (opts->action != QUERY)) { + say(ERROR, "The '-r', '-a', or '-Q' option must be specified " + "for PHB operations.\n"); + return -1; + } + return 0; } diff -Nru powerpc-ibm-utils-1.2.20/src/drmgr/drslot_chrp_slot.c powerpc-ibm-utils-1.2.22/src/drmgr/drslot_chrp_slot.c --- powerpc-ibm-utils-1.2.20/src/drmgr/drslot_chrp_slot.c 2014-03-12 13:05:04.000000000 +0000 +++ powerpc-ibm-utils-1.2.22/src/drmgr/drslot_chrp_slot.c 2014-08-13 12:26:23.000000000 +0000 @@ -270,6 +270,13 @@ return -1; } + if ((opts->action != ADD) && (opts->action != REMOVE) + && (opts->action != QUERY)) { + say(ERROR, "The '-r', '-a', or '-Q' option must be specified " + "for slot operations.\n"); + return -1; + } + return 0; } diff -Nru powerpc-ibm-utils-1.2.20/src/drmgr/lsslot.c powerpc-ibm-utils-1.2.22/src/drmgr/lsslot.c --- powerpc-ibm-utils-1.2.20/src/drmgr/lsslot.c 2014-03-12 13:16:24.000000000 +0000 +++ powerpc-ibm-utils-1.2.22/src/drmgr/lsslot.c 2014-08-13 12:26:23.000000000 +0000 @@ -709,7 +709,7 @@ int lmb_offset = strlen(OFDT_BASE); lmb_list = get_lmbs(LMB_NORMAL_SORT); - if (lmb_list == NULL) + if (lmb_list == NULL || lmb_list->lmbs == NULL) return -1; printf("lmb size: 0x%x\n", lmb_list->lmbs->lmb_size); diff -Nru powerpc-ibm-utils-1.2.20/src/drmgr/Makefile.am powerpc-ibm-utils-1.2.22/src/drmgr/Makefile.am --- powerpc-ibm-utils-1.2.20/src/drmgr/Makefile.am 2014-03-12 14:14:43.000000000 +0000 +++ powerpc-ibm-utils-1.2.22/src/drmgr/Makefile.am 1970-01-01 00:00:00.000000000 +0000 @@ -1,23 +0,0 @@ -AUTOMAKE_OPTIONS = subdir-objects - -COM_DIR = $(top_srcdir)/src/common - -AM_CFLAGS = -Wall -g -I $(COM_DIR) - -if WITH_LIBRTAS -sbin_PROGRAMS = drmgr lsslot -endif - -pseries_platform_SOURCES = $(COM_DIR)/pseries_platform.c $(COM_DIR)/pseries_platform.h - -drmgr_SOURCES = common.c common_cpu.c common_ofdt.c common_pci.c \ - drcpu.h dr.h drmem.h drmgr.c drmig_chrp_pmig.c drpci.h \ - drslot_chrp_cpu.c drslot_chrp_hea.c drslot_chrp_mem.c \ - drslot_chrp_pci.c drslot_chrp_phb.c drslot_chrp_slot.c \ - ofdt.h rtas_calls.c rtas_calls.h $(pseries_platform_SOURCES) -drmgr_LDADD = -lrtas - -lsslot_SOURCES = lsslot.c lsslot.h lsslot_chrp_cpu.c common.c \ - common_cpu.c common_pci.c common_ofdt.c ofdt.h \ - rtas_calls.c rtas_calls.h drslot_chrp_mem.c $(pseries_platform_SOURCES) -lsslot_LDADD = -lrtas diff -Nru powerpc-ibm-utils-1.2.20/src/drmgr/Makefile.in powerpc-ibm-utils-1.2.22/src/drmgr/Makefile.in --- powerpc-ibm-utils-1.2.20/src/drmgr/Makefile.in 2014-03-21 20:24:02.000000000 +0000 +++ powerpc-ibm-utils-1.2.22/src/drmgr/Makefile.in 1970-01-01 00:00:00.000000000 +0000 @@ -1,466 +0,0 @@ -# Makefile.in generated by automake 1.10.1 from Makefile.am. -# @configure_input@ - -# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, -# 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc. -# This Makefile.in is free software; the Free Software Foundation -# gives unlimited permission to copy and/or distribute it, -# with or without modifications, as long as this notice is preserved. - -# This program is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY, to the extent permitted by law; without -# even the implied warranty of MERCHANTABILITY or FITNESS FOR A -# PARTICULAR PURPOSE. - -@SET_MAKE@ - -VPATH = @srcdir@ -pkgdatadir = $(datadir)/@PACKAGE@ -pkglibdir = $(libdir)/@PACKAGE@ -pkgincludedir = $(includedir)/@PACKAGE@ -am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd -install_sh_DATA = $(install_sh) -c -m 644 -install_sh_PROGRAM = $(install_sh) -c -install_sh_SCRIPT = $(install_sh) -c -INSTALL_HEADER = $(INSTALL_DATA) -transform = $(program_transform_name) -NORMAL_INSTALL = : -PRE_INSTALL = : -POST_INSTALL = : -NORMAL_UNINSTALL = : -PRE_UNINSTALL = : -POST_UNINSTALL = : -@WITH_LIBRTAS_TRUE@sbin_PROGRAMS = drmgr$(EXEEXT) lsslot$(EXEEXT) -subdir = src/drmgr -DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in -ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 -am__aclocal_m4_deps = $(top_srcdir)/configure.ac -am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ - $(ACLOCAL_M4) -mkinstalldirs = $(install_sh) -d -CONFIG_CLEAN_FILES = -am__installdirs = "$(DESTDIR)$(sbindir)" -sbinPROGRAMS_INSTALL = $(INSTALL_PROGRAM) -PROGRAMS = $(sbin_PROGRAMS) -am__dirstamp = $(am__leading_dot)dirstamp -am__objects_1 = $(COM_DIR)/pseries_platform.$(OBJEXT) -am_drmgr_OBJECTS = common.$(OBJEXT) common_cpu.$(OBJEXT) \ - common_ofdt.$(OBJEXT) common_pci.$(OBJEXT) drmgr.$(OBJEXT) \ - drmig_chrp_pmig.$(OBJEXT) drslot_chrp_cpu.$(OBJEXT) \ - drslot_chrp_hea.$(OBJEXT) drslot_chrp_mem.$(OBJEXT) \ - drslot_chrp_pci.$(OBJEXT) drslot_chrp_phb.$(OBJEXT) \ - drslot_chrp_slot.$(OBJEXT) rtas_calls.$(OBJEXT) \ - $(am__objects_1) -drmgr_OBJECTS = $(am_drmgr_OBJECTS) -drmgr_DEPENDENCIES = -am_lsslot_OBJECTS = lsslot.$(OBJEXT) lsslot_chrp_cpu.$(OBJEXT) \ - common.$(OBJEXT) common_cpu.$(OBJEXT) common_pci.$(OBJEXT) \ - common_ofdt.$(OBJEXT) rtas_calls.$(OBJEXT) \ - drslot_chrp_mem.$(OBJEXT) $(am__objects_1) -lsslot_OBJECTS = $(am_lsslot_OBJECTS) -lsslot_DEPENDENCIES = -DEFAULT_INCLUDES = -I.@am__isrc@ -depcomp = $(SHELL) $(top_srcdir)/build-aux/depcomp -am__depfiles_maybe = depfiles -COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \ - $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -CCLD = $(CC) -LINK = $(CCLD) $(AM_CFLAGS) $(CFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@ -SOURCES = $(drmgr_SOURCES) $(lsslot_SOURCES) -DIST_SOURCES = $(drmgr_SOURCES) $(lsslot_SOURCES) -ETAGS = etags -CTAGS = ctags -DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) -ACLOCAL = @ACLOCAL@ -AMTAR = @AMTAR@ -AUTOCONF = @AUTOCONF@ -AUTOHEADER = @AUTOHEADER@ -AUTOMAKE = @AUTOMAKE@ -AWK = @AWK@ -CC = @CC@ -CCDEPMODE = @CCDEPMODE@ -CFLAGS = @CFLAGS@ -CPP = @CPP@ -CPPFLAGS = @CPPFLAGS@ -CYGPATH_W = @CYGPATH_W@ -DEFS = @DEFS@ -DEPDIR = @DEPDIR@ -ECHO_C = @ECHO_C@ -ECHO_N = @ECHO_N@ -ECHO_T = @ECHO_T@ -EGREP = @EGREP@ -EXEEXT = @EXEEXT@ -GREP = @GREP@ -INSTALL = @INSTALL@ -INSTALL_DATA = @INSTALL_DATA@ -INSTALL_PROGRAM = @INSTALL_PROGRAM@ -INSTALL_SCRIPT = @INSTALL_SCRIPT@ -INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@ -LDFLAGS = @LDFLAGS@ -LIBOBJS = @LIBOBJS@ -LIBS = @LIBS@ -LTLIBOBJS = @LTLIBOBJS@ -MAKEINFO = @MAKEINFO@ -MKDIR_P = @MKDIR_P@ -OBJEXT = @OBJEXT@ -PACKAGE = @PACKAGE@ -PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@ -PACKAGE_NAME = @PACKAGE_NAME@ -PACKAGE_STRING = @PACKAGE_STRING@ -PACKAGE_TARNAME = @PACKAGE_TARNAME@ -PACKAGE_VERSION = @PACKAGE_VERSION@ -PATH_SEPARATOR = @PATH_SEPARATOR@ -SET_MAKE = @SET_MAKE@ -SHELL = @SHELL@ -STRIP = @STRIP@ -VERSION = @VERSION@ -abs_builddir = @abs_builddir@ -abs_srcdir = @abs_srcdir@ -abs_top_builddir = @abs_top_builddir@ -abs_top_srcdir = @abs_top_srcdir@ -ac_ct_CC = @ac_ct_CC@ -am__include = @am__include@ -am__leading_dot = @am__leading_dot@ -am__quote = @am__quote@ -am__tar = @am__tar@ -am__untar = @am__untar@ -bindir = @bindir@ -build_alias = @build_alias@ -builddir = @builddir@ -datadir = @datadir@ -datarootdir = @datarootdir@ -docdir = @docdir@ -dvidir = @dvidir@ -exec_prefix = @exec_prefix@ -host_alias = @host_alias@ -htmldir = @htmldir@ -includedir = @includedir@ -infodir = @infodir@ -install_sh = @install_sh@ -libdir = @libdir@ -libexecdir = @libexecdir@ -localedir = @localedir@ -localstatedir = @localstatedir@ -mandir = @mandir@ -mkdir_p = @mkdir_p@ -oldincludedir = @oldincludedir@ -pdfdir = @pdfdir@ -prefix = @prefix@ -program_transform_name = @program_transform_name@ -psdir = @psdir@ -sbindir = @sbindir@ -sharedstatedir = @sharedstatedir@ -srcdir = @srcdir@ -sysconfdir = @sysconfdir@ -target_alias = @target_alias@ -top_build_prefix = @top_build_prefix@ -top_builddir = @top_builddir@ -top_srcdir = @top_srcdir@ -AUTOMAKE_OPTIONS = subdir-objects -COM_DIR = $(top_srcdir)/src/common -AM_CFLAGS = -Wall -g -I $(COM_DIR) -pseries_platform_SOURCES = $(COM_DIR)/pseries_platform.c $(COM_DIR)/pseries_platform.h -drmgr_SOURCES = common.c common_cpu.c common_ofdt.c common_pci.c \ - drcpu.h dr.h drmem.h drmgr.c drmig_chrp_pmig.c drpci.h \ - drslot_chrp_cpu.c drslot_chrp_hea.c drslot_chrp_mem.c \ - drslot_chrp_pci.c drslot_chrp_phb.c drslot_chrp_slot.c \ - ofdt.h rtas_calls.c rtas_calls.h $(pseries_platform_SOURCES) - -drmgr_LDADD = -lrtas -lsslot_SOURCES = lsslot.c lsslot.h lsslot_chrp_cpu.c common.c \ - common_cpu.c common_pci.c common_ofdt.c ofdt.h \ - rtas_calls.c rtas_calls.h drslot_chrp_mem.c $(pseries_platform_SOURCES) - -lsslot_LDADD = -lrtas -all: all-am - -.SUFFIXES: -.SUFFIXES: .c .o .obj -$(srcdir)/Makefile.in: $(srcdir)/Makefile.am $(am__configure_deps) - @for dep in $?; do \ - case '$(am__configure_deps)' in \ - *$$dep*) \ - cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \ - && exit 0; \ - exit 1;; \ - esac; \ - done; \ - echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign src/drmgr/Makefile'; \ - cd $(top_srcdir) && \ - $(AUTOMAKE) --foreign src/drmgr/Makefile -.PRECIOUS: Makefile -Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status - @case '$?' in \ - *config.status*) \ - cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh;; \ - *) \ - echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)'; \ - cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe);; \ - esac; - -$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES) - cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh - -$(top_srcdir)/configure: $(am__configure_deps) - cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh -$(ACLOCAL_M4): $(am__aclocal_m4_deps) - cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh -install-sbinPROGRAMS: $(sbin_PROGRAMS) - @$(NORMAL_INSTALL) - test -z "$(sbindir)" || $(MKDIR_P) "$(DESTDIR)$(sbindir)" - @list='$(sbin_PROGRAMS)'; for p in $$list; do \ - p1=`echo $$p|sed 's/$(EXEEXT)$$//'`; \ - if test -f $$p \ - ; then \ - f=`echo "$$p1" | sed 's,^.*/,,;$(transform);s/$$/$(EXEEXT)/'`; \ - echo " $(INSTALL_PROGRAM_ENV) $(sbinPROGRAMS_INSTALL) '$$p' '$(DESTDIR)$(sbindir)/$$f'"; \ - $(INSTALL_PROGRAM_ENV) $(sbinPROGRAMS_INSTALL) "$$p" "$(DESTDIR)$(sbindir)/$$f" || exit 1; \ - else :; fi; \ - done - -uninstall-sbinPROGRAMS: - @$(NORMAL_UNINSTALL) - @list='$(sbin_PROGRAMS)'; for p in $$list; do \ - f=`echo "$$p" | sed 's,^.*/,,;s/$(EXEEXT)$$//;$(transform);s/$$/$(EXEEXT)/'`; \ - echo " rm -f '$(DESTDIR)$(sbindir)/$$f'"; \ - rm -f "$(DESTDIR)$(sbindir)/$$f"; \ - done - -clean-sbinPROGRAMS: - -test -z "$(sbin_PROGRAMS)" || rm -f $(sbin_PROGRAMS) -$(COM_DIR)/$(am__dirstamp): - @$(MKDIR_P) $(COM_DIR) - @: > $(COM_DIR)/$(am__dirstamp) -$(COM_DIR)/$(DEPDIR)/$(am__dirstamp): - @$(MKDIR_P) $(COM_DIR)/$(DEPDIR) - @: > $(COM_DIR)/$(DEPDIR)/$(am__dirstamp) -$(COM_DIR)/pseries_platform.$(OBJEXT): $(COM_DIR)/$(am__dirstamp) \ - $(COM_DIR)/$(DEPDIR)/$(am__dirstamp) -drmgr$(EXEEXT): $(drmgr_OBJECTS) $(drmgr_DEPENDENCIES) - @rm -f drmgr$(EXEEXT) - $(LINK) $(drmgr_OBJECTS) $(drmgr_LDADD) $(LIBS) -lsslot$(EXEEXT): $(lsslot_OBJECTS) $(lsslot_DEPENDENCIES) - @rm -f lsslot$(EXEEXT) - $(LINK) $(lsslot_OBJECTS) $(lsslot_LDADD) $(LIBS) - -mostlyclean-compile: - -rm -f *.$(OBJEXT) - -rm -f $(COM_DIR)/pseries_platform.$(OBJEXT) - -distclean-compile: - -rm -f *.tab.c - -@AMDEP_TRUE@@am__include@ @am__quote@$(COM_DIR)/$(DEPDIR)/pseries_platform.Po@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/common.Po@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/common_cpu.Po@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/common_ofdt.Po@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/common_pci.Po@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/drmgr.Po@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/drmig_chrp_pmig.Po@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/drslot_chrp_cpu.Po@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/drslot_chrp_hea.Po@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/drslot_chrp_mem.Po@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/drslot_chrp_pci.Po@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/drslot_chrp_phb.Po@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/drslot_chrp_slot.Po@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/lsslot.Po@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/lsslot_chrp_cpu.Po@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/rtas_calls.Po@am__quote@ - -.c.o: -@am__fastdepCC_TRUE@ depbase=`echo $@ | sed 's|[^/]*$$|$(DEPDIR)/&|;s|\.o$$||'`;\ -@am__fastdepCC_TRUE@ $(COMPILE) -MT $@ -MD -MP -MF $$depbase.Tpo -c -o $@ $< &&\ -@am__fastdepCC_TRUE@ mv -f $$depbase.Tpo $$depbase.Po -@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ -@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCC_FALSE@ $(COMPILE) -c -o $@ $< - -.c.obj: -@am__fastdepCC_TRUE@ depbase=`echo $@ | sed 's|[^/]*$$|$(DEPDIR)/&|;s|\.obj$$||'`;\ -@am__fastdepCC_TRUE@ $(COMPILE) -MT $@ -MD -MP -MF $$depbase.Tpo -c -o $@ `$(CYGPATH_W) '$<'` &&\ -@am__fastdepCC_TRUE@ mv -f $$depbase.Tpo $$depbase.Po -@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ -@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCC_FALSE@ $(COMPILE) -c -o $@ `$(CYGPATH_W) '$<'` - -ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES) - list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ - unique=`for i in $$list; do \ - if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ - done | \ - $(AWK) '{ files[$$0] = 1; nonemtpy = 1; } \ - END { if (nonempty) { for (i in files) print i; }; }'`; \ - mkid -fID $$unique -tags: TAGS - -TAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ - $(TAGS_FILES) $(LISP) - tags=; \ - here=`pwd`; \ - list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ - unique=`for i in $$list; do \ - if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ - done | \ - $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ - END { if (nonempty) { for (i in files) print i; }; }'`; \ - if test -z "$(ETAGS_ARGS)$$tags$$unique"; then :; else \ - test -n "$$unique" || unique=$$empty_fix; \ - $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \ - $$tags $$unique; \ - fi -ctags: CTAGS -CTAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ - $(TAGS_FILES) $(LISP) - tags=; \ - list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ - unique=`for i in $$list; do \ - if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ - done | \ - $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ - END { if (nonempty) { for (i in files) print i; }; }'`; \ - test -z "$(CTAGS_ARGS)$$tags$$unique" \ - || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \ - $$tags $$unique - -GTAGS: - here=`$(am__cd) $(top_builddir) && pwd` \ - && cd $(top_srcdir) \ - && gtags -i $(GTAGS_ARGS) $$here - -distclean-tags: - -rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags - -distdir: $(DISTFILES) - @srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \ - topsrcdirstrip=`echo "$(top_srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \ - list='$(DISTFILES)'; \ - dist_files=`for file in $$list; do echo $$file; done | \ - sed -e "s|^$$srcdirstrip/||;t" \ - -e "s|^$$topsrcdirstrip/|$(top_builddir)/|;t"`; \ - case $$dist_files in \ - */*) $(MKDIR_P) `echo "$$dist_files" | \ - sed '/\//!d;s|^|$(distdir)/|;s,/[^/]*$$,,' | \ - sort -u` ;; \ - esac; \ - for file in $$dist_files; do \ - if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \ - if test -d $$d/$$file; then \ - dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \ - if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \ - cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \ - fi; \ - cp -pR $$d/$$file $(distdir)$$dir || exit 1; \ - else \ - test -f $(distdir)/$$file \ - || cp -p $$d/$$file $(distdir)/$$file \ - || exit 1; \ - fi; \ - done -check-am: all-am -check: check-am -all-am: Makefile $(PROGRAMS) -installdirs: - for dir in "$(DESTDIR)$(sbindir)"; do \ - test -z "$$dir" || $(MKDIR_P) "$$dir"; \ - done -install: install-am -install-exec: install-exec-am -install-data: install-data-am -uninstall: uninstall-am - -install-am: all-am - @$(MAKE) $(AM_MAKEFLAGS) install-exec-am install-data-am - -installcheck: installcheck-am -install-strip: - $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \ - install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \ - `test -z '$(STRIP)' || \ - echo "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'"` install -mostlyclean-generic: - -clean-generic: - -distclean-generic: - -test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES) - -test -z "$(COM_DIR)/$(DEPDIR)/$(am__dirstamp)" || rm -f $(COM_DIR)/$(DEPDIR)/$(am__dirstamp) - -test -z "$(COM_DIR)/$(am__dirstamp)" || rm -f $(COM_DIR)/$(am__dirstamp) - -maintainer-clean-generic: - @echo "This command is intended for maintainers to use" - @echo "it deletes files that may require special tools to rebuild." -clean: clean-am - -clean-am: clean-generic clean-sbinPROGRAMS mostlyclean-am - -distclean: distclean-am - -rm -rf $(COM_DIR)/$(DEPDIR) ./$(DEPDIR) - -rm -f Makefile -distclean-am: clean-am distclean-compile distclean-generic \ - distclean-tags - -dvi: dvi-am - -dvi-am: - -html: html-am - -info: info-am - -info-am: - -install-data-am: - -install-dvi: install-dvi-am - -install-exec-am: install-sbinPROGRAMS - -install-html: install-html-am - -install-info: install-info-am - -install-man: - -install-pdf: install-pdf-am - -install-ps: install-ps-am - -installcheck-am: - -maintainer-clean: maintainer-clean-am - -rm -rf $(COM_DIR)/$(DEPDIR) ./$(DEPDIR) - -rm -f Makefile -maintainer-clean-am: distclean-am maintainer-clean-generic - -mostlyclean: mostlyclean-am - -mostlyclean-am: mostlyclean-compile mostlyclean-generic - -pdf: pdf-am - -pdf-am: - -ps: ps-am - -ps-am: - -uninstall-am: uninstall-sbinPROGRAMS - -.MAKE: install-am install-strip - -.PHONY: CTAGS GTAGS all all-am check check-am clean clean-generic \ - clean-sbinPROGRAMS ctags distclean distclean-compile \ - distclean-generic distclean-tags distdir dvi dvi-am html \ - html-am info info-am install install-am install-data \ - install-data-am install-dvi install-dvi-am install-exec \ - install-exec-am install-html install-html-am install-info \ - install-info-am install-man install-pdf install-pdf-am \ - install-ps install-ps-am install-sbinPROGRAMS install-strip \ - installcheck installcheck-am installdirs maintainer-clean \ - maintainer-clean-generic mostlyclean mostlyclean-compile \ - mostlyclean-generic pdf pdf-am ps ps-am tags uninstall \ - uninstall-am uninstall-sbinPROGRAMS - -# Tell versions [3.59,3.63) of GNU make to not export all variables. -# Otherwise a system limit (for SysV at least) may be exceeded. -.NOEXPORT: diff -Nru powerpc-ibm-utils-1.2.20/src/drmgr/ofdt.h powerpc-ibm-utils-1.2.22/src/drmgr/ofdt.h --- powerpc-ibm-utils-1.2.20/src/drmgr/ofdt.h 2014-03-12 13:05:04.000000000 +0000 +++ powerpc-ibm-utils-1.2.22/src/drmgr/ofdt.h 2014-08-13 13:35:03.000000000 +0000 @@ -14,7 +14,7 @@ #define DR_PATH_MAX 1024 #define DR_STR_MAX 128 -#define MAX_CPU_INTSERV_NUMS 4 +#define MAX_CPU_INTSERV_NUMS 8 struct dr_connector { char name[DRC_STR_MAX]; diff -Nru powerpc-ibm-utils-1.2.20/src/librtas_error.c powerpc-ibm-utils-1.2.22/src/librtas_error.c --- powerpc-ibm-utils-1.2.20/src/librtas_error.c 2014-03-12 13:05:04.000000000 +0000 +++ powerpc-ibm-utils-1.2.22/src/librtas_error.c 1970-01-01 00:00:00.000000000 +0000 @@ -1,80 +0,0 @@ -/** - * @file librtas_error.c - * @brief Common librtas_error routine for powerpc-utils-papr commands - * - * Copyright (c) 2004 International Business Machines - * Common Public License Version 1.0 (see COPYRIGHT) - * - * @author Nathan Fontenot - */ - -#include -#include - -/** - * librtas_error - * @brief check for librtas specific return codes - * - * This will check the erro value for a librtas specific return code - * and fill in the buffer with the appropraite error message - * - * @param error return code from librtas - * @param buf buffer to fill with error string - * @param size size of "buffer" - */ -void librtas_error(int error, char *buf, size_t size) -{ - switch (error) { - case RTAS_KERNEL_INT: - snprintf(buf, size, "No kernel interface to firmware"); - break; - case RTAS_KERNEL_IMP: - snprintf(buf, size, "No kernel implementation of function"); - break; - case RTAS_PERM: - snprintf(buf, size, "Non-root caller"); - break; - case RTAS_NO_MEM: - snprintf(buf, size, "Out of heap memory"); - break; - case RTAS_NO_LOWMEM: - snprintf(buf, size, "Kernel out of low memory"); - break; - case RTAS_FREE_ERR: - snprintf(buf, size, "Attempt to free nonexistant RMO buffer"); - break; - case RTAS_TIMEOUT: - snprintf(buf, size, "RTAS delay exceeded specified timeout"); - break; - case RTAS_IO_ASSERT: - snprintf(buf, size, "Unexpected librtas I/O error"); - break; - case RTAS_UNKNOWN_OP: - snprintf(buf, size, "No firmware implementation of function"); - break; - default: - snprintf(buf, size, "Unknown librtas error %d", error); - } - - return; -} - -int is_librtas_error(int error) -{ - int rc = 0; - - switch (error) { - case RTAS_KERNEL_INT: - case RTAS_KERNEL_IMP: - case RTAS_PERM: - case RTAS_NO_MEM: - case RTAS_NO_LOWMEM: - case RTAS_FREE_ERR: - case RTAS_TIMEOUT: - case RTAS_IO_ASSERT: - case RTAS_UNKNOWN_OP: - rc = 1; - } - - return rc; -} diff -Nru powerpc-ibm-utils-1.2.20/src/librtas_error.h powerpc-ibm-utils-1.2.22/src/librtas_error.h --- powerpc-ibm-utils-1.2.20/src/librtas_error.h 2014-03-12 13:05:04.000000000 +0000 +++ powerpc-ibm-utils-1.2.22/src/librtas_error.h 1970-01-01 00:00:00.000000000 +0000 @@ -1,17 +0,0 @@ -/** - * @file librtas_error.h - * @brief Common librtas_error routine for powerpc-utils-papr commands - * - * Copyright (c) 2004 International Business Machines - * Common Public License Version 1.0 (see COPYRIGHT) - * - * @author Nathan Fontenot - */ - -#ifndef _LIBRTAS_ERROR_H -#define _LIBRTAS_ERROR_H - -void librtas_error(int, char *, size_t); -int is_librtas_error(int); - -#endif diff -Nru powerpc-ibm-utils-1.2.20/src/Makefile.am powerpc-ibm-utils-1.2.22/src/Makefile.am --- powerpc-ibm-utils-1.2.20/src/Makefile.am 2014-03-12 14:14:43.000000000 +0000 +++ powerpc-ibm-utils-1.2.22/src/Makefile.am 1970-01-01 00:00:00.000000000 +0000 @@ -1,45 +0,0 @@ -AUTOMAKE_OPTIONS = subdir-objects - -AM_CFLAGS = -Wall -g -I common/ -AM_LDFLAGS = - -SUBDIRS = drmgr - -sbin_PROGRAMS = nvram lsprop lparstat - -pseries_platform_SOURCES = common/pseries_platform.c common/pseries_platform.h -if WITH_LIBRTAS -activate_firmware_SOURCES = activate_fw.c $(pseries_platform_SOURCES) -activate_firmware_LDADD = -lrtas - -set_poweron_time_SOURCES = set_poweron_time.c librtas_error.c librtas_error.h $(pseries_platform_SOURCES) -set_poweron_time_LDADD = -lrtas - -rtas_ibm_get_vpd_SOURCES = rtas_ibm_get_vpd.c librtas_error.c librtas_error.h $(pseries_platform_SOURCES) -rtas_ibm_get_vpd_LDADD = -lrtas - -serv_config_SOURCES = serv_config.c librtas_error.c librtas_error.h $(pseries_platform_SOURCES) -serv_config_LDADD = -lrtas - -uesensor_SOURCES = uesensor.c librtas_error.c librtas_error.h $(pseries_platform_SOURCES) -uesensor_LDADD = -lrtas - -rtas_event_decode_SOURCES = rtas_event_decode.c $(pseries_platform_SOURCES) -rtas_event_decode_LDADD = -lrtasevent - -sys_ident_SOURCES = sys_ident.c $(pseries_platform_SOURCES) -sys_ident_LDADD = -lrtas - -ppc64_cpu_SOURCES = ppc64_cpu.c librtas_error.c librtas_error.h $(pseries_platform_SOURCES) -ppc64_cpu_LDADD = -lrtas -lpthread - -sbin_PROGRAMS += activate_firmware set_poweron_time rtas_ibm_get_vpd \ - serv_config uesensor rtas_event_decode sys_ident ppc64_cpu -endif - -nvram_SOURCES = nvram.c nvram.h $(pseries_platform_SOURCES) -nvram_LDADD = -ldl -lz - -lsprop_SOURCES = lsprop.c $(pseries_platform_SOURCES) - -lparstat_SOURCES = lparstat.c lparstat.h $(pseries_platform_SOURCES) diff -Nru powerpc-ibm-utils-1.2.20/src/Makefile.in powerpc-ibm-utils-1.2.22/src/Makefile.in --- powerpc-ibm-utils-1.2.20/src/Makefile.in 2014-03-21 20:24:02.000000000 +0000 +++ powerpc-ibm-utils-1.2.22/src/Makefile.in 1970-01-01 00:00:00.000000000 +0000 @@ -1,683 +0,0 @@ -# Makefile.in generated by automake 1.10.1 from Makefile.am. -# @configure_input@ - -# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, -# 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc. -# This Makefile.in is free software; the Free Software Foundation -# gives unlimited permission to copy and/or distribute it, -# with or without modifications, as long as this notice is preserved. - -# This program is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY, to the extent permitted by law; without -# even the implied warranty of MERCHANTABILITY or FITNESS FOR A -# PARTICULAR PURPOSE. - -@SET_MAKE@ - -VPATH = @srcdir@ -pkgdatadir = $(datadir)/@PACKAGE@ -pkglibdir = $(libdir)/@PACKAGE@ -pkgincludedir = $(includedir)/@PACKAGE@ -am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd -install_sh_DATA = $(install_sh) -c -m 644 -install_sh_PROGRAM = $(install_sh) -c -install_sh_SCRIPT = $(install_sh) -c -INSTALL_HEADER = $(INSTALL_DATA) -transform = $(program_transform_name) -NORMAL_INSTALL = : -PRE_INSTALL = : -POST_INSTALL = : -NORMAL_UNINSTALL = : -PRE_UNINSTALL = : -POST_UNINSTALL = : -sbin_PROGRAMS = nvram$(EXEEXT) lsprop$(EXEEXT) lparstat$(EXEEXT) \ - $(am__EXEEXT_1) -@WITH_LIBRTAS_TRUE@am__append_1 = activate_firmware set_poweron_time rtas_ibm_get_vpd \ -@WITH_LIBRTAS_TRUE@ serv_config uesensor rtas_event_decode sys_ident ppc64_cpu - -subdir = src -DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in -ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 -am__aclocal_m4_deps = $(top_srcdir)/configure.ac -am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ - $(ACLOCAL_M4) -mkinstalldirs = $(install_sh) -d -CONFIG_CLEAN_FILES = -@WITH_LIBRTAS_TRUE@am__EXEEXT_1 = activate_firmware$(EXEEXT) \ -@WITH_LIBRTAS_TRUE@ set_poweron_time$(EXEEXT) \ -@WITH_LIBRTAS_TRUE@ rtas_ibm_get_vpd$(EXEEXT) \ -@WITH_LIBRTAS_TRUE@ serv_config$(EXEEXT) uesensor$(EXEEXT) \ -@WITH_LIBRTAS_TRUE@ rtas_event_decode$(EXEEXT) \ -@WITH_LIBRTAS_TRUE@ sys_ident$(EXEEXT) ppc64_cpu$(EXEEXT) -am__installdirs = "$(DESTDIR)$(sbindir)" -sbinPROGRAMS_INSTALL = $(INSTALL_PROGRAM) -PROGRAMS = $(sbin_PROGRAMS) -am__activate_firmware_SOURCES_DIST = activate_fw.c \ - common/pseries_platform.c common/pseries_platform.h -am__dirstamp = $(am__leading_dot)dirstamp -am__objects_1 = common/pseries_platform.$(OBJEXT) -@WITH_LIBRTAS_TRUE@am_activate_firmware_OBJECTS = \ -@WITH_LIBRTAS_TRUE@ activate_fw.$(OBJEXT) $(am__objects_1) -activate_firmware_OBJECTS = $(am_activate_firmware_OBJECTS) -activate_firmware_DEPENDENCIES = -am_lparstat_OBJECTS = lparstat.$(OBJEXT) $(am__objects_1) -lparstat_OBJECTS = $(am_lparstat_OBJECTS) -lparstat_LDADD = $(LDADD) -am_lsprop_OBJECTS = lsprop.$(OBJEXT) $(am__objects_1) -lsprop_OBJECTS = $(am_lsprop_OBJECTS) -lsprop_LDADD = $(LDADD) -am_nvram_OBJECTS = nvram.$(OBJEXT) $(am__objects_1) -nvram_OBJECTS = $(am_nvram_OBJECTS) -nvram_DEPENDENCIES = -am__ppc64_cpu_SOURCES_DIST = ppc64_cpu.c librtas_error.c \ - librtas_error.h common/pseries_platform.c \ - common/pseries_platform.h -@WITH_LIBRTAS_TRUE@am_ppc64_cpu_OBJECTS = ppc64_cpu.$(OBJEXT) \ -@WITH_LIBRTAS_TRUE@ librtas_error.$(OBJEXT) $(am__objects_1) -ppc64_cpu_OBJECTS = $(am_ppc64_cpu_OBJECTS) -ppc64_cpu_DEPENDENCIES = -am__rtas_event_decode_SOURCES_DIST = rtas_event_decode.c \ - common/pseries_platform.c common/pseries_platform.h -@WITH_LIBRTAS_TRUE@am_rtas_event_decode_OBJECTS = \ -@WITH_LIBRTAS_TRUE@ rtas_event_decode.$(OBJEXT) \ -@WITH_LIBRTAS_TRUE@ $(am__objects_1) -rtas_event_decode_OBJECTS = $(am_rtas_event_decode_OBJECTS) -rtas_event_decode_DEPENDENCIES = -am__rtas_ibm_get_vpd_SOURCES_DIST = rtas_ibm_get_vpd.c librtas_error.c \ - librtas_error.h common/pseries_platform.c \ - common/pseries_platform.h -@WITH_LIBRTAS_TRUE@am_rtas_ibm_get_vpd_OBJECTS = \ -@WITH_LIBRTAS_TRUE@ rtas_ibm_get_vpd.$(OBJEXT) \ -@WITH_LIBRTAS_TRUE@ librtas_error.$(OBJEXT) $(am__objects_1) -rtas_ibm_get_vpd_OBJECTS = $(am_rtas_ibm_get_vpd_OBJECTS) -rtas_ibm_get_vpd_DEPENDENCIES = -am__serv_config_SOURCES_DIST = serv_config.c librtas_error.c \ - librtas_error.h common/pseries_platform.c \ - common/pseries_platform.h -@WITH_LIBRTAS_TRUE@am_serv_config_OBJECTS = serv_config.$(OBJEXT) \ -@WITH_LIBRTAS_TRUE@ librtas_error.$(OBJEXT) $(am__objects_1) -serv_config_OBJECTS = $(am_serv_config_OBJECTS) -serv_config_DEPENDENCIES = -am__set_poweron_time_SOURCES_DIST = set_poweron_time.c librtas_error.c \ - librtas_error.h common/pseries_platform.c \ - common/pseries_platform.h -@WITH_LIBRTAS_TRUE@am_set_poweron_time_OBJECTS = \ -@WITH_LIBRTAS_TRUE@ set_poweron_time.$(OBJEXT) \ -@WITH_LIBRTAS_TRUE@ librtas_error.$(OBJEXT) $(am__objects_1) -set_poweron_time_OBJECTS = $(am_set_poweron_time_OBJECTS) -set_poweron_time_DEPENDENCIES = -am__sys_ident_SOURCES_DIST = sys_ident.c common/pseries_platform.c \ - common/pseries_platform.h -@WITH_LIBRTAS_TRUE@am_sys_ident_OBJECTS = sys_ident.$(OBJEXT) \ -@WITH_LIBRTAS_TRUE@ $(am__objects_1) -sys_ident_OBJECTS = $(am_sys_ident_OBJECTS) -sys_ident_DEPENDENCIES = -am__uesensor_SOURCES_DIST = uesensor.c librtas_error.c librtas_error.h \ - common/pseries_platform.c common/pseries_platform.h -@WITH_LIBRTAS_TRUE@am_uesensor_OBJECTS = uesensor.$(OBJEXT) \ -@WITH_LIBRTAS_TRUE@ librtas_error.$(OBJEXT) $(am__objects_1) -uesensor_OBJECTS = $(am_uesensor_OBJECTS) -uesensor_DEPENDENCIES = -DEFAULT_INCLUDES = -I.@am__isrc@ -depcomp = $(SHELL) $(top_srcdir)/build-aux/depcomp -am__depfiles_maybe = depfiles -COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \ - $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -CCLD = $(CC) -LINK = $(CCLD) $(AM_CFLAGS) $(CFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@ -SOURCES = $(activate_firmware_SOURCES) $(lparstat_SOURCES) \ - $(lsprop_SOURCES) $(nvram_SOURCES) $(ppc64_cpu_SOURCES) \ - $(rtas_event_decode_SOURCES) $(rtas_ibm_get_vpd_SOURCES) \ - $(serv_config_SOURCES) $(set_poweron_time_SOURCES) \ - $(sys_ident_SOURCES) $(uesensor_SOURCES) -DIST_SOURCES = $(am__activate_firmware_SOURCES_DIST) \ - $(lparstat_SOURCES) $(lsprop_SOURCES) $(nvram_SOURCES) \ - $(am__ppc64_cpu_SOURCES_DIST) \ - $(am__rtas_event_decode_SOURCES_DIST) \ - $(am__rtas_ibm_get_vpd_SOURCES_DIST) \ - $(am__serv_config_SOURCES_DIST) \ - $(am__set_poweron_time_SOURCES_DIST) \ - $(am__sys_ident_SOURCES_DIST) $(am__uesensor_SOURCES_DIST) -RECURSIVE_TARGETS = all-recursive check-recursive dvi-recursive \ - html-recursive info-recursive install-data-recursive \ - install-dvi-recursive install-exec-recursive \ - install-html-recursive install-info-recursive \ - install-pdf-recursive install-ps-recursive install-recursive \ - installcheck-recursive installdirs-recursive pdf-recursive \ - ps-recursive uninstall-recursive -RECURSIVE_CLEAN_TARGETS = mostlyclean-recursive clean-recursive \ - distclean-recursive maintainer-clean-recursive -ETAGS = etags -CTAGS = ctags -DIST_SUBDIRS = $(SUBDIRS) -DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) -ACLOCAL = @ACLOCAL@ -AMTAR = @AMTAR@ -AUTOCONF = @AUTOCONF@ -AUTOHEADER = @AUTOHEADER@ -AUTOMAKE = @AUTOMAKE@ -AWK = @AWK@ -CC = @CC@ -CCDEPMODE = @CCDEPMODE@ -CFLAGS = @CFLAGS@ -CPP = @CPP@ -CPPFLAGS = @CPPFLAGS@ -CYGPATH_W = @CYGPATH_W@ -DEFS = @DEFS@ -DEPDIR = @DEPDIR@ -ECHO_C = @ECHO_C@ -ECHO_N = @ECHO_N@ -ECHO_T = @ECHO_T@ -EGREP = @EGREP@ -EXEEXT = @EXEEXT@ -GREP = @GREP@ -INSTALL = @INSTALL@ -INSTALL_DATA = @INSTALL_DATA@ -INSTALL_PROGRAM = @INSTALL_PROGRAM@ -INSTALL_SCRIPT = @INSTALL_SCRIPT@ -INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@ -LDFLAGS = @LDFLAGS@ -LIBOBJS = @LIBOBJS@ -LIBS = @LIBS@ -LTLIBOBJS = @LTLIBOBJS@ -MAKEINFO = @MAKEINFO@ -MKDIR_P = @MKDIR_P@ -OBJEXT = @OBJEXT@ -PACKAGE = @PACKAGE@ -PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@ -PACKAGE_NAME = @PACKAGE_NAME@ -PACKAGE_STRING = @PACKAGE_STRING@ -PACKAGE_TARNAME = @PACKAGE_TARNAME@ -PACKAGE_VERSION = @PACKAGE_VERSION@ -PATH_SEPARATOR = @PATH_SEPARATOR@ -SET_MAKE = @SET_MAKE@ -SHELL = @SHELL@ -STRIP = @STRIP@ -VERSION = @VERSION@ -abs_builddir = @abs_builddir@ -abs_srcdir = @abs_srcdir@ -abs_top_builddir = @abs_top_builddir@ -abs_top_srcdir = @abs_top_srcdir@ -ac_ct_CC = @ac_ct_CC@ -am__include = @am__include@ -am__leading_dot = @am__leading_dot@ -am__quote = @am__quote@ -am__tar = @am__tar@ -am__untar = @am__untar@ -bindir = @bindir@ -build_alias = @build_alias@ -builddir = @builddir@ -datadir = @datadir@ -datarootdir = @datarootdir@ -docdir = @docdir@ -dvidir = @dvidir@ -exec_prefix = @exec_prefix@ -host_alias = @host_alias@ -htmldir = @htmldir@ -includedir = @includedir@ -infodir = @infodir@ -install_sh = @install_sh@ -libdir = @libdir@ -libexecdir = @libexecdir@ -localedir = @localedir@ -localstatedir = @localstatedir@ -mandir = @mandir@ -mkdir_p = @mkdir_p@ -oldincludedir = @oldincludedir@ -pdfdir = @pdfdir@ -prefix = @prefix@ -program_transform_name = @program_transform_name@ -psdir = @psdir@ -sbindir = @sbindir@ -sharedstatedir = @sharedstatedir@ -srcdir = @srcdir@ -sysconfdir = @sysconfdir@ -target_alias = @target_alias@ -top_build_prefix = @top_build_prefix@ -top_builddir = @top_builddir@ -top_srcdir = @top_srcdir@ -AUTOMAKE_OPTIONS = subdir-objects -AM_CFLAGS = -Wall -g -I common/ -AM_LDFLAGS = -SUBDIRS = drmgr -pseries_platform_SOURCES = common/pseries_platform.c common/pseries_platform.h -@WITH_LIBRTAS_TRUE@activate_firmware_SOURCES = activate_fw.c $(pseries_platform_SOURCES) -@WITH_LIBRTAS_TRUE@activate_firmware_LDADD = -lrtas -@WITH_LIBRTAS_TRUE@set_poweron_time_SOURCES = set_poweron_time.c librtas_error.c librtas_error.h $(pseries_platform_SOURCES) -@WITH_LIBRTAS_TRUE@set_poweron_time_LDADD = -lrtas -@WITH_LIBRTAS_TRUE@rtas_ibm_get_vpd_SOURCES = rtas_ibm_get_vpd.c librtas_error.c librtas_error.h $(pseries_platform_SOURCES) -@WITH_LIBRTAS_TRUE@rtas_ibm_get_vpd_LDADD = -lrtas -@WITH_LIBRTAS_TRUE@serv_config_SOURCES = serv_config.c librtas_error.c librtas_error.h $(pseries_platform_SOURCES) -@WITH_LIBRTAS_TRUE@serv_config_LDADD = -lrtas -@WITH_LIBRTAS_TRUE@uesensor_SOURCES = uesensor.c librtas_error.c librtas_error.h $(pseries_platform_SOURCES) -@WITH_LIBRTAS_TRUE@uesensor_LDADD = -lrtas -@WITH_LIBRTAS_TRUE@rtas_event_decode_SOURCES = rtas_event_decode.c $(pseries_platform_SOURCES) -@WITH_LIBRTAS_TRUE@rtas_event_decode_LDADD = -lrtasevent -@WITH_LIBRTAS_TRUE@sys_ident_SOURCES = sys_ident.c $(pseries_platform_SOURCES) -@WITH_LIBRTAS_TRUE@sys_ident_LDADD = -lrtas -@WITH_LIBRTAS_TRUE@ppc64_cpu_SOURCES = ppc64_cpu.c librtas_error.c librtas_error.h $(pseries_platform_SOURCES) -@WITH_LIBRTAS_TRUE@ppc64_cpu_LDADD = -lrtas -lpthread -nvram_SOURCES = nvram.c nvram.h $(pseries_platform_SOURCES) -nvram_LDADD = -ldl -lz -lsprop_SOURCES = lsprop.c $(pseries_platform_SOURCES) -lparstat_SOURCES = lparstat.c lparstat.h $(pseries_platform_SOURCES) -all: all-recursive - -.SUFFIXES: -.SUFFIXES: .c .o .obj -$(srcdir)/Makefile.in: $(srcdir)/Makefile.am $(am__configure_deps) - @for dep in $?; do \ - case '$(am__configure_deps)' in \ - *$$dep*) \ - cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \ - && exit 0; \ - exit 1;; \ - esac; \ - done; \ - echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign src/Makefile'; \ - cd $(top_srcdir) && \ - $(AUTOMAKE) --foreign src/Makefile -.PRECIOUS: Makefile -Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status - @case '$?' in \ - *config.status*) \ - cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh;; \ - *) \ - echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)'; \ - cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe);; \ - esac; - -$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES) - cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh - -$(top_srcdir)/configure: $(am__configure_deps) - cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh -$(ACLOCAL_M4): $(am__aclocal_m4_deps) - cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh -install-sbinPROGRAMS: $(sbin_PROGRAMS) - @$(NORMAL_INSTALL) - test -z "$(sbindir)" || $(MKDIR_P) "$(DESTDIR)$(sbindir)" - @list='$(sbin_PROGRAMS)'; for p in $$list; do \ - p1=`echo $$p|sed 's/$(EXEEXT)$$//'`; \ - if test -f $$p \ - ; then \ - f=`echo "$$p1" | sed 's,^.*/,,;$(transform);s/$$/$(EXEEXT)/'`; \ - echo " $(INSTALL_PROGRAM_ENV) $(sbinPROGRAMS_INSTALL) '$$p' '$(DESTDIR)$(sbindir)/$$f'"; \ - $(INSTALL_PROGRAM_ENV) $(sbinPROGRAMS_INSTALL) "$$p" "$(DESTDIR)$(sbindir)/$$f" || exit 1; \ - else :; fi; \ - done - -uninstall-sbinPROGRAMS: - @$(NORMAL_UNINSTALL) - @list='$(sbin_PROGRAMS)'; for p in $$list; do \ - f=`echo "$$p" | sed 's,^.*/,,;s/$(EXEEXT)$$//;$(transform);s/$$/$(EXEEXT)/'`; \ - echo " rm -f '$(DESTDIR)$(sbindir)/$$f'"; \ - rm -f "$(DESTDIR)$(sbindir)/$$f"; \ - done - -clean-sbinPROGRAMS: - -test -z "$(sbin_PROGRAMS)" || rm -f $(sbin_PROGRAMS) -common/$(am__dirstamp): - @$(MKDIR_P) common - @: > common/$(am__dirstamp) -common/$(DEPDIR)/$(am__dirstamp): - @$(MKDIR_P) common/$(DEPDIR) - @: > common/$(DEPDIR)/$(am__dirstamp) -common/pseries_platform.$(OBJEXT): common/$(am__dirstamp) \ - common/$(DEPDIR)/$(am__dirstamp) -activate_firmware$(EXEEXT): $(activate_firmware_OBJECTS) $(activate_firmware_DEPENDENCIES) - @rm -f activate_firmware$(EXEEXT) - $(LINK) $(activate_firmware_OBJECTS) $(activate_firmware_LDADD) $(LIBS) -lparstat$(EXEEXT): $(lparstat_OBJECTS) $(lparstat_DEPENDENCIES) - @rm -f lparstat$(EXEEXT) - $(LINK) $(lparstat_OBJECTS) $(lparstat_LDADD) $(LIBS) -lsprop$(EXEEXT): $(lsprop_OBJECTS) $(lsprop_DEPENDENCIES) - @rm -f lsprop$(EXEEXT) - $(LINK) $(lsprop_OBJECTS) $(lsprop_LDADD) $(LIBS) -nvram$(EXEEXT): $(nvram_OBJECTS) $(nvram_DEPENDENCIES) - @rm -f nvram$(EXEEXT) - $(LINK) $(nvram_OBJECTS) $(nvram_LDADD) $(LIBS) -ppc64_cpu$(EXEEXT): $(ppc64_cpu_OBJECTS) $(ppc64_cpu_DEPENDENCIES) - @rm -f ppc64_cpu$(EXEEXT) - $(LINK) $(ppc64_cpu_OBJECTS) $(ppc64_cpu_LDADD) $(LIBS) -rtas_event_decode$(EXEEXT): $(rtas_event_decode_OBJECTS) $(rtas_event_decode_DEPENDENCIES) - @rm -f rtas_event_decode$(EXEEXT) - $(LINK) $(rtas_event_decode_OBJECTS) $(rtas_event_decode_LDADD) $(LIBS) -rtas_ibm_get_vpd$(EXEEXT): $(rtas_ibm_get_vpd_OBJECTS) $(rtas_ibm_get_vpd_DEPENDENCIES) - @rm -f rtas_ibm_get_vpd$(EXEEXT) - $(LINK) $(rtas_ibm_get_vpd_OBJECTS) $(rtas_ibm_get_vpd_LDADD) $(LIBS) -serv_config$(EXEEXT): $(serv_config_OBJECTS) $(serv_config_DEPENDENCIES) - @rm -f serv_config$(EXEEXT) - $(LINK) $(serv_config_OBJECTS) $(serv_config_LDADD) $(LIBS) -set_poweron_time$(EXEEXT): $(set_poweron_time_OBJECTS) $(set_poweron_time_DEPENDENCIES) - @rm -f set_poweron_time$(EXEEXT) - $(LINK) $(set_poweron_time_OBJECTS) $(set_poweron_time_LDADD) $(LIBS) -sys_ident$(EXEEXT): $(sys_ident_OBJECTS) $(sys_ident_DEPENDENCIES) - @rm -f sys_ident$(EXEEXT) - $(LINK) $(sys_ident_OBJECTS) $(sys_ident_LDADD) $(LIBS) -uesensor$(EXEEXT): $(uesensor_OBJECTS) $(uesensor_DEPENDENCIES) - @rm -f uesensor$(EXEEXT) - $(LINK) $(uesensor_OBJECTS) $(uesensor_LDADD) $(LIBS) - -mostlyclean-compile: - -rm -f *.$(OBJEXT) - -rm -f common/pseries_platform.$(OBJEXT) - -distclean-compile: - -rm -f *.tab.c - -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/activate_fw.Po@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/librtas_error.Po@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/lparstat.Po@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/lsprop.Po@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/nvram.Po@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/ppc64_cpu.Po@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/rtas_event_decode.Po@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/rtas_ibm_get_vpd.Po@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/serv_config.Po@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/set_poweron_time.Po@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/sys_ident.Po@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/uesensor.Po@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@common/$(DEPDIR)/pseries_platform.Po@am__quote@ - -.c.o: -@am__fastdepCC_TRUE@ depbase=`echo $@ | sed 's|[^/]*$$|$(DEPDIR)/&|;s|\.o$$||'`;\ -@am__fastdepCC_TRUE@ $(COMPILE) -MT $@ -MD -MP -MF $$depbase.Tpo -c -o $@ $< &&\ -@am__fastdepCC_TRUE@ mv -f $$depbase.Tpo $$depbase.Po -@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ -@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCC_FALSE@ $(COMPILE) -c -o $@ $< - -.c.obj: -@am__fastdepCC_TRUE@ depbase=`echo $@ | sed 's|[^/]*$$|$(DEPDIR)/&|;s|\.obj$$||'`;\ -@am__fastdepCC_TRUE@ $(COMPILE) -MT $@ -MD -MP -MF $$depbase.Tpo -c -o $@ `$(CYGPATH_W) '$<'` &&\ -@am__fastdepCC_TRUE@ mv -f $$depbase.Tpo $$depbase.Po -@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ -@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCC_FALSE@ $(COMPILE) -c -o $@ `$(CYGPATH_W) '$<'` - -# This directory's subdirectories are mostly independent; you can cd -# into them and run `make' without going through this Makefile. -# To change the values of `make' variables: instead of editing Makefiles, -# (1) if the variable is set in `config.status', edit `config.status' -# (which will cause the Makefiles to be regenerated when you run `make'); -# (2) otherwise, pass the desired values on the `make' command line. -$(RECURSIVE_TARGETS): - @failcom='exit 1'; \ - for f in x $$MAKEFLAGS; do \ - case $$f in \ - *=* | --[!k]*);; \ - *k*) failcom='fail=yes';; \ - esac; \ - done; \ - dot_seen=no; \ - target=`echo $@ | sed s/-recursive//`; \ - list='$(SUBDIRS)'; for subdir in $$list; do \ - echo "Making $$target in $$subdir"; \ - if test "$$subdir" = "."; then \ - dot_seen=yes; \ - local_target="$$target-am"; \ - else \ - local_target="$$target"; \ - fi; \ - (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \ - || eval $$failcom; \ - done; \ - if test "$$dot_seen" = "no"; then \ - $(MAKE) $(AM_MAKEFLAGS) "$$target-am" || exit 1; \ - fi; test -z "$$fail" - -$(RECURSIVE_CLEAN_TARGETS): - @failcom='exit 1'; \ - for f in x $$MAKEFLAGS; do \ - case $$f in \ - *=* | --[!k]*);; \ - *k*) failcom='fail=yes';; \ - esac; \ - done; \ - dot_seen=no; \ - case "$@" in \ - distclean-* | maintainer-clean-*) list='$(DIST_SUBDIRS)' ;; \ - *) list='$(SUBDIRS)' ;; \ - esac; \ - rev=''; for subdir in $$list; do \ - if test "$$subdir" = "."; then :; else \ - rev="$$subdir $$rev"; \ - fi; \ - done; \ - rev="$$rev ."; \ - target=`echo $@ | sed s/-recursive//`; \ - for subdir in $$rev; do \ - echo "Making $$target in $$subdir"; \ - if test "$$subdir" = "."; then \ - local_target="$$target-am"; \ - else \ - local_target="$$target"; \ - fi; \ - (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \ - || eval $$failcom; \ - done && test -z "$$fail" -tags-recursive: - list='$(SUBDIRS)'; for subdir in $$list; do \ - test "$$subdir" = . || (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) tags); \ - done -ctags-recursive: - list='$(SUBDIRS)'; for subdir in $$list; do \ - test "$$subdir" = . || (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) ctags); \ - done - -ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES) - list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ - unique=`for i in $$list; do \ - if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ - done | \ - $(AWK) '{ files[$$0] = 1; nonemtpy = 1; } \ - END { if (nonempty) { for (i in files) print i; }; }'`; \ - mkid -fID $$unique -tags: TAGS - -TAGS: tags-recursive $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ - $(TAGS_FILES) $(LISP) - tags=; \ - here=`pwd`; \ - if ($(ETAGS) --etags-include --version) >/dev/null 2>&1; then \ - include_option=--etags-include; \ - empty_fix=.; \ - else \ - include_option=--include; \ - empty_fix=; \ - fi; \ - list='$(SUBDIRS)'; for subdir in $$list; do \ - if test "$$subdir" = .; then :; else \ - test ! -f $$subdir/TAGS || \ - tags="$$tags $$include_option=$$here/$$subdir/TAGS"; \ - fi; \ - done; \ - list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ - unique=`for i in $$list; do \ - if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ - done | \ - $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ - END { if (nonempty) { for (i in files) print i; }; }'`; \ - if test -z "$(ETAGS_ARGS)$$tags$$unique"; then :; else \ - test -n "$$unique" || unique=$$empty_fix; \ - $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \ - $$tags $$unique; \ - fi -ctags: CTAGS -CTAGS: ctags-recursive $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ - $(TAGS_FILES) $(LISP) - tags=; \ - list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ - unique=`for i in $$list; do \ - if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ - done | \ - $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ - END { if (nonempty) { for (i in files) print i; }; }'`; \ - test -z "$(CTAGS_ARGS)$$tags$$unique" \ - || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \ - $$tags $$unique - -GTAGS: - here=`$(am__cd) $(top_builddir) && pwd` \ - && cd $(top_srcdir) \ - && gtags -i $(GTAGS_ARGS) $$here - -distclean-tags: - -rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags - -distdir: $(DISTFILES) - @srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \ - topsrcdirstrip=`echo "$(top_srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \ - list='$(DISTFILES)'; \ - dist_files=`for file in $$list; do echo $$file; done | \ - sed -e "s|^$$srcdirstrip/||;t" \ - -e "s|^$$topsrcdirstrip/|$(top_builddir)/|;t"`; \ - case $$dist_files in \ - */*) $(MKDIR_P) `echo "$$dist_files" | \ - sed '/\//!d;s|^|$(distdir)/|;s,/[^/]*$$,,' | \ - sort -u` ;; \ - esac; \ - for file in $$dist_files; do \ - if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \ - if test -d $$d/$$file; then \ - dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \ - if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \ - cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \ - fi; \ - cp -pR $$d/$$file $(distdir)$$dir || exit 1; \ - else \ - test -f $(distdir)/$$file \ - || cp -p $$d/$$file $(distdir)/$$file \ - || exit 1; \ - fi; \ - done - list='$(DIST_SUBDIRS)'; for subdir in $$list; do \ - if test "$$subdir" = .; then :; else \ - test -d "$(distdir)/$$subdir" \ - || $(MKDIR_P) "$(distdir)/$$subdir" \ - || exit 1; \ - distdir=`$(am__cd) $(distdir) && pwd`; \ - top_distdir=`$(am__cd) $(top_distdir) && pwd`; \ - (cd $$subdir && \ - $(MAKE) $(AM_MAKEFLAGS) \ - top_distdir="$$top_distdir" \ - distdir="$$distdir/$$subdir" \ - am__remove_distdir=: \ - am__skip_length_check=: \ - distdir) \ - || exit 1; \ - fi; \ - done -check-am: all-am -check: check-recursive -all-am: Makefile $(PROGRAMS) -installdirs: installdirs-recursive -installdirs-am: - for dir in "$(DESTDIR)$(sbindir)"; do \ - test -z "$$dir" || $(MKDIR_P) "$$dir"; \ - done -install: install-recursive -install-exec: install-exec-recursive -install-data: install-data-recursive -uninstall: uninstall-recursive - -install-am: all-am - @$(MAKE) $(AM_MAKEFLAGS) install-exec-am install-data-am - -installcheck: installcheck-recursive -install-strip: - $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \ - install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \ - `test -z '$(STRIP)' || \ - echo "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'"` install -mostlyclean-generic: - -clean-generic: - -distclean-generic: - -test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES) - -rm -f common/$(DEPDIR)/$(am__dirstamp) - -rm -f common/$(am__dirstamp) - -maintainer-clean-generic: - @echo "This command is intended for maintainers to use" - @echo "it deletes files that may require special tools to rebuild." -clean: clean-recursive - -clean-am: clean-generic clean-sbinPROGRAMS mostlyclean-am - -distclean: distclean-recursive - -rm -rf ./$(DEPDIR) common/$(DEPDIR) - -rm -f Makefile -distclean-am: clean-am distclean-compile distclean-generic \ - distclean-tags - -dvi: dvi-recursive - -dvi-am: - -html: html-recursive - -info: info-recursive - -info-am: - -install-data-am: - -install-dvi: install-dvi-recursive - -install-exec-am: install-sbinPROGRAMS - -install-html: install-html-recursive - -install-info: install-info-recursive - -install-man: - -install-pdf: install-pdf-recursive - -install-ps: install-ps-recursive - -installcheck-am: - -maintainer-clean: maintainer-clean-recursive - -rm -rf ./$(DEPDIR) common/$(DEPDIR) - -rm -f Makefile -maintainer-clean-am: distclean-am maintainer-clean-generic - -mostlyclean: mostlyclean-recursive - -mostlyclean-am: mostlyclean-compile mostlyclean-generic - -pdf: pdf-recursive - -pdf-am: - -ps: ps-recursive - -ps-am: - -uninstall-am: uninstall-sbinPROGRAMS - -.MAKE: $(RECURSIVE_CLEAN_TARGETS) $(RECURSIVE_TARGETS) install-am \ - install-strip - -.PHONY: $(RECURSIVE_CLEAN_TARGETS) $(RECURSIVE_TARGETS) CTAGS GTAGS \ - all all-am check check-am clean clean-generic \ - clean-sbinPROGRAMS ctags ctags-recursive distclean \ - distclean-compile distclean-generic distclean-tags distdir dvi \ - dvi-am html html-am info info-am install install-am \ - install-data install-data-am install-dvi install-dvi-am \ - install-exec install-exec-am install-html install-html-am \ - install-info install-info-am install-man install-pdf \ - install-pdf-am install-ps install-ps-am install-sbinPROGRAMS \ - install-strip installcheck installcheck-am installdirs \ - installdirs-am maintainer-clean maintainer-clean-generic \ - mostlyclean mostlyclean-compile mostlyclean-generic pdf pdf-am \ - ps ps-am tags tags-recursive uninstall uninstall-am \ - uninstall-sbinPROGRAMS - -# Tell versions [3.59,3.63) of GNU make to not export all variables. -# Otherwise a system limit (for SysV at least) may be exceeded. -.NOEXPORT: diff -Nru powerpc-ibm-utils-1.2.20/src/nvram.c powerpc-ibm-utils-1.2.22/src/nvram.c --- powerpc-ibm-utils-1.2.20/src/nvram.c 2014-03-12 13:05:04.000000000 +0000 +++ powerpc-ibm-utils-1.2.22/src/nvram.c 2014-08-13 13:38:37.000000000 +0000 @@ -113,7 +113,8 @@ " --nvram-file \n" " specify alternate nvram data file (default is /dev/nvram)\n" " --nvram-size\n" - " specify size of nvram data (for repair operations)\n" + " specify size of nvram data, must in multiples of 16 Bytes\n" + " (for repair operations)\n" " --verbose (-v)\n" " be (more) verbose\n" " --help\n" @@ -205,17 +206,18 @@ int nvram_read(struct nvram *nvram) { - int len, remaining; + int len, remaining, chunk; char *p; /* read in small chunks */ - for (p = nvram->data, remaining = nvram->nbytes; - (len = read(nvram->fd, p, 512)) > 0; - p += len, remaining -= len) { - if (remaining <= 0) { - remaining = 0; - break; - } + p = nvram->data; + remaining = nvram->nbytes; + chunk = (NVRAM_READ_SIZE < remaining) ? NVRAM_READ_SIZE : remaining; + + while ((len = read(nvram->fd, p, chunk)) > 0) { + p+=len; + remaining -= len; + chunk = (NVRAM_READ_SIZE < remaining) ? NVRAM_READ_SIZE : remaining; } if (len == -1) { @@ -1111,7 +1113,7 @@ start = (char*) phead; next = start + sizeof(*phead); /* Skip partition header. */ next += sizeof(struct err_log_info); /* Skip sub-header. */ - zipped_length = *((unsigned short*) next); + zipped_length = be16toh(*((unsigned short*) next)); next += sizeof(unsigned short); /* New format oops header, zipped_length > OOPS_PARTITION_SZ @@ -1119,7 +1121,7 @@ * and from where the compressed data starts. */ if (zipped_length > OOPS_PARTITION_SZ) { - zipped_length = *((unsigned short*) next); + zipped_length = be16toh(*((unsigned short*) next)); next += sizeof(struct oops_log_info) - sizeof(unsigned short); } @@ -1485,6 +1487,10 @@ err_msg("specify nvram-size as an integer\n"); exit(1); } + if (nvram.nbytes % NVRAM_BLOCK_SIZE) { + err_msg("nvram-size must be a multiple of 16 Bytes\n"); + exit(1); + } break; case 'V': /* print-vpd */ print_vpd = 1; diff -Nru powerpc-ibm-utils-1.2.20/src/nvram.h powerpc-ibm-utils-1.2.22/src/nvram.h --- powerpc-ibm-utils-1.2.20/src/nvram.h 2014-03-12 13:05:04.000000000 +0000 +++ powerpc-ibm-utils-1.2.22/src/nvram.h 2014-08-13 12:26:23.000000000 +0000 @@ -31,6 +31,7 @@ #define printmap(ch) (isgraph(ch) ? (ch) : '.') #define NVRAM_BLOCK_SIZE 16 +#define NVRAM_READ_SIZE 512 #define NVRAM_FILENAME1 "/dev/nvram" #define NVRAM_FILENAME2 "/dev/misc/nvram" diff -Nru powerpc-ibm-utils-1.2.20/src/ppc64_cpu.c powerpc-ibm-utils-1.2.22/src/ppc64_cpu.c --- powerpc-ibm-utils-1.2.20/src/ppc64_cpu.c 2014-03-12 13:41:43.000000000 +0000 +++ powerpc-ibm-utils-1.2.22/src/ppc64_cpu.c 2014-08-13 14:37:51.000000000 +0000 @@ -57,43 +57,19 @@ static int cpus_in_system = 0; static int threads_in_system = 0; -static int test_attr(char *path, char *perms) -{ - FILE *fp; - - fp = fopen(path, perms); - if (fp) { - fclose(fp); - return 1; - } - - if (errno == ENOENT) { - /* When CPU is offline, attr may not exist. Return 2 so caller - * will not see 'false' and continue to try next CPU. */ - return 2; - } - - return 0; -} +static int do_info(void); -static int attr_is_readable(char *path) -{ - return test_attr(path, "r"); -} - -static int attr_is_writeable(char *path) -{ - return test_attr(path, "w"); -} - -static int test_sysattr(char *attribute, char *perms) +static int test_sysattr(char *attribute, int perms) { char path[SYSFS_PATH_MAX]; int i; for (i = 0; i < threads_in_system; i++) { sprintf(path, SYSFS_CPUDIR"/%s", i, attribute); - if (!test_attr(path, perms)) + if (access(path, F_OK)) + continue; + + if (access(path, perms)) return 0; } @@ -102,12 +78,12 @@ static int sysattr_is_readable(char *attribute) { - return test_sysattr(attribute, "r"); + return test_sysattr(attribute, R_OK); } static int sysattr_is_writeable(char *attribute) { - return test_sysattr(attribute, "w"); + return test_sysattr(attribute, W_OK); } static int get_attribute(char *path, const char *fmt, int *value) @@ -115,14 +91,14 @@ FILE *fp; int rc; + rc = access(path, F_OK); + if (rc) + return -1; + + fp = fopen(path, "r"); - if (fp == NULL) { - if (errno == ENOENT) - /* No attribute, cpu probably offline */ - return 0; - else - return -1; - } + if (!fp) + return -1; rc = fscanf(fp, fmt, value); fclose(fp); @@ -182,6 +158,9 @@ for (i = 0; i < threads_in_system; i++) { int cpu_attribute; + if (!cpu_online(i)) + continue; + sprintf(path, SYSFS_CPUDIR"/%s", i, attribute); rc = get_attribute(path, fmt, &cpu_attribute); if (rc) @@ -239,7 +218,7 @@ int rc; if (dscr_default_exists()) { - if (!attr_is_writeable(DSCR_DEFAULT_PATH)) { + if (access(DSCR_DEFAULT_PATH, W_OK)) { perror("Cannot set default dscr value"); return -2; } @@ -262,7 +241,7 @@ int rc; if (dscr_default_exists()) { - if (!attr_is_readable(DSCR_DEFAULT_PATH)) { + if (access(DSCR_DEFAULT_PATH, R_OK)) { perror("Cannot retrieve default dscr"); return -2; } @@ -313,7 +292,7 @@ static int is_subcore_capable(void) { - return attr_is_readable(SYSFS_SUBCORES) == 1; + return access(SYSFS_SUBCORES, F_OK) == 0; } static int num_subcores(void) @@ -550,6 +529,11 @@ return rc; } +static inline void do_threads_per_core() +{ + printf("Threads per core: %d\n", threads_per_cpu); +} + static int do_subcores_per_core(char *state) { int rc = 0; @@ -576,13 +560,9 @@ } printf("Subcores per core: %d\n", subcore_state); } else { + /* Kernel decides what values are valid, so no need to + * check here. */ subcore_state = strtol(state, NULL, 0); - /* Validate option: we only suport 1 or 4. */ - if (subcore_state != 1 && subcore_state != 4) { - fprintf(stderr, "subcores-per-core=%d invalid.\n", subcore_state); - return -1; - } - rc = set_attribute(SYSFS_SUBCORES, "%d", subcore_state); if (rc) { fprintf(stderr, "Failed to set subcore option.\n"); @@ -739,7 +719,7 @@ return -1; } - *(short *)mode = 1; + *(short *)mode = htobe16(1); mode[2] = rmode; rc = rtas_set_sysparm(DIAGNOSTICS_RUN_MODE, mode); @@ -1028,10 +1008,9 @@ #endif -static int do_cores_present(char * state) +static inline void do_cores_present() { printf("Number of cores present = %d\n", cpus_in_system); - return 0; } static int set_all_threads_off(int cpu, int smt_state) @@ -1091,7 +1070,9 @@ smt_state = get_smt_state(); if (smt_state == -1) { - printf("Bad or inconsistent SMT state\n"); + printf("Bad or inconsistent SMT state: use ppc64_cpu --smt=on|off to set all\n" + "cores to have the same number of online threads to continue.\n"); + do_info(); return -1; } @@ -1114,7 +1095,7 @@ if (number_to_have > cpus_in_system) { printf("Cannot online more cores than are present.\n"); - do_cores_present(NULL); + do_cores_present(); return -1; } @@ -1149,7 +1130,7 @@ return 0; } -static int do_info(char *arg) +static int do_info(void) { int i, j, thread_num; char online; @@ -1200,6 +1181,7 @@ " # seconds, default is 1 second.\n\n" "ppc64_cpu --subcores-per-core # Get number of subcores per core\n" "ppc64_cpu --subcores-per-core=X # Set subcores per core to X (1 or 4)\n" +"ppc64_cpu --threads-per-core # Get threads per core\n" "ppc64_cpu --info # Display system state information)\n"); } @@ -1301,13 +1283,15 @@ else if (!strcmp(action, "frequency")) rc = do_cpu_frequency(sleep_time); else if (!strcmp(action, "cores-present")) - rc = do_cores_present(action_arg); + do_cores_present(); else if (!strcmp(action, "cores-on")) rc = do_cores_online(action_arg); else if (!strcmp(action, "subcores-per-core")) rc = do_subcores_per_core(action_arg); + else if (!strcmp(action, "threads-per-core")) + do_threads_per_core(); else if (!strcmp(action, "info")) - rc = do_info(action_arg); + rc = do_info(); else if (!strcmp(action, "version")) printf("ppc64_cpu: version %s\n", PPC64_CPU_VERSION); else diff -Nru powerpc-ibm-utils-1.2.20/src/serv_config.c powerpc-ibm-utils-1.2.22/src/serv_config.c --- powerpc-ibm-utils-1.2.20/src/serv_config.c 2014-03-12 13:05:04.000000000 +0000 +++ powerpc-ibm-utils-1.2.22/src/serv_config.c 2014-08-13 12:26:23.000000000 +0000 @@ -614,7 +614,7 @@ if (!call_home_buffer) return RC_OTHER; /* should never happen */ - buf_size = *(uint16_t *)call_home_buffer; + buf_size = be16toh(*(uint16_t *)call_home_buffer); loc = call_home_buffer + sizeof(uint16_t); while (loc[0] != '\0') { @@ -674,7 +674,7 @@ if (var->sysparm_num == USE_CALL_HOME_SYSPARM) break; - ret_size = *(uint16_t *)param; + ret_size = be16toh(*(uint16_t *)param); if (!strcmp(var->nvram_var, "sp-ri-pon") || !strcmp(var->nvram_var, "sp-remote-pon") || !strcmp(var->nvram_var, "sp-sen")) { @@ -825,7 +825,7 @@ if (!strcmp(var->nvram_var, "sp-ri-pon") || !strcmp(var->nvram_var, "sp-remote-pon") || !strcmp(var->nvram_var, "sp-sen")) { - *(uint16_t *)param = 1; + *(uint16_t *)param = htobe16(1); if (!strcmp(val, "on")) param[2] = (uint8_t)(1); if (!strcmp(val, "off")) @@ -837,11 +837,11 @@ (var->type == TYPE_NUM_1_120) || (var->type == TYPE_NUM_1_255)) { - *(uint16_t *)param = 1; + *(uint16_t *)param = htobe16(1); param[2] = (uint8_t)atoi(val); } else { - *(uint16_t *)param = sizeof(val); + *(uint16_t *)param = htobe16(sizeof(val)); strncpy(param+2, val, BUF_SIZE-2); } diff -Nru powerpc-ibm-utils-1.2.20/src/set_poweron_time.c powerpc-ibm-utils-1.2.22/src/set_poweron_time.c --- powerpc-ibm-utils-1.2.20/src/set_poweron_time.c 2014-03-12 13:05:04.000000000 +0000 +++ powerpc-ibm-utils-1.2.22/src/set_poweron_time.c 2014-08-13 12:26:23.000000000 +0000 @@ -142,6 +142,7 @@ return 28; /* assumed default of 28 days, per RPA */ } n = read(fd, &max, 4); + max = be32toh(max); close(fd); if (n != 4) diff -Nru powerpc-ibm-utils-1.2.20/src/uesensor.c powerpc-ibm-utils-1.2.22/src/uesensor.c --- powerpc-ibm-utils-1.2.20/src/uesensor.c 2014-03-12 13:05:04.000000000 +0000 +++ powerpc-ibm-utils-1.2.22/src/uesensor.c 2014-08-13 12:26:23.000000000 +0000 @@ -301,7 +301,6 @@ main (int argc, char **argv) { int c, text=0, numerical=0, measured=0, i; - int platform=0; int fd, rc; uint32_t tok, max_index; char *token=NULL, *index=NULL; @@ -415,8 +414,9 @@ while (read(fd, (char *)&tok, sizeof(uint32_t)) == sizeof(uint32_t)) { - + tok = be32toh(tok); rc = read(fd, (char *)&max_index, sizeof(uint32_t)); + max_index=be32toh(max_index); if (rc != sizeof(uint32_t)) { err_msg(ERR_MSG, "Error reading the " "list of sensors.\n");