Re: [Powerpc-utils-devel] [PATCH] Remove amsvis from powerpc-utils

SourceForge Headquarters 225 Broadway Suite 1600 San Diego, CA 92101 +1 (858) 422-6466

Applied.

-Nathan Fontenot

Nathan Fontenot wrote:
> The amsvis tools is being moved to the powerpc-utils-python package.  The
> following patch is the code updates needed to remove the command from
> the powerpc-utils package.
> 
> Additionally the following updates are needed;
> - rename powerpc-utils.spec.in to powerpc-utils.spec
>   We no longer have to update this file with the correct python paths at
>   configure time
> 
> - delete all files under scripts/amsvis
>   No longer needed.
> 
> Signed-off-by: Nathan Fontenot <nf...@au...>
> ---
> 
> Index: powerpc-utils/configure.ac
> ===================================================================
> --- powerpc-utils.orig/configure.ac	2009-10-21 13:10:20.000000000 -0500
> +++ powerpc-utils/configure.ac	2009-10-21 13:15:07.000000000 -0500
> @@ -34,31 +34,5 @@
>  AC_FUNC_MKTIME
>  AC_CHECK_FUNCS([memset strchr strcspn strdup strerror strrchr strstr strtol strtoul strtoull])
>  
> -echo "configure: creating ./powerpc-utils.spec"
> -tfile=/tmp/powerpc-utils.spec$$
> -
> -# See if the .egg-info file is to be created.
> -PY_VERSION=`python -c "from platform import python_version; print python_version()" 2>/dev/null`
> -
> -if [[ -z $PY_VERSION ]]; then
> -    sed "|\@PY_VERSION\@|d" powerpc-utils.spec.in > $tfile
> -else
> -    PY_VERSION=${PY_VERSION%.*}
> -    sed "s|\@PY_VERSION\@|$PY_VERSION|g" powerpc-utils.spec.in > $tfile
> -fi
> -
> -# Update the spec file with the correct python paths
> -PY_INST_DIR=`python -c "from distutils.sysconfig import get_python_lib; print get_python_lib()"`
> -sed "s|\@PYTHON_SITE_PKGS\@|$PY_INST_DIR|g" $tfile > powerpc-utils.spec
> -rm $tfile
> -
> -# Update the prefix used in the scripts/amsvis/Makefile
> -echo "configure: creating ./scripts/amsvis/Makefile"
> -sed "s|\@PREFIX\@|$prefix|g" scripts/amsvis/Makefile.in > scripts/amsvis/Makefile
> -
> -# Update the release in scripts/amsvis/setup.py
> -echo "configure: creating ./scripts/amsvis/setup.py"
> -sed "s|\@VERSION\@|$PACKAGE_VERSION|g" scripts/amsvis/setup.py.in > scripts/amsvis/setup.py
> -
>  AC_CONFIG_FILES(Makefile src/Makefile src/drmgr/Makefile scripts/Makefile man/Makefile)
>  AC_OUTPUT
> Index: powerpc-utils/powerpc-utils.spec.in
> ===================================================================
> --- powerpc-utils.orig/powerpc-utils.spec.in	2009-10-21 13:10:20.000000000 -0500
> +++ /dev/null	1970-01-01 00:00:00.000000000 +0000
> @@ -1,111 +0,0 @@
> -%define name powerpc-utils
> -%define version 1.2.1
> -%define release 0
> -Summary:	Utilities for PowerPC platforms
> -Name:		%{name}
> -Version:	%{version}
> -Release:	%{release}
> -License:	IBM Common Public License (CPL)
> -Group:		System Environment
> -Source0:	N/A
> -BuildRoot:	/tmp/%{name}-buildroot/
> -Requires:	/bin/bash, /bin/sh, /bin/sed, /usr/bin/perl, librtas >= 1.3.0
> -
> -%description
> -Utilities for maintaining and servicing PowerPC systems.
> -
> -%files 
> -%defattr(-,root,root)
> -/usr/share/doc/packages/powerpc-utils/README
> -/usr/share/doc/packages/powerpc-utils/COPYRIGHT
> -
> -/usr/sbin/update_flash
> -/usr/sbin/activate_firmware
> -/usr/sbin/usysident
> -/usr/sbin/usysattn
> -/usr/sbin/set_poweron_time
> -/usr/sbin/rtas_ibm_get_vpd
> -/usr/sbin/serv_config
> -/usr/sbin/uesensor
> -/usr/sbin/hvcsadmin
> -/usr/sbin/vscsisadmin
> -/usr/sbin/rtas_dump
> -/usr/sbin/rtas_event_decode
> -/usr/sbin/sys_ident
> -/usr/sbin/drmgr
> -/usr/sbin/lsslot
> -/usr/sbin/lsprop
> -/usr/sbin/nvram
> -/usr/sbin/snap
> -/usr/sbin/bootlist
> -/usr/sbin/ofpathname
> -/usr/sbin/ppc64_cpu
> -/usr/sbin/lsdevinfo
> -
> -/etc/init.d/ibmvscsis.sh
> -
> -/usr/bin/amsstat
> -/usr/bin/amsvis
> -@PYTHON_SITE_PKGS@/powerpcAMS-%{version}-py@PY_VERSION@.egg-info
> -@PYTHON_SITE_PKGS@/powerpcAMS/__init__.py
> -@PYTHON_SITE_PKGS@/powerpcAMS/__init__.pyc
> -@PYTHON_SITE_PKGS@/powerpcAMS/amsdata.py
> -@PYTHON_SITE_PKGS@/powerpcAMS/amsdata.pyc
> -@PYTHON_SITE_PKGS@/powerpcAMS/amsnet.py
> -@PYTHON_SITE_PKGS@/powerpcAMS/amsnet.pyc
> -@PYTHON_SITE_PKGS@/powerpcAMS/amswidget.py
> -@PYTHON_SITE_PKGS@/powerpcAMS/amswidget.pyc
> -
> -/usr/share/man/man8/update_flash.8
> -/usr/share/man/man8/activate_firmware.8
> -/usr/share/man/man8/usysident.8
> -/usr/share/man/man8/usysattn.8
> -/usr/share/man/man8/set_poweron_time.8
> -/usr/share/man/man8/rtas_ibm_get_vpd.8
> -/usr/share/man/man8/serv_config.8
> -/usr/share/man/man8/uesensor.8
> -/usr/share/man/man8/hvcsadmin.8
> -/usr/share/man/man8/vscsisadmin.8
> -/usr/share/man/man8/ibmvscsis.sh.8
> -/usr/share/man/man8/ibmvscsis.conf.8
> -/usr/share/man/man8/rtas_dump.8
> -/usr/share/man/man8/sys_ident.8
> -/usr/share/man/man8/nvram.8
> -/usr/share/man/man8/snap.8
> -/usr/share/man/man8/bootlist.8
> -/usr/share/man/man8/ofpathname.8
> -
> -/usr/share/man/man1/amsvis.1
> -/usr/share/man/man1/amsstat.1
> -
> -%post
> -# Post-install script -----------------------------------------------
> -ln -sf /usr/sbin/usysattn usr/sbin/usysfault
> -ln -sf /usr/sbin/serv_config usr/sbin/uspchrp
> -ln -sf /usr/share/man/man8/usysattn.8 usr/share/man/man8/usysfault.8
> -ln -sf /usr/share/man/man8/serv_config.8 usr/share/man/man8/uspchrp.8
> -ln -sf /usr/sbin/drmgr /usr/sbin/drslot_chrp_slot
> -ln -sf /usr/sbin/drmgr /usr/sbin/drslot_chrp_pci
> -ln -sf /usr/sbin/drmgr /usr/sbin/drslot_chrp_cpu
> -ln -sf /usr/sbin/drmgr /usr/sbin/drslot_chrp_phb
> -ln -sf /usr/sbin/drmgr /usr/sbin/drslot_chrp_mem
> -ln -sf /usr/sbin/drmgr /usr/sbin/drslot_chrp_hea
> -ln -sf /usr/sbin/drmgr /usr/sbin/drmig_chrp_pmig
> -
> -%postun
> -# Post-uninstall script ---------------------------------------------
> -if [ "$1" = "0" ]; then
> -	# last uninstall
> -	rm -f /usr/sbin/usysfault
> -	rm -f /usr/sbin/uspchrp
> -	rm -f /usr/share/man/man8/usysfault.8.gz
> -	rm -f /usr/share/man/man8/uspchrp.8.gz
> -	rm /usr/sbin/drslot_chrp_slot
> -        rm /usr/sbin/drslot_chrp_pci
> -        rm /usr/sbin/drslot_chrp_cpu
> -        rm /usr/sbin/drslot_chrp_phb
> -        rm /usr/sbin/drslot_chrp_mem
> -        rm /usr/sbin/drslot_chrp_hea
> -        rm /usr/sbin/drmig_chrp_pmig
> -fi
> -
> Index: powerpc-utils/configure
> ===================================================================
> --- powerpc-utils.orig/configure	2009-10-21 13:10:20.000000000 -0500
> +++ powerpc-utils/configure	2009-10-21 13:22:43.000000000 -0500
> @@ -6740,32 +6740,6 @@
>  done
>  
>  
> -echo "configure: creating ./powerpc-utils.spec"
> -tfile=/tmp/powerpc-utils.spec$$
> -
> -# See if the .egg-info file is to be created.
> -PY_VERSION=`python -c "from platform import python_version; print python_version()" 2>/dev/null`
> -
> -if [ -z $PY_VERSION ]; then
> -    sed "|\@PY_VERSION\@|d" powerpc-utils.spec.in > $tfile
> -else
> -    PY_VERSION=${PY_VERSION%.*}
> -    sed "s|\@PY_VERSION\@|$PY_VERSION|g" powerpc-utils.spec.in > $tfile
> -fi
> -
> -# Update the spec file with the correct python paths
> -PY_INST_DIR=`python -c "from distutils.sysconfig import get_python_lib; print get_python_lib()"`
> -sed "s|\@PYTHON_SITE_PKGS\@|$PY_INST_DIR|g" $tfile > powerpc-utils.spec
> -rm $tfile
> -
> -# Update the prefix used in the scripts/amsvis/Makefile
> -echo "configure: creating ./scripts/amsvis/Makefile"
> -sed "s|\@PREFIX\@|$prefix|g" scripts/amsvis/Makefile.in > scripts/amsvis/Makefile
> -
> -# Update the release in scripts/amsvis/setup.py
> -echo "configure: creating ./scripts/amsvis/setup.py"
> -sed "s|\@VERSION\@|$PACKAGE_VERSION|g" scripts/amsvis/setup.py.in > scripts/amsvis/setup.py
> -
>  ac_config_files="$ac_config_files Makefile src/Makefile src/drmgr/Makefile scripts/Makefile man/Makefile"
>  
>  cat >confcache <<\_ACEOF
> Index: powerpc-utils/scripts/Makefile.am
> ===================================================================
> --- powerpc-utils.orig/scripts/Makefile.am	2009-10-21 13:10:20.000000000 -0500
> +++ powerpc-utils/scripts/Makefile.am	2009-10-21 13:30:43.000000000 -0500
> @@ -1,5 +1,3 @@
> -SUBDIRS = amsvis
> -
>  bin_SCRIPTS = amsstat
>  
>  sbin_SCRIPTS = update_flash hvcsadmin vscsisadmin rtas_dump snap	\
> 
> ------------------------------------------------------------------------------
> Come build with us! The BlackBerry(R) Developer Conference in SF, CA
> is the only developer event you need to attend this year. Jumpstart your
> developing skills, take BlackBerry mobile applications to market and stay 
> ahead of the curve. Join us from November 9 - 12, 2009. Register now!
> http://p.sf.net/sfu/devconference
> _______________________________________________
> Powerpc-utils-devel mailing list
> Pow...@li...
> https://lists.sourceforge.net/lists/listinfo/powerpc-utils-devel