v7-commits January 2010

v7-commits@lists.stg.fedorahosted.org

3 participants
76 discussions

r346 - trunk/tests/tape
by gnichols＠fedoraproject.org 29 Jan '10

29 Jan '10

Author: gnichols Date: 2010-01-29 14:51:40 +0000 (Fri, 29 Jan 2010) New Revision: 346 Modified: trunk/tests/tape/tape.py Log: 555842 - tests should make use of runtime requires feature Modified: trunk/tests/tape/tape.py =================================================================== --- trunk/tests/tape/tape.py 2010-01-29 14:51:14 UTC (rev 345) +++ trunk/tests/tape/tape.py 2010-01-29 14:51:40 UTC (rev 346) @@ -41,6 +41,9 @@ test.setDevice(device) tests.append(test) return tests + + def getRequiredRPMs(self): + return ["mt-st"] def getTapeDeviceName(self):

1 0

r345 - trunk/tests/profiler
by gnichols＠fedoraproject.org 29 Jan '10

29 Jan '10

Author: gnichols Date: 2010-01-29 14:51:14 +0000 (Fri, 29 Jan 2010) New Revision: 345 Modified: trunk/tests/profiler/profiler.py Log: 555842 - tests should make use of runtime requires feature Modified: trunk/tests/profiler/profiler.py =================================================================== --- trunk/tests/profiler/profiler.py 2010-01-29 14:50:45 UTC (rev 344) +++ trunk/tests/profiler/profiler.py 2010-01-29 14:51:14 UTC (rev 345) @@ -38,6 +38,8 @@ tests.append(test) return tests + def getRequiredRPMs(self): + return ["oprofile"] def old_run(self): FAILED = 1

1 0

r344 - trunk/tests/suspend
by gnichols＠fedoraproject.org 29 Jan '10

29 Jan '10

Author: gnichols Date: 2010-01-29 14:50:45 +0000 (Fri, 29 Jan 2010) New Revision: 344 Modified: trunk/tests/suspend/suspend.py Log: 555842 - tests should make use of runtime requires feature Modified: trunk/tests/suspend/suspend.py =================================================================== --- trunk/tests/suspend/suspend.py 2010-01-29 14:47:10 UTC (rev 343) +++ trunk/tests/suspend/suspend.py 2010-01-29 14:50:45 UTC (rev 344) @@ -50,6 +50,11 @@ # batteries are reported break return tests + + + def getRequiredRPMs(self): + return ["pm-utils"] + def getSuspendMethods(self): sysPowerState = open("/sys/power/state", "r")

1 0

r343 - trunk/tests/info
by gnichols＠fedoraproject.org 29 Jan '10

29 Jan '10

