From mboxrd@z Thu Jan 1 00:00:00 1970 Return-path: Received: from mail-eopbgr120047.outbound.protection.outlook.com ([40.107.12.47] 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 1jPNhc-00023w-BT for ptxdist@pengutronix.de; Fri, 17 Apr 2020 11:54:30 +0200 From: Simon Falsig Date: Fri, 17 Apr 2020 11:54:14 +0200 Message-Id: <20200417095414.9278-1-sfalsig@veritystudios.com> MIME-Version: 1.0 Subject: [ptxdist] [PATCH v2] ipkg-push: build index with sha256 checksums if supported 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 Cc: Simon Falsig Instead of always building the index with the default md5sum, the index will now be built with sha256, iff the target opkg package is configured to support sha256. Also, the ipkg support in ipkg-push has been removed, and it now always uses the opkg tools instead. The name is kept, since everything else is still using the 'ipkg' naming scheme though. --- rules/post/image_ipkg.make | 6 ++++-- scripts/ipkg-push | 8 ++++---- 2 files changed, 8 insertions(+), 6 deletions(-) diff --git a/rules/post/image_ipkg.make b/rules/post/image_ipkg.make index c2171574c..60b668230 100644 --- a/rules/post/image_ipkg.make +++ b/rules/post/image_ipkg.make @@ -25,7 +25,7 @@ endif --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 $(call ptx/ifdef,PTXCONF_OPKG_SHA256,sha256,md5) @echo "ipkg-repository updated" ifdef PTXCONF_IMAGE_IPKG_SIGN_OPENSSL @echo "signing Packages..." @@ -51,7 +51,9 @@ $(PKGDIR)/Packages: $(STATEDIR)/host-ipkg-utils.install.post $(STATEDIR)/world.t @echo "Creating ipkg index '$@'..." @rm -f $(PKGDIR)/Packages* @$(HOST_ENV) opkg-make-index \ - -l "$(PKGDIR)/Packages.filelist" -p "$(@)" "$(PKGDIR)" + -l "$(PKGDIR)/Packages.filelist" -p "$(@)" \ + --checksum $(call ptx/ifdef,PTXCONF_OPKG_SHA256,sha256,md5) \ + "$(PKGDIR)" @echo "done." # vim: syntax=make diff --git a/scripts/ipkg-push b/scripts/ipkg-push index 45978b305..6467f0947 100755 --- a/scripts/ipkg-push +++ b/scripts/ipkg-push @@ -31,7 +31,7 @@ usage() { echo " --revision dist revision name to be updated" echo " --project project name" echo " --dist use this to make a dist release (optional)" - echo " --type specify package type (default: ipkg)" + echo " --checksum specify checksum type, {md5,sha256}, default: md5" echo exit 1 } @@ -41,7 +41,7 @@ REPODIR= DISTREVISION= PROJECT= DIST= -TYPE=ipkg +CHECKSUM=md5 # @@ -55,7 +55,7 @@ while [ $# -gt 0 ]; do --revision) DISTREVISION=`ptxd_abspath $2`; shift 2 ;; --project) PROJECT=$2; shift 2 ;; --dist) DIST=$2; shift 2 ;; - --type) TYPE=$2; shift 2 ;; + --checksum) CHECKSUM=$2; shift 2 ;; *) usage "unknown option $1" ;; esac done @@ -193,7 +193,7 @@ done echo "creating index.....: " -(cd $REPODIR/$PROJECT/dists/$DIST && ${TYPE}-make-index . > Packages && gzip -c Packages > Packages.gz) +(cd $REPODIR/$PROJECT/dists/$DIST && opkg-make-index --checksum ${CHECKSUM} . > Packages && gzip -c Packages > Packages.gz) exit -- 2.17.1 _______________________________________________ ptxdist mailing list ptxdist@pengutronix.de