Update `sync-all` and `packages` wrt to fold-in

This adapts `sync-all` and `packages` to the recently folded-in Git
repositories

 - `base.git`
 - `ghc-prim.git`
 - `integer-gmp.git`
 - `integer-simple.git`
 - `template-haskell.git`

See #8545 as well as 5f54d67818ee7a74325eed130438beba96510e43 for more
details.

Signed-off-by: Herbert Valerio Riedel <hvr@gnu.org>

2 files changed, 81 insertions, 5 deletions

diff --git a/packages b/packages
index 2683c992c6..c324d2d8c3 100644
--- a/packages
+++ b/packages
@@ -49,7 +49,6 @@ libffi-tarballs              -           libffi-tarballs.git             -
 utils/hsc2hs                 -           hsc2hs.git                      -
 utils/haddock                -           -                               -
 libraries/array              -           packages/array.git              -
-libraries/base               -           packages/base.git               -
 libraries/binary             -           -                               https://github.com/kolmodin/binary.git
 libraries/bytestring         -           -                               https://github.com/haskell/bytestring.git
 libraries/Cabal              -           -                               https://github.com/haskell/cabal.git
@@ -57,19 +56,15 @@ libraries/containers         -           -                               https:/
 libraries/deepseq            -           packages/deepseq.git            -
 libraries/directory          -           packages/directory.git          -
 libraries/filepath           -           packages/filepath.git           -
-libraries/ghc-prim           -           packages/ghc-prim.git           -
 libraries/haskeline          -           -                               https://github.com/judah/haskeline.git
 libraries/haskell98          -           packages/haskell98.git          -
 libraries/haskell2010        -           packages/haskell2010.git        -
 libraries/hoopl              -           packages/hoopl.git              -
 libraries/hpc                -           packages/hpc.git                -
-libraries/integer-gmp        -           packages/integer-gmp.git        -
-libraries/integer-simple     -           packages/integer-simple.git     -
 libraries/old-locale         -           packages/old-locale.git         -
 libraries/old-time           -           packages/old-time.git           -
 libraries/pretty             -           -                               https://github.com/haskell/pretty.git
 libraries/process            -           packages/process.git            -
-libraries/template-haskell   -           packages/template-haskell.git   -
 libraries/terminfo           -           -                               https://github.com/judah/terminfo.git
 libraries/time               -           -                               http://git.haskell.org/darcs-mirrors/time.git
 libraries/transformers       -           -                               http://git.haskell.org/darcs-mirrors/transformers.git
diff --git a/sync-all b/sync-all
index 70c9639d1c..6b875bb19a 100755
--- a/sync-all
+++ b/sync-all
@@ -977,6 +977,87 @@ the ghc Git repository (see #8545 for more details)
 EOF
         die "detected obsolete testsuite/.git folder"
     }
+
+
+    if (-d "libraries/base/.git") {
+        print <<EOF;
+============================
+ATTENTION!
+
+You have a left-over libraries/base/.git folder in your GHC tree!
+
+Please backup or remove it (e.g. "rm -r libraries/base/.git") before
+proceeding as the testsuite Git repository is now tracked as part of
+the ghc Git repository (see #8545 for more details)
+============================
+EOF
+        die "detected obsolete libraries/base/.git folder"
+    }
+
+    if (-d "libraries/ghc-prim/.git") {
+        print <<EOF;
+============================
+ATTENTION!
+
+You have a left-over libraries/ghc-prim/.git folder in your GHC tree!
+
+Please backup or remove it (e.g. "rm -r libraries/ghc-prim/.git") before
+proceeding as the testsuite Git repository is now tracked as part of
+the ghc Git repository (see #8545 for more details)
+============================
+EOF
+        die "detected obsolete libraries/ghc-prim/.git folder"
+    }
+
+
+    if (-d "libraries/template-haskell/.git") {
+        print <<EOF;
+============================
+ATTENTION!
+
+You have a left-over libraries/template-haskell/.git folder in your GHC tree!
+
+Please backup or remove it (e.g. "rm -r libraries/template-haskell/.git") before
+proceeding as the testsuite Git repository is now tracked as part of
+the ghc Git repository (see #8545 for more details)
+============================
+EOF
+        die "detected obsolete libraries/template-haskell/.git folder"
+    }
+
+
+    if (-d "libraries/integer-gmp/.git") {
+        print <<EOF;
+============================
+ATTENTION!
+
+You have a left-over libraries/integer-gmp/.git folder in your GHC tree!
+
+Please backup or remove it (e.g. "rm -r libraries/integer-gmp/.git") before
+proceeding as the testsuite Git repository is now tracked as part of
+the ghc Git repository (see #8545 for more details)
+============================
+EOF
+        die "detected obsolete libraries/integer-gmp/.git folder"
+    }
+
+
+    if (-d "libraries/integer-simple/.git") {
+        print <<EOF;
+============================
+ATTENTION!
+
+You have a left-over libraries/integer-simple/.git folder in your GHC tree!
+
+Please backup or remove it (e.g. "rm -r libraries/integer-simple/.git") before
+proceeding as the testsuite Git repository is now tracked as part of
+the ghc Git repository (see #8545 for more details)
+============================
+EOF
+        die "detected obsolete libraries/integer-simple/.git folder"
+    }
+
+
 }
 
 END {