Author: gnichols Date: 2010-01-29 14:47:10 +0000 (Fri, 29 Jan 2010) New Revision: 343 Modified: trunk/tests/info/info.py Log: 192245 - info test should call sosreport instead of sysreport Modified: trunk/tests/info/info.py =================================================================== --- trunk/tests/info/info.py 2010-01-29 14:40:32 UTC (rev 342) +++ trunk/tests/info/info.py 2010-01-29 14:47:10 UTC (rev 343) @@ -28,19 +28,11 @@ self.deviceClass = DeviceClass.system self.mandatory = Constants.post # required at the end of each run # what RHEL are we testing? - self.osVersion = Constants.RHEL5 - etcRelease = open('/etc/redhat-release') - releaseDescription = etcRelease.readline() - if releaseDescription: - # 450068: FEAT: INFO test should check detailed OS version - print "OS Version: %s" % releaseDescription.strip() - if 'Nahant' in releaseDescription: - self.osVersion = Constants.RHEL4 - elif 'Fedora' in releaseDescription: - self.osVersion = releaseDescription.strip() - else: - print "Warning: could not read /etc/redhat-release" - etcRelease.close() + self.osVersion = "6" + (self.osProduct, self.osVersion, self.osCodeName) = self.getRedHatRelease() + print "Tested OS: %s %s (%s)" % (self.osProduct, self.osVersion, self.osCodeName) + + self.getKernelRPMName() print "Kernel RPM: %s" % self.kernelRPMName @@ -66,7 +58,7 @@ unameOutput = unameOutput.strip() self.kernelRPMName = None - if self.osVersion == Constants.RHEL4: + if "Red Hat" in self.osProduct and self.osVersion == "4": pattern = re.compile("(?P<versionRelease>[^a-z]*)(?P<name>smp|hugemem|largesmp)?$") match = pattern.search(unameOutput) if match: @@ -76,7 +68,7 @@ else: self.kernelRPMName = "kernel-%s" % match.group("versionRelease") - elif self.osVersion == Constants.RHEL5: + elif "Red Hat" in self.osProduct and self.osVersion == "5": pattern = re.compile("(?P<versionRelease>[^a-z]*)(?P<product>el5)(?P<flavor>xen|PAE)?$") match = pattern.search(unameOutput) if match: @@ -85,7 +77,7 @@ flavor = "%s-" % match.group("flavor") self.kernelRPMName = "kernel-%s%s%s" % (flavor, match.group("versionRelease"), match.group("product")) - elif 'Fedora' in self.osVersion: + elif 'Fedora' in self.osProduct: print "looking for Fedora kernel" print unameOutput pattern = re.compile("(?P<versionRelease>[^a-z]*)(?P<product>fc[0-9]+)(?P<arch>\..*)$") @@ -197,7 +189,7 @@ break # module is NOT from the kernel RPM. if not found: - if self.osVersion is Constants.RHEL4: + if "Red Hat" in self.osProduct and self.osVersion == "4": print "Error: Non-Red Hat kernel module %s" % module elif not self.abiCheck(module): print "Error: Non-Red Hat kernel module %s fails ABI Whitelist check." % module @@ -361,7 +353,10 @@ def generateSystemReport(self): outputDirectory = os.getcwd() - pipe = os.popen("echo -e '\n\n' | sysreport -k rpm.rpmva=off 2>&1") + reportCommand = "sosreport" + if "Red Hat" in self.osProduct and self.osVersion == "4": + report = "sysreport" + pipe = os.popen("echo -e '\n\n' | %s -k rpm.rpmva=off 2>&1" % reportCommand) result = False while True: line = pipe.readline() @@ -369,9 +364,19 @@ print line.strip() sys.stdout.flush() word = line.split() - if len(word) > 3 and word[0] in "Please" and word[1] in "send": - shutil.copy(word[2], outputDirectory) - print "Copied sysreport %s to %s" % (word[2], outputDirectory) + tarFile = None + if reportCommand == "sysreport": + if len(word) > 3 and word[0] in "Please" and word[1] in "send": + tarFile = word[2] + else: # sosreport + if "generated and saved in" in line: + tarFile = pipe.readline().strip() + print tarFile + sys.stdout.flush() + + if tarFile: + shutil.copy(tarFile, outputDirectory) + print "Copied %s %s to %s" % (reportCommand, tarFile, outputDirectory) sys.stdout.flush() result = True break

1 0

r342 - trunk
by gnichols＠fedoraproject.org 29 Jan '10

29 Jan '10

Author: gnichols Date: 2010-01-29 14:40:32 +0000 (Fri, 29 Jan 2010) New Revision: 342 Modified: trunk/Makefile Log: R5 Modified: trunk/Makefile =================================================================== --- trunk/Makefile 2010-01-28 18:56:22 UTC (rev 341) +++ trunk/Makefile 2010-01-29 14:40:32 UTC (rev 342) @@ -14,7 +14,7 @@ # Author: Greg Nichols V7_VERSION := 1.1 -V7_RELEASE := 4 +V7_RELEASE := 5 V7_VERSION_RELEASE := $(V7_VERSION)-$(V7_RELEASE) V7_VERSION_PY := v7/version.py V7_SVN_MODULE := svn+ssh://svn.fedorahosted.org/svn/v7

1 0

r341 - in trunk/tests: hwlatdetect rteval
by jcwillia＠fedoraproject.org 28 Jan '10

28 Jan '10

