@@ -146,6 +146,12 @@ endif
comment "Legacy options removed in 2023.08"
+config BR2_PACKAGE_OCF_LINUX
+ bool "ocf-linux has been removed"
+ select BR2_LEGACY
+ help
+ ocf-linux is incompatible with newer kernels.
+
config BR2_BINUTILS_VERSION_2_37_X
bool "binutils 2.37.x has been removed"
select BR2_LEGACY
@@ -1474,7 +1474,7 @@ menu "Crypto"
source "package/beecrypt/Config.in"
source "package/botan/Config.in"
source "package/ca-certificates/Config.in"
- source "package/cryptodev/Config.in"
+ source "package/cryptodev-linux/Config.in"
source "package/cryptopp/Config.in"
source "package/gcr/Config.in"
source "package/gnutls/Config.in"
new file mode 100644
@@ -0,0 +1,14 @@
+config BR2_PACKAGE_CRYPTODEV_LINUX
+ bool "cryptodev-linux"
+ depends on !BR2_microblaze
+ depends on BR2_LINUX_KERNEL
+ help
+ Cryptodev-linux is a device that allows access to Linux kernel
+ cryptographic drivers; thus allowing userspace applications
+ to take advantage of hardware accelerators.
+
+ http://cryptodev-linux.org/index.html
+
+comment "cryptodev-linux needs a Linux kernel to be built"
+ depends on !BR2_microblaze
+ depends on !BR2_LINUX_KERNEL
@@ -11,8 +11,6 @@ CRYPTODEV_LINUX_LICENSE = GPL-2.0+
CRYPTODEV_LINUX_LICENSE_FILES = COPYING
CRYPTODEV_LINUX_CPE_ID_VENDOR = cryptodev-linux
-CRYPTODEV_LINUX_PROVIDES = cryptodev
-
define CRYPTODEV_LINUX_MODULE_GEN_VERSION_H
$(TARGET_MAKE_ENV) $(MAKE) -C $(@D) version.h
endef
deleted file mode 100644
@@ -1,50 +0,0 @@
-comment "cryptodev needs a Linux kernel to be built"
- depends on !BR2_LINUX_KERNEL
-
-config BR2_PACKAGE_CRYPTODEV
- bool "cryptodev"
- depends on BR2_LINUX_KERNEL
- help
- Select the desired cryptodev implementation.
-
-if BR2_PACKAGE_CRYPTODEV
-
-choice
- prompt "cryptodev variant"
- default BR2_PACKAGE_CRYPTODEV_LINUX if !BR2_microblaze
- help
- Select the cryptodev implementation.
-
-config BR2_PACKAGE_CRYPTODEV_LINUX
- bool "cryptodev-linux"
- depends on !BR2_microblaze
- select BR2_PACKAGE_HAS_CRYPTODEV
- help
- Cryptodev-linux is a device that allows access to Linux kernel
- cryptographic drivers; thus allowing userspace applications
- to take advantage of hardware accelerators.
-
- http://cryptodev-linux.org/index.html
-
-config BR2_PACKAGE_OCF_LINUX
- bool "ocf-linux"
- select BR2_PACKAGE_HAS_CRYPTODEV
- help
- OCF-Linux is a Linux port of the OpenBSD/FreeBSD Cryptographic
- Framework (OCF). This port aims to bring full asynchronous
- HW/SW crypto acceleration to the Linux kernel and applications
- running under Linux.
-
- http://ocf-linux.sourceforge.net/
-
-endchoice
-
-config BR2_PACKAGE_HAS_CRYPTODEV
- bool
-
-config BR2_PACKAGE_PROVIDES_CRYPTODEV
- string
- default "cryptodev-linux" if BR2_PACKAGE_CRYPTODEV_LINUX
- default "ocf-linux" if BR2_PACKAGE_OCF_LINUX
-
-endif
deleted file mode 100644
@@ -1,7 +0,0 @@
-################################################################################
-#
-# cryptodev
-#
-################################################################################
-
-$(eval $(virtual-package))
@@ -29,8 +29,8 @@ ifeq ($(BR2_USE_MMU),)
LIBOPENSSL_CFLAGS += -DHAVE_FORK=0 -DOPENSSL_NO_MADVISE
endif
-ifeq ($(BR2_PACKAGE_HAS_CRYPTODEV),y)
-LIBOPENSSL_DEPENDENCIES += cryptodev
+ifeq ($(BR2_PACKAGE_CRYPTODEV_LINUX),y)
+LIBOPENSSL_DEPENDENCIES += cryptodev-linux
endif
# fixes the following build failures:
@@ -76,7 +76,7 @@ define LIBOPENSSL_CONFIGURE_CMDS
$(if $(BR2_TOOLCHAIN_HAS_LIBATOMIC),-latomic) \
$(if $(BR2_TOOLCHAIN_HAS_THREADS),threads,no-threads) \
$(if $(BR2_STATIC_LIBS),no-shared,shared) \
- $(if $(BR2_PACKAGE_HAS_CRYPTODEV),enable-devcryptoeng) \
+ $(if $(BR2_PACKAGE_CRYPTODEV_LINUX),enable-devcryptoeng) \
no-rc5 \
enable-camellia \
no-tests \
deleted file mode 100644
@@ -1,2 +0,0 @@
-# Locally computed:
-sha256 3d7984754d58ced5695889744caf1e18a53f5d2e35ed40cc04d3595e59b7431f ocf-linux-20171122.tar.gz
deleted file mode 100644
@@ -1,26 +0,0 @@
-################################################################################
-#
-# ocf-linux
-#
-################################################################################
-
-OCF_LINUX_VERSION = 20171122
-OCF_LINUX_SITE = http://downloads.sourceforge.net/project/ocf-linux/ocf-linux/$(OCF_LINUX_VERSION)
-OCF_LINUX_INSTALL_STAGING = YES
-
-OCF_LINUX_PROVIDES = cryptodev
-
-OCF_LINUX_MODULE_SUBDIRS = ocf
-OCF_LINUX_MODULE_MAKE_OPTS = \
- CONFIG_OCF_OCF=m \
- CONFIG_OCF_CRYPTOSOFT=m \
- CONFIG_OCF_BENCH=m \
- CONFIG_OCF_OCFNULL=m
-
-define OCF_LINUX_INSTALL_STAGING_CMDS
- $(INSTALL) -D -m 644 $(@D)/ocf/cryptodev.h \
- $(STAGING_DIR)/usr/include/crypto/cryptodev.h
-endef
-
-$(eval $(kernel-module))
-$(eval $(generic-package))
@@ -25,9 +25,6 @@ endif
ifeq ($(BR2_PACKAGE_OPENSSL),y)
OPENSWAN_DEPENDENCIES += openssl
OPENSWAN_MAKE_OPTS += HAVE_OPENSSL=true
-ifeq ($(BR2_PACKAGE_OCF_LINUX),y)
-OPENSWAN_MAKE_OPTS += HAVE_OCF=true
-endif
endif
define OPENSWAN_BUILD_CMDS
Fixes: http://autobuild.buildroot.net/results/88b/88b5d14b315af1669fff04f8c11c321cc4c107c7/ The package seems to be unmainted, asking for support of kernels >= 5.6 a year ago was unanswered: https://sourceforge.net/p/ocf-linux/mailman/message/37662698/ This patch follow Thomas' suggestion to remove the package: https://lists.buildroot.org/pipermail/buildroot/2022-November/654688.html Remove the virtual package cryptodev which is not needed anymore. Signed-off-by: Bernd Kuhls <bernd@kuhls.net> --- v2: removed legacy handling for the virtual package (Arnout) Config.in.legacy | 6 +++ package/Config.in | 2 +- package/cryptodev-linux/Config.in | 14 ++++++ package/cryptodev-linux/cryptodev-linux.mk | 2 - package/cryptodev/Config.in | 50 ---------------------- package/cryptodev/cryptodev.mk | 7 --- package/libopenssl/libopenssl.mk | 6 +-- package/ocf-linux/ocf-linux.hash | 2 - package/ocf-linux/ocf-linux.mk | 26 ----------- package/openswan/openswan.mk | 3 -- 10 files changed, 24 insertions(+), 94 deletions(-) create mode 100644 package/cryptodev-linux/Config.in delete mode 100644 package/cryptodev/Config.in delete mode 100644 package/cryptodev/cryptodev.mk delete mode 100644 package/ocf-linux/ocf-linux.hash delete mode 100644 package/ocf-linux/ocf-linux.mk