summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorKévin THIERRY <kevin.thierry@open.eurogiciel.org>2014-11-03 17:06:11 +0100
committerKévin THIERRY <kevin.thierry@open.eurogiciel.org>2014-11-03 17:06:55 +0100
commita2ef79f3f784c3c04f94bbccb1e8bfb015c6b571 (patch)
tree06f745de0448e5059dd0ab348da1f168f6c87f32
parent3e286bddbca41c780daa58019edfc47a83d4582b (diff)
downloadkmod-tizen_3.0.2014.q4_common.tar.gz
kmod-tizen_3.0.2014.q4_common.tar.bz2
kmod-tizen_3.0.2014.q4_common.zip
Use upstream git repo instead of pristin-tar. Bug-Tizen: TC-1921 Change-Id: Iddf85dfdbbaf09e6be5dac11e73d492a8cb23b35 Signed-off-by: Kévin THIERRY <kevin.thierry@open.eurogiciel.org>
-rw-r--r--.gbs.conf3
-rw-r--r--packaging/kmod.spec19
2 files changed, 12 insertions, 10 deletions
diff --git a/.gbs.conf b/.gbs.conf
new file mode 100644
index 0000000..2877865
--- /dev/null
+++ b/.gbs.conf
@@ -0,0 +1,3 @@
+[general]
+upstream_branch = upstream/master
+upstream_tag = v${upstreamversion}
diff --git a/packaging/kmod.spec b/packaging/kmod.spec
index b3c4de8..0e78cb4 100644
--- a/packaging/kmod.spec
+++ b/packaging/kmod.spec
@@ -1,12 +1,13 @@
Name: kmod
-Version: 15
+Version: 18
Release: 0
License: LGPL-2.1+ and GPL-2.0+
Summary: Utilities to load modules into the kernel
Url: http://www.politreco.com/2011/12/announce-kmod-2/
Group: Base/Libraries
Source: %{name}-%{version}.tar.xz
-Source1001: kmod.manifest
+#X-Vcs-Url: git://git.kernel.org/pub/scm/utils/kernel/kmod/kmod.git
+Source1001: kmod.manifest
BuildRequires: autoconf
BuildRequires: automake
BuildRequires: libtool
@@ -29,7 +30,7 @@ License: GPL-2.0+
Summary: Compat symlinks for kernel module utilities
Group: Base/Libraries
Requires: kmod
-Requires(pre): filesystem
+Requires(pre): filesystem
Provides: module-init-tools
%description compat
@@ -66,7 +67,7 @@ in libkmod.
cp %{SOURCE1001} .
%build
-autoreconf -fi
+%autogen
# The extra --includedir gives us the possibility to detect dependent
# packages which fail to properly use pkgconfig.
%configure \
@@ -76,19 +77,19 @@ autoreconf -fi
--includedir=%{_includedir}/%{name}-%{version} \
--with-rootlibdir=%{_libdir} \
--bindir=%{_bindir}
-make %{?_smp_mflags}
+%__make %{?_smp_mflags}
%check
-make check
+%__make check
%install
%make_install
# kmod-compat
mkdir -p %{buildroot}/%{_sbindir}
-ln -s %{_bindir}/kmod %{buildroot}/%{_bindir}/lsmod
+ln -sf %{_bindir}/kmod %{buildroot}/%{_bindir}/lsmod
for i in depmod insmod lsmod modinfo modprobe rmmod; do
- ln -s %{_bindir}/kmod %{buildroot}/%{_sbindir}/$i
+ ln -sf %{_bindir}/kmod %{buildroot}/%{_sbindir}/$i
done;
@@ -128,5 +129,3 @@ done;
%{_sbindir}/modinfo
%{_sbindir}/modprobe
%{_sbindir}/rmmod
-
-%changelog