From dd4fd3e167e456af75562376e9272d2290695d49 Mon Sep 17 00:00:00 2001 From: Jonathan Dieter Date: Sat, 17 Jan 2015 11:59:28 +0200 Subject: [PATCH 1/3] Switch to 3.17 branch for F21 and F20 Signed-off-by: Jonathan Dieter --- .gitignore | 1 + sources | 2 +- usbip.spec | 7 +++---- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/.gitignore b/.gitignore index 4266f0a..f2d4c1e 100644 --- a/.gitignore +++ b/.gitignore @@ -1 +1,2 @@ /usbip-3.18.tar.xz +/usbip-3.17.tar.xz diff --git a/sources b/sources index d23ebad..ec02228 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -e90a3347a759ab9ba0000bd358012974 usbip-3.18.tar.xz +505edf0251e36244f619c8008dd42a2c usbip-3.17.tar.xz diff --git a/usbip.spec b/usbip.spec index bfe274c..29b7e66 100644 --- a/usbip.spec +++ b/usbip.spec @@ -4,7 +4,7 @@ Name: usbip License: GPLv2+ Summary: USB/IP user-space Group: System Environment/Daemons -Version: 3.18 +Version: 3.17 Release: 3%{?dist} #Source: https://www.kernel.org/pub/linux/kernel/v3.x/linux-%%{version}.tar.xz # In the interests of keeping the source rpm from being ridiculously large, @@ -86,10 +86,10 @@ install -pm 644 %{SOURCE2} %{buildroot}%{_unitdir} %{_libdir}/*.so %changelog -* Thu Jan 15 2015 - Jonathan Dieter - 3.18-3 +* Thu Jan 15 2015 - Jonathan Dieter - 3.17-3 - Improve description -* Wed Jan 14 2015 - Jonathan Dieter - 3.18-2 +* Wed Jan 14 2015 - Jonathan Dieter - 3.17-2 - Remove clean section - Remove defattr in files list - Use license macro for COPYING @@ -98,7 +98,6 @@ install -pm 644 %{SOURCE2} %{buildroot}%{_unitdir} - Remove /etc/default config file - Stop rmmoding when services stop - Remove unneeded After=syslog.target in services -- Update to 3.18 - Replace /usr/share with datadir macro in configure - Switch to make_install macro - When manually using install, preserve timestamps From 1773439f29a5ffd30d7ec346d894426f5f0702d3 Mon Sep 17 00:00:00 2001 From: Jonathan Dieter Date: Mon, 2 Feb 2015 20:56:46 +0200 Subject: [PATCH 2/3] F20 kernel-modules-extra doesn't provide module virtual provides --- usbip.spec | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/usbip.spec b/usbip.spec index 29b7e66..ae22869 100644 --- a/usbip.spec +++ b/usbip.spec @@ -5,7 +5,7 @@ License: GPLv2+ Summary: USB/IP user-space Group: System Environment/Daemons Version: 3.17 -Release: 3%{?dist} +Release: 3%{?dist}.1 #Source: https://www.kernel.org/pub/linux/kernel/v3.x/linux-%%{version}.tar.xz # In the interests of keeping the source rpm from being ridiculously large, # download the Linux kernel from above and run `extract_usbip.sh ` @@ -15,9 +15,7 @@ Source: usbip-%{version}.tar.xz Source1: usbip-server.service Source2: usbip-client.service Source99: extract_usbip.sh -Requires: kmod(usbip-core.ko) -Requires: kmod(usbip-host.ko) -Requires: kmod(vhci-hcd.ko) +Requires: kernel-modules-extra Requires: hwdata Requires(post): systemd Requires(preun): systemd @@ -86,6 +84,10 @@ install -pm 644 %{SOURCE2} %{buildroot}%{_unitdir} %{_libdir}/*.so %changelog +* Mon Feb 2 2015 - Jonathan Dieter - 3.17-3.1 +- Change requires for F20 because kernel-modules-extra doesn't provide + individual modules + * Thu Jan 15 2015 - Jonathan Dieter - 3.17-3 - Improve description From 298c22de3dcdaf3d531a980f58230c7b05ff56c1 Mon Sep 17 00:00:00 2001 From: Jonathan Dieter Date: Thu, 5 Feb 2015 20:43:19 +0200 Subject: [PATCH 3/3] Fix datadir and client service type Signed-off-by: Jonathan Dieter --- usbip-client.service | 2 +- usbip.spec | 8 ++++++-- 2 files changed, 7 insertions(+), 3 deletions(-) diff --git a/usbip-client.service b/usbip-client.service index 2562e7b..b10b74b 100644 --- a/usbip-client.service +++ b/usbip-client.service @@ -2,7 +2,7 @@ Description=USB/IP client modules [Service] -Type=OneShot +Type=oneshot RemainAfterExit=true ExecStart=/sbin/modprobe -qab vhci-hcd diff --git a/usbip.spec b/usbip.spec index ae22869..37c3645 100644 --- a/usbip.spec +++ b/usbip.spec @@ -5,7 +5,7 @@ License: GPLv2+ Summary: USB/IP user-space Group: System Environment/Daemons Version: 3.17 -Release: 3%{?dist}.1 +Release: 4%{?dist} #Source: https://www.kernel.org/pub/linux/kernel/v3.x/linux-%%{version}.tar.xz # In the interests of keeping the source rpm from being ridiculously large, # download the Linux kernel from above and run `extract_usbip.sh ` @@ -49,7 +49,7 @@ development %build ./autogen.sh -%configure --disable-static --with-usbids-dir=%{_datadir}hwdata +%configure --disable-static --with-usbids-dir=%{_datadir}/hwdata make %{?_smp_mflags} %install @@ -84,6 +84,10 @@ install -pm 644 %{SOURCE2} %{buildroot}%{_unitdir} %{_libdir}/*.so %changelog +* Thu Feb 5 2015 - Jonathan Dieter - 3.17-4 +- Fix datadir (#1189855) +- Fix client service type + * Mon Feb 2 2015 - Jonathan Dieter - 3.17-3.1 - Change requires for F20 because kernel-modules-extra doesn't provide individual modules