Skip to content

Commit 5be3c43

Browse files
packages: bump lvm2 to 2.03.41
lvm2 2.02.105 -> 2.03.41 (latest), sourced from sourceware (LVM2.<ver>.tgz). Drop --with-clvmd (the clvmd cluster stack was removed in 2.03) and disable optional deps absent from the sysroot; depend on the libaio package (2.03's bcache I/O engine requires it). Drop sbin/lvmchange (blocklisted in 2.03) and the obsolete add-sysmacros.h patch. Signed-off-by: Brad House <bhouse@nexthop.ai>
1 parent 56f02fa commit 5be3c43

4 files changed

Lines changed: 21 additions & 19 deletions

File tree

build-config/make/lvm2.make

Lines changed: 12 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -11,11 +11,11 @@
1111
# This is a makefile fragment that defines the build of lvm2
1212
#
1313

14-
LVM2_VERSION ?= 2_02_105
15-
LVM2_TARBALL = lvm2-$(LVM2_VERSION).tar.xz
16-
LVM2_TARBALL_URLS += $(ONIE_MIRROR) https://git.fedorahosted.org/cgit/lvm2.git/snapshot/
14+
LVM2_VERSION ?= 2.03.41
15+
LVM2_TARBALL = LVM2.$(LVM2_VERSION).tgz
16+
LVM2_TARBALL_URLS += $(ONIE_MIRROR) https://sourceware.org/ftp/lvm2
1717
LVM2_BUILD_DIR = $(USER_BUILDDIR)/lvm2
18-
LVM2_DIR = $(LVM2_BUILD_DIR)/lvm2-$(LVM2_VERSION)
18+
LVM2_DIR = $(LVM2_BUILD_DIR)/LVM2.$(LVM2_VERSION)
1919

2020
LVM2_SRCPATCHDIR = $(PATCHDIR)/lvm2
2121
LVM2_DOWNLOAD_STAMP = $(DOWNLOADDIR)/lvm2-$(LVM2_VERSION)-download
@@ -45,7 +45,6 @@ LVM2_PROGS = \
4545
sbin/lvcreate \
4646
sbin/lvdisplay \
4747
sbin/lvextend \
48-
sbin/lvmchange \
4948
sbin/lvmdiskscan \
5049
sbin/lvmsadc \
5150
sbin/lvmsar \
@@ -122,7 +121,7 @@ LVM2_CONFIGURE_OVERRIDES = \
122121

123122

124123
lvm2-configure: $(LVM2_CONFIGURE_STAMP)
125-
$(LVM2_CONFIGURE_STAMP): $(LVM2_SOURCE_STAMP) $(LVM2_PATCH_STAMP)\
124+
$(LVM2_CONFIGURE_STAMP): $(LVM2_SOURCE_STAMP) $(LVM2_PATCH_STAMP) $(LIBAIO_BUILD_STAMP)\
126125
| $(DEV_SYSROOT_INIT_STAMP)
127126
$(Q) rm -f $@ && eval $(PROFILE_STAMP)
128127
$(Q) echo "==== Configure lvm2-$(LVM2_VERSION) ===="
@@ -131,9 +130,14 @@ $(LVM2_CONFIGURE_STAMP): $(LVM2_SOURCE_STAMP) $(LVM2_PATCH_STAMP)\
131130
$(LVM2_DIR)/configure \
132131
--prefix=/usr \
133132
--host=$(TARGET) \
134-
--with-clvmd=none \
135133
--disable-nls \
136134
--disable-selinux \
135+
--disable-readline \
136+
--disable-systemd-journal \
137+
--without-systemd \
138+
--without-udev \
139+
--disable-use-lvmlockd \
140+
--disable-use-lvmpolld \
137141
CC=$(CROSSPREFIX)gcc \
138142
CFLAGS="$(ONIE_CFLAGS)" \
139143
LDFLAGS="$(ONIE_LDFLAGS)"
@@ -150,7 +154,7 @@ $(LVM2_BUILD_STAMP): $(LVM2_CONFIGURE_STAMP) $(UTILLINUX_BUILD_STAMP)
150154
$(Q) touch $@
151155

152156
lvm2-install: $(LVM2_INSTALL_STAMP)
153-
$(LVM2_INSTALL_STAMP): $(SYSROOT_INIT_STAMP) $(LVM2_BUILD_STAMP) $(UTILLINUX_INSTALL_STAMP)
157+
$(LVM2_INSTALL_STAMP): $(SYSROOT_INIT_STAMP) $(LVM2_BUILD_STAMP) $(UTILLINUX_INSTALL_STAMP) $(LIBAIO_INSTALL_STAMP)
154158
$(Q) rm -f $@ && eval $(PROFILE_STAMP)
155159
$(Q) echo "==== Installing lvm2 programs in $(SYSROOTDIR) ===="
156160
$(Q) for file in $(LVM2_PROGS) ; do \

patches/lvm2/0001-add-sysmacros.h-to-filter-sysfs.c

Lines changed: 0 additions & 10 deletions
This file was deleted.

patches/lvm2/series

Lines changed: 8 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1,8 @@
1-
0001-add-sysmacros.h-to-filter-sysfs.c
1+
# This series applies on lvm2 release LVM2.2.03.41
2+
#
3+
# No patches required.
4+
#
5+
# The former 0001-add-sysmacros.h-to-filter-sysfs.c patch (which added
6+
# <sys/sysmacros.h> for the major()/minor() macros to satisfy newer glibc)
7+
# is now upstream as of the 2.03 series and no longer applies, so it has
8+
# been dropped.

upstream/LVM2.2.03.41.tgz.sha1

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
8a16e5e133da63f1aae3d6416aee568bc203df0f LVM2.2.03.41.tgz

0 commit comments

Comments
 (0)