| 1 |
ssuominen 14/07/30 17:11:27 |
| 2 |
|
| 3 |
Added: lvm2-2.02.108-static-pkgconfig-libs.patch |
| 4 |
lvm2-2.02.108-example.conf.in.patch |
| 5 |
Log: |
| 6 |
Version bump. Fix configure logic for cache since it's tied to thin-provisioning-tools. |
| 7 |
|
| 8 |
(Portage version: 2.2.10/cvs/Linux x86_64, signed Manifest commit with key 4868F14D) |
| 9 |
|
| 10 |
Revision Changes Path |
| 11 |
1.1 sys-fs/lvm2/files/lvm2-2.02.108-static-pkgconfig-libs.patch |
| 12 |
|
| 13 |
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-fs/lvm2/files/lvm2-2.02.108-static-pkgconfig-libs.patch?rev=1.1&view=markup |
| 14 |
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-fs/lvm2/files/lvm2-2.02.108-static-pkgconfig-libs.patch?rev=1.1&content-type=text/plain |
| 15 |
|
| 16 |
Index: lvm2-2.02.108-static-pkgconfig-libs.patch |
| 17 |
=================================================================== |
| 18 |
Maintainer note: Forward ported without editing from lvm2-2.02.107-static-pkgconfig-libs.patch to apply cleanly. |
| 19 |
|
| 20 |
--- configure.in |
| 21 |
+++ configure.in |
| 22 |
@@ -1067,6 +1067,7 @@ |
| 23 |
fi]) |
| 24 |
if test "$BLKID_WIPING" = yes; then |
| 25 |
BLKID_PC="blkid" |
| 26 |
+ BLKID_STATIC_LIBS=`$PKG_CONFIG --static --libs $BLKID_PC` |
| 27 |
AC_DEFINE([BLKID_WIPING_SUPPORT], 1, [Define to 1 to use libblkid detection of signatures when wiping.]) |
| 28 |
fi |
| 29 |
fi |
| 30 |
@@ -1092,6 +1093,7 @@ |
| 31 |
if test "$UDEV_SYNC" = yes; then |
| 32 |
pkg_config_init |
| 33 |
PKG_CHECK_MODULES(UDEV, libudev >= 143, [UDEV_PC="libudev"]) |
| 34 |
+ UDEV_STATIC_LIBS=`$PKG_CONFIG --static --libs libudev` |
| 35 |
AC_DEFINE([UDEV_SYNC_SUPPORT], 1, [Define to 1 to enable synchronisation with udev processing.]) |
| 36 |
fi |
| 37 |
|
| 38 |
@@ -1312,19 +1314,32 @@ |
| 39 |
if test "$SELINUX" = yes; then |
| 40 |
AC_CHECK_LIB([sepol], [sepol_check_context], [ |
| 41 |
AC_DEFINE([HAVE_SEPOL], 1, [Define to 1 if sepol_check_context is available.]) |
| 42 |
- SELINUX_LIBS="-lsepol"]) |
| 43 |
+ SEPOL_LIBS="-lsepol"]) |
| 44 |
+ |
| 45 |
+ dnl -- init pkgconfig if required |
| 46 |
+ if test x$PKGCONFIG_INIT != x1; then |
| 47 |
+ pkg_config_init |
| 48 |
+ fi |
| 49 |
+ PKG_CHECK_MODULES(SELINUX, libselinux, [ |
| 50 |
+ SELINUX_PC="libselinux" |
| 51 |
+ SELINUX_STATIC_LIBS=`$PKG_CONFIG --static --libs libselinux` |
| 52 |
+ SELINUX_LIBS="$SELINUX_LIBS $SEPOL_LIBS" |
| 53 |
+ AC_DEFINE([HAVE_SELINUX], 1, [Define to 1 to include support for selinux.]) |
| 54 |
+ ],[ |
| 55 |
+ dnl -- old non-pkgconfig method, is buggy with static builds |
| 56 |
|
| 57 |
AC_CHECK_LIB([selinux], [is_selinux_enabled], [ |
| 58 |
AC_CHECK_HEADERS([selinux/selinux.h],, hard_bailout) |
| 59 |
AC_CHECK_HEADERS([selinux/label.h]) |
| 60 |
AC_DEFINE([HAVE_SELINUX], 1, [Define to 1 to include support for selinux.]) |
| 61 |
- SELINUX_LIBS="-lselinux $SELINUX_LIBS" |
| 62 |
+ SELINUX_LIBS="-lselinux $SEPOL_LIBS" |
| 63 |
SELINUX_PC="libselinux" |
| 64 |
HAVE_SELINUX=yes ], [ |
| 65 |
AC_MSG_WARN(Disabling selinux) |
| 66 |
SELINUX_LIBS= |
| 67 |
SELINUX_PC= |
| 68 |
HAVE_SELINUX=no ]) |
| 69 |
+ ]) |
| 70 |
fi |
| 71 |
|
| 72 |
################################################################################ |
| 73 |
@@ -1626,6 +1641,7 @@ |
| 74 |
################################################################################ |
| 75 |
AC_SUBST(APPLIB) |
| 76 |
AC_SUBST(AWK) |
| 77 |
+AC_SUBST(BLKID_STATIC_LIBS) |
| 78 |
AC_SUBST(BLKID_PC) |
| 79 |
AC_SUBST(BLKID_WIPING) |
| 80 |
AC_SUBST(BUILD_CMIRRORD) |
| 81 |
@@ -1721,6 +1737,7 @@ |
| 82 |
AC_SUBST(SALCK_CFLAGS) |
| 83 |
AC_SUBST(SALCK_LIBS) |
| 84 |
AC_SUBST(SELINUX_LIBS) |
| 85 |
+AC_SUBST(SELINUX_STATIC_LIBS) |
| 86 |
AC_SUBST(SELINUX_PC) |
| 87 |
AC_SUBST(SNAPSHOTS) |
| 88 |
AC_SUBST(STATICDIR) |
| 89 |
@@ -1735,6 +1752,7 @@ |
| 90 |
AC_SUBST(CACHE_DUMP_CMD) |
| 91 |
AC_SUBST(CACHE_REPAIR_CMD) |
| 92 |
AC_SUBST(CACHE_RESTORE_CMD) |
| 93 |
+AC_SUBST(UDEV_STATIC_LIBS) |
| 94 |
AC_SUBST(UDEV_PC) |
| 95 |
AC_SUBST(UDEV_RULES) |
| 96 |
AC_SUBST(UDEV_SYNC) |
| 97 |
--- make.tmpl.in |
| 98 |
+++ make.tmpl.in |
| 99 |
@@ -43,7 +43,7 @@ |
| 100 |
|
| 101 |
LIBS = @LIBS@ |
| 102 |
# Extra libraries always linked with static binaries |
| 103 |
-STATIC_LIBS = $(SELINUX_LIBS) $(UDEV_LIBS) $(BLKID_LIBS) |
| 104 |
+STATIC_LIBS = $(SELINUX_STATIC_LIBS) $(UDEV_STATIC_LIBS) $(BLKID_STATIC_LIBS) |
| 105 |
DEFS += @DEFS@ |
| 106 |
# FIXME set this only where it's needed, not globally? |
| 107 |
CFLAGS += @CFLAGS@ |
| 108 |
@@ -57,10 +57,13 @@ |
| 109 |
PTHREAD_LIBS = @PTHREAD_LIBS@ |
| 110 |
READLINE_LIBS = @READLINE_LIBS@ |
| 111 |
SELINUX_LIBS = @SELINUX_LIBS@ |
| 112 |
+SELINUX_STATIC_LIBS = @SELINUX_STATIC_LIBS@ |
| 113 |
UDEV_CFLAGS = @UDEV_CFLAGS@ |
| 114 |
UDEV_LIBS = @UDEV_LIBS@ |
| 115 |
+UDEV_STATIC_LIBS = @UDEV_STATIC_LIBS@ |
| 116 |
BLKID_CFLAGS = @BLKID_CFLAGS@ |
| 117 |
BLKID_LIBS = @BLKID_LIBS@ |
| 118 |
+BLKID_STATIC_LIBS = @BLKID_STATIC_LIBS@ |
| 119 |
TESTING = @TESTING@ |
| 120 |
|
| 121 |
# Setup directory variables |
| 122 |
|
| 123 |
|
| 124 |
|
| 125 |
1.1 sys-fs/lvm2/files/lvm2-2.02.108-example.conf.in.patch |
| 126 |
|
| 127 |
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-fs/lvm2/files/lvm2-2.02.108-example.conf.in.patch?rev=1.1&view=markup |
| 128 |
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-fs/lvm2/files/lvm2-2.02.108-example.conf.in.patch?rev=1.1&content-type=text/plain |
| 129 |
|
| 130 |
Index: lvm2-2.02.108-example.conf.in.patch |
| 131 |
=================================================================== |
| 132 |
Maintainer note: Forward ported without editing from lvm2-2.02.99-example.conf.in.patch to apply cleanly. |
| 133 |
|
| 134 |
--- conf/example.conf.in |
| 135 |
+++ conf/example.conf.in |
| 136 |
@@ -105,6 +105,10 @@ |
| 137 |
# By default we accept every block device: |
| 138 |
# filter = [ "a/.*/" ] |
| 139 |
|
| 140 |
+ # Gentoo: we exclude /dev/nbd by default, because it makes a lot of kernel |
| 141 |
+ # noise when you probed while not available. |
| 142 |
+ filter = [ "r|/dev/nbd.*|", "a/.*/" ] |
| 143 |
+ |
| 144 |
# Exclude the cdrom drive |
| 145 |
# filter = [ "r|/dev/cdrom|" ] |
| 146 |
|
| 147 |
@@ -522,7 +526,8 @@ |
| 148 |
# e.g. vgscan.lvm1 and they will stop working after you start using |
| 149 |
# the new lvm2 on-disk metadata format. |
| 150 |
# The default value is set when the tools are built. |
| 151 |
- # fallback_to_lvm1 = 0 |
| 152 |
+ # Gentoo: the LVM tools are a seperate package. |
| 153 |
+ fallback_to_lvm1 = 0 |
| 154 |
|
| 155 |
# The default metadata format that commands should use - "lvm1" or "lvm2". |
| 156 |
# The command line override is -M1 or -M2. |
| 157 |
@@ -1182,12 +1187,13 @@ |
| 158 |
|
| 159 |
# Metadata settings |
| 160 |
# |
| 161 |
-# metadata { |
| 162 |
+metadata { |
| 163 |
# Default number of copies of metadata to hold on each PV. 0, 1 or 2. |
| 164 |
# You might want to override it from the command line with 0 |
| 165 |
# when running pvcreate on new PVs which are to be added to large VGs. |
| 166 |
|
| 167 |
- # pvmetadatacopies = 1 |
| 168 |
+ # Gentoo: enable for data safety, but PV resize is then disabled. |
| 169 |
+ # pvmetadatacopies = 2 |
| 170 |
|
| 171 |
# Default number of copies of metadata to maintain for each VG. |
| 172 |
# If set to a non-zero value, LVM automatically chooses which of |
| 173 |
@@ -1222,7 +1228,7 @@ |
| 174 |
# the supplied toolset to make changes (e.g. vgcfgrestore). |
| 175 |
|
| 176 |
# dirs = [ "/etc/lvm/metadata", "/mnt/disk2/lvm/metadata2" ] |
| 177 |
-#} |
| 178 |
+} |
| 179 |
|
| 180 |
# Event daemon |
| 181 |
# |
Archives