From: Shaun Tancheff <shaun.tancheff@hpe.com>
Date: Thu, 2 Feb 2023 03:47:15 +0000 (-0600)
Subject: LU-13743 build: Explicitly require encryption support
X-Git-Tag: 2.15.55~120
X-Git-Url: https://git.whamcloud.com/gitweb?a=commitdiff_plain;h=refs%2Fchanges%2F43%2F39243%2F10;p=fs%2Flustre-release.git

LU-13743 build: Explicitly require encryption support

Linux commit v5.18-rc5-17-gb1241c8eb977
  ext4: move ext4 crypto code to its own file crypto.c

Update the ldiskfs Makefile to exclude crypto.c when
CONFIG_FS_ENCRYPTION is not enabled.

Test-Parameters: trivial
Signed-off-by: Shaun Tancheff <shaun.tancheff@hpe.com>
Change-Id: Ic8a40f3d395286bb52ed20693fd7cc4755b10556
Reviewed-on: https://review.whamcloud.com/c/fs/lustre-release/+/39243
Tested-by: jenkins <devops@whamcloud.com>
Tested-by: Maloo <maloo@whamcloud.com>
Reviewed-by: Oleg Drokin <green@whamcloud.com>
Reviewed-by: jsimmons <jsimmons@infradead.org>
Reviewed-by: Neil Brown <neilb@suse.de>
Reviewed-by: Yang Sheng <ys@whamcloud.com>
Reviewed-by: Sebastien Buisson <sbuisson@ddn.com>
---

diff --git a/ldiskfs/Makefile.in b/ldiskfs/Makefile.in
index 811b1f4..3ce6566 100644
--- a/ldiskfs/Makefile.in
+++ b/ldiskfs/Makefile.in
@@ -10,7 +10,11 @@ linux_headers := $(wildcard @LINUX@/include/linux/ext4*.h)
 linux_new_headers := htree_lock.h
 trace_headers := $(wildcard @LINUX@/include/trace/events/ext4*.h)
 
+ifeq ($(CONFIG_FS_ENCRYPTION),)
+backfs_sources := $(filter-out %.mod.c %/inode-test.c %/crypto.c,$(wildcard @EXT4_SRC_DIR@/*.c))
+else
 backfs_sources := $(filter-out %.mod.c %/inode-test.c,$(wildcard @EXT4_SRC_DIR@/*.c))
+endif
 
 new_sources := mmp.c htree_lock.c critical_encode.h
 new_headers :=