diff options
| author | Samuel Thibault <samuel.thibault@ens-lyon.org> | 2023-07-01 15:06:05 +0000 |
|---|---|---|
| committer | Samuel Thibault <samuel.thibault@ens-lyon.org> | 2023-07-01 15:06:29 +0000 |
| commit | 82f34092832148a82c76e186fab3b3ec752a7312 (patch) | |
| tree | f10823998db2bf41c497eca83c740465bb2a3e89 | |
| parent | f9593afd5c4c5e50c9fc874f0bcb7450518ce988 (diff) | |
patches/clean_external: Fix clean target with pruned source
| -rw-r--r-- | debian/changelog | 5 | ||||
| -rw-r--r-- | debian/patches/clean_external | 15 | ||||
| -rw-r--r-- | debian/patches/series | 1 | ||||
| -rwxr-xr-x | debian/rules | 2 |
4 files changed, 21 insertions, 2 deletions
diff --git a/debian/changelog b/debian/changelog index 5e78c54c..1e9db5a5 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,4 +1,4 @@ -rumpkernel (0~20211031-4) UNRELEASED; urgency=medium +rumpkernel (0~20211031+repack-1) UNRELEASED; urgency=medium [ Janneke Nieuwenhuizen ] * debian/patches/crossbuild: Fix cross-builds on Arch. @@ -13,6 +13,9 @@ rumpkernel (0~20211031-4) UNRELEASED; urgency=medium * librumpdev-if: Install PHY drivers. * patches/acpi.diff: Re-enable. + [ Samuel Thibault ] + * patches/clean_external: Fix clean target with pruned source. + -- Samuel Thibault <sthibault@debian.org> Tue, 16 May 2023 13:55:58 +0200 rumpkernel (0~20211031-3) unreleased; urgency=medium diff --git a/debian/patches/clean_external b/debian/patches/clean_external new file mode 100644 index 00000000..25689b35 --- /dev/null +++ b/debian/patches/clean_external @@ -0,0 +1,15 @@ +We have dropped various source that is useless to use, so ignore cleaning them. + +Index: rumpkernel/buildrump.sh/src/build.sh +=================================================================== +--- rumpkernel.orig/buildrump.sh/src/build.sh ++++ rumpkernel/buildrump.sh/src/build.sh +@@ -2533,7 +2533,7 @@ main() + ;; + + cleandir|obj|sourcesets|syspkgs|params) +- ${runcmd} "${makewrapper}" ${parallel} ${op} || ++ ${runcmd} "${makewrapper}" -k ${parallel} ${op} || + bomb "Failed to make ${op}" + statusmsg "Successful make ${op}" + ;; diff --git a/debian/patches/series b/debian/patches/series index 06b9fccb..346d79be 100644 --- a/debian/patches/series +++ b/debian/patches/series @@ -20,3 +20,4 @@ crossbuild clean_libpci random non-fhs-shell +clean_external diff --git a/debian/rules b/debian/rules index 1a4e6f85..73272a7f 100755 --- a/debian/rules +++ b/debian/rules @@ -39,7 +39,7 @@ override_dh_auto_clean: -V TOOLS_BUILDRUMP=yes \ -V MKBINUTILS=no -V MKGCC=no -V MKGDB=no -V MKGROFF=no \ -V TOPRUMP="$(CURDIR)/buildrump.sh/src/sys/rump" \ - -U -u -T ./obj/tooldir -m $(DEB_HOST_ARCH_CPU) cleandir ) ; \ + -U -u -T ./obj/tooldir -m $(DEB_HOST_ARCH_CPU) cleandir || true ) ; \ fi rm -fr obj -find buildrump.sh/src -type f -name .depend -or -name \*.d | xargs -L512 rm -f |