From nobody Sun Feb 8 15:46:14 2026 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of redhat.com designates 205.139.110.61 as permitted sender) client-ip=205.139.110.61; envelope-from=libvir-list-bounces@redhat.com; helo=us-smtp-delivery-1.mimecast.com; Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of redhat.com designates 205.139.110.61 as permitted sender) smtp.mailfrom=libvir-list-bounces@redhat.com; dmarc=pass(p=none dis=none) header.from=redhat.com ARC-Seal: i=1; a=rsa-sha256; t=1594894059; cv=none; d=zohomail.com; s=zohoarc; b=McL1Sc+7wOu4cPSxVJzS3wjt9K/zrtta8Hw+XBUtiN8o/yVjwwJz6nvmMrIXINL5VBT4tXIQgBHo+sM2gS81bCQc1oUzjv24uJvcHom0lRBC3KSY8HTZegAGdZdC4saAb8I2hUlEqf+BWkWVzaaWGBXd3NZ2rmuSWZwXA7lRA8U= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1594894059; h=Content-Type:Content-Transfer-Encoding:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:To; bh=XHSwaW3QgpuU9L/0VnZ8bjGMQzGIpPl22D434Fde0YA=; b=n7SI3KVQjHyl9K6m2wt6owNSXqyQOxI4UmnWH95CT2TlCQGCOfIscUAAGwUw3FVcfPxgULnVB4Lxt6dW3fst7TCIDl2kyZPWvzcvftIsnAo/1sQwlaph23V2HHsaghnPczQwqKqRiYcwJkuuxaOCk4Zn0g0upjqlOGG8sYvgE9Q= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of redhat.com designates 205.139.110.61 as permitted sender) smtp.mailfrom=libvir-list-bounces@redhat.com; dmarc=pass header.from= (p=none dis=none) header.from= Return-Path: Received: from us-smtp-delivery-1.mimecast.com (us-smtp-2.mimecast.com [205.139.110.61]) by mx.zohomail.com with SMTPS id 1594894059619268.87838817241106; Thu, 16 Jul 2020 03:07:39 -0700 (PDT) Received: from mimecast-mx01.redhat.com (mimecast-mx01.redhat.com [209.132.183.4]) (Using TLS) by relay.mimecast.com with ESMTP id us-mta-65-jcmnYoBNMsy21vgzJoW8zQ-1; Thu, 16 Jul 2020 06:03:31 -0400 Received: from smtp.corp.redhat.com (int-mx03.intmail.prod.int.phx2.redhat.com [10.5.11.13]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id C741F10A6; Thu, 16 Jul 2020 10:03:24 +0000 (UTC) Received: from colo-mx.corp.redhat.com (colo-mx01.intmail.prod.int.phx2.redhat.com [10.5.11.20]) by smtp.corp.redhat.com (Postfix) with ESMTPS id A655374F64; Thu, 16 Jul 2020 10:03:24 +0000 (UTC) Received: from lists01.pubmisc.prod.ext.phx2.redhat.com (lists01.pubmisc.prod.ext.phx2.redhat.com [10.5.19.33]) by colo-mx.corp.redhat.com (Postfix) with ESMTP id 55F7E180476B; Thu, 16 Jul 2020 10:03:24 +0000 (UTC) Received: from smtp.corp.redhat.com (int-mx08.intmail.prod.int.phx2.redhat.com [10.5.11.23]) by lists01.pubmisc.prod.ext.phx2.redhat.com (8.13.8/8.13.8) with ESMTP id 06GA3L7V017141 for ; Thu, 16 Jul 2020 06:03:21 -0400 Received: by smtp.corp.redhat.com (Postfix) id 8EE872B6E2; Thu, 16 Jul 2020 10:03:21 +0000 (UTC) Received: from antique-work.redhat.com (unknown [10.40.194.85]) by smtp.corp.redhat.com (Postfix) with ESMTP id 09C982B6DB for ; Thu, 16 Jul 2020 10:03:20 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1594894058; h=from:from:sender:sender:reply-to:subject:subject:date:date: message-id:message-id:to:to:cc:mime-version:mime-version: content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references:list-id:list-help: list-unsubscribe:list-subscribe:list-post; bh=XHSwaW3QgpuU9L/0VnZ8bjGMQzGIpPl22D434Fde0YA=; b=OBBYfDxjaBedefQQF90yV6OterKgO6PeLZRkdh1+I3t3l7X+jbiSxHn8hW0cquhCk5Z0f7 ZGF0j6XRKMAJBN2lqPNlmXu+NUamTNI72Aw05JpkcpkwzULF40hYxEIZmWs1pga1+m/SuD 0Gk2+RwXOe54s8DRsPH5MmgrVVnIUCM= X-MC-Unique: jcmnYoBNMsy21vgzJoW8zQ-1 From: Pavel Hrdina To: libvir-list@redhat.com Subject: [libvirt PATCH 119/351] meson: add login_shell build option Date: Thu, 16 Jul 2020 11:55:55 +0200 Message-Id: <25796d3ffdc65e8425221aee2ae9050d10c247f3.1594891445.git.phrdina@redhat.com> In-Reply-To: References: MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.84 on 10.5.11.23 X-loop: libvir-list@redhat.com X-BeenThere: libvir-list@redhat.com X-Mailman-Version: 2.1.12 Precedence: junk List-Id: Development discussions about the libvirt library & tools List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: libvir-list-bounces@redhat.com Errors-To: libvir-list-bounces@redhat.com X-Scanned-By: MIMEDefang 2.79 on 10.5.11.13 Authentication-Results: relay.mimecast.com; auth=pass smtp.auth=CUSA124A263 smtp.mailfrom=libvir-list-bounces@redhat.com X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com Content-Transfer-Encoding: quoted-printable X-ZohoMail-DKIM: pass (identity @redhat.com) Content-Type: text/plain; charset="utf-8" Signed-off-by: Pavel Hrdina --- configure.ac | 3 --- m4/virt-login-shell.m4 | 43 ------------------------------------------ meson.build | 7 +++++++ meson_options.txt | 1 + 4 files changed, 8 insertions(+), 46 deletions(-) delete mode 100644 m4/virt-login-shell.m4 diff --git a/configure.ac b/configure.ac index e73b3f617ca..cfe0545685f 100644 --- a/configure.ac +++ b/configure.ac @@ -98,13 +98,11 @@ dnl Miscellaneous checks dnl =20 LIBVIRT_ARG_NUMAD -LIBVIRT_ARG_LOGIN_SHELL LIBVIRT_ARG_TLS_PRIORITY LIBVIRT_ARG_SYSCTL_CONFIG =20 =20 LIBVIRT_CHECK_NUMAD -LIBVIRT_CHECK_LOGIN_SHELL LIBVIRT_CHECK_TLS_PRIORITY LIBVIRT_CHECK_SYSCTL_CONFIG LIBVIRT_CHECK_NSS @@ -176,6 +174,5 @@ AC_MSG_NOTICE([]) AC_MSG_NOTICE([Miscellaneous]) AC_MSG_NOTICE([]) LIBVIRT_RESULT_NUMAD -LIBVIRT_RESULT_LOGIN_SHELL LIBVIRT_RESULT_TLS_PRIORITY AC_MSG_NOTICE([]) diff --git a/m4/virt-login-shell.m4 b/m4/virt-login-shell.m4 deleted file mode 100644 index 713c488599e..00000000000 --- a/m4/virt-login-shell.m4 +++ /dev/null @@ -1,43 +0,0 @@ -dnl Copyright (c) 2015 SUSE LINUX Products GmbH, Nuernberg, Germany. -dnl Copyright (C) 2016 Red Hat, Inc. -dnl -dnl This library is free software; you can redistribute it and/or -dnl modify it under the terms of the GNU Lesser General Public -dnl License as published by the Free Software Foundation; either -dnl version 2.1 of the License, or (at your option) any later version. -dnl -dnl This library is distributed in the hope that it will be useful, -dnl but WITHOUT ANY WARRANTY; without even the implied warranty of -dnl MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU -dnl Lesser General Public License for more details. -dnl -dnl You should have received a copy of the GNU Lesser General Public -dnl License along with this library. If not, see -dnl . - -AC_DEFUN([LIBVIRT_ARG_LOGIN_SHELL], [ - LIBVIRT_ARG_WITH([LOGIN_SHELL], [build virt-login-shell], [check]) -]) - -AC_DEFUN([LIBVIRT_CHECK_LOGIN_SHELL], [ - if test "x$with_login_shell" !=3D "xno"; then - if test "x$with_linux" !=3D "xyes"; then - if test "x$with_login_shell" =3D "xyes"; then - AC_MSG_ERROR([virt-login-shell is supported on Linux only]) - else - with_login_shell=3Dno; - fi - else - with_login_shell=3Dyes; - fi - fi - - if test "x$with_login_shell" =3D "xyes" ; then - AC_DEFINE_UNQUOTED([WITH_LOGIN_SHELL], 1, [whether virt-login-shell = is built]) - fi - AM_CONDITIONAL([WITH_LOGIN_SHELL], [test "$with_login_shell" =3D "yes"]) -]) - -AC_DEFUN([LIBVIRT_RESULT_LOGIN_SHELL], [ - LIBVIRT_RESULT([virt-login-shell], [$with_login_shell]) -]) diff --git a/meson.build b/meson.build index e9186e38cfd..4c7345c81e3 100644 --- a/meson.build +++ b/meson.build @@ -2100,6 +2100,12 @@ else init_script =3D get_option('init_script') endif =20 +if not get_option('login_shell').disabled() and host_machine.system() =3D= =3D 'linux' + conf.set('WITH_LOGIN_SHELL', 1) +elif get_option('login_shell').enabled() + error('virt-login-shell is supported on Linux only') +endif + =20 # define top include directory =20 @@ -2228,6 +2234,7 @@ misc_summary =3D { 'Init script': init_script, 'Char device locks': chrdev_lock_files, 'Default Editor': conf.get_unquoted('DEFAULT_EDITOR'), + 'virt-login-shell': conf.has('WITH_LOGIN_SHELL'), 'virt-host-validate': conf.has('WITH_HOST_VALIDATE'), } summary(misc_summary, section: 'Miscellaneous', bool_yn: true, list_sep: '= ') diff --git a/meson_options.txt b/meson_options.txt index 0e7b6659e2f..6a3c98fc697 100644 --- a/meson_options.txt +++ b/meson_options.txt @@ -96,3 +96,4 @@ option('default_editor', type: 'string', value: 'vi', des= cription: 'Editor to us option('dtrace', type: 'feature', value: 'auto', description: 'use dtrace = for static probing') option('host_validate', type: 'feature', value: 'auto', description: 'buil= d virt-host-validate') option('init_script', type: 'combo', choices: ['systemd', 'openrc', 'check= ', 'none'], value: 'check', description: 'Style of init script to install') +option('login_shell', type: 'feature', value: 'auto', description: 'build = virt-login-shell') --=20 2.26.2