[oe-commits] org.oe.dev merge of 'bc7f1f51525f7d568b5fe34877e1237d8d943cd6'
mickeyl commit
openembedded-commits at lists.openembedded.org
Wed Oct 17 15:04:04 UTC 2007
merge of 'bc7f1f51525f7d568b5fe34877e1237d8d943cd6'
and 'be08cf05c894e5e60c1759dc02b5c26b50963906'
Author: mickeyl at openembedded.org
Branch: org.openembedded.dev
Revision: 0b2dabb8c740a97651ade85ebd22e45a68907b71
ViewMTN: http://monotone.openembedded.org/revision/info/0b2dabb8c740a97651ade85ebd22e45a68907b71
Files:
1
packages/meta/meta-toolchain-openmoko.bb
packages/tasks/task-toolchain-openmoko-sdk.bb
packages/meta/meta-toolchain.bb
classes/angstrom-mirrors.bbclass
conf/distro/openmoko.conf
packages/gpe-conf/gpe-conf_0.2.6.bb
packages/uboot/uboot-openmoko_svn.bb
Diffs:
#
# mt diff -rbc7f1f51525f7d568b5fe34877e1237d8d943cd6 -r0b2dabb8c740a97651ade85ebd22e45a68907b71
#
#
#
# add_file "packages/meta/meta-toolchain-openmoko.bb"
# content [5a2e215e02b6321dcc448a76c44590d15e889728]
#
# add_file "packages/tasks/task-toolchain-openmoko-sdk.bb"
# content [7af4fab2e6a807dcffa21e3e435c72702f5f2e0f]
#
# patch "packages/meta/meta-toolchain.bb"
# from [87c750d8d98af38e8402202979fe105e03ca6e35]
# to [0c3ac90a6bc67204dfd677a6397fe650e84c59fa]
#
============================================================
--- packages/meta/meta-toolchain-openmoko.bb 5a2e215e02b6321dcc448a76c44590d15e889728
+++ packages/meta/meta-toolchain-openmoko.bb 5a2e215e02b6321dcc448a76c44590d15e889728
@@ -0,0 +1,5 @@
+TOOLCHAIN_TARGET_TASK = "task-toolchain-openmoko-sdk"
+RDEPENDS = "${TOOLCHAIN_TARGET_TASK}"
+
+require meta-toolchain.bb
+
============================================================
--- packages/tasks/task-toolchain-openmoko-sdk.bb 7af4fab2e6a807dcffa21e3e435c72702f5f2e0f
+++ packages/tasks/task-toolchain-openmoko-sdk.bb 7af4fab2e6a807dcffa21e3e435c72702f5f2e0f
@@ -0,0 +1,28 @@
+DESCRIPTION = "Packages for a standalone OpenMoko SDK or external toolchain"
+PR = "r1"
+LICENSE = "MIT"
+ALLOW_EMPTY = "1"
+
+PACKAGES = "${PN}"
+
+RDEPENDS_${PN} = "\
+ glibc \
+ glibc-dbg \
+ glibc-dev \
+ glibc-utils \
+ libsegfault \
+ glibc-thread-db \
+ glibc-localedata-i18n \
+ glibc-gconv-ibm850 \
+ glibc-gconv-cp1252 \
+ glibc-gconv-iso8859-1 \
+ glibc-gconv-iso8859-15 \
+ locale-base-en-gb \
+ libgcc \
+ libstdc++ \
+ \
+ libmokogsmd2-dev \
+ libmokoui2-dev \
+ libmokopanelui2-dev \
+ libmokojournal2-dev \
+"
============================================================
--- packages/meta/meta-toolchain.bb 87c750d8d98af38e8402202979fe105e03ca6e35
+++ packages/meta/meta-toolchain.bb 0c3ac90a6bc67204dfd677a6397fe650e84c59fa
@@ -100,6 +100,9 @@ do_populate_sdk() {
done
done
+ # add missing link to libgcc_s.so.1
+ # libgcc-dev should be responsible for that, but it's not getting built
+ ln -sf libgcc_s.so.1 ${SDK_OUTPUT}/${prefix}/${TARGET_SYS}/lib/libgcc_s.so
# remove unwanted executables
rm -rf ${SDK_OUTPUT}/${prefix}/sbin ${SDK_OUTPUT}/${prefix}/etc
#
# mt diff -rbe08cf05c894e5e60c1759dc02b5c26b50963906 -r0b2dabb8c740a97651ade85ebd22e45a68907b71
#
#
#
# patch "classes/angstrom-mirrors.bbclass"
# from [12843eb50eb15e995dc38e63bf1c31e35b879ff4]
# to [5cb52a71d99b0e1e741b10beef5daa2a8a206bd0]
#
# patch "conf/distro/openmoko.conf"
# from [2ec30f54157022779b502f8ec721dfbf3505d89b]
# to [6a2e6be73d20c7c96c92f46207a589f96df4b427]
#
# patch "packages/gpe-conf/gpe-conf_0.2.6.bb"
# from [ab00b228e49cc53742b5fcd1ecb6dd579a926ef3]
# to [86e16babf4c0a37cb552a66f01e6d3fb2cd8fc2e]
#
# patch "packages/uboot/uboot-openmoko_svn.bb"
# from [32f83f5ac25253fffe2da4176c4bce6897bd83a1]
# to [d69a1fdef9283935cf9aaf4246a079f43fbeb62a]
#
============================================================
--- classes/angstrom-mirrors.bbclass 12843eb50eb15e995dc38e63bf1c31e35b879ff4
+++ classes/angstrom-mirrors.bbclass 5cb52a71d99b0e1e741b10beef5daa2a8a206bd0
@@ -1,4 +1,4 @@ ftp://.*/.*/ http://www.angstrom-distrib
MIRRORS_append () {
ftp://.*/.*/ http://www.angstrom-distribution.org/unstable/sources/
-http://.*/.*/ http://www.angstrom-distribution.org/unstable/sources/
+https?$://.*/.*/ http://www.angstrom-distribution.org/unstable/sources/
}
============================================================
--- conf/distro/openmoko.conf 2ec30f54157022779b502f8ec721dfbf3505d89b
+++ conf/distro/openmoko.conf 6a2e6be73d20c7c96c92f46207a589f96df4b427
@@ -19,7 +19,7 @@ CVS_TARBALL_STASH = "http://downloads.op
CVS_TARBALL_STASH = "http://downloads.openmoko.org/sources/"
-PREMIRRORS = "(ftp|http)://.*/.*/ http://downloads.openmoko.org/sources/"
+PREMIRRORS = "(ftp|https?)$://.*/.*/ http://downloads.openmoko.org/sources/"
FEED_URIS = "\
snapshot-all##http://buildhost.openmoko.org/snapshots/2007.08/ipk/all \
============================================================
--- packages/gpe-conf/gpe-conf_0.2.6.bb ab00b228e49cc53742b5fcd1ecb6dd579a926ef3
+++ packages/gpe-conf/gpe-conf_0.2.6.bb 86e16babf4c0a37cb552a66f01e6d3fb2cd8fc2e
@@ -1,16 +1,16 @@ DEPENDS = "gtk+ esound audiofile libgpew
DESCRIPTION = "Configuration applets for GPE"
SECTION = "gpe"
PRIORITY = "optional"
LICENSE = "GPL"
DEPENDS = "gtk+ esound audiofile libgpewidget libxsettings libxsettings-client libxrandr"
-RDEPENDS_${PN} = "xst xset ntpdate gpe-login gpe-icons tzdata xrandr"
+RDEPENDS_${PN} = "xst gpe-confd xset ntpdate gpe-icons tzdata xrandr"
RDEPENDS_gpe-conf-panel = "gpe-conf"
RPROVIDES_${PN} += " bl"
RCONFLICTS_${PN} = "bl"
-PR = "r0"
+PR = "r1"
GPE_TARBALL_SUFFIX = "bz2"
============================================================
--- packages/uboot/uboot-openmoko_svn.bb 32f83f5ac25253fffe2da4176c4bce6897bd83a1
+++ packages/uboot/uboot-openmoko_svn.bb d69a1fdef9283935cf9aaf4246a079f43fbeb62a
@@ -18,6 +18,7 @@ SRC_URI = "\
svn://svn.openmoko.org/trunk/src/target/u-boot;module=patches;proto=http;name=patches \
file://uboot-eabi-fix-HACK.patch \
file://uboot-20070311-tools_makefile_ln_sf.patch;patch=1 \
+ file://makefile-no-dirafter.patch;patch=1 \
"
S = "${WORKDIR}/git"
More information about the Openembedded-commits
mailing list