Author: jcwillia Date: 2010-01-28 18:56:22 +0000 (Thu, 28 Jan 2010) New Revision: 341 Modified: trunk/tests/hwlatdetect/v7_hwlatdetect.py trunk/tests/rteval/v7_rteval.py Log: fixed check for RT kernel and added rpm requires Moved the check for running an RT kernel into the init() method for both rteval and hwlatdetect. Added getRequiredRPMS() method to both as well. CC: David Sommerseth <davids(a)redhat.com> Signed-off-by: Clark Williams <williams(a)redhat.com> Modified: trunk/tests/hwlatdetect/v7_hwlatdetect.py =================================================================== --- trunk/tests/hwlatdetect/v7_hwlatdetect.py 2010-01-27 20:32:35 UTC (rev 340) +++ trunk/tests/hwlatdetect/v7_hwlatdetect.py 2010-01-28 18:56:22 UTC (rev 341) @@ -40,18 +40,36 @@ Test.__init__(self, name="hwlatdetect") self.interactive = False self.data = {} + if os.uname()[3].find(" RT ") == -1: + self.realtime = False + else: + self.realtime = True self.hwlatdetect = None self.deviceClass = DeviceClass.processor self.owner = "Clark Williams <williams(a)redhat.com>" self.path = "v7/tests/hwlatdetect" self.version = "0.1" self.description = "hardware latency detector" - self.requires = "rt-setup rt-tests ibm-prtm" + self.requires = ["rt-setup", "rt-tests"] + if self.realtime and self.__read_sys_dmi("sys_vendor") == "IBM": + self.requires.append("ibm-prtm") + def getRequiredRPMs(self): + return self.requires + + def __read_sys_dmi(self, name): + try: + f = open("/sys/class/dmi/id/%s" % name, "r") + ret = f.readline().strip() + f.close() + return ret + except IOError: + print "Could not open /sys/class/dmi/id/%s ... are you running the right kernel?" % name + return None + def plan(self, devices): ret = list() - v = os.uname()[3] - if v.find(" RT ") == -1: + if not self.realtime: return ret ret.append(self.makeCopy()) return ret Modified: trunk/tests/rteval/v7_rteval.py =================================================================== --- trunk/tests/rteval/v7_rteval.py 2010-01-27 20:32:35 UTC (rev 340) +++ trunk/tests/rteval/v7_rteval.py 2010-01-28 18:56:22 UTC (rev 341) @@ -29,6 +29,10 @@ def __init__(self): Test.__init__(self, name="rteval") self.interactive = False + if os.uname()[3].find(" RT ") == -1: + self.realtime = False + else: + self.realtime = True self.data = {} self.rteval = None self.deviceClass = DeviceClass.processor @@ -36,7 +40,12 @@ self.path = "v7/tests/rteval" self.version = "0.1" self.description = "Realtime hardware evaluation tool" - self.requires = "rt-setup rteval rt-eval-loads rt-tests ibm-prtm" + self.requires = ["rt-setup", "rteval", "rteval-loads", "rt-tests"] + if self.realtime and self.__read_sys_dmi("sys_vendor") == "IBM": + self.requires.append("ibm-prtm") + + def getRequiredRPMs(self): + return self.requires def __read_sys_dmi(self, name): try: @@ -51,8 +60,7 @@ def plan(self, devices): ret = list() - v = os.uname()[3] - if v.find(" RT ") == -1: + if not self.realtime: return ret # Check if we have some interesting data from the /sys/class/dmi/id directory

1 0

r340 - trunk/tools
by gnichols＠fedoraproject.org 27 Jan '10

27 Jan '10

