-
Notifications
You must be signed in to change notification settings - Fork 5
Expand file tree
/
Copy pathhardware-detection.patch
More file actions
58 lines (53 loc) · 1.68 KB
/
hardware-detection.patch
File metadata and controls
58 lines (53 loc) · 1.68 KB
1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
diff --git a/conf/Makefile.am b/conf/Makefile.am
index 18ebdc2..e69de29 100644
--- a/conf/Makefile.am
+++ b/conf/Makefile.am
@@ -1,7 +0,0 @@
-#
-# Makefile.am for core/agent-probe/conf
-#
-
-scrconf_DATA = probe.scr
-
-EXTRA_DIST = $(scrconf_DATA)
diff --git a/doc/autodocs/Makefile.am b/doc/autodocs/Makefile.am
index 842d408..7c81520 100644
--- a/doc/autodocs/Makefile.am
+++ b/doc/autodocs/Makefile.am
@@ -1,3 +1,4 @@
# Makefile.am for .../agent-hardware-detection/doc/autodocs
+AUTODOCS_CC=$(srcdir)/../../agent
include $(top_srcdir)/autodocs-cc.ami
diff --git a/testsuite/Makefile.am b/testsuite/Makefile.am
index a710e62..20ad188 100644
--- a/testsuite/Makefile.am
+++ b/testsuite/Makefile.am
@@ -17,5 +17,5 @@ runag_hwprobe_SOURCES = runag_hwprobe.cc
runag_hwprobe_LDADD = ${AGENT_LIBADD}
runag_hwprobe_LDFLAGS = \
-Xlinker --whole-archive \
- ../src/libpy2ag_hwprobe.la \
+ ../agent/libpy2ag_hwprobe.la \
-Xlinker --no-whole-archive
diff --git a/testsuite/runag_hwprobe.cc b/testsuite/runag_hwprobe.cc
index 08f8d0d..59d2218 100644
--- a/testsuite/runag_hwprobe.cc
+++ b/testsuite/runag_hwprobe.cc
@@ -7,7 +7,7 @@
#include <scr/run_agent.h>
-#include "../src/HwProbe.h"
+#include "../agent/HwProbe.h"
int
diff --git a/yast2-hardware-detection.spec.in b/yast2-hardware-detection.spec.in
index 837725c..ce0038f 100644
--- a/yast2-hardware-detection.spec.in
+++ b/yast2-hardware-detection.spec.in
@@ -18,6 +18,8 @@ BuildRequires: yast2-core-devel
BuildRequires: hwinfo-devel
# we check for hwinfo
BuildRequires: pkg-config
+Requires: yast2-ruby-bindings >= 1.0.0
+
Summary: YaST2 - Hardware Detection Interface
# hwinfo-13.38: hw_fingerprint
Requires: hwinfo >= 13.38