diff options
author | David Seifert <soap@gentoo.org> | 2023-06-02 15:02:37 +0200 |
---|---|---|
committer | David Seifert <soap@gentoo.org> | 2023-06-02 15:02:37 +0200 |
commit | 74999508c7b1a19ad0422a22c35bc11e4e79cb1b (patch) | |
tree | 54af4fa8446bd8a179368e403da41621e648b84f /sys-fs | |
parent | app-admin/sysklogd: add 2.5.0 (diff) | |
download | gentoo-74999508c7b1a19ad0422a22c35bc11e4e79cb1b.tar.gz gentoo-74999508c7b1a19ad0422a22c35bc11e4e79cb1b.tar.bz2 gentoo-74999508c7b1a19ad0422a22c35bc11e4e79cb1b.zip |
sys-fs/lvm2: drop 2.03.20
Signed-off-by: David Seifert <soap@gentoo.org>
Diffstat (limited to 'sys-fs')
-rw-r--r-- | sys-fs/lvm2/Manifest | 1 | ||||
-rw-r--r-- | sys-fs/lvm2/files/lvm2-2.03.20-locale-muck.patch | 11 | ||||
-rw-r--r-- | sys-fs/lvm2/files/lvm2-2.03.20-lvm2create_initrd.patch | 79 | ||||
-rw-r--r-- | sys-fs/lvm2/lvm2-2.03.20.ebuild | 302 |
4 files changed, 0 insertions, 393 deletions
diff --git a/sys-fs/lvm2/Manifest b/sys-fs/lvm2/Manifest index 01f7b2833c23..8d5003223fb4 100644 --- a/sys-fs/lvm2/Manifest +++ b/sys-fs/lvm2/Manifest @@ -1,2 +1 @@ -DIST LVM2.2.03.20.tgz 2739763 BLAKE2B 4dc223eca1a370450c3985a5f962a2450a2ed08f1fa40af98d181a1530960a7caa3e896a3b54f0f333e2d6818bf35378b9c491a1488a4d3815959ab0e1f987de SHA512 202ff19f6ab1e1ecdf448beec6c7db1a80885efda1a6eeabf44cd2cea40577405c388eabd86f59f34c6e9e400188050bc6d1a5d5daf02f2beda87eee73cd1a2d DIST LVM2.2.03.21.tgz 2742294 BLAKE2B 529bc01b3d1ba6207c9ddc95309b39e6293fcd0286334240b9fdc076da0b7bc7e026338ec0243564ec153f2fb5009014149c3f8e0db0cd47a29418af62068728 SHA512 6024811c3fa92afd2fc13a10d1c3542352aa9a016f40c3ef588bd2f5f3e41245fed4b36c8a87d9f7f8dddc6e13b7253396f5c811f99665df27751676dc7b5bde diff --git a/sys-fs/lvm2/files/lvm2-2.03.20-locale-muck.patch b/sys-fs/lvm2/files/lvm2-2.03.20-locale-muck.patch deleted file mode 100644 index c672a10e2cf6..000000000000 --- a/sys-fs/lvm2/files/lvm2-2.03.20-locale-muck.patch +++ /dev/null @@ -1,11 +0,0 @@ ---- a/make.tmpl.in -+++ b/make.tmpl.in -@@ -571,7 +571,7 @@ - ( cat $(srcdir)/.exported_symbols; \ - if test -n "$(EXPORTED_HEADER)"; then \ - $(CC) -E -P $(INCLUDES) $(DEFS) $(EXPORTED_HEADER) | \ -- $(SED) -ne "/^typedef|}/!s/.*[ *]\($(EXPORTED_FN_PREFIX)_[a-z0-9_]*\)(.*/\1/p"; \ -+ LC_ALL=C $(SED) -ne "/^typedef|}/!s/.*[ *]\($(EXPORTED_FN_PREFIX)_[a-z0-9_]*\)(.*/\1/p"; \ - fi \ - ) > $@ - diff --git a/sys-fs/lvm2/files/lvm2-2.03.20-lvm2create_initrd.patch b/sys-fs/lvm2/files/lvm2-2.03.20-lvm2create_initrd.patch deleted file mode 100644 index 007b2b5c1e3a..000000000000 --- a/sys-fs/lvm2/files/lvm2-2.03.20-lvm2create_initrd.patch +++ /dev/null @@ -1,79 +0,0 @@ ---- a/scripts/lvm2create_initrd/lvm2create_initrd -+++ b/scripts/lvm2create_initrd/lvm2create_initrd -@@ -54,7 +54,9 @@ - DEVRAM=/tmp/initrd.$$ - - # set defaults --BINFILES=${BINFILES:-"`which lvm` `which bash` `which busybox` `which pivot_root`"} -+LVM=`which lvm.static` -+LVM=${LVM:-"`which lvm`"} -+BINFILES=${BINFILES:-"${LVM} `which bash` `which busybox` `which pivot_root`"} - BASICDEVICES=${BASICDEVICES:-"std consoleonly fd"} - BLOCKDEVICES=${BLOCKDEVICES:-"md hda hdb hdc hdd sda sdb sdc sdd"} - MAKEDEV=${MAKEDEV:-"debian"} -@@ -119,6 +121,10 @@ - echo "$PRE Mounting /proc" - mount -t proc none /proc - -+# We need /sys for lvm -+echo "$PRE Mounting /sys" -+mount -t sysfs sysfs /sys -+ - # plug in modules listed in /etc/modules - if [ -f /etc/modules ]; then - echo -n "$PRE plugging in kernel modules:" -@@ -179,26 +185,29 @@ - # run a shell if we're passed lvm2rescue on commandline - grep lvm2rescue /proc/cmdline 1>/dev/null 2>&1 - if [ $? -eq 0 ]; then -- lvm vgchange --ignorelockingfailure -P -a y -+ $LVM vgchange --ignorelockingfailure -P -a y - do_shell - else -- lvm vgchange --ignorelockingfailure -a y -+ $LVM vgchange --ignorelockingfailure -a y - fi - - echo "$PRE Mounting root filesystem $rootvol ro" - mkdir /rootvol - if ! mount -t auto -o ro $rootvol /rootvol; then -- echo "\t*FAILED*"; -+ echo "\t*FAILED TRYING TO MOUNT ROOTVOL*"; - do_shell - fi - - echo "$PRE Umounting /proc" - umount /proc - -+echo "$PRE Umounting /sys" -+umount /sys -+ - echo "$PRE Changing roots" - cd /rootvol - if ! pivot_root . initrd ; then -- echo "\t*FAILED*" -+ echo "\t*FAILED PIVOT TO NEW ROOT*" - do_shell - fi - -@@ -356,7 +365,7 @@ - fi - - verbose "creating basic set of directories in $TMPMNT" --(cd $TMPMNT; mkdir bin dev etc lib proc sbin var) -+(cd $TMPMNT; mkdir bin dev etc lib proc sbin sys var) - if [ $? -ne 0 ]; then - echo "$cmd -- ERROR creating directories in $TMPMNT" - cleanup 1 -@@ -460,9 +469,9 @@ - rmdir $TMPMNT/lost+found - - echo "$cmd -- ummounting ram disk" --umount $DEVRAM -+umount $TMPMNT - if [ $? -ne 0 ]; then -- echo "$cmd -- ERROR umounting $DEVRAM" -+ echo "$cmd -- ERROR umounting $TMPMNT" - cleanup 1 - fi - diff --git a/sys-fs/lvm2/lvm2-2.03.20.ebuild b/sys-fs/lvm2/lvm2-2.03.20.ebuild deleted file mode 100644 index 1c7fd041e178..000000000000 --- a/sys-fs/lvm2/lvm2-2.03.20.ebuild +++ /dev/null @@ -1,302 +0,0 @@ -# Copyright 1999-2023 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=8 - -TMPFILES_OPTIONAL=1 -inherit autotools linux-info systemd toolchain-funcs tmpfiles udev flag-o-matic - -DESCRIPTION="User-land utilities for LVM2 (device-mapper) software" -HOMEPAGE="https://sourceware.org/lvm2/" -SRC_URI="https://sourceware.org/ftp/lvm2/${PN^^}.${PV}.tgz" -S="${WORKDIR}/${PN^^}.${PV}" - -LICENSE="GPL-2" -SLOT="0" -KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux" -IUSE="lvm lvm2create-initrd readline sanlock selinux static static-libs systemd thin +udev" -REQUIRED_USE=" - static? ( !systemd !udev ) - static-libs? ( static !udev ) - systemd? ( udev ) - thin? ( lvm )" - -DEPEND_COMMON=" - udev? ( virtual/libudev:= ) - lvm? ( - dev-libs/libaio - sys-apps/util-linux - readline? ( sys-libs/readline:= ) - sanlock? ( sys-cluster/sanlock ) - systemd? ( sys-apps/systemd:= ) - )" -# /run is now required for locking during early boot. /var cannot be assumed to -# be available -- thus, pull in recent enough baselayout for /run. -# This version of LVM is incompatible with cryptsetup <1.1.2. -RDEPEND="${DEPEND_COMMON} - >=sys-apps/baselayout-2.2 - lvm? ( - virtual/tmpfiles - lvm2create-initrd? ( sys-apps/makedev ) - thin? ( sys-block/thin-provisioning-tools ) - )" -# note: thin- 0.3.0 is required to avoid --disable-thin_check_needs_check -DEPEND="${DEPEND_COMMON} - static? ( - lvm? ( - dev-libs/libaio[static-libs] - sys-apps/util-linux[static-libs] - readline? ( sys-libs/readline[static-libs] ) - ) - selinux? ( sys-libs/libselinux[static-libs] ) - )" -BDEPEND=" - sys-devel/autoconf-archive - virtual/pkgconfig" - -PATCHES=( - # Gentoo specific modification(s): - "${FILESDIR}"/${PN}-2.03.20-example.conf.in.patch - - # For upstream -- review and forward: - "${FILESDIR}"/${PN}-2.03.20-lvm2create_initrd.patch - "${FILESDIR}"/${PN}-2.03.20-locale-muck.patch #330373 - "${FILESDIR}"/${PN}-2.03.20-dmeventd-no-idle-exit.patch - "${FILESDIR}"/${PN}-2.03.20-freopen-musl.patch -) - -pkg_setup() { - local CONFIG_CHECK="~SYSVIPC" - - if use udev; then - local WARNING_SYSVIPC="CONFIG_SYSVIPC:\tis not set (required for udev sync)\n" - if linux_config_exists; then - local uevent_helper_path=$(linux_chkconfig_string UEVENT_HELPER_PATH) - if [[ -n "${uevent_helper_path}" ]] && [[ "${uevent_helper_path}" != '""' ]]; then - ewarn "It's recommended to set an empty value to the following kernel config option:" - ewarn "CONFIG_UEVENT_HELPER_PATH=${uevent_helper_path}" - fi - fi - fi - - check_extra_config - - # 1. Genkernel no longer copies /sbin/lvm blindly. - if use static; then - elog "Warning, we no longer overwrite /sbin/lvm and /sbin/dmsetup with" - elog "their static versions. If you need the static binaries," - elog "you must append .static to the filename!" - fi -} - -src_prepare() { - default - - # Users without systemd get no auto-activation of any logical volume - if ! use systemd ; then - eapply "${FILESDIR}"/${PN}-2.03.20-dm_lvm_rules_no_systemd.patch - fi - - eautoreconf -} - -src_configure() { - filter-flags -flto - - # Workaround for bug #822210 - tc-ld-disable-gold - - # Most of this package does weird stuff. - # The build options are tristate, and --without is NOT supported - # options: 'none', 'internal', 'shared' - local myeconfargs=( - $(use_enable lvm dmfilemapd) - $(use_enable lvm dmeventd) - $(use_enable lvm cmdlib) - $(use_enable lvm fsadm) - $(use_enable lvm lvmpolld) - - # This only causes the .static versions to become available - $(usev static --enable-static_link) - - # dmeventd requires mirrors to be internal, and snapshot available - # so we cannot disable them - --with-mirrors="$(usex lvm internal none)" - --with-snapshots="$(usex lvm internal none)" - ) - - if use lvm && use thin; then - myeconfargs+=( --with-thin=internal --with-cache=internal ) - local texec - for texec in check dump repair restore; do - myeconfargs+=( --with-thin-${texec}="${EPREFIX}"/sbin/thin_${texec} ) - myeconfargs+=( --with-cache-${texec}="${EPREFIX}"/sbin/cache_${texec} ) - done - else - myeconfargs+=( --with-thin=none --with-cache=none ) - fi - - myeconfargs+=( - # musl doesn't do symbol versioning so can end up with - # runtime breakage. - --with-symvers=$(usex elibc_glibc 'gnu' 'no') - $(use_enable readline) - $(use_enable selinux) - --enable-pkgconfig - --with-confdir="${EPREFIX}"/etc - --exec-prefix="${EPREFIX}" - --sbindir="${EPREFIX}/sbin" - --with-staticdir="${EPREFIX}"/sbin - --libdir="${EPREFIX}/$(get_libdir)" - --with-usrlibdir="${EPREFIX}/usr/$(get_libdir)" - --with-default-dm-run-dir=/run - --with-default-run-dir=/run/lvm - --with-default-locking-dir=/run/lock/lvm - --with-default-pid-dir=/run - $(use_enable udev udev_rules) - $(use_enable udev udev_sync) - $(use_with udev udevdir "${EPREFIX}$(get_udevdir)"/rules.d) - # USE=sanlock requires USE=lvm - $(use_enable $(usex lvm sanlock lvm) lvmlockd-sanlock) - $(use_enable systemd notify-dbus) - $(use_enable systemd app-machineid) - $(use_enable systemd systemd-journal) - $(use_with systemd systemd-run "/usr/bin/systemd-run") - --with-systemdsystemunitdir="$(systemd_get_systemunitdir)" - CLDFLAGS="${LDFLAGS}" - ) - - econf "${myeconfargs[@]}" -} - -src_compile() { - emake V=1 -C include - - if use lvm ; then - emake V=1 - emake V=1 CC="$(tc-getCC)" -C scripts - else - emake V=1 device-mapper - # https://bugs.gentoo.org/878131 - emake V=1 -C libdm/dm-tools device-mapper - fi -} - -src_test() { - einfo "Tests are disabled because of device-node mucking, if you want to" - einfo "run tests, compile the package and see ${S}/tests" -} - -src_install() { - local INSTALL_TARGETS=( - # full LVM2 - $(usev lvm "install install_tmpfiles_configuration") - # install systemd related files only when requested, bug #522430 - $(usev $(usex lvm systemd lvm) "SYSTEMD_GENERATOR_DIR=$(systemd_get_systemgeneratordir) install_systemd_units install_systemd_generators") - - # install dm unconditionally - install_device-mapper - ) - emake V=1 DESTDIR="${D}" "${INSTALL_TARGETS[@]}" - - newinitd "${FILESDIR}"/device-mapper.rc-r3 device-mapper - newconfd "${FILESDIR}"/device-mapper.conf-r4 device-mapper - - if use lvm ; then - newinitd "${FILESDIR}"/dmeventd.initd-r3 dmeventd - newinitd "${FILESDIR}"/lvm.rc-r1 lvm - newconfd "${FILESDIR}"/lvm.confd-r4 lvm - if ! use udev ; then - # We keep the variable but remove udev from it. - sed -r -i \ - -e '/^rc_need=/s/\<udev\>//g' \ - "${ED}"/etc/conf.d/lvm || die "Could not drop udev from rc_need" - fi - - newinitd "${FILESDIR}"/lvm-monitoring.initd-r3 lvm-monitoring - newinitd "${FILESDIR}"/lvmpolld.initd-r1 lvmpolld - - if use lvm2create-initrd; then - dosbin scripts/lvm2create_initrd/lvm2create_initrd - doman scripts/lvm2create_initrd/lvm2create_initrd.8 - newdoc scripts/lvm2create_initrd/README README.lvm2create_initrd - fi - - if use sanlock; then - newinitd "${FILESDIR}"/lvmlockd.initd-r2 lvmlockd - fi - fi - - if use static-libs; then - dolib.a libdm/ioctl/libdevmapper.a - if use lvm; then - # depends on lvmetad - dolib.a libdaemon/client/libdaemonclient.a #462908 - # depends on dmeventd - dolib.a daemons/dmeventd/libdevmapper-event.a - fi - else - rm -f "${ED}"/usr/$(get_libdir)/{libdevmapper-event,liblvm2cmd,liblvm2app,libdevmapper}.a || die - fi - - insinto /etc - doins "${FILESDIR}"/dmtab - - dodoc README VERSION* WHATS_NEW WHATS_NEW_DM doc/*.{c,txt} conf/*.conf -} - -pkg_preinst() { - HAD_LVM=0 - - if has_version 'sys-fs/lvm2[lvm(+)]' ; then - HAD_LVM=1 - fi -} - -pkg_postinst() { - use lvm && tmpfiles_process lvm2.conf - use udev && udev_reload - - # This is a new installation - if [[ -z "${REPLACING_VERSIONS}" ]]; then - if use lvm ; then - ewarn "Make sure the \"lvm\" init script is in the runlevels:" - ewarn "# rc-update add lvm boot" - ewarn - ewarn "Make sure to enable lvmetad in ${EROOT}/etc/lvm/lvm.conf if you want" - ewarn "to enable lvm autoactivation and metadata caching." - else - ewarn "Please enable USE=lvm if you need the LVM daemon and" - ewarn "tools like 'lvchange', 'vgchange', etc!" - fi - else - if ! use lvm && [[ ${HAD_LVM} -eq 1 ]] ; then - ewarn "LVM was previously enabled but is now disabled." - ewarn "Please enable USE=lvm if you need the LVM daemon and" - ewarn "tools like 'lvchange', 'vgchange', etc!" - ewarn "See the 2022-11-19-lvm2-default-USE-flags news item for more details." - fi - fi - - if use udev && [[ -d /run ]] ; then - local permission_run_expected="drwxr-xr-x" - local permission_run=$(stat -c "%A" /run) - if [[ "${permission_run}" != "${permission_run_expected}" ]] ; then - ewarn "Found the following problematic permissions:" - ewarn "" - ewarn " ${permission_run} /run" - ewarn "" - ewarn "Expected:" - ewarn "" - ewarn " ${permission_run_expected} /run" - ewarn "" - ewarn "This is known to cause problems for udev-enabled LVM services." - fi - fi -} - -pkg_postrm() { - if use udev && [[ -z ${REPLACED_BY_VERSION} ]]; then - udev_reload - fi -} |