summaryrefslogtreecommitdiff
path: root/conf/distro
diff options
context:
space:
mode:
authorMartin Jansa <Martin.Jansa@gmail.com>2009-11-11 17:46:05 +0100
committerMartin Jansa <Martin.Jansa@gmail.com>2009-11-11 18:36:27 +0100
commitb4364b30eb1b25af44a5253616b8528e74e392d7 (patch)
treea6c8cad05a0f2570fe5320b429fd6daad8561339 /conf/distro
parent3d7d24cfdca0a906e1063e417dd6be8c3d9533b1 (diff)
shr: add SHR distribution configs
Diffstat (limited to 'conf/distro')
-rw-r--r--conf/distro/include/preferred-shr-versions.inc32
-rw-r--r--conf/distro/include/shr-autorev-unstable.inc128
-rw-r--r--conf/distro/include/shr-autorev.inc144
-rw-r--r--conf/distro/shr.conf97
4 files changed, 138 insertions, 263 deletions
diff --git a/conf/distro/include/preferred-shr-versions.inc b/conf/distro/include/preferred-shr-versions.inc
new file mode 100644
index 0000000000..769ec7c4c7
--- /dev/null
+++ b/conf/distro/include/preferred-shr-versions.inc
@@ -0,0 +1,32 @@
+# Upgraded
+# use newer version then preferred by default
+PREFERRED_VERSION_dbus ?= "1.3.0"
+PREFERRED_VERSION_autoconf = "2.63"
+PREFERRED_VERSION_autoconf-native = "2.63"
+PREFERRED_VERSION_libmikmod ?= "3.2.0-beta2"
+PREFERRED_VERSION_mtd-utils-native ?= "1.2.0+git"
+PREFERRED_VERSION_strace ?= "4.5.15"
+
+# we need new headers for libc, now OLDEST_KERNEL_linux-gnueabi = "2.6.24"
+PREFERRED_VERSION_linux-libc-headers = "2.6.29"
+
+# upgrades used in Angstrom
+PREFERRED_VERSION_gtk+ = "2.18.3"
+PREFERRED_VERSION_hal = "0.5.13"
+PREFERRED_VERSION_libtool = "2.2.6a"
+PREFERRED_VERSION_libtool-native = "2.2.6a"
+PREFERRED_VERSION_libtool-cross = "2.2.6a"
+PREFERRED_VERSION_libtool-sdk = "2.2.6a"
+PREFERRED_VERSION_udev = "141"
+PREFERRED_VERSION_usbutils = "0.82"
+PREFERRED_VERSION_wpa-supplicant = "0.6.9"
+UDEV_GE_141 = "1"
+
+# Downgraded
+# python-pygtk_2.16.0 is accessing non-existent /usr/share/pygobject/2.0/codegen/codegen.py
+PREFERRED_VERSION_python-pygtk ?= "2.10.4"
+PREFERRED_VERSION_gpe-gallery ?= "0.97"
+PREFERRED_VERSION_boost ?= "1.33.1"
+PREFERRED_VERSION_man-pages ?= "2.41"
+PREFERRED_VERSION_xchat ?= "2.8.4"
+PREFERRED_VERSION_x11vnc ?= "0.9.3"
diff --git a/conf/distro/include/shr-autorev-unstable.inc b/conf/distro/include/shr-autorev-unstable.inc
deleted file mode 100644
index 5e7a0ddfa3..0000000000
--- a/conf/distro/include/shr-autorev-unstable.inc
+++ /dev/null
@@ -1,128 +0,0 @@
-
-# SHR - override revs for shr-unstable
-
-
-# KERNEL
-SRCREV_pn-linux-openmoko-shr-devel = "${AUTOREV}"
-
-PREFERRED_VERSION_vala-native = "0.7.4+0.7.5-fso2"
-
-
-# FSO stuff
-SRCREV_pn-dbus-hlid = "${AUTOREV}"
-SRCREV_pn-frameworkd = "${AUTOREV}"
-SRCREV_pn-frameworkd-config-shr = "${AUTOREV}"
-SRCREV_pn-frameworkd-config-shr_FSO_REV = "${AUTOREV}"
-SRCREV_pn-frameworkd-config-shr_SHR_REV = "${AUTOREV}"
-SRCREV_pn-fsod = "${AUTOREV}"
-SRCREV_pn-fsodeviced = "${AUTOREV}"
-SRCREV_pn-fsonetworkd = "${AUTOREV}"
-SRCREV_pn-fsousaged = "${AUTOREV}"
-SRCREV_pn-fsoraw = "${AUTOREV}"
-SRCREV_pn-fso-abyss = "${AUTOREV}"
-SRCREV_pn-fso-apm = "${AUTOREV}"
-SRCREV_pn-fso-term = "${AUTOREV}"
-SRCREV_pn-fso-gsm0710muxd = "${AUTOREV}"
-SRCREV_pn-fso-gpsd = "${AUTOREV}"
-SRCREV_pn-fso-monitord = "${AUTOREV}"
-SRCREV_pn-fso-sounds = "${AUTOREV}"
-SRCREV_pn-fso-specs = "${AUTOREV}"
-SRCREV_pn-fso-term = "${AUTOREV}"
-SRCREV_pn-gsmd2 = "${AUTOREV}"
-SRCREV_pn-illume-theme-freesmartphone = "${AUTOREV}"
-SRCREV_pn-libascenario = "${AUTOREV}"
-SRCREV_pn-libfsobasics = "${AUTOREV}"
-SRCREV_pn-libfsoframework = "${AUTOREV}"
-SRCREV_pn-libfsotransport = "${AUTOREV}"
-SRCREV_pn-libframeworkd-glib = "${AUTOREV}"
-SRCREV_pn-libfso-glib = "${AUTOREV}"
-SRCREV_pn-libgsm0710 = "${AUTOREV}"
-SRCREV_pn-libgsm0710mux = "${AUTOREV}"
-SRCREV_pn-mickeydbus = "${AUTOREV}"
-SRCREV_pn-mickeyterm = "${AUTOREV}"
-SRCREV_pn-misc-vapi = "${AUTOREV}"
-SRCREV_pn-python-pytrc = "${AUTOREV}"
-SRCREV_pn-vala-dbus-binding-tool-native = "6071da6ad645e1200eb2aee88d254ada348d361b"
-SRCREV_pn-vala = "${AUTOREV}"
-SRCREV_pn-zhone = "${AUTOREV}"
-
-
-# SHR stuff
-SRCREV_pn-libhito = "${AUTOREV}"
-SRCREV_pn-neod = "${AUTOREV}"
-SRCREV_pn-shr-settings = "${AUTOREV}"
-SRCREV_pn-ophonekitd = "${AUTOREV}"
-SRCREV_pn-ophonekitd-vala = "${AUTOREV}"
-SRCREV_pn-libmodulo = "${AUTOREV}"
-SRCREV_pn-shr-messages = "${AUTOREV}"
-SRCREV_pn-shr-contacts = "${AUTOREV}"
-SRCREV_pn-shr-dialer = "${AUTOREV}"
-SRCREV_pn-libframeworkd-phonegui = "${AUTOREV}"
-SRCREV_pn-libframeworkd-phonegui-efl = "${AUTOREV}"
-SRCREV_pn-libframeworkd-phonegui-efl2 = "${AUTOREV}"
-SRCREV_pn-libframeworkd-phonegui-gtk = "${AUTOREV}"
-SRCREV_pn-libframeworkd-phonegui-gtk2 = "${AUTOREV}"
-SRCREV_pn-opimd-utils = "${AUTOREV}"
-SRCREV_pn-pyphonelog = "${AUTOREV}"
-SRCREV_pn-shr-theme = "${AUTOREV}"
-SRCREV_pn-shr-theme-brave = "${AUTOREV}"
-SRCREV_pn-shr-theme-gtk-e17lookalike = "${AUTOREV}"
-SRCREV_pn-shr-splash = "${AUTOREV}"
-SRCREV_pn-shr-splash-theme-simple = "${AUTOREV}"
-SRCREV_pn-shr-splash-theme-dontpanic = "${AUTOREV}"
-SRCREV_pn-shr-splash-theme-handy = "${AUTOREV}"
-SRCREV_pn-shr-splash-theme-dociswatchingyou = "${AUTOREV}"
-SRCREV_pn-shr-installer = "${AUTOREV}"
-SRCREV_pn-shr-config = "${AUTOREV}"
-SRCREV_pn-alsa-scenarii-shr = "${AUTOREV}"
-SRCREV_pn-libphone-utils = "${AUTOREV}"
-SRCREV_pn-python-phoneutils = "${AUTOREV}"
-
-
-# E17 stuff
-EFL_SRCREV = "41040"
-SRCREV_pn-python-elementary = "41040"
-SRCREV_pn-e-wm-config-illume-shr = "${AUTOREV}"
-SRCREV_pn-e-wm-sysactions-shr = "${AUTOREV}"
-SRCREV_pn-e-wm-theme-illume-shr = "${AUTOREV}"
-SRCREV_pn-e-wm-theme-illume-sixteen = "${AUTOREV}"
-SRCREV_pn-elementary-theme-sixteen = "${AUTOREV}"
-SRCREV_pn-e-wm-menu-shr = "${AUTOREV}"
-SRCREV_pn-e-wm-illume-dict-pl = "${AUTOREV}"
-SRCREV_pn-etk-theme-shr = "${AUTOREV}"
-SRCREV_pn-libeflvala = "${AUTOREV}"
-
-SRCREV_pn-illume-keyboard-german = "${AUTOREV}"
-SRCREV_pn-illume-keyboard-arabic = "${AUTOREV}"
-SRCREV_pn-illume-keyboard-browse = "${AUTOREV}"
-SRCREV_pn-illume-keyboard-danish = "${AUTOREV}"
-SRCREV_pn-illume-keyboard-default-alt = "${AUTOREV}"
-SRCREV_pn-illume-keyboard-dutch = "${AUTOREV}"
-SRCREV_pn-illume-keyboard-dvorak = "${AUTOREV}"
-SRCREV_pn-illume-keyboard-french = "${AUTOREV}"
-SRCREV_pn-illume-keyboard-hebrew = "${AUTOREV}"
-SRCREV_pn-illume-keyboard-numeric-alt = "${AUTOREV}"
-SRCREV_pn-illume-keyboard-russian-terminal = "${AUTOREV}"
-SRCREV_pn-illume-keyboard-russian = "${AUTOREV}"
-
-# Other stuff
-SRCREV_pn-navit = "${AUTOREV}"
-SRCREV_pn-omview = "${AUTOREV}"
-SRCREV_pn-pythm = "${AUTOREV}"
-SRCREV_pn-omoney = "29"
-SRCREV_pn-enotes = "19"
-SRCREV_pn-ebrainy = "${AUTOREV}"
-SRCREV_pn-boost-signals2 = "52299"
-SRCREV_pn-dbus-c++-native = "${AUTOREV}"
-SRCREV_pn-dbus-c++ = "${AUTOREV}"
-SRCREV_pn-openmoocow = "${AUTOREV}"
-SRCREV_pn-libmokoui2 = "4695"
-SRCREV_pn-intone = "${AUTOREV}"
-SRCREV_pn-connman = "aac35324deb8c0b57f881338d87cb36b0979e7df"
-SRCREV_pn-msn-pecan = "${AUTOREV}"
-SRCREV_pn-omgps = "${AUTOREV}"
-SRCREV_pn-shr-launcher = "${AUTOREV}"
-SRCREV_pn-e-tasks = "${AUTOREV}"
-SRCREV_pn-mokonnect = "${AUTOREV}"
-SRCREV_pn-elmdentica = "${AUTOREV}"
-SRCREV_pn-vala-terminal = "${AUTOREV}"
diff --git a/conf/distro/include/shr-autorev.inc b/conf/distro/include/shr-autorev.inc
index 1605e8607a..78735fddce 100644
--- a/conf/distro/include/shr-autorev.inc
+++ b/conf/distro/include/shr-autorev.inc
@@ -1,140 +1,14 @@
-# SHR conf file
-
-# We need to override some machine stuff as well; include the machine-
-# specific file here (if it exists).
-#include conf/distro/include/shr-${MACHINE}.conf
-
-# Nail down some SRCREV's for the kernels. There is a real potential problem
-# here, in that git hashes are hashes, not incrementing version numbers. Thus
-# we need to have something else in the kernel version string that gets bumped
-# with each change. So if you change one of these, go to the kernel recipe
-# and bump the OEV value up as well.
-SRCREV_pn-linux-eten = "df9715883efa3e6a88866813168fabb1c16b0b7a"
-SRCREV_pn-linux-openmoko-shr-devel = "2d158aae9d8d36f575504f59884ed8e80802efe2"
-
-# FSO stuff
-SRCREV_pn-dbus-hlid = "39e804f28808247df2573788cb99897d4d765e69"
-SRCREV_pn-frameworkd = "e96a204768744130859ab091162ec5c976854d49"
+# SHR autorev include
SRCREV_pn-frameworkd-config-shr = "${AUTOREV}"
-SRCREV_pn-frameworkd-config-shr_FSO_REV = "e96a204768744130859ab091162ec5c976854d49"
+SRCREV_pn-frameworkd-config-shr_FSO_REV = "${AUTOREV}"
SRCREV_pn-frameworkd-config-shr_SHR_REV = "${AUTOREV}"
-SRCREV_pn-fsod = "${AUTOREV}"
-SRCREV_pn-fsodeviced = "${AUTOREV}"
-SRCREV_pn-fsonetworkd = "${AUTOREV}"
-SRCREV_pn-fsousaged = "3c3e1b862cdde806cef8f502dfe79f1d48f1c5d7"
-SRCREV_pn-fsoraw = "${AUTOREV}"
-SRCREV_pn-fso-abyss = "ff68be1581069ca494a559e85f6299246888d3b5"
-SRCREV_pn-fso-apm = "${AUTOREV}"
-SRCREV_pn-fso-term = "${AUTOREV}"
-SRCREV_pn-fso-gsm0710muxd = "abcbcd7cc532a8834906de3fc24c8f8fe7643cd4"
-SRCREV_pn-fso-gpsd = "78fe48dffb923175bde9f0aabc3500a9264a57e0"
-SRCREV_pn-fso-monitord = "${AUTOREV}"
-SRCREV_pn-fso-sounds = "3a4767ec01988bd0fd8f72f0c35d6d36e5fbc815"
-SRCREV_pn-fso-specs = "${AUTOREV}"
-SRCREV_pn-fso-term = "${AUTOREV}"
-SRCREV_pn-gsmd2 = "${AUTOREV}"
-SRCREV_pn-illume-theme-freesmartphone = "${AUTOREV}"
-SRCREV_pn-libascenario = "${AUTOREV}"
-SRCREV_pn-libfsobasics = "3c3e1b862cdde806cef8f502dfe79f1d48f1c5d7"
-SRCREV_pn-libfsoframework = "3c3e1b862cdde806cef8f502dfe79f1d48f1c5d7"
-SRCREV_pn-libfsotransport = "3c3e1b862cdde806cef8f502dfe79f1d48f1c5d7"
-SRCREV_pn-libframeworkd-glib = "680276e4cddabeb1edd088ddd421f363dd106a50"
-SRCREV_pn-libfso-glib = "9d292508739452b55b80ec40ec57405a5de2159f"
-SRCREV_pn-libgsm0710 = "3bb80ba6cc9f86ed3996f88bfa2986cc572489d6"
-SRCREV_pn-libgsm0710mux = "8e3e7533b286d8086bce8fa09bce23bb9f18bb98"
-SRCREV_pn-mickeydbus = "6d7f51b5189a00a07d9b88100a565f46fcb62644"
-SRCREV_pn-mickeyterm = "6d7f51b5189a00a07d9b88100a565f46fcb62644"
-SRCREV_pn-misc-vapi = "${AUTOREV}"
-SRCREV_pn-python-pytrc = "f15ff7c58946a2fd6ba767628b2fe5d6f46ff9bb"
-SRCREV_pn-vala-dbus-binding-tool-native = "6071da6ad645e1200eb2aee88d254ada348d361b"
-SRCREV_pn-vala = "${AUTOREV}"
-SRCREV_pn-zhone = "${AUTOREV}"
-
-# SHR stuff
-SHRREV = "c3d97171723d8e824cb5acf58b711aa78b3b82d9"
-
-SRCREV_pn-libhito = "${AUTOREV}"
-SRCREV_pn-neod = "${AUTOREV}"
-SRCREV_pn-shr-settings = "4e0fbe17e4fddd18b0455ec4d007ab3f1d19918e"
-SRCREV_pn-ophonekitd = "${SHRREV}"
-SRCREV_pn-ophonekitd-vala = "${AUTOREV}"
-SRCREV_pn-libmodulo = "${AUTOREV}"
-SRCREV_pn-shr-messages = "${SHRREV}"
-SRCREV_pn-shr-contacts = "${SHRREV}"
-SRCREV_pn-shr-dialer = "${SHRREV}"
-SRCREV_pn-libframeworkd-phonegui = "${SHRREV}"
-SRCREV_pn-libframeworkd-phonegui-efl = "${SHRREV}"
-SRCREV_pn-libframeworkd-phonegui-efl2 = "${AUTOREV}"
-SRCREV_pn-libframeworkd-phonegui-gtk = "${AUTOREV}"
-SRCREV_pn-libframeworkd-phonegui-gtk2 = "${AUTOREV}"
-SRCREV_pn-opimd-utils = "${AUTOREV}"
-SRCREV_pn-pyphonelog = "9da559f0242a32aa5d0b72c795f53d7d9ef8c973"
-SRCREV_pn-shr-theme = "${AUTOREV}"
-SRCREV_pn-shr-theme-brave = "${AUTOREV}"
-SRCREV_pn-shr-theme-gtk-e17lookalike = "${AUTOREV}"
-SRCREV_pn-shr-splash = "${AUTOREV}"
-SRCREV_pn-shr-splash-theme-simple = "${AUTOREV}"
-SRCREV_pn-shr-splash-theme-dontpanic = "${AUTOREV}"
-SRCREV_pn-shr-splash-theme-handy = "${AUTOREV}"
-SRCREV_pn-shr-splash-theme-niebiee = "${AUTOREV}"
-SRCREV_pn-shr-installer = "${AUTOREV}"
-SRCREV_pn-shr-config = "${AUTOREV}"
SRCREV_pn-alsa-scenarii-shr = "${AUTOREV}"
+SRCREV_pn-shr-settings = "${AUTOREV}"
+SRCREV_pn-shr-specs = "${AUTOREV}"
+SRCREV_pn-phoneui-apps = "${AUTOREV}"
+SRCREV_pn-phoneuid = "${AUTOREV}"
+SRCREV_pn-phonefsod = "${AUTOREV}"
+SRCREV_pn-libphone-ui = "${AUTOREV}"
+SRCREV_pn-libphone-ui-shr = "${AUTOREV}"
SRCREV_pn-libphone-utils = "${AUTOREV}"
-SRCREV_pn-python-phoneutils = "${AUTOREV}"
-
-
-# E17 stuff
-EFL_SRCREV = "41040"
-SRCREV_pn-python-elementary = "41040"
-SRCREV_pn-e-wm-config-illume-shr = "${AUTOREV}"
-SRCREV_pn-e-wm-sysactions-shr = "${AUTOREV}"
-SRCREV_pn-e-wm-theme-illume-shr = "${AUTOREV}"
-SRCREV_pn-e-wm-theme-illume-sixteen = "${AUTOREV}"
-SRCREV_pn-e-wm-theme-illume-niebiee = "${AUTOREV}"
-SRCREV_pn-elementary-theme-sixteen = "${AUTOREV}"
-SRCREV_pn-elementary-theme-niebiee = "${AUTOREV}"
-SRCREV_pn-e-wm-menu-shr = "${AUTOREV}"
-SRCREV_pn-e-wm-illume-dict-pl = "${AUTOREV}"
-SRCREV_pn-etk-theme-shr = "${AUTOREV}"
-SRCREV_pn-libeflvala = "${AUTOREV}"
-
-SRCREV_pn-illume-keyboard-german = "${AUTOREV}"
-SRCREV_pn-illume-keyboard-arabic = "${AUTOREV}"
-SRCREV_pn-illume-keyboard-browse = "${AUTOREV}"
-SRCREV_pn-illume-keyboard-danish = "${AUTOREV}"
-SRCREV_pn-illume-keyboard-default-alt = "${AUTOREV}"
-SRCREV_pn-illume-keyboard-dutch = "${AUTOREV}"
-SRCREV_pn-illume-keyboard-dvorak = "${AUTOREV}"
-SRCREV_pn-illume-keyboard-french = "${AUTOREV}"
-SRCREV_pn-illume-keyboard-hebrew = "${AUTOREV}"
-SRCREV_pn-illume-keyboard-numeric-alt = "${AUTOREV}"
-SRCREV_pn-illume-keyboard-russian-terminal = "${AUTOREV}"
-SRCREV_pn-illume-keyboard-russian = "${AUTOREV}"
-
-
-# Other stuff
-SRCREV_pn-bt-configure = "${AUTOREV}"
-SRCREV_pn-navit = "2309"
-SRCREV_pn-omview = "${AUTOREV}"
-SRCREV_pn-pythm = "${AUTOREV}"
-SRCREV_pn-omoney = "29"
-SRCREV_pn-enotes = "19"
-SRCREV_pn-ebrainy = "${AUTOREV}"
-SRCREV_pn-boost-signals2 = "52299"
-SRCREV_pn-dbus-c++-native = "${AUTOREV}"
-SRCREV_pn-dbus-c++ = "${AUTOREV}"
-SRCREV_pn-openmoocow = "${AUTOREV}"
-SRCREV_pn-libmokoui2 = "4695"
-SRCREV_pn-intone = "${AUTOREV}"
-SRCREV_pn-connman = "aac35324deb8c0b57f881338d87cb36b0979e7df"
-SRCREV_pn-msn-pecan = "${AUTOREV}"
-SRCREV_pn-omgps = "${AUTOREV}"
-SRCREV_pn-shr-today = "${AUTOREV}"
-SRCREV_pn-shr-launcher = "${AUTOREV}"
-SRCREV_pn-e-tasks = "${AUTOREV}"
-SRCREV_pn-mokonnect = "${AUTOREV}"
-SRCREV_pn-elmdentica = "${AUTOREV}"
-SRCREV_pn-vala-terminal = "${AUTOREV}"
-
diff --git a/conf/distro/shr.conf b/conf/distro/shr.conf
new file mode 100644
index 0000000000..e45fc07334
--- /dev/null
+++ b/conf/distro/shr.conf
@@ -0,0 +1,97 @@
+#-----------------------------------------------------------------------------
+#@TYPE: Distribution
+#@NAME: SHR
+#@DESCRIPTION: Linux Distribution Configuration for Mobile Phones
+#-----------------------------------------------------------------------------
+
+# set default locale for images - we have to do that before
+# including angstrom-2007-for-openmoko.inc because otherwise
+# it will be already set to en-gb
+IMAGE_LINGUAS ?= "en-us"
+
+# Set the toolchain type (internal, external) and brand (generic, csl etc.)
+TOOLCHAIN_TYPE ?= "internal"
+TOOLCHAIN_BRAND ?= ""
+
+#LIBC = "glibc"
+
+require conf/distro/include/preferred-xorg-versions-X11R7.5.inc
+require conf/distro/include/preferred-shr-versions.inc
+require conf/distro/include/shr-autorev.inc
+
+include conf/distro/minimal.conf
+
+#
+# Header
+#
+DISTRO_NAME = "shr"
+DISTRO_VERSION = "-${DATE}"
+DISTRO_REVISION = "2"
+DISTRO_PR = ".4"
+#DISTRO_TYPE = "release"
+DISTRO_TYPE = "debug"
+DISTRO = "shr"
+
+#Generate locales on the buildsystem instead of on the target. Speeds up first boot, set to "1" to enable
+PREFERRED_PROVIDER_qemu-native = "qemu-native"
+ENABLE_BINARY_LOCALE_GENERATION ?= "1"
+
+# We only want to build UTF8 locales
+LOCALE_UTF8_ONLY = "1"
+
+INHERIT += "testlab"
+
+CVS_TARBALL_STASH += "http://build.shr-project.org/sources/"
+
+PREMIRRORS = "(ftp|https?)$://.*/.* http://build.shr-project.org/sources/"
+
+DISTRO_FEED_PREFIX ?= "shr-dev"
+DISTRO_FEED_URI ?= "http://build.shr-project.org/shr-testing/ipk"
+
+AB_DEPLOY_EXTRA ?= ""
+DEPLOY_DIR_IMAGE = "${DEPLOY_DIR}/images/${MACHINE_ARCH}/${AB_DEPLOY_EXTRA}"
+
+IMAGE_INITSCRIPTS = "initscripts-shr"
+DISTRO_INITSCRIPTS = "initscripts-shr"
+DISTRO_DEV_MANAGER = "udev"
+
+IPKG_VARIANT = "opkg"
+
+# Same kernel so same usb
+PACKAGE_ARCH_pn-usb-gadget-mode_om-gta01 = "armv4t"
+PACKAGE_ARCH_pn-usb-gadget-mode_om-gta02 = "armv4t"
+# same kernel so same keymaps
+PACKAGE_ARCH_pn-keymaps_om-gta01 = "armv4t"
+PACKAGE_ARCH_pn-keymaps_om-gta02 = "armv4t"
+# neod knows about both machines
+PACKAGE_ARCH_pn-neod_om-gta01 = "armv4t"
+PACKAGE_ARCH_pn-neod_om-gta02 = "armv4t"
+
+PREFERRED_PROVIDER_gconf = "gconf"
+PREFERRED_PROVIDER_virtual/shr-splash-theme = "shr-splash-theme-logo"
+PREFERRED_PROVIDER_frameworkd-config = "frameworkd-config-shr"
+PREFERRED_PROVIDER_gpsd = "fso-gpsd"
+PREFERRED_PROVIDER_e-wm-menu = "e-wm-menu-shr"
+PREFERRED_PROVIDER_openmoko-alsa-scenarios = "alsa-scenarii-shr"
+PREFERRED_PROVIDER_virtual/alsa-scenarios = "alsa-scenarii-shr"
+PREFERRED_PROVIDER_libfribidi = "fribidi"
+PREFERRED_PROVIDER_bluez-libs = "bluez4"
+PREFERRED_PROVIDER_bluez-utils = "bluez4"
+PREFERRED_PROVIDER_classpath = "classpath"
+PREFERRED_PROVIDER_virtual/javac-native = "ecj-bootstrap-native"
+PREFERRED_PROVIDER_virtual/java-native = "jamvm-native"
+PREFERRED_PROVIDER_virtual/gail = "gtk+"
+PREFERRED_PROVIDER_opkg = "opkg"
+PREFERRED_PROVIDER_virtual/java-initial = "cacao-initial"
+PREFERRED_PROVIDER_atd = "atd-over-fso"
+
+# Helper to say what image we built
+SHR_VERSION_FILE = "${IMAGE_ROOTFS}/${sysconfdir}/shr-version"
+ROOTFS_POSTPROCESS_COMMAND += "OLD_PWD=$PWD; cd `dirname '${FILE_DIRNAME}'`; echo Tag Name: `git tag|tail -n 1`> ${SHR_VERSION_FILE};cd $OLD_PWD;"
+ROOTFS_POSTPROCESS_COMMAND += "OLD_PWD=$PWD; cd `dirname '${FILE_DIRNAME}'`; echo VERSION: `git-log -n1 --pretty=oneline|awk '{print $1}'` >> ${SHR_VERSION_FILE}; cd $OLD_PWD;"
+ROOTFS_POSTPROCESS_COMMAND += "OLD_PWD=$PWD; cd `dirname '${FILE_DIRNAME}'`; echo Branch: ` git branch |awk '/*/{print $2}'` >> ${SHR_VERSION_FILE}; cd $OLD_PWD;"
+ROOTFS_POSTPROCESS_COMMAND += "echo Build Host: `cat /etc/hostname` >> ${SHR_VERSION_FILE};"
+ROOTFS_POSTPROCESS_COMMAND += "echo Time Stamp: `date -R` >> ${SHR_VERSION_FILE};"
+
+#Package customization
+EXTRA_OECONF-pn_qemu += " --target-list=arm-linux-user,arm-softmmu"