summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--meta-oe/recipes-support/sdparm/files/make-sysroot-work.patch14
-rw-r--r--meta-oe/recipes-support/sdparm/sdparm_1.10.bb (renamed from meta-oe/recipes-support/sdparm/sdparm_1.09.bb)4
2 files changed, 11 insertions, 7 deletions
diff --git a/meta-oe/recipes-support/sdparm/files/make-sysroot-work.patch b/meta-oe/recipes-support/sdparm/files/make-sysroot-work.patch
index 5405ed802e..3fd85d9e25 100644
--- a/meta-oe/recipes-support/sdparm/files/make-sysroot-work.patch
+++ b/meta-oe/recipes-support/sdparm/files/make-sysroot-work.patch
@@ -1,27 +1,31 @@
1[PATCH] make sysroot work 1From 15f0722bc5481cca5ba92adceab8c769112e4ea6 Mon Sep 17 00:00:00 2001
2From: Dengke Du <dengke.du@windriver.com>
3Date: Mon, 24 Oct 2016 07:28:13 +0000
4Subject: [PATCH] sdparm: make sysroot work
2 5
3Upstream-Status: Pending 6Upstream-Status: Pending
4 7
5Add = before the included dir to make sysroot work 8Add = before the included dir to make sysroot work
6 9
7Signed-off-by: Roy.Li <rongqing.li@windriver.com> 10Signed-off-by: Roy.Li <rongqing.li@windriver.com>
11Signed-off-by: Dengke Du <dengke.du@windriver.com>
8--- 12---
9 src/Makefile.am | 2 +- 13 src/Makefile.am | 2 +-
10 1 file changed, 1 insertion(+), 1 deletion(-) 14 1 file changed, 1 insertion(+), 1 deletion(-)
11 15
12diff --git a/src/Makefile.am b/src/Makefile.am 16diff --git a/src/Makefile.am b/src/Makefile.am
13index c83788c..9f62115 100644 17index 61dd9f8..42c911f 100644
14--- a/src/Makefile.am 18--- a/src/Makefile.am
15+++ b/src/Makefile.am 19+++ b/src/Makefile.am
16@@ -32,7 +32,7 @@ sglib_SOURCES = ../lib/sg_lib.c \ 20@@ -41,7 +41,7 @@ sglib_SOURCES = ../lib/sg_lib.c \
17 ../lib/sg_pt_common.c 21 ../lib/sg_pt_common.c
18 22
19 if HAVE_SGUTILS 23 if HAVE_SGUTILS
20-INCLUDES = -I/usr/include/scsi 24-INCLUDES = -I/scsi
21+INCLUDES = -I=@includedir@/scsi 25+INCLUDES = -I=@includedir@/scsi
22 sdparm_LDADD = @GETOPT_O_FILES@ @os_libs@ @SGUTILS_LIBS@ 26 sdparm_LDADD = @GETOPT_O_FILES@ @os_libs@ @SGUTILS_LIBS@
23 sdparm_DEPENDENCIES = @GETOPT_O_FILES@ 27 sdparm_DEPENDENCIES = @GETOPT_O_FILES@
24 else 28 else
25-- 29--
261.9.1 302.7.4
27 31
diff --git a/meta-oe/recipes-support/sdparm/sdparm_1.09.bb b/meta-oe/recipes-support/sdparm/sdparm_1.10.bb
index ca11ca4ec6..8ab2819d3a 100644
--- a/meta-oe/recipes-support/sdparm/sdparm_1.09.bb
+++ b/meta-oe/recipes-support/sdparm/sdparm_1.10.bb
@@ -14,8 +14,8 @@ SRC_URI = "http://sg.danny.cz/sg/p/${BPN}-${PV}.tgz \
14PACKAGES =+ "${PN}-scripts" 14PACKAGES =+ "${PN}-scripts"
15RDEPENDS_${PN}-scripts += "bash ${PN}" 15RDEPENDS_${PN}-scripts += "bash ${PN}"
16 16
17SRC_URI[md5sum] = "e51b1fd41c3e4c9d1274a2e4f046eebf" 17SRC_URI[md5sum] = "bdae64375376ce8fe4bf9521c1db858f"
18SRC_URI[sha256sum] = "7294f44173ac0946f1de8af02b1bdb0bd648079245396589397a2b0d3abc42d3" 18SRC_URI[sha256sum] = "1ea1ed1bb1ee2aef62392618fa42da9ed027d5e655f174525c39235778292ab3"
19 19
20inherit autotools 20inherit autotools
21 21