> > +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 [email protected]
