From: Oleksij Rempel <o.rempel@pengutronix.de>
To: ptxdist@pengutronix.de
Cc: Oleksij Rempel <o.rempel@pengutronix.de>
Subject: [ptxdist] [PATCH v2 2/2] ecryptfs-utils: provide option for test scripts
Date: Fri, 23 Jun 2017 13:19:41 +0200 [thread overview]
Message-ID: <20170623111941.25182-3-o.rempel@pengutronix.de> (raw)
In-Reply-To: <20170623111941.25182-1-o.rempel@pengutronix.de>
These scripts are desined for kernel fs/ecryptfs testing.
Signed-off-by: Oleksij Rempel <o.rempel@pengutronix.de>
---
rules/ecryptfs-utils.in | 12 ++++++++++++
rules/ecryptfs-utils.make | 8 +++++++-
2 files changed, 19 insertions(+), 1 deletion(-)
diff --git a/rules/ecryptfs-utils.in b/rules/ecryptfs-utils.in
index e73dafdfc..fc44caf00 100644
--- a/rules/ecryptfs-utils.in
+++ b/rules/ecryptfs-utils.in
@@ -9,6 +9,16 @@ menuconfig ECRYPTFS_UTILS
select HOST_GETTEXT # needed for autogen.sh
select HOST_GLIB # needed for autogen.sh
select HOST_LIBGCRYPT # needed for autogen.sh
+ select ATTR if ECRYPTFS_UTILS_TESTS
+ select BASH if ECRYPTFS_UTILS_TESTS
+ select COREUTILS if ECRYPTFS_UTILS_TESTS
+ select COREUTILS_DF if ECRYPTFS_UTILS_TESTS
+ select COREUTILS_MKDIR if ECRYPTFS_UTILS_TESTS
+ select COREUTILS_SLEEP if ECRYPTFS_UTILS_TESTS
+ select COREUTILS_STAT if ECRYPTFS_UTILS_TESTS
+ select COREUTILS_TR if ECRYPTFS_UTILS_TESTS
+ select COREUTILS_TRUNCATE if ECRYPTFS_UTILS_TESTS
+ select UTIL_LINUX_NG_MKFS if ECRYPTFS_UTILS_TESTS
help
eCryptfs is a POSIX-compliant enterprise-class stacked
cryptographic filesystem for Linux.
@@ -44,4 +54,6 @@ config ECRYPTFS_UTILS_ECRYPTFS_UNWRAP_PASSPHRASE
config ECRYPTFS_UTILS_ECRYPTFS_WRAP_PASSPHRASE
bool "ecryptfs-wrap-passphrase"
+config ECRYPTFS_UTILS_TESTS
+ bool "ecryptfs-tests"
endif
diff --git a/rules/ecryptfs-utils.make b/rules/ecryptfs-utils.make
index 371f05cbc..c7c92b89f 100644
--- a/rules/ecryptfs-utils.make
+++ b/rules/ecryptfs-utils.make
@@ -46,11 +46,12 @@ ECRYPTFS_UTILS_CONF_OPT := \
--disable-gui \
--disable-docs \
--disable-docs-gen \
- --disable-tests \
+ --$(call ptx/endis,PTXCONF_ECRYPTFS_UTILS_TESTS)-tests \
--disable-mudflap \
$(GLOBAL_LARGE_FILE_OPTION) \
--disable-nls
+
ECRYPTFS_UTILS_PROGS_y :=
ECRYPTFS_UTILS_PROGS_$(PTXCONF_ECRYPTFS_UTILS_MOUNT_ECRYPTFS) += /sbin/mount.ecryptfs
@@ -82,6 +83,11 @@ $(STATEDIR)/ecryptfs-utils.targetinstall:
@$(call install_lib, ecryptfs-utils, 0, 0, 0644, ecryptfs/libecryptfs_key_mod_passphrase)
@$(call install_lib, ecryptfs-utils, 0, 0, 0644, libecryptfs)
+ifdef PTXCONF_ECRYPTFS_UTILS_TESTS
+ @$(call install_glob, ecryptfs-utils, 0, 0, $(ECRYPTFS_UTILS_DIR)/tests, /usr/lib/ecryptfs/tests,, \
+ *Makefile* */.deps* */.libs* */.dirstamp* *.o *.c, n)
+endif
+
ifdef PTXCONF_ECRYPTFS_UTILS_MOUNT_ECRYPTFS
@$(call install_link, ecryptfs-utils, mount.ecryptfs_private, /sbin/umount.ecryptfs_private)
endif
--
2.11.0
_______________________________________________
ptxdist mailing list
ptxdist@pengutronix.de
prev parent reply other threads:[~2017-06-23 11:19 UTC|newest]
Thread overview: 3+ messages / expand[flat|nested] mbox.gz Atom feed top
2017-06-23 11:19 [ptxdist] [PATCH v2 0/2] provide ecryptfs tests Oleksij Rempel
2017-06-23 11:19 ` [ptxdist] [PATCH v2 1/2] util-linux-ng: make mkfs configurable Oleksij Rempel
2017-06-23 11:19 ` Oleksij Rempel [this message]
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20170623111941.25182-3-o.rempel@pengutronix.de \
--to=o.rempel@pengutronix.de \
--cc=ptxdist@pengutronix.de \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox