From 662046861dd5050c4d5e49118fcb253e0160d8a9 Mon Sep 17 00:00:00 2001 From: bp-sawyers Date: Thu, 23 Aug 2012 20:04:13 +0000 Subject: [PATCH] remove explicit perl-Net-Telnet requires from xCAT.spec and xCATsn.spec because it is automatically generated by rpm anyway git-svn-id: https://svn.code.sf.net/p/xcat/code/xcat-core/trunk@13596 8638fb3e-16cb-4fca-ae20-7b5d299a9bcd --- buildcore.sh | 13 +++++++++---- xCAT/xCAT.spec | 2 +- xCATsn/xCATsn.spec | 2 +- 3 files changed, 11 insertions(+), 6 deletions(-) diff --git a/buildcore.sh b/buildcore.sh index 3d6db2d2a..9858f94e2 100755 --- a/buildcore.sh +++ b/buildcore.sh @@ -19,10 +19,15 @@ # directories that are needed. # Usage: buildcore.sh [attr=value attr=value ...] -# PROMOTE=1 - if the attribute "PROMOTE" is specified, means an official dot release. -# Otherwise, and snap build is assumed. -# PREGA=1 - means this is a branch that has not been released yet, so during the promote, copy the -# xcat-core tarball to the SF web site instead of the FRS area. +# PROMOTE=1 - if the attribute "PROMOTE" is specified, means an official dot release. This does not +# actually build xcat, just uploads the most recent snap build to https://sourceforge.net/projects/xcat/files/xcat/ . +# If not specified, a snap build is assumed, which uploads to https://sourceforge.net/projects/xcat/files/yum/ +# or https://sourceforge.net/projects/xcat/files/aix/. +# PREGA=1 - use this option with PROMOTE=1 on a branch that already has a released dot release, but this build is +# a GA candidate build, not to be released yet. This will result in the tarball being uploaded to +# https://sourceforge.net/projects/xcat/files/yum/ or https://sourceforge.net/projects/xcat/files/aix/ +# (but the tarball file name will be like a released tarball, not a snap build). When you are ready to +# release this build, use PROMOTE=1 without PREGA # BUILDALL=1 - build all rpms, whether they changed or not. Should be used for snap builds that are in prep for a release. # UP=0 or UP=1 - override the default upload behavior # SVNUP= - control which rpms get built by specifying a coresvnup file diff --git a/xCAT/xCAT.spec b/xCAT/xCAT.spec index 15ce86e40..674b7025c 100644 --- a/xCAT/xCAT.spec +++ b/xCAT/xCAT.spec @@ -30,7 +30,7 @@ Requires: /usr/sbin/dhcpd %ifnarch s390x Requires: /etc/xinetd.d/tftp # yaboot-xcat is pulled in so any MN can manage ppc nodes -Requires: conserver-xcat yaboot-xcat perl-Net-Telnet fping +Requires: conserver-xcat yaboot-xcat fping %endif %ifarch ppc64 Requires: perl-IO-Stty diff --git a/xCATsn/xCATsn.spec b/xCATsn/xCATsn.spec index c9a07c50e..8047e13a3 100644 --- a/xCATsn/xCATsn.spec +++ b/xCATsn/xCATsn.spec @@ -33,7 +33,7 @@ Requires: perl-IO-Stty # No additional requires for zLinux right now %else Requires: /etc/xinetd.d/tftp -Requires: conserver-xcat yaboot-xcat perl-Net-Telnet fping +Requires: conserver-xcat yaboot-xcat fping %endif %endif