Skip to contentSkip to conversation

sdparm: 1.09 -> 1.10

PATCH Superseded Dengke Du 1 participant 2 messages Oct 25, 2016 – Oct 26, 2016

v2 of 3 Superseded Latest is v3 →

lore
Share & tools
lore

Dengke Du

author
#0 lore raw

PATCH v2 1/1 sdparm: 1.09 -> 1.10

Changed in V2:
Add the [meta-oe] prefix in patch.

---
 .../recipes-support/sdparm/files/make-sysroot-work.patch   | 14 +++++++++-----
 .../sdparm/{sdparm_1.09.bb => sdparm_1.10.bb}              |  4 ++--
 2 files changed, 11 insertions(+), 7 deletions(-)
 rename meta-oe/recipes-support/sdparm/{sdparm_1.09.bb => sdparm_1.10.bb} (83%)
meta-oe/recipes-support/sdparm/files/make-sysroot-work.patch +9 -5
index 5405ed8..3fd85d9 100644
@@ -1,27 +1,31 @@
-[PATCH] make sysroot work
+From 15f0722bc5481cca5ba92adceab8c769112e4ea6 Mon Sep 17 00:00:00 2001
+From: Dengke Du <[email protected]>
+Date: Mon, 24 Oct 2016 07:28:13 +0000
+Subject: [PATCH] sdparm: make sysroot work
 
 Upstream-Status: Pending
 
 Add = before the included dir to make sysroot work
 
 Signed-off-by: Roy.Li <[email protected]>
+Signed-off-by: Dengke Du <[email protected]>
 ---
  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
+index 61dd9f8..42c911f 100644
 --- a/src/Makefile.am
 +++ b/src/Makefile.am
-@@ -32,7 +32,7 @@ sglib_SOURCES =		../lib/sg_lib.c \
+@@ -41,7 +41,7 @@ sglib_SOURCES =		../lib/sg_lib.c \
  			../lib/sg_pt_common.c
  
  if HAVE_SGUTILS
--INCLUDES = -I/usr/include/scsi
+-INCLUDES = -I/scsi
 +INCLUDES = -I=@includedir@/scsi
  sdparm_LDADD = @GETOPT_O_FILES@ @os_libs@ @SGUTILS_LIBS@
  sdparm_DEPENDENCIES = @GETOPT_O_FILES@
  else
 -- 
-1.9.1
+2.7.4
 
meta-oe/recipes-support/sdparm/sdparm_1.10.bb renamed from meta-oe/recipes-support/sdparm/sdparm_1.09.bb +2 -2
similarity index 83%
rename from meta-oe/recipes-support/sdparm/sdparm_1.09.bb
rename to meta-oe/recipes-support/sdparm/sdparm_1.10.bb
index ca11ca4..8ab2819 100644
@@ -14,8 +14,8 @@ SRC_URI = "http://sg.danny.cz/sg/p/${BPN}-${PV}.tgz \
 PACKAGES =+ "${PN}-scripts"
 RDEPENDS_${PN}-scripts += "bash ${PN}"
 
-SRC_URI[md5sum] = "e51b1fd41c3e4c9d1274a2e4f046eebf"
-SRC_URI[sha256sum] = "7294f44173ac0946f1de8af02b1bdb0bd648079245396589397a2b0d3abc42d3"
+SRC_URI[md5sum] = "bdae64375376ce8fe4bf9521c1db858f"
+SRC_URI[sha256sum] = "1ea1ed1bb1ee2aef62392618fa42da9ed027d5e655f174525c39235778292ab3"
 
 inherit autotools
 
Signature · 1 line
2.7.4
author
#1 lore raw

Please ignore this.

// Dengke

Quoted 69 lines · Dengke Du

Changed in V2:
Add the [meta-oe] prefix in patch.

---
  .../recipes-support/sdparm/files/make-sysroot-work.patch   | 14 +++++++++-----
  .../sdparm/{sdparm_1.09.bb => sdparm_1.10.bb}              |  4 ++--
  2 files changed, 11 insertions(+), 7 deletions(-)

rename meta-oe/recipes-support/sdparm/{sdparm_1.09.bb => sdparm_1.10.bb} (83%)

meta-oe/recipes-support/sdparm/files/make-sysroot-work.patch +9 -5
index 5405ed8..3fd85d9 100644
@@ -1,27 +1,31 @@
-[PATCH] make sysroot work
+From 15f0722bc5481cca5ba92adceab8c769112e4ea6 Mon Sep 17 00:00:00 2001
+From: Dengke Du <[email protected]>
+Date: Mon, 24 Oct 2016 07:28:13 +0000
+Subject: [PATCH] sdparm: make sysroot work
 
  Upstream-Status: Pending
 
  Add = before the included dir to make sysroot work
 
  Signed-off-by: Roy.Li <[email protected]>
+Signed-off-by: Dengke Du <[email protected]>
  ---
   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
+index 61dd9f8..42c911f 100644
  --- a/src/Makefile.am
  +++ b/src/Makefile.am
-@@ -32,7 +32,7 @@ sglib_SOURCES =		../lib/sg_lib.c \
+@@ -41,7 +41,7 @@ sglib_SOURCES =		../lib/sg_lib.c \
   			../lib/sg_pt_common.c
 
   if HAVE_SGUTILS
--INCLUDES = -I/usr/include/scsi
+-INCLUDES = -I/scsi
  +INCLUDES = -I=@includedir@/scsi
   sdparm_LDADD = @GETOPT_O_FILES@ @os_libs@ @SGUTILS_LIBS@
   sdparm_DEPENDENCIES = @GETOPT_O_FILES@
   else
  --
-1.9.1
+2.7.4
 
meta-oe/recipes-support/sdparm/sdparm_1.10.bb renamed from meta-oe/recipes-support/sdparm/sdparm_1.09.bb +2 -2
similarity index 83%
rename from meta-oe/recipes-support/sdparm/sdparm_1.09.bb
rename to meta-oe/recipes-support/sdparm/sdparm_1.10.bb
index ca11ca4..8ab2819 100644
@@ -14,8 +14,8 @@ SRC_URI = "http://sg.danny.cz/sg/p/${BPN}-${PV}.tgz \
  PACKAGES =+ "${PN}-scripts"
  RDEPENDS_${PN}-scripts += "bash ${PN}"
 
-SRC_URI[md5sum] = "e51b1fd41c3e4c9d1274a2e4f046eebf"
-SRC_URI[sha256sum] = "7294f44173ac0946f1de8af02b1bdb0bd648079245396589397a2b0d3abc42d3"
+SRC_URI[md5sum] = "bdae64375376ce8fe4bf9521c1db858f"
+SRC_URI[sha256sum] = "1ea1ed1bb1ee2aef62392618fa42da9ed027d5e655f174525c39235778292ab3"
 
  inherit autotools