From 752f695c4a5b237fc6569d6808b8d2d81548b038 Mon Sep 17 00:00:00 2001
From: Pat <pat@calyptia.com>
Date: Fri, 3 Nov 2023 12:20:43 +0000
Subject: [PATCH] workflows: update_version.sh handles copyright year and BB
 files properly (#8073)

Signed-off-by: Patrick Stephens <pat@calyptia.com>
---
 fluent-bit-2.1.11.bb | 57 --------------------------------------------
 update_version.sh    | 12 +++++++---
 2 files changed, 9 insertions(+), 60 deletions(-)
 delete mode 100644 fluent-bit-2.1.11.bb

diff --git a/fluent-bit-2.1.11.bb b/fluent-bit-2.1.11.bb
deleted file mode 100644
index dd445340652..00000000000
--- a/fluent-bit-2.1.11.bb
+++ /dev/null
@@ -1,57 +0,0 @@
-# Fluent Bit - Yocto / Bitbake
-# ============================
-# The following Bitbake package the latest Fluent Bit stable release.
-
-SUMMARY = "Fast Log processor and Forwarder"
-DESCRIPTION = "Fluent Bit is a data collector, processor and  \
-forwarder for Linux. It supports several input sources and \
-backends (destinations) for your data. \
-"
-
-HOMEPAGE = "http://fluentbit.io"
-BUGTRACKER = "https://github.com/fluent/fluent-bit/issues"
-
-LICENSE = "Apache-2.0"
-LIC_FILES_CHKSUM = "file://LICENSE;md5=2ee41112a44fe7014dce33e26468ba93"
-SECTION = "net"
-
-PR = "r0"
-PV = "2.1.10"
-
-SRCREV = "v${PV}"
-SRC_URI = "git://github.com/fluent/fluent-bit.git;nobranch=1"
-
-S = "${WORKDIR}/git"
-DEPENDS = "zlib bison-native flex-native"
-INSANE_SKIP_${PN}-dev += "dev-elf"
-
-# Use CMake 'Unix Makefiles' generator
-OECMAKE_GENERATOR ?= "Unix Makefiles"
-
-# Fluent Bit build options
-# ========================
-
-# Host related setup
-EXTRA_OECMAKE += "-DGNU_HOST=${HOST_SYS} "
-
-# Disable LuaJIT and filter_lua support
-EXTRA_OECMAKE += "-DFLB_LUAJIT=Off -DFLB_FILTER_LUA=Off "
-
-# Disable Library and examples
-EXTRA_OECMAKE += "-DFLB_SHARED_LIB=Off -DFLB_EXAMPLES=Off "
-
-# Systemd support (optional)
-DEPENDS += "systemd"
-EXTRA_OECMAKE += "-DFLB_IN_SYSTEMD=On "
-
-# Kafka Output plugin (disabled by default): note that when
-# enabling Kafka output plugin, the backend library librdkafka
-# requires 'openssl' as a dependency.
-#
-# DEPENDS += "openssl "
-# EXTRA_OECMAKE += "-DFLB_OUT_KAFKA=On "
-
-inherit cmake systemd
-
-SYSTEMD_SERVICE_${PN} = "fluent-bit.service"
-TARGET_CC_ARCH_append = " ${SELECTED_OPTIMIZATION}"
diff --git a/update_version.sh b/update_version.sh
index 403176f6140..998db1c2ade 100755
--- a/update_version.sh
+++ b/update_version.sh
@@ -37,6 +37,12 @@ else
     exit 1
 fi
 
+# Get the current year
+NEW_COPYRIGHT_YEAR=${NEW_COPYRIGHT_YEAR:-$(date +%Y)}
+
+# Update Copyright statement
+sed_wrapper -i -E "s/Copyright \(C\) 2015-([0-9]+)/Copyright (C) 2015-$NEW_COPYRIGHT_YEAR/g" "$SCRIPT_DIR"/include/fluent-bit/flb_version.h.in
+
 # Extract and verify each version
 major=$(echo "$NEW_VERSION" | cut -d. -f1)
 minor=$(echo "$NEW_VERSION" | cut -d. -f2)
@@ -73,8 +79,8 @@ if [[ -f "fluent-bit-$NEW_VERSION.bb" ]]; then
     echo "ERROR: existing fluent-bit-$NEW_VERSION.bb"
     exit 1
 else
-    sed_wrapper -i "s/PV = \"[0-9].[0-9].[0-9]\"/PV = \"$NEW_VERSION\"/g" "$SCRIPT_DIR"/fluent-bit-*.*.*.bb
-    mv "$SCRIPT_DIR"/fluent-bit-*.*.*.bb "fluent-bit-$NEW_VERSION.bb"
+    mv -vf "$SCRIPT_DIR"/fluent-bit-*.*.*.bb "fluent-bit-$NEW_VERSION.bb"
+    sed_wrapper -i -E "s/^PV =.*$/PV = \"$NEW_VERSION\"/g" "fluent-bit-$NEW_VERSION.bb"
 fi
 
 if [[ "${DISABLE_COMMIT:-no}" == "no" ]]; then
@@ -89,7 +95,7 @@ if [[ "${DISABLE_COMMIT:-no}" == "no" ]]; then
     # Handle renaming
     git add "*.bb"
     git commit -a -s -m "bitbake: bump to v$NEW_VERSION"
-else 
+else
     echo "Skipping commits"
 fi