Re: [csw-devel] [PATCH] Fix SPKG_DESC duplicate checking
2011/8/3 Ben Walton : > I wonder if checkpkg isn't a better place for this check though? > Separating package building from package verification makes sense to > me. I like the early detection of the issue. You could consider it a build recipe check, as opposed to a binary package check. Nevertheless, checking the resulting binary package set could be a good idea. Something like "no two packages from the set under test should have the same description field". As an extended check, descriptions could be matched against all descriptions in the catalog, but the database doesn't have the metadata yet. Maciej ___ devel mailing list devel@lists.opencsw.org https://lists.opencsw.org/mailman/listinfo/devel
[csw-devel] SF.net SVN: gar:[15248] csw/mgar/gar/v2/gar.pkg.mk
Revision: 15248 http://gar.svn.sourceforge.net/gar/?rev=15248&view=rev Author: wahwah Date: 2011-08-03 09:05:46 + (Wed, 03 Aug 2011) Log Message: --- Fix SPKG_DESC duplicate checking Works around ticket #56. http://sourceforge.net/apps/trac/gar/ticket/56 Previous attempt at fixing it: http://sourceforge.net/apps/trac/gar/changeset/11424 Modified Paths: -- csw/mgar/gar/v2/gar.pkg.mk Modified: csw/mgar/gar/v2/gar.pkg.mk === --- csw/mgar/gar/v2/gar.pkg.mk 2011-08-03 01:36:31 UTC (rev 15247) +++ csw/mgar/gar/v2/gar.pkg.mk 2011-08-03 09:05:46 UTC (rev 15248) @@ -640,9 +640,16 @@ $(foreach P,$(SPKG_SPECS),\ $(if $(SPKG_DESC_$(P)),,$(error Multiple packages defined and SPKG_DESC_$(P) is not set. +# There was a bug here. +# http://sourceforge.net/apps/trac/gar/ticket/56 +# The workaround was to add an additional check whether the strings are the +# same or not. $(foreach P,$(SPKG_SPECS),\ $(foreach Q,$(filter-out $(P) $(OBSOLETED_PKGS),$(SPKG_SPECS)),\ - $(if $(filter-out $(subst ,_,$(SPKG_DESC_$(P))),$(subst ,_,$(SPKG_DESC_$(Q,,$(error The package descriptions for $(P) [$(if $(SPKG_DESC_$(P)),$(SPKG_DESC_$(P)),)] and $(Q) [$(if $(SPKG_DESC_$(Q)),$(SPKG_DESC_$(Q)),)] are identical. Please make sure that all descriptions are unique by setting SPKG_DESC_ for each package. + $(if $(filter-out $(subst ,_,$(SPKG_DESC_$(P))),$(subst ,_,$(SPKG_DESC_$(Q,\ + ,\ + $(if $(shell if [ "$(SPKG_DESC_$(P))" = "$(SPKG_DESC_$(Q))" ]; then echo bad; fi),\ + $(error The package descriptions for $(P) [$(if $(SPKG_DESC_$(P)),$(SPKG_DESC_$(P)),)] and $(Q) [$(if $(SPKG_DESC_$(Q)),$(SPKG_DESC_$(Q)),)] are identical. Please make sure that all descriptions are unique by setting SPKG_DESC_ for each package.), .PRECIOUS: $(WORKDIR)/%.pkginfo 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:[15249] csw/mgar/gar/v2/lib/python
Revision: 15249 http://gar.svn.sourceforge.net/gar/?rev=15249&view=rev Author: wahwah Date: 2011-08-03 09:06:51 + (Wed, 03 Aug 2011) Log Message: --- checkpkg: Shared libraries need the .so extension Based on the libdnet example and bug 4811. http://lists.opencsw.org/pipermail/maintainers/2011-August/015089.html https://www.opencsw.org/mantis/view.php?id=4811 Modified Paths: -- csw/mgar/gar/v2/lib/python/package_checks.py csw/mgar/gar/v2/lib/python/package_checks_test.py Modified: csw/mgar/gar/v2/lib/python/package_checks.py === --- csw/mgar/gar/v2/lib/python/package_checks.py2011-08-03 09:05:46 UTC (rev 15248) +++ csw/mgar/gar/v2/lib/python/package_checks.py2011-08-03 09:06:51 UTC (rev 15249) @@ -1307,3 +1307,12 @@ error_mgr.NeedFile( "/opt/csw/sbin/alternatives", "The alternatives subsystem is used") + + +def CheckSharedLibrarySoExtension(pkg_data, error_mgr, logger, messenger): + shared_libs = set(su.GetSharedLibs(pkg_data)) + for shared_lib in shared_libs: +if ".so" not in shared_lib: + error_mgr.ReportError( + "shared-library-missing-dot-so", + "file=%s" % shared_lib) Modified: csw/mgar/gar/v2/lib/python/package_checks_test.py === --- csw/mgar/gar/v2/lib/python/package_checks_test.py 2011-08-03 09:05:46 UTC (rev 15248) +++ csw/mgar/gar/v2/lib/python/package_checks_test.py 2011-08-03 09:06:51 UTC (rev 15249) @@ -1819,5 +1819,21 @@ "The alternatives subsystem is used") +class TestCheckSharedLibrarySoExtension( +CheckpkgUnitTestHelper, unittest.TestCase): + FUNCTION_NAME = 'CheckSharedLibrarySoExtension' + def CheckpkgTest(self): +self.pkg_data = copy.deepcopy(neon_stats[0]) + + def CheckpkgTest2(self): +self.pkg_data = copy.deepcopy(neon_stats[0]) +self.pkg_data["files_metadata"][11]["path"] = "foo.1" +self.error_mgr_mock.ReportError( +'shared-library-missing-dot-so', 'file=foo.1') + + def testTwo(self): +self.RunCheckpkgTest(self.CheckpkgTest2) + + if __name__ == '__main__': unittest.main() 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
Re: [csw-devel] SF.net SVN: gar:[15248] csw/mgar/gar/v2/gar.pkg.mk
2011/8/3 : > Fix SPKG_DESC duplicate checking I meant to only submit the other change. Well, if this got in, I'll let it be, since it allows to work on the gcc packages. We'll do further improvements later. Maciej ___ devel mailing list devel@lists.opencsw.org https://lists.opencsw.org/mailman/listinfo/devel
Re: [csw-devel] [PATCH] Fix SPKG_DESC duplicate checking
Excerpts from Maciej Bliziński's message of Wed Aug 03 04:36:31 -0400 2011: > I like the early detection of the issue. You could consider it a > build recipe check, as opposed to a binary package check. Fail fast is good, but doing the check in GAR removes the opportunity to intentionally have two the same. This isn't a likely scenario though. > Nevertheless, checking the resulting binary package set could be a > good idea. Something like "no two packages from the set under test > should have the same description field". As an extended check, > descriptions could be matched against all descriptions in the > catalog, but the database doesn't have the metadata yet. I would only look at the current set for a check like this. Thanks -Ben -- Ben Walton Systems Programmer - CHASS University of Toronto C:416.407.5610 | W:416.978.4302 ___ devel mailing list devel@lists.opencsw.org https://lists.opencsw.org/mailman/listinfo/devel
[csw-devel] SF.net SVN: gar:[15250] csw/mgar/pkg/pkgutil/trunk
Revision: 15250 http://gar.svn.sourceforge.net/gar/?rev=15250&view=rev Author: bonivart Date: 2011-08-03 14:33:07 + (Wed, 03 Aug 2011) Log Message: --- pkgutil/trunk: update to 2.5 beta 1 Modified Paths: -- csw/mgar/pkg/pkgutil/trunk/Makefile csw/mgar/pkg/pkgutil/trunk/checksums Modified: csw/mgar/pkg/pkgutil/trunk/Makefile === --- csw/mgar/pkg/pkgutil/trunk/Makefile 2011-08-03 09:06:51 UTC (rev 15249) +++ csw/mgar/pkg/pkgutil/trunk/Makefile 2011-08-03 14:33:07 UTC (rev 15250) @@ -1,5 +1,5 @@ NAME = pkgutil -VERSION = 2.4 +VERSION = 2.5b1 CATEGORIES = utils DESCRIPTION = Installs Solaris packages easily @@ -10,9 +10,6 @@ package automatically. endef -# Disable inclusion of CSWcommon by default. -COMMON_PKG_DEPENDS = - MASTER_SITES = $(SF_MIRRORS) #MASTER_SITES = http://sourceforge.net/projects/pkgutil/files/pkgutil/2.4/ DISTFILES = $(NAME)-$(VERSION).zip @@ -34,6 +31,11 @@ DISTFILES += opencsw.py DISTFILES += cswcatalog +LICENSE = license + +# Disable inclusion of CSWcommon by default. +COMMON_PKG_DEPENDS = + PACKAGES = CSWpkgutil CATALOGNAME_CSWpkgutil = pkgutil SPKG_DESC_CSWpkgutil = $(DESCRIPTION) @@ -98,9 +100,10 @@ @ginstall -m 755 $(FILEDIR)/build_sun_catalog.py $(FILEDIR)/opencsw.py $(DESTDIR)/opt/csw/libexec/$(NAME) @ln -s ../libexec/pkgutil/build_sun_catalog.py $(DESTDIR)$(bindir)/build_sun_catalog @ginstall -m 755 -d $(DESTDIR)$(docdir)/$(NAME) - @ginstall -m 444 $(WORKSRC)/readme $(WORKSRC)/license $(DESTDIR)$(docdir)/$(NAME)/ + @ginstall -m 444 $(WORKSRC)/readme $(DESTDIR)$(docdir)/$(NAME)/ +# @ginstall -m 444 $(WORKSRC)/license $(DESTDIR)$(docdir)/$(NAME)/ @ginstall -m 755 -d $(DESTDIR)$(docdir)/$(NAME)plus - @ginstall -m 444 $(WORKSRC)/license $(DESTDIR)$(docdir)/$(NAME)plus/ +# @ginstall -m 444 $(WORKSRC)/license $(DESTDIR)$(docdir)/$(NAME)plus/ @ginstall -m 444 $(WORKSRC)/readme.pkgutilplus $(DESTDIR)$(docdir)/$(NAME)plus/readme @ginstall -m 755 -d $(DESTDIR)$(mandir)/man1 @pod2man --section=1 $(WORKSRC)/$(NAME) > $(DESTDIR)$(mandir)/man1/pkgutil.1 Modified: csw/mgar/pkg/pkgutil/trunk/checksums === --- csw/mgar/pkg/pkgutil/trunk/checksums2011-08-03 09:06:51 UTC (rev 15249) +++ csw/mgar/pkg/pkgutil/trunk/checksums2011-08-03 14:33:07 UTC (rev 15250) @@ -1 +1 @@ -e87b64770282e68713692dce6e0808c3 pkgutil-2.4.zip +e69620e109e75ade9f1c7ea83b302786 pkgutil-2.5b1.zip 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:[15251] csw/mgar/pkg/libdshconfig/trunk/Makefile
Revision: 15251 http://gar.svn.sourceforge.net/gar/?rev=15251&view=rev Author: khabermann Date: 2011-08-03 15:06:49 + (Wed, 03 Aug 2011) Log Message: --- libdshconfig: cleanup Makefile (remove unused code) Modified Paths: -- csw/mgar/pkg/libdshconfig/trunk/Makefile Modified: csw/mgar/pkg/libdshconfig/trunk/Makefile === --- csw/mgar/pkg/libdshconfig/trunk/Makefile2011-08-03 14:33:07 UTC (rev 15250) +++ csw/mgar/pkg/libdshconfig/trunk/Makefile2011-08-03 15:06:49 UTC (rev 15251) @@ -12,15 +12,6 @@ DISTFILES = $(DISTNAME).tar.gz -# File name regex to get notifications about upstream software releases -# NOTE: Use this only if the automatic regex creation -# does not work for your package -# UFILES_REGEX = $(NAME)-(\d+(?:\.\d+)*).tar.gz - -# If the url used to check for software update is different of MASTER_SITES, then -# uncomment the next line. Otherwise it is set by default to the value of MASTER_SITES -# UPSTREAM_MASTER_SITES = - CONFIGURE_ARGS = $(DIRPATHS) include gar/category.mk 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:[15252] csw/mgar/pkg/dsh/trunk/Makefile
Revision: 15252 http://gar.svn.sourceforge.net/gar/?rev=15252&view=rev Author: khabermann Date: 2011-08-03 15:08:59 + (Wed, 03 Aug 2011) Log Message: --- dsh: cleanup Makefile (better solution for extra libs, remove unused code) Modified Paths: -- csw/mgar/pkg/dsh/trunk/Makefile Modified: csw/mgar/pkg/dsh/trunk/Makefile === --- csw/mgar/pkg/dsh/trunk/Makefile 2011-08-03 15:06:49 UTC (rev 15251) +++ csw/mgar/pkg/dsh/trunk/Makefile 2011-08-03 15:08:59 UTC (rev 15252) @@ -13,18 +13,8 @@ MASTER_SITES = http://www.netfort.gr.jp/~dancer/software/downloads/dsh-0.25.9.tar.gz DISTFILES = $(DISTNAME).tar.gz -# File name regex to get notifications about upstream software releases -# NOTE: Use this only if the automatic regex creation -# does not work for your package -# UFILES_REGEX = $(NAME)-(\d+(?:\.\d+)*).tar.gz - -# If the url used to check for software update is different of MASTER_SITES, then -# uncomment the next line. Otherwise it is set by default to the value of MASTER_SITES -# UPSTREAM_MASTER_SITES = - # for libintl_gettext, libintl_textdomain, libintl_bindtextdomain -LIBS += -lintl -export LIBS +EXTRA_LINKER_FLAGS = -lintl CONFIGURE_ARGS = $(DIRPATHS) 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:[15253] csw/mgar/pkg/libdnet/trunk
Revision: 15253 http://gar.svn.sourceforge.net/gar/?rev=15253&view=rev Author: wahwah Date: 2011-08-03 16:37:11 + (Wed, 03 Aug 2011) Log Message: --- pkg/libdnet/trunk: upgrade to 1.12, upstream address change Modified Paths: -- csw/mgar/pkg/libdnet/trunk/Makefile csw/mgar/pkg/libdnet/trunk/checksums Modified: csw/mgar/pkg/libdnet/trunk/Makefile === --- csw/mgar/pkg/libdnet/trunk/Makefile 2011-08-03 15:08:59 UTC (rev 15252) +++ csw/mgar/pkg/libdnet/trunk/Makefile 2011-08-03 16:37:11 UTC (rev 15253) @@ -1,22 +1,20 @@ # $Id$ NAME = libdnet -VERSION = 1.11 +VERSION = 1.12 CATEGORIES = lib +GARTYPE = v2 DESCRIPTION = A simplified, portable interface to several low-level networking routines define BLURB endef -MASTER_SITES = $(SF_MIRROR) +VENDOR_URL = http://code.google.com/p/libdnet/ +MASTER_SITES = $(GOOGLE_MIRROR) DISTFILES = $(NAME)-$(VERSION).tar.gz -# File name regex to get notifications about upstream software releases -UFILES_REGEX = $(NAME)-(\d+(?:\.\d+)*).tar.gz - LICENSE = LICENSE BUILD64 = 1 -NOISAEXEC = 1 CONFIGURE_ARGS = $(DIRPATHS) MERGE_DIRS_isa-extra = $(libdir) Modified: csw/mgar/pkg/libdnet/trunk/checksums === --- csw/mgar/pkg/libdnet/trunk/checksums2011-08-03 15:08:59 UTC (rev 15252) +++ csw/mgar/pkg/libdnet/trunk/checksums2011-08-03 16:37:11 UTC (rev 15253) @@ -1 +1 @@ -04c394ed8e1e7fc455456e79e908916d libdnet-1.11.tar.gz +0984cf799f070ec51be753d697830143 libdnet-1.12.tar.gz 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:[15254] csw/mgar/pkg/libdnet/trunk/Makefile
Revision: 15254 http://gar.svn.sourceforge.net/gar/?rev=15254&view=rev Author: wahwah Date: 2011-08-03 16:38:03 + (Wed, 03 Aug 2011) Log Message: --- pkg/libdnet/trunk: link to the upstream bug Modified Paths: -- csw/mgar/pkg/libdnet/trunk/Makefile Modified: csw/mgar/pkg/libdnet/trunk/Makefile === --- csw/mgar/pkg/libdnet/trunk/Makefile 2011-08-03 16:37:11 UTC (rev 15253) +++ csw/mgar/pkg/libdnet/trunk/Makefile 2011-08-03 16:38:03 UTC (rev 15254) @@ -4,6 +4,8 @@ CATEGORIES = lib GARTYPE = v2 +# ! .so extension missing http://code.google.com/p/libdnet/issues/detail?id=18 + DESCRIPTION = A simplified, portable interface to several low-level networking routines define BLURB endef 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:[15255] csw/mgar/pkg/libdnet/trunk/Makefile
Revision: 15255 http://gar.svn.sourceforge.net/gar/?rev=15255&view=rev Author: wahwah Date: 2011-08-03 17:59:06 + (Wed, 03 Aug 2011) Log Message: --- pkg/libdnet/trunk: Found a link about a very similar issue Modified Paths: -- csw/mgar/pkg/libdnet/trunk/Makefile Modified: csw/mgar/pkg/libdnet/trunk/Makefile === --- csw/mgar/pkg/libdnet/trunk/Makefile 2011-08-03 16:38:03 UTC (rev 15254) +++ csw/mgar/pkg/libdnet/trunk/Makefile 2011-08-03 17:59:06 UTC (rev 15255) @@ -5,6 +5,9 @@ GARTYPE = v2 # ! .so extension missing http://code.google.com/p/libdnet/issues/detail?id=18 +# An idea: +# http://www.v7w.com/debian/libtool-missing_so.html +# http://www.v7w.com/debian/libtool-updating.html DESCRIPTION = A simplified, portable interface to several low-level networking routines define BLURB 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
