From 671b60c1eab90ee7e99ed1fe7a21ecfbf1a080e9 Mon Sep 17 00:00:00 2001 From: Samuel Thibault Date: Sun, 9 Jul 2023 13:45:49 +0200 Subject: rules: Fix make clean. set MKDTRACE and MKZFS to no to avoid cross-build failure. --- debian/changelog | 7 +++++++ debian/rules | 5 +++-- 2 files changed, 10 insertions(+), 2 deletions(-) diff --git a/debian/changelog b/debian/changelog index 723b6aee..06f9d36a 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,10 @@ +rumpkernel (0~20211031+repack-2) UNRELEASED; urgency=medium + + * rules: Fix make clean. set MKDTRACE and MKZFS to no to avoid cross-build + failure. + + -- Samuel Thibault Sun, 09 Jul 2023 13:45:32 +0200 + rumpkernel (0~20211031+repack-1) unreleased; urgency=medium [ Janneke Nieuwenhuizen ] diff --git a/debian/rules b/debian/rules index 73272a7f..54b6fe58 100755 --- a/debian/rules +++ b/debian/rules @@ -37,7 +37,7 @@ override_dh_auto_clean: BSDOBJDIR=$(CURDIR)/obj \ ./build.sh \ -V TOOLS_BUILDRUMP=yes \ - -V MKBINUTILS=no -V MKGCC=no -V MKGDB=no -V MKGROFF=no \ + -V MKBINUTILS=no -V MKGCC=no -V MKGDB=no -V MKGROFF=no -V MKDTRACE=no -V MKZFS=no \ -V TOPRUMP="$(CURDIR)/buildrump.sh/src/sys/rump" \ -U -u -T ./obj/tooldir -m $(DEB_HOST_ARCH_CPU) cleandir || true ) ; \ fi @@ -47,6 +47,7 @@ override_dh_auto_clean: rm -f buildrump.sh/src/lib/librumpuser/config.log rm -f buildrump.sh/src/lib/librumpuser/config.status rm -f buildrump.sh/src/lib/librumpuser/rumpuser_config.h + rm -f buildrump.sh/src/mig override_dh_auto_configure-arch: dh_testdir -a @@ -62,7 +63,7 @@ override_dh_auto_build-arch: BSDOBJDIR=$(CURDIR)/obj \ ./build.sh \ -V TOOLS_BUILDRUMP=yes \ - -V MKBINUTILS=no -V MKGDB=no -V MKGROFF=no \ + -V MKBINUTILS=no -V MKGDB=no -V MKGROFF=no -V MKDTRACE=no -V MKZFS=no \ -V TOPRUMP="$(CURDIR)/buildrump.sh/src/sys/rump" \ -V BUILDRUMP_CPPFLAGS="-Wno-error=stringop-overread" \ -V RUMPUSER_EXTERNAL_DPLIBS=pthread \ -- cgit v1.2.3