[PATCH] kernel/crypto: fix crypto-lib-curve25519 x86_64 build

[Hauke Mehrtens]

On 7/21/22 15:17, Florian Eckert wrote:
> The crypto-lib-curve25519 dependency for x86_64 could not be met,
> because the package for for the architecture x86_64 was not added to
> crypto-lib-curve package. Also the package arch definition for x86/64
> does not exist. It musst be change to x86_64 to get added.
Maybe you should mention that you want to change it from depending on 
the x86/64 target to the x86_64 CPU config configuration.

> Signed-off-by: Florian Eckert <fe at dev.tdt.de>
> ---
>   package/kernel/linux/modules/crypto.mk | 7 ++++++-
>   1 file changed, 6 insertions(+), 1 deletion(-)
> 
> diff --git a/package/kernel/linux/modules/crypto.mk b/package/kernel/linux/modules/crypto.mk
> index ed4e51079e..f31c4d5949 100644
> --- a/package/kernel/linux/modules/crypto.mk
> +++ b/package/kernel/linux/modules/crypto.mk
> @@ -526,11 +526,16 @@ define KernelPackage/crypto-lib-curve25519/config
>     imply PACKAGE_kmod-crypto-kpp
>   endef
>   
> -define KernelPackage/crypto-lib-curve25519/x86/64
> +define KernelPackage/crypto-lib-curve25519/x86_64
>     KCONFIG+=CONFIG_CRYPTO_CURVE25519_X86
>     FILES+=$(LINUX_DIR)/arch/x86/crypto/curve25519-x86_64.ko
>   endef

I was looking into this code some time ago.
I think the KCONFIG changes per target are not working. Does it work for 
you when nothing else directly selects the Kconfig symbol?

I think the evaluation of the next lines is only working when Kconfig is 
finished, but I am not sure.

>   
> +ifdef KernelPackage/crypto-lib-curve25519/$(ARCH)
> +  KernelPackage/crypto-lib-curve25519/$(CRYPTO_TARGET)=\
> +	  $(KernelPackage/crypto-lib-curve25519/$(ARCH))
> +endif
> +
>   define KernelPackage/crypto-lib-curve25519/arm-neon
>     KCONFIG+=CONFIG_CRYPTO_CURVE25519_NEON
>     FILES+=$(LINUX_DIR)/arch/arm/crypto/curve25519-neon.ko