Update staging scripts to support multiple sections

2 files changed, 56 insertions, 51 deletions

diff --git a/stage-pkg b/stage-pkg
index fe876c6..898887b 100755
--- a/stage-pkg
+++ b/stage-pkg
@@ -18,8 +18,8 @@
 # -q
 #    Put packages into the queue instead of staging. Implies -d.
 #
-# -Q
-#    Put packages into staging queue instead of staging.
+# -Q <section>
+#    Put packages into staging queue's specified section instead of staging.
 #
 # --min-bpkg-version <ver>
 #
@@ -43,7 +43,8 @@ bpkg --version >/dev/null
 bdep --version >/dev/null
 
 repo_name="STAGE.BUILD2.ORG"
-repo_dir="staging/repository/1"
+repo_root="staging/repository/1"
+repo_dir="$repo_root"
 repo_host1="stage.build2.org:/var/bpkg/1"
 repo_host2=
 
@@ -75,16 +76,19 @@ while [ $# -gt 0 ]; do
       ;;
     -q)
       #repo_name="CPPGET.ORG/QUEUE"
-      repo_dir="cppget.org/queue/1/alpha"
+      repo_root="cppget.org/queue/1"
+      repo_dir="$repo_root/alpha"
       #repo_host1="cppget.org:/var/bpkg/1/queue"
       #repo_host2="queue.cppget.org:/var/bpkg/1/queue"
       dist_only=true
       shift
       ;;
     -Q)
+      shift
       repo_name="QUEUE.STAGE.BUILD2.ORG"
-      repo_dir="staging/queue/1"
-      repo_host1="stage.build2.org:/var/bpkg/queue/1"
+      repo_root="staging/queue/1"
+      repo_dir="$repo_root/$1"
+      repo_host1="stage.build2.org:/var/pkg/1"
       shift
       ;;
     --min-bpkg-version)
@@ -156,12 +160,14 @@ if [ -z "$pub_only" ]; then
 
   # Regenerate the repository.
   #
+  # --key "label_SIGN key" (OpenSSL 2)
+  #
   info "Insert $repo_name signing key and press Enter"
   read
-  etc/rep-update "$repo_dir/" "${rep_create_ops[@]}"  \
+  etc/rep-update "$repo_root/" "${rep_create_ops[@]}"  \
     --openssl-option -engine --openssl-option pkcs11  \
     --openssl-option -keyform --openssl-option engine \
-    --key "label_SIGN key"
+    --key "pkcs11:token=name:**build2.org;object=SIGN%20key"
 
   if [ -n "$gen_only" ]; then
     exit 0
@@ -174,8 +180,8 @@ fi # !pub_only
 info "Press Enter to start package upload"
 read
 
-etc/rep-publish "$repo_dir/" "$repo_host1/" $rsync_ops
+etc/rep-publish "$repo_root/" "$repo_host1/" $rsync_ops
 
 if [ -n "$repo_host2" ]; then
-  etc/rep-publish "$repo_dir/" "$repo_host2/" $rsync_ops
+  etc/rep-publish "$repo_root/" "$repo_host2/" $rsync_ops
 fi
diff --git a/stage-queue b/stage-queue
index 9548466..e6787f1 100755
--- a/stage-queue
+++ b/stage-queue
@@ -25,59 +25,58 @@ done
 # These are currently pulled from cppget.org (we cannot have the same
 # versions in multiple places since archive checksums are not stable).
 #
-#etc/stage-pkg -Q -c -d curl packaging/curl/curl/libcurl
-#etc/stage-pkg -Q -c -d curl packaging/curl/curl/curl
-#etc/stage-pkg -Q -c -d curl packaging/curl/ca-certificates-curl/libca-certificates-curl
+#etc/stage-pkg -Q alpha -c -d curl packaging/curl/curl/libcurl
+#etc/stage-pkg -Q alpha -c -d curl packaging/curl/curl/curl
+#etc/stage-pkg -Q alpha -c -d curl packaging/curl/ca-certificates-curl/libca-certificates-curl
 
-#etc/stage-pkg -Q -c -d icu packaging/icu/icu/libicuuc
-#etc/stage-pkg -Q -c -d icu packaging/icu/icu/libicui18n
-#etc/stage-pkg -Q -c -d icu packaging/icu/icu/libicuio
+#etc/stage-pkg -Q alpha -c -d icu packaging/icu/icu/libicuuc
+#etc/stage-pkg -Q alpha -c -d icu packaging/icu/icu/libicui18n
+#etc/stage-pkg -Q alpha -c -d icu packaging/icu/icu/libicuio
 
-#etc/stage-pkg -Q -c -d tinycbor packaging/tinycbor/tinycbor/libtinycbor
+#etc/stage-pkg -Q alpha -c -d tinycbor packaging/tinycbor/tinycbor/libtinycbor
 
-#etc/stage-pkg -Q -c -d xxd packaging/xxd/xxd/xxd
-#etc/stage-pkg -Q -c -d byacc packaging/byacc/byacc/byacc
-#etc/stage-pkg -Q -c -d reflex packaging/reflex/reflex/reflex
-#etc/stage-pkg -Q -c -d openbsd-m4 packaging/openbsd-m4/openbsd-m4/openbsd-m4
+#etc/stage-pkg -Q alpha -c -d xxd packaging/xxd/xxd/xxd
+#etc/stage-pkg -Q alpha -c -d byacc packaging/byacc/byacc/byacc
+#etc/stage-pkg -Q alpha -c -d reflex packaging/reflex/reflex/reflex
+#etc/stage-pkg -Q alpha -c -d openbsd-m4 packaging/openbsd-m4/openbsd-m4/openbsd-m4
 
