From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: by yocto-www.yoctoproject.org (Postfix, from userid 118) id 3EC11E00D74; Thu, 7 Dec 2017 11:03:04 -0800 (PST) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on yocto-www.yoctoproject.org X-Spam-Level: X-Spam-Status: No, score=-2.0 required=5.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID, DKIM_VALID_AU, RCVD_IN_DNSWL_NONE, SPF_HELO_PASS autolearn=ham version=3.3.1 X-Spam-HAM-Report: * -0.0 RCVD_IN_DNSWL_NONE RBL: Sender listed at http://www.dnswl.org/, no * trust * [104.47.2.79 listed in list.dnswl.org] * -0.0 SPF_HELO_PASS SPF: HELO matches SPF record * -1.9 BAYES_00 BODY: Bayes spam probability is 0 to 1% * [score: 0.0000] * -0.1 DKIM_VALID_AU Message has a valid DKIM or DK signature from author's * domain * 0.1 DKIM_SIGNED Message has a DKIM or DK signature, not necessarily * valid * -0.1 DKIM_VALID Message has at least one valid DKIM or DK signature Received: from EUR01-DB5-obe.outbound.protection.outlook.com (mail-db5eur01on0079.outbound.protection.outlook.com [104.47.2.79]) by yocto-www.yoctoproject.org (Postfix) with ESMTP id 4DBF6E00D71 for ; Thu, 7 Dec 2017 11:03:02 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=nxp.com; s=selector1; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version; bh=rYMjJmofaXeYT177glhUjhI60NdyjqSjOfS5PmNVodk=; b=jQDgVRema1uFnfjHHT/Gpm6COtMgfH0VHHzPH2Y/YEaCZejzCPkK/4EuHAklYfWf9gmPC7Z7Z5SUflcne+LwQRJN9iABdg9dmHySvURbMRsAB4/+jKrBHCzfS2OsSqKrAggAVzH3Ot9A/tAY1OaGDN5VzcKM28cf50lzEfNaeDc= Authentication-Results: spf=none (sender IP is ) smtp.mailfrom=tom.hochstein@nxp.com; Received: from tx30imx-01.am.freescale.net (192.88.168.49) by AM5PR0402MB2819.eurprd04.prod.outlook.com (2603:10a6:203:99::10) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_CBC_SHA384_P256) id 15.20.302.9; Thu, 7 Dec 2017 17:31:42 +0000 From: Tom Hochstein To: meta-freescale@yoctoproject.org Date: Thu, 7 Dec 2017 11:31:02 -0600 Message-Id: <1512667862-15931-9-git-send-email-tom.hochstein@nxp.com> X-Mailer: git-send-email 1.9.1 In-Reply-To: <1512667862-15931-1-git-send-email-tom.hochstein@nxp.com> References: <1512667862-15931-1-git-send-email-tom.hochstein@nxp.com> MIME-Version: 1.0 X-Originating-IP: [192.88.168.49] X-ClientProxiedBy: CY4PR19CA0034.namprd19.prod.outlook.com (2603:10b6:903:103::20) To AM5PR0402MB2819.eurprd04.prod.outlook.com (2603:10a6:203:99::10) X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: f50d0c77-4e27-4b1a-b22a-08d53d98623a X-MS-Office365-Filtering-HT: Tenant X-Microsoft-Antispam: UriScan:; BCL:0; PCL:0; RULEID:(4534020)(4602075)(4627115)(201703031133081)(201702281549075)(5600026)(4604075)(48565401081)(2017052603286); SRVR:AM5PR0402MB2819; X-Microsoft-Exchange-Diagnostics: 1; AM5PR0402MB2819; 3:kTtY3YEi/FXvBXuRYLVWdz4taXd0Sl2l5Ndby7YqHq9rHxSu6H2VqYdDyZH8tJq6HPZJpHEtgA4H/oQ3lyEXW3MurV0CnyZgqf84ndC6RkN7uWcQUyzyuEtZJ3yuBbfCXskrSbgDfjWovdnyrMI6A2FPeIVt68PFiwNtWMk01QIEvRyOULP1AVseWu8Jg0PUSWuJwBOgKHvit8iWuiQ+KnsTC08cVm64fYv2JXhV4DERKJOQGpHaNOQ9FbOtaAs6; 25:SOD/lZXSEkAbpZ+6rW1nUiVmLHYKr6UFpbOtlCcvoDOUvTl7z4+TQvTcgOiq+fUiDUiZZscUzLESTi4rDqxNczI9+RV0Nep5b0iqAS1vjovWbrZsufsdkLvTGuDgsW3gYG7mJLK9xFyeP342MIL6kUbkjwRL0ZWdhTCWlvOEaOjBMSgCLbP05fy+MWRG6Mg9vxh0eBP4XBSA3oiY2bwFGHWXhrAmucNYYFswOonjvFpnJ4RV19N1BiEiF6Rw7giTb4xZC0Cu58wmAQ7HkD35qIC6eCSQwcLba4vBeomngf4wIENseLLiOpm3kqpf8FoEeBLDKif1ZOHJTirQmagWeg==; 31:9KcNFboH5A6DDF75JaACVAryXjwrnwT81aNCJYI7SJQGp1BuhkSFHXeigg7L8fEFU/bVh7zWKI+v4ibfh/GJIuasfTN1QK01St0m9cggOahp/mHNH6OBYFUerzcMiSm9tGx+hOeH7e38v0MZ88u5l/2dUgPXh7l6vmKmLQF9g3yJakdnvRyH7v9diWC7/XjIJioKjCs+elbq1riDs64XceothrP3GdHLuM6C1fyr7HA= X-MS-TrafficTypeDiagnostic: AM5PR0402MB2819: X-Microsoft-Exchange-Diagnostics: 1; AM5PR0402MB2819; 20:un4ZsqqspwiRenpMwF6cP59xTFFpC+LOQHVNknuwMT1yHFb54jcEzk/0I7MkdyO+dQ5qYQ4sSXHtbD5U/Jl+JHbMbLDGHihcNGAndnGUJ01JFcO/1GrdR8bi1XSYmBYgUNlJ/sxP4L4xjlrF1bOnmPNLZpxbwsg4Pa7Dt2QPcBjhPOwhmm8LMpXydaNuIhAvkdnLwMPfmSzoJ4lohalnthp0acb/PitfxJedBZWN2jtrR9FvMQR2vquyKioSO9cKHYm+iv0FzT43StuUK5X3msRzTo+ZydeNcePBB4fxeuZQsTwBSNo1P0EMNPReO69SQp+JQETOXZqpqqOlDUwRHp2ExKng5luJf/A313U1lgQsFbY0lyXpFvLtLtkF+U5p+SIl8cLcGvnvM6yZu+a+I33I1DIW2FnsaTzr56lDk0gerHU/oP2U50XWNPQzHJRUdQzSlTwzeCx7CDE4YYbn21gqCAq0MLIp3jdZNThCjJ96zCb+SiHa5k/w2eMHFITa; 4:UJabLHk6DRDC+TSYTGeZwJSZfOkL/tfQHZp0RLwZRy3tF9sAu09LHbOJ0uX/naU9YlQZR9olGiw93ZMQtpmYm0WaPIbkbISBFSKMBlGTs7BZ57YYJhoQUxuOcmeOWl93s1SkWSyZQU1HTWQ/RJeq5neBV9FuvvgtAtDLWjA51NeYw71r4ta457OHEGScxrDKRWjuCFCWLpfn5RnU+KCJmQr2PbJXHOSoU+x58sck4DoH+XMgYr7hVw0QGHIg/sp/+pLhVDbtadC2vU1Xpx9SdV4k/a1/RU5JAIohQ8p8moA0Tkejqil7M4TLRCsivqeRQsx7DsHC0CbWNhUPa1cxYuxa+nA1OQLpOcYO9X/kK64= X-Microsoft-Antispam-PRVS: X-Exchange-Antispam-Report-Test: UriScan:(185117386973197)(264703809997249); X-Exchange-Antispam-Report-CFA-Test: BCL:0; PCL:0; RULEID:(6040450)(2401047)(8121501046)(5005006)(3231022)(10201501046)(3002001)(93006095)(93001095)(6055026)(6041248)(20161123564025)(20161123555025)(20161123562025)(20161123560025)(20161123558100)(201703131423075)(201702281528075)(201703061421075)(201703061406153)(6072148)(201708071742011); SRVR:AM5PR0402MB2819; BCL:0; PCL:0; RULEID:(100000803101)(100110400095); SRVR:AM5PR0402MB2819; X-Forefront-PRVS: 05143A8241 X-Forefront-Antispam-Report: SFV:NSPM; SFS:(10009020)(366004)(346002)(39860400002)(376002)(199004)(189003)(5660300001)(2351001)(50466002)(48376002)(561944003)(2361001)(4326008)(101416001)(33646002)(106356001)(966005)(7736002)(305945005)(316002)(478600001)(6116002)(36756003)(97736004)(16586007)(3846002)(81156014)(81166006)(66066001)(6306002)(2906002)(47776003)(105586002)(86362001)(8936002)(53936002)(52116002)(51416003)(6512007)(25786009)(50226002)(68736007)(2950100002)(6666003)(6486002)(6506006)(76176011)(16526018)(6916009)(8676002); DIR:OUT; SFP:1101; SCL:1; SRVR:AM5PR0402MB2819; H:tx30imx-01.am.freescale.net; FPR:; SPF:None; PTR:InfoNoRecords; A:1; MX:1; LANG:en; Received-SPF: None (protection.outlook.com: nxp.com does not designate permitted sender hosts) X-Microsoft-Exchange-Diagnostics: =?us-ascii?Q?1; AM5PR0402MB2819; 23:audKQRZPf0BQj7Rtk3zGn5XyQVRDkUbDQplsVph?= =?us-ascii?Q?3Qa5AZjDsuQPFFsZQ7zyUdb5zs63BADwTaFibvWOhCv/WSUZV/RQtNFZVmmS?= =?us-ascii?Q?meqrkkBKBgDbrVqIhh1weCMBRzsdv1om/nFQzNLeYiVQBuq6l+Utis4/Tfbs?= =?us-ascii?Q?1EQYGWA3SFPANu9wod2UjRheL5pNCZlcXv3nXUfUpf4tZKpk1IgUARnpmetb?= =?us-ascii?Q?FP02emr+Qk5JIPMYMV9dbEd9sDYHyQksdeizUS21arrKKQUnoQ8jMxwNBhx7?= =?us-ascii?Q?bccVIVpn3mA06fxYiEycBl8B3yYhBpW9kp05wNRJJRHH1eVFyngJle6FweAE?= =?us-ascii?Q?OfeinWL4s32xRSRzTwIKWrTPMyKrqspWJut2s8etwox4oVSsM5TnIm7/oUAN?= =?us-ascii?Q?vjbaQa3zDl6sxbtepNGPAf/STJI8FReF29IqRsau7bjMc/k5fD3d74pM6zB1?= =?us-ascii?Q?HhILjSVddhiS/bbUiRDK/qErrtgXbyqa8RXyG0KVqxzxWLZL/8NiKap/9RFG?= =?us-ascii?Q?HU1psJjLp1PDN6BAYl/pxIKFC17WAvwagMtg2ZiLodR1IctBQ3ciC/Rmw8Gg?= =?us-ascii?Q?anSy+QynGrr8tot/pX7b3YKa1HMKyrmwqav8/xmlkD+q2gHSNXNwlLXX07xO?= =?us-ascii?Q?S9IdjSCpUxejuCRyvadUDQXYL3oN7mEuWRgTi1bD+4oS/ZUTm0qqSfdpSKKc?= =?us-ascii?Q?mp7Nfipzd+3wYvUqhh4ldwsetTQlM8z+JWiMHGpP1VmYIeRGIFGhlyzA6ip2?= =?us-ascii?Q?eqDUiCkBmOy+GDI7I9kLwU5CWm2Vi+519sezBHmNOhi+B+oa3UZXP8yKzfT6?= =?us-ascii?Q?r+VbOmPDdE3s7YyStuBKP2yeBt3lUKJ5+cinajcGt6vL8f2VOZ/Uxa9ln5H7?= =?us-ascii?Q?WpdoZa3wZjDE9KapgrvJ+A5Q57wdxnQ+DsjkEiNaIBnbOiABakSdulGmbXGW?= =?us-ascii?Q?zhbTvnr3UcFSXtd2iCE7Ir8I5iGjWJBlbKyQYp6nPDz/TVCpW0rsnVU/e9yW?= =?us-ascii?Q?06nXN0dROrRTsl+Ey3Ej0bI7WFQ6HD6tvU6THuVhtULDJjGOwp86JPiKCXah?= =?us-ascii?Q?EVkoqUcTnht7TTZZgu60txI1an3G9xPk6ndh0NJrFr4r4TyWCasnmkLHz4wO?= =?us-ascii?Q?o/XO/bn/AVMS1FgMVEpJ8NRvPfTaXtvS+?= X-Microsoft-Exchange-Diagnostics: 1; AM5PR0402MB2819; 6:hY5Si8+DW5bNdREDpcir810BRzTYwg2cW+O2F3Lhoh3OTpSTZAOrB+wuzEWixBcRQc5bBFFLDzX85ek1Fgrp4GPsC/3c+c2h+BsFXD9/VZcGrCoJ9kgSTzJqSpzYCU5dpOokTLwr0+4qYOIoa+Q6w379czlGjruPKixQnTrbcx0ja9vHLAyeL92n8s3TSlS9vlqSFMpIeq37S5Nx8IZxzaqCXCPHaFvgnxI3e76U0CPCRji2Zh6Bt7WmwWGmBGa3yWjyDtYPjaaEIxEa5zg+FWosfCQ3vrkCHum75Tc8OzP6MUMCkBBLva9M6fqZ9Y4yHmw5BpL2gPRgr3WIWjHUyJsReFpi09ZmSQiAQSMWXkM=; 5:aRj0E1qqMSfajK4eVichPrk82092yXUd2XmEbcJWEAYKFtlcqVUEaFjdOn4he6CVXmXy8Deb0okj63gA+OpIT7d2xyFG9aaoZipk7goMc3J21zrescyZzbhkFxIRsqqVr0uFRiLBQU9kMogvlkVbkRRsi+snim/370PUUh8Uusc=; 24:skvd7FyFy+Mw62hQejaI/8ZJvp3W5fvpzoJ9ranCq1TBBQpJyem1c2woLVOlk9BXcFZ0/JlXHGOQAiRInk/DfgZL5ayqdjgh2J61xG5HVAY=; 7:XBPqJ2BVYMg/TrH4VqI0AQo36lH5zkv6cOUBXNqLM7qdn3w3fUvCpH9GfuceXnpxb7WZ/GTD3A2dDsK5yOQcWFDrJMTW93YEelAvEtzJ5UHtRlW2SKNwwovz0a/f5HIQqbwAwzer4767fIAFdz7Nn5RCHm4cfUsh8xXg7LkX+S4LPv1XTxIjrOMPzS2RQ66ayk5FIpikfezx9TyKMPhzYMcEFDzUSk3oQ/CXjny7C72YoR27xu7RPQ4PxQ62I4+F SpamDiagnosticOutput: 1:99 SpamDiagnosticMetadata: NSPM X-OriginatorOrg: nxp.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 07 Dec 2017 17:31:42.7942 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: f50d0c77-4e27-4b1a-b22a-08d53d98623a X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted X-MS-Exchange-CrossTenant-Id: 686ea1d3-bc2b-4c6f-a92c-d99c5c301635 X-MS-Exchange-Transport-CrossTenantHeadersStamped: AM5PR0402MB2819 Subject: [PATCH v4 8/8] weston-init: Fix weston 2.0 startup for pam, systemd case X-BeenThere: meta-freescale@yoctoproject.org X-Mailman-Version: 2.1.13 Precedence: list List-Id: Usage and development list for the meta-fsl-* layers List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 07 Dec 2017 19:03:04 -0000 Content-Type: text/plain The weston-start script for starting Weston does not work well for Weston 2.0. Daniel Diaz's proposal [1] for the systemd case with pam seems to work, except that starting an xterm under XWayland causes the desktop to crash. Using weston-launch instead of weston works better. [1] http://lists.openembedded.org/pipermail/openembedded-core/2016-December/129986.html Signed-off-by: Tom Hochstein --- recipes-graphics/wayland/weston-init.bbappend | 23 ++++++++++++++ recipes-graphics/wayland/weston-init/weston.config | 2 ++ .../wayland/weston-init/weston.service | 37 ++++++++++++++++++++++ 3 files changed, 62 insertions(+) create mode 100644 recipes-graphics/wayland/weston-init.bbappend create mode 100644 recipes-graphics/wayland/weston-init/weston.config create mode 100644 recipes-graphics/wayland/weston-init/weston.service diff --git a/recipes-graphics/wayland/weston-init.bbappend b/recipes-graphics/wayland/weston-init.bbappend new file mode 100644 index 0000000..8a5d9a8 --- /dev/null +++ b/recipes-graphics/wayland/weston-init.bbappend @@ -0,0 +1,23 @@ +FILESEXTRAPATHS_prepend := "${THISDIR}/${PN}:" + +REQUIRED_DISTRO_FEATURES_REMOVE_IMXGPU = "" +REQUIRED_DISTRO_FEATURES_REMOVE_IMXGPU_imxgpu2d = "opengl" +REQUIRED_DISTRO_FEATURES_REMOVE_IMXGPU_imxgpu3d = "" +REQUIRED_DISTRO_FEATURES_remove = "${REQUIRED_DISTRO_FEATURES_REMOVE_IMXGPU}" + +SRC_URI_append = \ + "${@bb.utils.contains('DISTRO_FEATURES', 'wayland x11', \ + ' file://weston.config', '', d)}" + +HAS_XWAYLAND = "${@bb.utils.contains('DISTRO_FEATURES', 'wayland x11', 'true', 'false', d)}" + +do_install_append() { + sed -i \ + -e 's,/usr/bin,${bindir},g' \ + -e 's,/etc,${sysconfdir},g' \ + -e 's,/var,${localstatedir},g' \ + ${D}${systemd_system_unitdir}/weston.service + if ${HAS_XWAYLAND}; then + install -Dm0755 ${WORKDIR}/weston.config ${D}${sysconfdir}/default/weston + fi +} diff --git a/recipes-graphics/wayland/weston-init/weston.config b/recipes-graphics/wayland/weston-init/weston.config new file mode 100644 index 0000000..7c92cf1 --- /dev/null +++ b/recipes-graphics/wayland/weston-init/weston.config @@ -0,0 +1,2 @@ +#!/bin/sh +OPTARGS="--xwayland" diff --git a/recipes-graphics/wayland/weston-init/weston.service b/recipes-graphics/wayland/weston-init/weston.service new file mode 100644 index 0000000..e3938c9 --- /dev/null +++ b/recipes-graphics/wayland/weston-init/weston.service @@ -0,0 +1,37 @@ +[Unit] +Description=Weston Wayland Compositor (on tty7) +RequiresMountsFor=/run +Conflicts=getty@tty7.service plymouth-quit.service +After=systemd-user-sessions.service getty@tty7.service plymouth-quit-wait.service + +[Service] +User=root +PermissionsStartOnly=true + +# Log us in via PAM so we get our XDG & co. environment and +# are treated as logged in so we can use the tty: +PAMName=login + +# Grab tty7 +UtmpIdentifier=tty7 +TTYPath=/dev/tty7 +TTYReset=yes +TTYVHangup=yes +TTYVTDisallocate=yes + +# stderr to journal so our logging doesn't get thrown into /dev/null +StandardOutput=tty +StandardInput=tty +StandardError=journal + +EnvironmentFile=-/etc/default/weston + +# Weston does not successfully change VT, nor does systemd place us on +# the VT it just activated for us. Switch manually: +ExecStartPre=/usr/bin/chvt 7 +ExecStart=/usr/bin/weston-launch -- --log=/var/log/weston.log $OPTARGS + +IgnoreSIGPIPE=no + +[Install] +WantedBy=multi-user.target -- 1.9.1