From 6f57674600977e8e69edc1ad2268835dbe8364c5 Mon Sep 17 00:00:00 2001
From: Boris Kolpackov <boris@codesynthesis.com>
Date: Thu, 15 Oct 2020 14:38:08 +0200
Subject: Adjust to bpkg-rep to bpkg-util rename, add kconfig

---
 git/modules | 10 ++++++----
 review      |  2 +-
 stage       | 10 ++++------
 version     |  4 ++--
 4 files changed, 13 insertions(+), 13 deletions(-)

diff --git a/git/modules b/git/modules
index 2d6237c..ca1841c 100644
--- a/git/modules
+++ b/git/modules
@@ -6,7 +6,7 @@ libbutl.bash      \
 build2            \
 libbpkg           \
 bpkg              \
-bpkg-rep          \
+bpkg-util         \
 bdep              \
 bdep-util         \
 brep              \
@@ -14,7 +14,8 @@ libbbot           \
 bbot              \
 libstd-modules    \
 libbuild2-hello   \
-libbuild2-rust"
+libbuild2-rust    \
+libbuild2-kconfig"
 
 # During release it is useful to exclude some of these so can do mass
 # commits (like version updates).
@@ -38,7 +39,7 @@ libbutl.bash      \
 build2            \
 libbpkg           \
 bpkg              \
-bpkg-rep          \
+bpkg-util         \
 bdep              \
 bdep-util         \
 brep              \
@@ -59,7 +60,7 @@ libbutl.bash      \
 build2            \
 libbpkg           \
 bpkg              \
-bpkg-rep          \
+bpkg-util         \
 bdep              \
 bdep-util         \
 brep              \
@@ -68,6 +69,7 @@ bbot              \
 libstd-modules    \
 libbuild2-hello   \
 libbuild2-rust    \
+libbuild2-kconfig \
 buildos           \
 msvc-linux        \
 openssl-agent"
diff --git a/review b/review
index f1d4c5b..829c4df 100755
--- a/review
+++ b/review
@@ -6,7 +6,7 @@
 #
 usage="usage: $0"
 
-modules="libbutl libbutl.bash build2 libbpkg bpkg bpkg-rep bdep bdep-util brep libbbot bbot libstd-modules build2-toolchain"
+modules="libbutl libbutl.bash build2 libbpkg bpkg bpkg-util bdep bdep-util brep libbbot bbot libstd-modules build2-toolchain"
 
 owd=`pwd`
 trap "{ cd $owd; exit 1; }" ERR
diff --git a/stage b/stage
index a8bde4e..915a93e 100755
--- a/stage
+++ b/stage
@@ -324,7 +324,7 @@ etc/stage-pkg -c $mode build2 \
 	      build2 \
 	      libbpkg \
 	      bpkg \
-	      bpkg-rep \
+	      bpkg-util \
 	      bdep \
 	      bdep-util \
 	      libbbot \
@@ -332,9 +332,7 @@ etc/stage-pkg -c $mode build2 \
 	      bbot \
 	      openssl-agent \
               libbuild2-hello/libbuild2-hello \
-              libbuild2-hello/libbuild2-hello-tests
+              libbuild2-hello/libbuild2-hello-tests \
 
-
-
-#             msvc-linux
-#             libstd-modules
+#	      libbuild2-kconfig/libbuild2-kconfig \
+#              libbuild2-kconfig/libbuild2-kconfig-tests
diff --git a/version b/version
index 1c53122..6f0847c 100755
--- a/version
+++ b/version
@@ -16,7 +16,7 @@ bpkg_min=0.13.0
 
 ver=0.14.0-a.0.z
 #ver=0.13.0
-mods=(libstd-modules libbutl libbutl.bash libbpkg libbbot bpkg)
+mods=(libstd-modules libbutl libbutl.bash libbpkg libbbot bpkg bpkg-util)
 
 odb_ver=2.5.0-b.20.z
 #odb_ver=2.5.0-b.21
@@ -29,7 +29,7 @@ xml_mods=(libstudxml)
 # !!! NOTE: libpkgconf version constraint in build2 is updated manually.
 # !!! NOTE: libcmark version constraint in brep is updated manually.
 
-all=(libstd-modules libbutl libbutl.bash build2 libbpkg bpkg bpkg-rep bdep bdep-util libbbot bbot brep build2-toolchain msvc-linux openssl-agent buildos)
+all=(libstd-modules libbutl libbutl.bash build2 libbpkg bpkg bpkg-util bdep bdep-util libbbot bbot brep build2-toolchain msvc-linux openssl-agent buildos)
 
 # In manifests for alpha/beta we use an exact match. For snapshots -- snapshot
 # range. Otherwise an X.Y.* range.
-- 
cgit v1.1