Linux v6.1-rc1
Signed-off-by: Justin M. Forbes <jforbes@fedoraproject.org>
This commit is contained in:
parent
201384bbe2
commit
2b3beed204
|
@ -0,0 +1,54 @@
|
|||
From 9c9d8f1b7327830376445c4dd05b121e1525c93f Mon Sep 17 00:00:00 2001
|
||||
From: Adrian Hunter <adrian.hunter@intel.com>
|
||||
Date: Mon, 17 Oct 2022 12:35:49 +0300
|
||||
Subject: [PATCH] perf tools: Fix man page build wrt perf-arm-coresight.txt
|
||||
|
||||
perf build assumes documentation files starting with "perf-" are man
|
||||
pages but perf-arm-coresight.txt is not a man page:
|
||||
|
||||
asciidoc: ERROR: perf-arm-coresight.txt: line 2: malformed manpage title
|
||||
asciidoc: ERROR: perf-arm-coresight.txt: line 3: name section expected
|
||||
asciidoc: FAILED: perf-arm-coresight.txt: line 3: section title expected
|
||||
make[3]: *** [Makefile:266: perf-arm-coresight.xml] Error 1
|
||||
make[3]: *** Waiting for unfinished jobs....
|
||||
make[2]: *** [Makefile.perf:895: man] Error 2
|
||||
|
||||
Fix by renaming it.
|
||||
|
||||
Reported-by: Sven Schnelle <svens@linux.ibm.com>
|
||||
Reported-by: Christian Borntraeger <borntraeger@linux.ibm.com>
|
||||
Fixes: dc2e0fb00bb2 ("perf test coresight: Add relevant documentation about ARM64 CoreSight testing")
|
||||
Signed-off-by: Adrian Hunter <adrian.hunter@intel.com>
|
||||
Reviewed-by: Leo Yan <leo.yan@linaro.org>
|
||||
---
|
||||
tools/perf/Documentation/arm-coresight.txt | 5 +++++
|
||||
tools/perf/Documentation/perf-arm-coresight.txt | 5 -----
|
||||
2 files changed, 5 insertions(+), 5 deletions(-)
|
||||
create mode 100644 tools/perf/Documentation/arm-coresight.txt
|
||||
delete mode 100644 tools/perf/Documentation/perf-arm-coresight.txt
|
||||
|
||||
diff --git a/tools/perf/Documentation/arm-coresight.txt b/tools/perf/Documentation/arm-coresight.txt
|
||||
new file mode 100644
|
||||
index 000000000000..c117fc50a2a9
|
||||
--- /dev/null
|
||||
+++ b/tools/perf/Documentation/arm-coresight.txt
|
||||
@@ -0,0 +1,5 @@
|
||||
+Arm CoreSight Support
|
||||
+=====================
|
||||
+
|
||||
+For full documentation, see Documentation/trace/coresight/coresight-perf.rst
|
||||
+in the kernel tree.
|
||||
diff --git a/tools/perf/Documentation/perf-arm-coresight.txt b/tools/perf/Documentation/perf-arm-coresight.txt
|
||||
deleted file mode 100644
|
||||
index c117fc50a2a9..000000000000
|
||||
--- a/tools/perf/Documentation/perf-arm-coresight.txt
|
||||
+++ /dev/null
|
||||
@@ -1,5 +0,0 @@
|
||||
-Arm CoreSight Support
|
||||
-=====================
|
||||
-
|
||||
-For full documentation, see Documentation/trace/coresight/coresight-perf.rst
|
||||
-in the kernel tree.
|
||||
--
|
||||
2.37.3
|
||||
|
|
@ -4,7 +4,7 @@
|
|||
# For a stable, released kernel, released_kernel should be 1. For rawhide
|
||||
# and/or a kernel built from an rc or git snapshot, released_kernel should
|
||||
# be 0.
|
||||
%global released_kernel 1
|
||||
%global released_kernel 0
|
||||
%global baserelease 1
|
||||
%global fedora_build %{baserelease}
|
||||
|
||||
|
@ -30,12 +30,11 @@
|
|||
## The not-released-kernel case ##
|
||||
%else
|
||||
# The next upstream release sublevel (base_sublevel+1)
|
||||
# %global upstream_sublevel %(echo $((%{base_sublevel} + 1)))
|
||||
%global upstream_sublevel 0
|
||||
%global upstream_sublevel %(echo $((%{base_sublevel} + 1)))
|
||||
%global upstream_major 6
|
||||
|
||||
# The rc snapshot level
|
||||
%global rcrev 0
|
||||
%global rcrev 1
|
||||
# Set rpm version accordingly
|
||||
%global rpmversion %{upstream_major}.%{upstream_sublevel}.0
|
||||
%endif
|
||||
|
@ -114,7 +113,7 @@ Source5000: patch-%{upstream_major}.%{upstream_sublevel}-rc%{rcrev}.xz
|
|||
%endif
|
||||
%endif
|
||||
|
||||
# Patch1:
|
||||
Patch1: 0001-perf-tools-Fix-man-page-build-wrt-perf-arm-coresight.patch
|
||||
|
||||
Name: kernel-tools
|
||||
Summary: Assortment of tools for the Linux kernel
|
||||
|
@ -218,7 +217,7 @@ cd linux-%{kversion}
|
|||
xzcat %{SOURCE5000} | patch -p1 -F1 -s
|
||||
%endif
|
||||
|
||||
# %patch1 -p1
|
||||
%patch1 -p1
|
||||
|
||||
# END OF PATCH APPLICATIONS
|
||||
|
||||
|
@ -535,6 +534,9 @@ popd
|
|||
%{_mandir}/man1/rtla.1.gz
|
||||
|
||||
%changelog
|
||||
* Mon Oct 17 2022 Justin M. Forbes <jforbes@fedoraproject.org> - 6.0.0-0.rc1.git0.1
|
||||
- Linux v6.1-rc1
|
||||
|
||||
* Mon Oct 03 2022 Justin M. Forbes <jforbes@fedoraproject.org> - 6.0.0-1
|
||||
- Linux v6.0
|
||||
|
||||
|
|
|
@ -15,7 +15,7 @@ BASE=`grep "%global base_sublevel" kernel-tools.spec| cut -d ' ' -f 3`
|
|||
OLDBASE=$BASE
|
||||
# See comment in kernel-tools.spec about the base numbering
|
||||
BASE=$(($BASE+1))
|
||||
MAJORVER=5
|
||||
MAJORVER=6
|
||||
|
||||
# Kill all patches
|
||||
awk '!/patch/ { print $0 }' < sources > sources.tmp
|
||||
|
|
1
sources
1
sources
|
@ -1 +1,2 @@
|
|||
SHA512 (linux-6.0.tar.xz) = bac41a7aeb6e809616cee2f13dcd1c45e829dfd1ccf60aee1dc4c46b1e28532f4485c7d819a32940de84fdfbf89db80a4e919bce8a74b2948c5a01551771b714
|
||||
SHA512 (patch-6.1-rc1.xz) = 4499a333485f15fe783914a2b7de4c3ff2f00a44b061895d184517f03481e99354e14dcb5b7b37c666c9f55fa04a2ae5e4bb397b18b68fd970878004d77d9302
|
||||
|
|
Loading…
Reference in New Issue