From: "Justin M. Forbes" <jfor...@fedoraproject.org>
---
redhat/genspec.sh | 8 ++++----
redhat/kernel.spec.template | 4 ++--
2 files changed, 6 insertions(+), 6 deletions(-)
diff --git a/redhat/genspec.sh b/redhat/genspec.sh
index 6b618f89f669..fce17298d071 100755
--- a/redhat/genspec.sh
+++ b/redhat/genspec.sh
@@ -276,12 +276,12 @@ Used to set the RHEL version.
patch=$(git format-patch -1 "$c")
echo "$patch" >> $plistf
mv $patch $SOURCES/
- sed -i "s/PATCHLIST/Patch$pnum: $patch\nPATCHLIST/" $SPECFILE
- sed -i "s/APPLYPATCH/ApplyOptionalPatch $patch\nAPPLYPATCH/"
$SPECFILE
+ sed -i "s/%%PATCHLIST%%/Patch$pnum: $patch\n%%PATCHLIST%%/"
$SPECFILE
+ sed -i "s/%%APPLYPATCH%%/ApplyOptionalPatch
$patch\n%%APPLYPATCH%%/" $SPECFILE
((pnum++))
done
- sed -i "s/PATCHLIST//" $SPECFILE
- sed -i "s/APPLYPATCH//" $SPECFILE
+ sed -i "s/%%PATCHLIST%%//" $SPECFILE
+ sed -i "s/%%APPLYPATCH%%//" $SPECFILE
fi
for opt in $BUILDOPTS; do
diff --git a/redhat/kernel.spec.template b/redhat/kernel.spec.template
index 58af5635935b..8d0244f08056 100644
--- a/redhat/kernel.spec.template
+++ b/redhat/kernel.spec.template
@@ -707,7 +707,7 @@ Patch1: patch-%{rpmversion}-redhat.patch
%if !%{nopatches}
-PATCHLIST
+%%PATCHLIST%%
%endif
# empty final patch to facilitate testing of kernel patches
@@ -1211,7 +1211,7 @@ ApplyOptionalPatch patch-%{rpmversion}-redhat.patch
%if !%{nopatches}
-APPLYPATCH
+%%APPLYPATCH%%
%endif
ApplyOptionalPatch linux-kernel-test.patch
--
2.26.2
_______________________________________________
kernel mailing list -- kernel@lists.fedoraproject.org
To unsubscribe send an email to kernel-le...@lists.fedoraproject.org
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/kernel@lists.fedoraproject.org
