From 827b3c91b4222d683c25a7be01c4f25334347111 Mon Sep 17 00:00:00 2001 From: Laurent Bercot Date: Fri, 10 Feb 2023 04:25:18 +0000 Subject: Try to accommodate libguestfs Signed-off-by: Laurent Bercot --- lh-config.dist | 3 +++ make | 2 ++ sub/skarnet.org/Makefile | 2 +- 3 files changed, 6 insertions(+), 1 deletion(-) diff --git a/lh-config.dist b/lh-config.dist index 2292afd..0767627 100644 --- a/lh-config.dist +++ b/lh-config.dist @@ -37,3 +37,6 @@ USERFS_SIZE=128M # The device on which to spawn an early getty. # Leave empty for no early getty. CONSOLE= + +# Where to find your supermin for libguestfs. (Don't ask.) +# LIBGUESTFS_PATH= diff --git a/make b/make index a73bbb6..b05ea60 100755 --- a/make +++ b/make @@ -27,6 +27,7 @@ ROOTFS_SIZE=${ROOTFS_SIZE:-1024M} RWFS_SIZE=${RWFS_SIZE:-512M} USERFS_SIZE=${USERFS_SIZE:-512M} LH_DEV=${DEVELOPMENT:-false} +LIBGUESTFS_PATH=${LIBGUESTFS_PATH:-/usr/lib/guestfs} build=`${BUILD_CC} -dumpmachine` if echo "$build" | grep -q -- '-.*-.*-' ; then @@ -81,4 +82,5 @@ exec env -i $crossenv LH_MAKE_MARKER=1 "WD=$WD" "NORMALUSER=$NORMALUSER" "TRIPLE "TARGET_CC=$TARGET_CC" "TARGET_CC_FULL=$TARGET_CC_FULL" "TARGET_SYSROOT=$TARGET_SYSROOT" "TARGET_PREFIX=$TARGET_PREFIX" \ "KERNEL_ARCH=$KERNEL_ARCH" "KERNEL_GENERIC_ARCH=$KERNEL_GENERIC_ARCH" "QEMU_ARCH=$QEMU_ARCH" "KERNEL_CONFIG=$KERNEL_CONFIG" \ "BUILD_QUADRUPLE=$BUILD_QUADRUPLE" "BUILD_CC=$BUILD_CC" SHELL=/bin/sh "CONSOLE=$CONSOLE" "TERM=$TERM" \ + "LIBGUESTFS_PATH=$LIBGUESTFS_PATH" make --jobserver-style=pipe "$@" diff --git a/sub/skarnet.org/Makefile b/sub/skarnet.org/Makefile index ffff81d..5a1f466 100644 --- a/sub/skarnet.org/Makefile +++ b/sub/skarnet.org/Makefile @@ -49,7 +49,7 @@ BCNM_CATEGORY := admin SKALIBS_TOKEN := libskarnet.a.xyzzy UTMPS_TOKEN := utmps-utmpd -EXECLINE_TOKEN := execlineb +EXECLINE_TOKEN := execline S6_TOKEN := s6-supervise S6_RC_TOKEN := s6-rc S6_LINUX_INIT_TOKEN := s6-linux-init-maker -- cgit v1.3.1