From mboxrd@z Thu Jan  1 00:00:00 1970
Return-path: <ptxdist-bounces@pengutronix.de>
From: Simon Falsig <sfalsig@verity.ch>
Date: Thu, 16 Apr 2020 07:58:43 +0000
Message-ID: <PR1PR02MB4826E0BC530AA6B060C8AA74BFD80@PR1PR02MB4826.eurprd02.prod.outlook.com>
References: <PR1PR02MB4826D938DBC06C1350FE5E15BFDB0@PR1PR02MB4826.eurprd02.prod.outlook.com>
 <20200416064806.GD2081@pengutronix.de>
In-Reply-To: <20200416064806.GD2081@pengutronix.de>
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 <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/cgi-bin/mailman/private/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>
Reply-To: ptxdist@pengutronix.de
Content-Type: text/plain; charset="us-ascii"
Content-Transfer-Encoding: 7bit
Errors-To: ptxdist-bounces@pengutronix.de
Sender: "ptxdist" <ptxdist-bounces@pengutronix.de>
To: Michael Olbrich <m.olbrich@pengutronix.de>, "ptxdist@pengutronix.de" <ptxdist@pengutronix.de>

> > +choice
> > +       prompt "checksum type"
> > +       default IMAGE_IPKG_CHECKSUM_MD5
> > +       help
> > +         Sets the checksum type to use when generating the index,
> > +         both when pushing to a repository and in PKGDIR.
> > +         Note that opkg on the target may need to be specifically
> > +          built with support for the selected checksum type.
> > +
> > +       config IMAGE_IPKG_CHECKSUM_MD5
> > +         bool
> > +         prompt "md5"
> > +
> > +       config IMAGE_IPKG_CHECKSUM_SHA256
> > +         bool
> > +         prompt "sha256"
> > +endchoice
> 
> Hmmm, we already have the PTXCONF_OPKG_SHA256 option for opkg. Maybe
> just use that one?

Done.

> 
> >  config IMAGE_XPKG_EXTRA_ARGS
> >         string
> >         prompt "extra arguments passed to ipkg-build/opkg-build"
> > diff --git a/rules/post/image_ipkg.make b/rules/post/image_ipkg.make
> > index c2171574c..64cdf150f 100644
> > --- 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
> 
> --checksum $(call
> ptx/ifdef,PTXCONF_IMAGE_IPKG_CHECKSUM_MD5,md5,sha256)
> 

Perfect - much cleaner - thanks!

Since the checksum is no longer exposed in the platformconfig, I'm changing the commit title though - will be up in a bit...

_______________________________________________
ptxdist mailing list
ptxdist@pengutronix.de