From: Paul Spooren Date: Thu, 16 Jul 2020 20:34:11 +0000 (-1000) Subject: build: use mkhash for IPK metadata checksums X-Git-Url: http://git.openwrt.org/?a=commitdiff_plain;h=e34f04f4bcaae2abead8e85b42dbcbba3ab2a065;p=openwrt%2Fstaging%2Frmilecki.git build: use mkhash for IPK metadata checksums When setting the option IPK_FILES_CHECKSUMS the build system stores checksums of all package file as metadata. In combination with pkg_check this allows to see if a package is broken, e.g. caused by bad flash. To create those checksums the tool `sha256sum` were used while the rest of OpenWrt uses `mkhash`, a small & fast implementation of sha256. As the build system does not check the existence of `sha256sum` and the stderr output is moved to /dev/null, a situation where the option is enabled but no actual checksum are created may occur. Instead of adding `sha256sum` as a requirement, this replaces it with `mkhash sha256` and adapts the `sed` pipe command to fit spacing. CC: Xu Wang CC: Michal Hrusecky Signed-off-by: Paul Spooren --- diff --git a/include/package-ipkg.mk b/include/package-ipkg.mk index 0bca8ae84dd..a92d6921214 100644 --- a/include/package-ipkg.mk +++ b/include/package-ipkg.mk @@ -218,8 +218,8 @@ $(_endef) ifneq ($$(CONFIG_IPK_FILES_CHECKSUMS),) (cd $$(IDIR_$(1)); \ ( \ - find . -type f \! -path ./CONTROL/\* -exec sha256sum \{\} \; 2> /dev/null | \ - sed 's|\([[:blank:]]\)\./|\1/|' > $$(IDIR_$(1))/CONTROL/files-sha256sum \ + find . -type f \! -path ./CONTROL/\* -exec mkhash sha256 -n \{\} \; 2> /dev/null | \ + sed 's|\([[:blank:]]\)\./| \1/|' > $$(IDIR_$(1))/CONTROL/files-sha256sum \ ) || true \ ) endif