Update stage script with baseutils changes

1 files changed, 25 insertions, 15 deletions

diff --git a/stage b/stage
index 71da929..55e801e 100755
--- a/stage
+++ b/stage
@@ -66,21 +66,31 @@ if [ -n "$base" ]; then
 
   echo "$v" >version
 
-  ./pkdist -n baseutils -d "$vf" -p "$vf/list-i686" \
--c "$vf/control" -s ./pkpost \
--z "/tmp/build2-baseutils-$v-i686-windows"
-
-  ./pkdist -n baseutils -d "$vf" -p "$vf/list-x86_64" \
--c "$vf/control" -s ./pkpost \
--z "/tmp/build2-baseutils-$v-x86_64-windows"
-
-  ./pkdist -n mingw -d "mingw-$vf" -p "mingw-$vf/list-i686" \
--c "mingw-$vf/control-i686" -s ./pkpost-mingw \
--u http://repo.msys2.org/mingw -x "/tmp/build2-mingw-$v-i686-windows"
-
-  ./pkdist -n mingw -d "mingw-$vf" -p "mingw-$vf/list-x86_64" \
--c "mingw-$vf/control-x86_64" -s ./pkpost-mingw \
--u http://repo.msys2.org/mingw -x "/tmp/build2-mingw-$v-x86_64-windows"
+  ./pkdist -n baseutils -d "$vf" -z "/tmp/build2-baseutils-$v-i686-windows" \
+--sys-p "$vf/list-msys-i686" \
+--sys-c "$vf/control-msys" \
+--sys-s ./pkpost-base-msys \
+--min-p "$vf/list-mingw-i686" \
+--min-c "$vf/control-mingw-i686" \
+--min-s ./pkpost-base-mingw
+
+  ./pkdist -n baseutils -d "$vf" -z "/tmp/build2-baseutils-$v-x86_64-windows" \
+--sys-p "$vf/list-msys-x86_64" \
+--sys-c "$vf/control-msys" \
+--sys-s ./pkpost-base-msys \
+--min-p "$vf/list-mingw-x86_64" \
+--min-c "$vf/control-mingw-x86_64" \
+--min-s ./pkpost-base-mingw
+
+  ./pkdist -n mingw -d "mingw-$vf" -x "/tmp/build2-mingw-$v-i686-windows" \
+--min-p "mingw-$vf/list-mingw-i686" \
+--min-c "mingw-$vf/control-mingw-i686" \
+--min-s ./pkpost-mingw-mingw
+
+  ./pkdist -n mingw -d "mingw-$vf" -x "/tmp/build2-mingw-$v-x86_64-windows" \
+--min-p "mingw-$vf/list-mingw-x86_64" \
+--min-c "mingw-$vf/control-mingw-x86_64" \
+--min-s ./pkpost-mingw-mingw
 
   cd ../..