From mboxrd@z Thu Jan 1 00:00:00 1970 Return-path: Received: from mail-pr2fra01on060f.outbound.protection.outlook.com ([2a01:111:f400:7e18::60f] helo=FRA01-PR2-obe.outbound.protection.outlook.com) by metis.ext.pengutronix.de with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.92) (envelope-from ) id 1jOiW5-0005Tk-AZ for ptxdist@pengutronix.de; Wed, 15 Apr 2020 15:55:49 +0200 From: Simon Falsig Date: Wed, 15 Apr 2020 13:55:46 +0000 Message-ID: References: In-Reply-To: Content-Language: en-US MIME-Version: 1.0 Subject: Re: [ptxdist] [PATCH] ipkg-push: expose checksum type in platformconfig List-Id: PTXdist Development Mailing List List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Reply-To: ptxdist@pengutronix.de Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Errors-To: ptxdist-bounces@pengutronix.de Sender: "ptxdist" To: "ptxdist@pengutronix.de" > --- a/rules/post/image_ipkg.make > +++ b/rules/post/image_ipkg.make > @@ -19,13 +19,24 @@ ifdef PTXCONF_IMAGE_IPKG_FORCED_PUSH > rm -rf "$(IMAGE_REPO_DIST_DIR)" > endif > @echo "pushing ipkg packages to ipkg-repository..." > - @$(HOST_ENV) $(PTXDIST_TOPDIR)/scripts/ipkg-push \ > +ifdef PTXCONF_IMAGE_IPKG_CHECKSUM_MD5 > + @$(HOST_ENV) $(PTXDIST_TOPDIR)/scripts/opkg-push \ > --ipkgdir $(call remove_quotes,$(PKGDIR)) \ > --repodir $(call > remove_quotes,$(PTXCONF_SETUP_IPKG_REPOSITORY)) \ > --revision $(call remove_quotes,$(PTXDIST_VERSION_FULL)) \ > --project $(call remove_quotes,$(PTXCONF_PROJECT)) \ > --dist $(call > remove_quotes,$(PTXCONF_PROJECT)$(PTXCONF_PROJECT_VERSION)) \ > - --type opkg > + --checksum md5 > +endif > +ifdef PTXCONF_IMAGE_IPKG_CHECKSUM_SHA256 > + @$(HOST_ENV) $(PTXDIST_TOPDIR)/scripts/opkg-push \ > + --ipkgdir $(call remove_quotes,$(PKGDIR)) \ > + --repodir $(call > remove_quotes,$(PTXCONF_SETUP_IPKG_REPOSITORY)) \ > + --revision $(call remove_quotes,$(PTXDIST_VERSION_FULL)) \ > + --project $(call remove_quotes,$(PTXCONF_PROJECT)) \ > + --dist $(call > remove_quotes,$(PTXCONF_PROJECT)$(PTXCONF_PROJECT_VERSION)) \ > + --checksum sha256 > +endif > @echo "ipkg-repository updated" > ifdef PTXCONF_IMAGE_IPKG_SIGN_OPENSSL > @echo "signing Packages..." Also, my makefile skills are not amazing, so if anyone knows of a cleaner way to convert IMAGE_IPKG_CHECKSUM_MD5 / IMAGE_IPKG_CHECKSUM_SHA256 to the md5 / sha256 argument needed for --checksum, then please let me know ;) _______________________________________________ ptxdist mailing list ptxdist@pengutronix.de