Skip to Content.
Sympa Menu

sm-commit - Re: [SM-Commit] GIT changes to master grimoire by Ismael Luceno (f57ef77d4df0a16868cc9da72ebd33230e22e064)

sm-commit AT lists.ibiblio.org

Subject: Source Mage code commit list

List archive

Chronological Thread  
  • From: Pavel Vinogradov <vin.public AT gmail.com>
  • To: sm-commit AT lists.ibiblio.org
  • Subject: Re: [SM-Commit] GIT changes to master grimoire by Ismael Luceno (f57ef77d4df0a16868cc9da72ebd33230e22e064)
  • Date: Sat, 3 Sep 2022 15:22:23 -0400

CONFIGURE cleanup code is suspicious. These lines:
case "$i" in
(--without*) res=disabled ;;
(--with*) res=enabled ;;
(*) continue ;;
esac &&

On Sat, Sep 03, 2022 at 02:07:37PM +0000, Ismael Luceno wrote:
> GIT changes to master grimoire by Ismael Luceno <ismael AT sourcemage.org>:
>
> libs/libvirt/CONFIGURE | 46 +++++++++++++++++++-----------
> libs/libvirt/DEPENDS | 64
> ++++++++++++-------------------------------
> libs/libvirt/DETAILS | 6 ++--
> libs/libvirt/HISTORY | 4 ++
> libs/libvirt/PRE_SUB_DEPENDS | 5 ---
> libs/libvirt/SUB_DEPENDS | 6 ----
> 6 files changed, 54 insertions(+), 77 deletions(-)
>
> New commits:
> commit f57ef77d4df0a16868cc9da72ebd33230e22e064
> Author: Ismael Luceno <ismael AT sourcemage.org>
> Commit: Ismael Luceno <ismael AT sourcemage.org>
>
> libvirt 8.6.0
>
> diff --git a/libs/libvirt/CONFIGURE b/libs/libvirt/CONFIGURE
> index 911d332..a9d3634 100755
> --- a/libs/libvirt/CONFIGURE
> +++ b/libs/libvirt/CONFIGURE
> @@ -1,35 +1,47 @@
> +# Migrate ac-style options to meson
> +list_remove LIBVIRT_OPTS \
> + --with{,out}-{uml,driver-modules,xen-inotify,avahi,hal} &&
> +for i in $LIBVIRT_OPTS; do
> + case "$i" in
> + (--without*) res=disabled ;;
> + (--with*) res=enabled ;;
> + (*) continue ;;
> + esac &&
> + list_remove LIBVIRT_OPTS "$i" &&
> + i="${i#--*-}" &&
> + case "$i" in
> + (xenapi) i=driver_libxl ;;
> + (network|qemu|vmware|esx|lxc|vbox|remote|libvirtd) i="driver_$i" ;;
> + esac &&
> + list_add LIBVIRT_OPTS "${i/-/_}=$res" || exit 1
> +done
> +
> config_query_option LIBVIRT_OPTS 'Build mpath storage backend' y \
> - '--with-storage-mpath' '--without-storage-mpath' &&
> + storage_mpath={enabled,disabled} &&
>
> config_query_option LIBVIRT_OPTS 'Build FileSystem storage backend' y \
> - '--with-storage-fs' '--without-storage-fs' &&
> + storage_fs={enabled,disabled} &&
>
> config_query_option LIBVIRT_OPTS 'Build virtual network driver' y \
> - '--with-network' '--without-network' &&
> + driver_network={enabled,disabled} &&
>
> config_query_option LIBVIRT_OPTS 'Build with QEMU/KVM support' y \
> - '--with-qemu' '--without-qemu' &&
> + driver_qemu={enabled,disabled} &&
>
> config_query_option LIBVIRT_OPTS 'Build with VMWare Workstation/Player
> support' y \
> - '--with-vmware' '--without-vmware' &&
> + driver_vmware={enabled,disabled} &&
>
> config_query_option LIBVIRT_OPTS 'Build with VMWare ESX/GSX support' y \
> - '--with-esx' '--without-esx' &&
> + driver_esx={enabled,disabled} &&
>
> -config_query_option LIBVIRT_OPTS 'Build Linux Containers(lxc) support' y
> \
> - '--with-lxc' '--without-lxc' &&
> +config_query_option LIBVIRT_OPTS 'Build Linux Containers (lxc) support'
> y \
> + driver_lxc={enabled,disabled} &&
>
> config_query_option LIBVIRT_OPTS 'Build VirtualBox support' y \
> - '--with-vbox' '--without-vbox' &&
> -
> -config_query_option LIBVIRT_OPTS 'Build User Mode Linux support' y \
> - '--with-uml' '--without-uml' &&
> + driver_vbox={enabled,disabled} &&
>
> config_query_option LIBVIRT_OPTS 'Build remote driver support?' y \
> - '--with-remote' '--without-remote' &&
> + driver_remote={enabled,disabled} &&
>
> config_query_option LIBVIRT_OPTS 'Build libvirtd support?' y \
> - '--with-libvirtd' '--without-libvirtd' &&
> -
> -config_query_option LIBVIRT_OPTS 'Build drivers as loadable modules?' n \
> - '--with-driver-modules' '--without-driver-modules'
> + driver_libvirtd={enabled,disabled}
> diff --git a/libs/libvirt/DEPENDS b/libs/libvirt/DEPENDS
> index 5dbdf80..ecd5ea2 100755
> --- a/libs/libvirt/DEPENDS
> +++ b/libs/libvirt/DEPENDS
> @@ -1,3 +1,4 @@
> +. "$GRIMOIRE"/MESON_DEPENDS &&
> depends gnutls &&
> depends libxml2 &&
> depends readline &&
> @@ -5,84 +6,55 @@ depends curl &&
> depends glib2 &&
> depends libpciaccess &&
> depends yajl &&
> +depends python3 &&
>
> -depends -sub "LVM_FULL" lvm '--with-storage-lvm' &&
> -
> -optional_depends avahi \
> - '--with-avahi' \
> - '--without-avahi' \
> - 'for Avahi remote daemon advertising' &&
> +optional_depends -sub "LVM_FULL" lvm \
> + storage_lvm={enabled,disabled} &&
>
> optional_depends LIBSASL \
> - '--with-sasl' \
> - '--without-sasl' \
> + sasl={enabled,disabled} \
> 'for Cyrus SASL authentication support' &&
>
> optional_depends gettext \
> - '--enable-nls' \
> - '--disable-nls' \
> + nls={enabled,disabled} \
> 'for Native Language support' &&
>
> -optional_depends iptables \
> - '' \
> - '' \
> - 'for IP table routing support' &&
> -
> -optional_depends xen \
> - '--with-xenapi' \
> - '--without-xenapi' \
> - 'for Xen API support' &&
> -
> -if is_depends_enabled $SPELL xen ; then
> -config_query_option LIBVIRT_OPTS 'Enable Xen inotify support' y \
> - '--with-xen-inotify' '--without-xen-inotify'
> -fi &&
> +optional_depends libxl \
> + driver_libxl={enabled,disabled} \
> + 'for Xen support' &&
>
> optional_depends parted \
> - '--with-storage-disk' \
> - '--without-storage-disk' \
> + storage_disk={enabled,disabled} \
> 'for GParted partitioning backend' &&
>
> -optional_depends hal \
> - '--with-hal' \
> - '--without-hal' \
> - 'HAL support' &&
> -
> -optional_depends 'python' '' '' 'Python bindings' &&
> -
> optional_depends policykit \
> - '--with-polkit' \
> - '--without-polkit' \
> + polkit={enabled,disabled} \
> 'PolicyKit support' &&
>
> optional_depends libssh2 \
> - '--with-ssh2' \
> - '--without-ssh2' \
> + libssh2={enabled,disabled} \
> 'SSH2 support' &&
>
> optional_depends DEVICE-MANAGER \
> - '--with-udev' \
> - '--without-udev' \
> + udev={enabled,disabled} \
> 'to use udev for host device enumeration' &&
>
> optional_depends 'libpcap' \
> - '--with-libpcap' \
> - '--without-libpcap' \
> + libpcap={enabled,disabled} \
> 'for a packet filtering mechanism' &&
>
> optional_depends 'libselinux' \
> - '--with-selinux' \
> - '--without-selinux' \
> + selinux={enabled,disabled} \
> 'for Security Enhanced Linux (SELinux) support' &&
>
> optional_depends 'fuse' \
> - '--with-fuse' \
> - '--without-fuse' \
> + fuse={enabled,disabled} \
> 'for FUSE filesystem support for lxc' &&
>
> +suggest_depends iptables '' '' 'for IP table routing support' &&
> suggest_depends -sub 'NMAP_NCAT NMAP_NC_SYMLINK' nmap '' '' 'for remote
> SSH tunneling' &&
> suggest_depends 'bridge-utils' '' '' 'for creating TUN/TAP bridges' &&
> suggest_depends 'iproute2' '' '' 'for routing between TUN/TAP interfaces'
> &&
> suggest_depends 'dnsmasq' '' '' 'for providing DHCP on virtual networks'
> &&
> -suggest_depends QEMU '' '' "for QEMU (use
> ${SPELL_COLOR}kvm${DEFAULT_COLOR} for QEMU/KVM) binaries?" &&
> +suggest_depends qemu '' '' 'for QEMU support' &&
> suggest_depends 'ebtables' '' '' 'for firewall/NAT support'
> diff --git a/libs/libvirt/DETAILS b/libs/libvirt/DETAILS
> index f1d722d..2c7392f 100755
> --- a/libs/libvirt/DETAILS
> +++ b/libs/libvirt/DETAILS
> @@ -1,8 +1,8 @@
> +. "$GRIMOIRE"/MESON_FUNCTIONS
> SPELL=libvirt
> - VERSION=4.4.0
> - PATCHLEVEL=2
> + VERSION=8.6.0
> SOURCE=$SPELL-$VERSION.tar.xz
> -
> SOURCE_HASH=sha512:725b9b093a2aaeab6fdcb8df341a400ab363bcd50af8400dfd0593c41d8fbc8352f89147be9fbfde2e8418cc7298e090fe07ec7255b0aff1f0d001b93322f93f
> +
> SOURCE_HASH=sha512:6198ac33ea718045bfd12a2740d5a7fa70c754b1ecda7c0cad5791fbdf7311091587056254fde88ebe3c2f927a8fb56909fe4c3a115595854b18d3a704db73de
> SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELL-$VERSION
> SOURCE_URL[0]=https://libvirt.org/sources/$SOURCE
> LICENSE[0]=LGPL
> diff --git a/libs/libvirt/HISTORY b/libs/libvirt/HISTORY
> index 7ba79c0..5a560f7 100644
> --- a/libs/libvirt/HISTORY
> +++ b/libs/libvirt/HISTORY
> @@ -1,3 +1,7 @@
> +2022-09-03 Ismael Luceno <ismael AT sourcemage.org>
> + * DETAILS, DEPENDS: updated spell to 8.6.0
> + * PRE_SUB_DEPENDS, SUB_DEPENDS: removed, no longer needed
> +
> 2021-02-25 Eric Sandall <sandalle AT sourcemage.org>
> * DEPENDS: Remove duplicate dependency on gnutls
>
> diff --git a/libs/libvirt/PRE_SUB_DEPENDS b/libs/libvirt/PRE_SUB_DEPENDS
> deleted file mode 100755
> index b250742..0000000
> --- a/libs/libvirt/PRE_SUB_DEPENDS
> +++ /dev/null
> @@ -1,5 +0,0 @@
> -case $THIS_SUB_DEPENDS in
> - PYTHON) is_depends_enabled $SPELL python;;
> - *) message "${PROBLEM_COLOR}bogus sub_depends: $SPELL
> $THIS_SUB_DEPENDS${DEFAULT_COLOR}"
> - return 1;;
> -esac
> diff --git a/libs/libvirt/SUB_DEPENDS b/libs/libvirt/SUB_DEPENDS
> deleted file mode 100755
> index 392aeec..0000000
> --- a/libs/libvirt/SUB_DEPENDS
> +++ /dev/null
> @@ -1,6 +0,0 @@
> -case $THIS_SUB_DEPENDS in
> - PYTHON) message "Python bindings requested, forcing python dependency" &&
> - depends python '--with-python';;
> - *) message "${PROBLEM_COLOR}bogus sub_depends: $SPELL
> $THIS_SUB_DEPENDS${DEFAULT_COLOR}"
> - return 1;;
> -esac




Archive powered by MHonArc 2.6.24.

Top of Page