From patchwork Tue Nov 4 13:40:47 2014 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Koen Kooi X-Patchwork-Id: 40151 Return-Path: X-Original-To: linaro@patches.linaro.org Delivered-To: linaro@patches.linaro.org Received: from mail-lb0-f200.google.com (mail-lb0-f200.google.com [209.85.217.200]) by ip-10-151-82-157.ec2.internal (Postfix) with ESMTPS id BD17D21894 for ; Tue, 4 Nov 2014 13:42:24 +0000 (UTC) Received: by mail-lb0-f200.google.com with SMTP id f15sf7659262lbj.11 for ; Tue, 04 Nov 2014 05:42:23 -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=orDQHGZY16gCoFLfq3/PQsvMCkQQSjdrmx1jv4Wdn3Q=; b=jC61gRGGYYk4tsR+BPKIScHvmOwX4otalY/hhsRPxi9LtJlrzbA9kYmioTzONGsbkL WWr5e/Mqs2wBjIAuW9whLz2bOaE/xY+UBIRpgIH8Dp26CvrF28RNPZr0+jhdPMiXUTCM GfAayn6rTK2G2qY1VX/fyxmLUXacHkqhGSBAFaidBLSV78n7MbpuRCCysGsz+prUe+1F vpby4TuOTnLNkk0Rs3OeOH6B9pHh6Fnmwn1nuDKjhWvh/QebqoL6wcNU2VfzqQE6IEtZ e68Ihh+oKSr/hBkXw7ZabjKQWOFIqLdd+5ubmgnke6PZLb1vWkc8tvspFzG1S64GOWG9 GzDg== X-Gm-Message-State: ALoCoQlI88WIle+BiFv6rPgo+qLUJZCdbiLmmPxjrJ81wF/IdVScIg3ephA22eKlBmQNGrbEKBDF X-Received: by 10.181.29.201 with SMTP id jy9mr741012wid.1.1415108543291; Tue, 04 Nov 2014 05:42:23 -0800 (PST) X-BeenThere: patchwork-forward@linaro.org Received: by 10.152.37.36 with SMTP id v4ls281754laj.43.gmail; Tue, 04 Nov 2014 05:42:23 -0800 (PST) X-Received: by 10.152.5.169 with SMTP id t9mr28785695lat.90.1415108543066; Tue, 04 Nov 2014 05:42:23 -0800 (PST) Received: from mail-la0-f52.google.com (mail-la0-f52.google.com. [209.85.215.52]) by mx.google.com with ESMTPS id o3si885375lag.29.2014.11.04.05.42.23 for (version=TLSv1 cipher=ECDHE-RSA-RC4-SHA bits=128/128); Tue, 04 Nov 2014 05:42:23 -0800 (PST) Received-SPF: pass (google.com: domain of patch+caf_=patchwork-forward=linaro.org@linaro.org designates 209.85.215.52 as permitted sender) client-ip=209.85.215.52; Received: by mail-la0-f52.google.com with SMTP id pv20so898319lab.11 for ; Tue, 04 Nov 2014 05:42:23 -0800 (PST) X-Received: by 10.152.87.98 with SMTP id w2mr58694448laz.27.1415108542834; Tue, 04 Nov 2014 05:42: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 ew9csp116173lbc; Tue, 4 Nov 2014 05:42:21 -0800 (PST) X-Received: by 10.70.5.130 with SMTP id s2mr1598515pds.17.1415108538019; Tue, 04 Nov 2014 05:42:18 -0800 (PST) Received: from mail.openembedded.org (mail.openembedded.org. [140.211.169.62]) by mx.google.com with ESMTP id h1si424144pdf.0.2014.11.04.05.41.47 for ; Tue, 04 Nov 2014 05:42:18 -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 A5DB671F93; Tue, 4 Nov 2014 13:41:46 +0000 (UTC) X-Original-To: openembedded-core@lists.openembedded.org Delivered-To: openembedded-core@lists.openembedded.org Received: from mail-wg0-f47.google.com (mail-wg0-f47.google.com [74.125.82.47]) by mail.openembedded.org (Postfix) with ESMTP id 6780970A8B for ; Tue, 4 Nov 2014 13:40:55 +0000 (UTC) Received: by mail-wg0-f47.google.com with SMTP id a1so13559446wgh.34 for ; Tue, 04 Nov 2014 05:40:54 -0800 (PST) X-Received: by 10.180.80.39 with SMTP id o7mr23403415wix.37.1415108454639; Tue, 04 Nov 2014 05:40:54 -0800 (PST) Received: from localhost ([2001:610:612:0:2ad2:44ff:fe4b:bc17]) by mx.google.com with ESMTPSA id ci9sm1066128wid.24.2014.11.04.05.40.53 for (version=TLSv1.2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Tue, 04 Nov 2014 05:40:54 -0800 (PST) From: Koen Kooi To: openembedded-core@lists.openembedded.org Date: Tue, 4 Nov 2014 14:40:47 +0100 Message-Id: <1415108447-16821-3-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 3/3] lsb 4.1: fix indentation 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.52 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 Shell methods use tabs, variables use spaces. Signed-off-by: Koen Kooi --- meta/recipes-extended/lsb/lsb_4.1.bb | 96 ++++++++++++++++++------------------ 1 file changed, 48 insertions(+), 48 deletions(-) diff --git a/meta/recipes-extended/lsb/lsb_4.1.bb b/meta/recipes-extended/lsb/lsb_4.1.bb index 897520a..b35796d 100644 --- a/meta/recipes-extended/lsb/lsb_4.1.bb +++ b/meta/recipes-extended/lsb/lsb_4.1.bb @@ -15,7 +15,7 @@ SRC_URI = "${SOURCEFORGE_MIRROR}/project/lsb/lsb_release/1.4/lsb-release-1.4.tar file://lsb_log_message \ file://lsb_pidofproc \ file://lsb_start_daemon \ - " + " SRC_URI[md5sum] = "30537ef5a01e0ca94b7b8eb6a36bb1e4" SRC_URI[sha256sum] = "99321288f8d62e7a1d485b7c6bdccf06766fb8ca603c6195806e4457fdf17172" @@ -73,54 +73,54 @@ do_install(){ touch ${D}${sysconfdir}/lsb-release.d/desktop-${PV}-ppc64 fi - install -d ${D}${sysconfdir}/core-lsb - install -d ${D}/${baselib}/lsb - for i in lsb_killproc lsb_log_message lsb_pidofproc lsb_start_daemon - do - install -m 0755 ${WORKDIR}/${i} ${D}${sysconfdir}/core-lsb - done - install -m 0755 ${WORKDIR}/init-functions ${D}/${baselib}/lsb - - # creat links for LSB test - 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 - - if [ "${TARGET_ARCH}" = "x86_64" ];then - cd ${D} - if [ "${baselib}" != "lib64" ]; then - ln -sf ${baselib} lib64 - fi - cd ${D}/${baselib} - ln -sf ld-linux-x86-64.so.2 ld-lsb-x86-64.so.2 - ln -sf ld-linux-x86-64.so.2 ld-lsb-x86-64.so.3 - fi - if [ "${TARGET_ARCH}" = "i586" ];then - cd ${D}/${baselib} - ln -sf ld-linux.so.2 ld-lsb.so.2 - ln -sf ld-linux.so.2 ld-lsb.so.3 - fi - - if [ "${TARGET_ARCH}" = "powerpc64" ];then - cd ${D} - if [ "${baselib}" != "lib64" ]; then - ln -sf ${baselib} lib64 - fi - cd ${D}/${baselib} - ln -sf ld64.so.1 ld-lsb-ppc64.so.2 - ln -sf ld64.so.1 ld-lsb-ppc64.so.3 - fi - if [ "${TARGET_ARCH}" = "powerpc" ];then - cd ${D}/${baselib} - ln -sf ld.so.1 ld-lsb-ppc32.so.2 - ln -sf ld.so.1 ld-lsb-ppc32.so.3 - fi + install -d ${D}${sysconfdir}/core-lsb + install -d ${D}/${baselib}/lsb + for i in lsb_killproc lsb_log_message lsb_pidofproc lsb_start_daemon + do + install -m 0755 ${WORKDIR}/${i} ${D}${sysconfdir}/core-lsb + done + install -m 0755 ${WORKDIR}/init-functions ${D}/${baselib}/lsb + + # creat links for LSB test + 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 + + if [ "${TARGET_ARCH}" = "x86_64" ];then + cd ${D} + if [ "${baselib}" != "lib64" ]; then + ln -sf ${baselib} lib64 + fi + cd ${D}/${baselib} + ln -sf ld-linux-x86-64.so.2 ld-lsb-x86-64.so.2 + ln -sf ld-linux-x86-64.so.2 ld-lsb-x86-64.so.3 + fi + if [ "${TARGET_ARCH}" = "i586" ];then + cd ${D}/${baselib} + ln -sf ld-linux.so.2 ld-lsb.so.2 + ln -sf ld-linux.so.2 ld-lsb.so.3 + fi + + if [ "${TARGET_ARCH}" = "powerpc64" ];then + cd ${D} + if [ "${baselib}" != "lib64" ]; then + ln -sf ${baselib} lib64 + fi + cd ${D}/${baselib} + ln -sf ld64.so.1 ld-lsb-ppc64.so.2 + ln -sf ld64.so.1 ld-lsb-ppc64.so.3 + fi + if [ "${TARGET_ARCH}" = "powerpc" ];then + cd ${D}/${baselib} + ln -sf ld.so.1 ld-lsb-ppc32.so.2 + ln -sf ld.so.1 ld-lsb-ppc32.so.3 + fi } FILES_${PN} += "/lib64 \ - ${libdir}/lsb \ + ${libdir}/lsb \ ${base_libdir}/lsb/* \ - ${libdir}/sendmail \ - " + ${libdir}/sendmail \ + "