mailarchive of the ptxdist mailing list
 help / color / mirror / Atom feed
From: Ladislav Michl <ladis@linux-mips.org>
To: ptxdist@pengutronix.de
Subject: [ptxdist] [PATCH] image_ipkg.make: create repository directory
Date: Thu, 15 Mar 2012 00:25:45 +0100	[thread overview]
Message-ID: <20120314232545.GA14376@localhost.localdomain> (raw)

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

             reply	other threads:[~2012-03-14 23:25 UTC|newest]

Thread overview: 2+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2012-03-14 23:25 Ladislav Michl [this message]
2012-03-15  9:21 ` Michael Olbrich

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=20120314232545.GA14376@localhost.localdomain \
    --to=ladis@linux-mips.org \
    --cc=ptxdist@pengutronix.de \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox