From 3ffc5b73c3e7174e3e6828b48239cd8b7c8ed069 Mon Sep 17 00:00:00 2001
From: Jeremy Rand <jeremyrand@airmail.cc>
Date: Tue, 18 May 2021 00:39:22 +0000
Subject: [PATCH] Rebase checkpoints.patch for TBB 10.5a15

---
 tools/checkpoints.patch | 20 ++++++++++----------
 1 file changed, 10 insertions(+), 10 deletions(-)

diff --git a/tools/checkpoints.patch b/tools/checkpoints.patch
index 12caaf9..4450c11 100644
--- a/tools/checkpoints.patch
+++ b/tools/checkpoints.patch
@@ -1,4 +1,4 @@
-From 25b581c833679939408fa51ce1d43b55ae481d51 Mon Sep 17 00:00:00 2001
+From f1de814df5ff7649268c5684d85f6679ac2be049 Mon Sep 17 00:00:00 2001
 From: Jeremy Rand <jeremyrand@airmail.cc>
 Date: Fri, 19 Feb 2021 00:23:40 +0000
 Subject: [PATCH 1/3] clang: Support rbm checkpointing
@@ -8,7 +8,7 @@ Subject: [PATCH 1/3] clang: Support rbm checkpointing
  1 file changed, 13 insertions(+)
 
 diff --git a/projects/clang/build b/projects/clang/build
-index c4c16d9..bb8283b 100644
+index 05a93dc..0c78780 100644
 --- a/projects/clang/build
 +++ b/projects/clang/build
 @@ -2,6 +2,13 @@
@@ -25,7 +25,7 @@ index c4c16d9..bb8283b 100644
  tar -C /var/tmp/dist -xf [% c('input_files_by_name/cmake') %]
  export PATH="/var/tmp/dist/cmake/bin:$PATH"
  [% IF c("var/linux") || c("var/android") %]
-@@ -35,6 +42,12 @@ cd build
+@@ -37,6 +44,12 @@ cd build
              [% IF c("var/rlbox") -%]-DLLVM_EXPERIMENTAL_TARGETS_TO_BUILD=WebAssembly \[% END -%]
                                      -DLLVM_ENABLE_PROJECTS="clang;clang-tools-extra;compiler-rt;libcxx;libcxxabi;lld"
  [% END -%]
@@ -42,7 +42,7 @@ index c4c16d9..bb8283b 100644
 2.20.1
 
 
-From ab0c171fe1c82efed5cbaf657b06d7103f209cb9 Mon Sep 17 00:00:00 2001
+From 68a55e0dc82875550eb78d17683c0eb582c22c23 Mon Sep 17 00:00:00 2001
 From: Jeremy Rand <jeremyrand@airmail.cc>
 Date: Sat, 20 Feb 2021 08:51:15 +0000
 Subject: [PATCH 2/3] macosx-toolchain: Support rbm checkpointing
@@ -85,7 +85,7 @@ index 5716a9e..94f6df1 100644
 2.20.1
 
 
-From 18866ae3512d13c1581a5fedad68565b9cc2e592 Mon Sep 17 00:00:00 2001
+From 54af5c1fd0c1bb6268ff6d8e0d2755fc9d96966a Mon Sep 17 00:00:00 2001
 From: Jeremy Rand <jeremyrand@airmail.cc>
 Date: Mon, 22 Mar 2021 17:19:12 +0000
 Subject: [PATCH 3/3] rbm.conf: Support rbm checkpointing
@@ -95,10 +95,10 @@ Subject: [PATCH 3/3] rbm.conf: Support rbm checkpointing
  1 file changed, 25 insertions(+)
 
 diff --git a/rbm.conf b/rbm.conf
-index 76ab74b..8014570 100644
+index a7023f2..18d8f78 100644
 --- a/rbm.conf
 +++ b/rbm.conf
-@@ -504,6 +504,18 @@ runc:
+@@ -509,6 +509,18 @@ container:
    remote_start: |
      #!/bin/sh
      set -e
@@ -117,7 +117,7 @@ index 76ab74b..8014570 100644
      if [ $(ls -1 '[% c("remote_srcdir", { error_if_undef => 1 }) %]/container-image_'* | wc -l) -ne 1 ]
      then
        echo "Can't find container image in input files" >&2
-@@ -580,6 +592,19 @@ runc:
+@@ -568,6 +580,19 @@ container:
    remote_finish: |
      #!/bin/sh
      set -e
@@ -134,9 +134,9 @@ index 76ab74b..8014570 100644
 +        exit
 +    fi
 +
-     sudo rm -Rf '[% c("var/container/dir", { error_if_undef => 1 }) %]'/rootfs '[% c("var/container/dir", { error_if_undef => 1 }) %]'/config.json
-     rmdir '[% c("var/container/dir") %]'
+     [% c("rbmdir") %]/container remove '[% c("var/container/dir") %]'
  
+ ENV:
 -- 
 2.20.1