From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id 76E11158020 for ; Tue, 20 Dec 2022 17:23:55 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 2B72EE095D; Tue, 20 Dec 2022 17:23:54 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [IPv6:2001:470:ea4a:1:5054:ff:fec7:86e4]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id 1266AE095D for ; Tue, 20 Dec 2022 17:23:52 +0000 (UTC) Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id C77B13414BE for ; Tue, 20 Dec 2022 17:23:51 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 1A613703 for ; Tue, 20 Dec 2022 17:23:50 +0000 (UTC) From: "Haelwenn Monnier" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Haelwenn Monnier" Message-ID: <1671457734.109805147f485e34cd304a70035870e73f2a5891.lanodan@gentoo> Subject: [gentoo-commits] repo/proj/guru:master commit in: app-emulation/waydroid/ X-VCS-Repository: repo/proj/guru X-VCS-Files: app-emulation/waydroid/waydroid-1.3.4-r2.ebuild app-emulation/waydroid/waydroid-1.3.4-r3.ebuild X-VCS-Directories: app-emulation/waydroid/ X-VCS-Committer: lanodan X-VCS-Committer-Name: Haelwenn Monnier X-VCS-Revision: 109805147f485e34cd304a70035870e73f2a5891 X-VCS-Branch: master Date: Tue, 20 Dec 2022 17:23:50 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Auto-Response-Suppress: DR, RN, NRN, OOF, AutoReply X-Archives-Salt: c0fff381-a649-4ba7-a347-6291e39da021 X-Archives-Hash: 149e05fe7e0c41072a873cc8a39153fb commit: 109805147f485e34cd304a70035870e73f2a5891 Author: Denis Reva gmail com> AuthorDate: Mon Dec 19 13:23:08 2022 +0000 Commit: Haelwenn Monnier hacktivis me> CommitDate: Mon Dec 19 13:48:54 2022 +0000 URL: https://gitweb.gentoo.org/repo/proj/guru.git/commit/?id=10980514 app-emulation/waydroid: Updated waydroid dependencies, added basic clarifications about usage and caveats Signed-off-by: Denis Reva gmail.com> ...id-1.3.4-r2.ebuild => waydroid-1.3.4-r3.ebuild} | 28 ++++++++++++++++++---- 1 file changed, 24 insertions(+), 4 deletions(-) diff --git a/app-emulation/waydroid/waydroid-1.3.4-r2.ebuild b/app-emulation/waydroid/waydroid-1.3.4-r3.ebuild similarity index 54% rename from app-emulation/waydroid/waydroid-1.3.4-r2.ebuild rename to app-emulation/waydroid/waydroid-1.3.4-r3.ebuild index dfecb4019..d22bac703 100644 --- a/app-emulation/waydroid/waydroid-1.3.4-r2.ebuild +++ b/app-emulation/waydroid/waydroid-1.3.4-r3.ebuild @@ -3,7 +3,7 @@ EAPI=8 -PYTHON_COMPAT=( python3_{9..10} ) +PYTHON_COMPAT=( python3_{9..11} ) inherit linux-info python-single-r1 DESCRIPTION="Container-based approach to boot a full Android system on Linux systems" @@ -14,20 +14,23 @@ LICENSE="GPL-3" SLOT="0" KEYWORDS="~amd64 ~arm ~arm64 ~x86" REQUIRED_USE="${PYTHON_REQUIRED_USE}" -IUSE="systemd" +IUSE="systemd apparmor" DEPEND="|| ( virtual/linux-sources virtual/dist-kernel )" RDEPEND=" systemd? ( sys-apps/systemd ) app-containers/lxc[systemd?] + app-containers/lxc[apparmor?] + app-containers/lxc[seccomp] $(python_gen_cond_dep ' dev-python/pygobject[${PYTHON_USEDEP}] >=dev-python/gbinder-1.1.1[${PYTHON_USEDEP}] - >=dev-libs/gbinder-1.1.21 + dev-python/pyclip[${PYTHON_USEDEP}] ') net-firewall/nftables[modern-kernel] net-dns/dnsmasq >=dev-libs/libglibutil-1.0.67 + >=dev-libs/gbinder-1.1.21 ${PYTHON_DEPS} " @@ -38,9 +41,26 @@ CONFIG_CHECK=" " ERROR_ANDROID_BINDERFS="CONFIG_ANDROID_BINDERFS: need for creating Android-specific binder IPC channels" ERROR_ANDROID_BINDER_IPC="CONFIG_ANDROID_BINDER_IPC: need for creating Android-specific binder IPC channels" -ERROR_MEMFD_CREATE="CONFIG_MEMFD_CREATE: it completely replaced deprecated ISHMEM drivers, therefore it's vital for android-specific memory management" +ERROR_MEMFD_CREATE="CONFIG_MEMFD_CREATE: it completely replaced deprecated ISHMEM drivers, + therefore it's vital for android-specific memory management" src_install() { python_fix_shebang waydroid.py emake install DESTDIR="${D}" USE_NFTABLES=1 USE_SYSTEMD=$(usex systemd 1 0) } + +pkg_postinst() { + if not use apparmor; then + ewarn "If you use app-containers/lxc without apparmor, make sure you deleted or commented out in waydroid LXC config" + ewarn "(generated after waydroid init) in /var/lib/waydroid/lxc/waydroid/config the following string:" + ewarn "lxc.apparmor.profile = unconfined" + ewarn "or waydroid experiences crash during launch" + ewarn "See also https://github.com/waydroid/waydroid/issues/652" + else + ewarn "Apparmor support has not been tested by package maintainer yet" + fi + ewarn "Make sure you have NFTABLES up and running in your kernel. See" + ewarn "https://wiki.gentoo.org/wiki/Nftables for how-to details" + einfo "Contact https://docs.waydro.id/usage/install-on-desktops for how-to guides" + einfo "(does not cover Gentoo-specific things sadly)" +}