-etc/stage-pkg -Q -c -d kconfig packaging/kconfig/kconfig/liblkc \
-                               packaging/kconfig/kconfig/kconfig-conf \
-	                       packaging/kconfig/kconfig/kconfig-qconf
+#etc/stage-pkg -Q alpha -c -d kconfig packaging/kconfig/kconfig/liblkc \
+#                              packaging/kconfig/kconfig/kconfig-conf  \
+#	                       packaging/kconfig/kconfig/kconfig-qconf
 
-#etc/stage-pkg -Q -c -d xerces-c packaging/xerces-c/xerces-c/libxerces-c
+#etc/stage-pkg -Q alpha -c -d xerces-c packaging/xerces-c/xerces-c/libxerces-c
 
-#etc/stage-pkg -Q -c -d libcutl ../cutl/libcutl
+#etc/stage-pkg -Q alpha -c -d libcutl ../cutl/libcutl
 
-#etc/stage-pkg -Q -c -d cli ../cli/cli/cli
-#etc/stage-pkg -Q -c -d cli ../cli/cli/cli-tests
-#etc/stage-pkg -Q -c -d cli ../cli/cli/cli-examples
+#etc/stage-pkg -Q alpha -c -d cli ../cli/cli/cli
+#etc/stage-pkg -Q alpha -c -d cli ../cli/cli/cli-tests
+#etc/stage-pkg -Q alpha -c -d cli ../cli/cli/cli-examples
 
-#etc/stage-pkg -Q -c -d libxsd-frontend ../xsd/libxsd-frontend/
-#etc/stage-pkg -Q -c -d xsd ../xsd/xsd/libxsd
-#etc/stage-pkg -Q -c -d xsd ../xsd/xsd/libxsd-tests
-#etc/stage-pkg -Q -c -d xsd ../xsd/xsd/xsd
-#etc/stage-pkg -Q -c -d xsd ../xsd/xsd/xsd-tests
-#etc/stage-pkg -Q -c -d xsd ../xsd/xsd/xsd-examples
+etc/stage-pkg -Q alpha -c -d libxsd-frontend ../xsd/libxsd-frontend/
+etc/stage-pkg -Q alpha -c -d xsd ../xsd/xsd/libxsd
+etc/stage-pkg -Q alpha -c -d xsd ../xsd/xsd/libxsd-tests
+etc/stage-pkg -Q alpha -c -d xsd ../xsd/xsd/xsd
+etc/stage-pkg -Q alpha -c -d xsd ../xsd/xsd/xsd-tests
+etc/stage-pkg -Q alpha -c -d xsd ../xsd/xsd/xsd-examples
 
-#etc/stage-pkg -Q -c -d boost packaging/boost/boost/libboost-*/
+#etc/stage-pkg -Q alpha -c -d boost packaging/boost/boost/libboost-*/
 
-etc/stage-pkg -Q -c -d libb2 packaging/libb2/libb2
+etc/stage-pkg -Q alpha -c -d libevent packaging/libevent/libevent
 
-etc/stage-pkg -Q -c -d libjpeg-turbo packaging/libjpeg-turbo/libjpeg-turbo/libjpeg-turbo
+etc/stage-pkg -Q alpha -c -d Qt5 packaging/qt5/Qt5/Qt5Moc \
+                                 packaging/qt5/Qt5/Qt5Rcc \
+                                 packaging/qt5/Qt5/Qt5Uic \
+                                 packaging/qt5/Qt5/libQt5Core \
+				 packaging/qt5/Qt5/libQt5Gui \
+				 packaging/qt5/Qt5/libQt5GuiTests \
+				 packaging/qt5/Qt5/libQt5Widgets \
+				 packaging/qt5/Qt5/libQt5WidgetsTests
 
-etc/stage-pkg -Q -c -d freetype packaging/libfreetype/libfreetype
-
-etc/stage-pkg -Q -c -d harfbuzz packaging/harfbuzz/harfbuzz/libharfbuzz
-
-etc/stage-pkg -Q -c -d Qt5 packaging/qt5/Qt5/Qt5Moc \
-                           packaging/qt5/Qt5/Qt5Rcc \
-                           packaging/qt5/Qt5/libQt5Core
-
-etc/stage-pkg -Q -c -d Qt6 packaging/qt6/Qt6/Qt6Moc \
-                           packaging/qt6/Qt6/Qt6Rcc \
-                           packaging/qt6/Qt6/libQt6Core
+etc/stage-pkg -Q alpha -c -d Qt6 packaging/qt6/Qt6/Qt6Moc \
+                                 packaging/qt6/Qt6/Qt6Rcc \
+                                 packaging/qt6/Qt6/libQt6Core
 
 # Regenerate repository and publish.
 #
-etc/stage-pkg -Q -g --min-bpkg-version 0.14.0
-etc/stage-pkg -Q -p
+etc/stage-pkg -Q "" -g --min-bpkg-version 0.15.0
+etc/stage-pkg -Q "" -p