Patchwork [meta-oe] sdparm: add recipe file

login
register
mail settings
Submitter rongqing.li@windriver.com
Date July 10, 2014, 7:07 a.m.
Message ID <1404976077-1809-1-git-send-email-rongqing.li@windriver.com>
Download mbox | patch
Permalink /patch/75297/
State Accepted, archived
Headers show

Comments

rongqing.li@windriver.com - July 10, 2014, 7:07 a.m.
From: Roy Li <rongqing.li@windriver.com>

Signed-off-by: Roy Li <rongqing.li@windriver.com>
---
 .../sdparm/files/make-sysroot-work.patch           |   27 ++++++++++++++++++++
 meta-oe/recipes-support/sdparm/sdparm_1.08.bb      |   17 ++++++++++++
 2 files changed, 44 insertions(+)
 create mode 100644 meta-oe/recipes-support/sdparm/files/make-sysroot-work.patch
 create mode 100644 meta-oe/recipes-support/sdparm/sdparm_1.08.bb
Chris Larson - July 10, 2014, 5:16 p.m.
On Thu, Jul 10, 2014 at 12:07 AM, <rongqing.li@windriver.com> wrote:

> +-INCLUDES = -I/usr/include/scsi
> ++INCLUDES = -I=/usr/include/scsi
>

Also doesn't obey @includedir@, so it'll break on a non-/usr prefix.
rongqing.li@windriver.com - July 11, 2014, 2:46 a.m.
On 07/11/2014 01:16 AM, Christopher Larson wrote:
> On Thu, Jul 10, 2014 at 12:07 AM, <rongqing.li@windriver.com> wrote:
>
>> +-INCLUDES = -I/usr/include/scsi
>> ++INCLUDES = -I=/usr/include/scsi
>>
>
> Also doesn't obey @includedir@, so it'll break on a non-/usr prefix.
>

The original code is written like this, I only make it to accept
sysroot.

How should I change it? like below

INCLUDES = -I=@includedir@/scsi

Patch

diff --git a/meta-oe/recipes-support/sdparm/files/make-sysroot-work.patch b/meta-oe/recipes-support/sdparm/files/make-sysroot-work.patch
new file mode 100644
index 0000000..b87e05c
--- /dev/null
+++ b/meta-oe/recipes-support/sdparm/files/make-sysroot-work.patch
@@ -0,0 +1,27 @@ 
+[PATCH] make sysroot work
+
+Upstream-Status: Pending
+
+Add = before the included dir to make sysroot work
+
+Signed-off-by: Roy.Li <rongqing.li@windriver.com>
+---
+ src/Makefile.am | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/src/Makefile.am b/src/Makefile.am
+index c83788c..9f62115 100644
+--- a/src/Makefile.am
++++ b/src/Makefile.am
+@@ -32,7 +32,7 @@ sglib_SOURCES =		../lib/sg_lib.c \
+ 			../lib/sg_pt_common.c
+ 
+ if HAVE_SGUTILS
+-INCLUDES = -I/usr/include/scsi
++INCLUDES = -I=/usr/include/scsi
+ sdparm_LDADD = @GETOPT_O_FILES@ @os_libs@ @SGUTILS_LIBS@
+ sdparm_DEPENDENCIES = @GETOPT_O_FILES@
+ else
+-- 
+1.9.1
+
diff --git a/meta-oe/recipes-support/sdparm/sdparm_1.08.bb b/meta-oe/recipes-support/sdparm/sdparm_1.08.bb
new file mode 100644
index 0000000..713e451
--- /dev/null
+++ b/meta-oe/recipes-support/sdparm/sdparm_1.08.bb
@@ -0,0 +1,17 @@ 
+SUMMARY = "fetch and change SCSI mode pages"
+DESCRIPTION = "The sdparm utility accesses and optionally modifies \
+SCSI devices' mode page and inquiry data."
+HOMEPAGE = "http://sg.danny.cz/sg/sdparm.html"
+SECTION = "console/utils"
+LICENSE = "BSD"
+LIC_FILES_CHKSUM = "file://COPYING;md5=ecab6c36b7ba82c675581dd0afde36f7 \
+                    file://lib/BSD_LICENSE;md5=1d52f4a66f1e0ed96776bf354ab7a2ed"
+DEPENDS="sg3-utils"
+SRC_URI = "http://sg.danny.cz/sg/p/${BPN}-${PV}.tgz \
+           file://make-sysroot-work.patch \
+           "
+
+SRC_URI[md5sum] = "be5786f37499018ef44f409597c92d42"
+SRC_URI[sha256sum] = "376b78a414b1a9c47f3f13dbeb963e7a3ec7be126f83927d6856b5f7ac425e57"
+
+inherit autotools