From: Frantisek Hrbata <[email protected]>

redhat: add clog for new minor release to index

Bugzilla: INTERNAL
Upstream Status: RHEL only
Tested: bump minor and run dist-release

dist-release-changed target has a check if there is any change between
worktree and index. If not, it exits with "Nothing changed, skipping updates".
Since the new file e.g. redhat/kernel.changelog-9.2 is not in the index yet,
because it's added after the check in the dist-release-finish target,
the check is bogus in this case. Note it's not looking at local vs
remote changes. Fix this just by adding the new changelog to index when
it's copied.

Signed-off-by: Frantisek Hrbata <[email protected]>

diff --git a/redhat/Makefile b/redhat/Makefile
index blahblah..blahblah 100644
--- a/redhat/Makefile
+++ b/redhat/Makefile
@@ -468,6 +468,7 @@ _setup-source: dist-git-version-check
        @if [ ! -e  $(REDHAT)/$(SPECCHANGELOG) ]; then \
                echo "Creating $(SPECCHANGELOG) as copy of $(CHANGELOG_PREV)"; \
                cp $(REDHAT)/$(CHANGELOG_PREV) $(REDHAT)/$(SPECCHANGELOG); \
+               $(GIT) add $(REDHAT)/$(SPECCHANGELOG); \
        fi
        @if [ -z "$(RHSELFTESTDATA)" ]; then \
                cp $(REDHAT)/$(SPECCHANGELOG) $(SOURCES)/$(SPECCHANGELOG); \

--
https://gitlab.com/cki-project/kernel-ark/-/merge_requests/2012
_______________________________________________
kernel mailing list -- [email protected]
To unsubscribe send an email to [email protected]
Fedora Code of Conduct: 
https://docs.fedoraproject.org/en-US/project/code-of-conduct/
List Guidelines: https://fedoraproject.org/wiki/Mailing_list_guidelines
List Archives: 
https://lists.fedoraproject.org/archives/list/[email protected]
Do not reply to spam, report it: 
https://pagure.io/fedora-infrastructure/new_issue

Reply via email to