meta-moblin: Remove now unneeded moblin POKYMODE

Signed-off-by: Richard Purdie <rpurdie@linux.intel.com>

diff --git a/meta-moblin/conf/distro/include/poky-moblin.inc b/meta-moblin/conf/distro/include/poky-moblin.inc
deleted file mode 100644 (file)
index af74c31..0000000
--- a/meta-moblin/conf/distro/include/poky-moblin.inc
+++ /dev/null
@@ -1,27 +0,0 @@
-TARGET_VENDOR = "-poky"
-
-PREFERRED_PROVIDER_virtual/${TARGET_PREFIX}libc-for-gcc = "glibc"
-PREFERRED_PROVIDER_virtual/${TARGET_PREFIX}binutils = "binutils-cross"
-PREFERRED_PROVIDER_virtual/${TARGET_PREFIX}gcc-initial = "gcc-cross-initial"
-PREFERRED_PROVIDER_virtual/${TARGET_PREFIX}gcc-intermediate = "gcc-cross-intermediate"
-PREFERRED_PROVIDER_virtual/${TARGET_PREFIX}gcc = "gcc-cross"
-PREFERRED_PROVIDER_virtual/${TARGET_PREFIX}g++ = "gcc-cross"
-PREFERRED_PROVIDER_virtual/${TARGET_PREFIX}compilerlibs = "gcc-runtime"
-
-GCCVERSION ?= "4.3.3"
-BINUVERSION = "2.20"
-
-PREFERRED_VERSION_gcc ?= "${GCCVERSION}"
-PREFERRED_VERSION_gcc-cross ?= "${GCCVERSION}"
-PREFERRED_VERSION_gcc-cross-initial ?= "${GCCVERSION}"
-PREFERRED_VERSION_gcc-cross-intermediate ?= "${GCCVERSION}"
-PREFERRED_VERSION_gcc-cross-sdk ?= "4.3.1"
-PREFERRED_VERSION_binutils ?= "${BINUVERSION}"
-PREFERRED_VERSION_binutils-cross ?= "${BINUVERSION}"
-PREFERRED_VERSION_linux-libc-headers ?= "2.6.33"
-PREFERRED_VERSION_glibc ?= "2.9"
-PREFERRED_VERSION_glibc-initial ?= "2.9"
-PREFERRED_VERSION_elfutils ?= "0.148"
-
-require conf/distro/include/as-needed.inc
-

diff --git a/meta-moblin/conf/distro/moblin.conf b/meta-moblin/conf/distro/moblin.conf
index 05888ac667e7f3f4fcd9e94ae41c1ca8fdc42215..abbbdf617cdd5ef44890c086d469c25deb6f54e2 100644 (file)
--- a/meta-moblin/conf/distro/moblin.conf
+++ b/meta-moblin/conf/distro/moblin.conf
@@ -46,7 +46,7 @@ KERNEL_CONSOLE = "ttyS0"
 GLIBCTARGETOS = "linux${@['','-gnueabi'][bb.data.getVar('TARGET_ARCH',d,1) in ['arm', 'armeb']]}"
 UCLIBCTARGETOS = "linux${@['-uclibc','-uclibcgnueabi'][bb.data.getVar('TARGET_ARCH',d,1) in ['arm', 'armeb']]}"
 
-POKYMODE ?= "moblin"
+POKYMODE ?= "default"
 require conf/distro/include/poky-${POKYMODE}.inc
 
 POKYLIBC ?= "glibc"