NetCube-Systems-Austria/kumquat-buildroot
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

libkcapi: split BR2_PACKAGE_LIBKCAPI_APPS

Browse Source 
Since commit af313accf1,
hasher test application depends on dlfcn.h. To avoid putting all apps
under !BR2_STATIC_LIBS dependency, split BR2_PACKAGE_LIBKCAPI_APPS into
several variables.

Moreover, BR2_USE_MMU is only a dependency of BR2_PACKAGE_LIBKCAPI_TEST
as other applications don't use fork.

Finally, enc or dgst applications could be enabled in a next patch if
needed.

Fixes:
 - http://autobuild.buildroot.net/results/7c57f3025030eff41a5cde52759821249859caf1

Signed-off-by: Fabrice Fontaine <fontaine.fabrice@gmail.com>
Signed-off-by: Thomas Petazzoni <thomas.petazzoni@bootlin.com>
This commit is contained in:
Fabrice Fontaine 2018-05-07 00:09:01 +02:00 committed by Thomas Petazzoni
parent 9d2ab8a596
commit f64211501d
3 changed files with 47 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
Config.in.legacy
View File

@ -145,6 +145,17 @@ endif
###############################################################################
comment "Legacy options removed in 2018.05"
config BR2_PACKAGE_LIBKCAPI_APPS
bool "libkcapi test applications removed"
select BR2_LEGACY
select BR2_PACKAGE_LIBKCAPI_HASHER if !BR2_STATIC_LIBS
select BR2_PACKAGE_LIBKCAPI_RNGAPP
select BR2_PACKAGE_LIBKCAPI_SPEED
select BR2_PACKAGE_LIBKCAPI_TEST
help
Test applications (hasher, rng read, speed-test, test) now
have their own configuration options in the libkcapi menu.
config BR2_PACKAGE_IQVLINUX
bool "iqvlinux package removed"
select BR2_LEGACY

20
package/libkcapi/Config.in
View File

@ -7,11 +7,21 @@ config BR2_PACKAGE_LIBKCAPI
if BR2_PACKAGE_LIBKCAPI
config BR2_PACKAGE_LIBKCAPI_APPS
bool "build test applications"
config BR2_PACKAGE_LIBKCAPI_HASHER
bool "build hasher application"
depends on !BR2_STATIC_LIBS # dlfcn.h
comment "hasher application needs a toolchain w/ dynamic library"
depends on BR2_STATIC_LIBS
config BR2_PACKAGE_LIBKCAPI_RNGAPP
bool "build rng read application"
config BR2_PACKAGE_LIBKCAPI_SPEED
bool "build speed-test program"
config BR2_PACKAGE_LIBKCAPI_TEST
bool "build test program"
depends on BR2_USE_MMU # fork()
help
Build additional test applications that can provide
performance or algorithm tests.
endif

32
package/libkcapi/libkcapi.mk
View File

@ -12,18 +12,28 @@ LIBKCAPI_INSTALL_STAGING = YES
LIBKCAPI_LICENSE = BSD-3-Clause (library), BSD-3-Clause or GPL-2.0 (programs)
LIBKCAPI_LICENSE_FILES = COPYING COPYING.gplv2 COPYING.bsd
ifeq ($(BR2_PACKAGE_LIBKCAPI_APPS),y)
LIBKCAPI_CONF_OPTS += \
--enable-kcapi-speed \
--enable-kcapi-test \
--enable-kcapi-hasher \
--enable-kcapi-rngapp
ifeq ($(BR2_PACKAGE_LIBKCAPI_HASHER),y)
LIBKCAPI_CONF_OPTS += --enable-kcapi-hasher
else
LIBKCAPI_CONF_OPTS += \
--disable-kcapi-speed \
--disable-kcapi-test \
--disable-kcapi-hasher \
--disable-kcapi-rngapp
LIBKCAPI_CONF_OPTS += --disable-kcapi-hasher
endif
ifeq ($(BR2_PACKAGE_LIBKCAPI_RNGAPP),y)
LIBKCAPI_CONF_OPTS += --enable-kcapi-rngapp
else
LIBKCAPI_CONF_OPTS += --disable-kcapi-rngapp
endif
ifeq ($(BR2_PACKAGE_LIBKCAPI_SPEED),y)
LIBKCAPI_CONF_OPTS += --enable-kcapi-speed
else
LIBKCAPI_CONF_OPTS += --disable-kcapi-speed
endif
ifeq ($(BR2_PACKAGE_LIBKCAPI_TEST),y)
LIBKCAPI_CONF_OPTS += --enable-kcapi-test
else
LIBKCAPI_CONF_OPTS += --disable-kcapi-test
endif
$(eval $(autotools-package))