From patchwork Tue Nov 4 13:40:46 2014 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Koen Kooi X-Patchwork-Id: 40154 Return-Path: X-Original-To: linaro@patches.linaro.org Delivered-To: linaro@patches.linaro.org Received: from mail-ee0-f69.google.com (mail-ee0-f69.google.com [74.125.83.69]) by ip-10-151-82-157.ec2.internal (Postfix) with ESMTPS id 8D9B921894 for ; Tue, 4 Nov 2014 13:47:23 +0000 (UTC) Received: by mail-ee0-f69.google.com with SMTP id c41sf4106052eek.8 for ; Tue, 04 Nov 2014 05:47:22 -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:in-reply-to:references: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=huZq1TdSC8fonOrKGMZwdV4co+U9pF8R2Lmj9aJORcE=; b=aUkLsNHKl4MxP5DzWDfloccx8nLNucWzklwYcF/hJgDuuP2wxoCK5lco8a5RbFnspq gl2q0CaMe1d6rBnf5RxpbilNzl77p/OQb1KMO09y/lLoIFn00lhhwOqLfc29pjkIRNi5 7qw4Vg3IbJ94czDx7GxncPCf6xwCxxBIqQy+gU+Ct3sFCsdP0aa0nqHAdmB19cAzQ/kS ly53srZs+Gx5LewkBXvDE3VeI4rYx+QX04xR6gzIBQLAa1c1V6UhmU2B+ToZSpQrJDH1 jvSgxviSAhJfp8frHraElHEWdxvIe58XN6Ummobf6YD0CZVof/j6TTvWWBy8GflR4QkE pbwQ== X-Gm-Message-State: ALoCoQlPLSUa8ORG/4MZ0dKc8dyhwmTrLqY34z5RCKQIIjp/O5m8886qWaxwrik1ZNjYcrbtwuVT X-Received: by 10.180.218.100 with SMTP id pf4mr2384406wic.4.1415108842728; Tue, 04 Nov 2014 05:47:22 -0800 (PST) X-BeenThere: patchwork-forward@linaro.org Received: by 10.152.7.177 with SMTP id k17ls59996laa.56.gmail; Tue, 04 Nov 2014 05:47:22 -0800 (PST) X-Received: by 10.152.5.129 with SMTP id s1mr60615418las.59.1415108842380; Tue, 04 Nov 2014 05:47:22 -0800 (PST) Received: from mail-la0-f41.google.com (mail-la0-f41.google.com. [209.85.215.41]) by mx.google.com with ESMTPS id k17si813910laa.67.2014.11.04.05.47.22 for (version=TLSv1 cipher=ECDHE-RSA-RC4-SHA bits=128/128); Tue, 04 Nov 2014 05:47:22 -0800 (PST) Received-SPF: pass (google.com: domain of patch+caf_=patchwork-forward=linaro.org@linaro.org designates 209.85.215.41 as permitted sender) client-ip=209.85.215.41; Received: by mail-la0-f41.google.com with SMTP id s18so908495lam.28 for ; Tue, 04 Nov 2014 05:47:22 -0800 (PST) X-Received: by 10.112.218.101 with SMTP id pf5mr23328856lbc.46.1415108842116; Tue, 04 Nov 2014 05:47:22 -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.112.184.201 with SMTP id ew9csp116822lbc; Tue, 4 Nov 2014 05:47:21 -0800 (PST) X-Received: by 10.68.213.138 with SMTP id ns10mr46812182pbc.50.1415108504686; Tue, 04 Nov 2014 05:41:44 -0800 (PST) Received: from mail.openembedded.org (mail.openembedded.org. [140.211.169.62]) by mx.google.com with ESMTP id ms8si292505pdb.133.2014.11.04.05.41.36 for ; Tue, 04 Nov 2014 05:41:44 -0800 (PST) Received-SPF: none (google.com: openembedded-core-bounces@lists.openembedded.org does not designate permitted sender hosts) client-ip=140.211.169.62; Received: from mail.openembedded.org (localhost [127.0.0.1]) by mail.openembedded.org (Postfix) with ESMTP id 9D30271F82; Tue, 4 Nov 2014 13:41:35 +0000 (UTC) X-Original-To: openembedded-core@lists.openembedded.org Delivered-To: openembedded-core@lists.openembedded.org Received: from mail-wg0-f52.google.com (mail-wg0-f52.google.com [74.125.82.52]) by mail.openembedded.org (Postfix) with ESMTP id BFB4371F50 for ; Tue, 4 Nov 2014 13:40:52 +0000 (UTC) Received: by mail-wg0-f52.google.com with SMTP id b13so12873978wgh.25 for ; Tue, 04 Nov 2014 05:40:53 -0800 (PST) X-Received: by 10.194.203.234 with SMTP id kt10mr2666650wjc.135.1415108453256; Tue, 04 Nov 2014 05:40:53 -0800 (PST) Received: from localhost ([2001:610:612:0:2ad2:44ff:fe4b:bc17]) by mx.google.com with ESMTPSA id ei1sm1072853wib.20.2014.11.04.05.40.52 for (version=TLSv1.2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Tue, 04 Nov 2014 05:40:52 -0800 (PST) From: Koen Kooi To: openembedded-core@lists.openembedded.org Date: Tue, 4 Nov 2014 14:40:46 +0100 Message-Id: <1415108447-16821-2-git-send-email-koen.kooi@linaro.org> X-Mailer: git-send-email 1.9.3 In-Reply-To: <1415108447-16821-1-git-send-email-koen.kooi@linaro.org> References: <1415108447-16821-1-git-send-email-koen.kooi@linaro.org> Cc: Koen Kooi Subject: [OE-core] [PATCH 2/3] lsb 4.1: fix /usr/lib/ hardcodes 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=pass (google.com: domain of patch+caf_=patchwork-forward=linaro.org@linaro.org designates 209.85.215.41 as permitted sender) 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 Also collapse do_install and do_install_append. Signed-off-by: Koen Kooi --- meta/recipes-extended/lsb/lsb_4.1.bb | 11 +++++------ 1 file changed, 5 insertions(+), 6 deletions(-) diff --git a/meta/recipes-extended/lsb/lsb_4.1.bb b/meta/recipes-extended/lsb/lsb_4.1.bb index 34a70d0..897520a 100644 --- a/meta/recipes-extended/lsb/lsb_4.1.bb +++ b/meta/recipes-extended/lsb/lsb_4.1.bb @@ -72,9 +72,7 @@ do_install(){ touch ${D}${sysconfdir}/lsb-release.d/graphics-${PV}-ppc64 touch ${D}${sysconfdir}/lsb-release.d/desktop-${PV}-ppc64 fi -} -do_install_append(){ install -d ${D}${sysconfdir}/core-lsb install -d ${D}/${baselib}/lsb for i in lsb_killproc lsb_log_message lsb_pidofproc lsb_start_daemon @@ -84,9 +82,9 @@ do_install_append(){ install -m 0755 ${WORKDIR}/init-functions ${D}/${baselib}/lsb # creat links for LSB test - install -d ${D}/usr/lib/lsb - ln -sf ${sbindir}/chkconfig ${D}/usr/lib/lsb/install_initd - ln -sf ${sbindir}/chkconfig ${D}/usr/lib/lsb/remove_initd + install -d ${D}${libdir}/lsb + ln -sf ${sbindir}/chkconfig ${D}${libdir}/lsb/install_initd + ln -sf ${sbindir}/chkconfig ${D}${libdir}/lsb/remove_initd install -d ${D}/${libdir} ln -sf ${sbindir}/sendmail ${D}/${libdir}/sendmail @@ -120,8 +118,9 @@ do_install_append(){ ln -sf ld.so.1 ld-lsb-ppc32.so.3 fi } + FILES_${PN} += "/lib64 \ - /usr/lib/lsb \ + ${libdir}/lsb \ ${base_libdir}/lsb/* \ ${libdir}/sendmail \ "