From mboxrd@z Thu Jan  1 00:00:00 1970
Return-path: <ptxdist-bounces@pengutronix.de>
Received: from eddie.linux-mips.org ([78.24.191.182] helo=cvs.linux-mips.org)
	by metis.ext.pengutronix.de with esmtp (Exim 4.72)
	(envelope-from <ladis@linux-mips.org>) id 1S7xZk-0003sP-U3
	for ptxdist@pengutronix.de; Thu, 15 Mar 2012 00:25:50 +0100
Received: (from localhost user: 'ladis' uid#521 fake: STDIN
	(ladis@eddie.linux-mips.org)) by eddie.linux-mips.org
	id S1903749Ab2CNXZs (ORCPT <rfc822;ptxdist@pengutronix.de>);
	Thu, 15 Mar 2012 00:25:48 +0100
Date: Thu, 15 Mar 2012 00:25:45 +0100
From: Ladislav Michl <ladis@linux-mips.org>
Message-ID: <20120314232545.GA14376@localhost.localdomain>
MIME-Version: 1.0
Content-Disposition: inline
Subject: [ptxdist] [PATCH] image_ipkg.make: create repository directory
Reply-To: ptxdist@pengutronix.de
List-Id: PTXdist Development Mailing List <ptxdist.pengutronix.de>
List-Unsubscribe: <http://metis.pengutronix.de/cgi-bin/mailman/options/ptxdist>, 
	<mailto:ptxdist-request@pengutronix.de?subject=unsubscribe>
List-Archive: <http://metis.pengutronix.de/pipermail/ptxdist>
List-Post: <mailto:ptxdist@pengutronix.de>
List-Help: <mailto:ptxdist-request@pengutronix.de?subject=help>
List-Subscribe: <http://metis.pengutronix.de/cgi-bin/mailman/listinfo/ptxdist>, 
	<mailto:ptxdist-request@pengutronix.de?subject=subscribe>
Content-Type: text/plain; charset="us-ascii"
Content-Transfer-Encoding: 7bit
Sender: ptxdist-bounces@pengutronix.de
Errors-To: ptxdist-bounces@pengutronix.de
To: ptxdist@pengutronix.de

Pushing ipks fails when top level repository directory does not exists.
Once here, use helper variables for repository paths.

Signed-off-by: Ladislav Michl <ladis@linux-mips.org>
---
 image_ipkg.make |   14 +++++++++-----
 1 file changed, 9 insertions(+), 5 deletions(-)

diff --git a/rules/post/image_ipkg.make b/rules/post/image_ipkg.make
index 5449553..4989632 100644
--- a/rules/post/image_ipkg.make
+++ b/rules/post/image_ipkg.make
@@ -11,17 +11,21 @@
 
 SEL_ROOTFS-$(PTXCONF_IMAGE_IPKG_PUSH_TO_REPOSITORY) += $(STATEDIR)/ipkg-push
 
-ipkg-push : $(STATEDIR)/ipkg-push
+ipkg-push: $(STATEDIR)/ipkg-push
+
+IPKG_DISTDIR	:= $(call remove_quotes,$(PTXCONF_SETUP_IPKG_REPOSITORY)/$(PTXCONF_PROJECT)/dists/$(PTXCONF_PROJECT)$(PTXCONF_PROJECT_VERSION))
+IPKG_REPODIR	:= $(call remove_quotes,$(PTXCONF_SETUP_IPKG_REPOSITORY))
 
 $(STATEDIR)/ipkg-push: $(STATEDIR)/host-ipkg-utils.install.post $(STATEDIR)/world.targetinstall
 	@$(call targetinfo)
 ifdef PTXCONF_IMAGE_IPKG_FORCED_PUSH
-	rm  -rf $(PTXCONF_SETUP_IPKG_REPOSITORY)/$(PTXCONF_PROJECT)/dists/$(PTXCONF_PROJECT)$(PTXCONF_PROJECT_VERSION)
+	rm  -rf $(IPKG_DISTDIR)
 endif
+	mkdir -p $(IPKG_REPODIR)
 	@echo "pushing ipkg packages to ipkg-repository..."
 	@$(HOST_ENV) $(PTXDIST_TOPDIR)/scripts/ipkg-push \
 		--ipkgdir  $(call remove_quotes,$(PKGDIR)) \
-		--repodir  $(call remove_quotes,$(PTXCONF_SETUP_IPKG_REPOSITORY)) \
+		--repodir  $(IPKG_REPODIR) \
 		--revision $(call remove_quotes,$(PTXDIST_VERSION_FULL)) \
 		--project  $(call remove_quotes,$(PTXCONF_PROJECT)) \
 		--dist     $(call remove_quotes,$(PTXCONF_PROJECT)$(PTXCONF_PROJECT_VERSION)) \
@@ -30,12 +34,12 @@ endif
 ifdef PTXCONF_IMAGE_IPKG_SIGN_OPENSSL
 	@echo "signing Packages..."
 	openssl smime -sign \
-		-in $(PTXCONF_SETUP_IPKG_REPOSITORY)/$(PTXCONF_PROJECT)/dists/$(PTXCONF_PROJECT)$(PTXCONF_PROJECT_VERSION)/Packages \
+		-in $(IPKG_DISTDIR)/Packages \
 		-text -binary \
 		-outform PEM \
 		-signer $(PTXCONF_IMAGE_IPKG_SIGN_OPENSSL_SIGNER) \
 		-inkey $(PTXCONF_IMAGE_IPKG_SIGN_OPENSSL_KEY) \
-		-out $(PTXCONF_SETUP_IPKG_REPOSITORY)/$(PTXCONF_PROJECT)/dists/$(PTXCONF_PROJECT)$(PTXCONF_PROJECT_VERSION)/Packages.sig
+		-out $(IPKG_DISTDIR)/Packages.sig
 	@echo "Packages.sig created"
 endif
 	@touch $@

-- 
ptxdist mailing list
ptxdist@pengutronix.de