fixup

Author: mattiaswal

utils/kernel-upgrade.sh

@@ -221,24 +221,8 @@ update_infix() {
         exit 1
     fi
 
-    # Update ChangeLog.md with new kernel version
-    log_info "Updating ChangeLog.md..."
-    if [ -f "doc/ChangeLog.md" ]; then
-        # Check if there's already a kernel upgrade entry in the latest release
-        if grep -q "^- Upgrade Linux kernel to" doc/ChangeLog.md | head -20; then
-            # Find and update the existing kernel upgrade line
-            sed -i "0,/^- Upgrade Linux kernel to.*/{s/^- Upgrade Linux kernel to.*/- Upgrade Linux kernel to $NEW_VERSION (LTS)/}" doc/ChangeLog.md
-            log_info "Updated existing kernel version entry to $NEW_VERSION"
-        else
-            # Add new kernel upgrade entry after the first "### Changes" section
-            sed -i "0,/^### Changes/a\\
-\\
-- Upgrade Linux kernel to $NEW_VERSION (LTS)" doc/ChangeLog.md
-            log_info "Added new kernel version entry: $NEW_VERSION"
-        fi
-    else
-        log_warn "doc/ChangeLog.md not found, skipping changelog update"
-    fi
+    # Update changelog
+    update_changelog "$NEW_VERSION"
 
     # Commit all changes
     log_info "Committing changes to infix..."
@@ -251,6 +235,64 @@ update_infix() {
     fi
 }
 
+# Update ChangeLog.md with new kernel version
+update_changelog() {
+    local NEW_VERSION="$1"
+
+    log_info "Updating ChangeLog.md..."
+    if [ ! -f "doc/ChangeLog.md" ]; then
+        log_warn "doc/ChangeLog.md not found, skipping changelog update"
+        return 0
+    fi
+
+    # Check if the latest release is UNRELEASED, if not create one
+    if ! grep -q "^\[.*\]\[UNRELEASED\]" doc/ChangeLog.md; then
+        log_info "No UNRELEASED section found, creating new one"
+        # Extract current version and increment it
+        CURRENT_VER=$(grep -m1 "^\[v" doc/ChangeLog.md | grep -oP 'v\d+\.\d+\.\d+' | head -1)
+        if [ -n "$CURRENT_VER" ]; then
+            # Parse version (e.g., v25.10.0 = year.month.patch)
+            YEAR=$(echo "$CURRENT_VER" | cut -d'.' -f1 | sed 's/v//')
+            MONTH=$(echo "$CURRENT_VER" | cut -d'.' -f2)
+            PATCH=$(echo "$CURRENT_VER" | cut -d'.' -f3)
+
+            # Increment month, roll over to next year if needed
+            NEXT_MONTH=$((10#$MONTH + 1))
+            NEXT_YEAR=$YEAR
+            if [ $NEXT_MONTH -gt 12 ]; then
+                NEXT_MONTH=1
+                NEXT_YEAR=$((YEAR + 1))
+            fi
+            NEXT_VER=$(printf "v%d.%02d.0" $NEXT_YEAR $NEXT_MONTH)
+
+            log_info "Creating new section for $NEXT_VER"
+            # Insert new unreleased header at the top
+            sed -i "1a\\
+[$NEXT_VER][UNRELEASED] - TBD\\
+-----------------------------\\
+\\
+### Changes" doc/ChangeLog.md
+            log_info "Created new UNRELEASED header"
+        else
+            log_error "Could not determine current version from ChangeLog.md"
+            exit 1
+        fi
+    fi
+
+    # Now add or update the kernel upgrade entry in the UNRELEASED section
+    if grep -q "^- Upgrade Linux kernel to" doc/ChangeLog.md | head -20; then
+        # Update existing kernel upgrade line
+        sed -i "0,/^- Upgrade Linux kernel to.*/{s/^- Upgrade Linux kernel to.*/- Upgrade Linux kernel to $NEW_VERSION (LTS)/}" doc/ChangeLog.md
+        log_info "Updated existing kernel version entry to $NEW_VERSION"
+    else
+        # Add new kernel upgrade entry after the first "### Changes" section
+        sed -i "0,/^### Changes/a\\
+\\
+- Upgrade Linux kernel to $NEW_VERSION (LTS)" doc/ChangeLog.md
+        log_info "Added new kernel version entry: $NEW_VERSION"
+    fi
+}
+
 # Check for uncommitted changes
 check_clean_working_tree() {
     log_info "Checking for uncommitted changes..."