diff options
author | Kai Kang <kai.kang@windriver.com> | 2023-12-06 10:24:46 +0800 |
---|---|---|
committer | Khem Raj <raj.khem@gmail.com> | 2023-12-07 14:25:11 -0800 |
commit | 02f460c5e379b3b0980374b3f89d55bc195d03d3 (patch) | |
tree | 07db71930eb05ac400b76c0fa96c8042fcb60f1d /meta-oe/recipes-support/lvm2/lvm2_2.03.22.bb | |
parent | da5e4c5eb2f0759da570d4fa76acfd09f0898565 (diff) | |
download | meta-openembedded-02f460c5e379b3b0980374b3f89d55bc195d03d3.tar.gz |
lvm2: 2.03.16 -> 2.03.22
Update lvm2 from 2.03.16 to 2.03.22.
* remove 0002-Guard-use-of-mallinfo-with-__GLIBC__.patch which has done
in upstream already
* add patch to check egrep & grep
* rebase patches
* add package config 'dbus' and fix errors about it
Signed-off-by: Kai Kang <kai.kang@windriver.com>
Signed-off-by: Khem Raj <raj.khem@gmail.com>
Diffstat (limited to 'meta-oe/recipes-support/lvm2/lvm2_2.03.22.bb')
-rw-r--r-- | meta-oe/recipes-support/lvm2/lvm2_2.03.22.bb | 110 |
1 files changed, 110 insertions, 0 deletions
diff --git a/meta-oe/recipes-support/lvm2/lvm2_2.03.22.bb b/meta-oe/recipes-support/lvm2/lvm2_2.03.22.bb new file mode 100644 index 000000000..c675d3ded --- /dev/null +++ b/meta-oe/recipes-support/lvm2/lvm2_2.03.22.bb | |||
@@ -0,0 +1,110 @@ | |||
1 | require lvm2.inc | ||
2 | |||
3 | SRC_URI += " \ | ||
4 | file://0001-fix-command-bin-findmnt-bin-lsblk-bin-sort-not-found.patch \ | ||
5 | file://tweak-for-lvmdbusd.patch \ | ||
6 | file://0001-lvmdbusd-create-dirs-for-lock-file.patch \ | ||
7 | " | ||
8 | |||
9 | DEPENDS += "autoconf-archive-native" | ||
10 | |||
11 | inherit multilib_script python3native | ||
12 | |||
13 | MULTILIB_SCRIPTS = "${PN}:${sysconfdir}/lvm/lvm.conf" | ||
14 | |||
15 | CACHED_CONFIGUREVARS += "MODPROBE_CMD=${base_sbindir}/modprobe" | ||
16 | |||
17 | do_install:append() { | ||
18 | # Install machine specific configuration file | ||
19 | install -d ${D}${sysconfdir}/lvm | ||
20 | install -m 0644 ${WORKDIR}/lvm.conf ${D}${sysconfdir}/lvm/lvm.conf | ||
21 | sed -i -e 's:@libdir@:${libdir}:g' ${D}${sysconfdir}/lvm/lvm.conf | ||
22 | # We don't want init scripts/systemd units for native SDK utilities | ||
23 | if [ "${PN}" != "nativesdk-lvm2" ]; then | ||
24 | if ${@bb.utils.contains('DISTRO_FEATURES','systemd','true','false',d)}; then | ||
25 | oe_runmake 'DESTDIR=${D}' install install_systemd_units | ||
26 | sed -i -e 's:/usr/bin/true:${base_bindir}/true:g' ${D}${systemd_system_unitdir}/blk-availability.service | ||
27 | else | ||
28 | oe_runmake 'DESTDIR=${D}' install install_initscripts | ||
29 | mv ${D}${sysconfdir}/rc.d/init.d ${D}${sysconfdir}/init.d | ||
30 | rm -rf ${D}${sysconfdir}/rc.d | ||
31 | fi | ||
32 | fi | ||
33 | |||
34 | # following files only exist when package config `dbus` enabled | ||
35 | sed -i -e '1s,#!.*python.*,#!${USRBINPATH}/env python3,' \ | ||
36 | ${D}${sbindir}/lvmdbusd \ | ||
37 | ${D}${PYTHON_SITEPACKAGES_DIR}/lvmdbusd/lvmdb.py \ | ||
38 | ${D}${PYTHON_SITEPACKAGES_DIR}/lvmdbusd/lvm_shell_proxy.py \ | ||
39 | || true | ||
40 | } | ||
41 | |||
42 | PACKAGE_BEFORE_PN = "${PN}-scripts ${PN}-udevrules" | ||
43 | |||
44 | SYSTEMD_PACKAGES = "${PN}" | ||
45 | SYSTEMD_SERVICE:${PN} = "${@bb.utils.contains('PACKAGECONFIG', 'dmeventd', 'lvm2-monitor.service dm-event.socket dm-event.service', '', d)} \ | ||
46 | ${@bb.utils.contains('PACKAGECONFIG', 'dbus', 'lvm2-lvmdbusd.service', '', d)} \ | ||
47 | blk-availability.service \ | ||
48 | " | ||
49 | SYSTEMD_AUTO_ENABLE = "disable" | ||
50 | |||
51 | TARGET_CC_ARCH += "${LDFLAGS}" | ||
52 | |||
53 | EXTRA_OECONF:append:class-nativesdk = " --with-confdir=${sysconfdir}" | ||
54 | |||
55 | DEPENDS += "util-linux" | ||
56 | LVM2_PACKAGECONFIG:append:class-target = " \ | ||
57 | udev \ | ||
58 | " | ||
59 | |||
60 | PACKAGECONFIG[dbus] = "--enable-dbus-service,--disable-dbus-service,,python3-dbus python3-pyudev" | ||
61 | PACKAGECONFIG[udev] = "--enable-udev_sync --enable-udev_rules --with-udevdir=${nonarch_base_libdir}/udev/rules.d,--disable-udev_sync --disable-udev_rules,udev,${PN}-udevrules" | ||
62 | |||
63 | PACKAGES =+ "libdevmapper" | ||
64 | FILES:libdevmapper = " \ | ||
65 | ${libdir}/libdevmapper.so.* \ | ||
66 | ${sbindir}/dmsetup \ | ||
67 | ${sbindir}/dmstats \ | ||
68 | " | ||
69 | |||
70 | FILES:${PN} += " \ | ||
71 | ${libdir}/device-mapper/*.so \ | ||
72 | ${systemd_system_unitdir}/lvm2-pvscan@.service \ | ||
73 | ${PYTHON_SITEPACKAGES_DIR}/lvmdbusd \ | ||
74 | ${datadir}/dbus-1/system-services/com.redhat.lvmdbus1.service \ | ||
75 | " | ||
76 | |||
77 | FILES:${PN}-scripts = " \ | ||
78 | ${sbindir}/blkdeactivate \ | ||
79 | ${sbindir}/fsadm \ | ||
80 | ${sbindir}/lvmconf \ | ||
81 | ${sbindir}/lvmdump \ | ||
82 | " | ||
83 | # Specified explicitly for the udev rules, just in case that it does not get picked | ||
84 | # up automatically: | ||
85 | FILES:${PN}-udevrules = "${nonarch_base_libdir}/udev/rules.d" | ||
86 | RDEPENDS:${PN} = "bash" | ||
87 | RDEPENDS:${PN}-udevrules = "libdevmapper" | ||
88 | RDEPENDS:${PN}:append:class-target = " libdevmapper" | ||
89 | RDEPENDS:${PN}:append:class-nativesdk = " libdevmapper" | ||
90 | |||
91 | RDEPENDS:${PN}-scripts = "${PN} (= ${EXTENDPKGV}) \ | ||
92 | bash \ | ||
93 | util-linux-lsblk \ | ||
94 | util-linux-findmnt \ | ||
95 | coreutils \ | ||
96 | " | ||
97 | RRECOMMENDS:${PN}:class-target = "${PN}-scripts (= ${EXTENDPKGV})" | ||
98 | |||
99 | CONFFILES:${PN} += "${sysconfdir}/lvm/lvm.conf" | ||
100 | |||
101 | SYSROOT_PREPROCESS_FUNCS:append = " remove_libdevmapper_sysroot_preprocess" | ||
102 | remove_libdevmapper_sysroot_preprocess() { | ||
103 | rm -f ${SYSROOT_DESTDIR}${libdir}/libdevmapper.so* \ | ||
104 | ${SYSROOT_DESTDIR}${sbindir}/dmsetup \ | ||
105 | ${SYSROOT_DESTDIR}${sbindir}/dmstats \ | ||
106 | ${SYSROOT_DESTDIR}${includedir}/libdevmapper.h \ | ||
107 | ${SYSROOT_DESTDIR}${libdir}/pkgconfig/devmapper.pc | ||
108 | } | ||
109 | |||
110 | BBCLASSEXTEND = "native nativesdk" | ||