[csw-devel] SF.net SVN: gar:[10471] csw/mgar/pkg/tkcvs/trunk/Makefile
Revision: 10471 http://gar.svn.sourceforge.net/gar/?rev=10471&view=rev Author: opk Date: 2010-07-08 14:09:21 + (Thu, 08 Jul 2010) Log Message: --- add checkpkg overrides for tkcvs Modified Paths: -- csw/mgar/pkg/tkcvs/trunk/Makefile Modified: csw/mgar/pkg/tkcvs/trunk/Makefile === --- csw/mgar/pkg/tkcvs/trunk/Makefile 2010-07-07 15:08:52 UTC (rev 10470) +++ csw/mgar/pkg/tkcvs/trunk/Makefile 2010-07-08 14:09:21 UTC (rev 10471) @@ -30,6 +30,10 @@ ARCHALL = 1 RUNTIME_DEP_PKGS = CSWtcl CSWtk CSWtkdiff +CHECKPKG_OVERRIDES_CSWtkcvs += surplus-dependency|CSWtcl +CHECKPKG_OVERRIDES_CSWtkcvs += surplus-dependency|CSWtkdiff +CHECKPKG_OVERRIDES_CSWtkcvs += surplus-dependency|CSWtk + include gar/category.mk TCL_FILES = $(filter-out %/tkcvs.tcl,$(wildcard $(WORKSRC)/tkcvs/*.tcl)) This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. ___ devel mailing list devel@lists.opencsw.org https://lists.opencsw.org/mailman/listinfo/devel
[csw-devel] SF.net SVN: gar:[10472] csw/mgar/pkg/xterm/trunk/files/changelog.CSW
Revision: 10472 http://gar.svn.sourceforge.net/gar/?rev=10472&view=rev Author: skayser Date: 2010-07-08 19:40:52 + (Thu, 08 Jul 2010) Log Message: --- xterm: update changelog.CSW Modified Paths: -- csw/mgar/pkg/xterm/trunk/files/changelog.CSW Modified: csw/mgar/pkg/xterm/trunk/files/changelog.CSW === --- csw/mgar/pkg/xterm/trunk/files/changelog.CSW2010-07-08 14:09:21 UTC (rev 10471) +++ csw/mgar/pkg/xterm/trunk/files/changelog.CSW2010-07-08 19:40:52 UTC (rev 10472) @@ -1,3 +1,9 @@ +xterm (260,REV=2010.07.08) + + * Updated to 260. (Fixes #4473) + + -- Sebastian Kayser Thu, 8 Jul 2010 21:40:22 +0200 + xterm (258,REV=2010.05.25) * Updated to 258. (Fixes #4186) This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. ___ devel mailing list devel@lists.opencsw.org https://lists.opencsw.org/mailman/listinfo/devel
[csw-devel] SF.net SVN: gar:[10473] csw/mgar/gar/v2
Revision: 10473 http://gar.svn.sourceforge.net/gar/?rev=10473&view=rev Author: wahwah Date: 2010-07-08 21:10:38 + (Thu, 08 Jul 2010) Log Message: --- mGAR v2: checkpkg, better shared library resolution, by basenames, not by sonames. Making the soname field optional, the way it should be. Modified Paths: -- csw/mgar/gar/v2/bin/checkpkg_collect_stats.py csw/mgar/gar/v2/lib/python/checkpkg.py csw/mgar/gar/v2/lib/python/dependency_checks.py csw/mgar/gar/v2/lib/python/opencsw.py csw/mgar/gar/v2/lib/python/package_checks.py csw/mgar/gar/v2/lib/python/package_checks_test.py csw/mgar/gar/v2/lib/python/testdata/rsync_pkg_stats.py Added Paths: --- csw/mgar/gar/v2/lib/python/testdata/ivtools_stats.py Modified: csw/mgar/gar/v2/bin/checkpkg_collect_stats.py === --- csw/mgar/gar/v2/bin/checkpkg_collect_stats.py 2010-07-08 19:40:52 UTC (rev 10472) +++ csw/mgar/gar/v2/bin/checkpkg_collect_stats.py 2010-07-08 21:10:38 UTC (rev 10473) @@ -62,7 +62,7 @@ bar = progressbar.ProgressBar() bar.maxval = total_packages bar.start() - logging.debug("Making sure package statistics are collected.") + logging.info("Unpacking and examining the srv4 files needed.") while stats_list: # This way objects will get garbage collected as soon as they are removed # from the list by pop(). The destructor (__del__()) of the srv4 class Modified: csw/mgar/gar/v2/lib/python/checkpkg.py === --- csw/mgar/gar/v2/lib/python/checkpkg.py 2010-07-08 19:40:52 UTC (rev 10472) +++ csw/mgar/gar/v2/lib/python/checkpkg.py 2010-07-08 21:10:38 UTC (rev 10473) @@ -32,7 +32,7 @@ DEBUG_BREAK_PKGMAP_AFTER = False DB_SCHEMA_VERSION = 4L -PACKAGE_STATS_VERSION = 6L +PACKAGE_STATS_VERSION = 8L SYSTEM_PKGMAP = "/var/sadm/install/contents" NEEDED_SONAMES = "needed sonames" RUNPATH = "runpath" @@ -77,6 +77,8 @@ (r".*\.el$", u"CSWemacscommon"), (r".*\.elc$", u"CSWemacscommon"), ) +# Compiling the regexes ahead of time. +DEPENDENCY_FILENAME_REGEXES = tuple([(re.compile(x), y) for x, y in DEPENDENCY_FILENAME_REGEXES]) REPORT_TMPL = u"""#if $missing_deps or $surplus_deps or $orphan_sonames Dependency issues of $pkgname: @@ -514,7 +516,7 @@ return schema_on_disk; res = m.CswConfig.select(m.CswConfig.q.option_key == CONFIG_DB_SCHEMA) if res.count() < 1: - logging.info("No db schema value found, assuming %s.", + logging.debug("No db schema value found, assuming %s.", schema_on_disk) elif res.count() == 1: schema_on_disk = res.getOne().int_value @@ -565,6 +567,8 @@ self.runpath_sanitize_cache = {} def ExpandRunpath(self, runpath, isalist): +# TODO: Implement $ORIGIN support +# Probably not here as it would make caching unusable. key = (runpath, tuple(isalist)) if key not in self.runpath_expand_cache: # Emulating $ISALIST expansion @@ -679,6 +683,8 @@ # Converting runpath to a tuple, which is a hashable data type and can act as # a key in a dict. binary_data[RUNPATH] = tuple(binary_data[RUNPATH]) + # the NEEDED list must not be modified, converting to a tuple. + binary_data[NEEDED_SONAMES] = tuple(binary_data[NEEDED_SONAMES]) binary_data["RUNPATH RPATH the same"] = (runpath == rpath) binary_data["RPATH set"] = bool(rpath) binary_data["RUNPATH set"] = bool(runpath) @@ -1031,7 +1037,11 @@ pkg_stats = self.GetDbObject() if not pkg_stats: return False -return pkg_stats.stats_version == PACKAGE_STATS_VERSION +if pkg_stats.stats_version != PACKAGE_STATS_VERSION: + pkg_stats.destroySelf() +else: + return True +return False def GetDirFormatPkg(self): if not self.dir_format_pkg: @@ -1071,13 +1081,7 @@ ret = dump_proc.wait() binary_data = ParseDumpOutput(stdout) binary_data["path"] = binary - binary_data["soname_guessed"] = False binary_data["base_name"] = binary_base_name - if SONAME not in binary_data: -# The binary doesn't tell its SONAME. We're guessing it's the -# same as the base file name. -binary_data[SONAME] = binary_base_name -binary_data["soname_guessed"] = True binaries_dump_info.append(binary_data) return binaries_dump_info Modified: csw/mgar/gar/v2/lib/python/dependency_checks.py === --- csw/mgar/gar/v2/lib/python/dependency_checks.py 2010-07-08 19:40:52 UTC (rev 10472) +++ csw/mgar/gar/v2/lib/python/dependency_checks.py 2010-07-08 21:10:38 UTC (rev 10473) @@ -7,6 +7,8 @@ ("/opt/csw/lib", "libdb-4.7.so", "Deprecated Berkeley DB location"), ("/opt/csw/lib/mysql", "libmysqlclient_r.so.15", "Please use /opt/csw/mysql5/..."), +("/opt/csw/lib/sparcv9/mysql", "li
[csw-devel] SF.net SVN: gar:[10474] csw/mgar/pkg/gtar/trunk/Makefile
Revision: 10474 http://gar.svn.sourceforge.net/gar/?rev=10474&view=rev Author: bdwalton Date: 2010-07-09 00:20:10 + (Fri, 09 Jul 2010) Log Message: --- gtar: remove grmt to prevent file dup with CSWgcpio Modified Paths: -- csw/mgar/pkg/gtar/trunk/Makefile Modified: csw/mgar/pkg/gtar/trunk/Makefile === --- csw/mgar/pkg/gtar/trunk/Makefile2010-07-08 21:10:38 UTC (rev 10473) +++ csw/mgar/pkg/gtar/trunk/Makefile2010-07-09 00:20:10 UTC (rev 10474) @@ -35,6 +35,7 @@ include gar/category.mk post-install-modulated: + rm $(DESTDIR)/opt/csw/libexec/grmt ginstall -d $(DESTDIR)$(prefix)/gnu $(foreach G,$(notdir $(wildcard $(DESTDIR)$(bindir)/*)),ln -s ../bin/$G $(DESTDIR)$(prefix)/gnu/$(patsubst g%,%,$G);) @$(MAKECOOKIE) This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. ___ devel mailing list devel@lists.opencsw.org https://lists.opencsw.org/mailman/listinfo/devel
[csw-devel] SF.net SVN: gar:[10475] csw/mgar/gar/v2/gar.mk
Revision: 10475 http://gar.svn.sourceforge.net/gar/?rev=10475&view=rev Author: bdwalton Date: 2010-07-09 00:33:08 + (Fri, 09 Jul 2010) Log Message: --- gar/v2: add makecookie statement back to check-prereqs Modified Paths: -- csw/mgar/gar/v2/gar.mk Modified: csw/mgar/gar/v2/gar.mk === --- csw/mgar/gar/v2/gar.mk 2010-07-09 00:20:10 UTC (rev 10474) +++ csw/mgar/gar/v2/gar.mk 2010-07-09 00:33:08 UTC (rev 10475) @@ -304,6 +304,7 @@ check-prereqs: @$(abspath $(GARBIN)/check_for_deps) $(ALL_PREREQ_PKGS) + @$(MAKECOOKIE) prerequisitepkg-%: @echo " ==> Verifying for installed package $*: \c" This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. ___ devel mailing list devel@lists.opencsw.org https://lists.opencsw.org/mailman/listinfo/devel
[csw-devel] SF.net SVN: gar:[10476] csw/mgar/pkg/gtar/trunk/Makefile
Revision: 10476 http://gar.svn.sourceforge.net/gar/?rev=10476&view=rev Author: bdwalton Date: 2010-07-09 01:14:17 + (Fri, 09 Jul 2010) Log Message: --- gtar: disable building grmt via configure option Modified Paths: -- csw/mgar/pkg/gtar/trunk/Makefile Modified: csw/mgar/pkg/gtar/trunk/Makefile === --- csw/mgar/pkg/gtar/trunk/Makefile2010-07-09 00:33:08 UTC (rev 10475) +++ csw/mgar/pkg/gtar/trunk/Makefile2010-07-09 01:14:17 UTC (rev 10476) @@ -28,6 +28,7 @@ NOISALIST = 1 CONFIGURE_ARGS = $(DIRPATHS) --program-prefix=g +CONFIGURE_ARGS += --with-rmt=/opt/csw/libexec/grmt TEST_SCRIPTS = EXTRA_MERGE_EXCLUDE_FILES = $(libdir)/charset.alias @@ -35,7 +36,6 @@ include gar/category.mk post-install-modulated: - rm $(DESTDIR)/opt/csw/libexec/grmt ginstall -d $(DESTDIR)$(prefix)/gnu $(foreach G,$(notdir $(wildcard $(DESTDIR)$(bindir)/*)),ln -s ../bin/$G $(DESTDIR)$(prefix)/gnu/$(patsubst g%,%,$G);) @$(MAKECOOKIE) This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. ___ devel mailing list devel@lists.opencsw.org https://lists.opencsw.org/mailman/listinfo/devel
[csw-devel] SF.net SVN: gar:[10477] csw/mgar/pkg/gtar/trunk/Makefile
Revision: 10477 http://gar.svn.sourceforge.net/gar/?rev=10477&view=rev Author: bdwalton Date: 2010-07-09 01:15:38 + (Fri, 09 Jul 2010) Log Message: --- gtar: depend on gcpio for buildtime and runtime Modified Paths: -- csw/mgar/pkg/gtar/trunk/Makefile Modified: csw/mgar/pkg/gtar/trunk/Makefile === --- csw/mgar/pkg/gtar/trunk/Makefile2010-07-09 01:14:17 UTC (rev 10476) +++ csw/mgar/pkg/gtar/trunk/Makefile2010-07-09 01:15:38 UTC (rev 10477) @@ -24,7 +24,8 @@ SPKG_SOURCEURL = http://www.gnu.org/software/tar/ -RUNTIME_DEP_PKGS = CSWggettextrt CSWiconv +BUILD_DEP_PKGS = CSWgcpio +RUNTIME_DEP_PKGS = CSWggettextrt CSWiconv CSWgcpio NOISALIST = 1 CONFIGURE_ARGS = $(DIRPATHS) --program-prefix=g This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. ___ devel mailing list devel@lists.opencsw.org https://lists.opencsw.org/mailman/listinfo/devel
[csw-devel] SF.net SVN: gar:[10478] csw/mgar/pkg/gtar/trunk/Makefile
Revision: 10478 http://gar.svn.sourceforge.net/gar/?rev=10478&view=rev Author: bdwalton Date: 2010-07-09 01:27:36 + (Fri, 09 Jul 2010) Log Message: --- gtar: checkpkg override for gcpio dep Modified Paths: -- csw/mgar/pkg/gtar/trunk/Makefile Modified: csw/mgar/pkg/gtar/trunk/Makefile === --- csw/mgar/pkg/gtar/trunk/Makefile2010-07-09 01:15:38 UTC (rev 10477) +++ csw/mgar/pkg/gtar/trunk/Makefile2010-07-09 01:27:36 UTC (rev 10478) @@ -34,6 +34,8 @@ EXTRA_MERGE_EXCLUDE_FILES = $(libdir)/charset.alias +CHECKPKG_OVERRIDES_CSWgtar += surplus-dependency|CSWgcpio + include gar/category.mk post-install-modulated: This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. ___ devel mailing list devel@lists.opencsw.org https://lists.opencsw.org/mailman/listinfo/devel