diff options
-rw-r--r-- | rules/libkcapi.in | 21 | ||||
-rw-r--r-- | rules/libkcapi.make | 28 |
2 files changed, 28 insertions, 21 deletions
diff --git a/rules/libkcapi.in b/rules/libkcapi.in index d349a0e22..0fa299c44 100644 --- a/rules/libkcapi.in +++ b/rules/libkcapi.in @@ -11,39 +11,42 @@ if LIBKCAPI config LIBKCAPI_MD5SUM bool - depends on !COREUTILS_MD5SUM - depends on !BUSYBOX_MD5SUM + depends on !COREUTILS_MD5SUM && !BUSYBOX_MD5SUM || ALLYES prompt "md5sum" help support md5sum cmdline util config LIBKCAPI_SHA1SUM bool - depends on !COREUTILS_SHA1SUM - depends on !BUSYBOX_SHA1SUM + depends on !COREUTILS_SHA1SUM && !BUSYBOX_SHA1SUM || ALLYES prompt "sha1sum" help support sha1sum cmdline util +config LIBKCAPI_SHA224SUM + bool + depends on !COREUTILS_SHA224SUM || ALLYES + prompt "sha224sum" + help + support sha224sum cmdline util + config LIBKCAPI_SHA256SUM bool - depends on !COREUTILS_SHA256SUM - depends on !BUSYBOX_SHA256SUM + depends on !COREUTILS_SHA256SUM && !BUSYBOX_SHA256SUM || ALLYES prompt "sha256sum" help support sha256sum cmdline util config LIBKCAPI_SHA384SUM bool - depends on !COREUTILS_SHA384SUM + depends on !COREUTILS_SHA384SUM || ALLYES prompt "sha384sum" help support sha384sum cmdline util config LIBKCAPI_SHA512SUM bool - depends on !COREUTILS_SHA512SUM - depends on !BUSYBOX_SHA512SUM + depends on !COREUTILS_SHA256SUM && !BUSYBOX_SHA256SUM || ALLYES prompt "sha512sum" help support sha512sum cmdline util diff --git a/rules/libkcapi.make b/rules/libkcapi.make index dbcc082f5..0aba6ffec 100644 --- a/rules/libkcapi.make +++ b/rules/libkcapi.make @@ -73,32 +73,36 @@ $(STATEDIR)/libkcapi.targetinstall: @$(call install_copy, libkcapi, 0, 0, 0755, -, /usr/bin/kcapi-dgst); @$(call install_copy, libkcapi, 0, 0, 0755, -, /usr/bin/kcapi-hasher); - @$(call install_link, libkcapi, /usr/bin/kcapi-hasher, /usr/bin/fipscheck); - @$(call install_link, libkcapi, /usr/bin/kcapi-hasher, /usr/bin/fipshmac); - @$(call install_link, libkcapi, /usr/bin/kcapi-hasher, /usr/bin/sha1hmac); - @$(call install_link, libkcapi, /usr/bin/kcapi-hasher, /usr/bin/sha224hmac); - @$(call install_link, libkcapi, /usr/bin/kcapi-hasher, /usr/bin/sha256hmac); - @$(call install_link, libkcapi, /usr/bin/kcapi-hasher, /usr/bin/sha384hmac); - @$(call install_link, libkcapi, /usr/bin/kcapi-hasher, /usr/bin/sha512hmac); + @$(call install_link, libkcapi, kcapi-hasher, /usr/bin/fipscheck); + @$(call install_link, libkcapi, kcapi-hasher, /usr/bin/fipshmac); + @$(call install_link, libkcapi, kcapi-hasher, /usr/bin/sha1hmac); + @$(call install_link, libkcapi, kcapi-hasher, /usr/bin/sha224hmac); + @$(call install_link, libkcapi, kcapi-hasher, /usr/bin/sha256hmac); + @$(call install_link, libkcapi, kcapi-hasher, /usr/bin/sha384hmac); + @$(call install_link, libkcapi, kcapi-hasher, /usr/bin/sha512hmac); ifdef PTXCONF_LIBKCAPI_MD5SUM - @$(call install_link, libkcapi, /usr/bin/kcapi-hasher, /usr/bin/md5sum); + @$(call install_link, libkcapi, kcapi-hasher, /usr/bin/md5sum); endif ifdef PTXCONF_LIBKCAPI_SHA1SUM - @$(call install_link, libkcapi, /usr/bin/kcapi-hasher, /usr/bin/sha1sum); + @$(call install_link, libkcapi, kcapi-hasher, /usr/bin/sha1sum); +endif + +ifdef PTXCONF_LIBKCAPI_SHA224SUM + @$(call install_link, libkcapi, kcapi-hasher, /usr/bin/sha224sum); endif ifdef PTXCONF_LIBKCAPI_SHA256SUM - @$(call install_link, libkcapi, /usr/bin/kcapi-hasher, /usr/bin/sha256sum); + @$(call install_link, libkcapi, kcapi-hasher, /usr/bin/sha256sum); endif ifdef PTXCONF_LIBKCAPI_SHA384SUM - @$(call install_link, libkcapi, /usr/bin/kcapi-hasher, /usr/bin/sha384sum); + @$(call install_link, libkcapi, kcapi-hasher, /usr/bin/sha384sum); endif ifdef PTXCONF_LIBKCAPI_SHA512SUM - @$(call install_link, libkcapi, /usr/bin/kcapi-hasher, /usr/bin/sha512sum); + @$(call install_link, libkcapi, kcapi-hasher, /usr/bin/sha512sum); endif ifdef PTXCONF_LIBKCAPI_TEST |