Resneptacle/openwrt-cghmn-mt300n
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

uml: exclude some /arch/x86 optimizations

Browse Source 
The x86_64 UML target wants to include SSSE3 optimized
crypto code which lives under /arch/x86/crypto.

However, these are not built and this causes an error.
| ERROR: module '[...]/arch/x86/crypto/sha512-ssse3.ko' is missing.
| make[3]: *** [modules/crypto.mk:990: [...]/kmod-crypto-sha512_5.15.112-1_x86_64.ipk] Error 1

Signed-off-by: Christian Lamparter <chunkeey@gmail.com>
This commit is contained in:
Christian Lamparter 2023-05-21 19:05:03 +02:00
parent aed2569d37
commit 959563fb81
1 changed files with 6 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
package/kernel/linux/modules/crypto.mk
View File

@ -897,10 +897,12 @@ define KernelPackage/crypto-sha1/mpc85xx
AUTOLOAD+=$(call AutoLoad,09,sha1-ppc-spe) AUTOLOAD+=$(call AutoLoad,09,sha1-ppc-spe)
endef endef
ifndef CONFIG_TARGET_uml
define KernelPackage/crypto-sha1/x86_64 define KernelPackage/crypto-sha1/x86_64
FILES+=$(LINUX_DIR)/arch/x86/crypto/sha1-ssse3.ko FILES+=$(LINUX_DIR)/arch/x86/crypto/sha1-ssse3.ko
AUTOLOAD+=$(call AutoLoad,09,sha1-ssse3) AUTOLOAD+=$(call AutoLoad,09,sha1-ssse3)
endef endef
endif
ifdef KernelPackage/crypto-sha1/$(ARCH) ifdef KernelPackage/crypto-sha1/$(ARCH)
KernelPackage/crypto-sha1/$(CRYPTO_TARGET)=\ KernelPackage/crypto-sha1/$(CRYPTO_TARGET)=\
@ -935,10 +937,12 @@ define KernelPackage/crypto-sha256/mpc85xx
AUTOLOAD+=$(call AutoLoad,09,sha256-ppc-spe) AUTOLOAD+=$(call AutoLoad,09,sha256-ppc-spe)
endef endef
ifndef CONFIG_TARGET_uml
define KernelPackage/crypto-sha256/x86_64 define KernelPackage/crypto-sha256/x86_64
FILES+=$(LINUX_DIR)/arch/x86/crypto/sha256-ssse3.ko FILES+=$(LINUX_DIR)/arch/x86/crypto/sha256-ssse3.ko
AUTOLOAD+=$(call AutoLoad,09,sha256-ssse3) AUTOLOAD+=$(call AutoLoad,09,sha256-ssse3)
endef endef
endif
ifdef KernelPackage/crypto-sha256/$(ARCH) ifdef KernelPackage/crypto-sha256/$(ARCH)
KernelPackage/crypto-sha256/$(CRYPTO_TARGET)=\ KernelPackage/crypto-sha256/$(CRYPTO_TARGET)=\
@ -977,10 +981,12 @@ endef
KernelPackage/crypto-sha512/tegra=$(KernelPackage/crypto-sha512/arm) KernelPackage/crypto-sha512/tegra=$(KernelPackage/crypto-sha512/arm)
ifndef CONFIG_TARGET_uml
define KernelPackage/crypto-sha512/x86_64 define KernelPackage/crypto-sha512/x86_64
FILES+=$(LINUX_DIR)/arch/x86/crypto/sha512-ssse3.ko FILES+=$(LINUX_DIR)/arch/x86/crypto/sha512-ssse3.ko
AUTOLOAD+=$(call AutoLoad,09,sha512-ssse3) AUTOLOAD+=$(call AutoLoad,09,sha512-ssse3)
endef endef
endif
ifdef KernelPackage/crypto-sha512/$(ARCH) ifdef KernelPackage/crypto-sha512/$(ARCH)
KernelPackage/crypto-sha512/$(CRYPTO_TARGET)=\ KernelPackage/crypto-sha512/$(CRYPTO_TARGET)=\