Skip to contentSkip to conversation

build-all: update rule to build fsverity-utils

PATCH Applied Eric Biggers 2 participants 2 messages May 27, 2020 – Jun 12, 2020 fscrypt: file system level encryption support

lore
Share & tools
lore

Eric Biggers

author maintainer
#0 lore raw

PATCH 1/1 build-all: update rule to build fsverity-utils

From: Eric Biggers <[email protected]>

To match the usual convention, the fsverity-utils Makefile now takes a PREFIX variable which defaults to /usr/local.

But xfstests-bld wants PREFIX=/usr, so set that.

Also don't explicitly build the 'all' target, since 'install' depends on it already.

---
 build-all | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
build-all +1 -1
index 0122628..572edfa 100755
@@ -290,7 +290,7 @@ if test -z "$SKIP_FSVERITY"; then
     build_start "fsverity"
     (cd fsverity; \
      ver=$(git describe --always --dirty); echo "fsverity	$ver ($(git log -1 --pretty=%cD))" > ../fsverity.ver ; \
-     $MAKE_CLEAN ; make $J all ; make install DESTDIR=$DESTDIR)
+     $MAKE_CLEAN ; make $J install DESTDIR=$DESTDIR PREFIX=/usr)
 fi
 
 if test -z "$SKIP_IMA_EVM_UTILS" ; then
Signature · 1 line
2.26.2
maintainer Applied
#1 lore raw
Quoted 11 lines · Eric Biggers

From: Eric Biggers <[email protected]>

To match the usual convention, the fsverity-utils Makefile now takes a PREFIX variable which defaults to /usr/local.

But xfstests-bld wants PREFIX=/usr, so set that.

Also don't explicitly build the 'all' target, since 'install' depends on it already.

Thanks, applied.

- Ted