obs: Update dependencies and versioning.

obs/_generic/build-scripts/00env.sh

@@ -34,7 +34,7 @@ PACKAGE_SHORT_DESCRIPTION=${PACKAGE_SHORT_DESCRIPTION:-Package for ${SOFTWARE_NA
 PACKAGE_DISTRIBUTION_VALUE=${PACKAGE_DISTRIBUTION_VALUE:-UNRELEASED}
 PACKAGE_URGENCY=${PACKAGE_URGENCY:-medium}
 ## Buildout file and version
-GIT_REPOSITORY=${GIT_REPOSITORY:-https://lab.nexedi.com/nexedi/slapos}
+GIT_REPOSITORY=${GIT_REPOSITORY:-https://lab.nexedi.com/nexedi/slapos.git}
 GIT_BRANCH_OR_COMMIT=${GIT_BRANCH_OR_COMMIT:-master}
 BUILDOUT_RELATIVE_PATH=${BUILDOUT_RELATIVE_PATH:-software/$SOFTWARE_NAME/software.cfg}
 ## OBS information

obs/fluent-bit/env.sh

@@ -5,10 +5,10 @@ export MAINTAINER_EMAIL=ophelie.gagnard@nexedi.com
 
 export SOFTWARE_NAME=fluent-bit
 # version format: <fluent-bit>+<slapos>
-export SOFTWARE_VERSION=1.9.8+1.0.293+nodep
+export SOFTWARE_VERSION=1.9.8
 
-export PACKAGE_BUILD_DEPENDENCIES="debhelper (>= 4.1.16), chrpath, wget, python (>= 2.7), python3 (>= 3.7), python3-dev (>= 3.7), cmake (>= 3.18)"
-export BUILDOUT_RELATIVE_PATH=component/fluent-bit/obs-nodep.cfg
+export PACKAGE_BUILD_DEPENDENCIES="debhelper (>= 4.1.16), chrpath, wget, python3 (>= 3.7) | python, python3-dev (>= 3.7) | python-dev"
+export BUILDOUT_RELATIVE_PATH=component/fluent-bit/obs.cfg
 export ZC_BUILDOUT_VERSION=2.7.1+slapos019
 
 export OBS_PROJECT=home:oph.nxd

obs/mca--static/env.sh

@@ -2,11 +2,11 @@ export MAINTAINER_NAME="Ophélie Gagnard"
 export MAINTAINER_EMAIL=ophelie.gagnard@nexedi.com
 
 export SOFTWARE_NAME=mca--static
-# version format: <mca>+<fluentbit-plugin>+<slapos>
-export SOFTWARE_VERSION=0.3.1+1.0.293+nodep
+# version format: <mca>+<slapos>
+export SOFTWARE_VERSION=0.3.1
 
-export PACKAGE_BUILD_DEPENDENCIES="debhelper (>= 4.1.16), chrpath, wget, python (>= 2.7), python3 (>= 3.7), python3-dev (>= 3.7), cmake (>= 3.18)"
-export BUILDOUT_RELATIVE_PATH=component/mca/obs-static-nodep.cfg
+export PACKAGE_BUILD_DEPENDENCIES="debhelper (>= 4.1.16), chrpath, wget, python3 (>= 3.7) | python, python3-dev (>= 3.7) | python-dev"
+export BUILDOUT_RELATIVE_PATH=component/mca/obs-static.cfg
 
 export OBS_PROJECT=home:oph.nxd
 export OBS_COMMIT_MSG="Yet another push in OBS."

obs/plugin-fluentbit-to-wendelin/env.sh

@@ -4,7 +4,7 @@ export MAINTAINER_EMAIL=ophelie.gagnard@nexedi.com
 export SOFTWARE_NAME=plugin-fluentbit-to-wendelin
 # version format: <fluentbit-plugin>+<slapos>
 # nodep means "no build dependencies"
-export SOFTWARE_VERSION=0.2.1+1.0.293+nodep
+export SOFTWARE_VERSION=0.3.1
 
 export PACKAGE_BUILD_DEPENDENCIES="debhelper (>= 4.1.16), chrpath, wget, python (>= 2.7), python3 (>= 3.7), python3-dev (>= 3.7), golang (>= 2:1.15~1)"
 export BUILDOUT_RELATIVE_PATH=component/fluentbit-plugin-wendelin/obs-nodep.cfg