* [ptxdist] [PATCH v2 1/2] util-linux-ng: make mkfs configurable
2017-06-23 11:19 [ptxdist] [PATCH v2 0/2] provide ecryptfs tests Oleksij Rempel
@ 2017-06-23 11:19 ` Oleksij Rempel
2017-06-23 11:19 ` [ptxdist] [PATCH v2 2/2] ecryptfs-utils: provide option for test scripts Oleksij Rempel
1 sibling, 0 replies; 3+ messages in thread
From: Oleksij Rempel @ 2017-06-23 11:19 UTC (permalink / raw)
To: ptxdist; +Cc: Oleksij Rempel
mkfs is used by ecryptfs-tools/tests.
Signed-off-by: Oleksij Rempel <o.rempel@pengutronix.de>
---
rules/util-linux-ng.in | 7 +++++++
rules/util-linux-ng.make | 3 +++
2 files changed, 10 insertions(+)
diff --git a/rules/util-linux-ng.in b/rules/util-linux-ng.in
index 8141a392f..d936dfe56 100644
--- a/rules/util-linux-ng.in
+++ b/rules/util-linux-ng.in
@@ -400,4 +400,11 @@ config UTIL_LINUX_NG_CHMEM
The chmem command sets a particular size or range of
memory online or offline.
+config UTIL_LINUX_NG_MKFS
+ bool
+ prompt "mkfs"
+ help
+ The mkfs command is a generic wrapper for fs specific
+ mkfs.* commands.
+
endif
diff --git a/rules/util-linux-ng.make b/rules/util-linux-ng.make
index 9905a50ed..a0915bc02 100644
--- a/rules/util-linux-ng.make
+++ b/rules/util-linux-ng.make
@@ -297,6 +297,9 @@ endif
ifdef PTXCONF_UTIL_LINUX_NG_ZRAMCTL
@$(call install_copy, util-linux-ng, 0, 0, 0755, -, /usr/sbin/zramctl)
endif
+ifdef PTXCONF_UTIL_LINUX_NG_MKFS
+ @$(call install_copy, util-linux-ng, 0, 0, 0755, -, /usr/sbin/mkfs)
+endif
@$(call install_finish, util-linux-ng)
--
2.11.0
_______________________________________________
ptxdist mailing list
ptxdist@pengutronix.de
^ permalink raw reply [flat|nested] 3+ messages in thread* [ptxdist] [PATCH v2 2/2] ecryptfs-utils: provide option for test scripts
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
1 sibling, 0 replies; 3+ messages in thread
From: Oleksij Rempel @ 2017-06-23 11:19 UTC (permalink / raw)
To: ptxdist; +Cc: Oleksij Rempel
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
^ permalink raw reply [flat|nested] 3+ messages in thread