Author: gnichols Date: 2010-01-27 20:32:35 +0000 (Wed, 27 Jan 2010) New Revision: 340 Added: trunk/tools/rhts-regression-test.py Log: job xml generator utility Added: trunk/tools/rhts-regression-test.py =================================================================== --- trunk/tools/rhts-regression-test.py (rev 0) +++ trunk/tools/rhts-regression-test.py 2010-01-27 20:32:35 UTC (rev 340) @@ -0,0 +1,57 @@ +#!/usr/bin/python +""" + generates an rhts job xml file +""" + +from optparse import OptionParser + +class Generator: + def __init__(self): + self.arch = None + self.RHEL_release = None + self.V7_repo = "http://qafiler.bos.redhat.com/testkits/V7" + + usage = "usage: %prog [options]" + parser = OptionParser(usage) + parser.add_option('-a', "--arch", action="store", type="string", dest="arch", default="i386") + parser.add_option('-o', "--os", action="store", type="string", dest="os", default="RHEL5-Server-U3") + parser.add_option('-r', "--reserve", action="store", type="int", dest="reserve", default=0) + (self.options, self.args) = parser.parse_args() + + self.family = "RedHatEnterpriseLinuxServer5" + self.osShortName = "RHEL5" + if "RHEL6" in self.options.os: + self.family = "RedHatEnterpriseLinuxServer6" + self.osShortName = "RHEL6" + elif "RHEL4" in self.options.os: + self.family = "RedHatEnterpriseLinux4" + self.osShortName = "RHEL4" + + def generate(self): + print """ + <job> + <workflow>V7 regression test</workflow> + <submitter>gnichols(a)redhat.com</submitter> + """ + print "<whiteboard>V7 %s on %s, auto mode (no interactive tests)</whiteboard>" % (self.options.arch, self.options.os) + print "<recipeSet>\n<recipe testrepo=\'development\'>" + print "<distroRequires>ARCH = %s</distroRequires>" % self.options.arch + print "<distroRequires>FAMILY = %s</distroRequires>" % self.family + print "<distroRequires>NAME = %s</distroRequires>" % self.options.os + print "<distroRequires>RELEASED = 1</distroRequires>" + print "<hostRequires>ARCH = %s</hostRequires>" % self.options.arch + print "<addrepo>%s/%s/</addrepo>" % (self.V7_repo, self.osShortName) + print "<test role=\'STANDALONE\' name=\'/distribution/v7/single\'/>" + if self.options.reserve > 0: + print "<test role=\'STANDALONE\' name=\'/distribution/reservesys\'><params>" + print "<param name=\'RESERVEBY\' value=\'gnichols(a)redhat.com\'/>" + print "<param name=\'RESERVETIME\' value=\'%u\'/>" % (self.options.reserve*3600) + print "</params></test>" + + + print "</recipe>\n</recipeSet>\n</job>" + +if __name__ == "__main__": + generator = Generator() + generator.generate() + Property changes on: trunk/tools/rhts-regression-test.py ___________________________________________________________________ Name: svn:executable + *

1 0

r339 - in trunk/tests: hwlatdetect rteval
by jcwillia＠fedoraproject.org 27 Jan '10

27 Jan '10

Author: jcwillia Date: 2010-01-27 20:06:01 +0000 (Wed, 27 Jan 2010) New Revision: 339 Modified: trunk/tests/hwlatdetect/v7_hwlatdetect.py trunk/tests/rteval/v7_rteval.py Log: modify rteval plan() and add runtime requires Modified rteval test to check for rt kernel before looking at /sys/class/dmi/id info. Also added list of required packages to init() routine in self.required CC: David Sommerseth <davids(a)redhat.com> Signed-off-by: Clark Williams <williams(a)redhat.com> Modified: trunk/tests/hwlatdetect/v7_hwlatdetect.py =================================================================== --- trunk/tests/hwlatdetect/v7_hwlatdetect.py 2010-01-27 11:58:02 UTC (rev 338) +++ trunk/tests/hwlatdetect/v7_hwlatdetect.py 2010-01-27 20:06:01 UTC (rev 339) @@ -42,7 +42,12 @@ self.data = {} self.hwlatdetect = None self.deviceClass = DeviceClass.processor - + self.owner = "Clark Williams <williams(a)redhat.com>" + self.path = "v7/tests/hwlatdetect" + self.version = "0.1" + self.description = "hardware latency detector" + self.requires = "rt-setup rt-tests ibm-prtm" + def plan(self, devices): ret = list() v = os.uname()[3] Modified: trunk/tests/rteval/v7_rteval.py =================================================================== --- trunk/tests/rteval/v7_rteval.py 2010-01-27 11:58:02 UTC (rev 338) +++ trunk/tests/rteval/v7_rteval.py 2010-01-27 20:06:01 UTC (rev 339) @@ -32,6 +32,11 @@ self.data = {} self.rteval = None self.deviceClass = DeviceClass.processor + self.owner = "David Sommerseth <davids(a)redhat.com>" + self.path = "v7/tests/rteval" + self.version = "0.1" + self.description = "Realtime hardware evaluation tool" + self.requires = "rt-setup rteval rt-eval-loads rt-tests ibm-prtm" def __read_sys_dmi(self, name): try: @@ -45,6 +50,11 @@ def plan(self, devices): + ret = list() + v = os.uname()[3] + if v.find(" RT ") == -1: + return ret + # Check if we have some interesting data from the /sys/class/dmi/id directory self.data['sysdmi'] = {} files = ('sys_vendor','product_name','product_version') @@ -53,10 +63,6 @@ if self.data['sysdmi'][f] is None: # If one of the /sys/class/dmi/id files is missing, abort this test planning return () - - - - ret = list() ret.append(self.makeCopy()) return ret

