[xfstests-bld] build-all: update rule to build fsverity-utils
diff mbox series

Message ID 20200527211642.122200-1-ebiggers@kernel.org
State Accepted
Headers show
Series
  • [xfstests-bld] build-all: update rule to build fsverity-utils
Related show

Commit Message

Eric Biggers May 27, 2020, 9:16 p.m. UTC
From: Eric Biggers <ebiggers@google.com>

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.

Signed-off-by: Eric Biggers <ebiggers@google.com>
---
 build-all | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

Comments

Theodore Ts'o June 12, 2020, 8:19 p.m. UTC | #1
On Wed, May 27, 2020 at 02:16:42PM -0700, Eric Biggers wrote:
> From: Eric Biggers <ebiggers@google.com>
> 
> 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.
> 
> Signed-off-by: Eric Biggers <ebiggers@google.com>

Thanks, applied.

						- Ted

Patch
diff mbox series

diff --git a/build-all b/build-all
index 0122628..572edfa 100755
--- a/build-all
+++ b/build-all
@@ -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