mirrors/flatcar-scripts
1
0
Fork 0
mirror of https://github.com/flatcar/scripts.git synced 2025-08-22 23:11:07 +02:00
Code Issues Packages Projects Releases Wiki Activity

sys-fs/lvm2: apply CoreOS changes and bump

Browse Source 
There is a dependency loop when systemd is build with cryptsetup
like systemd -> cryptsetup -> lvm2 -> baselayout -> systemd.  Since
CoreOS always installs a good baselayout, it makes sense drop the
lvm2 dependency and turn it into a conflict with bad versions.  It
also has a runtime dependency loop on systemd, so make that into a
build dependency.

This also stabilizes the version that was being used by arm64,
updating amd64, to bring the architectures into alignment.
This commit is contained in:
David Michael 2017-03-10 13:13:43 -08:00
parent 445d252966
commit 31af91da89
2 changed files with 3 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
sdk_container/src/third_party/coreos-overlay/profiles/coreos/arm64/package.accept_keywords vendored
View File

@ -41,7 +41,6 @@
=sys-devel/bison-3.0.4-r1 ~arm64 =sys-devel/bison-3.0.4-r1 ~arm64
=sys-fs/cryptsetup-1.7.2 ** =sys-fs/cryptsetup-1.7.2 **
=sys-fs/lsscsi-0.28 ** =sys-fs/lsscsi-0.28 **
=sys-fs/lvm2-2.02.145-r2 ~arm64
=sys-fs/mdadm-3.4 ** =sys-fs/mdadm-3.4 **
=sys-fs/quota-4.02 ** =sys-fs/quota-4.02 **
=sys-fs/squashfs-tools-4.3-r2 ~arm64 =sys-fs/squashfs-tools-4.3-r2 ~arm64

6
sdk_container/src/third_party/coreos-overlay/sys-fs/lvm2/lvm2-2.02.145-r2.ebuild → sdk_container/src/third_party/coreos-overlay/sys-fs/lvm2/lvm2-2.02.145-r3.ebuild vendored
View File

@ -11,7 +11,7 @@ SRC_URI="ftp://sourceware.org/pub/lvm2/${PN/lvm/LVM}.${PV}.tgz
LICENSE="GPL-2" LICENSE="GPL-2"
SLOT="0" SLOT="0"
KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-linux ~x86-linux" KEYWORDS="~alpha amd64 ~arm arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-linux ~x86-linux"
IUSE="readline static static-libs systemd clvm cman corosync lvm1 lvm2create_initrd openais selinux +udev +thin device-mapper-only" IUSE="readline static static-libs systemd clvm cman corosync lvm1 lvm2create_initrd openais selinux +udev +thin device-mapper-only"
REQUIRED_USE="device-mapper-only? ( !clvm !cman !corosync !lvm1 !lvm2create_initrd !openais !thin ) REQUIRED_USE="device-mapper-only? ( !clvm !cman !corosync !lvm1 !lvm2create_initrd !openais !thin )
systemd? ( udev ) systemd? ( udev )
@ -26,13 +26,12 @@ DEPEND_COMMON="
) )
readline? ( sys-libs/readline:0= ) readline? ( sys-libs/readline:0= )
systemd? ( >=sys-apps/systemd-205:0= )
udev? ( >=virtual/libudev-208:=[static-libs?] )" udev? ( >=virtual/libudev-208:=[static-libs?] )"
# /run is now required for locking during early boot. /var cannot be assumed to # /run is now required for locking during early boot. /var cannot be assumed to
# be available -- thus, pull in recent enough baselayout for /run. # be available -- thus, pull in recent enough baselayout for /run.
# This version of LVM is incompatible with cryptsetup <1.1.2. # This version of LVM is incompatible with cryptsetup <1.1.2.
RDEPEND="${DEPEND_COMMON} RDEPEND="${DEPEND_COMMON}
>=sys-apps/baselayout-2.2 !<sys-apps/baselayout-2.2
!<sys-apps/openrc-0.11 !<sys-apps/openrc-0.11
!<sys-fs/cryptsetup-1.1.2 !<sys-fs/cryptsetup-1.1.2
!!sys-fs/clvm !!sys-fs/clvm
@ -46,6 +45,7 @@ DEPEND="${DEPEND_COMMON}
virtual/pkgconfig virtual/pkgconfig
>=sys-devel/binutils-2.20.1-r1 >=sys-devel/binutils-2.20.1-r1
sys-devel/autoconf-archive sys-devel/autoconf-archive
systemd? ( >=sys-apps/systemd-205:0= )
static? ( static? (
selinux? ( sys-libs/libselinux[static-libs] ) selinux? ( sys-libs/libselinux[static-libs] )
udev? ( >=sys-fs/eudev-3.1.2[static-libs] ) udev? ( >=sys-fs/eudev-3.1.2[static-libs] )