1 0

r338 - in tags: . v7-V1-1R4 v7-V1-1R4/v7
by gnichols＠fedoraproject.org 27 Jan '10

27 Jan '10

Author: gnichols Date: 2010-01-27 11:58:02 +0000 (Wed, 27 Jan 2010) New Revision: 338 Added: tags/v7-V1-1R4/ tags/v7-V1-1R4/Makefile Removed: tags/v7-V1-1R4/Makefile Modified: tags/v7-V1-1R4/v7/version.py Log: tag version Copied: tags/v7-V1-1R4 (from rev 335, trunk) Deleted: tags/v7-V1-1R4/Makefile =================================================================== --- trunk/Makefile 2010-01-27 11:43:50 UTC (rev 335) +++ tags/v7-V1-1R4/Makefile 2010-01-27 11:58:02 UTC (rev 338) @@ -1,95 +0,0 @@ -# Copyright (c) 2006 Red Hat, Inc. All rights reserved. This copyrighted material -# is made available to anyone wishing to use, modify, copy, or -# redistribute it subject to the terms and conditions of the GNU General -# Public License v.2. -# -# 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. -# -# Author: Greg Nichols - -V7_VERSION := 1.1 -V7_RELEASE := 3 -V7_VERSION_RELEASE := $(V7_VERSION)-$(V7_RELEASE) -V7_VERSION_PY := v7/version.py -V7_SVN_MODULE := svn+ssh://svn.fedorahosted.org/svn/v7 -V7_RHEL_VERSION := 5 - -HERE=$(shell pwd) - -HERE=$(shell pwd) - -HERE=$(shell pwd) - -.PHONY: clean install - -SUBDIRS := test-env v7 tests docs - -all: - for i in $(SUBDIRS); do $(MAKE) V7_VERSION=$(V7_VERSION) V7_RELEASE=$(V7_RELEASE) V7_RHEL_VERSION=$(V7_RHEL_VERSION) -C $$i; done - -install-noarch: install - -tag: mark-version - svn copy . $(V7_SVN_MODULE)/tags/`echo "v7-V$(V7_VERSION)R$(V7_RELEASE)" | sed "/\./s//-/"` -m "tag version" - -mark-version: - @echo " " > $(V7_VERSION_PY) - @echo "# $(V7_VERSION_PY) is automatically-generated - DO NOT EDIT" >> $(V7_VERSION_PY) - @echo "version = '$(V7_VERSION)'" >> $(V7_VERSION_PY) - @echo "release = '$(V7_RELEASE)'" >> $(V7_VERSION_PY) - @echo "rhel_version = '$(V7_RHEL_VERSION)'" >> $(V7_VERSION_PY) - -install: mark-version - mkdir -p $(DESTDIR)/usr/share/v7 - mkdir -p $(DESTDIR)/var/v7 - mkdir -p $(DESTDIR)/var/v7/docs - for i in $(SUBDIRS); do $(MAKE) -C $$i DESTDIR=$(DESTDIR) V7_VERSION=$(V7_VERSION) V7_RELEASE=$(V7_RELEASE) V7_RHEL_VERSION=$(V7_RHEL_VERSION) install; done - for i in $(SUBDIRS); do $(MAKE) -C $$i DESTDIR=$(DESTDIR) V7_VERSION=$(V7_VERSION) V7_RELEASE=$(V7_RELEASE) install; done - -clean: - $(MAKE) -C tests clean - $(MAKE) -C v7 clean - $(MAKE) -C test-env clean - rm -f v7-*.tar.bz2 - rm -f v7.spec - rm -f v7.spec.el4 - $(MAKE) -C docs clean - -package: install v7-$(V7_VERSION_RELEASE).el$(V7_RHEL_VERSION).tar.bz2 - - -v7-$(V7_VERSION_RELEASE).el$(V7_RHEL_VERSION).tar.bz2: /tmp/v7/exclude v7.spec - tar cjS -f $@ -X /tmp/v7/exclude --exclude $@ * - - -/tmp/v7/exclude: - mkdir -p /tmp/v7 - echo "CVS" > $@ - echo "save" >> $@ - echo ".*" >> $@ - echo ".patch" >> $@ - echo "v7/*.pyc" >> $@ - echo "test-env/bin/*.pyc" >> $@ - echo "*.bz2" >> $@ - -v7.spec: v7.spec.in Makefile - cat $< | sed -e 's/@V7_VERSION@/$(V7_VERSION)/g' -e 's/@V7_RELEASE@/$(V7_RELEASE)/g' -e 's/@V7_RHEL_VERSION@/$(V7_RHEL_VERSION)/g'> $@ - -rpm-prep: v7-$(V7_VERSION_RELEASE).el$(V7_RHEL_VERSION).tar.bz2 v7.spec - rm -rf rpm - mkdir -p rpm/{BUILD,RPMS,SRPMS,SOURCES,SPECS} - cp v7-$(V7_VERSION_RELEASE).el$(V7_RHEL_VERSION).tar.bz2 rpm/SOURCES/ - cp v7.spec rpm/SPECS - -srpm: rpm-prep - rpmbuild --define "_topdir $(HERE)/rpm" -bs rpm/SPECS/v7.spec - -rpm: rpm-prep - rpmbuild --define "_topdir $(HERE)/rpm" -ba rpm/SPECS/v7.spec - Copied: tags/v7-V1-1R4/Makefile (from rev 337, trunk/Makefile) =================================================================== --- tags/v7-V1-1R4/Makefile (rev 0) +++ tags/v7-V1-1R4/Makefile 2010-01-27 11:58:02 UTC (rev 338) @@ -0,0 +1,95 @@ +# Copyright (c) 2006 Red Hat, Inc. All rights reserved. This copyrighted material +# is made available to anyone wishing to use, modify, copy, or +# redistribute it subject to the terms and conditions of the GNU General +# Public License v.2. +# +# 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. +# +# Author: Greg Nichols + +V7_VERSION := 1.1 +V7_RELEASE := 4 +V7_VERSION_RELEASE := $(V7_VERSION)-$(V7_RELEASE) +V7_VERSION_PY := v7/version.py +V7_SVN_MODULE := svn+ssh://svn.fedorahosted.org/svn/v7 +V7_RHEL_VERSION := 5 + +HERE=$(shell pwd) + +HERE=$(shell pwd) + +HERE=$(shell pwd) + +.PHONY: clean install + +SUBDIRS := test-env v7 tests docs + +all: + for i in $(SUBDIRS); do $(MAKE) V7_VERSION=$(V7_VERSION) V7_RELEASE=$(V7_RELEASE) V7_RHEL_VERSION=$(V7_RHEL_VERSION) -C $$i; done + +install-noarch: install + +tag: mark-version + svn copy . $(V7_SVN_MODULE)/tags/`echo "v7-V$(V7_VERSION)R$(V7_RELEASE)" | sed "/\./s//-/"` -m "tag version" + +mark-version: + @echo " " > $(V7_VERSION_PY) + @echo "# $(V7_VERSION_PY) is automatically-generated - DO NOT EDIT" >> $(V7_VERSION_PY) + @echo "version = '$(V7_VERSION)'" >> $(V7_VERSION_PY) + @echo "release = '$(V7_RELEASE)'" >> $(V7_VERSION_PY) + @echo "rhel_version = '$(V7_RHEL_VERSION)'" >> $(V7_VERSION_PY) + +install: mark-version + mkdir -p $(DESTDIR)/usr/share/v7 + mkdir -p $(DESTDIR)/var/v7 + mkdir -p $(DESTDIR)/var/v7/docs + for i in $(SUBDIRS); do $(MAKE) -C $$i DESTDIR=$(DESTDIR) V7_VERSION=$(V7_VERSION) V7_RELEASE=$(V7_RELEASE) V7_RHEL_VERSION=$(V7_RHEL_VERSION) install; done + for i in $(SUBDIRS); do $(MAKE) -C $$i DESTDIR=$(DESTDIR) V7_VERSION=$(V7_VERSION) V7_RELEASE=$(V7_RELEASE) install; done + +clean: + $(MAKE) -C tests clean + $(MAKE) -C v7 clean + $(MAKE) -C test-env clean + rm -f v7-*.tar.bz2 + rm -f v7.spec + rm -f v7.spec.el4 + $(MAKE) -C docs clean + +package: install v7-$(V7_VERSION_RELEASE).el$(V7_RHEL_VERSION).tar.bz2 + + +v7-$(V7_VERSION_RELEASE).el$(V7_RHEL_VERSION).tar.bz2: /tmp/v7/exclude v7.spec + tar cjS -f $@ -X /tmp/v7/exclude --exclude $@ * + + +/tmp/v7/exclude: + mkdir -p /tmp/v7 + echo "CVS" > $@ + echo "save" >> $@ + echo ".*" >> $@ + echo ".patch" >> $@ + echo "v7/*.pyc" >> $@ + echo "test-env/bin/*.pyc" >> $@ + echo "*.bz2" >> $@ + +v7.spec: v7.spec.in Makefile + cat $< | sed -e 's/@V7_VERSION@/$(V7_VERSION)/g' -e 's/@V7_RELEASE@/$(V7_RELEASE)/g' -e 's/@V7_RHEL_VERSION@/$(V7_RHEL_VERSION)/g'> $@ + +rpm-prep: v7-$(V7_VERSION_RELEASE).el$(V7_RHEL_VERSION).tar.bz2 v7.spec + rm -rf rpm + mkdir -p rpm/{BUILD,RPMS,SRPMS,SOURCES,SPECS} + cp v7-$(V7_VERSION_RELEASE).el$(V7_RHEL_VERSION).tar.bz2 rpm/SOURCES/ + cp v7.spec rpm/SPECS + +srpm: rpm-prep + rpmbuild --define "_topdir $(HERE)/rpm" -bs rpm/SPECS/v7.spec + +rpm: rpm-prep + rpmbuild --define "_topdir $(HERE)/rpm" -ba rpm/SPECS/v7.spec + Modified: tags/v7-V1-1R4/v7/version.py =================================================================== --- trunk/v7/version.py 2010-01-27 11:43:50 UTC (rev 335) +++ tags/v7-V1-1R4/v7/version.py 2010-01-27 11:58:02 UTC (rev 338) @@ -1,5 +1,5 @@ # v7/version.py is automatically-generated - DO NOT EDIT -version = '1.0' -release = '23' -rhel_version = '6' +version = '1.1' +release = '4' +rhel_version = '5'

1 0

r337 - trunk
by gnichols＠fedoraproject.org 27 Jan '10

27 Jan '10

Author: gnichols Date: 2010-01-27 11:57:10 +0000 (Wed, 27 Jan 2010) New Revision: 337 Modified: trunk/Makefile Log: R4 Modified: trunk/Makefile =================================================================== --- trunk/Makefile 2010-01-27 11:46:10 UTC (rev 336) +++ trunk/Makefile 2010-01-27 11:57:10 UTC (rev 337) @@ -14,7 +14,7 @@ # Author: Greg Nichols V7_VERSION := 1.1 -V7_RELEASE := 3 +V7_RELEASE := 4 V7_VERSION_RELEASE := $(V7_VERSION)-$(V7_RELEASE) V7_VERSION_PY := v7/version.py V7_SVN_MODULE := svn+ssh://svn.fedorahosted.org/svn/v7

1 0

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

v7-commits January 2010