Compare commits

...

No commits in common. "c8" and "c9-beta" have entirely different histories.
c8 ... c9-beta

5 changed files with 95 additions and 45 deletions

3
.gitignore vendored
View File

@ -1 +1,2 @@
SOURCES/userspace-rcu-0.10.1.tar.bz2
SOURCES/gpgkey-2A0B4ED915F2D3FA45F5B16217280A9781186ACF.gpg
SOURCES/userspace-rcu-0.12.1.tar.bz2

View File

@ -1 +1,2 @@
32755b4e99306fca50ededf2e4b8ef987813696c SOURCES/userspace-rcu-0.10.1.tar.bz2
1acbfbacb54a005445f835a0c09bc28c71849b64 SOURCES/gpgkey-2A0B4ED915F2D3FA45F5B16217280A9781186ACF.gpg
93ad363e3889e55fac7d35d406927e5925e40dd9 SOURCES/userspace-rcu-0.12.1.tar.bz2

View File

@ -1,26 +1,12 @@
Remove the benchmarks from the regtest target, they timeout on the buildds.
--- a/tests/benchmark/Makefile.am
+++ b/tests/benchmark/Makefile.am
@@ -229,13 +229,10 @@
done; \
fi
-.PHONY: short_bench long_bench regtest
+.PHONY: short_bench long_bench
short_bench:
./run.sh short_bench_tests
long_bench:
./run.sh long_bench_tests
-
-regtest:
- ./run.sh regression_tests
--- a/tests/Makefile.am
+++ b/tests/Makefile.am
@@ -8,4 +8,3 @@
--- a/tests/Makefile.am.orig 2019-06-03 15:46:16.380163423 -0400
+++ b/tests/Makefile.am 2019-06-03 15:46:26.099004417 -0400
@@ -8,7 +8,6 @@
cd benchmark && $(MAKE) $(AM_MAKEFLAGS) long_bench
regtest:
cd regression && $(MAKE) $(AM_MAKEFLAGS) regtest
- cd benchmark && $(MAKE) $(AM_MAKEFLAGS) regtest
check-loop:
while [ 0 ]; do \

View File

@ -0,0 +1,11 @@
-----BEGIN PGP SIGNATURE-----
iQEzBAABCAAdFiEEKgtO2RXy0/pF9bFiFygKl4EYas8FAl6gQH4ACgkQFygKl4EY
as8h/AgAkN5SYABEXrJlwr/KVhGMRYdz6aTJXhnD+WUeLEEf7/2C2kumO5xCkiU5
hM/UVpD1I/tDDHBopz8C/sU3pvnyY/OLDkWq9KlxcHWyQvCr9rrlYNhpndL495vS
OwiY5GXrMnsthTNGuxsg+ViZ3o8gu4buWBeji7yO6OBsMI6YJp4xQNfIZl6lGMcY
k4LB9rP2OnK39+1JGuXkRouFLKIIY8LxJzF1SAeG281xYkgEr8ffrAIfiebZ1Wra
H3C4Fn5LolD9gE2UqVyEFDMaunNgJrFQvWOLmyFg/S31WWE93mKQBXEBMagNf1ZR
QlBu66HFSswrHYnJEdCevrAAP3fs3Q==
=yzRV
-----END PGP SIGNATURE-----

View File

