Skip to contentSkip to conversation

scsirastools: Upgrade to 1.6.6

PATCH New Khem Raj 1 participant 1 message Jun 20, 2017

lore
Share & tools
lore

Khem Raj

author
#0 lore raw

PATCH 1/1 scsirastools: Upgrade to 1.6.6

Fix build with hardening flags

---
 .../scsirastools/scsirastools/mdadm.patch          |  13 ++
 .../scsirastools/scsirastools/print-format.patch   | 218 +++++++++++++++++++++
 ...scsirastools_1.6.4.bb => scsirastools_1.6.6.bb} |  14 +-
 3 files changed, 242 insertions(+), 3 deletions(-)
 create mode 100644 meta-oe/recipes-extended/scsirastools/scsirastools/mdadm.patch
 create mode 100644 meta-oe/recipes-extended/scsirastools/scsirastools/print-format.patch
 rename meta-oe/recipes-extended/scsirastools/{scsirastools_1.6.4.bb => scsirastools_1.6.6.bb} (81%)
meta-oe/recipes-extended/scsirastools/scsirastools/mdadm.patch new file +13 -0
new file mode 100644
index 000000000..6edda08cd
@@ -0,0 +1,13 @@
+--- mdadm.d/mdadm-1.3.0/mdadm.h.org	2017-06-20 00:35:55.366978372 -0700
++++ mdadm.d/mdadm-1.3.0/mdadm.h	2017-06-20 00:36:41.244363348 -0700
+@@ -29,8 +29,9 @@
+ 
+ #define	__USE_LARGEFILE64
+ #include	<unistd.h>
+-extern __off64_t lseek64 __P ((int __fd, __off64_t __offset, int __whence));
++//extern __off64_t lseek64 __P ((int __fd, __off64_t __offset, int __whence));
+ 
++#include	<sys/sysmacros.h>
+ #include	<sys/types.h>
+ #include	<sys/stat.h>
+ #include	<stdlib.h>
meta-oe/recipes-extended/scsirastools/scsirastools/print-format.patch new file +218 -0

218 lines not on this page · raw message

meta-oe/recipes-extended/scsirastools/scsirastools_1.6.6.bb renamed from meta-oe/recipes-extended/scsirastools/scsirastools_1.6.4.bb +11 -3
similarity index 81%
rename from meta-oe/recipes-extended/scsirastools/scsirastools_1.6.4.bb
rename to meta-oe/recipes-extended/scsirastools/scsirastools_1.6.6.bb
index d0c36e472..e202d16eb 100644
@@ -10,15 +10,23 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=687ea108478d26152ae46eb29d9d1545"
 
 DEPENDS += "groff-native"
 
-SRC_URI = "http://prdownloads.sourceforge.net/scsirastools/scsirastools-${PV}.tar.gz"
-SRC_URI[md5sum] = "2d775111b62e2dfc1960a722f5fda211"
-SRC_URI[sha256sum] = "38d2c6c9b04a2c594e528927b950754f94c0522718d17c78e6589ba778339bf8"
+SRC_URI = "http://prdownloads.sourceforge.net/scsirastools/scsirastools-${PV}.tar.gz \
+           file://mdadm.patch;apply=no \
+           file://print-format.patch \
+"
+SRC_URI[md5sum] = "6271a61b2ce40aaf33ef61775148cda1"
+SRC_URI[sha256sum] = "e7b997e75decb06a650c42c35cd63d0c94c34e39cf133c723337b0eeabbfdf6a"
 
 inherit autotools update-rc.d
 
 # mdadm Makefile has CC set to gcc, hence override CC to ${CC}
 EXTRA_OEMAKE += "CC='${CC}'"
 
+
+do_configure_append() {
+	oe_runmake -C mdadm.d mdadm-1.3.0
+	patch -p0 < ${WORKDIR}/mdadm.patch
+}
 INITSCRIPT_PACKAGES = "${PN}-diskmon ${PN}-raidmon"
 INITSCRIPT_NAME_${PN}-diskmon = "sgdisk"
 INITSCRIPT_PARAMS_${PN}-diskmon = "defaults 80 20"
Signature · 1 line
2.13.1