Changeset 2373 in ProjectBuilder

Timestamp:

Mar 1, 2019, 1:38:55 AM (5 years ago)

Author:

Bruno Cornec

Message:

Add support forotherproject ctn build and use getconf for velist

Location:

devel/contrib

Files:

• mkallctn (modified) (1 diff)
• mkctn (modified) (2 diffs)

devel/contrib/mkallctn

@@ -1 +1 @@
 #!/bin/bash
 #
-vedir=`grep -2 vepath ~/.pbrc.yml | grep default: | cut -d: -f2`
-distros=`grep -2 velist $vedir/.pbrc.yml | grep default: | cut -d: -f2`
 lwd=`dirname $0`
+PBPRJ=$1
 
+if [ _"$PBPRJ" = _"" ]; then
+    echo "Defaulting to building for pb itself"
+    PBPRJ="pb"
+fi
+
+distros=`pb -p $PBPRJ getconf velist`
 for pbos in `echo $distros | sed 's/,/ /g'`;
 do
     d=`echo $pbos | cut -d'-' -f1`
     v=`echo $pbos | cut -d'-' -f2`
-    $lwd/mkctn $d $v
+    $lwd/mkctn $PBPRJ $d $v
 done

devel/contrib/mkctn

@@ -1 +1 @@
 #!/bin/bash
 #
-DISTRO=$1
-DISTROVER=$2
-ORIGREPO=$3
+PBPRJ=$1
+DISTRO=$2
+DISTROVER=$3
+ORIGREPO=$4
 ARCH=x86_64
 
 M=$DISTRO-$DISTROVER-$ARCH
 
+if [ _"$PBPRJ" = _"" ]; then
+    echo "Syntax: mkctn project distro version [repo]"
+    exit -1
+fi
 if [ _"$DISTRO" = _"mageia" ]; then
     ORIGREPO=mageiaofficial
@@ -29 +34 @@
 pb -p pb -T docker --stop-on-error -m $M newve -i ${ORIGREPO}:$DISTROVER && \
 pb -p pb -T docker --stop-on-error -m $M sbx2setupve && \
-pb -p pb -T docker --stop-on-error -m $M prepve && \
-pb -p pb -T docker --stop-on-error -m $M build2ve
+pb -p $PBPRJ -T docker --stop-on-error -m $M prepve && \
+pb -p $PBPRJ -T docker --stop-on-error -m $M build2ve
 docker image prune -f