4 files changed, 0 insertions, 206 deletions
diff --git a/meta-moblin/conf/distro/include/moblin-fixed-revisions.inc b/meta-moblin/conf/distro/include/moblin-fixed-revisions.inc
deleted file mode 100644
index afd673fcb..000000000
--- a/meta-moblin/conf/distro/include/moblin-fixed-revisions.inc
+++ /dev/null
@@ -1,9 +0,0 @@
-#
-# Known good source dates/revisions/tags to use, *only* for where Moblin deviates
-# from Poky:
-#
-PREFERRED_VERSION_eds-dbus ?= "2.20.0"
-PREFERRED_VERSION_dbus ?= "1.2.14"
-PREFERRED_VERSION_dbus-native ?= "1.2.14"
-
-#SRCREV_pn-mutter ?= "b6b3bba06fe5a3fe0b1bd6e31a7369dd83812bab"
diff --git a/meta-moblin/conf/distro/moblin.conf b/meta-moblin/conf/distro/moblin.conf
deleted file mode 100644
index d27aa96e0..000000000
--- a/meta-moblin/conf/distro/moblin.conf
+++ /dev/null
@@ -1,111 +0,0 @@
-DISTRO = "moblin"
-DISTRO_NAME = "Moblin (Poky Powered)"
-DISTRO_VERSION = "1.99+snapshot-${DATE}"
-
-MAINTAINER = "Moblin <dev@lists.moblin.org>"
-
-PACKAGE_CLASSES ?= "package_ipk package_rpm"
-INHERIT_INSANE ?= "insane"
-INHERIT += "${PACKAGE_CLASSES} debian moblin devshell ${INHERIT_INSANE} packaged-staging"
-
-# For some reason, this doesn't work
-# TARGET_OS ?= "linux"
-# TARGET_VENDOR ?= "-poky"
-# Set by POKYMODE instead
-TARGET_OS = "linux"
-
-QA_LOGFILE = "${TMPDIR}/qa.log"
-
-IMAGE_ROOTFS_SIZE_ext2 ?= "131072"
-
-#IPK_FEED_URIS += " \
-#           upgrades##http://openzaurus.org/official/unstable/${DISTRO_VERSION}/upgrades/ \
-#upgrades-${MACHINE}##http://openzaurus.org/official/unstable/${DISTRO_VERSION}/upgrades/${MACHINE} \
-#            machine##http://openzaurus.org/official/unstable/${DISTRO_VERSION}/feed/machine/${MACHINE} \
-#               base##http://openzaurus.org/official/unstable/${DISTRO_VERSION}/feed/base/ \
-#               libs##http://openzaurus.org/official/unstable/${DISTRO_VERSION}/feed/libs/ \
-#            console##http://openzaurus.org/official/unstable/${DISTRO_VERSION}/feed/console \
-#              devel##http://openzaurus.org/official/unstable/${DISTRO_VERSION}/feed/devel"
-
-#RPM_FEED_URIS += " \
-#           upgrades##http://openzaurus.org/official/unstable/${DISTRO_VERSION}/upgrades/ \
-#upgrades-${MACHINE}##http://openzaurus.org/official/unstable/${DISTRO_VERSION}/upgrades/${MACHINE} \
-#            machine##http://openzaurus.org/official/unstable/${DISTRO_VERSION}/feed/machine/${MACHINE} \
-#               base##http://openzaurus.org/official/unstable/${DISTRO_VERSION}/feed/base/ \
-#               libs##http://openzaurus.org/official/unstable/${DISTRO_VERSION}/feed/libs/ \
-#            console##http://openzaurus.org/official/unstable/${DISTRO_VERSION}/feed/console \
-#              devel##http://openzaurus.org/official/unstable/${DISTRO_VERSION}/feed/devel"
-
-OEINCLUDELOGS = "yes"
-KERNEL_CONSOLE = "ttyS0"
-#DEBUG_OPTIMIZATION = "-O -g3"
-#DEBUG_BUILD = "1"
-#INHIBIT_PACKAGE_STRIP = "1"
-
-# Default to TARGETOS values for EABI
-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"
-require conf/distro/include/poky-${POKYMODE}.inc
-
-POKYLIBC ?= "glibc"
-require conf/distro/include/poky-${POKYLIBC}.inc
-
-SDK_NAME = "${DISTRO}-${POKYMODE}-${POKYLIBC}-${HOST_ARCH}-${TARGET_ARCH}"
-SDK_PREFIX = "/usr/local/${DISTRO}/${POKYMODE}-${POKYLIBC}/${TARGET_ARCH}"
-
-CACHE = "${TMPDIR}/cache/${POKYMODE}-${POKYLIBC}${@['', '/' + str(bb.data.getVar('MACHINE', d, 1))][bool(bb.data.getVar('MACHINE', d, 1))]}"
-
-#
-# Preferred providers:
-#
-
-# Virtuals:
-PREFERRED_PROVIDER_virtual/db ?= "db"
-PREFERRED_PROVIDER_virtual/db-native ?= "db-native"
-PREFERRED_PROVIDER_virtual/xserver ?= "xserver-kdrive"
-PREFERRED_PROVIDER_virtual/xserver-xf86 ?= "xserver-xf86-dri-lite"
-PREFERRED_PROVIDER_virtual/libgl ?= "mesa-xlib"
-PREFERRED_PROVIDER_virtual/update-alternatives ?= "update-alternatives-cworth"
-PREFERRED_PROVIDER_virtual/update-alternatives-native ?= "opkg-native"
-PREFERRED_PROVIDER_virtual/libx11 ?= "libx11-diet"
-PREFERRED_PROVIDER_xf86-video-intel ?= "xf86-video-intel"
-
-VIRTUAL-RUNTIME_update-alternatives ?= "update-alternatives-cworth"
-
-# Others:
-PREFERRED_PROVIDER_linux-libc-headers ?= "linux-libc-headers"
-PREFERRED_PROVIDER_dbus-glib ?= "dbus-glib"
-PREFERRED_PROVIDER_dbus-glib-native ?= "dbus-glib-native"
-PREFERRED_PROVIDER_gconf ?= "gconf-dbus"
-PREFERRED_PROVIDER_matchbox-panel ?= "matchbox-panel-2"
-PREFERRED_PROVIDER_opkg ?= "opkg"
-
-require conf/distro/include/moblin-fixed-revisions.inc
-require conf/distro/include/poky-fixed-revisions.inc
-require conf/distro/include/preferred-xorg-versions.inc
-
-PCMCIA_MANAGER ?= "pcmciautils"
-
-CVS_TARBALL_STASH += "http://www.o-hand.com/~richard/poky/sources/"
-
-IMAGE_LINGUAS ?= "en-gb"
-LIMIT_BUILT_LOCALES ?= "en_GB"
-ENABLE_BINARY_LOCALE_GENERATION ?= "1"
-LOCALE_UTF8_ONLY = "1"
-
-DISTRO_FEATURES = "alsa bluetooth ext2 irda pcmcia usbgadget usbhost wifi nfs zeroconf pci"
-
-POKY_EXTRA_RDEPENDS = "task-moblin-boot"
-POKY_EXTRA_RDEPENDS_qemuarm = "qemu-config"
-POKY_EXTRA_RDEPENDS_qemuarmv6 = "qemu-config"
-POKY_EXTRA_RDEPENDS_qemuarmv7 = "qemu-config"
-POKY_EXTRA_RDEPENDS_qemux86 = "qemu-config"
-
-DISTRO_EXTRA_RDEPENDS += "${POKY_EXTRA_RDEPENDS}"
-DISTRO_EXTRA_RRECOMMENDS += "kernel-module-af-packet"
-
-IMAGE_FEATURES ?= ""
-
-require conf/distro/include/world-broken.inc
diff --git a/meta-moblin/conf/machine/menlow.conf b/meta-moblin/conf/machine/menlow.conf
deleted file mode 100644
index 039f5e031..000000000
--- a/meta-moblin/conf/machine/menlow.conf
+++ /dev/null
@@ -1,42 +0,0 @@
-#@TYPE: Machine
-#@NAME: Netbook
-
-#@DESCRIPTION: Machine configuration for Menlow platforms. Currently supported machines are the Compal JAX10
-
-TARGET_ARCH = "i586"
-PACKAGE_EXTRA_ARCHS = "x86 core2"
-
-include conf/machine/include/tune-atom.inc
-
-MACHINE_FEATURES = "kernel26 screen keyboard pci usbhost ext2 ext3 x86 wifi \
-                    acpi"
-
-KERNEL_IMAGETYPE = "bzImage"
-
-PREFERRED_PROVIDER_virtual/kernel ?= "linux-moblin"
-PREFERRED_PROVIDER_virtual/libx11 ?= "libx11-trim"
-PREFERRED_PROVIDER_virtual/libgl  ?= "mesa-dri"
-PREFERRED_PROVIDER_virtual/xserver ?= "xserver-xf86-dri-lite"
-PREFERRED_PROVIDER_virtual/xserver-xf86 ?= "xserver-xf86-dri-lite"
-XSERVER ?= "xserver-xf86-dri-lite \
-           xf86-video-psb \
-           xf86-input-mouse \
-           xf86-input-keyboard \
-           xf86-input-evdev"
-
-#MACHINE_EXTRA_RDEPENDS = "rt2860"
-
-MACHINE_EXTRA_RRECOMMENDS = "kernel-modules eee-acpi-scripts"
-
-GUI_MACHINE_CLASS = "bigscreen"
-
-IMAGE_ROOTFS_SIZE_ext3 = "500000"
-
-IMAGE_FSTYPES ?= "ext3 cpio.gz"
-
-APPEND += "video=intelfb:mode=800x600,accel=0,hwcursor=0 vga=788 usbcore.autosuspend=1"
-
-GLIBC_ADDONS = "nptl"
-GLIBC_EXTRA_OECONF = "--with-tls"
-
-EXTRA_OECONF_append_pn-matchbox-panel-2 = " --with-battery=acpi"
diff --git a/meta-moblin/conf/machine/netbook.conf b/meta-moblin/conf/machine/netbook.conf
deleted file mode 100644
index cd0c45cfc..000000000
--- a/meta-moblin/conf/machine/netbook.conf
+++ /dev/null
@@ -1,44 +0,0 @@
-#@TYPE: Machine
-#@NAME: Netbook
-
-#@DESCRIPTION: Machine configuration for Netbooks. Currently supported machines are the Asus eee901 and the Acer Aspire One
-
-TARGET_ARCH = "i586"
-PACKAGE_EXTRA_ARCHS = "x86 core2"
-
-include conf/machine/include/tune-atom.inc
-
-MACHINE_FEATURES = "kernel26 screen keyboard pci usbhost ext2 ext3 x86 wifi \
-                    acpi"
-
-KERNEL_IMAGETYPE = "bzImage"
-
-PREFERRED_PROVIDER_virtual/kernel ?= "linux-moblin"
-PREFERRED_PROVIDER_virtual/libx11 ?= "libx11-trim"
-PREFERRED_PROVIDER_virtual/libgl  ?= "mesa-dri"
-PREFERRED_PROVIDER_virtual/xserver ?= "xserver-xf86-dri-lite"
-PREFERRED_PROVIDER_virtual/xserver-xf86 ?= "xserver-xf86-dri-lite"
-XSERVER ?= "xserver-xf86-dri-lite \
-           xf86-input-mouse \
-           xf86-input-keyboard \
-           xf86-input-evdev \
-           xf86-input-synaptics \
-           xf86-video-intel \
-           mesa-dri-driver-i915"
-
-#MACHINE_EXTRA_RDEPENDS = "rt2860"
-
-MACHINE_EXTRA_RRECOMMENDS = "kernel-modules eee-acpi-scripts"
-
-GUI_MACHINE_CLASS = "bigscreen"
-
-IMAGE_ROOTFS_SIZE_ext3 = "500000"
-
-IMAGE_FSTYPES ?= "ext3 cpio.gz"
-
-APPEND += "video=intelfb:mode=800x600,accel=0,hwcursor=0 vga=788 usbcore.autosuspend=1"
-
-GLIBC_ADDONS = "nptl"
-GLIBC_EXTRA_OECONF = "--with-tls"
-
-EXTRA_OECONF_append_pn-matchbox-panel-2 = " --with-battery=acpi"