diff options
author | John Lee <john_lee@openmoko.org> | 2008-01-17 09:03:38 +0000 |
---|---|---|
committer | Openmoko anonymizer key <devel@lists.openmoko.org> | 2008-01-17 09:03:38 +0000 |
commit | 357ee099c60ddf4fe162b8e24aeeba52edf4099a (patch) | |
tree | e129dbc695257cf5ccce54cdd6316cb2f428df43 /packages | |
parent | 048ace2a52af79397c783867a0fe2a37d671baf4 (diff) |
(Merge OM mtn modification back into mainline)
Integrate mainstream to build meta-toolchain-openmoko
packages/meta/meta-toolchain-openmoko.bb: will install
task-openmoko-toolchain-{target,host}
task-openmoko-toolchain-target: specific to target arch.
task-openmoko-toolchain-host: for host and all, such as
openmoko-sample2-src
moko-autorev.inc, sane-srcrevs.inc: add SRCREV_pn-openmoko-toolchain-scripts
openmoko-toolchain-scripts_svn.bb: will not install sample code now.
openmoko-sample2_svn.bb: update PACKAGE_ARCH_${PN}-src to be used by
ipkg-sdk.conf
Diffstat (limited to 'packages')
-rw-r--r-- | packages/meta/meta-toolchain-openmoko.bb | 8 | ||||
-rw-r--r-- | packages/openmoko-spaces/openmoko-toolchain-scripts_svn.bb | 13 | ||||
-rw-r--r-- | packages/openmoko2/openmoko-sample2_svn.bb | 2 | ||||
-rw-r--r-- | packages/tasks/task-openmoko-toolchain-host.bb | 26 | ||||
-rw-r--r-- | packages/tasks/task-openmoko-toolchain-target.bb (renamed from packages/tasks/task-toolchain-openmoko-sdk.bb) | 1 |
5 files changed, 38 insertions, 12 deletions
diff --git a/packages/meta/meta-toolchain-openmoko.bb b/packages/meta/meta-toolchain-openmoko.bb index b5e392ab1c..b7e5626f61 100644 --- a/packages/meta/meta-toolchain-openmoko.bb +++ b/packages/meta/meta-toolchain-openmoko.bb @@ -1,5 +1,7 @@ -TOOLCHAIN_TARGET_TASK = "task-toolchain-openmoko-sdk" +PR = "r1" -require meta-toolchain.bb +TOOLCHAIN_TARGET_TASK = "task-openmoko-toolchain-target" +TOOLCHAIN_HOST_TASK = "task-openmoko-toolchain-host" -SDK_SUFFIX = "toolchain-openmoko"
\ No newline at end of file +require meta-toolchain.bb +SDK_SUFFIX = "toolchain-openmoko" diff --git a/packages/openmoko-spaces/openmoko-toolchain-scripts_svn.bb b/packages/openmoko-spaces/openmoko-toolchain-scripts_svn.bb index 1526cbab55..7533f81958 100644 --- a/packages/openmoko-spaces/openmoko-toolchain-scripts_svn.bb +++ b/packages/openmoko-spaces/openmoko-toolchain-scripts_svn.bb @@ -1,15 +1,14 @@ DESCRIPTION = "Convenient scripts to be used with openmoko toolchain." -PACKAGE_ARCH = "all" +PR = "r1" SRC_URI = "svn://svn.openmoko.org/developers/john_lee;module=toolkit;proto=http" -SRC_URI += "svn://svn.openmoko.org/trunk/src/target/OM-2007.2/applications;module=openmoko-sample2;proto=http" -SRCREV="3630" +S = "${WORKDIR}/toolkit" + FILES_${PN} = "/" do_install () { - (find ${WORKDIR} -type d -name ".svn" | xargs rm -rf) || true - install -m 755 -d ${D}/share - cp -dr ${WORKDIR}/toolkit/* ${D} - cp -dr ${WORKDIR}/openmoko-sample2 ${D}/share + cp -dr ${S}/* ${D} + find ${D} -name ".svn" | xargs rm -rf + rm -r ${D}/patches } diff --git a/packages/openmoko2/openmoko-sample2_svn.bb b/packages/openmoko2/openmoko-sample2_svn.bb index 4c2c5aad46..9118f89e8a 100644 --- a/packages/openmoko2/openmoko-sample2_svn.bb +++ b/packages/openmoko2/openmoko-sample2_svn.bb @@ -9,7 +9,7 @@ inherit openmoko2 PACKAGES += "${PN}-src" # path should match the toolchain path FILES_${PN}-src = "/usr/local/openmoko" -PACKAGE_ARCH_${PN}-src = "all" +PACKAGE_ARCH_${PN}-src = "${BUILD_ARCH}-all-sdk" do_configure_prepend() { install -d ${WORKDIR}/source diff --git a/packages/tasks/task-openmoko-toolchain-host.bb b/packages/tasks/task-openmoko-toolchain-host.bb new file mode 100644 index 0000000000..31ac3bb746 --- /dev/null +++ b/packages/tasks/task-openmoko-toolchain-host.bb @@ -0,0 +1,26 @@ +require task-sdk-host.bb + +DESCRIPTION = "Packages for a standalone OpenMoko SDK or external toolchain" +LICENSE = "MIT" +ALLOW_EMPTY = "1" + +PR = "r0" + +PACKAGES = "${PN}" + +RDEPENDS_${PN} += "\ + openmoko-sample2-src \ +" +require task-sdk-host.bb + +DESCRIPTION = "Packages for a standalone OpenMoko SDK or external toolchain" +LICENSE = "MIT" +ALLOW_EMPTY = "1" + +PR = "r0" + +PACKAGES = "${PN}" + +RDEPENDS_${PN} += "\ + openmoko-sample2-src \ +" diff --git a/packages/tasks/task-toolchain-openmoko-sdk.bb b/packages/tasks/task-openmoko-toolchain-target.bb index bcb2d370a6..281884d051 100644 --- a/packages/tasks/task-toolchain-openmoko-sdk.bb +++ b/packages/tasks/task-openmoko-toolchain-target.bb @@ -26,6 +26,5 @@ RDEPENDS_${PN} = "\ libmokoui2-dev \ libmokopanelui2-dev \ libmokojournal2-dev \ - openmoko-sample2-src \ openmoko-toolchain-scripts \ " |