packaging: align zypper placeholder handling and kafka cmake flags

Author: illescad

install.sh

@@ -154,14 +154,15 @@ rpm --import $RELEASE_KEY
 cat << EOF > /etc/zypp/repos.d/fluent-bit.repo
 [fluent-bit]
 name = Fluent Bit
-baseurl = $RELEASE_URL/opensuse/leap/\$releaserver
+baseurl = $RELEASE_URL/opensuse/leap/VERSION_SUBSTR
 gpgcheck=1
 repo_gpgcheck=1
 gpgkey=$RELEASE_KEY
 enabled=1
 type=rpm-md
 autorefresh=1
 EOF
+sed -i 's|VERSION_SUBSTR|\$releaserver|g' /etc/zypp/repos.d/fluent-bit.repo
 cat /etc/zypp/repos.d/fluent-bit.repo
 zypper --non-interactive --gpg-auto-import-keys refresh
 $INSTALL_CMD_PREFIX zypper --non-interactive --gpg-auto-import-keys $ZYPPER_PARAMETERS install $INSTALL_PACKAGE_NAME$ZYPPER_VERSION
@@ -173,14 +174,15 @@ rpm --import $RELEASE_KEY
 cat << EOF > /etc/zypp/repos.d/fluent-bit.repo
 [fluent-bit]
 name = Fluent Bit
-baseurl = $RELEASE_URL/sles/\$releasever
+baseurl = $RELEASE_URL/sles/VERSION_SUBSTR
 gpgcheck=1
 repo_gpgcheck=1
 gpgkey=$RELEASE_KEY
 enabled=1
 type=rpm-md
 autorefresh=1
 EOF
+sed -i 's|VERSION_SUBSTR|\$releasever|g' /etc/zypp/repos.d/fluent-bit.repo
 cat /etc/zypp/repos.d/fluent-bit.repo
 zypper --non-interactive --gpg-auto-import-keys refresh
 $INSTALL_CMD_PREFIX zypper --non-interactive --gpg-auto-import-keys $ZYPPER_PARAMETERS install $INSTALL_PACKAGE_NAME$ZYPPER_VERSION

packaging/distros/opensuse/Dockerfile

@@ -110,6 +110,7 @@ RUN cmake -DCMAKE_INSTALL_PREFIX="$CMAKE_INSTALL_PREFIX" \
     -DFLB_TRACE="$FLB_TRACE" \
     -DFLB_SQLDB="$FLB_SQLDB" \
     -DFLB_HTTP_SERVER="$FLB_HTTP_SERVER" \
+    -DFLB_OUT_KAFKA="$FLB_OUT_KAFKA" \
     -DFLB_KAFKA="$FLB_KAFKA" \
     -DFLB_OUT_PGSQL="$FLB_OUT_PGSQL" \
     -DFLB_NIGHTLY_BUILD="$FLB_NIGHTLY_BUILD" \

packaging/distros/sles/Dockerfile

@@ -75,6 +75,7 @@ RUN cmake -DCMAKE_INSTALL_PREFIX="$CMAKE_INSTALL_PREFIX" \
     -DFLB_TRACE="$FLB_TRACE" \
     -DFLB_SQLDB="$FLB_SQLDB" \
     -DFLB_HTTP_SERVER="$FLB_HTTP_SERVER" \
+    -DFLB_OUT_KAFKA="$FLB_OUT_KAFKA" \
     -DFLB_KAFKA="$FLB_KAFKA" \
     -DFLB_OUT_PGSQL="$FLB_OUT_PGSQL" \
     -DFLB_NIGHTLY_BUILD="$FLB_NIGHTLY_BUILD" \