From: Don Zickus <dzickus(a)redhat.com>
A source git tree's workflow and Fedora's separation of upstream and distro
contributions don't overlap well.
A source git tree is always merging upstream content and downstream content
while avoiding a rebase. By separating the tarballs and patches out, this
effectively causes a rebase. This 'rebase' causes patches to not apply
correctly as git took care of it previously.
This patch creates a Patchlist.changelog file that lists all the SHAs that
are added to the upstream tree.
The goal is to create a useful file such that the source git tree can
create a single tarball and use the Patchlist.changelog file to adhere
to the spirit of the Fedora's separation rules.
No technical changes, just a new file added to the srpm.
Signed-off-by: Don Zickus <dzickus(a)redhat.com>
---
redhat/genspec.sh | 8 ++++++++
redhat/kernel.spec.template | 1 +
2 files changed, 9 insertions(+)
diff --git a/redhat/genspec.sh b/redhat/genspec.sh
index fbe275f6f4e7..308db0182954 100755
--- a/redhat/genspec.sh
+++ b/redhat/genspec.sh
@@ -273,6 +273,14 @@ if [ "$SINGLE_TARBALL" = 0 ]; then
done
fi
+# generate Patchlist.changelog file that holds the shas and commits not
+# included upstream.
+git log --no-merges --pretty=oneline --no-decorate master.. \
+ ":(exclude,top).gitlab-ci.yml" \
+ ":(exclude,top)makefile" \
+ ":(exclude,top)Makefile.rhelver" \
+ ":(exclude,top)redhat" > $plistf.changelog
+
sed -i "s/%%PATCHLIST%%//" $SPECFILE
sed -i "s/%%APPLYPATCH%%//" $SPECFILE
diff --git a/redhat/kernel.spec.template b/redhat/kernel.spec.template
index 6f591e11bd71..bc12211a7d6b 100644
--- a/redhat/kernel.spec.template
+++ b/redhat/kernel.spec.template
@@ -708,6 +708,7 @@ Source2001: cpupower.config
Source3000: merge.pl
Source3001: kernel-local
Source3002: Patchlist
+Source3003: Patchlist.changelog
Source4000: README.rst
--
GitLab
Show replies by date