Skip to content
Closed
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view

This file was deleted.

Original file line number Diff line number Diff line change
Expand Up @@ -14,6 +14,11 @@ Do not build man to workaround the issue.
Upstream-Status: Pending

Signed-off-by: Hongxu Jia <[email protected]>


Update context for lvm2 2.03.02.

Signed-off-by: Kai Kang <[email protected]>
---
Makefile.in | 6 +++---
configure.ac | 1 -
Expand Down Expand Up @@ -41,7 +46,7 @@ index 6a1a990..80cba91 100644
libdaemon lib tools daemons libdm \
udev po
tools.distclean: test.distclean
@@ -59,7 +59,7 @@ libdm.device-mapper: include.device-mapper
@@ -65,7 +65,7 @@ libdm.device-mapper: include.device-mapper
daemons.device-mapper: libdm.device-mapper
tools.device-mapper: libdm.device-mapper
scripts.device-mapper: include.device-mapper
Expand All @@ -51,17 +56,17 @@ index 6a1a990..80cba91 100644
ifeq ("@INTL@", "yes")
lib.pofile: include.pofile
diff --git a/configure.ac b/configure.ac
index 9c45745..8fee4c4 100644
index 7fd0561..4154dc0 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1806,7 +1806,6 @@ libdaemon/server/Makefile
@@ -1812,7 +1812,6 @@ libdaemon/server/Makefile
libdm/Makefile
libdm/dm-tools/Makefile
libdm/libdevmapper.pc
-man/Makefile
po/Makefile
scripts/lvm2-pvscan.service
scripts/blkdeactivate.sh
scripts/blk_availability_init_red_hat
--
2.7.4

Original file line number Diff line number Diff line change
Expand Up @@ -10,20 +10,25 @@ So start lvm2-monitor.service after tmp.mount
Upstream-Status: Inappropriate [oe specific]

Signed-off-by: Hongxu Jia <[email protected]>


Update context for lvm2 2.03.02.

Signed-off-by: Kai Kang <[email protected]>
---
scripts/lvm2_monitoring_systemd_red_hat.service.in | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/scripts/lvm2_monitoring_systemd_red_hat.service.in b/scripts/lvm2_monitoring_systemd_red_hat.service.in
index 22238b7..93b2bee 100644
index 7ec4e4e..3282a95 100644
--- a/scripts/lvm2_monitoring_systemd_red_hat.service.in
+++ b/scripts/lvm2_monitoring_systemd_red_hat.service.in
@@ -2,7 +2,7 @@
Description=Monitoring of LVM2 mirrors, snapshots etc. using dmeventd or progress polling
Documentation=man:dmeventd(8) man:lvcreate(8) man:lvchange(8) man:vgchange(8)
Requires=dm-event.socket lvm2-lvmetad.socket
-After=dm-event.socket dm-event.service lvm2-lvmetad.socket lvm2-activation.service lvm2-lvmetad.service
+After=dm-event.socket dm-event.service lvm2-lvmetad.socket lvm2-activation.service lvm2-lvmetad.service tmp.mount
Requires=dm-event.socket
-After=dm-event.socket dm-event.service lvm2-activation.service
+After=dm-event.socket dm-event.service lvm2-activation.service tmp.mount
Before=local-fs-pre.target
DefaultDependencies=no
Conflicts=shutdown.target
Expand Down
7 changes: 4 additions & 3 deletions meta-oe/recipes-support/lvm2/lvm2.inc
Original file line number Diff line number Diff line change
Expand Up @@ -7,18 +7,19 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=12713b4d9386533feeb07d6e4831765a \

DEPENDS += "util-linux libaio"

SRC_URI = "git://github.com/lvmteam/lvm2.git;protocol=https;branch=master \
SRC_URI = "ftp://sources.redhat.com/pub/lvm2/releases/LVM2.${PV}.tgz \
file://lvm.conf \
file://0001-implement-libc-specific-reopen_stream.patch \
file://0002-Guard-use-of-mallinfo-with-__GLIBC__.patch \
file://0003-include-fcntl.h-for-O_-defines-and-fcntl-signature.patch \
file://0004-tweak-MODPROBE_CMD-for-cross-compile.patch \
file://0001-Avoid-bashisms-in-init-scripts.patch \
file://0005-do-not-build-manual.patch \
file://0006-start-lvm2-monitor.service-after-tmp.mount.patch \
"
SRC_URI[md5sum] = "5fc07da5461a3794a751dcfc355827d5"
SRC_URI[sha256sum] = "550ba750239fd75b7e52c9877565cabffef506bbf6d7f6f17b9700dee56c720f"

S = "${WORKDIR}/git"
S = "${WORKDIR}/LVM2.${PV}"

