update to 0.17.9
(cherry picked from commit bfa0e03bc423f815d9c27b972b8ba11c4f46c0c3)
This commit is contained in:
parent
db5b84fec4
commit
8772c25cf8
BIN
0.11.3.tar.gz
BIN
0.11.3.tar.gz
Binary file not shown.
BIN
0.17.9.tar.gz
Normal file
BIN
0.17.9.tar.gz
Normal file
Binary file not shown.
@ -1,24 +0,0 @@
|
||||
diff -Nur umockdev-0.11.3/Makefile.am umockdev-0.11.3-new/Makefile.am
|
||||
--- umockdev-0.11.3/Makefile.am 2018-05-01 19:01:00.000000000 +0800
|
||||
+++ umockdev-0.11.3-new/Makefile.am 2021-08-04 11:42:00.000000000 +0800
|
||||
@@ -261,6 +261,8 @@
|
||||
tests_test_ioctl_tree_SOURCES = \
|
||||
src/ioctl_tree.c \
|
||||
tests/test-ioctl-tree.c \
|
||||
+ src/debug.h \
|
||||
+ src/debug.c \
|
||||
$(NULL)
|
||||
|
||||
tests_test_ioctl_tree_CFLAGS = \
|
||||
diff -Nur umockdev-0.11.3/src/debug.h umockdev-0.11.3-new/src/debug.h
|
||||
--- umockdev-0.11.3/src/debug.h 2018-05-01 19:01:00.000000000 +0800
|
||||
+++ umockdev-0.11.3-new/src/debug.h 2021-08-04 11:42:53.000000000 +0800
|
||||
@@ -13,7 +13,7 @@
|
||||
#define DBG_IOCTL (1 << 3)
|
||||
#define DBG_IOCTL_TREE (1 << 4)
|
||||
|
||||
-unsigned debug_categories;
|
||||
+extern unsigned debug_categories;
|
||||
|
||||
void init_debug(void) __attribute__((constructor));
|
||||
|
||||
@ -1,34 +0,0 @@
|
||||
From f1b416400479d861deffb4c5a40422dcdf190e85 Mon Sep 17 00:00:00 2001
|
||||
From: Martin Pitt <martin@piware.de>
|
||||
Date: Fri, 23 Oct 2020 14:58:50 +0200
|
||||
|
||||
Recent glibc deprecated/dropped the `__xstat*()` family from the header
|
||||
files, so the build started to fail on "no previous prototype". However,
|
||||
umockdev still needs needs to keep the wrappers to run programs that got
|
||||
built against an earlier glibc.
|
||||
|
||||
Thus declare the prototype explicitly. It should still fail to build if
|
||||
glibc defines it differently.
|
||||
|
||||
Fixes #108
|
||||
---
|
||||
src/libumockdev-preload.c | 5 ++++-
|
||||
1 file changed, 4 insertions(+), 1 deletion(-)
|
||||
|
||||
diff --git a/src/libumockdev-preload.c b/src/libumockdev-preload.c
|
||||
index 9328dc1..9bbec62 100644
|
||||
--- a/src/libumockdev-preload.c
|
||||
+++ b/src/libumockdev-preload.c
|
||||
@@ -1215,8 +1215,11 @@ int prefix ## stat ## suffix (const char *path, struct stat ## suffix *st) \
|
||||
|
||||
/* wrapper template for __xstat family; note that we abuse the sticky bit in
|
||||
* the emulated /dev to indicate a block device (the sticky bit has no
|
||||
- * real functionality for device nodes) */
|
||||
+ * real functionality for device nodes)
|
||||
+ * This family got deprecated/dropped in glibc 2.32.9000, but we still need
|
||||
+ * to keep it for a while for programs that were built against previous versions */
|
||||
#define WRAP_VERSTAT(prefix, suffix) \
|
||||
+int prefix ## stat ## suffix (int ver, const char *path, struct stat ## suffix *st); \
|
||||
int prefix ## stat ## suffix (int ver, const char *path, struct stat ## suffix *st) \
|
||||
{ \
|
||||
const char *p; \
|
||||
@ -1,16 +1,14 @@
|
||||
Name: umockdev
|
||||
Version: 0.11.3
|
||||
Release: 5
|
||||
Version: 0.17.9
|
||||
Release: 1
|
||||
Summary: Mock hardware devices
|
||||
License: LGPLv2+
|
||||
URL: https://github.com/martinpitt/%{name}
|
||||
Source0: https://github.com/martinpitt/%{name}/archive/%{version}.tar.gz
|
||||
|
||||
Patch0000: fix-glibc-update-error.patch
|
||||
Patch0001: bugfix-of-gcc10.patch
|
||||
|
||||
BuildRequires: autoconf automake libtool gtk-doc gobject-introspection-devel glib2-devel
|
||||
BuildRequires: libgudev1-devel systemd-devel vala chrpath python3 gphoto2
|
||||
BuildRequires: meson libpcap-devel
|
||||
|
||||
%description
|
||||
umockdev mocks Linux devices for creating integration tests for hardware related libraries and programs.
|
||||
@ -28,12 +26,11 @@ The umockdev-devel package contains umockdev development library.
|
||||
%autosetup -n %{name}-%{version} -p1
|
||||
|
||||
%build
|
||||
NOCONFIGURE=1 ./autogen.sh
|
||||
%configure --disable-static --enable-gtk-doc
|
||||
%make_build
|
||||
%meson -Dgtk_doc=true
|
||||
%meson_build
|
||||
|
||||
%install
|
||||
%make_install
|
||||
%meson_install
|
||||
|
||||
%delete_la
|
||||
|
||||
@ -48,9 +45,10 @@ rm -rf $RPM_BUILD_ROOT/%{_datadir}/doc/umockdev
|
||||
|
||||
%files
|
||||
%license COPYING
|
||||
%doc README.rst
|
||||
%doc README.md
|
||||
%{_bindir}/umockdev-*
|
||||
%{_libdir}/*.so.*
|
||||
%{_libdir}/libumockdev.so.*
|
||||
%{_libdir}/libumockdev-preload.so*
|
||||
%{_libdir}/girepository-1.0/UMockdev-1.0.typelib
|
||||
|
||||
%files devel
|
||||
@ -63,6 +61,9 @@ rm -rf $RPM_BUILD_ROOT/%{_datadir}/doc/umockdev
|
||||
%{_datadir}/vala/vapi/umockdev-1.0.vapi
|
||||
|
||||
%changelog
|
||||
* Mon Apr 25 2022 caodongxia <caodongxia@h-partners.com> - 0.17.9-1
|
||||
- update to 0.17.9
|
||||
|
||||
* Wed Aug 4 2021 wutao <tushenmei@huawei.com> - 0.11.3-5
|
||||
- bugfix-of-gcc10.patch
|
||||
|
||||
|
||||
Loading…
x
Reference in New Issue
Block a user