summaryrefslogtreecommitdiffstats
path: root/meta/recipes-core/sysfsutils
diff options
context:
space:
mode:
authorRichard Purdie <richard.purdie@linuxfoundation.org>2013-03-18 02:13:07 (GMT)
committerRichard Purdie <richard.purdie@linuxfoundation.org>2013-03-18 13:18:24 (GMT)
commitb345b7cdb30e5d93ca332189fee4b7b390db59b0 (patch)
tree14f6d5368af688a205178c6f0a4c7404906f243f /meta/recipes-core/sysfsutils
parent265320d5d05ac87299ec2052fcbeac7092b6b826 (diff)
downloadpoky-b345b7cdb30e5d93ca332189fee4b7b390db59b0.tar.gz
sysfsutils: Fix case where ${B} != ${S}
Patch the makefiles to allow out of tree builds to work. (From OE-Core rev: 05ba73cb721481db319bc9f528fe7085d5684303) Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/recipes-core/sysfsutils')
-rw-r--r--meta/recipes-core/sysfsutils/sysfsutils-2.1.0/separatebuild.patch65
-rw-r--r--meta/recipes-core/sysfsutils/sysfsutils_2.1.0.bb6
2 files changed, 68 insertions, 3 deletions
diff --git a/meta/recipes-core/sysfsutils/sysfsutils-2.1.0/separatebuild.patch b/meta/recipes-core/sysfsutils/sysfsutils-2.1.0/separatebuild.patch
new file mode 100644
index 0000000..82e725e
--- /dev/null
+++ b/meta/recipes-core/sysfsutils/sysfsutils-2.1.0/separatebuild.patch
@@ -0,0 +1,65 @@
1Upstream-Status: Pending
2
3Fix out of tree build issues so ${B} != ${S} works.
4
5RP 2013/03/18
6
7Index: sysfsutils-2.1.0/cmd/Makefile.am
8===================================================================
9--- sysfsutils-2.1.0.orig/cmd/Makefile.am 2013-03-08 08:57:27.224556508 +0000
10+++ sysfsutils-2.1.0/cmd/Makefile.am 2013-03-08 08:57:27.480556502 +0000
11@@ -1,6 +1,6 @@
12 bin_PROGRAMS = systool
13 systool_SOURCES = systool.c names.c names.h
14-INCLUDES = -I../include
15+INCLUDES = -I$(srcdir)/../include
16 LDADD = ../lib/libsysfs.la
17 EXTRA_CFLAGS = @EXTRA_CFLAGS@
18 AM_CFLAGS = -Wall -W -Wstrict-prototypes $(EXTRA_CFLAGS)
19Index: sysfsutils-2.1.0/lib/Makefile.am
20===================================================================
21--- sysfsutils-2.1.0.orig/lib/Makefile.am 2013-03-08 08:57:27.224556508 +0000
22+++ sysfsutils-2.1.0/lib/Makefile.am 2013-03-08 08:57:27.480556502 +0000
23@@ -1,7 +1,7 @@
24 lib_LTLIBRARIES = libsysfs.la
25 libsysfs_la_SOURCES = sysfs_utils.c sysfs_attr.c sysfs_class.c dlist.c \
26 sysfs_device.c sysfs_driver.c sysfs_bus.c sysfs_module.c sysfs.h
27-INCLUDES = -I../include
28+INCLUDES = -I$(srcdir)/../include
29 libsysfs_la_LDFLAGS = -version-info 2:1:0
30 EXTRA_CFLAGS = @EXTRA_CLFAGS@
31 libsysfs_la_CFLAGS = -Wall -W -Wstrict-prototypes $(EXTRA_CLFAGS)
32Index: sysfsutils-2.1.0/test/Makefile.am
33===================================================================
34--- sysfsutils-2.1.0.orig/test/Makefile.am 2013-03-08 08:57:27.224556508 +0000
35+++ sysfsutils-2.1.0/test/Makefile.am 2013-03-08 09:06:48.196543326 +0000
36@@ -2,14 +2,14 @@
37 BUILT_SOURCES = test.h
38 CLEANFILES = test.h
39 test.h:
40- ./create-test
41+ $(srcdir)/create-test $(srcdir)/libsysfs.conf
42 get_device_SOURCES = get_device.c
43 get_driver_SOURCES = get_driver.c
44 get_module_SOURCES = get_module.c
45 testlibsysfs_SOURCES = test.c test_attr.c test_bus.c test_class.c \
46 test_device.c test_driver.c test_module.c test_utils.c \
47 testout.c test-defs.h libsysfs.conf create-test
48-INCLUDES = -I../include
49+INCLUDES = -I$(srcdir)/../include
50 LDADD = ../lib/libsysfs.la
51 EXTRA_CFLAGS = @EXTRA_CLFAGS@
52 AM_CFLAGS = -Wall -W -Wstrict-prototypes $(EXTRA_CLFAGS)
53Index: sysfsutils-2.1.0/test/create-test
54===================================================================
55--- sysfsutils-2.1.0.orig/test/create-test 2005-11-28 10:22:10.000000000 +0000
56+++ sysfsutils-2.1.0/test/create-test 2013-03-08 09:07:03.372542838 +0000
57@@ -2,7 +2,7 @@
58
59 rm -f test.h
60
61-conf_file=./libsysfs.conf
62+conf_file=$1
63
64 . $conf_file
65
diff --git a/meta/recipes-core/sysfsutils/sysfsutils_2.1.0.bb b/meta/recipes-core/sysfsutils/sysfsutils_2.1.0.bb
index 5b51daf..d7b461e 100644
--- a/meta/recipes-core/sysfsutils/sysfsutils_2.1.0.bb
+++ b/meta/recipes-core/sysfsutils/sysfsutils_2.1.0.bb
@@ -11,9 +11,9 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=3d06403ea54c7574a9e581c6478cc393 \
11PR = "r5" 11PR = "r5"
12 12
13SRC_URI = "${SOURCEFORGE_MIRROR}/linux-diag/sysfsutils-${PV}.tar.gz \ 13SRC_URI = "${SOURCEFORGE_MIRROR}/linux-diag/sysfsutils-${PV}.tar.gz \
14 file://sysfsutils-2.0.0-class-dup.patch \ 14 file://sysfsutils-2.0.0-class-dup.patch \
15 file://obsolete_automake_macros.patch \ 15 file://obsolete_automake_macros.patch \
16 " 16 file://separatebuild.patch"
17 17
18SRC_URI[md5sum] = "14e7dcd0436d2f49aa403f67e1ef7ddc" 18SRC_URI[md5sum] = "14e7dcd0436d2f49aa403f67e1ef7ddc"
19SRC_URI[sha256sum] = "e865de2c1f559fff0d3fc936e660c0efaf7afe662064f2fb97ccad1ec28d208a" 19SRC_URI[sha256sum] = "e865de2c1f559fff0d3fc936e660c0efaf7afe662064f2fb97ccad1ec28d208a"