From nobody Tue Feb 10 01:35:06 2026 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=pass(p=none dis=none) header.from=redhat.com ARC-Seal: i=1; a=rsa-sha256; t=1597398225; cv=none; d=zohomail.com; s=zohoarc; b=CyREevm69n/vLpc4ZyG7d7JE0JyaxHFogbaMNXsuyCFC1NDhBHUrGjDtPoHaAFixGgxuAGmQylvWfDT6sdG/8T7lUIgnuaATMXz5nzgdMlJWyC2tHn0usCp97QKbIMChKzeyWyHVNPtDuMCjxjqVCpfYsWlELVtFLC+AFqZbgt0= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1597398225; h=Content-Type:Content-Transfer-Encoding:Cc: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=u6RVhKS6fUkL+DiTgNlRZrtHMWYzsBjSmcfWWC2gfiE=; b=lt1CCb5DU3QWLC7ArX+CJfb/A0Q3n6ZooRq0cNxKu0KmCo6BelXj5iQZB2fiKwsrMuKCtuuRWAfAx57c/Kxum2rWkGCQFkXNTkpl0/Y3yrasZpZE/+vKxEROWAUNGyroXsx6+i1NXNyZ3CTfLUPohHEyjHZiZk01aFlfoS2usZQ= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=pass header.from= (p=none dis=none) header.from= Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1597398225330347.87630411917087; Fri, 14 Aug 2020 02:43:45 -0700 (PDT) Received: from localhost ([::1]:48390 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1k6WFU-0000Hm-3A for importer@patchew.org; Fri, 14 Aug 2020 05:43:44 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:43218) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1k6Vn0-00061C-2m for qemu-devel@nongnu.org; Fri, 14 Aug 2020 05:14:18 -0400 Received: from us-smtp-2.mimecast.com ([205.139.110.61]:50726 helo=us-smtp-delivery-1.mimecast.com) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_CBC_SHA1:256) (Exim 4.90_1) (envelope-from ) id 1k6Vmt-0002x0-Kv for qemu-devel@nongnu.org; Fri, 14 Aug 2020 05:14:17 -0400 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-564-F8MQjV46PVCcsk8hDQhzKQ-1; Fri, 14 Aug 2020 05:14:08 -0400 Received: from smtp.corp.redhat.com (int-mx01.intmail.prod.int.phx2.redhat.com [10.5.11.11]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id 1A8FB801AC5 for ; Fri, 14 Aug 2020 09:14:08 +0000 (UTC) Received: from virtlab701.virt.lab.eng.bos.redhat.com (virtlab701.virt.lab.eng.bos.redhat.com [10.19.152.228]) by smtp.corp.redhat.com (Postfix) with ESMTP id CB9C1600E4; Fri, 14 Aug 2020 09:14:07 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1597396450; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=u6RVhKS6fUkL+DiTgNlRZrtHMWYzsBjSmcfWWC2gfiE=; b=VguZfJGWkdA1jt8U8RH7yfiQvrTT4ZZg99ohU4gnhO5nM4hF2ujKn945DFd1CcIiyqUHWo HfjmvSYdXlFvO6cfM/rHed8eNx9P++2tXINdocsqpMYWVsUbkXkMEGRc+NqrMahoT51evW Qi2M/1/U1nslpEq4k9ICfKJBahBUYVs= X-MC-Unique: F8MQjV46PVCcsk8hDQhzKQ-1 From: Paolo Bonzini To: qemu-devel@nongnu.org Subject: [PATCH 057/150] meson: convert authz directory to Meson Date: Fri, 14 Aug 2020 05:11:53 -0400 Message-Id: <20200814091326.16173-58-pbonzini@redhat.com> In-Reply-To: <20200814091326.16173-1-pbonzini@redhat.com> References: <20200814091326.16173-1-pbonzini@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.79 on 10.5.11.11 Authentication-Results: relay.mimecast.com; auth=pass smtp.auth=CUSA124A263 smtp.mailfrom=pbonzini@redhat.com X-Mimecast-Spam-Score: 0.001 X-Mimecast-Originator: redhat.com Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable Received-SPF: pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Received-SPF: pass client-ip=205.139.110.61; envelope-from=pbonzini@redhat.com; helo=us-smtp-delivery-1.mimecast.com X-detected-operating-system: by eggs.gnu.org: First seen = 2020/08/14 01:57:54 X-ACL-Warn: Detected OS = Linux 2.2.x-3.x [generic] [fuzzy] X-Spam_score_int: -40 X-Spam_score: -4.1 X-Spam_bar: ---- X-Spam_report: (-4.1 / 5.0 requ) BAYES_00=-1.9, DKIMWL_WL_HIGH=-1, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_NONE=-0.0001, RCVD_IN_MSPIKE_H2=-1, SPF_HELO_NONE=0.001, SPF_PASS=-0.001, URIBL_BLOCKED=0.001 autolearn=ham autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: =?UTF-8?q?Marc-Andr=C3=A9=20Lureau?= Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: pass (identity @redhat.com) From: Marc-Andr=C3=A9 Lureau Signed-off-by: Marc-Andr=C3=A9 Lureau Signed-off-by: Paolo Bonzini --- Makefile | 1 - Makefile.objs | 3 ++- Makefile.target | 2 +- authz/Makefile.objs | 7 ------- authz/meson.build | 19 +++++++++++++++++++ meson.build | 5 +++++ 6 files changed, 27 insertions(+), 10 deletions(-) delete mode 100644 authz/Makefile.objs create mode 100644 authz/meson.build diff --git a/Makefile b/Makefile index bd0f208dd6..2742f92706 100644 --- a/Makefile +++ b/Makefile @@ -232,7 +232,6 @@ include $(SRC_PATH)/Makefile.objs endif =20 dummy :=3D $(call unnest-vars,, \ - authz-obj-y \ chardev-obj-y \ block-obj-y \ block-obj-m \ diff --git a/Makefile.objs b/Makefile.objs index 84bfa2a61a..0bc361d338 100644 --- a/Makefile.objs +++ b/Makefile.objs @@ -9,7 +9,8 @@ ifeq ($(call lor,$(CONFIG_SOFTMMU),$(CONFIG_TOOLS)),y) =20 chardev-obj-y =3D chardev/ =20 -authz-obj-y =3D authz/ +authz-obj-y =3D authz/libauthz.fa +authz/libauthz.fa-libs =3D $(if $(CONFIG_AUTH_PAM),-lpam) =20 block-obj-y =3D block/ nbd/ scsi/ block-obj-y +=3D block.o blockjob.o job.o diff --git a/Makefile.target b/Makefile.target index 1e04551a8e..79b6e02bed 100644 --- a/Makefile.target +++ b/Makefile.target @@ -192,9 +192,9 @@ common-obj-m :=3D =20 include $(SRC_PATH)/Makefile.objs dummy :=3D $(call fix-paths,../,, \ + authz-obj-y \ qom-obj-y) dummy :=3D $(call unnest-vars,.., \ - authz-obj-y \ block-obj-y \ block-obj-m \ chardev-obj-y \ diff --git a/authz/Makefile.objs b/authz/Makefile.objs deleted file mode 100644 index ed7b273596..0000000000 --- a/authz/Makefile.objs +++ /dev/null @@ -1,7 +0,0 @@ -authz-obj-y +=3D base.o -authz-obj-y +=3D simple.o -authz-obj-y +=3D list.o -authz-obj-y +=3D listfile.o -authz-obj-$(CONFIG_AUTH_PAM) +=3D pamacct.o - -pamacct.o-libs =3D -lpam diff --git a/authz/meson.build b/authz/meson.build new file mode 100644 index 0000000000..c1f63627c1 --- /dev/null +++ b/authz/meson.build @@ -0,0 +1,19 @@ +authz_ss =3D ss.source_set() +authz_ss.add(genh) +authz_ss.add(files( + 'base.c', + 'list.c', + 'listfile.c', + 'simple.c', +)) + +authz_ss.add(when: ['CONFIG_AUTH_PAM', pam], if_true: files('pamacct.c')) + +authz_ss =3D authz_ss.apply(config_host, strict: false) +libauthz =3D static_library('authz', authz_ss.sources(), + dependencies: [authz_ss.dependencies()], + name_suffix: 'fa', + build_by_default: false) + +authz =3D declare_dependency(link_whole: libauthz, + dependencies: qom) diff --git a/meson.build b/meson.build index d883fcf926..0454061543 100644 --- a/meson.build +++ b/meson.build @@ -99,6 +99,10 @@ if 'CONFIG_GNUTLS' in config_host endif pixman =3D declare_dependency(compile_args: config_host['PIXMAN_CFLAGS'].s= plit(), link_args: config_host['PIXMAN_LIBS'].split()) +pam =3D not_found +if 'CONFIG_AUTH_PAM' in config_host + pam =3D cc.find_library('pam') +endif libattr =3D not_found if 'CONFIG_ATTR' in config_host libattr =3D declare_dependency(link_args: config_host['LIBATTR_LIBS'].sp= lit()) @@ -337,6 +341,7 @@ qemuutil =3D declare_dependency(link_with: libqemuutil, sources: genh + version_res) =20 subdir('qom') +subdir('authz') subdir('fsdev') =20 # Other build targets --=20 2.26.2