rpms/iproute
3
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Add Makefile patches to install devlink manpages

Browse source 
Signed-off-by: Phil Sutter <psutter@redhat.com>
This commit is contained in:
Ido Schimmel 2016-11-25 18:19:40 +02:00 • committed by Phil Sutter
commit 294ff72abc
3 changed files with 69 additions and 1 deletions
Download patch file Download diff file Expand all files Collapse all files

28
0001-man-Add-devlink-man-pages-to-Makefile.patch Normal file
View file

@ -0,0 +1,28 @@
From e3da7a45bad1672328d67f016627e026cb41feba Mon Sep 17 00:00:00 2001
From: Ido Schimmel <idosch@mellanox.com>
Date: Wed, 13 Jul 2016 09:53:53 +0300
Subject: [PATCH 1/2] man: Add devlink man pages to Makefile
Signed-off-by: Jiri Pirko <jiri@mellanox.com>
Signed-off-by: Ido Schimmel <idosch@mellanox.com>
---
man/man8/Makefile | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
diff --git a/man/man8/Makefile b/man/man8/Makefile
index 929826e..9badbed 100644
--- a/man/man8/Makefile
+++ b/man/man8/Makefile
@@ -16,7 +16,8 @@ MAN8PAGES = $(TARGETS) ip.8 arpd.8 lnstat.8 routel.8 rtacct.8 rtmon.8 rtpr.8 ss.
tc-basic.8 tc-cgroup.8 tc-flow.8 tc-flower.8 tc-fw.8 tc-route.8 \
tc-tcindex.8 tc-u32.8 \
tc-connmark.8 tc-csum.8 tc-mirred.8 tc-nat.8 tc-pedit.8 tc-police.8 \
- tc-simple.8 tc-skbedit.8 tc-vlan.8 tc-xt.8
+ tc-simple.8 tc-skbedit.8 tc-vlan.8 tc-xt.8 \
+ devlink.8 devlink-dev.8 devlink-monitor.8 devlink-port.8 devlink-sb.8
all: $(TARGETS)
--
2.9.3

26
0002-man-Point-to-devlink-sb-from-devlink-man-page.patch Normal file
View file

@ -0,0 +1,26 @@
From 78c610e6ea8554e87e2204f540cf0ce61ef52695 Mon Sep 17 00:00:00 2001
From: Ido Schimmel <idosch@mellanox.com>
Date: Wed, 13 Jul 2016 09:53:54 +0300
Subject: [PATCH 2/2] man: Point to 'devlink-sb' from 'devlink' man page
Signed-off-by: Jiri Pirko <jiri@mellanox.com>
Signed-off-by: Ido Schimmel <idosch@mellanox.com>
---
man/man8/devlink.8 | 1 +
1 file changed, 1 insertion(+)
diff --git a/man/man8/devlink.8 b/man/man8/devlink.8
index df00f4f..cf0563b 100644
--- a/man/man8/devlink.8
+++ b/man/man8/devlink.8
@@ -76,6 +76,7 @@ Exit status is 0 if command was successful or a positive integer upon failure.
.BR devlink-dev (8),
.BR devlink-port (8),
.BR devlink-monitor (8),
+.BR devlink-sb (8),
.br
.SH REPORTING BUGS
--
2.9.3

16
iproute.spec
View file

@ -2,7 +2,7 @@
Summary: Advanced IP routing and network device configuration tools
Name: iproute
Version: 4.6.0
Release: 2%{?dist}
Release: 3%{?dist}
Group: Applications/System
URL: http://kernel.org/pub/linux/utils/net/%{name}2/
Source0: http://kernel.org/pub/linux/utils/net/%{name}2/%{name}2-%{version}.tar.xz
@ -26,6 +26,15 @@ Patch2: devlink-kernel-headers.patch
Patch3: 0001-devlink-implement-shared-buffer-support.patch
Patch4: 0002-devlink-implement-shared-buffer-occupancy-control.patch
# devlink manpages installation
#
# Accepted by upstream
#
# https://patchwork.ozlabs.org/patch/647766/
# https://patchwork.ozlabs.org/patch/647764/
Patch5: 0001-man-Add-devlink-man-pages-to-Makefile.patch
Patch6: 0002-man-Point-to-devlink-sb-from-devlink-man-page.patch
License: GPLv2+ and Public Domain
BuildRequires: bison
BuildRequires: elfutils-libelf-devel
@ -91,6 +100,8 @@ The libnetlink static library.
%patch2 -p1
%patch3 -p1
%patch4 -p1
%patch5 -p1
%patch6 -p1
%build
export CFLAGS="%{optflags}"
@ -174,6 +185,9 @@ rm -rf '%{buildroot}%{_docdir}'
%{_includedir}/libnetlink.h
%changelog
* Fri Nov 25 2016 Ido Schimmel <idosch@mellanox.com> - 4.6.0-3
- Add Makefile patches to install devlink manpages
* Fri Nov 25 2016 Ido Schimmel <idosch@mellanox.com> - 4.6.0-2
- Add devlink shared buffer patches