[oe-commits] org.oe.dev merge of '39f14a7904df78c33a10ff78c5b16684b63bf4ca'

[oe commit]

merge of '39f14a7904df78c33a10ff78c5b16684b63bf4ca'
     and 'ff99dd15b2922519885cf8632ba157d543e933c2'

Author: oe at openembedded.org
Branch: org.openembedded.dev
Revision: 048141e23ddf141ad29dc4fbcab2d7ed03eb4a2a
ViewMTN: http://monotone.openembedded.org/revision/info/048141e23ddf141ad29dc4fbcab2d7ed03eb4a2a
Files:
1
packages/tasks/task-sdk.bb
conf/machine/em-x270.conf
Diffs:

#
# mt diff -r39f14a7904df78c33a10ff78c5b16684b63bf4ca -r048141e23ddf141ad29dc4fbcab2d7ed03eb4a2a
#
# 
# 
# patch "packages/tasks/task-sdk.bb"
#  from [c0a5081b759775c0b891e8be2e7e55e4f2fe8388]
#    to [fa9cc1983236c143585863ae6d3d6b6f426c6b0b]
# 
============================================================
--- packages/tasks/task-sdk.bb	c0a5081b759775c0b891e8be2e7e55e4f2fe8388
+++ packages/tasks/task-sdk.bb	fa9cc1983236c143585863ae6d3d6b6f426c6b0b
@@ -1,5 +1,5 @@ DESCRIPTION = "SDK packages"
 DESCRIPTION = "SDK packages"
-PR = "r7"
+PR = "r8"
 LICENSE = "MIT"
 ALLOW_EMPTY = "1"
 
@@ -7,8 +7,16 @@ PACKAGES = "\
     task-sdk-bare \
     "
 
+DEPENDS = "virtual/libc"
+
+LIBC_linux = "glibc"
+LIBC_linux-uclibc = "uclibc"
+LIBC_linux-gnueabi = "glibc"
+LIBC_linux-uclibcgnueabi = "uclibc"
+
+
 RDEPENDS_task-sdk-bare = "\
-    glibc \
-    glibc-dev \
+    ${LIBC} \
+    ${LIBC}-dev \
     libgcc \
     "


#
# mt diff -rff99dd15b2922519885cf8632ba157d543e933c2 -r048141e23ddf141ad29dc4fbcab2d7ed03eb4a2a
#
# 
# 
# patch "conf/machine/em-x270.conf"
#  from [181cb3e20de62a1ead71d4fa8899c4d5f16eaff2]
#    to [2068d979d6158266b6c75fe1b8ff553e77308e04]
# 
============================================================
--- conf/machine/em-x270.conf	181cb3e20de62a1ead71d4fa8899c4d5f16eaff2
+++ conf/machine/em-x270.conf	2068d979d6158266b6c75fe1b8ff553e77308e04
@@ -8,7 +8,7 @@ GUI_MACHINE_CLASS ?= "bigscreen"
 TARGET_ARCH = "arm"
 GUI_MACHINE_CLASS ?= "bigscreen"
 
-PACKAGE_EXTRA_ARCHS = "arm armv4 armv4t armv5te iwmmxt  "
+PACKAGE_EXTRA_ARCHS = "armv4 armv4t armv5te iwmmxt  "
 PREFERRED_PROVIDER_virtual/kernel = "${MACHINE}"
 
 # Use tune-xscale per default. Machine independent feeds should be built with tune-strongarm.