From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from mail-gw0-f47.google.com ([74.125.83.47]) by linuxtogo.org with esmtp (Exim 4.72) (envelope-from ) id 1PfDLP-0006Ed-9T for openembedded-devel@lists.openembedded.org; Tue, 18 Jan 2011 16:19:39 +0100 Received: by gwaa12 with SMTP id a12so2369488gwa.6 for ; Tue, 18 Jan 2011 07:19:00 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=gamma; h=domainkey-signature:from:to:cc:subject:date:message-id:x-mailer :in-reply-to:references; bh=kgP8n0fuBaovL8yK+Gea0ymvKl3Yhrn4u1zDHmQ17os=; b=i6BWnTYn7JBhf64wtWBr+HkXahwTKnlAneDn864t9OrcwZRzS7zxQ1DNT3d/9YmzXV OfOCdIiSCSTqSPNBeatACOq1z4DOgWZO3cVe/Oe66Qnm+mGRZh5caJd6TSzym4MmD77o qVJXdre7iLUjkNAcCiOdutS7qYJpxRXfJtN9w= DomainKey-Signature: a=rsa-sha1; c=nofws; d=gmail.com; s=gamma; h=from:to:cc:subject:date:message-id:x-mailer:in-reply-to:references; b=LuOFIj5HknixAgyvW/qlDfTyyN9IM6ZZ2v2rAF071oQyz5lBjj3/KEVJwDhLB7kcfF snCUhNrgKRoQN9hr6VSIwsDOLyveb/QNJQfzxAsl6ft9loZtBEo/k3PACcn4htu32oNO 2zqSrA9xG04HH3sftxSsuVN+hGQj7RbgZv3L4= Received: by 10.42.174.132 with SMTP id v4mr2314471icz.311.1295363940153; Tue, 18 Jan 2011 07:19:00 -0800 (PST) Received: from localhost.localdomain (ip24-251-170-95.ph.ph.cox.net [24.251.170.95]) by mx.google.com with ESMTPS id f5sm4564018icu.16.2011.01.18.07.18.58 (version=TLSv1/SSLv3 cipher=RC4-MD5); Tue, 18 Jan 2011 07:18:59 -0800 (PST) From: Chris Larson To: openembedded-devel@lists.openembedded.org Date: Tue, 18 Jan 2011 08:18:48 -0700 Message-Id: <1295363929-13246-3-git-send-email-kergoth@gmail.com> X-Mailer: git-send-email 1.7.2.3 In-Reply-To: <1295363929-13246-1-git-send-email-kergoth@gmail.com> References: <1295363929-13246-1-git-send-email-kergoth@gmail.com> Cc: Chris Larson Subject: [PATCH 3/4] Add install wrapper rather than coreutils-native X-BeenThere: openembedded-devel@lists.openembedded.org X-Mailman-Version: 2.1.11 Precedence: list Reply-To: openembedded-devel@lists.openembedded.org List-Id: Using the OpenEmbedded metadata to build Distributions List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 18 Jan 2011 15:19:39 -0000 From: Chris Larson Signed-off-by: Chris Larson --- bin/darwin/cp | 2 +- bin/darwin/sed | 2 +- bin/install | 28 ++++++++++++++++++++++++++++ classes/base.bbclass | 28 +++++++++------------------- classes/gpe.bbclass | 2 +- classes/gpephone.bbclass | 2 +- recipes/twin/twin_0.4.6.bb | 1 - 7 files changed, 41 insertions(+), 24 deletions(-) create mode 100755 bin/install diff --git a/bin/darwin/cp b/bin/darwin/cp index 0a523b7..a753557 100755 --- a/bin/darwin/cp +++ b/bin/darwin/cp @@ -7,7 +7,7 @@ # - Otherwise, we stick to what SuSv3 defines -source $(dirname $0)/wrapper.sh +source $(dirname $0)/../wrapper.sh saved="" while getopts fpaRHLP opt; do diff --git a/bin/darwin/sed b/bin/darwin/sed index 2200bd1..5c830e4 100755 --- a/bin/darwin/sed +++ b/bin/darwin/sed @@ -21,7 +21,7 @@ # to reimplement -i internally in this script on some platforms. -source $(dirname $0)/wrapper.sh +source $(dirname $0)/../wrapper.sh case `uname -s` in Darwin) diff --git a/bin/install b/bin/install new file mode 100755 index 0000000..4ad8172 --- /dev/null +++ b/bin/install @@ -0,0 +1,28 @@ +#!/bin/sh + +source $(dirname $0)/wrapper.sh + +saved="" +while getopts dbCcMpSsvB:f:g:m:o: opt; do + case "$opt" in + s) + # Ignore strip argument + ;; + B|f|g|m|o) + save "-$opt" + save "$OPTARG" + ;; + \?) + exit 1 + ;; + *) + save "-$opt" + ;; + esac +done +shift $(($OPTIND - 1)) +for arg; do + save "$arg" +done + +exec_real diff --git a/classes/base.bbclass b/classes/base.bbclass index 6fa292e..8804ec0 100644 --- a/classes/base.bbclass +++ b/classes/base.bbclass @@ -55,33 +55,23 @@ oe_runmake() { } def base_deps(d): - # - # Ideally this will check a flag so we will operate properly in - # the case where host == build == target, for now we don't work in - # that case though. - # - deps = "coreutils-native" - if bb.data.getVar('PN', d, True) in ("shasum-native", "coreutils-native"): - deps = "" - # INHIBIT_DEFAULT_DEPS doesn't apply to the patch command. Whether or not # we need that built is the responsibility of the patch function / class, not # the application. if not bb.data.getVar('INHIBIT_DEFAULT_DEPS', d): if (bb.data.getVar('HOST_SYS', d, 1) != - bb.data.getVar('BUILD_SYS', d, 1)): - deps += " virtual/${TARGET_PREFIX}gcc virtual/libc " + bb.data.getVar('BUILD_SYS', d, 1)): + return "virtual/${TARGET_PREFIX}gcc virtual/libc" elif bb.data.inherits_class('native', d) and \ bb.data.getVar('PN', d, True) not in \ ("linux-libc-headers-native", "quilt-native", - "unifdef-native", "shasum-native", - "coreutils-native"): - deps += " linux-libc-headers-native" - return deps + "unifdef-native", "shasum-native"): + return "linux-libc-headers-native" + return "" -DEPENDS_prepend="${@base_deps(d)} " -DEPENDS_virtclass-native_prepend="${@base_deps(d)} " -DEPENDS_virtclass-nativesdk_prepend="${@base_deps(d)} " +DEPENDS_prepend = "${@base_deps(d)} " +DEPENDS_virtclass-native_prepend = "${@base_deps(d)} " +DEPENDS_virtclass-nativesdk_prepend = "${@base_deps(d)} " SCENEFUNCS += "base_scenefunction" @@ -89,7 +79,7 @@ SCENEFUNCS += "base_scenefunction" python base_scenefunction () { stamp = bb.data.getVar('STAMP', d, 1) + ".needclean" if os.path.exists(stamp): - bb.build.exec_func("do_clean", d) + bb.build.exec_func("do_clean", d) } python base_do_setscene () { diff --git a/classes/gpe.bbclass b/classes/gpe.bbclass index a9ddec3..7e042ee 100644 --- a/classes/gpe.bbclass +++ b/classes/gpe.bbclass @@ -1,4 +1,4 @@ -DEPENDS_prepend = "coreutils-native virtual/libintl intltool-native " +DEPENDS_prepend = "virtual/libintl intltool-native " GPE_TARBALL_SUFFIX ?= "gz" SRC_URI = "${GPE_MIRROR}/${PN}-${PV}.tar.${GPE_TARBALL_SUFFIX}" FILES_${PN} += "${datadir}/gpe ${datadir}/application-registry" diff --git a/classes/gpephone.bbclass b/classes/gpephone.bbclass index 57867b5..dffbaa9 100644 --- a/classes/gpephone.bbclass +++ b/classes/gpephone.bbclass @@ -1,4 +1,4 @@ -DEPENDS_prepend = "coreutils-native virtual/libintl intltool-native " +DEPENDS_prepend = "virtual/libintl intltool-native " GPE_TARBALL_SUFFIX ?= "gz" SRC_URI = "${GPEPHONE_MIRROR}/${PN}-${PV}/${PN}-${PV}.tar.${GPE_TARBALL_SUFFIX}" FILES_${PN} += "${datadir}/gpe ${datadir}/application-registry" diff --git a/recipes/twin/twin_0.4.6.bb b/recipes/twin/twin_0.4.6.bb index c6c3fbd..3ea36f8 100644 --- a/recipes/twin/twin_0.4.6.bb +++ b/recipes/twin/twin_0.4.6.bb @@ -1,7 +1,6 @@ DESCRIPTION = "Twin is a text-mode windowing environment: it draws and manages text windows on a text-mode display, like X11 does for graphical windows. It has a built-in window manager and terminal emulator, and can be used as server for remote clients in the same style as X11. It can display on Linux console, on X11 and inside itself." SECTION = "console/utils" -DEPENDS = "coreutils-native" LICENSE = "GPL LGPL" SRC_URI = "http://linuz.sns.it/~max/twin/twin-0.4.6.tar.gz \ file://cross_compile.patch" -- 1.7.2.3