diff options
| -rw-r--r-- | meta-oe/recipes-support/multipath-tools/files/makefile_inc.patch | 11 | ||||
| -rw-r--r-- | meta-oe/recipes-support/multipath-tools/multipath-tools_git.bb | 8 |
2 files changed, 13 insertions, 6 deletions
diff --git a/meta-oe/recipes-support/multipath-tools/files/makefile_inc.patch b/meta-oe/recipes-support/multipath-tools/files/makefile_inc.patch index ff71f39675..71963e0c49 100644 --- a/meta-oe/recipes-support/multipath-tools/files/makefile_inc.patch +++ b/meta-oe/recipes-support/multipath-tools/files/makefile_inc.patch @@ -7,6 +7,9 @@ Upstream-Status: Inappropriate [embedded specific] Signed-off-by: Joe Slater <joe.slater@windriver.com> +Update for version 0.5.0-144-g770e6d0 + +Signed-off-by: Kai Kang <kai.kang@windriver.com> --- a/Makefile.inc +++ b/Makefile.inc @@ -20,10 +23,10 @@ Signed-off-by: Joe Slater <joe.slater@windriver.com> - endif -endif - - prefix = - exec_prefix = $(prefix) - bindir = $(exec_prefix)/sbin -@@ -49,7 +43,10 @@ ifndef RPM_OPT_FLAGS + ifndef SYSTEMDPATH + SYSTEMDPATH=usr/lib + endif +@@ -53,7 +47,10 @@ ifndef RPM_OPT_FLAGS RPM_OPT_FLAGS = -O2 -g -pipe -Wformat-security -Wall -Wp,-D_FORTIFY_SOURCE=2 -fexceptions -fstack-protector --param=ssp-buffer-size=4 endif diff --git a/meta-oe/recipes-support/multipath-tools/multipath-tools_git.bb b/meta-oe/recipes-support/multipath-tools/multipath-tools_git.bb index f35cc3b58b..a3f20bcfb1 100644 --- a/meta-oe/recipes-support/multipath-tools/multipath-tools_git.bb +++ b/meta-oe/recipes-support/multipath-tools/multipath-tools_git.bb @@ -25,9 +25,12 @@ SRC_URI = "git://git.opensvc.com/multipath-tools/.git;protocol=http \ # # includes important systemd related structure size fix # -SRCREV = "aec68ab217fd2956443b27ceeb97dd6475267789" +#SRCREV = "aec68ab217fd2956443b27ceeb97dd6475267789" LIC_FILES_CHKSUM = "file://COPYING;md5=b06690e7a95c166eefe0199b39118eb1" +# 0.5.0 + commits thru 2/16/2015 +SRCREV = "770e6d0da035deaced82885939161c2b69225e10" + inherit systemd @@ -66,6 +69,7 @@ FILES_${PN} += "${base_libdir}/multipath \ PACKAGES =+ "kpartx" FILES_kpartx = "${base_sbindir}/kpartx \ - /lib/udev/kpartx_id" + /usr/lib/udev/kpartx_id \ + " RDEPENDS_${PN} += "kpartx" |