From patchwork Tue Jan 21 11:01:21 2014 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Koen Kooi X-Patchwork-Id: 23430 Return-Path: X-Original-To: linaro@patches.linaro.org Delivered-To: linaro@patches.linaro.org Received: from mail-qc0-f200.google.com (mail-qc0-f200.google.com [209.85.216.200]) by ip-10-151-82-157.ec2.internal (Postfix) with ESMTPS id D43CE218C5 for ; Tue, 21 Jan 2014 11:01:41 +0000 (UTC) Received: by mail-qc0-f200.google.com with SMTP id e9sf13302801qcy.11 for ; Tue, 21 Jan 2014 03:01:41 -0800 (PST) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20130820; h=x-gm-message-state:delivered-to:delivered-to:from:to:date :message-id:cc:subject:precedence:list-id:list-unsubscribe :list-archive:list-post:list-help:list-subscribe:mime-version:sender :errors-to:x-original-sender:x-original-authentication-results :mailing-list:content-type:content-transfer-encoding; bh=DFI3kemloNunieg+muMaqc8O6+qf32yKpLSq/19DucM=; b=JOHwB4cQl07s1ZZULtywwWPMu7Y0rpD4lL/q4vLaJ39a9dFV0X9+k0tDOBJcIub0ir kpX2+mYxO3zHsQ5dZ8GPRtyo+l76rb9JRKd1MXFE0Nw/knK/ij043mLJLloDzWJaK6nF 6vi02Hj4ek7//0FbO8KO31wbGq6G7PUhuhrBi0Cqxg2umzLEEPeyq1kj0hDF07y7YV34 vFZVxqJwmb/NawhTMbmTx9XtTj5KCgFjgj/EH1N1rApmc4rhPMXNJp4iwX09qLhthYYC PxMuApylLiFqfv6W7HphzL6OiUahAD1N8Mgioayh7oxLNhjELDq3X9jnpXd8nB8dW7Fn FcKA== X-Gm-Message-State: ALoCoQlBBhTj6lhF7WM6STah6Nem/CcAKY8+BZenVoDUp8yqXXYnxZWF4JiHL6f5YkFmg1NT4K3p X-Received: by 10.236.90.112 with SMTP id d76mr2422539yhf.49.1390302101085; Tue, 21 Jan 2014 03:01:41 -0800 (PST) X-BeenThere: patchwork-forward@linaro.org Received: by 10.49.64.97 with SMTP id n1ls1188876qes.62.gmail; Tue, 21 Jan 2014 03:01:40 -0800 (PST) X-Received: by 10.220.161.132 with SMTP id r4mr1044944vcx.29.1390302100945; Tue, 21 Jan 2014 03:01:40 -0800 (PST) Received: from mail-vb0-f48.google.com (mail-vb0-f48.google.com [209.85.212.48]) by mx.google.com with ESMTPS id q10si1803013ves.58.2014.01.21.03.01.40 for (version=TLSv1 cipher=ECDHE-RSA-RC4-SHA bits=128/128); Tue, 21 Jan 2014 03:01:40 -0800 (PST) Received-SPF: neutral (google.com: 209.85.212.48 is neither permitted nor denied by best guess record for domain of patch+caf_=patchwork-forward=linaro.org@linaro.org) client-ip=209.85.212.48; Received: by mail-vb0-f48.google.com with SMTP id q16so3354507vbe.7 for ; Tue, 21 Jan 2014 03:01:40 -0800 (PST) X-Received: by 10.221.37.1 with SMTP id tc1mr588246vcb.32.1390302100854; Tue, 21 Jan 2014 03:01:40 -0800 (PST) X-Forwarded-To: patchwork-forward@linaro.org X-Forwarded-For: patch@linaro.org patchwork-forward@linaro.org Delivered-To: patch@linaro.org Received: by 10.220.174.196 with SMTP id u4csp109792vcz; Tue, 21 Jan 2014 03:01:40 -0800 (PST) X-Received: by 10.68.66.103 with SMTP id e7mr23892398pbt.120.1390302098046; Tue, 21 Jan 2014 03:01:38 -0800 (PST) Received: from mail.openembedded.org (mail.openembedded.org. [140.211.169.62]) by mx.google.com with ESMTP id n8si4978777pax.102.2014.01.21.03.01.37 for ; Tue, 21 Jan 2014 03:01:38 -0800 (PST) Received-SPF: pass (google.com: domain of openembedded-core-bounces@lists.openembedded.org designates 140.211.169.62 as permitted sender) client-ip=140.211.169.62; Received: from mail.openembedded.org (localhost [127.0.0.1]) by mail.openembedded.org (Postfix) with ESMTP id 455BC6E786; Tue, 21 Jan 2014 11:01:35 +0000 (UTC) X-Original-To: openembedded-core@lists.openembedded.org Delivered-To: openembedded-core@lists.openembedded.org Received: from mail-wi0-f181.google.com (mail-wi0-f181.google.com [209.85.212.181]) by mail.openembedded.org (Postfix) with ESMTP id 2BCA66E70F for ; Tue, 21 Jan 2014 11:01:34 +0000 (UTC) Received: by mail-wi0-f181.google.com with SMTP id hi8so4182462wib.8 for ; Tue, 21 Jan 2014 03:01:33 -0800 (PST) X-Received: by 10.194.62.111 with SMTP id x15mr1562312wjr.55.1390302093460; Tue, 21 Jan 2014 03:01:33 -0800 (PST) Received: from localhost ([2001:610:612:0:5e51:4fff:fec8:7c15]) by mx.google.com with ESMTPSA id dd3sm7070677wjb.9.2014.01.21.03.01.32 for (version=TLSv1.2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Tue, 21 Jan 2014 03:01:32 -0800 (PST) From: Koen Kooi To: openembedded-core@lists.openembedded.org Date: Tue, 21 Jan 2014 12:01:21 +0100 Message-Id: <1390302081-29499-1-git-send-email-koen.kooi@linaro.org> X-Mailer: git-send-email 1.8.4.2 Cc: Koen Kooi Subject: [OE-core] [PATCH] systemd 208: move stray /usr/lib/systemd/* into /lib/systemd X-BeenThere: openembedded-core@lists.openembedded.org X-Mailman-Version: 2.1.12 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: , List-Help: , List-Subscribe: , MIME-Version: 1.0 Sender: openembedded-core-bounces@lists.openembedded.org Errors-To: openembedded-core-bounces@lists.openembedded.org X-Removed-Original-Auth: Dkim didn't pass. X-Original-Sender: koen.kooi@linaro.org X-Original-Authentication-Results: mx.google.com; spf=neutral (google.com: 209.85.212.48 is neither permitted nor denied by best guess record for domain of patch+caf_=patchwork-forward=linaro.org@linaro.org) smtp.mail=patch+caf_=patchwork-forward=linaro.org@linaro.org Mailing-list: list patchwork-forward@linaro.org; contact patchwork-forward+owners@linaro.org X-Google-Group-Id: 836684582541 From: Koen Kooi Apps testing for systemd config get confused when both /usr/lib/systemd and /lib/systemd exist. This fixes (among other things) dracut systemd detections. Signed-off-by: Koen Kooi --- meta/recipes-core/systemd/systemd_208.bb | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/meta/recipes-core/systemd/systemd_208.bb b/meta/recipes-core/systemd/systemd_208.bb index 6590235..710624c 100644 --- a/meta/recipes-core/systemd/systemd_208.bb +++ b/meta/recipes-core/systemd/systemd_208.bb @@ -113,6 +113,12 @@ do_install() { # Delete journal README, as log can be symlinked inside volatile. rm -f ${D}/${localstatedir}/log/README + + # fix up libdir confusion + if [ -d ${D}${libdir}/systemd ] ; then + cp -a ${D}${libdir}/systemd/* ${D}${systemd_unitdir} + rm -rf ${D}${libdir}/systemd + fi } do_install_ptest () {