From patchwork Mon Dec 9 18:27:01 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Khem Raj X-Patchwork-Id: 181086 Delivered-To: patch@linaro.org Received: by 2002:a92:3001:0:0:0:0:0 with SMTP id x1csp4711616ile; Mon, 9 Dec 2019 10:27:19 -0800 (PST) X-Google-Smtp-Source: APXvYqz7VgkKNtdadfzDq9OQNt4rspTQC91hLry3krPBbcv9HZRGQd7EyBtoAi4ZR1kWrL+q/eoV X-Received: by 2002:a63:3089:: with SMTP id w131mr20640993pgw.453.1575916038826; Mon, 09 Dec 2019 10:27:18 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1575916038; cv=none; d=google.com; s=arc-20160816; b=DTrntqY/mpoCo0kehA1p2BTj5Sd8Htc2JPkJIdM3NQ8/U3kYpVIiwcaHUpsDgu4XVt 7EojQuya3ClXGgM0V2WAwwTRQLmwXR3LrFFQha0gHpoVxwPAPsGQA2Hq7IDQwqb99d02 BrnqcKwkFPooUi/0uJbWDCMiwvXHFQzf2iyrBtaDQL5/z6lcuBGYQLgGDp25uBTsitr0 /Ql7kKpIi5i4/cgubmiUjhsTUWWfdfrWNVwyxj+5JAT9JWnSatpCk/+EJ6OJHRdaaVDA GiiWym8sbq6L//EdamlWRWsfpk4ZcGSJKHgMxts4XoyBtP3dp/52Ya6lhjiSOsJKb/k8 AtzA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=errors-to:sender:content-transfer-encoding:list-subscribe:list-help :list-post:list-archive:list-unsubscribe:list-id:precedence:subject :mime-version:message-id:date:to:from:dkim-signature:delivered-to; bh=HsFS422TgCz1rOOWsxvdGDDc+QOelFbv7Otkt8fQk2k=; b=JmR5Ivaj2zZU4fIcl2qzNIdAJtgHnuGMjYjrLFvbAZLAQwUYuiakw/SE8LWhkz0Liu krqQJf54p0HZEVOAUd6spzgMIDZ4iAhdCsr39sqCt52u8lMhrV78Zr+BgWq4vyv5+kYc JdNXJPh4cfLoDAaXSEy2x+e0/qu6SWwYGLp5+P1XHy0rsN1IQ44c3vUwFzCKw7WJQUvA GRInUuKpSyf3nYFrVohryooau0YcXrLmOYsqBvBMo5k6PPO/t9/Ldm8eX+CxMWYo2/8S cgO+77z+aP1CMJvjgYipKVS429O0/U5SHLG74k2fQmidFwFQj0prQJLAZYUNHww14epy 3j6Q== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@gmail.com header.s=20161025 header.b=qeC+gOBt; spf=pass (google.com: best guess record for domain of openembedded-core-bounces@lists.openembedded.org designates 140.211.169.62 as permitted sender) smtp.mailfrom=openembedded-core-bounces@lists.openembedded.org; dmarc=fail (p=NONE sp=QUARANTINE dis=NONE) header.from=gmail.com Return-Path: Received: from mail.openembedded.org (mail.openembedded.org. [140.211.169.62]) by mx.google.com with ESMTP id 85si547375pfy.98.2019.12.09.10.27.18; Mon, 09 Dec 2019 10:27:18 -0800 (PST) Received-SPF: pass (google.com: best guess record for domain of openembedded-core-bounces@lists.openembedded.org designates 140.211.169.62 as permitted sender) client-ip=140.211.169.62; Authentication-Results: mx.google.com; dkim=neutral (body hash did not verify) header.i=@gmail.com header.s=20161025 header.b=qeC+gOBt; spf=pass (google.com: best guess record for domain of openembedded-core-bounces@lists.openembedded.org designates 140.211.169.62 as permitted sender) smtp.mailfrom=openembedded-core-bounces@lists.openembedded.org; dmarc=fail (p=NONE sp=QUARANTINE dis=NONE) header.from=gmail.com Received: from ec2-34-214-78-129.us-west-2.compute.amazonaws.com (localhost [127.0.0.1]) by mail.openembedded.org (Postfix) with ESMTP id 6A6AE7FCB4; Mon, 9 Dec 2019 18:27:13 +0000 (UTC) X-Original-To: openembedded-core@lists.openembedded.org Delivered-To: openembedded-core@lists.openembedded.org Received: from mail-pg1-f196.google.com (mail-pg1-f196.google.com [209.85.215.196]) by mail.openembedded.org (Postfix) with ESMTP id 4D7297CB4F for ; Mon, 9 Dec 2019 18:27:12 +0000 (UTC) Received: by mail-pg1-f196.google.com with SMTP id k25so7517560pgt.7 for ; Mon, 09 Dec 2019 10:27:13 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id:mime-version :content-transfer-encoding; bh=tsub6EUGUkzkLjBdW9uiuM403fLnh/COELnjSpFFQ2s=; b=qeC+gOBtKtpFSwBDx0MuK7i7e2xvj886I8SFTj1qvcjSj9Oo9mg1Rhw2czC+MlxBC3 eF4Zp5XzhEcJFa5ZFZgdrLyPxgOlK+lugX+LwbolQ4RgTY//li69iZuRaoaR2gABKyTn 2ZslrSIKsQApnkh/Ixpi3pWV/QO9w0OuXzmOj/GpfQXrydtodJr7BzQYa2q5o8G4gNXx u8tebmn3wD0KJ/Z6CEdCaXtu5TfoKpRaNRGPRfhbaL47KGHkNGqbIGWDbH5vWtl80r9O 92OWZ+eyPA+W0pptN2ntXWgMfrCxTP/dEvX1duTP2a/3tFpSABl6gl67YNcDToEzUjRx V8Eg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:mime-version :content-transfer-encoding; bh=tsub6EUGUkzkLjBdW9uiuM403fLnh/COELnjSpFFQ2s=; b=pZHSXpINGzca1OEODb4pqSKWsOa31wJD7ygiaoK2gQbjdsGjGpzt9tHcC4wmQnqAN/ Y33k+M6aoH/96dAap10TduHiwADyhwcxjIDFMLe9/WN3BvVg9jeGtqjKOVIlk/369zpm mFwgz1mzb1165TLGizRurVjwqcAsrf4TbJJdtZBOVfry1BR8q2ymBuEj1WWVtfI00v4t 6W4KTtkmPf3pmdq/cnvqUNbDIU7b5ax/9METHORQdNvH7umOBPfxvx+lvufvjEY8HDqY 3Joiz0tjSFGb5raumn5MtcsiJwdzYguhh/YhhRMH1iLCm/gt+eCBRLpWP7UVofu2Yv7/ 1Xvw== X-Gm-Message-State: APjAAAUz3Qh209DvKAxZKg4P1I8srStWmvaLhMtqv1oRUqNKeAZloQsB 1KV91AHxkwjY0xQp9soJNK2DTO6w0q0= X-Received: by 2002:a63:4d4c:: with SMTP id n12mr20543046pgl.212.1575916032608; Mon, 09 Dec 2019 10:27:12 -0800 (PST) Received: from apollo.hsd1.ca.comcast.net ([2601:646:9200:4e0::afb7]) by smtp.gmail.com with ESMTPSA id 20sm237465pgw.71.2019.12.09.10.27.11 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 09 Dec 2019 10:27:11 -0800 (PST) From: Khem Raj To: openembedded-core@lists.openembedded.org, ross.burton@intel.com Date: Mon, 9 Dec 2019 10:27:01 -0800 Message-Id: <20191209182701.4120643-1-raj.khem@gmail.com> X-Mailer: git-send-email 2.24.0 MIME-Version: 1.0 Subject: [OE-core] [PATCH v2] kbd: avoid vlock conflict with busybox when pam is enabled X-BeenThere: openembedded-core@lists.openembedded.org X-Mailman-Version: 2.1.12 Precedence: list List-Id: Patches and discussions about the oe-core layer List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: openembedded-core-bounces@lists.openembedded.org Errors-To: openembedded-core-bounces@lists.openembedded.org busybox as well as vlock utility from meta-oe provides vlock utility which can conflict when with kbd if pam is a enabled distro_feature Fixes image build errors update-alternatives: Error: not linking /usr/bin/vlock to /bin/busybox.suid since /usr/bin/vlock exists and is not a link ERROR: yoe-qt5-wayland-image-1.0-r0 do_rootfs: Postinstall scriptlets of ['busybox'] have failed. If the intention is to defer them to first boot, then please place them into pkg_postinst_ontarget_${PN} (). Deferring to first boot via 'exit 1' is no longer supported. Signed-off-by: Khem Raj --- v2: Check for pam in distro feautres meta/recipes-core/kbd/kbd_2.2.0.bb | 2 ++ 1 file changed, 2 insertions(+) -- 2.24.0 -- _______________________________________________ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-core diff --git a/meta/recipes-core/kbd/kbd_2.2.0.bb b/meta/recipes-core/kbd/kbd_2.2.0.bb index 9556302ab5..5270508b36 100644 --- a/meta/recipes-core/kbd/kbd_2.2.0.bb +++ b/meta/recipes-core/kbd/kbd_2.2.0.bb @@ -62,6 +62,8 @@ RDEPENDS_${PN}-ptest = "make" inherit update-alternatives ALTERNATIVE_${PN} = "chvt deallocvt fgconsole openvt showkey" +ALTERNATIVE_${PN}_append = "${@bb.utils.contains('DISTRO_FEATURES', 'pam', ' vlock', '', d)}" + ALTERNATIVE_PRIORITY = "100" BBCLASSEXTEND = "native"