summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--meta/conf/distro/include/poky-default.inc (renamed from meta/conf/distro/include/poky-eabi.inc)0
-rw-r--r--meta/conf/distro/poky.conf4
2 files changed, 2 insertions, 2 deletions
diff --git a/meta/conf/distro/include/poky-eabi.inc b/meta/conf/distro/include/poky-default.inc
index a0dc10196b..a0dc10196b 100644
--- a/meta/conf/distro/include/poky-eabi.inc
+++ b/meta/conf/distro/include/poky-default.inc
diff --git a/meta/conf/distro/poky.conf b/meta/conf/distro/poky.conf
index ccbd4869b6..2bf4be8c04 100644
--- a/meta/conf/distro/poky.conf
+++ b/meta/conf/distro/poky.conf
@@ -48,11 +48,11 @@ KERNEL_CONSOLE = "ttyS0"
48#DEBUG_BUILD = "1" 48#DEBUG_BUILD = "1"
49#INHIBIT_PACKAGE_STRIP = "1" 49#INHIBIT_PACKAGE_STRIP = "1"
50 50
51# Default to TARGETOS values for EABI 51# Default to TARGETOS values for EABI on arm
52GLIBCTARGETOS = "linux${@['','-gnueabi'][bb.data.getVar('TARGET_ARCH',d,1) in ['arm', 'armeb']]}" 52GLIBCTARGETOS = "linux${@['','-gnueabi'][bb.data.getVar('TARGET_ARCH',d,1) in ['arm', 'armeb']]}"
53UCLIBCTARGETOS = "linux${@['-uclibc','-uclibcgnueabi'][bb.data.getVar('TARGET_ARCH',d,1) in ['arm', 'armeb']]}" 53UCLIBCTARGETOS = "linux${@['-uclibc','-uclibcgnueabi'][bb.data.getVar('TARGET_ARCH',d,1) in ['arm', 'armeb']]}"
54 54
55POKYMODE ?= "eabi" 55POKYMODE ?= "default"
56require conf/distro/include/poky-${POKYMODE}.inc 56require conf/distro/include/poky-${POKYMODE}.inc
57 57
58POKYLIBC ?= "glibc" 58POKYLIBC ?= "glibc"