fixup

Author: mattiaswal

utils/kernel-upgrade.sh

@@ -245,41 +245,14 @@ update_changelog() {
         return 0
     fi
 
-    # Check if the latest release is UNRELEASED, if not create one
+    # Check if the latest release is UNRELEASED
     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
+        log_error "No UNRELEASED section found in ChangeLog.md"
+        log_error "Please create an UNRELEASED section first before running this script"
+        exit 1
     fi
 
-    # Now add or update the kernel upgrade entry in the UNRELEASED section
+    # 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
@@ -314,20 +287,18 @@ check_clean_working_tree() {
     log_info "Working tree is clean"
 }
 
-# Push changes to remotes
+# Push changes to both repositories
 push_changes() {
-    log_info "Pushing changes to remotes..."
-
-    # Push rebased linux branch to kkit remote
-    log_info "Pushing rebased linux branch to $KKIT_REMOTE..."
+    # Push rebased linux branch
+    log_info "Pushing linux branch to $KKIT_REMOTE..."
     if git -C "$LINUX_DIR" push "$KKIT_REMOTE" "$LINUX_BRANCH" --force-with-lease; then
         log_info "Successfully pushed linux branch to $KKIT_REMOTE"
     else
         log_error "Push to linux remote failed"
         exit 1
     fi
 
-    # Push infix branch to origin
+    # Push infix changes
     log_info "Pushing infix branch to origin..."
     if git -C "$INFIX_DIR" push origin "$INFIX_BRANCH"; then
         log_info "Successfully pushed infix branch to origin"