[csw-devel] [PATCH] mGAR v2: Checking packages against 'current'

maciej at opencsw.org maciej at opencsw.org
Mon Dec 6 18:23:30 CET 2010


From: Maciej Blizinski <maciej at opencsw.org>

Defining CATALOG_RELEASE and setting it to 'current' by default.  This
means that packages will be checked against the current branch by
default.
---
 gar/v2/gar.pkg.mk |    2 ++
 1 files changed, 2 insertions(+), 0 deletions(-)

diff --git a/gar/v2/gar.pkg.mk b/gar/v2/gar.pkg.mk
index 296e73f..fd7c5d4 100644
--- a/gar/v2/gar.pkg.mk
+++ b/gar/v2/gar.pkg.mk
@@ -33,6 +33,7 @@ PKGINFO ?= /usr/bin/pkginfo
 ifeq ($(origin PACKAGES), undefined)
 PACKAGES        = $(if $(filter %.gspec,$(DISTFILES)),,CSW$(GARNAME))
 CATALOGNAME    ?= $(if $(filter %.gspec,$(DISTFILES)),,$(GARNAME))
+CATALOG_RELEASE ?= current
 SRCPACKAGE_BASE = $(firstword $(basename $(filter %.gspec,$(DISTFILES))) $(PACKAGES))
 SRCPACKAGE     ?= $(SRCPACKAGE_BASE)-src
 SPKG_SPECS     ?= $(basename $(filter %.gspec,$(DISTFILES))) $(PACKAGES) $(if $(NOSOURCEPACKAGE),,$(SRCPACKAGE))
@@ -846,6 +847,7 @@ pkgcheck: $(foreach SPEC,$(_PKG_SPECS),package-$(SPEC))
 	$(_DBG)( LC_ALL=C $(GARBIN)/checkpkg \
 		--architecture $(GARCH) \
 		--os-releases $(SPKG_OSNAME) \
+		--catalog-release $(CATALOG_RELEASE) \
 		$(foreach SPEC,$(_PKG_SPECS),$(SPKG_EXPORT)/`$(call _PKG_ENV,$(SPEC)) mkpackage --tmpdir $(SPKG_TMPDIR) -qs $(WORKDIR)/$(SPEC).gspec -D pkgfile`.gz ) || exit 2;)
 	@$(MAKECOOKIE)
 
-- 
1.7.3.2



More information about the devel mailing list