From patchwork Thu Jan 31 10:35:59 2013 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: =?utf-8?q?Kim_B=C3=B8ndergaard?= X-Patchwork-Id: 217150 X-Patchwork-Delegate: esben@haabendal.dk Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from hugin.dotsrc.org (hugin.dotsrc.org [IPv6:2001:878:346::102]) by ozlabs.org (Postfix) with ESMTP id AFFFF2C0299 for ; Thu, 31 Jan 2013 21:36:13 +1100 (EST) Received: from hugin.dotsrc.org (localhost [127.0.0.1]) by hugin.dotsrc.org (Postfix) with ESMTP id 8BEF63FDEE for ; Thu, 31 Jan 2013 11:36:09 +0100 (CET) X-Original-To: dev@oe-lite.org Delivered-To: dev@oe-lite.org Received: from mail01.prevas.se (mail01.prevas.se [62.95.78.3]) by hugin.dotsrc.org (Postfix) with ESMTPS id 965703FBD6 for ; Thu, 31 Jan 2013 11:36:06 +0100 (CET) DKIM-Signature: v=1; a=rsa-sha256; c=simple/simple; d=prevas.dk; i=@prevas.dk; l=1788; q=dns/txt; s=ironport1; t=1359628566; x=1391164566; h=from:to:subject:date:message-id:in-reply-to:references: mime-version; bh=zZrXiRw9qa0soA3818x39hUFyNdl5rhjXOWBsO/T7xM=; b=ww75kn3glp3HOq75sQjC06QMLp3kCXgL8hiJU7Nl1AI7UTEui268D5qq F+AjOCBhDW55nmoSs31a6PcNUJlMV+8S2oxHSgGBDrbMU2+HFHXP04GrP WK06O2Olk5BmuVhxGZxJQtg+DCAsRvocIdu4zamcUlHgnn6FeApRHOiHQ Y=; X-IronPort-AV: E=Sophos;i="4.84,575,1355094000"; d="scan'208";a="2748938" Received: from vmprevas3.prevas.se (HELO smtp.prevas.se) ([172.16.8.103]) by ironport1.prevas.se with ESMTP/TLS/AES128-SHA; 31 Jan 2013 11:36:05 +0100 Received: from localhost (172.16.10.102) by smtp.prevas.se (172.16.8.105) with Microsoft SMTP Server id 14.2.328.9; Thu, 31 Jan 2013 11:36:04 +0100 Received: by localhost (Postfix, from userid 30019) id EBC9E3D719; Thu, 31 Jan 2013 10:36:04 +0000 (UTC) From: =?UTF-8?q?Kim=20B=C3=B8ndergaard?= To: Subject: [PATCH 2/2] util-linux: install issue fix for sdk build Date: Thu, 31 Jan 2013 10:35:59 +0000 Message-ID: X-Mailer: git-send-email 1.8.0.3 In-Reply-To: References: MIME-Version: 1.0 X-BeenThere: dev@oe-lite.org X-Mailman-Version: 2.1.13 Precedence: list List-Id: OE-lite development List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: dev-bounces@oe-lite.org Errors-To: dev-bounces@oe-lite.org --- recipes/util-linux/util-linux.inc | 27 ++++++++++++++++++++++++++- 1 file changed, 26 insertions(+), 1 deletion(-) diff --git a/recipes/util-linux/util-linux.inc b/recipes/util-linux/util-linux.inc index 961c5a4..78479bb 100644 --- a/recipes/util-linux/util-linux.inc +++ b/recipes/util-linux/util-linux.inc @@ -46,7 +46,9 @@ EXTRA_OEMAKE += "V=1" # Grrrr... at least some versions of util-linux insists on having # an sbin dir even though it is told to put everything in bin. At # least it seems to respect requests on dropping usr prefix -do_install[postfuncs] += "do_install_sbin_fixup" +INSTALL_POSTFUNC = "do_install_sbin_fixup" +INSTALL_POSTFUNC:sdk = "do_install_sdk_fixup" +do_install[postfuncs] += "${INSTALL_POSTFUNC}" do_install_sbin_fixup () { if [ ${base_sbindir} != "/sbin" ] ; then if [ -d ${D}/sbin ] ; then @@ -56,6 +58,28 @@ do_install_sbin_fixup () { fi } +do_install_sdk_fixup () { + if [ ${base_sbindir} != "/sbin" ] ; then + if [ -d ${D}/sbin ] ; then + cp -ar ${D}/sbin/. ${D}${bindir}/. \ + && rm -rf ${D}/sbin + fi + fi + if [ ${sbindir} != "/usr/sbin" ] ; then + if [ -d ${D}/usr/sbin ] ; then + cp -ar ${D}/usr/sbin/. ${D}${bindir}/. \ + && rm -rf ${D}/usr/sbin + fi + fi + if [ ${bindir} != "/usr/bin" ] ; then + if [ -d ${D}/usr/bin ] ; then + cp -ar ${D}/usr/bin/. ${D}${bindir}/. \ + && rm -rf ${D}/usr/bin + fi + fi + +} + FILES_${PN}-doc += "${datadir}/getopt/" inherit auto-package-utils auto-package-libs @@ -70,3 +94,4 @@ FILES_${PN}-libmount-dev += "${includedir}/libmount" FILES_${PN}-setarch = "${bindir}/linux32 ${bindir}/linux64 ${bindir}/ppc \ ${bindir}/ppc32 ${bindir}/ppc64" FILES_${PN}-swapon = "${sbindir}/swapoff" +