From patchwork Sat Dec 7 07:22:08 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Khem Raj X-Patchwork-Id: 180942 Delivered-To: patch@linaro.org Received: by 2002:a92:3001:0:0:0:0:0 with SMTP id x1csp1789684ile; Fri, 6 Dec 2019 23:22:30 -0800 (PST) X-Google-Smtp-Source: APXvYqx2CyY3d4BQs48at2cvlVQb3qxMQc33lqP6z3lOAv/z7YU2UMOq9snLsMmjbiz1JfWMiq9U X-Received: by 2002:a63:2cc9:: with SMTP id s192mr7691406pgs.396.1575703350195; Fri, 06 Dec 2019 23:22:30 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1575703350; cv=none; d=google.com; s=arc-20160816; b=uJo83k7UzM5jmaTgJlKjWdhJqNGmuq8mThpNKv2fDP4AXlfslAPL80NmhWLwNnsL6O puJk9C8rNs86Vih3k8sj76J6pnKAIByYll4zkzOBwEcZINEc2q6vw4ZXZrq3MKSPYLS1 9D91uTknZ4neZK4wSkDp4oANs9ADdte4DGcC/0+Wwl2/cbF0dRlREsx8lb64nbEfaQNE B07Cn/YtVwCKNWW4CoHaHd/zVIWJ7q6MTNyb0Zzquy5TRf7jVLwkya+DLZzHQTGe+jwY +Xv/wh7El3YQWL75jSIUMISpLe2A9SLSSeLXuC8YA3/0uqjkGWyDnwm80uwGH8I/RBCA uxSg== 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=knW4/UMDvjP6xi3q8ibqiXY+6ZF8eSSyCDKLM7j2UiQ=; b=W7/ofUYDvuiBLpM5uuEUMAaR++xxvO/yHSMsSvfejakvJZ+jNYu0J/6/x8HL2cNAaa vn2sHEZ2/OXLvKG8Q9sGJCFDfIa8zFZO/p1OGJMz8rRCJrLZzD51RQP0TYoYddJc1Gox R/hKqbVDnTvvbTObhzFacoENgTxXpvRBWI70ucP7X10NLfPMCve80Mk6OssXStGNOxMH GVZFD/cLO8Mq64wECpa7yuaEUPXMkA+Lj/fz/XmKimKcUbzVb8TBrXFSGQ67CB2nzcfp Ml47AWcn+rUkxHiQgDLTevcEPuqYB162Gn4konD0bXk8a2qWqPdzBIktx3RxnKO7S8Re OhPA== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@gmail.com header.s=20161025 header.b=Our9qX24; 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 r19si12929719pga.43.2019.12.06.23.22.28; Fri, 06 Dec 2019 23:22:30 -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=Our9qX24; 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 C97DA7F986; Sat, 7 Dec 2019 07:22:23 +0000 (UTC) X-Original-To: openembedded-core@lists.openembedded.org Delivered-To: openembedded-core@lists.openembedded.org Received: from mail-pf1-f194.google.com (mail-pf1-f194.google.com [209.85.210.194]) by mail.openembedded.org (Postfix) with ESMTP id 908AD7F986 for ; Sat, 7 Dec 2019 07:22:21 +0000 (UTC) Received: by mail-pf1-f194.google.com with SMTP id q8so4537108pfh.7 for ; Fri, 06 Dec 2019 23:22:22 -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=10R3fxdxCWaAQH6wlO8t5LGCt+Ik4JS3sb+BZ2LPGA0=; b=Our9qX24Oobt6wXVQopjDW/uB3p9E/N8K8YXRRLRaRZLrlLqp21DIynSqu+kuB0dSV Bebt9bbio/3aqzp/cCEB/JEEWn7YBoiJVG4xJ9qhbmywg/md+N3UlwZGQ3wWk7awej/A U3VCtoIals68SjTRfKBat7vFIVk7eh6qXmmMC7tzx7XyH67b5POoj1cUJMx6bOXmJ0Ar MKgghdIZ6TSF9qLJS4E/muRwwGfa5yS8xeIY5MpB5Q8wJO2lH8V5wopOafBJzEaOFBFY fstnq3dCTlandN6DPNwdJ7u/sBhxK43EiDzltfZRGvVX5e4QSW+9hM4J6B84siXsa09b E7Hg== 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=10R3fxdxCWaAQH6wlO8t5LGCt+Ik4JS3sb+BZ2LPGA0=; b=KHrAhmGj1MyKHTVXW9ZM7Kyp2dcfCIrpCfVDGqsGO3L7nUrZRwcvFKgHTiAXj+9T8P 2neu/FDNl6XZUYCIVG716cKv4DWZo3vT9BmGfF+0/4J49yRo21gaRxAinYnpvtl4MGIC nBd0XEbq7EUy35B12ptnSU2AxYnZ0hk77IdVy0Quzh/aDD810LLeK8OiLKAKNXv3dvIE fa/wqJ5wZ/Gr0wzeW1DsY2gDIntzGVkRke0MBNPfWQ+/FUm/WjFNSORVofP7oIRBvf+t j+XCeD54z1dfE/W30RZdeBURcMO8PFs+zA60ukRobxrt7egOH8DJ4f5LdhI/52uFxEY1 9pBg== X-Gm-Message-State: APjAAAVUziO1DHHz5QfvMwBPm+N90hqJSbrxDSYJEqFdGtPWSNZeOaJq crWx5s30n3UTgwZPQyoap16Bb3BbAjg= X-Received: by 2002:a63:5211:: with SMTP id g17mr7530662pgb.299.1575703341939; Fri, 06 Dec 2019 23:22:21 -0800 (PST) Received: from apollo.hsd1.ca.comcast.net ([2601:646:9200:4e0::afb7]) by smtp.gmail.com with ESMTPSA id w10sm17314152pgi.47.2019.12.06.23.22.21 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 06 Dec 2019 23:22:21 -0800 (PST) From: Khem Raj To: openembedded-core@lists.openembedded.org Date: Fri, 6 Dec 2019 23:22:08 -0800 Message-Id: <20191207072208.2773273-1-raj.khem@gmail.com> X-Mailer: git-send-email 2.24.0 MIME-Version: 1.0 Subject: [OE-core] [PATCH] kbd: avoid vlock conflict with busybox 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 --- meta/recipes-core/kbd/kbd_2.2.0.bb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) -- 2.24.0 -- _______________________________________________ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-core Tested-by: Richard Leitner diff --git a/meta/recipes-core/kbd/kbd_2.2.0.bb b/meta/recipes-core/kbd/kbd_2.2.0.bb index 9556302ab5..4853db8a78 100644 --- a/meta/recipes-core/kbd/kbd_2.2.0.bb +++ b/meta/recipes-core/kbd/kbd_2.2.0.bb @@ -61,7 +61,7 @@ RDEPENDS_${PN}-ptest = "make" inherit update-alternatives -ALTERNATIVE_${PN} = "chvt deallocvt fgconsole openvt showkey" +ALTERNATIVE_${PN} = "chvt deallocvt fgconsole openvt showkey vlock" ALTERNATIVE_PRIORITY = "100" BBCLASSEXTEND = "native"