org.openmoko.dev: 5a5e955c4e067a5ab216f6e9a28c27f869862051

oe at monotone.openmoko.org oe at monotone.openmoko.org
Thu May 15 06:40:20 CEST 2008


revision:            5a5e955c4e067a5ab216f6e9a28c27f869862051
date:                2008-05-15T04:23:15
author:              john_lee at openembedded.org
branch:              org.openmoko.dev
changelog:
meta-toolchain-openmoko: a gross hack to put pkg-config in.
* We need the OE version of pkg-config that uses PKG_CONFIG_SYSROOT_DIR
  to make toolchain work properly.  However, there's no facility to
  install native stuffs in it.  First, native recipes don't generate
  ipkg.  Second, native feed does not exist in opkg-sdk.conf.  I don't
  won't to fix these yet so at the moment I just copy the native
  pkg-config into the toolchain.
* meta-toolchain: add a hook variable POPULATE_SDK_EXTRA_TASK
* meta-toolchain-openmoko: cp native pkg-config from staging dir into
  toolchain.
* openmoko-toolchain-scripts: use ${prefix} instead of hardcode path.

manifest:
format_version "1"

new_manifest [d344d39b5731d99472f978ad70766177f1af257a]

old_revision [fba9e32c8adbdf5cb4cac4f5dd30b830efe70c04]

patch "packages/meta/meta-toolchain-openmoko.bb"
 from [76d692ed056a9397df52f5d27a16c97f29b032cd]
   to [f863c373260a0e447f82489950183fed3cacbca5]

patch "packages/meta/meta-toolchain.bb"
 from [653be1fcb3f433216d391a1e48cde9fd4e56e7a3]
   to [154f3d231b84fcfc3bb4298097864f5f205225df]

patch "packages/openmoko-tools/openmoko-toolchain-scripts_svn.bb"
 from [1e7c5255fcac0c151d8e27c90678b60a96ba86cc]
   to [602d1e114432c290bee5ea5c879d890625819c12]
-------------- next part --------------
#
#
# patch "packages/meta/meta-toolchain-openmoko.bb"
#  from [76d692ed056a9397df52f5d27a16c97f29b032cd]
#    to [f863c373260a0e447f82489950183fed3cacbca5]
# 
# patch "packages/meta/meta-toolchain.bb"
#  from [653be1fcb3f433216d391a1e48cde9fd4e56e7a3]
#    to [154f3d231b84fcfc3bb4298097864f5f205225df]
# 
# patch "packages/openmoko-tools/openmoko-toolchain-scripts_svn.bb"
#  from [1e7c5255fcac0c151d8e27c90678b60a96ba86cc]
#    to [602d1e114432c290bee5ea5c879d890625819c12]
#
============================================================
--- packages/meta/meta-toolchain-openmoko.bb	76d692ed056a9397df52f5d27a16c97f29b032cd
+++ packages/meta/meta-toolchain-openmoko.bb	f863c373260a0e447f82489950183fed3cacbca5
@@ -1,7 +1,11 @@
-PR = "r1"
+require meta-toolchain.bb
 
+DEPENDS += "pkgconfig-native"
+PR = "r1.01"
+
+SDK_SUFFIX = "toolchain-openmoko"
+
 TOOLCHAIN_TARGET_TASK = "task-openmoko-toolchain-target"
 TOOLCHAIN_HOST_TASK = "task-openmoko-toolchain-host"
 
+POPULATE_SDK_EXTRA_TASK = "cp ${STAGING_BINDIR_NATIVE}/pkg-config ${SDK_OUTPUT}/${bindir}"
-require meta-toolchain.bb
-SDK_SUFFIX = "toolchain-openmoko"
============================================================
--- packages/meta/meta-toolchain.bb	653be1fcb3f433216d391a1e48cde9fd4e56e7a3
+++ packages/meta/meta-toolchain.bb	154f3d231b84fcfc3bb4298097864f5f205225df
@@ -20,6 +20,8 @@ RDEPENDS = "${TOOLCHAIN_TARGET_TASK} ${T
 
 RDEPENDS = "${TOOLCHAIN_TARGET_TASK} ${TOOLCHAIN_HOST_TASK}"
 
+POPULATE_SDK_EXTRA_TASK ?= ""
+
 do_populate_sdk() {
 	rm -rf ${SDK_OUTPUT}
 	mkdir -p ${SDK_OUTPUT}
@@ -93,6 +95,8 @@ do_populate_sdk() {
 	done
 	rm -f ${SDK_OUTPUT}/${prefix}/lib/*.la
 
+	${POPULATE_SDK_EXTRA_TASK}
+
 	# Setup site file for external use
 	siteconfig=${SDK_OUTPUT}/${prefix}/site-config
 	touch $siteconfig
============================================================
--- packages/openmoko-tools/openmoko-toolchain-scripts_svn.bb	1e7c5255fcac0c151d8e27c90678b60a96ba86cc
+++ packages/openmoko-tools/openmoko-toolchain-scripts_svn.bb	602d1e114432c290bee5ea5c879d890625819c12
@@ -1,15 +1,15 @@ DESCRIPTION = "Convenient scripts to be 
 DESCRIPTION = "Convenient scripts to be used with openmoko toolchain."
-PR = "r1.03"
+PR = "r1.04"
 
 SRC_URI = "svn://svn.openmoko.org/trunk/src/host;module=toolchain-scripts;proto=http"
 
 S = "${WORKDIR}/toolchain-scripts"
 
 do_install () {
-        install -d ${D}/usr/local/openmoko/arm
-        cp -dr ${S}/* ${D}/usr/local/openmoko/arm
+        install -d ${D}/${prefix}
+        cp -dr ${S}/* ${D}/${prefix}
         find ${D} -name ".svn" | xargs rm -rf
-        rm -r ${D}/usr/local/openmoko/arm/patches
+        rm -rf ${D}/${prefix}/patches
 }
 
 PACKAGE_ARCH = "all"
-------------- next part --------------
An HTML attachment was scrubbed...
URL: http://lists.openmoko.org/pipermail/commitlog/attachments/20080515/64e5d041/attachment.htm 


More information about the commitlog mailing list