diff options
author | Joe Slater <jslater@windriver.com> | 2014-09-22 17:22:32 -0700 |
---|---|---|
committer | Martin Jansa <Martin.Jansa@gmail.com> | 2014-09-26 05:41:54 +0200 |
commit | 48e5c5ef39d70c3b00f755d09811f497e6d23f53 (patch) | |
tree | 595d81d3ee1e3bc91f1949c5a05f060fa9216712 /meta-oe/recipes-support/multipath-tools/multipath-tools_git.bb | |
parent | 0a67b9f3fd164b808c66286ff0435c65421e5352 (diff) | |
download | meta-openembedded-48e5c5ef39d70c3b00f755d09811f497e6d23f53.tar.gz |
multipath-tools: update to version 0.5.0+
SCRREV includes patches up to 9/12/2014.
Modify upstream source to be better set up for
cross compilation.
Signed-off-by: Joe Slater <jslater@windriver.com>
Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
Diffstat (limited to 'meta-oe/recipes-support/multipath-tools/multipath-tools_git.bb')
-rw-r--r-- | meta-oe/recipes-support/multipath-tools/multipath-tools_git.bb | 58 |
1 files changed, 49 insertions, 9 deletions
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 038f4e26d..055cfe64c 100644 --- a/meta-oe/recipes-support/multipath-tools/multipath-tools_git.bb +++ b/meta-oe/recipes-support/multipath-tools/multipath-tools_git.bb | |||
@@ -1,30 +1,70 @@ | |||
1 | SUMMARY = "The upstream project used to drive the Device Mapper multipathing driver" | 1 | SUMMARY = "The upstream project used to drive the Device Mapper multipathing driver" |
2 | 2 | ||
3 | DEPENDS = "lvm2 libaio readline" | 3 | DEPENDS = "lvm2 libaio readline udev" |
4 | 4 | ||
5 | LICENSE = "GPLv2" | 5 | LICENSE = "LGPLv2" |
6 | LIC_FILES_CHKSUM = "file://COPYING;md5=7be2873b6270e45abacc503abbe2aa3d" | ||
7 | 6 | ||
7 | SRC_URI = "git://git.opensvc.com/multipath-tools/.git;protocol=http \ | ||
8 | file://multipathd.oe \ | ||
9 | file://makefile_inc.patch \ | ||
10 | file://always-use-libdevmapper.patch \ | ||
11 | file://always-use-libdevmapper-kpartx.patch \ | ||
12 | " | ||
13 | # 0.5.0 | ||
14 | # | ||
15 | #SRCREV = "82f391e787dc02e9d9294aa391137ab424bb83c4" | ||
16 | #LIC_FILES_CHKSUM = "file://COPYING;md5=7be2873b6270e45abacc503abbe2aa3d" | ||
17 | |||
18 | # 0.5.0 + commits thru 7/18/2014 | ||
19 | # | ||
20 | #SRCREV = "0d72f46c12207a6b7b89f5ef4f5ab5f87ed8bc90" | ||
21 | #LIC_FILES_CHKSUM = "file://COPYING;md5=b06690e7a95c166eefe0199b39118eb1" | ||
22 | |||
23 | # 0.5.0 + commits thru 9/12/2014 | ||
24 | # | ||
25 | # includes important systemd related structure size fix | ||
26 | # | ||
27 | SRCREV = "aec68ab217fd2956443b27ceeb97dd6475267789" | ||
28 | LIC_FILES_CHKSUM = "file://COPYING;md5=b06690e7a95c166eefe0199b39118eb1" | ||
29 | |||
30 | inherit systemd | ||
8 | 31 | ||
9 | SRC_URI = "git://git.opensvc.com/multipath-tools/.git;protocol=http" | ||
10 | SRCREV = "15fc23ffb2bd1bac6990eda3e23c3e8980e6cfa5" | ||
11 | 32 | ||
12 | S = "${WORKDIR}/git" | 33 | S = "${WORKDIR}/git" |
13 | 34 | ||
14 | PV = "0.4.9+git" | 35 | PV = "0.5.0+git${@'${SRCPV}'.split('+')[-1]}" |
15 | 36 | ||
16 | EXTRA_OEMAKE = "MULTIPATH_VERSION=${PV} DESTDIR=${D} syslibdir=${base_libdir} libdir=${base_libdir}/multipath" | 37 | # The exact version of SYSTEMD does not matter but should be greater than 209. |
38 | # | ||
39 | EXTRA_OEMAKE = 'MULTIPATH_VERSION=${PV} DESTDIR=${D} syslibdir=${base_libdir} \ | ||
40 | OPTFLAGS="${CFLAGS}" \ | ||
41 | LIB=${base_libdir} libdir=${base_libdir}/multipath \ | ||
42 | unitdir=/lib/systemd/system \ | ||
43 | ${@bb.utils.contains("DISTRO_FEATURES", "systemd", "SYSTEMD=216", "", d)} \ | ||
44 | ' | ||
17 | 45 | ||
18 | do_install() { | 46 | do_install() { |
19 | oe_runmake install | 47 | oe_runmake install |
48 | |||
49 | # Copy a sample conf file, but do not rename it multipath.conf. | ||
50 | # | ||
51 | cp multipath.conf.defaults ${D}${sysconfdir} | ||
52 | |||
53 | # We copy an initscript, but do not start multipathd at init time. | ||
54 | # | ||
55 | cp ${WORKDIR}/multipathd.oe ${D}${sysconfdir}/init.d/multipathd | ||
56 | |||
20 | } | 57 | } |
21 | 58 | ||
22 | FILES_${PN}-dbg += "${base_libdir}/multipath/.debug" | 59 | FILES_${PN}-dbg += "${base_libdir}/multipath/.debug" |
60 | |||
61 | # systemd and udev stuff always goes under /lib! | ||
62 | # | ||
23 | FILES_${PN} += "${base_libdir}/multipath \ | 63 | FILES_${PN} += "${base_libdir}/multipath \ |
24 | ${base_libdir}/systemd" | 64 | /lib/systemd" |
25 | 65 | ||
26 | PACKAGES =+ "kpartx" | 66 | PACKAGES =+ "kpartx" |
27 | FILES_kpartx = "${base_sbindir}/kpartx \ | 67 | FILES_kpartx = "${base_sbindir}/kpartx \ |
28 | ${base_libdir}/udev/kpartx_id" | 68 | /lib/udev/kpartx_id" |
29 | 69 | ||
30 | RDEPENDS_${PN} += "kpartx" | 70 | RDEPENDS_${PN} += "kpartx" |