aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorChris Larson <clarson@kergoth.com>2004-10-07 15:47:44 +0000
committerChris Larson <clarson@kergoth.com>2004-10-07 15:47:44 +0000
commit4f412c9a4a376e5689ed26b62c626ca4158424b6 (patch)
tree48eab65feca48ce78d9bcc2b4a6768282e02f85d
parent92b95480c1095db9dc453725c5a13698a7eb8e20 (diff)
downloadopenembedded-4f412c9a4a376e5689ed26b62c626ca4158424b6.tar.gz
openembedded-4f412c9a4a376e5689ed26b62c626ca4158424b6.tar.bz2
openembedded-4f412c9a4a376e5689ed26b62c626ca4158424b6.zip
Pull in Robert P.J. Day's reorganized oe.conf work, to improve readability,
and moved MACHINE and DISTRO specific .conf files into their own directories. BKrev: 41656520p5hbk1WSEZcNUg5mgUqbwA
-rw-r--r--conf/beagle.conf35
-rw-r--r--conf/collie.conf24
-rw-r--r--conf/corgi.conf5
-rw-r--r--conf/distro/familiar-0.8.0.conf (renamed from conf/familiar-0.8.0.conf)0
-rw-r--r--conf/distro/familiar.conf (renamed from conf/boxer.conf)0
-rw-r--r--conf/distro/nylon.conf (renamed from conf/innovator.conf)0
-rw-r--r--conf/distro/openmnci.conf (renamed from conf/ipaq-pxa-2.6.conf)0
-rw-r--r--conf/distro/opensimpad.conf (renamed from conf/omap1610h2.conf)0
-rw-r--r--conf/distro/openslug.conf (renamed from conf/openslug.conf)0
-rw-r--r--conf/distro/openzaurus-3.5.1.conf (renamed from conf/sun4cdm.conf)0
-rw-r--r--conf/distro/openzaurus.conf (renamed from conf/tune-arm920t.conf)0
-rw-r--r--conf/distro/unslung.conf (renamed from conf/tune-arm926ejs.conf)0
-rw-r--r--conf/distro/wrt54oe.conf (renamed from conf/wrt54oe.conf)0
-rw-r--r--conf/epia.conf14
-rw-r--r--conf/familiar.conf5
-rw-r--r--conf/h3600.conf39
-rw-r--r--conf/h3900.conf23
-rw-r--r--conf/handheld-common.conf24
-rw-r--r--conf/husky.conf5
-rw-r--r--conf/ipaq-common.conf4
-rw-r--r--conf/machine/beagle.conf (renamed from conf/tune-c3.conf)0
-rw-r--r--conf/machine/boxer.conf0
-rw-r--r--conf/machine/collie.conf0
-rw-r--r--conf/machine/corgi.conf0
-rw-r--r--conf/machine/epia.conf0
-rw-r--r--conf/machine/h3600.conf0
-rw-r--r--conf/machine/h3900.conf0
-rw-r--r--conf/machine/handheld-common.conf0
-rw-r--r--conf/machine/husky.conf0
-rw-r--r--conf/machine/ipaq-common.conf0
-rw-r--r--conf/machine/ipaq-pxa-2.6.conf0
-rw-r--r--conf/machine/mtx-1.conf0
-rw-r--r--conf/machine/native.conf0
-rw-r--r--conf/machine/nslu2.conf0
-rw-r--r--conf/machine/omap1610h2.conf0
-rw-r--r--conf/machine/poodle.conf0
-rw-r--r--conf/machine/ramses.conf0
-rw-r--r--conf/machine/shepherd.conf0
-rw-r--r--conf/machine/simpad.conf0
-rw-r--r--conf/machine/sun4cdm.conf0
-rw-r--r--conf/machine/tosa.conf0
-rw-r--r--conf/machine/tune-arm920t.conf0
-rw-r--r--conf/machine/tune-arm926ejs.conf0
-rw-r--r--conf/machine/tune-c3.conf0
-rw-r--r--conf/machine/tune-strongarm.conf0
-rw-r--r--conf/machine/tune-xscale.conf0
-rw-r--r--conf/machine/wrt54.conf0
-rw-r--r--conf/machine/x86-uml.conf0
-rw-r--r--conf/machine/zaurus-pxa.conf0
-rw-r--r--conf/mtx-1.conf18
-rw-r--r--conf/native.conf12
-rw-r--r--conf/nslu2.conf16
-rw-r--r--conf/nylon.conf33
-rw-r--r--conf/oe.conf424
-rw-r--r--conf/openmnci.conf203
-rw-r--r--conf/opensimpad.conf5
-rw-r--r--conf/openzaurus-3.5.1.conf287
-rw-r--r--conf/openzaurus.conf5
-rw-r--r--conf/poodle.conf24
-rw-r--r--conf/ramses.conf22
-rw-r--r--conf/shepherd.conf5
-rw-r--r--conf/simpad.conf29
-rw-r--r--conf/tosa.conf28
-rw-r--r--conf/tune-strongarm.conf2
-rw-r--r--conf/tune-xscale.conf3
-rw-r--r--conf/unslung.conf17
-rw-r--r--conf/wrt54.conf24
-rw-r--r--conf/x86-uml.conf9
-rw-r--r--conf/zaurus-pxa.conf27
69 files changed, 193 insertions, 1178 deletions
diff --git a/conf/beagle.conf b/conf/beagle.conf
deleted file mode 100644
index 0b76d87dc7..0000000000
--- a/conf/beagle.conf
+++ /dev/null
@@ -1,35 +0,0 @@
-#@TYPE: Machine
-#@NAME: MasterIA PA100
-#@DESCRIPTION: Machine configuration for the SA1100 based MasterIA PA-100 device
-
-TARGET_ARCH = "arm"
-IPKG_ARCHS = "all arm ${MACHINE}"
-PREFERRED_PROVIDER_xserver = "xserver-kdrive"
-PREFERRED_PROVIDER_virtual/kernel = "montavista-sa"
-BOOTSTRAP_EXTRA_DEPENDS = "virtual/kernel modutils hostap-modules orinoco-modules "
-BOOTSTRAP_EXTRA_RDEPENDS = " kernel-module-net-fd \
-kernel-module-sa1100-bi kernel-module-usbdcore kernel-module-usbdmonitor \
-kernel-module-pcnet-cs kernel-module-8390 kernel-module-unix \
-kernel-module-sa1100-ir \
-kernel-module-usb-eth kernel-module-sa1100usb-core \
-kernel-module-ppp-generic kernel-module-ppp-async kernel-module-mtdchar \
-kernel-module-fat kernel-module-vfat "
-BOOTSTRAP_EXTRA_RRECOMMENDS = "hostap-modules-cs "
-
-
-# FIXME: the modules list is not complete yet!
-
-EXTRA_IMAGECMD_jffs2 = "--pad=0xec0000 --little-endian --eraseblock=0x40000"
-EXTRA_IMAGEDEPENDS = "cetools-native"
-
-IMAGE_CMD_jffs2 = "mkfs.jffs2 --root=${IMAGE_ROOTFS} --faketime \
- --output=${T}/${IMAGE_NAME}.rootfs.jffs2 \
- ${EXTRA_IMAGECMD}; bin2rom ${T}/${IMAGE_NAME}.rootfs.jffs2 \
- ${DEPLOY_DIR_IMAGE}/${IMAGE_NAME}.rootfs.img \
- ffffffff ffffffff d0140000"
-
-include conf/handheld-common.conf
-include conf/tune-strongarm.conf
-
-SERIAL_CONSOLE = "115200 ttySA0"
-
diff --git a/conf/collie.conf b/conf/collie.conf
deleted file mode 100644
index a7a69d9750..0000000000
--- a/conf/collie.conf
+++ /dev/null
@@ -1,24 +0,0 @@
-#@TYPE: Machine
-#@NAME: Sharp Zaurus SL-5000, Sharp Zaurus SL-5500
-#@DESCRIPTION: Machine configuration for the SA1100 based Sharp Zaurus SL-5000 and SL-5500 devices
-
-TARGET_ARCH = "arm"
-IPKG_ARCHS = "all arm ${MACHINE}"
-PREFERRED_PROVIDER_xserver = "xserver-kdrive"
-PREFERRED_PROVIDER_virtual/kernel = "openzaurus-sa"
-BOOTSTRAP_EXTRA_DEPENDS = "virtual/kernel hostap-modules orinoco-modules sharp-sdmmc-support"
-BOOTSTRAP_EXTRA_RDEPENDS = "kernel modutils hostap-modules-cs orinoco-modules sharp-sdmmc-support \
-kernel-module-devinfo kernel-module-gpio kernel-module-net-fd kernel-module-registers kernel-module-sa1100-bi \
-kernel-module-usbdcore kernel-module-usbdmonitor "
-
-# This is needed for the ramdisk script to work
-BOOTSTRAP_EXTRA_DEPENDS += "e2fsprogs"
-BOOTSTRAP_EXTRA_RDEPENDS += "e2fsprogs-mke2fs"
-
-EXTRA_IMAGECMD_jffs2 = "--pad=14680064 --little-endian --eraseblock=0x20000 -n"
-
-include conf/handheld-common.conf
-include conf/tune-strongarm.conf
-
-SERIAL_CONSOLE = "115200 ttyS0"
-
diff --git a/conf/corgi.conf b/conf/corgi.conf
deleted file mode 100644
index 4e1793acdc..0000000000
--- a/conf/corgi.conf
+++ /dev/null
@@ -1,5 +0,0 @@
-#@TYPE: Machine
-#@NAME: Sharp Zaurus SL-C700
-#@DESCRIPTION: Machine configuration for the PXA250 based Sharp Zaurus SL-C700 device
-
-include conf/zaurus-pxa.conf
diff --git a/conf/familiar-0.8.0.conf b/conf/distro/familiar-0.8.0.conf
index e69de29bb2..e69de29bb2 100644
--- a/conf/familiar-0.8.0.conf
+++ b/conf/distro/familiar-0.8.0.conf
diff --git a/conf/boxer.conf b/conf/distro/familiar.conf
index e69de29bb2..e69de29bb2 100644
--- a/conf/boxer.conf
+++ b/conf/distro/familiar.conf
diff --git a/conf/innovator.conf b/conf/distro/nylon.conf
index e69de29bb2..e69de29bb2 100644
--- a/conf/innovator.conf
+++ b/conf/distro/nylon.conf
diff --git a/conf/ipaq-pxa-2.6.conf b/conf/distro/openmnci.conf
index e69de29bb2..e69de29bb2 100644
--- a/conf/ipaq-pxa-2.6.conf
+++ b/conf/distro/openmnci.conf
diff --git a/conf/omap1610h2.conf b/conf/distro/opensimpad.conf
index e69de29bb2..e69de29bb2 100644
--- a/conf/omap1610h2.conf
+++ b/conf/distro/opensimpad.conf
diff --git a/conf/openslug.conf b/conf/distro/openslug.conf
index e69de29bb2..e69de29bb2 100644
--- a/conf/openslug.conf
+++ b/conf/distro/openslug.conf
diff --git a/conf/sun4cdm.conf b/conf/distro/openzaurus-3.5.1.conf
index e69de29bb2..e69de29bb2 100644
--- a/conf/sun4cdm.conf
+++ b/conf/distro/openzaurus-3.5.1.conf
diff --git a/conf/tune-arm920t.conf b/conf/distro/openzaurus.conf
index e69de29bb2..e69de29bb2 100644
--- a/conf/tune-arm920t.conf
+++ b/conf/distro/openzaurus.conf
diff --git a/conf/tune-arm926ejs.conf b/conf/distro/unslung.conf
index e69de29bb2..e69de29bb2 100644
--- a/conf/tune-arm926ejs.conf
+++ b/conf/distro/unslung.conf
diff --git a/conf/wrt54oe.conf b/conf/distro/wrt54oe.conf
index e69de29bb2..e69de29bb2 100644
--- a/conf/wrt54oe.conf
+++ b/conf/distro/wrt54oe.conf
diff --git a/conf/epia.conf b/conf/epia.conf
deleted file mode 100644
index 299ac5507b..0000000000
--- a/conf/epia.conf
+++ /dev/null
@@ -1,14 +0,0 @@
-TARGET_ARCH = "i686"
-TARGET_VENDOR = "-oe"
-PREFERRED_PROVIDER_virtual/kernel = "linux-epia"
-IMAGE_FSTYPE = "ext2"
-BOOTSTRAP_EXTRA_DEPENDS = "virtual/kernel pciutils udev module-init-tools strace"
-BOOTSTRAP_EXTRA_RDEPENDS = "pciutils udev module-init-tools kernel-modules strace"
-udevdir = "/dev"
-OLDEST_KERNEL = "2.6.5"
-GLIBC_ADDONS = "nptl"
-GLIBC_EXTRA_OECONF = "--with-tls"
-IPKG_ARCHS = "i386"
-
-include tune-c3.conf
-
diff --git a/conf/familiar.conf b/conf/familiar.conf
deleted file mode 100644
index adeeb611fb..0000000000
--- a/conf/familiar.conf
+++ /dev/null
@@ -1,5 +0,0 @@
-#@TYPE: Distribution
-#@NAME: Familiar Linux
-#@DESCRIPTION: Distribution configuration for Familiar Linux (handhelds.org)
-
-INHERIT += " package_ipk debian"
diff --git a/conf/h3600.conf b/conf/h3600.conf
deleted file mode 100644
index e5dc8a14e2..0000000000
--- a/conf/h3600.conf
+++ /dev/null
@@ -1,39 +0,0 @@
-#@TYPE: Machine
-#@NAME: Compaq iPAQ 36xx,Compaq iPAQ 37xx,Compaq iPAQ 38xx
-#@DESCRIPTION: Machine configuration for the Compaq iPAQ 36xx, Compaq iPAQ 37xx and Compaq iPAQ 38xx devices
-
-TARGET_ARCH = "arm"
-IPKG_ARCHS = "all arm ipaqsa h3600"
-PREFERRED_PROVIDER_xserver = "xserver-kdrive"
-PREFERRED_PROVIDER_virtual/kernel = "handhelds-sa"
-EXTRA_IMAGECMD_h3600 = "-e 0x40000 -p"
-BOOTSTRAP_EXTRA_DEPENDS = "handhelds-sa"
-BOOTSTRAP_EXTRA_RDEPENDS = "kernel ${@linux_module_packages('${H3600_MODULES}')}"
-
-H3600_MODULES = "\
-h3600-asic \
-h3600-micro \
-h3600-microkbd h3600-stowaway \
-h3600-uda1341 \
-hwtimer \
-l3-backpaq \
-nvrd \
-sa1100-cs \
-sa1100-ir \
-sa1100-wdt \
-sa1100-audio \
-sa1100-rtc \
-sa1100usb-core \
-sd-mod \
-serial-h3800 \
-uda1341 \
-usb-char \
-usb-eth"
-
-USE_DEVFS = "1"
-
-include conf/ipaq-common.conf
-include conf/handheld-common.conf
-include conf/tune-strongarm.conf
-
-SERIAL_CONSOLE = "115200 ttySA0"
diff --git a/conf/h3900.conf b/conf/h3900.conf
deleted file mode 100644
index f26490fed5..0000000000
--- a/conf/h3900.conf
+++ /dev/null
@@ -1,23 +0,0 @@
-#@TYPE: Machine
-#@NAME: Compaq iPAQ 39xx, Compaq iPAQ 54xx, Compaq iPAQ 55xx
-#@DESCRIPTION: Machine configuration for the Compaq iPAQ 39xx, Compaq iPAQ 54xx, and Compaq iPAQ 55xx devices
-
-TARGET_ARCH = "arm"
-IPKG_ARCHS = "all arm ipaqpxa h3900"
-PREFERRED_PROVIDER_xserver = "xserver-kdrive"
-PREFERRED_PROVIDER_virtual/kernel = "handhelds-pxa"
-EXTRA_IMAGECMD_h3900 = "-e 0x40000 -p"
-BOOTSTRAP_EXTRA_DEPENDS = "handhelds-pxa at76c503a-modules"
-BOOTSTRAP_EXTRA_RDEPENDS = "kernel ${@linux_module_packages('${H3900_MODULES}')} at76c503a-modules"
-H3900_MODULES = "h3900_asic h5400_asic pxa_ir h5400_buzzer h5400_fsi mmc_h5400 usb-ohci-h5400 mmc_asic3 mtdchar h5400-audio"
-
-SERIAL_CONSOLE = "115200 tts/0 vt100"
-USE_DEVFS = "1"
-
-include conf/ipaq-common.conf
-include conf/handheld-common.conf
-
-GPE_MACHINE_CLASS = "smallscreen"
-
-# not using tune-xscale so as to retain backwards compatibility
-include conf/tune-strongarm.conf
diff --git a/conf/handheld-common.conf b/conf/handheld-common.conf
deleted file mode 100644
index f9e2608927..0000000000
--- a/conf/handheld-common.conf
+++ /dev/null
@@ -1,24 +0,0 @@
-HANDHELD_MODULES = "ipv6 \
-ipsec \
-nvrd \
-mip6-mn \
-tun \
-ide-cs ide-disk \
-loop \
-vfat ext2 \
-sunrpc nfs \
-btuart-cs dtl1-cs bt3c-cs rfcomm bnep l2cap sco hci_uart \
-pcnet-cs serial-cs \
-af_packet \
-ppp-async ppp-deflate ppp-mppe \
-ip-gre ip-tables ipip \
-irda irlan irnet irport irtty \
-input uinput \
-"
-
-# Configuration bits for "generic handheld"
-BOOTSTRAP_EXTRA_DEPENDS += "pcmcia-cs apmd ppp bluez-utils wireless-tools"
-BOOTSTRAP_EXTRA_RDEPENDS += "pcmcia-cs apm"
-BOOTSTRAP_EXTRA_RRECOMMENDS += "ppp bluez-utils wireless-tools ${@linux_module_packages('${HANDHELD_MODULES}')}"
-
-INHERIT += "linux_modules"
diff --git a/conf/husky.conf b/conf/husky.conf
deleted file mode 100644
index c8310036a0..0000000000
--- a/conf/husky.conf
+++ /dev/null
@@ -1,5 +0,0 @@
-#@TYPE: Machine
-#@NAME: Sharp Zaurus SL-C750,Sharp Zaurus SL-C760
-#@DESCRIPTION: Machine configuration for the Sharp Zaurus SL-C760 and Sharp Zaurus SL-C860 devices
-
-include conf/zaurus-pxa.conf
diff --git a/conf/ipaq-common.conf b/conf/ipaq-common.conf
deleted file mode 100644
index 9c91802c04..0000000000
--- a/conf/ipaq-common.conf
+++ /dev/null
@@ -1,4 +0,0 @@
-IPAQ_MODULES = "apm h3600_generic_sleeve ipaq-sleeve ipaq-mtd-asset nvrd pcmf502rd pcmf502re sa1100-rtc ipaq-hal h3600_ts usb-eth"
-
-BOOTSTRAP_EXTRA_DEPENDS += "kbdd hostap-modules orinoco-modules freeswan mipv6"
-BOOTSTRAP_EXTRA_RRECOMMENDS += "kbdd hostap-modules-cs orinoco-modules freeswan mipv6 ${@linux_module_packages('${IPAQ_MODULES}')}"
diff --git a/conf/tune-c3.conf b/conf/machine/beagle.conf
index e69de29bb2..e69de29bb2 100644
--- a/conf/tune-c3.conf
+++ b/conf/machine/beagle.conf
diff --git a/conf/machine/boxer.conf b/conf/machine/boxer.conf
new file mode 100644
index 0000000000..e69de29bb2
--- /dev/null
+++ b/conf/machine/boxer.conf
diff --git a/conf/machine/collie.conf b/conf/machine/collie.conf
new file mode 100644
index 0000000000..e69de29bb2
--- /dev/null
+++ b/conf/machine/collie.conf
diff --git a/conf/machine/corgi.conf b/conf/machine/corgi.conf
new file mode 100644
index 0000000000..e69de29bb2
--- /dev/null
+++ b/conf/machine/corgi.conf
diff --git a/conf/machine/epia.conf b/conf/machine/epia.conf
new file mode 100644
index 0000000000..e69de29bb2
--- /dev/null
+++ b/conf/machine/epia.conf
diff --git a/conf/machine/h3600.conf b/conf/machine/h3600.conf
new file mode 100644
index 0000000000..e69de29bb2
--- /dev/null
+++ b/conf/machine/h3600.conf
diff --git a/conf/machine/h3900.conf b/conf/machine/h3900.conf
new file mode 100644
index 0000000000..e69de29bb2
--- /dev/null
+++ b/conf/machine/h3900.conf
diff --git a/conf/machine/handheld-common.conf b/conf/machine/handheld-common.conf
new file mode 100644
index 0000000000..e69de29bb2
--- /dev/null
+++ b/conf/machine/handheld-common.conf
diff --git a/conf/machine/husky.conf b/conf/machine/husky.conf
new file mode 100644
index 0000000000..e69de29bb2
--- /dev/null
+++ b/conf/machine/husky.conf
diff --git a/conf/machine/ipaq-common.conf b/conf/machine/ipaq-common.conf
new file mode 100644
index 0000000000..e69de29bb2
--- /dev/null
+++ b/conf/machine/ipaq-common.conf
diff --git a/conf/machine/ipaq-pxa-2.6.conf b/conf/machine/ipaq-pxa-2.6.conf
new file mode 100644
index 0000000000..e69de29bb2
--- /dev/null
+++ b/conf/machine/ipaq-pxa-2.6.conf
diff --git a/conf/machine/mtx-1.conf b/conf/machine/mtx-1.conf
new file mode 100644
index 0000000000..e69de29bb2
--- /dev/null
+++ b/conf/machine/mtx-1.conf
diff --git a/conf/machine/native.conf b/conf/machine/native.conf
new file mode 100644
index 0000000000..e69de29bb2
--- /dev/null
+++ b/conf/machine/native.conf
diff --git a/conf/machine/nslu2.conf b/conf/machine/nslu2.conf
new file mode 100644
index 0000000000..e69de29bb2
--- /dev/null
+++ b/conf/machine/nslu2.conf
diff --git a/conf/machine/omap1610h2.conf b/conf/machine/omap1610h2.conf
new file mode 100644
index 0000000000..e69de29bb2
--- /dev/null
+++ b/conf/machine/omap1610h2.conf
diff --git a/conf/machine/poodle.conf b/conf/machine/poodle.conf
new file mode 100644
index 0000000000..e69de29bb2
--- /dev/null
+++ b/conf/machine/poodle.conf
diff --git a/conf/machine/ramses.conf b/conf/machine/ramses.conf
new file mode 100644
index 0000000000..e69de29bb2
--- /dev/null
+++ b/conf/machine/ramses.conf
diff --git a/conf/machine/shepherd.conf b/conf/machine/shepherd.conf
new file mode 100644
index 0000000000..e69de29bb2
--- /dev/null
+++ b/conf/machine/shepherd.conf
diff --git a/conf/machine/simpad.conf b/conf/machine/simpad.conf
new file mode 100644
index 0000000000..e69de29bb2
--- /dev/null
+++ b/conf/machine/simpad.conf
diff --git a/conf/machine/sun4cdm.conf b/conf/machine/sun4cdm.conf
new file mode 100644
index 0000000000..e69de29bb2
--- /dev/null
+++ b/conf/machine/sun4cdm.conf
diff --git a/conf/machine/tosa.conf b/conf/machine/tosa.conf
new file mode 100644
index 0000000000..e69de29bb2
--- /dev/null
+++ b/conf/machine/tosa.conf
diff --git a/conf/machine/tune-arm920t.conf b/conf/machine/tune-arm920t.conf
new file mode 100644
index 0000000000..e69de29bb2
--- /dev/null
+++ b/conf/machine/tune-arm920t.conf
diff --git a/conf/machine/tune-arm926ejs.conf b/conf/machine/tune-arm926ejs.conf
new file mode 100644
index 0000000000..e69de29bb2
--- /dev/null
+++ b/conf/machine/tune-arm926ejs.conf
diff --git a/conf/machine/tune-c3.conf b/conf/machine/tune-c3.conf
new file mode 100644
index 0000000000..e69de29bb2
--- /dev/null
+++ b/conf/machine/tune-c3.conf
diff --git a/conf/machine/tune-strongarm.conf b/conf/machine/tune-strongarm.conf
new file mode 100644
index 0000000000..e69de29bb2
--- /dev/null
+++ b/conf/machine/tune-strongarm.conf
diff --git a/conf/machine/tune-xscale.conf b/conf/machine/tune-xscale.conf
new file mode 100644
index 0000000000..e69de29bb2
--- /dev/null
+++ b/conf/machine/tune-xscale.conf
diff --git a/conf/machine/wrt54.conf b/conf/machine/wrt54.conf
new file mode 100644
index 0000000000..e69de29bb2
--- /dev/null
+++ b/conf/machine/wrt54.conf
diff --git a/conf/machine/x86-uml.conf b/conf/machine/x86-uml.conf
new file mode 100644
index 0000000000..e69de29bb2
--- /dev/null
+++ b/conf/machine/x86-uml.conf
diff --git a/conf/machine/zaurus-pxa.conf b/conf/machine/zaurus-pxa.conf
new file mode 100644
index 0000000000..e69de29bb2
--- /dev/null
+++ b/conf/machine/zaurus-pxa.conf
diff --git a/conf/mtx-1.conf b/conf/mtx-1.conf
deleted file mode 100644
index 6b11df78da..0000000000
--- a/conf/mtx-1.conf
+++ /dev/null
@@ -1,18 +0,0 @@
-#@TYPE: Machine
-#@NAME: 4G Systems mtx-1
-#@DESCRIPTION: Machine configuration for the mtx-1 (aka MeshCube)
-
-TARGET_ARCH = "mipsel"
-IPKG_ARCHS = "all mipsel ${MACHINE}"
-
-PREFERRED_PROVIDER_virtual/kernel = "linux-mtx-1"
-CVSDATE_linux-mtx-1 = "20040927"
-
-EXTRA_IMAGECMD_jffs2 = "--pad=0x1c00000 --little-endian --eraseblock=0x20000 -n"
-
-# does not gain any speed and just creates problems:
-# TARGET_CC_ARCH = "-march=mips32"
-
-USE_DEVFS = "1"
-USE_VT = "0"
-SERIAL_CONSOLE = "115200 tts/0 vt100" \ No newline at end of file
diff --git a/conf/native.conf b/conf/native.conf
deleted file mode 100644
index b28565316f..0000000000
--- a/conf/native.conf
+++ /dev/null
@@ -1,12 +0,0 @@
-#@TYPE: Machine
-#@NAME: Build Station
-#@DESCRIPTION: Machine configuration for your build station.
-
-TARGET_ARCH = "${BUILD_ARCH}"
-IPKG_ARCHS = "all ${TARGET_ARCH}"
-TARGET_PREFIX = ""
-VENDOR = "-oe"
-
-PREFERRED_PROVIDER_virtual/kernel = "native-kernel"
-ASSUME_PROVIDED = "virtual/gcc-initial virtual/gcc virtual/g++"
-ASSUME_PROVIDED += "binutils-cross"
diff --git a/conf/nslu2.conf b/conf/nslu2.conf
deleted file mode 100644
index 8d5ab8ad12..0000000000
--- a/conf/nslu2.conf
+++ /dev/null
@@ -1,16 +0,0 @@
-#@TYPE: Machine
-#@NAME: Linksys NSLU2
-#@DESCRIPTION: Machine configuration for the Linksys NSLU2 product
-
-TARGET_ARCH = "armeb"
-IPKG_ARCHS = "all ${TARGET_ARCH} armv5te ${MACHINE}"
-PREFERRED_PROVIDER_xserver ?= "xserver-kdrive"
-
-IMAGE_ROOTFS_SIZE_ext2 = "8192"
-IMAGE_ROOTFS_SIZE_ext2.gz = "8192"
-
-include tune-xscale.conf
-
-SERIAL_CONSOLE = "115200 ttyS0"
-KERNEL_CONSOLE = "ttyS0,115200n8"
-USE_VT = "0"
diff --git a/conf/nylon.conf b/conf/nylon.conf
deleted file mode 100644
index 3d97e3716c..0000000000
--- a/conf/nylon.conf
+++ /dev/null
@@ -1,33 +0,0 @@
-#@TYPE: Distribution
-#@NAME: Nylon Linux
-#@DESCRIPTION: Distribution configuration for Nylon Mesh Linux distribution
-
-# this distribution is mainly for wireless networking devices and includes
-# packages necessary for wireless LAN access point, routing, encryption and
-# especially mesh routing applications
-#
-# it is primarily aimed at the 4G Systems MeshCube (mtx-1) and other
-# mipsel based platforms
-#
-# Bruno Randolf <bruno.randolf@4g-systems.biz>
-
-INHERIT += " package_ipk debian"
-INHERIT += " linux_modules"
-
-PREFERRED_PROVIDERS += " virtual/${TARGET_PREFIX}gcc-initial:gcc-cross-initial"
-PREFERRED_PROVIDERS += " virtual/${TARGET_PREFIX}gcc:gcc-cross"
-PREFERRED_PROVIDERS += " virtual/${TARGET_PREFIX}g++:gcc-cross"
-PREFERRED_PROVIDERS += " virtual/${TARGET_PREFIX}libc-for-gcc:glibc"
-
-#CVSDATE = 20040916
-
-PREFERRED_VERSION_glibc = "2.3.3"
-PREFERRED_VERSION_gcc-cross-initial = "3.3.4"
-PREFERRED_VERSION_gcc-cross = "3.3.4"
-PREFERRED_VERSION_gcc-cross-sdk = "3.3.4"
-PREFERRED_VERSION_gcc = "3.3.4"
-PREFERRED_VERSION_binutils-cross = "2.14.90.0.7"
-PREFERRED_VERSION_binutils-cross-sdk = "2.14.90.0.7"
-PREFERRED_VERSION_binutils = "2.14.90.0.7"
-
-PREFERRED_VERSION_prism54-module = "1.2"
diff --git a/conf/oe.conf b/conf/oe.conf
index c6820c94b3..3977b491bb 100644
--- a/conf/oe.conf
+++ b/conf/oe.conf
@@ -1,70 +1,80 @@
-#############################################################################
-# #
-# You should *NOT* edit this file. Instead, edit ${OEDIR}/conf/local.conf #
-# #
-# # #
-# ### #
-# ##### #
-# # #
-# # #
-# # #
-# # #
-# #
-# #
-# This looks like a shell file, but it isn't. All variables get expanded #
-# after ALL config files have been read in. This allows you to override #
-# anything. #
-# #
-# The following config files will be read (if existent): #
-# #
-# ${OEDIR}/conf/oe.conf #
-# ${OEDIR}/conf/local.conf #
-# <current-dir>/oe.conf #
-# ${OEDIR}/conf/auto.conf #
-# ${OEDIR}/conf/${DISTRO}.conf #
-# ${OEDIR}/conf/${BUILD_SYS}.conf #
-# ${OEDIR}/conf/${SYS}.conf #
-# ${OEDIR}/conf/${MACHINE}.conf #
-# #
-# DISTRO is something like 'mandrake82' or 'debian3' #
-# BUILD_SYS is made of BUILD_ARCH and BUILD_OS and like 'i686-linux' #
-# SYS is made of ARCH and OS and like 'arm-linux' #
-# MACHINE is something like 'collie', 'corgie' or 'ramses' #
-# #
-# The auto.conf file will be automatically generated, either by something #
-# like "./configure" or by something like "make menuconfig". #
-# #
-#############################################################################
+##################################################################
+# Standard target filesystem paths.
+##################################################################
-###
-### Date/time variables
-###
+export prefix = "/usr"
+export exec_prefix = "${prefix}"
+export bindir = "${exec_prefix}/bin"
+export sbindir = "${exec_prefix}/sbin"
+export libexecdir = "${exec_prefix}/libexec"
+export datadir = "${prefix}/share"
+export sysconfdir = "/etc"
+export sharedstatedir = "${prefix}/com"
+export localstatedir = "/var"
+export libdir = "${exec_prefix}/lib"
+export includedir = "${prefix}/include"
+export oldincludedir = "/usr/include"
+export infodir = "${datadir}/info"
+export mandir = "${datadir}/man"
+export docdir = "${datadir}/doc"
+
+##################################################################
+# Architecture-dependent build variables.
+##################################################################
+
+BUILD_ARCH = "${@os.uname()[4]}"
+BUILD_OS = "${@os.uname()[0].lower()}"
+BUILD_VENDOR = ""
+BUILD_SYS = "${BUILD_ARCH}${BUILD_VENDOR}-${BUILD_OS}"
+BUILD_PREFIX = ""
+BUILD_CC_ARCH = ""
+
+HOST_ARCH = "${TARGET_ARCH}"
+HOST_OS = "${TARGET_OS}"
+HOST_VENDOR = "${TARGET_VENDOR}"
+HOST_SYS = "${HOST_ARCH}${HOST_VENDOR}-${HOST_OS}"
+HOST_PREFIX = "${TARGET_PREFIX}"
+HOST_CC_ARCH = "${TARGET_CC_ARCH}"
+
+TARGET_ARCH = "${BUILD_ARCH}"
+TARGET_OS = "${BUILD_OS}"
+TARGET_VENDOR = "${BUILD_VENDOR}"
+TARGET_SYS = "${TARGET_ARCH}${TARGET_VENDOR}-${TARGET_OS}"
+TARGET_PREFIX = "${TARGET_SYS}-"
+TARGET_CC_ARCH = ""
+
+PACKAGE_ARCH = "${TARGET_ARCH}"
+MACHINE_ARCH = "${MACHINE}"
+
+##################################################################
+# Date/time variables.
+##################################################################
DATE := "${@time.strftime('%Y%m%d',time.gmtime())}"
TIME := "${@time.strftime('%H%M%S',time.gmtime())}"
DATETIME = "${DATE}${TIME}"
-# Variable that controls the date CVS HEAD checkouts are pulled from.
-# Defaults to today.
-CVSDATE = "${DATE}"
-
-CACHE = "${TMPDIR}/cache"
+##################################################################
+# Package default variables.
+##################################################################
-###
-### Package default variables
-###
PN = "${@oe.parse.OEHandler.vars_from_file(oe.data.getVar('FILE',d),d)[0] or 'defaultpkgname'}"
PV = "${@oe.parse.OEHandler.vars_from_file(oe.data.getVar('FILE',d),d)[1] or '1.0'}"
PR = "${@oe.parse.OEHandler.vars_from_file(oe.data.getVar('FILE',d),d)[2] or 'r0'}"
PF = "${PN}-${PV}-${PR}"
P = "${PN}-${PV}"
+# Package info.
+
SECTION = "base"
PRIORITY = "optional"
DESCRIPTION = "Version ${PV}-${PR} of package ${PN}"
LICENSE = "unknown"
MAINTAINER = "OpenEmbedded Team <oe@handhelds.org>"
HOMEPAGE = "unknown"
+
+# Package dependencies and provides.
+
DEPENDS = ""
RDEPENDS = ""
PROVIDES = ""
@@ -74,88 +84,65 @@ RPROVIDES = ""
PACKAGES = "${PN} ${PN}-doc ${PN}-dev ${PN}-locale"
FILES = ""
FILES_${PN} = "${bindir} ${sbindir} ${libexecdir} ${libdir}/lib*.so.* \
- ${sysconfdir} ${sharedstatedir} ${localstatedir} \
- /bin /sbin /lib/*.so* ${datadir}/${PN} ${libdir}/${PN} \
- ${datadir}/pixmaps ${datadir}/applications \
- ${datadir}/idl ${datadir}/omf ${datadir}/sounds \
- ${libdir}/bonobo/servers"
+ ${sysconfdir} ${sharedstatedir} ${localstatedir} \
+ /bin /sbin /lib/*.so* ${datadir}/${PN} ${libdir}/${PN} \
+ ${datadir}/pixmaps ${datadir}/applications \
+ ${datadir}/idl ${datadir}/omf ${datadir}/sounds \
+ ${libdir}/bonobo/servers"
FILES_${PN}-doc = "${datadir}/doc ${mandir} ${infodir} ${datadir}/gtk-doc \
- ${datadir}/gnome/help"
+ ${datadir}/gnome/help"
FILES_${PN}-dev = "${includedir} ${libdir}/lib*.so ${libdir}/*.la \
- ${libdir}/*.a ${libdir}/*.o ${libdir}/pkgconfig \
- /lib/*.a /lib/*.o ${datadir}/aclocal"
+ ${libdir}/*.a ${libdir}/*.o ${libdir}/pkgconfig \
+ /lib/*.a /lib/*.o ${datadir}/aclocal"
FILES_${PN}-locale = "${datadir}/locale"
-###
-### Directories for the Buildsystem
-###
-
-# Temporary directory
-TMPDIR = "${TOPDIR}/tmp"
-
-# Download directory
-DL_DIR = "${TMPDIR}/downloads"
-
-# Stamps mark tasks that are done
-STAMP = "${TMPDIR}/stamps/${PF}"
+# File manifest
-# File Manifest
export MANIFEST = "${FILESDIR}/manifest"
FILE_DIRNAME = "${@os.path.dirname(oe.data.getVar('FILE', d))}"
FILESPATH = "${FILE_DIRNAME}/${PF}:${FILE_DIRNAME}/${P}:${FILE_DIRNAME}/${PN}:${FILE_DIRNAME}/files:${FILE_DIRNAME}"
FILESDIR = "${@oe.which(oe.data.getVar('FILESPATH', d, 1), '.')}"
-# Per package directories
+##################################################################
+# General work and output directories for the build system.
+##################################################################
-# overall work area
-WORKDIR = "${TMPDIR}/work/${PF}"
+TMPDIR = "${TOPDIR}/tmp"
+CACHE = "${TMPDIR}/cache"
+DL_DIR = "${TMPDIR}/downloads"
-# shell script output and log area
+STAMP = "${TMPDIR}/stamps/${PF}"
+WORKDIR = "${TMPDIR}/work/${PF}"
T = "${WORKDIR}/temp"
-
-# do_install output area
D = "${WORKDIR}/image"
-
-# default source tree path
S = "${WORKDIR}/${P}"
-
-# default build path
B = "${S}"
-# slot - currently unused by OE. portage remnants
-SLOT = "0"
-
-# default source is just the .oe
-SRC_URI = "file://${FILE}"
-
-# Staging area - used to handle inter-package dependency
STAGING_DIR = "${TMPDIR}/staging"
STAGING_BINDIR = "${STAGING_DIR}/${BUILD_SYS}/bin"
STAGING_LIBDIR = "${STAGING_DIR}/${HOST_SYS}/lib"
STAGING_INCDIR = "${STAGING_DIR}/${HOST_SYS}/include"
STAGING_DATADIR = "${STAGING_DIR}/${HOST_SYS}/share"
-
-# output packages
DEPLOY_DIR = "${TMPDIR}/deploy"
DEPLOY_DIR_TAR = "${DEPLOY_DIR}/tar"
DEPLOY_DIR_IPK = "${DEPLOY_DIR}/ipk"
DEPLOY_DIR_RPM = "${DEPLOY_DIR}/rpm"
-#
-# bootstrap things
-#
-BOOTSTRAP_EXTRA_DEPENDS = ""
-BOOTSTRAP_EXTRA_RDEPENDS = ""
-BOOTSTRAP_EXTRA_RRECOMMENDS = ""
+##################################################################
+# Kernel info.
+##################################################################
+
+OLDEST_KERNEL = "2.4.0"
+STAGING_KERNEL_DIR = "${STAGING_DIR}/${HOST_SYS}/kernel"
+
+##################################################################
+# Specific image creation and rootfs population info.
+##################################################################
-# image creation and rootfs population
DEPLOY_DIR_IMAGE = "${DEPLOY_DIR}/images"
IMAGE_ROOTFS = "${TMPDIR}/rootfs"
-PACKAGE_ARCH = "${TARGET_ARCH}"
-MACHINE_ARCH = "${MACHINE}"
-
IMAGE_BASENAME = "rootfs"
IMAGE_NAME = "${IMAGE_BASENAME}-${MACHINE}-${DATETIME}"
IMAGE_CMD = ""
@@ -170,6 +157,8 @@ IMAGE_CMD_tar = "cd ${IMAGE_ROOTFS} && tar -jcvf ${DEPLOY_DIR_IMAGE}/${IMAGE_NAM
EXTRA_IMAGECMD = ""
EXTRA_IMAGECMD_jffs2 = "--pad --little-endian --eraseblock=0x40000"
EXTRA_IMAGECMD_squashfs = "-le -b 16384"
+IMAGE_FSTYPE = "jffs2"
+IMAGE_FSTYPES = "${IMAGE_FSTYPE}"
IMAGE_ROOTFS_SIZE_ext2 = "65536"
IMAGE_ROOTFS_SIZE_ext2.gz = "65536"
@@ -179,50 +168,102 @@ IMAGE_DEPENDS_cramfs = "cramfs-native"
IMAGE_DEPENDS_ext2 = "genext2fs-native"
IMAGE_DEPENDS_ext2.gz = "genext2fs-native"
IMAGE_DEPENDS_squashfs = "squashfs-tools-native"
-
-IMAGE_FSTYPE = "jffs2"
-IMAGE_FSTYPES = "${IMAGE_FSTYPE}"
-
EXTRA_IMAGEDEPENDS = ""
-# minimum kernel version that we support
-OLDEST_KERNEL = "2.4.0"
+##################################################################
+# Toolchain info.
+##################################################################
-# toolchain things
CROSS_DIR = "${TMPDIR}/cross"
CROSS_DATADIR = "${CROSS_DIR}/share"
-
-# Add staging and cross to the PATH
export PATH_prepend = "${STAGING_BINDIR}:${CROSS_DIR}/bin:"
-# palmtop things - per default for opie, qtopia
+##################################################################
+# Build utility info.
+##################################################################
+
+CCACHE = "${@oe.which(oe.data.getVar('PATH', d), 'ccache') and 'ccache '}"
+
+export CC = "${CCACHE}${HOST_PREFIX}gcc ${HOST_CC_ARCH}"
+export CXX = "${CCACHE}${HOST_PREFIX}g++ ${HOST_CC_ARCH}"
+export F77 = "${CCACHE}${HOST_PREFIX}g77 ${HOST_CC_ARCH}"
+export CPP = "${HOST_PREFIX}gcc -E"
+export LD = "${HOST_PREFIX}ld"
+export CCLD = "${HOST_PREFIX}gcc"
+export AR = "${HOST_PREFIX}ar"
+export RANLIB = "${HOST_PREFIX}ranlib"
+export STRIP = "${HOST_PREFIX}strip"
+
+export BUILD_CC = "${CCACHE}${BUILD_PREFIX}gcc ${BUILD_CC_ARCH}"
+export BUILD_CXX = "${CCACHE}${BUILD_PREFIX}g++ ${BUILD_CC_ARCH}"
+export BUILD_F77 = "${CCACHE}${BUILD_PREFIX}g77 ${BUILD_CC_ARCH}"
+export BUILD_CPP = "${BUILD_PREFIX}cpp"
+export BUILD_LD = "${BUILD_PREFIX}ld"
+export BUILD_CCLD = "${BUILD_PREFIX}gcc"
+export BUILD_AR = "${BUILD_PREFIX}ar"
+export BUILD_RANLIB = "${BUILD_PREFIX}ranlib"
+export BUILD_STRIP = "${BUILD_PREFIX}strip"
+
+export MAKE = "make"
+EXTRA_OEMAKE = "-e MAKEFLAGS="
+
+##################################################################
+# Build flags and options.
+##################################################################
+
+export BUILD_CPPFLAGS = "-I${STAGING_DIR}/${BUILD_SYS}/include"
+export CPPFLAGS = "${TARGET_CPPFLAGS}"
+export TARGET_CPPFLAGS = "-I${STAGING_DIR}/${TARGET_SYS}/include"
+
+export BUILD_CFLAGS = "${BUILD_CPPFLAGS} ${BUILD_OPTIMIZATION}"
+export CFLAGS = "${TARGET_CFLAGS}"
+export TARGET_CFLAGS = "${TARGET_CPPFLAGS} ${SELECTED_OPTIMIZATION}"
+
+export BUILD_CXXFLAGS = "${BUILD_CFLAGS} -fpermissive"
+export CXXFLAGS = "${TARGET_CXXFLAGS}"
+export TARGET_CXXFLAGS = "${TARGET_CFLAGS} -fpermissive"
+
+export BUILD_LDFLAGS = "-L${STAGING_DIR}/${BUILD_SYS}/lib \
+ -Wl,-rpath-link,${STAGING_DIR}/${BUILD_SYS}/lib \
+ -Wl,-rpath,${STAGING_DIR}/${BUILD_SYS}/lib"
+export LDFLAGS = "${TARGET_LDFLAGS}"
+export TARGET_LDFLAGS = "-L${STAGING_DIR}/${TARGET_SYS}/lib \
+ -Wl,-rpath-link,${STAGING_DIR}/${TARGET_SYS}/lib \
+ -Wl,-rpath,${libdir}"
+
+# Which flags to leave by strip-flags() in bin/build/oebuild.sh ?
+ALLOWED_FLAGS = "-O -mcpu -march -pipe"
+
+##################################################################
+# Optimization flags.
+##################################################################
+
+FULL_OPTIMIZATION = "-fexpensive-optimizations -fomit-frame-pointer -frename-registers -O2"
+DEBUG_OPTIMIZATION = "-O -g"
+SELECTED_OPTIMIZATION = "${@oe.data.getVar(['FULL_OPTIMIZATION', 'DEBUG_OPTIMIZATION'][oe.data.getVar('DEBUG_BUILD', d, 1) == '1'], d, 1)}"
+BUILD_OPTIMIZATION = "-O2"
+
+##################################################################
+# Bootstrap stuff.
+##################################################################
+
+BOOTSTRAP_EXTRA_DEPENDS = ""
+BOOTSTRAP_EXTRA_RDEPENDS = ""
+BOOTSTRAP_EXTRA_RRECOMMENDS = ""
+
+##################################################################
+# Palmtop stuff.
+##################################################################
+
export QTDIR = "${STAGING_DIR}/${HOST_SYS}/qt2"
export QPEDIR = "${STAGING_DIR}/${HOST_SYS}"
export OPIEDIR = "${STAGING_DIR}/${HOST_SYS}"
export palmtopdir = "/opt/QtPalmtop"
export palmqtdir = "/opt/QtPalmtop"
-# target filesystem paths
-export prefix = "/usr"
-export exec_prefix = "${prefix}"
-
-export bindir = "${exec_prefix}/bin"
-export sbindir = "${exec_prefix}/sbin"
-export libexecdir = "${exec_prefix}/libexec"
-export datadir = "${prefix}/share"
-export sysconfdir = "/etc"
-export sharedstatedir = "${prefix}/com"
-export localstatedir = "/var"
-export libdir = "${exec_prefix}/lib"
-export includedir = "${prefix}/include"
-export oldincludedir = "/usr/include"
-export infodir = "${datadir}/info"
-export mandir = "${datadir}/man"
-export docdir = "${datadir}/doc"
-
-###
-### Mirrors and download
-###
+##################################################################
+# Download locations and utilities.
+##################################################################
GNU_MIRROR = "ftp://ftp.gnu.org/gnu"
DEBIAN_MIRROR = "ftp://ftp.debian.org/debian/pool"
@@ -232,109 +273,34 @@ XLIBS_MIRROR = "http://freedesktop.org/~xlibs/release"
GNOME_MIRROR = "http://ftp.gnome.org/pub/GNOME/sources"
# You can use the mirror of your country to get faster downloads by putting
-# export DEBIAN_MIRROR = "ftp://ftp.de.debian.org/debian/pool"
-# export SOURCEFORGE_MIRROR = "http://belnet.dl.sourceforge.net/sourceforge"
-# into ${OEDIR}/local.conf
+# export DEBIAN_MIRROR = "ftp://ftp.de.debian.org/debian/pool"
+# export SOURCEFORGE_MIRROR = "http://belnet.dl.sourceforge.net/sourceforge"
+# into your local.conf
FETCHCOMMAND = ""
FETCHCOMMAND_wget = "/usr/bin/env wget -t 5 --passive-ftp -P ${DL_DIR} ${URI}"
FETCHCOMMAND_cvs = "/usr/bin/env cvs -d${CVSROOT} co ${CVSCOOPTS} ${CVSMODULE}"
RESUMECOMMAND = ""
RESUMECOMMAND_wget = "/usr/bin/env wget -c -t 5 --passive-ftp -P ${DL_DIR} ${URI}"
+CVSDATE = "${DATE}"
-MKTEMPDIRCMD = "mktemp -d -q ${TMPBASE}"
-MKTEMPCMD = "mktemp -q ${TMPBASE}"
-
-
-###
-### Compilation control
-###
-
-# NOTE: _VENDOR fields must be either empty or start with a -
-
-# build vars
-BUILD_ARCH = "${@os.uname()[4]}"
-BUILD_OS = "${@os.uname()[0].lower()}"
-BUILD_VENDOR = ""
-
-BUILD_SYS = "${BUILD_ARCH}${BUILD_VENDOR}-${BUILD_OS}"
-BUILD_PREFIX = ""
-BUILD_CC_ARCH = ""
-
-# host vars (either target or build)
-HOST_ARCH = "${TARGET_ARCH}"
-HOST_OS = "${TARGET_OS}"
-HOST_VENDOR = "${TARGET_VENDOR}"
-
-HOST_SYS = "${HOST_ARCH}${HOST_VENDOR}-${HOST_OS}"
-HOST_PREFIX = "${TARGET_PREFIX}"
-HOST_CC_ARCH = "${TARGET_CC_ARCH}"
-
-# target vars
-TARGET_ARCH = "${BUILD_ARCH}"
-TARGET_OS = "${BUILD_OS}"
-TARGET_VENDOR = "${BUILD_VENDOR}"
-
-TARGET_SYS = "${TARGET_ARCH}${TARGET_VENDOR}-${TARGET_OS}"
-TARGET_PREFIX = "${TARGET_SYS}-"
-TARGET_CC_ARCH = ""
-
-# Which flags to leave by strip-flags() in bin/build/oebuild.sh ?
-ALLOWED_FLAGS = "-O -mcpu -march -pipe"
-
-# Optimization flags
-FULL_OPTIMIZATION = "-fexpensive-optimizations -fomit-frame-pointer -frename-registers -O2"
-DEBUG_OPTIMIZATION = "-O -g"
-SELECTED_OPTIMIZATION = "${@oe.data.getVar(['FULL_OPTIMIZATION', 'DEBUG_OPTIMIZATION'][oe.data.getVar('DEBUG_BUILD', d, 1) == '1'], d, 1)}"
-BUILD_OPTIMIZATION = "-O2"
-
-# flags
-export BUILD_CPPFLAGS = "-I${STAGING_DIR}/${BUILD_SYS}/include"
-export CPPFLAGS = "${TARGET_CPPFLAGS}"
-export TARGET_CPPFLAGS = "-I${STAGING_DIR}/${TARGET_SYS}/include"
-
-export BUILD_CFLAGS = "${BUILD_CPPFLAGS} ${BUILD_OPTIMIZATION}"
-export CFLAGS = "${TARGET_CFLAGS}"
-export TARGET_CFLAGS = "${TARGET_CPPFLAGS} ${SELECTED_OPTIMIZATION}"
+SRC_URI = "file://${FILE}"
-export BUILD_CXXFLAGS = "${BUILD_CFLAGS} -fpermissive"
-export CXXFLAGS = "${TARGET_CXXFLAGS}"
-export TARGET_CXXFLAGS = "${TARGET_CFLAGS} -fpermissive"
+##################################################################
+# Miscellaneous utilities.
+##################################################################
-export BUILD_LDFLAGS = "-L${STAGING_DIR}/${BUILD_SYS}/lib \
- -Wl,-rpath-link,${STAGING_DIR}/${BUILD_SYS}/lib \
- -Wl,-rpath,${STAGING_DIR}/${BUILD_SYS}/lib"
-export LDFLAGS = "${TARGET_LDFLAGS}"
-export TARGET_LDFLAGS = "-L${STAGING_DIR}/${TARGET_SYS}/lib \
- -Wl,-rpath-link,${STAGING_DIR}/${TARGET_SYS}/lib \
- -Wl,-rpath,${libdir}"
+MKTEMPDIRCMD = "mktemp -d -q ${TMPBASE}"
+MKTEMPCMD = "mktemp -q ${TMPBASE}"
-# host vars (can be either target or build, based on CROSS variable)
-export CC = "${CCACHE}${HOST_PREFIX}gcc ${HOST_CC_ARCH}"
-export CXX = "${CCACHE}${HOST_PREFIX}g++ ${HOST_CC_ARCH}"
-export F77 = "${CCACHE}${HOST_PREFIX}g77 ${HOST_CC_ARCH}"
-export CPP = "${HOST_PREFIX}gcc -E"
-export LD = "${HOST_PREFIX}ld"
-export CCLD = "${HOST_PREFIX}gcc"
-export AR = "${HOST_PREFIX}ar"
-export RANLIB = "${HOST_PREFIX}ranlib"
-export STRIP = "${HOST_PREFIX}strip"
+##################################################################
+# Not sure about the rest of this yet.
+##################################################################
-# Flags to compile stuff for the build host:
-export BUILD_CC = "${CCACHE}${BUILD_PREFIX}gcc ${BUILD_CC_ARCH}"
-export BUILD_CXX = "${CCACHE}${BUILD_PREFIX}g++ ${BUILD_CC_ARCH}"
-export BUILD_F77 = "${CCACHE}${BUILD_PREFIX}g77 ${BUILD_CC_ARCH}"
-export BUILD_CPP = "${BUILD_PREFIX}cpp"
-export BUILD_LD = "${BUILD_PREFIX}ld"
-export BUILD_CCLD = "${BUILD_PREFIX}gcc"
-export BUILD_AR = "${BUILD_PREFIX}ar"
-export BUILD_RANLIB = "${BUILD_PREFIX}ranlib"
-export BUILD_STRIP = "${BUILD_PREFIX}strip"
+# slot - currently unused by OE. portage remnants
+SLOT = "0"
# Other
-CCACHE = "${@oe.which(oe.data.getVar('PATH', d), 'ccache') and 'ccache '}"
-export MAKE = "make"
-EXTRA_OEMAKE = "-e MAKEFLAGS="
export PKG_CONFIG_PATH = "${STAGING_DATADIR}/pkgconfig"
export PKG_CONFIG_DISABLE_UNINSTALLED = "yes"
@@ -343,12 +309,8 @@ export QMAKE_MKSPEC_PATH = "${STAGING_DIR}/${BUILD_SYS}/share/qmake"
export STAGING_SIPDIR = "${STAGING_DIR}/${BUILD_SYS}/share/sip"
export STAGING_IDLDIR = "${STAGING_DATADIR}/idl"
-# Kernel Stuff
-STAGING_KERNEL_DIR = "${STAGING_DIR}/${HOST_SYS}/kernel"
-
-
# default test results for autoconf
-# possible candidate for moving into autotools.oeclass -CL
+# possible candidate for moving into autotools.oeclass -CL
export CONFIG_SITE = "${@oe.which(oe.data.getVar('OEPATH', d, 1), 'site/%s-%s' % (oe.data.getVar('HOST_ARCH', d, 1), oe.data.getVar('HOST_OS', d, 1)))}"
# library package naming
@@ -364,16 +326,16 @@ AUTO_LIBNAME_PKGS = "${PACKAGES}"
# when ${MACHINE} is 'ramses'. And finally '<foo>_local' overrides anything.
#
# This works for functions as well, they are really just environment variables.
-
OVERRIDES = "local:${MACHINE}:${DISTRO}:${TARGET_OS}:${TARGET_ARCH}"
-# Read rest of config files:
+##################################################################
+# Include the rest of the config files.
+##################################################################
-include conf/oe.conf
include conf/site.conf
include conf/auto.conf
include conf/local.conf
-include conf/${MACHINE}.conf
-include conf/${DISTRO}.conf
-include conf/${BUILD_SYS}.conf
-include conf/${TARGET_SYS}.conf
+include conf/build/${BUILD_SYS}.conf
+include conf/target/${TARGET_SYS}.conf
+include conf/machine/${MACHINE}.conf
+include conf/distro/${DISTRO}.conf
diff --git a/conf/openmnci.conf b/conf/openmnci.conf
deleted file mode 100644
index 302cb66c21..0000000000
--- a/conf/openmnci.conf
+++ /dev/null
@@ -1,203 +0,0 @@
-#@TYPE: Distribution
-#@NAME: OpenMNCI
-#@DESCRIPTION: Distribution configuration for OpenMNCI
-
-INHERIT += " package_ipk debian"
-TARGET_FPU = "soft"
-
-
-CVSDATE = 20040915
-
-PREFERRED_PROVIDERS = "virtual/qte:qte-for-opie virtual/libqpe:libqpe-opie"
-PREFERRED_PROVIDERS += " virtual/${TARGET_PREFIX}gcc-initial:gcc-cross-initial"
-PREFERRED_PROVIDERS += " virtual/${TARGET_PREFIX}gcc:gcc-cross"
-PREFERRED_PROVIDERS += " virtual/${TARGET_PREFIX}g++:gcc-cross"
-
-PREFERRED_VERSION_binutils-cross = "2.15.91.0.2"
-PREFERRED_VERSION_orinoco-modules = "0.13e"
-PREFERRED_VERSION_glibc = "2.3.2+cvs20040726"
-PREFERRED_VERSION_libpng = "1.2.5+1.2.6rc5"
-
-# Opie
-OPIE_VERSION = "1.1.6"
-PREFERRED_VERSION_libopie = "${OPIE_VERSION}"
-PREFERRED_VERSION_libopieobex = "${OPIE_VERSION}"
-PREFERRED_VERSION_libopietooth = "${OPIE_VERSION}"
-PREFERRED_VERSION_libqpe-opie = "${OPIE_VERSION}"
-PREFERRED_VERSION_libqtaux2 = "${OPIE_VERSION}"
-PREFERRED_VERSION_opie-aboutapplet = "${OPIE_VERSION}"
-PREFERRED_VERSION_opie-addressbook = "${OPIE_VERSION}"
-PREFERRED_VERSION_opie-advancedfm = "${OPIE_VERSION}"
-PREFERRED_VERSION_opie-alarm = "${OPIE_VERSION}"
-PREFERRED_VERSION_opie-appearance = "${OPIE_VERSION}"
-PREFERRED_VERSION_opie-aqpkg = "${OPIE_VERSION}"
-PREFERRED_VERSION_opie-autorotateapplet = "${OPIE_VERSION}"
-PREFERRED_VERSION_opie-backgammon = "${OPIE_VERSION}"
-PREFERRED_VERSION_opie-backup = "${OPIE_VERSION}"
-PREFERRED_VERSION_opie-bartender = "${OPIE_VERSION}"
-PREFERRED_VERSION_opie-batteryapplet = "${OPIE_VERSION}"
-PREFERRED_VERSION_opie-bluepin = "${OPIE_VERSION}"
-PREFERRED_VERSION_opie-bluetoothapplet = "${OPIE_VERSION}"
-PREFERRED_VERSION_opie-bluetoothmanager = "${OPIE_VERSION}"
-PREFERRED_VERSION_opie-bounce = "${OPIE_VERSION}"
-PREFERRED_VERSION_opie-button-settings = "${OPIE_VERSION}"
-PREFERRED_VERSION_opie-buzzword = "${OPIE_VERSION}"
-PREFERRED_VERSION_opie-calculator = "${OPIE_VERSION}"
-PREFERRED_VERSION_opie-calibrate = "${OPIE_VERSION}"
-PREFERRED_VERSION_opie-camera = "1.0.1"
-PREFERRED_VERSION_opie-cardmon = "${OPIE_VERSION}"
-PREFERRED_VERSION_opie-checkbook = "0.8.0"
-PREFERRED_VERSION_opie-citytime = "${OPIE_VERSION}"
-PREFERRED_VERSION_opie-clipboardapplet = "${OPIE_VERSION}"
-PREFERRED_VERSION_opie-clockapplet = "${OPIE_VERSION}"
-PREFERRED_VERSION_opie-clock = "${OPIE_VERSION}"
-PREFERRED_VERSION_opie-confeditor = "${OPIE_VERSION}"
-PREFERRED_VERSION_opie-console = "${OPIE_VERSION}"
-PREFERRED_VERSION_opie-dagger = "${OPIE_VERSION}"
-PREFERRED_VERSION_opie-dasher = "${OPIE_VERSION}"
-PREFERRED_VERSION_opie-datebook = "${OPIE_VERSION}"
-PREFERRED_VERSION_opie-deco-flat = "${OPIE_VERSION}"
-PREFERRED_VERSION_opie-deco-liquid = "${OPIE_VERSION}"
-PREFERRED_VERSION_opie-deco-polished = "${OPIE_VERSION}"
-PREFERRED_VERSION_opie-doctab = "${OPIE_VERSION}"
-PREFERRED_VERSION_opie-drawpad = "${OPIE_VERSION}"
-PREFERRED_VERSION_opie-dvorak = "${OPIE_VERSION}"
-PREFERRED_VERSION_opie-embeddedkonsole = "${OPIE_VERSION}"
-PREFERRED_VERSION_opie-euroconv = "${OPIE_VERSION}"
-PREFERRED_VERSION_opie-examples-python = "${OPIE_VERSION}"
-PREFERRED_VERSION_opie-eye = "${OPIE_VERSION}"
-PREFERRED_VERSION_opie-fifteen = "${OPIE_VERSION}"
-PREFERRED_VERSION_opie-formatter = "${OPIE_VERSION}"
-PREFERRED_VERSION_opie-freetype = "${OPIE_VERSION}"
-PREFERRED_VERSION_opie-ftplib = "${OPIE_VERSION}"
-PREFERRED_VERSION_opie-ftp = "${OPIE_VERSION}"
-PREFERRED_VERSION_opie-go = "${OPIE_VERSION}"
-PREFERRED_VERSION_opie-gutenbrowser = "${OPIE_VERSION}"
-PREFERRED_VERSION_opie-handwriting = "${OPIE_VERSION}"
-PREFERRED_VERSION_opie-helpbrowser = "${OPIE_VERSION}"
-PREFERRED_VERSION_opie-help-en = "${OPIE_VERSION}"
-PREFERRED_VERSION_opie-homeapplet = "${OPIE_VERSION}"
-PREFERRED_VERSION_opie-i18n = "${OPIE_VERSION}"
-PREFERRED_VERSION_opie-i18n = "${OPIE_VERSION}"
-PREFERRED_VERSION_opie-i18n = "${OPIE_VERSION}"
-PREFERRED_VERSION_opie-irc = "${OPIE_VERSION}"
-PREFERRED_VERSION_opie-irdaapplet = "${OPIE_VERSION}"
-PREFERRED_VERSION_opie-jumpx = "${OPIE_VERSION}"
-PREFERRED_VERSION_opie-kbill = "${OPIE_VERSION}"
-PREFERRED_VERSION_opie-kcheckers = "${OPIE_VERSION}"
-PREFERRED_VERSION_opie-keyboard = "${OPIE_VERSION}"
-PREFERRED_VERSION_opie-keypebble = "${OPIE_VERSION}"
-PREFERRED_VERSION_opie-keytabs = "${OPIE_VERSION}"
-PREFERRED_VERSION_opie-keyview = "${OPIE_VERSION}"
-PREFERRED_VERSION_opie-kjumpx = "${OPIE_VERSION}"
-PREFERRED_VERSION_opie-kpacman = "${OPIE_VERSION}"
-PREFERRED_VERSION_opie-language = "${OPIE_VERSION}"
-PREFERRED_VERSION_opie-launcher-settings = "${OPIE_VERSION}"
-PREFERRED_VERSION_opie-libqrsync = "${OPIE_VERSION}"
-PREFERRED_VERSION_opie-light-and-power = "${OPIE_VERSION}"
-PREFERRED_VERSION_opie-login = "${OPIE_VERSION}"
-PREFERRED_VERSION_opie-logoutapplet = "${OPIE_VERSION}"
-PREFERRED_VERSION_opie-mailapplet = "${OPIE_VERSION}"
-PREFERRED_VERSION_opie-mail = "${OPIE_VERSION}"
-PREFERRED_VERSION_opie-mediaplayer1-libmadplugin = "${OPIE_VERSION}"
-PREFERRED_VERSION_opie-mediaplayer1-libmodplugin = "${OPIE_VERSION}"
-PREFERRED_VERSION_opie-mediaplayer1-libtremorplugin = "${OPIE_VERSION}"
-PREFERRED_VERSION_opie-mediaplayer1-libwavplugin = "${OPIE_VERSION}"
-PREFERRED_VERSION_opie-mediaplayer1 = "${OPIE_VERSION}"
-PREFERRED_VERSION_opie-mediaplayer2 = "${OPIE_VERSION}"
-PREFERRED_VERSION_opie-mediaplayer2 = "${OPIE_VERSION}"
-PREFERRED_VERSION_opie-mediaplayer2 = "${OPIE_VERSION}"
-PREFERRED_VERSION_opie-mediaplayer2 = "${OPIE_VERSION}"
-PREFERRED_VERSION_opie-mediaplayer2 = "${OPIE_VERSION}"
-PREFERRED_VERSION_opie-mediummount = "${OPIE_VERSION}"
-PREFERRED_VERSION_opie-memoryapplet = "${OPIE_VERSION}"
-PREFERRED_VERSION_opie-mindbreaker = "${OPIE_VERSION}"
-PREFERRED_VERSION_opie-minesweep = "${OPIE_VERSION}"
-PREFERRED_VERSION_opie-mobilemsg = "${OPIE_VERSION}"
-PREFERRED_VERSION_opie-multikeyapplet = "${OPIE_VERSION}"
-PREFERRED_VERSION_opie-multikey = "${OPIE_VERSION}"
-PREFERRED_VERSION_opie-networkapplet = "${OPIE_VERSION}"
-PREFERRED_VERSION_opie-networksettings = "${OPIE_VERSION}"
-PREFERRED_VERSION_opie-notesapplet = "${OPIE_VERSION}"
-PREFERRED_VERSION_opie-odict = "${OPIE_VERSION}"
-PREFERRED_VERSION_opie-osearch = "${OPIE_VERSION}"
-PREFERRED_VERSION_opie-oxygen = "1.0.0"
-PREFERRED_VERSION_opie-oyatzee = "${OPIE_VERSION}"
-PREFERRED_VERSION_opie-packagemanager = "${OPIE_VERSION}"
-PREFERRED_VERSION_opie-parashoot = "${OPIE_VERSION}"
-PREFERRED_VERSION_opie-performance = "${OPIE_VERSION}"
-PREFERRED_VERSION_opie-pickboard = "${OPIE_VERSION}"
-PREFERRED_VERSION_opie-pics = "${OPIE_VERSION}"
-PREFERRED_VERSION_opie-pimconverter = "${OPIE_VERSION}"
-PREFERRED_VERSION_opie-powerchord = "${OPIE_VERSION}"
-PREFERRED_VERSION_opie-pyquicklaunchapplet = "${OPIE_VERSION}"
-PREFERRED_VERSION_opie-qashmoney = "${OPIE_VERSION}"
-PREFERRED_VERSION_opie-qasteroids = "${OPIE_VERSION}"
-PREFERRED_VERSION_opie-qcop = "1.0.0"
-PREFERRED_VERSION_opie-quicklauncher = "${OPIE_VERSION}"
-PREFERRED_VERSION_opie-rdesktop = "${OPIE_VERSION}"
-PREFERRED_VERSION_opie-reader = "${OPIE_VERSION}"
-PREFERRED_VERSION_opie-recorder = "${OPIE_VERSION}"
-PREFERRED_VERSION_opie-remote = "${OPIE_VERSION}"
-PREFERRED_VERSION_opie-restartapplet2 = "${OPIE_VERSION}"
-PREFERRED_VERSION_opie-restartapplet = "${OPIE_VERSION}"
-PREFERRED_VERSION_opie-restartapplet = "${OPIE_VERSION}"
-PREFERRED_VERSION_opie-rotateapplet = "${OPIE_VERSION}"
-PREFERRED_VERSION_opie-screenshotapplet = "${OPIE_VERSION}"
-PREFERRED_VERSION_opie-search = "${OPIE_VERSION}"
-PREFERRED_VERSION_opie-security = "${OPIE_VERSION}"
-PREFERRED_VERSION_opie-securityplugins = "${OPIE_VERSION}"
-PREFERRED_VERSION_opie-securityplugins = "${OPIE_VERSION}"
-PREFERRED_VERSION_opie-securityplugins = "${OPIE_VERSION}"
-PREFERRED_VERSION_opie-securityplugins = "${OPIE_VERSION}"
-PREFERRED_VERSION_opie-sfcave = "${OPIE_VERSION}"
-PREFERRED_VERSION_opie-sheet = "${OPIE_VERSION}"
-PREFERRED_VERSION_opie-sh = "${OPIE_VERSION}"
-PREFERRED_VERSION_opie-showimg = "${OPIE_VERSION}"
-PREFERRED_VERSION_opie-snake = "${OPIE_VERSION}"
-PREFERRED_VERSION_opie-solitaire = "${OPIE_VERSION}"
-PREFERRED_VERSION_opie-sshkeys = "${OPIE_VERSION}"
-PREFERRED_VERSION_opie-style-flat = "${OPIE_VERSION}"
-PREFERRED_VERSION_opie-style-fresh = "${OPIE_VERSION}"
-PREFERRED_VERSION_opie-style-liquid = "${OPIE_VERSION}"
-PREFERRED_VERSION_opie-style-metal = "${OPIE_VERSION}"
-PREFERRED_VERSION_opie-style-phase = "${OPIE_VERSION}"
-PREFERRED_VERSION_opie-style-web = "${OPIE_VERSION}"
-PREFERRED_VERSION_opie-suspendapplet = "${OPIE_VERSION}"
-PREFERRED_VERSION_opie-symlinker = "${OPIE_VERSION}"
-PREFERRED_VERSION_opie-sysinfo = "${OPIE_VERSION}"
-PREFERRED_VERSION_opie-systemtime = "${OPIE_VERSION}"
-PREFERRED_VERSION_opie-tableviewer = "${OPIE_VERSION}"
-PREFERRED_VERSION_opie-tabmanager = "${OPIE_VERSION}"
-PREFERRED_VERSION_opie-taskbar = "${OPIE_VERSION}"
-PREFERRED_VERSION_opie-tetrix = "${OPIE_VERSION}"
-PREFERRED_VERSION_opie-textedit = "${OPIE_VERSION}"
-PREFERRED_VERSION_opie-theme = "${OPIE_VERSION}"
-PREFERRED_VERSION_opie-tictac = "${OPIE_VERSION}"
-PREFERRED_VERSION_opie-tinykate = "${OPIE_VERSION}"
-PREFERRED_VERSION_opie-today-addressbookplugin = "${OPIE_VERSION}"
-PREFERRED_VERSION_opie-today-datebookplugin = "${OPIE_VERSION}"
-PREFERRED_VERSION_opie-today-fortuneplugin = "${OPIE_VERSION}"
-PREFERRED_VERSION_opie-today-mailplugin = "${OPIE_VERSION}"
-PREFERRED_VERSION_opie-today = "${OPIE_VERSION}"
-PREFERRED_VERSION_opie-today-stocktickerplugin = "${OPIE_VERSION}"
-PREFERRED_VERSION_opie-today-todolistplugin = "${OPIE_VERSION}"
-PREFERRED_VERSION_opie-today-weatherplugin = "${OPIE_VERSION}"
-PREFERRED_VERSION_opie-todo = "${OPIE_VERSION}"
-PREFERRED_VERSION_opie-tonleiter = "${OPIE_VERSION}"
-PREFERRED_VERSION_opie-ubrowser = "${OPIE_VERSION}"
-PREFERRED_VERSION_opie-unikeyboard = "${OPIE_VERSION}"
-PREFERRED_VERSION_opie-usermanager = "${OPIE_VERSION}"
-PREFERRED_VERSION_opie-vmemo = "${OPIE_VERSION}"
-PREFERRED_VERSION_opie-vmemo-settings = "${OPIE_VERSION}"
-PREFERRED_VERSION_opie-volumeapplet = "${OPIE_VERSION}"
-PREFERRED_VERSION_opie-vtapplet = "${OPIE_VERSION}"
-PREFERRED_VERSION_opie-wellenreiter = "1.0.3"
-PREFERRED_VERSION_opie-wirelessapplet = "${OPIE_VERSION}"
-PREFERRED_VERSION_opie-wordgame = "${OPIE_VERSION}"
-PREFERRED_VERSION_opie-write = "${OPIE_VERSION}"
-PREFERRED_VERSION_opie-zkbapplet = "${OPIE_VERSION}"
-PREFERRED_VERSION_opie-zlines = "${OPIE_VERSION}"
-PREFERRED_VERSION_opie-zsafe = "${OPIE_VERSION}"
-PREFERRED_VERSION_opie-zsame = "${OPIE_VERSION}"
-
diff --git a/conf/opensimpad.conf b/conf/opensimpad.conf
deleted file mode 100644
index db7de6e038..0000000000
--- a/conf/opensimpad.conf
+++ /dev/null
@@ -1,5 +0,0 @@
-#@TYPE: Distribution
-#@NAME: OpenSIMpad
-#@DESCRIPTION: Distribution configuration for OpenSIMpad (opensimpad.org)
-
-INHERIT += " package_ipk debian"
diff --git a/conf/openzaurus-3.5.1.conf b/conf/openzaurus-3.5.1.conf
deleted file mode 100644
index ac113c752a..0000000000
--- a/conf/openzaurus-3.5.1.conf
+++ /dev/null
@@ -1,287 +0,0 @@
-include conf/openzaurus.conf
-DISTRO = "openzaurus"
-
-CVSDATE = 20040915
-ASSUME_PROVIDED = "virtual/arm-linux-gcc-2.95"
-PREFERRED_PROVIDERS = "virtual/qte:qte-for-opie virtual/libqpe:libqpe-opie"
-PREFERRED_PROVIDERS += " virtual/xserver:xserver-kdrive"
-PREFERRED_PROVIDERS += " virtual/libsdl:libsdl-x11"
-PREFERRED_PROVIDERS += " gst-plugins:gpe-gst-plugins"
-PREFERRED_PROVIDERS += " virtual/${TARGET_PREFIX}gcc-initial:gcc-cross-initial"
-PREFERRED_PROVIDERS += " virtual/${TARGET_PREFIX}gcc:gcc-cross"
-PREFERRED_PROVIDERS += " virtual/${TARGET_PREFIX}g++:gcc-cross"
-
-OEINCLUDELOGS = "yes"
-KERNEL_CONSOLE = "tty1"
-TARGET_FPU = "soft"
-#DEBUG_OPTIMIZATION = "-O -g3"
-#DEBUG_BUILD = "1"
-#INHIBIT_PACKAGE_STRIP = "1"
-
-PREFERRED_VERSION_binutils-cross = "2.15.91.0.1"
-PREFERRED_VERSION_qte-for-opie = "2.3.7"
-PREFERRED_VERSION_orinoco-modules = "0.13e"
-PREFERRED_VERSION_glibc = "2.3.2+cvs20040726"
-PREFERRED_VERSION_libpng = "1.2.5+1.2.6rc5"
-
-#
-# Opie
-#
-
-OPIE_VERSION = "1.1.6"
-PREFERRED_VERSION_libopie = "${OPIE_VERSION}"
-PREFERRED_VERSION_libopieobex = "${OPIE_VERSION}"
-PREFERRED_VERSION_libopietooth = "${OPIE_VERSION}"
-PREFERRED_VERSION_libqpe-opie = "${OPIE_VERSION}"
-PREFERRED_VERSION_libqtaux2 = "${OPIE_VERSION}"
-PREFERRED_VERSION_opie-aboutapplet = "${OPIE_VERSION}"
-PREFERRED_VERSION_opie-addressbook = "${OPIE_VERSION}"
-PREFERRED_VERSION_opie-advancedfm = "${OPIE_VERSION}"
-PREFERRED_VERSION_opie-alarm = "${OPIE_VERSION}"
-PREFERRED_VERSION_opie-appearance = "${OPIE_VERSION}"
-PREFERRED_VERSION_opie-aqpkg = "${OPIE_VERSION}"
-PREFERRED_VERSION_opie-autorotateapplet = "${OPIE_VERSION}"
-PREFERRED_VERSION_opie-backgammon = "${OPIE_VERSION}"
-PREFERRED_VERSION_opie-backup = "${OPIE_VERSION}"
-PREFERRED_VERSION_opie-bartender = "${OPIE_VERSION}"
-PREFERRED_VERSION_opie-batteryapplet = "${OPIE_VERSION}"
-PREFERRED_VERSION_opie-bluepin = "${OPIE_VERSION}"
-PREFERRED_VERSION_opie-bluetoothapplet = "${OPIE_VERSION}"
-PREFERRED_VERSION_opie-bluetoothmanager = "${OPIE_VERSION}"
-PREFERRED_VERSION_opie-bounce = "${OPIE_VERSION}"
-PREFERRED_VERSION_opie-button-settings = "${OPIE_VERSION}"
-PREFERRED_VERSION_opie-buzzword = "${OPIE_VERSION}"
-PREFERRED_VERSION_opie-calculator = "${OPIE_VERSION}"
-PREFERRED_VERSION_opie-calibrate = "${OPIE_VERSION}"
-PREFERRED_VERSION_opie-camera = "1.0.1"
-PREFERRED_VERSION_opie-cardmon = "${OPIE_VERSION}"
-PREFERRED_VERSION_opie-checkbook = "0.8.0"
-PREFERRED_VERSION_opie-citytime = "${OPIE_VERSION}"
-PREFERRED_VERSION_opie-clipboardapplet = "${OPIE_VERSION}"
-PREFERRED_VERSION_opie-clockapplet = "${OPIE_VERSION}"
-PREFERRED_VERSION_opie-clock = "${OPIE_VERSION}"
-PREFERRED_VERSION_opie-confeditor = "${OPIE_VERSION}"
-PREFERRED_VERSION_opie-console = "${OPIE_VERSION}"
-PREFERRED_VERSION_opie-dagger = "${OPIE_VERSION}"
-PREFERRED_VERSION_opie-dasher = "${OPIE_VERSION}"
-PREFERRED_VERSION_opie-datebook = "${OPIE_VERSION}"
-PREFERRED_VERSION_opie-deco-flat = "${OPIE_VERSION}"
-PREFERRED_VERSION_opie-deco-liquid = "${OPIE_VERSION}"
-PREFERRED_VERSION_opie-deco-polished = "${OPIE_VERSION}"
-PREFERRED_VERSION_opie-doctab = "${OPIE_VERSION}"
-PREFERRED_VERSION_opie-drawpad = "${OPIE_VERSION}"
-PREFERRED_VERSION_opie-dvorak = "${OPIE_VERSION}"
-PREFERRED_VERSION_opie-embeddedkonsole = "${OPIE_VERSION}"
-PREFERRED_VERSION_opie-euroconv = "${OPIE_VERSION}"
-PREFERRED_VERSION_opie-examples-python = "${OPIE_VERSION}"
-PREFERRED_VERSION_opie-eye = "${OPIE_VERSION}"
-PREFERRED_VERSION_opie-fifteen = "${OPIE_VERSION}"
-PREFERRED_VERSION_opie-formatter = "${OPIE_VERSION}"
-PREFERRED_VERSION_opie-freetype = "${OPIE_VERSION}"
-PREFERRED_VERSION_opie-ftplib = "${OPIE_VERSION}"
-PREFERRED_VERSION_opie-ftp = "${OPIE_VERSION}"
-PREFERRED_VERSION_opie-go = "${OPIE_VERSION}"
-PREFERRED_VERSION_opie-gutenbrowser = "${OPIE_VERSION}"
-PREFERRED_VERSION_opie-handwriting = "${OPIE_VERSION}"
-PREFERRED_VERSION_opie-helpbrowser = "${OPIE_VERSION}"
-PREFERRED_VERSION_opie-help-en = "${OPIE_VERSION}"
-PREFERRED_VERSION_opie-homeapplet = "${OPIE_VERSION}"
-PREFERRED_VERSION_opie-i18n = "${OPIE_VERSION}"
-PREFERRED_VERSION_opie-i18n = "${OPIE_VERSION}"
-PREFERRED_VERSION_opie-i18n = "${OPIE_VERSION}"
-PREFERRED_VERSION_opie-irc = "${OPIE_VERSION}"
-PREFERRED_VERSION_opie-irdaapplet = "${OPIE_VERSION}"
-PREFERRED_VERSION_opie-jumpx = "${OPIE_VERSION}"
-PREFERRED_VERSION_opie-kbill = "${OPIE_VERSION}"
-PREFERRED_VERSION_opie-kcheckers = "${OPIE_VERSION}"
-PREFERRED_VERSION_opie-keyboard = "${OPIE_VERSION}"
-PREFERRED_VERSION_opie-keypebble = "${OPIE_VERSION}"
-PREFERRED_VERSION_opie-keytabs = "${OPIE_VERSION}"
-PREFERRED_VERSION_opie-keyview = "${OPIE_VERSION}"
-PREFERRED_VERSION_opie-kjumpx = "${OPIE_VERSION}"
-PREFERRED_VERSION_opie-kpacman = "${OPIE_VERSION}"
-PREFERRED_VERSION_opie-language = "${OPIE_VERSION}"
-PREFERRED_VERSION_opie-launcher-settings = "${OPIE_VERSION}"
-PREFERRED_VERSION_opie-libqrsync = "${OPIE_VERSION}"
-PREFERRED_VERSION_opie-light-and-power = "${OPIE_VERSION}"
-PREFERRED_VERSION_opie-login = "${OPIE_VERSION}"
-PREFERRED_VERSION_opie-logoutapplet = "${OPIE_VERSION}"
-PREFERRED_VERSION_opie-mailapplet = "${OPIE_VERSION}"
-PREFERRED_VERSION_opie-mail = "${OPIE_VERSION}"
-PREFERRED_VERSION_opie-mediaplayer1-libmadplugin = "${OPIE_VERSION}"
-PREFERRED_VERSION_opie-mediaplayer1-libmodplugin = "${OPIE_VERSION}"
-PREFERRED_VERSION_opie-mediaplayer1-libtremorplugin = "${OPIE_VERSION}"
-PREFERRED_VERSION_opie-mediaplayer1-libwavplugin = "${OPIE_VERSION}"
-PREFERRED_VERSION_opie-mediaplayer1 = "${OPIE_VERSION}"
-PREFERRED_VERSION_opie-mediaplayer2 = "${OPIE_VERSION}"
-PREFERRED_VERSION_opie-mediaplayer2 = "${OPIE_VERSION}"
-PREFERRED_VERSION_opie-mediaplayer2 = "${OPIE_VERSION}"
-PREFERRED_VERSION_opie-mediaplayer2 = "${OPIE_VERSION}"
-PREFERRED_VERSION_opie-mediaplayer2 = "${OPIE_VERSION}"
-PREFERRED_VERSION_opie-mediummount = "${OPIE_VERSION}"
-PREFERRED_VERSION_opie-memoryapplet = "${OPIE_VERSION}"
-PREFERRED_VERSION_opie-mindbreaker = "${OPIE_VERSION}"
-PREFERRED_VERSION_opie-minesweep = "${OPIE_VERSION}"
-PREFERRED_VERSION_opie-mobilemsg = "${OPIE_VERSION}"
-PREFERRED_VERSION_opie-multikeyapplet = "${OPIE_VERSION}"
-PREFERRED_VERSION_opie-multikey = "${OPIE_VERSION}"
-PREFERRED_VERSION_opie-networkapplet = "${OPIE_VERSION}"
-PREFERRED_VERSION_opie-networksettings = "${OPIE_VERSION}"
-PREFERRED_VERSION_opie-notesapplet = "${OPIE_VERSION}"
-PREFERRED_VERSION_opie-odict = "${OPIE_VERSION}"
-PREFERRED_VERSION_opie-osearch = "${OPIE_VERSION}"
-PREFERRED_VERSION_opie-oxygen = "1.0.0"
-PREFERRED_VERSION_opie-oyatzee = "${OPIE_VERSION}"
-PREFERRED_VERSION_opie-packagemanager = "${OPIE_VERSION}"
-PREFERRED_VERSION_opie-parashoot = "${OPIE_VERSION}"
-PREFERRED_VERSION_opie-performance = "${OPIE_VERSION}"
-PREFERRED_VERSION_opie-pickboard = "${OPIE_VERSION}"
-PREFERRED_VERSION_opie-pics = "${OPIE_VERSION}"
-PREFERRED_VERSION_opie-pimconverter = "${OPIE_VERSION}"
-PREFERRED_VERSION_opie-powerchord = "${OPIE_VERSION}"
-PREFERRED_VERSION_opie-pyquicklaunchapplet = "${OPIE_VERSION}"
-PREFERRED_VERSION_opie-qashmoney = "${OPIE_VERSION}"
-PREFERRED_VERSION_opie-qasteroids = "${OPIE_VERSION}"
-PREFERRED_VERSION_opie-qcop = "1.0.0"
-PREFERRED_VERSION_opie-quicklauncher = "${OPIE_VERSION}"
-PREFERRED_VERSION_opie-rdesktop = "${OPIE_VERSION}"
-PREFERRED_VERSION_opie-reader = "${OPIE_VERSION}"
-PREFERRED_VERSION_opie-recorder = "${OPIE_VERSION}"
-PREFERRED_VERSION_opie-remote = "${OPIE_VERSION}"
-PREFERRED_VERSION_opie-restartapplet2 = "${OPIE_VERSION}"
-PREFERRED_VERSION_opie-restartapplet = "${OPIE_VERSION}"
-PREFERRED_VERSION_opie-restartapplet = "${OPIE_VERSION}"
-PREFERRED_VERSION_opie-rotateapplet = "${OPIE_VERSION}"
-PREFERRED_VERSION_opie-screenshotapplet = "${OPIE_VERSION}"
-PREFERRED_VERSION_opie-search = "${OPIE_VERSION}"
-PREFERRED_VERSION_opie-security = "${OPIE_VERSION}"
-PREFERRED_VERSION_opie-securityplugins = "${OPIE_VERSION}"
-PREFERRED_VERSION_opie-securityplugins = "${OPIE_VERSION}"
-PREFERRED_VERSION_opie-securityplugins = "${OPIE_VERSION}"
-PREFERRED_VERSION_opie-securityplugins = "${OPIE_VERSION}"
-PREFERRED_VERSION_opie-sfcave = "${OPIE_VERSION}"
-PREFERRED_VERSION_opie-sheet = "${OPIE_VERSION}"
-PREFERRED_VERSION_opie-sh = "${OPIE_VERSION}"
-PREFERRED_VERSION_opie-showimg = "${OPIE_VERSION}"
-PREFERRED_VERSION_opie-snake = "${OPIE_VERSION}"
-PREFERRED_VERSION_opie-solitaire = "${OPIE_VERSION}"
-PREFERRED_VERSION_opie-sshkeys = "${OPIE_VERSION}"
-PREFERRED_VERSION_opie-style-flat = "${OPIE_VERSION}"
-PREFERRED_VERSION_opie-style-fresh = "${OPIE_VERSION}"
-PREFERRED_VERSION_opie-style-liquid = "${OPIE_VERSION}"
-PREFERRED_VERSION_opie-style-metal = "${OPIE_VERSION}"
-PREFERRED_VERSION_opie-style-phase = "${OPIE_VERSION}"
-PREFERRED_VERSION_opie-style-web = "${OPIE_VERSION}"
-PREFERRED_VERSION_opie-suspendapplet = "${OPIE_VERSION}"
-PREFERRED_VERSION_opie-symlinker = "${OPIE_VERSION}"
-PREFERRED_VERSION_opie-sysinfo = "${OPIE_VERSION}"
-PREFERRED_VERSION_opie-systemtime = "${OPIE_VERSION}"
-PREFERRED_VERSION_opie-tableviewer = "${OPIE_VERSION}"
-PREFERRED_VERSION_opie-tabmanager = "${OPIE_VERSION}"
-PREFERRED_VERSION_opie-taskbar = "${OPIE_VERSION}"
-PREFERRED_VERSION_opie-tetrix = "${OPIE_VERSION}"
-PREFERRED_VERSION_opie-textedit = "${OPIE_VERSION}"
-PREFERRED_VERSION_opie-theme = "${OPIE_VERSION}"
-PREFERRED_VERSION_opie-tictac = "${OPIE_VERSION}"
-PREFERRED_VERSION_opie-tinykate = "${OPIE_VERSION}"
-PREFERRED_VERSION_opie-today-addressbookplugin = "${OPIE_VERSION}"
-PREFERRED_VERSION_opie-today-datebookplugin = "${OPIE_VERSION}"
-PREFERRED_VERSION_opie-today-fortuneplugin = "${OPIE_VERSION}"
-PREFERRED_VERSION_opie-today-mailplugin = "${OPIE_VERSION}"
-PREFERRED_VERSION_opie-today = "${OPIE_VERSION}"
-PREFERRED_VERSION_opie-today-stocktickerplugin = "${OPIE_VERSION}"
-PREFERRED_VERSION_opie-today-todolistplugin = "${OPIE_VERSION}"
-PREFERRED_VERSION_opie-today-weatherplugin = "${OPIE_VERSION}"
-PREFERRED_VERSION_opie-todo = "${OPIE_VERSION}"
-PREFERRED_VERSION_opie-tonleiter = "${OPIE_VERSION}"
-PREFERRED_VERSION_opie-ubrowser = "${OPIE_VERSION}"
-PREFERRED_VERSION_opie-unikeyboard = "${OPIE_VERSION}"
-PREFERRED_VERSION_opie-usermanager = "${OPIE_VERSION}"
-PREFERRED_VERSION_opie-vmemo = "${OPIE_VERSION}"
-PREFERRED_VERSION_opie-vmemo-settings = "${OPIE_VERSION}"
-PREFERRED_VERSION_opie-volumeapplet = "${OPIE_VERSION}"
-PREFERRED_VERSION_opie-vtapplet = "${OPIE_VERSION}"
-PREFERRED_VERSION_opie-wellenreiter = "1.0.3"
-PREFERRED_VERSION_opie-wirelessapplet = "${OPIE_VERSION}"
-PREFERRED_VERSION_opie-wordgame = "${OPIE_VERSION}"
-PREFERRED_VERSION_opie-write = "${OPIE_VERSION}"
-PREFERRED_VERSION_opie-zkbapplet = "${OPIE_VERSION}"
-PREFERRED_VERSION_opie-zlines = "${OPIE_VERSION}"
-PREFERRED_VERSION_opie-zsafe = "${OPIE_VERSION}"
-PREFERRED_VERSION_opie-zsame = "${OPIE_VERSION}"
-
-#
-# GPE
-#
-
-PREFERRED_VERSION_libmatchbox = "1.2"
-PREFERRED_VERSION_matchbox = "0.8.1"
-PREFERRED_VERSION_matchbox-common = "0.8"
-PREFERRED_VERSION_matchbox-desktop = "0.8.1"
-PREFERRED_VERSION_matchbox-wm = "0.8.2"
-PREFERRED_VERSION_matchbox-panel = "0.8.1"
-PREFERRED_VERSION_matchbox-applet-inputmanager = "0.5"
-PREFERRED_VERSION_gtk+ = "2.4.4"
-PREFERRED_VERSION_libgpewidget = "0.90"
-PREFERRED_VERSION_libgpepimc = "0.3"
-PREFERRED_VERSION_libgpevtype = "0.4"
-PREFERRED_VERSION_libschedule = "0.13"
-PREFERRED_VERSION_gpe-icons = "0.22"
-PREFERRED_VERSION_libgsm = "1.0.10"
-PREFERRED_VERSION_diet-x11 = "6.2.1"
-PREFERRED_VERSION_xcursor-transparent-theme = "0.1.1"
-PREFERRED_VERSION_rxvt-unicode = "3.7"
-PREFERRED_VERSION_gtk2-theme-angelistic = "0.3"
-PREFERRED_VERSION_xst = "0.14"
-PREFERRED_VERSION_xprop = "0.0cvs${CVSDATE}"
-PREFERRED_VERSION_xhost = "0.0cvs20040413"
-PREFERRED_VERSION_xrdb = "0.0cvs${CVSDATE}"
-PREFERRED_VERSION_gpe-login = "0.73"
-PREFERRED_VERSION_gpe-session-scripts = "0.61"
-PREFERRED_VERSION_gpe-soundserver = "0.4-1"
-PREFERRED_VERSION_gpe-todo = "0.48"
-PREFERRED_VERSION_gpe-calendar = "0.56"
-PREFERRED_VERSION_gpe-sketchbox = "0.2.8"
-PREFERRED_VERSION_gpe-contacts = "0.29"
-PREFERRED_VERSION_gpe-today = "0.08"
-PREFERRED_VERSION_matchbox-panel-manager = "0.1"
-PREFERRED_VERSION_dbus = "0.21"
-PREFERRED_VERSION_gpe-bluetooth = "0.36.3"
-PREFERRED_VERSION_gpe-su = "0.18"
-PREFERRED_VERSION_gpe-conf = "0.1.19"
-PREFERRED_VERSION_gpe-clock = "0.14"
-PREFERRED_VERSION_gpe-mininet = "0.4"
-PREFERRED_VERSION_gpe-mixer = "0.38"
-PREFERRED_VERSION_gpe-shield = "0.6"
-PREFERRED_VERSION_gpe-wlancfg = "0.2.6"
-PREFERRED_VERSION_gpe-taskmanager = "0.17"
-PREFERRED_VERSION_keylaunch = "2.0.7"
-PREFERRED_VERSION_minilite = "0.44"
-PREFERRED_VERSION_xmonobut = "0.4"
-PREFERRED_VERSION_gpe-edit = "0.28"
-PREFERRED_VERSION_gpe-gallery = "0.95"
-PREFERRED_VERSION_gpe-calculator = "0.2"
-PREFERRED_VERSION_gpe-package = "0.0.12"
-PREFERRED_VERSION_gpe-soundbite = "1.0.5"
-PREFERRED_VERSION_gpe-terminal = "1.1"
-PREFERRED_VERSION_gpe-watch = "0.10"
-PREFERRED_VERSION_gpe-what = "0.31"
-PREFERRED_VERSION_gpe-filemanager = "0.20"
-PREFERRED_VERSION_gpe-go = "0.05"
-PREFERRED_VERSION_gpe-irc = "0.07"
-PREFERRED_VERSION_gpe-lights = "0.12"
-PREFERRED_VERSION_gpe-nmf = "0.19"
-PREFERRED_VERSION_gpe-othello = "0.2-1"
-PREFERRED_VERSION_gpe-plucker = "0.1"
-PREFERRED_VERSION_gpe-session-scripts = "0.61"
-PREFERRED_VERSION_gpe-tetris = "0.6-2"
-PREFERRED_VERSION_gsoko = "0.4.2-gpe5"
-PREFERRED_VERSION_xdemineur = "2.1.1"
-PREFERRED_VERSION_matchbox-panel-hacks = "0.3-1"
-PREFERRED_VERSION_rosetta = "0.0cvs${CVSDATE}"
-PREFERRED_VERSION_dillo2 = "0.6.6"
-PREFERRED_VERSION_minimo = "0.0cvs${CVSDATE}"
-PREFERRED_VERSION_linphone-hh = "0.12.2.hh1"
-PREFERRED_VERSION_linphone = "0.12.2"
-PREFERRED_VERSION_firefox = "0.9.3"
-
diff --git a/conf/openzaurus.conf b/conf/openzaurus.conf
deleted file mode 100644
index a3049fc102..0000000000
--- a/conf/openzaurus.conf
+++ /dev/null
@@ -1,5 +0,0 @@
-#@TYPE: Distribution
-#@NAME: OpenZaurus
-#@DESCRIPTION: Distribution configuration for OpenZaurus (opensimpad.org)
-
-INHERIT += " package_ipk debian"
diff --git a/conf/poodle.conf b/conf/poodle.conf
deleted file mode 100644
index 39bb7df1eb..0000000000
--- a/conf/poodle.conf
+++ /dev/null
@@ -1,24 +0,0 @@
-#@TYPE: Machine
-#@NAME: Sharp Zaurus SL-B500, Sharp Zaurus SL-5600
-#@DESCRIPTION: Machine configuration for the PXA250 based Sharp Zaurus SL-B500 and SHarp Zaurus SL-5600 devices
-
-TARGET_ARCH = "arm"
-IPKG_ARCHS = "all arm ${MACHINE}"
-PREFERRED_PROVIDER_xserver = "xserver-kdrive"
-PREFERRED_PROVIDER_virtual/kernel = "openzaurus-pxa"
-BOOTSTRAP_EXTRA_DEPENDS = "virtual/kernel modutils-collateral hostap-modules orinoco-modules sharp-sdmmc-support"
-BOOTSTRAP_EXTRA_RDEPENDS = "kernel hostap-modules-cs orinoco-modules sharp-sdmmc-support \
-kernel-module-ip-gre \
-kernel-module-ipip kernel-module-irnet kernel-module-net-fd kernel-module-registers kernel-module-pxa-bi \
-kernel-module-usbdcore kernel-module-usbdmonitor modutils-collateral"
-
-EXTRA_IMAGECMD_jffs2 = "--little-endian --eraseblock=0x4000 --pad --faketime -n"
-
-IMAGE_CMD_jffs2 = "mkfs.jffs2 --root=${IMAGE_ROOTFS} --output=${DEPLOY_DIR_IMAGE}/${IMAGE_NAME}.rootfs.jffs2.bin ${EXTRA_IMAGECMD}"
-
-include conf/handheld-common.conf
-# not using tune-xscale.conf so as to retain backwards compatibility
-include conf/tune-strongarm.conf
-
-SERIAL_CONSOLE = "115200 ttyS0"
-
diff --git a/conf/ramses.conf b/conf/ramses.conf
deleted file mode 100644
index 81cfc8d78b..0000000000
--- a/conf/ramses.conf
+++ /dev/null
@@ -1,22 +0,0 @@
-#@TYPE: Machine
-#@NAME: M&N MNCI-RX
-#@DESCRIPTION: Machine configuration for the PXA255 based M&N Solutions MNCI-RX
-
-include conf/openmnci.conf
-include conf/tune-xscale.conf
-
-TARGET_ARCH = "arm"
-TARGET_OS = "linux"
-IPKG_ARCHS = "all arm ${MACHINE}"
-PREFERRED_PROVIDER_xserver = "xserver-kdrive"
-PREFERRED_PROVIDER_virtual/kernel = "mnci-ramses"
-
-EXTRA_IMAGECMD_jffs2 = "--pad=0x1ec0000 --eraseblock=0x40000"
-
-
-USE_DEVFS = "1"
-GPE_MACHINE_CLASS = "smallscreen"
-
-# For sysvinit:
-USE_VT = "0"
-SERIAL_CONSOLE = "115200 tts/0"
diff --git a/conf/shepherd.conf b/conf/shepherd.conf
deleted file mode 100644
index 0ec471d9bc..0000000000
--- a/conf/shepherd.conf
+++ /dev/null
@@ -1,5 +0,0 @@
-#@TYPE: Machine
-#@NAME: Sharp Zaurus SL-C750
-#@DESCRIPTION: Machine configuration for the Sharp Zaurus SL-C750 device
-
-include conf/zaurus-pxa.conf
diff --git a/conf/simpad.conf b/conf/simpad.conf
deleted file mode 100644
index 587a17b846..0000000000
--- a/conf/simpad.conf
+++ /dev/null
@@ -1,29 +0,0 @@
-#@TYPE: Machine
-#@NAME: SIEMENS SIMpad SL4, SIEMENS SIMpad CL4, SIEMENS SIMpad SLC, Telekom T-Sinus PAD
-#@DESCRIPTION: Machine configuration for the SA1100 based SIEMENS SIMpad and Telekom T-Sinus PAD devices
-
-TARGET_ARCH = "arm"
-IPKG_ARCHS = "all arm ${MACHINE}"
-PREFERRED_PROVIDER_xserver = "xserver-kdrive"
-PREFERRED_PROVIDER_virtual/kernel = "opensimpad-64+0"
-BOOTSTRAP_EXTRA_DEPENDS = "virtual/kernel hostap-modules orinoco-modules freeswan mipv6 atmelwlandriver"
-BOOTSTRAP_EXTRA_RDEPENDS = "kernel"
-BOOTSTRAP_EXTRA_RRECOMMENDS = "freeswan mipv6 hostap-modules-cs orinoco-modules atmelwlandriver \
-kernel-module-sa1100-ir kernel-module-sa1100usb-core kernel-module-usb-eth \
-kernel-module-pcnet-cs kernel-module-8390"
-
-# This is needed for the ramdisk script to work
-BOOTSTRAP_EXTRA_DEPENDS += "e2fsprogs"
-BOOTSTRAP_EXTRA_RDEPENDS += "e2fsprogs-mke2fs"
-
-EXTRA_IMAGECMD_jffs2 = "--pad --little-endian --eraseblock=0x20000 -n"
-EXTRA_IMAGEDEPENDS = ""
-INHERIT += "simpad_flashimg"
-SERIAL_CONSOLE = "ttySA0 38400 vt100"
-
-USE_DEVFS = "1"
-GPE_MACHINE_CLASS = "bigscreen"
-
-include conf/handheld-common.conf
-include conf/tune-strongarm.conf
-
diff --git a/conf/tosa.conf b/conf/tosa.conf
deleted file mode 100644
index 3361e53f71..0000000000
--- a/conf/tosa.conf
+++ /dev/null
@@ -1,28 +0,0 @@
-#@TYPE: Machine
-#@NAME: Sharp Zaurus SL-6000
-#@DESCRIPTION: Machine configuration for the PXA255 based Sharp Zaurus SL-6000 device
-
-TARGET_ARCH = "arm"
-IPKG_ARCHS = "all arm ${MACHINE}"
-PREFERRED_PROVIDER_xserver = "xserver-kdrive"
-PREFERRED_PROVIDER_virtual/kernel = "openzaurus-pxa"
-BOOTSTRAP_EXTRA_DEPENDS += "wlan-ng-modules virtual/kernel modutils-collateral hostap-modules orinoco-modules sharp-sdmmc-support chkhinge"
-BOOTSTRAP_EXTRA_RDEPENDS += "wlan-ng-modules wlan-ng-utils kernel-module-acm kernel-module-evdev kernel-module-net-fd \
-kernel-module-pxa-bi kernel-module-registers kernel-module-storage-fd kernel-module-usb-ohci-tc6393 kernel-module-usb-storage \
-kernel hostap-modules-cs orinoco-modules sharp-sdmmc-support kernel-module-pxa-bi modutils chkhinge kernel-module-ip-gre \
-kernel-module-irnet kernel-module-ipip modutils-collateral kernel-module-usbcore kernel-module-usbdcore kernel-module-usbdmonitor"
-
-RRECOMMENDS += "kernel-module-usbdserial kernel-module-usbkbd kernel-module-usbmouse kernel-module-hid usbutils kernel-module-evdev"
-
-EXTRA_IMAGECMD_jffs2 = "--pad --little-endian --eraseblock=0x4000 -n --faketime"
-
-IMAGE_CMD_jffs2 = "mkfs.jffs2 --root=${IMAGE_ROOTFS} --output=${DEPLOY_DIR_IMAGE}/${IMAGE_NAME}.rootfs.jffs2 ${EXTRA_IMAGECMD}"
-
-# GPE_MACHINE_CLASS = "bigscreen"
-# GPE_EXTRA_DEPENDS = "gaim"
-
-include conf/handheld-common.conf
-# not using tune-xscale.conf so as to retain backwards compatibility
-include conf/tune-strongarm.conf
-
-SERIAL_CONSOLE = "115200 ttyS0"
diff --git a/conf/tune-strongarm.conf b/conf/tune-strongarm.conf
deleted file mode 100644
index 8654c996ef..0000000000
--- a/conf/tune-strongarm.conf
+++ /dev/null
@@ -1,2 +0,0 @@
-TARGET_CC_ARCH = "-march=armv4 -mtune=xscale"
-
diff --git a/conf/tune-xscale.conf b/conf/tune-xscale.conf
deleted file mode 100644
index 0b98f09fc8..0000000000
--- a/conf/tune-xscale.conf
+++ /dev/null
@@ -1,3 +0,0 @@
-TARGET_CC_ARCH = "-march=armv5te -mtune=xscale"
-PACKAGE_ARCH = "armv5te"
-
diff --git a/conf/unslung.conf b/conf/unslung.conf
deleted file mode 100644
index 949870e156..0000000000
--- a/conf/unslung.conf
+++ /dev/null
@@ -1,17 +0,0 @@
-#@TYPE: Distribution
-#@NAME: Unslung
-#@DESCRIPTION: Unslung Linux Distribution for the NSLU2
-
-INHERIT += " package_ipk debian nslu2_flashimg"
-
-IMAGE_FSTYPE = "ext2.gz"
-
-BOOTSTRAP_EXTRA_DEPENDS += "virtual/kernel"
-BOOTSTRAP_EXTRA_RDEPENDS += "kernel-module-ax8817x kernel-module-catc \
-kernel-module-cdcether kernel-module-kaweth kernel-module-pegasus \
-kernel-module-rtl8150 kernel-module-usbnet kernel-module-mii"
-
-# PREFERRED_PROVIDER_virtual/kernel ?= "nslu2-unslung-kernel"
-
-PREFERRED_VERSION_glibc ?= "2.2.5"
-PREFERRED_VERSION_glibc-initial ?= "2.2.5"
diff --git a/conf/wrt54.conf b/conf/wrt54.conf
deleted file mode 100644
index 440d05e3a8..0000000000
--- a/conf/wrt54.conf
+++ /dev/null
@@ -1,24 +0,0 @@
-#@TYPE: Machine
-#@NAME: Linksys WRT54G(S)
-#@DESCRIPTION: Machine configuration for the MIPS based WRT54G(S) devices
-
-TARGET_ARCH = "mipsel"
-TARGET_CC_ARCH = "-Os -mips2"
-IPKG_ARCHS = "all mipsel ${MACHINE}"
-
-ROUTER_MODULES = "ipv6 \
-ipsec \
-mip6-mn \
-tun \
-loop \
-sunrpc nfs \
-af_packet \
-ppp-async ppp-deflate ppp-mppe \
-ip-gre ip-tables ipip \
-input uinput \
-"
-
-BOOTSTRAP_EXTRA_DEPENDS = "virtual/kernel-wrt ppp wireless-tools hostap-modules"
-BOOTSTRAP_EXTRA_RDEPENDS = "kernel modutils hostap-modules-cs hostap-modules \
-kernel-module-devinfo kernel-module-gpio kernel-module-net-fd kernel-module-registers "
-BOOTSTRAP_EXTRA_RRECOMMENDS = "ppp wireless-tools ${@linux_module_packages('${ROUTER_MODULES}')}"
diff --git a/conf/x86-uml.conf b/conf/x86-uml.conf
deleted file mode 100644
index 2dbb6059c1..0000000000
--- a/conf/x86-uml.conf
+++ /dev/null
@@ -1,9 +0,0 @@
-#@TYPE: Machine
-#@NAME: X86 User Mode Linux
-#@DESCRIPTION: Machine configuration for a User Mode Linux running on an x86 compatible PC
-
-TARGET_ARCH = "i386"
-IPKG_ARCHS = "all i686 i386 x86 x86-uml"
-PREFERRED_PROVIDER_virtual/kernel = "linux-uml"
-BOOTSTRAP_EXTRA_DEPENDS = "virtual/kernel"
-BOOTSTRAP_EXTRA_RDEPENDS = "kernel kernel-modules"
diff --git a/conf/zaurus-pxa.conf b/conf/zaurus-pxa.conf
deleted file mode 100644
index a2ad7756c3..0000000000
--- a/conf/zaurus-pxa.conf
+++ /dev/null
@@ -1,27 +0,0 @@
-TARGET_ARCH = "arm"
-IPKG_ARCHS = "all arm ${MACHINE}"
-PREFERRED_PROVIDER_xserver = "xserver-kdrive"
-PREFERRED_PROVIDER_virtual/kernel = "openzaurus-pxa"
-BOOTSTRAP_EXTRA_DEPENDS = "virtual/kernel hostap-modules orinoco-modules sharp-sdmmc-support chkhinge"
-BOOTSTRAP_EXTRA_RDEPENDS = "kernel hostap-modules-cs orinoco-modules sharp-sdmmc-support \
-kernel-module-net-fd kernel-module-registers kernel-module-pxa-bi \
-kernel-module-usbdcore kernel-module-usbdmonitor modutils chkhinge"
-
-EXTRA_IMAGECMD_jffs2 = "--pad --little-endian --eraseblock=0x4000 -n"
-EXTRA_IMAGEDEPENDS = "sharp-flash-header-c700"
-
-IMAGE_CMD_jffs2 = "mkfs.jffs2 --root=${IMAGE_ROOTFS} --faketime \
- --output=${T}/${IMAGE_NAME}.rootfs.jffs2 \
- ${EXTRA_IMAGECMD}; \
- cat ${STAGING_LIBDIR}/sharp-flash-header/header-c700.bin \
- ${T}/${IMAGE_NAME}.rootfs.jffs2 > \
- ${DEPLOY_DIR_IMAGE}/${IMAGE_NAME}.rootfs.img"
-
-GPE_MACHINE_CLASS = "bigscreen"
-GPE_EXTRA_DEPENDS = "gaim"
-
-include conf/handheld-common.conf
-# not using tune-xscale.conf so as to retain backwards compatibility
-include conf/tune-strongarm.conf
-
-SERIAL_CONSOLE = "115200 ttyS0"