From b1975f9168a195bebda9db170f4350c98e973634 Mon Sep 17 00:00:00 2001
From: Richard Purdie <richard@openedhand.com>
Date: Wed, 9 Jan 2008 13:46:44 +0000
Subject: meta-toolchain: Allow output name to be overridden

git-svn-id: https://svn.o-hand.com/repos/poky/trunk@3438 311d38ba-8fff-0310-9ca6-ca027cbcb966
---
 meta/packages/meta/meta-toolchain-sdk.bb | 1 +
 meta/packages/meta/meta-toolchain.bb     | 4 ++--
 2 files changed, 3 insertions(+), 2 deletions(-)

(limited to 'meta/packages')

diff --git a/meta/packages/meta/meta-toolchain-sdk.bb b/meta/packages/meta/meta-toolchain-sdk.bb
index 61f6a18e1..4da9391dd 100644
--- a/meta/packages/meta/meta-toolchain-sdk.bb
+++ b/meta/packages/meta/meta-toolchain-sdk.bb
@@ -1,2 +1,3 @@
 TOOLCHAIN_TARGET_TASK = "task-poky-standalone-gmae-sdk-target"
+TOOLCHAIN_OUTPUTNAME = "${SDK_NAME}-toolchain-sdk-${DISTRO_VERSION}"
 require meta-toolchain.bb
diff --git a/meta/packages/meta/meta-toolchain.bb b/meta/packages/meta/meta-toolchain.bb
index 45d1009f3..dfa28e163 100644
--- a/meta/packages/meta/meta-toolchain.bb
+++ b/meta/packages/meta/meta-toolchain.bb
@@ -1,7 +1,6 @@
 DESCRIPTION = "Meta package for building a installable toolchain"
 LICENSE = "MIT"
 DEPENDS = "ipkg-native ipkg-utils-native fakeroot-native sed-native"
-PR = "r1"
 
 inherit sdk meta
 
@@ -14,6 +13,7 @@ IPKG_TARGET = "ipkg-cl -f ${IPKGCONF_TARGET} -o ${SDK_OUTPUT}/${prefix}"
 
 TOOLCHAIN_HOST_TASK ?= "task-sdk-host"
 TOOLCHAIN_TARGET_TASK ?= "task-poky-standalone-sdk-target"
+TOOLCHAIN_OUTPUTNAME ?= "${SDK_NAME}-toolchain-${DISTRO_VERSION}"
 
 RDEPENDS = "${TOOLCHAIN_TARGET_TASK} ${TOOLCHAIN_HOST_TASK}"
 
@@ -122,7 +122,7 @@ do_populate_sdk() {
 	# Package it up
 	mkdir -p ${SDK_DEPLOY}
 	cd ${SDK_OUTPUT}
-	fakeroot tar cfj ${SDK_DEPLOY}/${SDK_NAME}-toolchain-${DISTRO_VERSION}.tar.bz2 .
+	fakeroot tar cfj ${SDK_DEPLOY}/${TOOLCHAIN_OUTPUTNAME}.tar.bz2 .
 }
 
 do_populate_sdk[nostamp] = "1"
-- 
cgit v1.2.3