@ -1,13 +1,16 @@
Name: userspace-rcu
Version: 0.10.1
Release: 4%{?dist}
Version: 0.12.1
Release: 6%{?dist}
Summary: RCU (read-copy-update) implementation in user-space
Group: System Environment/Libraries
License: LGPLv2+
URL: http://liburcu.org
Source0: http://lttng.org/files/urcu/%{name}-%{version}.tar.bz2
Source1: http://lttng.org/files/urcu/%{name}-%{version}.tar.bz2.asc
# gpg2 --export --export-options export-minimal 2A0B4ED915F2D3FA45F5B16217280A9781186ACF > gpgkey-2A0B4ED915F2D3FA45F5B16217280A9781186ACF.gpg
Source2: gpgkey-2A0B4ED915F2D3FA45F5B16217280A9781186ACF.gpg
Patch0: regtest-without-bench.patch
BuildRequires: make
BuildRequires: pkgconfig
BuildRequires: perl-Test-Harness
BuildRequires: autoconf automake libtool
@ -22,17 +25,15 @@ reclamation is possible.
%package devel
Summary: Development files for %{name}
Group: Development/Libraries
Requires: %{name}%{?_isa} = %{version}-%{release}
%description devel
The %{name}-devel package contains libraries and header files for
developing applications that use %{name}.
This package contains libraries and header files for developing applications
that use %{name}
%prep
%setup -q
%patch0 -p1
%autosetup -p1
%build
# Reinitialize libtool with the fedora version to remove Rpath
@ -44,27 +45,41 @@ V=1 make %{?_smp_mflags}
%install
make install DESTDIR=$RPM_BUILD_ROOT
rm -vf $RPM_BUILD_ROOT%{_libdir}/*.la
find %{buildroot} -type f -name "*.la" -delete
rm %{buildroot}/%{_docdir}/%{name}/LICENSE
# Replace arch-dependent header file with arch-independent stub (when needed).
%multilib_fix_c_header --file %{_includedir}/urcu/config.h
%check
make check
make regtest
%post -p /sbin/ldconfig
%postun -p /sbin/ldconfig
%ldconfig_scriptlets
%files
%doc ChangeLog LICENSE README.md gpl-2.0.txt lgpl-relicensing.txt lgpl-2.1.txt
%{_libdir}/*.so.*
%license LICENSE gpl-2.0.txt lgpl-relicensing.txt lgpl-2.1.txt
%doc ChangeLog README.md
%{_libdir}/liburcu-bp.so.6*
%{_libdir}/liburcu-cds.so.6*
%{_libdir}/liburcu-common.so.6*
%{_libdir}/liburcu-mb.so.6*
%{_libdir}/liburcu-memb.so.6*
%{_libdir}/liburcu-qsbr.so.6*
%{_libdir}/liburcu-signal.so.6*
%{_libdir}/liburcu.so.6*
%files devel
%doc %{_pkgdocdir}/examples
%{_includedir}/*
%{_libdir}/*.so
%{_libdir}/liburcu-bp.so
%{_libdir}/liburcu-cds.so
%{_libdir}/liburcu-common.so
%{_libdir}/liburcu-mb.so
%{_libdir}/liburcu-memb.so
%{_libdir}/liburcu-qsbr.so
%{_libdir}/liburcu-signal.so
%{_libdir}/liburcu.so
%{_libdir}/pkgconfig/liburcu*.pc
%{_docdir}/%{name}/cds-api.md
%{_docdir}/%{name}/rcu-api.md
@ -73,15 +88,51 @@ make regtest
%changelog
* Wed Feb 10 2021 Benjamin Marzinski <bmarzins@redhat.com> - 0.10.1-4
- Fix CI test package requirements
- Resolves: bz #1682555
* Tue Aug 10 2021 Mohan Boddu <mboddu@redhat.com> - 0.12.1-6
- Rebuilt for IMA sigs, glibc 2.34, aarch64 flags
Related: rhbz#1991688
* Fri Oct 04 2019 Benjamin Marzinski <bmarzins@redhat.com> - 0.10.1-3
* Mon Apr 19 2021 Benjamin Marzinski <bmarzins@redhat.com> - 0.12.1-5
- Replace arch-dependent /usr/include/urcu/config.h with arch-independent
stub when needed. (bz #1853168)
- Added CI gating tests (bz #1682555)
- Resolves: bz #1682555, #1853168
stub when needed. (bz# 1951223)
- Added CI gating tests
- Resolves: bz #1951223
* Fri Apr 16 2021 Mohan Boddu <mboddu@redhat.com> - 0.12.1-4
- Rebuilt for RHEL 9 BETA on Apr 15th 2021. Related: rhbz#1947937
* Wed Jan 27 2021 Fedora Release Engineering <releng@fedoraproject.org> - 0.12.1-3
- Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild
* Wed Jul 29 2020 Fedora Release Engineering <releng@fedoraproject.org> - 0.12.1-2
- Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild
* Tue Apr 22 2020 Michael Jeanson <mjeanson@efficios.com> - 0.12.1-1
- New upstream release
* Tue Apr 14 2020 Michael Jeanson <mjeanson@efficios.com> - 0.12.0-1
- New upstream release
* Fri Jan 31 2020 Fedora Release Engineering <releng@fedoraproject.org> - 0.11.1-3
- Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild
* Sat Jul 27 2019 Fedora Release Engineering <releng@fedoraproject.org> - 0.11.1-2
- Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild
* Mon Jun 03 2019 Michael Jeanson <mjeanson@efficios.com> - 0.11.1-1
- New upstream release
* Fri May 03 2019 Michael Jeanson <mjeanson@efficios.com> - 0.10.2-1
- New upstream release
* Sun Feb 03 2019 Fedora Release Engineering <releng@fedoraproject.org> - 0.10.1-5
- Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild
* Sat Jul 14 2018 Fedora Release Engineering <releng@fedoraproject.org> - 0.10.1-4
- Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild
* Thu May 10 2018 Peter Robinson <pbrobinson@fedoraproject.org> 0.10.1-3
- Use %%license, spec cleanups
* Fri Feb 09 2018 Fedora Release Engineering <releng@fedoraproject.org> - 0.10.1-2
- Rebuilt for https://fedoraproject.org/wiki/Fedora_28_Mass_Rebuild