9114d48b31
The variable <pkg>_LINUX_CONFIG_FIXUPS defined in the
cryptodev-linux... has no effect. Indeed, the variable is only named
CRYPTODEV_LINUX_CONFIG_FIXUPS.
But the variable name being <pkg>_LINUX_CONFIG_FIXUPS and the package
name being CRYPTODEV_LINUX, the correct variable name is
CRYPTODEV_LINUX_LINUX_CONFIG_FIXUPS.
Prior to this commit, a configuration with cryptodev-linux enabled
would result in:
$ make VARS=PACKAGES_LINUX_CONFIG_FIXUPS printvars
$
Aka, empty, while PACKAGES_LINUX_CONFIG_FIXUPS collects in
package/pkg-generic.mk the value of the <pkg>_LINUX_CONFIG_FIXUPS
variables from all enabled packages.
With this patch applied:
$ make VARS=PACKAGES_LINUX_CONFIG_FIXUPS printvars
PACKAGES_LINUX_CONFIG_FIXUPS= @if ! grep -q '^CONFIG_CRYPTO=[my]' /; then /usr/bin/sed -i -e '/^\(# \)\?CONFIG_CRYPTO\>/d' / && echo 'CONFIG_CRYPTO=y' >> /; fi
@if ! grep -q '^CONFIG_CRYPTO_USER_API_AEAD=[my]' /; then /usr/bin/sed -i -e '/^\(# \)\?CONFIG_CRYPTO_USER_API_AEAD\>/d' / && echo 'CONFIG_CRYPTO_USER_API_AEAD=y' >> /; fi
$
As one would expect.
Fixes: 4b12336d1f ("package/cryptodev-linux: needs CONFIG_CRYPTO_USER_API_AEAD")
Signed-off-by: Thomas Petazzoni <thomas.petazzoni@bootlin.com>
Signed-off-by: Julien Olivain <ju.o@free.fr>
31 lines
1009 B
Makefile
31 lines
1009 B
Makefile
################################################################################
|
|
#
|
|
# cryptodev-linux
|
|
#
|
|
################################################################################
|
|
|
|
CRYPTODEV_LINUX_VERSION = 1.13
|
|
CRYPTODEV_LINUX_SITE = $(call github,cryptodev-linux,cryptodev-linux,cryptodev-linux-$(CRYPTODEV_LINUX_VERSION))
|
|
CRYPTODEV_LINUX_INSTALL_STAGING = YES
|
|
CRYPTODEV_LINUX_LICENSE = GPL-2.0+
|
|
CRYPTODEV_LINUX_LICENSE_FILES = COPYING
|
|
CRYPTODEV_LINUX_CPE_ID_VENDOR = cryptodev-linux
|
|
|
|
define CRYPTODEV_LINUX_MODULE_GEN_VERSION_H
|
|
$(TARGET_MAKE_ENV) $(MAKE) -C $(@D) version.h
|
|
endef
|
|
CRYPTODEV_LINUX_PRE_BUILD_HOOKS += CRYPTODEV_LINUX_MODULE_GEN_VERSION_H
|
|
|
|
define CRYPTODEV_LINUX_INSTALL_STAGING_CMDS
|
|
$(INSTALL) -D -m 644 $(@D)/crypto/cryptodev.h \
|
|
$(STAGING_DIR)/usr/include/crypto/cryptodev.h
|
|
endef
|
|
|
|
define CRYPTODEV_LINUX_LINUX_CONFIG_FIXUPS
|
|
$(call KCONFIG_ENABLE_OPT,CONFIG_CRYPTO)
|
|
$(call KCONFIG_ENABLE_OPT,CONFIG_CRYPTO_USER_API_AEAD)
|
|
endef
|
|
|
|
$(eval $(kernel-module))
|
|
$(eval $(generic-package))
|