inherit autotools-brokensep pkgconfig systemd license

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -9,16 +9,21 @@ explicitly do not do the installation here.
Upstream-Status: Inappropriate [meta-oe specific]

Signed-off-by: Hongxu Jia <[email protected]>


Update context for lvm2 2.03.02.

Signed-off-by: Kai Kang <[email protected]>
---
libdm/Makefile.in | 6 ++++--
libdm/dm-tools/Makefile.in | 6 ++++--
2 files changed, 8 insertions(+), 4 deletions(-)

diff --git a/libdm/Makefile.in b/libdm/Makefile.in
index 8c8334a..effcf25 100644
index e9bb5ae..4e9ae3f 100644
--- a/libdm/Makefile.in
+++ b/libdm/Makefile.in
@@ -81,9 +81,11 @@ ifeq ("@PKGCONFIG@", "yes")
@@ -82,9 +82,11 @@ ifeq ("@PKGCONFIG@", "yes")
INSTALL_TYPE += install_pkgconfig
endif

Expand All @@ -31,25 +36,30 @@ index 8c8334a..effcf25 100644
+ echo "Do not install device mapper in lvm2"

install_include: $(srcdir)/libdevmapper.h
$(INSTALL_DATA) -D $< $(includedir)/$(<F)
@echo " [INSTALL] $<"
diff --git a/libdm/dm-tools/Makefile.in b/libdm/dm-tools/Makefile.in
index 39d411d..4a0f61a 100644
index 15a9d8e..65e1306 100644
--- a/libdm/dm-tools/Makefile.in
+++ b/libdm/dm-tools/Makefile.in
@@ -60,9 +60,11 @@ install_dmsetup_static: dmsetup.static
$(Q) $(INSTALL_PROGRAM) -D $< $(staticdir)/$(<F)
$(Q) $(LN_S) -f $(<F) $(staticdir)/dmstats
@@ -20,7 +20,8 @@ all: device-mapper

-install_device-mapper: $(INSTALL_DMSETUP_TARGETS)
SOURCES2 = dmsetup.c
TARGETS_DM = dmsetup
-install_device-mapper: install_dmsetup_dynamic
+install_device-mapper:
+ echo "Do not install device mapper in lvm2"

-install: install_device-mapper
ifeq ("@STATIC_LINK@", "yes")
TARGETS_DM += dmsetup.static
@@ -93,6 +94,7 @@ install_dmfilemapd_static: dmfilemapd.static
.PHONY: install_dmsetup_dynamic install_dmsetup_static
.PHONY: install_dmfilemapd install_dmfilemapd_static

-install: install_device-mapper install_dmfilemapd
+install:
+ echo "Do not install device mapper in lvm2"

# dmfilemapd support
ifeq ("@BUILD_DMFILEMAPD@", "yes")
device-mapper: $(TARGETS_DM)
--
2.7.4

This file was deleted.

Original file line number Diff line number Diff line change
Expand Up @@ -3,8 +3,7 @@ require lvm2.inc
SRCREV = "913c28917e62577a2ef67152b2e5159237503dda"

SRC_URI += "file://0001-explicitly-do-not-install-libdm.patch \
file://0001-lvm2-monitoring-service-shouldn-t-refer-to-lvmetad.patch \
file://0001-dev-hdc-open-failed-No-medium-found-will-print-out-i.patch \
file://0001-dev-hdc-open-failed-No-medium-found-will-print-out-i.patch \
"

DEPENDS += "autoconf-archive-native"
Expand Down
19 changes: 19 additions & 0 deletions meta-oe/recipes-support/spdlog/spdlog_1.3.1.bb
Original file line number Diff line number Diff line change
@@ -0,0 +1,19 @@
DESCRIPTION = "Very fast, header only, C++ logging library."
HOMEPAGE = "https://github.com/gabime/spdlog/wiki"
LICENSE = "MIT"
LIC_FILES_CHKSUM = "file://${COREBASE}/meta/files/common-licenses/MIT;md5=0835ade698e0bcf8506ecda2f7b4f302"

SRCREV = "a7148b718ea2fabb8387cb90aee9bf448da63e65"
SRC_URI = "git://github.com/gabime/spdlog.git;protocol=git;branch=v1.x;"

S = "${WORKDIR}/git"

BBCLASSEXTEND = "native"
# no need to build example&text&benchmarks on pure yocto
EXTRA_OECMAKE += "-DSPDLOG_INSTALL=on -DSPDLOG_BUILD_EXAMPLES=off -DSPDLOG_BUILD_TESTS=off -DSPDLOG_BUILD_BENCH=off"

inherit cmake

# Header-only library
RDEPENDS_${PN}-dev = ""
RRECOMMENDS_${PN}-dbg = "${PN}-dev (= ${EXTENDPKGV})"