summaryrefslogtreecommitdiff
path: root/conf/distro/openmoko.conf
diff options
context:
space:
mode:
Diffstat (limited to 'conf/distro/openmoko.conf')
-rw-r--r--conf/distro/openmoko.conf67
1 files changed, 38 insertions, 29 deletions
diff --git a/conf/distro/openmoko.conf b/conf/distro/openmoko.conf
index 8caa9ecb5f..81d7075fc1 100644
--- a/conf/distro/openmoko.conf
+++ b/conf/distro/openmoko.conf
@@ -18,21 +18,38 @@ DISTRO = "openmoko"
OVERRIDES = "local:${MACHINE}:openmoko:angstrom:${TARGET_OS}:${TARGET_ARCH}:build-${BUILD_OS}:fail-fast:pn-${PN}"
-CVS_TARBALL_STASH += "http://downloads.openmoko.org/sources/"
+LIBC = "glibc"
+require conf/distro/include/${LIBC}.inc
-PREMIRRORS = "(ftp|https?)$://.*/.* http://downloads.openmoko.org/sources/"
+INHERIT += "packaged-staging"
-ANGSTROM_FEED_CONFIGS ?= "openmoko-feed-configs"
+CVS_TARBALL_STASH += "http://downloads.openmoko.org/developer/sources/"
+
+PREMIRRORS = "(ftp|https?)$://.*/.* http://downloads.openmoko.org/developer/sources/"
+
+DISTRO_FEED_PREFIX ?= "om-dev"
+DISTRO_FEED_URI ?= "http://downloads.openmoko.org/repository/testing"
+
+AB_DEPLOY_EXTRA ?= ""
+DEPLOY_DIR_IMAGE = "${DEPLOY_DIR}/images/${MACHINE_ARCH}/${AB_DEPLOY_EXTRA}"
+
+IMAGE_INITSCRIPTS = "initscripts-openmoko"
+
+# We try to minimize the distro features in the default image.
+DISTRO_FEATURES = "wifi ppp alsa ext2 vfat usbhost"
+
+# Some features (bluetooth, usbgadget) include packages we do not like.
+# Pick some of the packages manually.
+DISTRO_EXTRA_RDEPENDS += " \
+ bluez4 \
+ kernel-module-g-ether \
+ "
# 2.18 seems to break badly on 64-bit systems
PREFERRED_VERSION_binutils ?= "2.17.50.0.12"
PREFERRED_VERSION_binutils-cross ?= "2.17.50.0.12"
-# we want the openmoko svn version of gsmd
-PREFERRED_PROVIDER_libgsmd = "libgsmd"
-
# Bleeding-edge developers should add the following lines to their local.conf:
-# require conf/distro/include/moko-autorev.inc
# require conf/distro/include/fso-autorev.inc
# override the PACKAGE_ARCH of certain packages for openmoko distro
@@ -40,24 +57,25 @@ PREFERRED_PROVIDER_libgsmd = "libgsmd"
# Same kernel used to run on both these machines...
# Currently not used but left here in case someone wants to switch on
# quickly
-#PACKAGE_ARCH_pn-linux-openmoko_om-gta01 = "${MACHINE_CLASS}"
-#PACKAGE_ARCH_pn-linux-openmoko_om-gta02 = "${MACHINE_CLASS}"
-#PACKAGE_ARCH_pn-linux-openmoko-devel_om-gta01 = "${MACHINE_CLASS}"
-#PACKAGE_ARCH_pn-linux-openmoko-devel_om-gta02 = "${MACHINE_CLASS}"
+#PACKAGE_ARCH_pn-linux-openmoko_om-gta01 = "armv4t"
+#PACKAGE_ARCH_pn-linux-openmoko_om-gta02 = "armv4t"
+#PACKAGE_ARCH_pn-linux-openmoko-devel_om-gta01 = "armv4t"
+#PACKAGE_ARCH_pn-linux-openmoko-devel_om-gta02 = "armv4t"
# Same kernel so same usb
-PACKAGE_ARCH_pn-usb-gadget-mode_om-gta01 = "${MACHINE_CLASS}"
-PACKAGE_ARCH_pn-usb-gadget-mode_om-gta02 = "${MACHINE_CLASS}"
+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 = "${MACHINE_CLASS}"
-PACKAGE_ARCH_pn-keymaps_om-gta02 = "${MACHINE_CLASS}"
+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 = "${MACHINE_CLASS}"
-PACKAGE_ARCH_pn-neod_om-gta02 = "${MACHINE_CLASS}"
+PACKAGE_ARCH_pn-neod_om-gta01 = "armv4t"
+PACKAGE_ARCH_pn-neod_om-gta02 = "armv4t"
-# Select package versions we want to use.
-PREFERRED_PROVIDER_gtk+ = "gtk+-fastscaling"
-PREFERRED_VERSION_gtk+-fastscaling = "2.10.14"
+# Select package providers
+PREFERRED_PROVIDER_gtk+ = "gtk+"
+PREFERRED_PROVIDER_opkg = "opkg"
+PREFERRED_PROVIDER_libgsmd = "libgsmd"
# for jalimo
PREFERRED_PROVIDER_virtual/javac-native = "ecj-bootstrap-native"
@@ -76,12 +94,3 @@ ROOTFS_POSTPROCESS_COMMAND += "OLD_PWD=$PWD; cd `dirname '${FILE_DIRNAME}'`; ech
ROOTFS_POSTPROCESS_COMMAND += "OLD_PWD=$PWD; cd `dirname '${FILE_DIRNAME}'`; echo Branch: ` git branch |awk '/*/{print $2}'` >> ${OM_VERSION_FILE}; cd $OLD_PWD;"
ROOTFS_POSTPROCESS_COMMAND += "echo Build Host: `cat /etc/hostname` >> ${OM_VERSION_FILE};"
ROOTFS_POSTPROCESS_COMMAND += "echo Time Stamp: `date -R` >> ${OM_VERSION_FILE};"
-
-
-
-# opkg
-PREFERRED_PROVIDER_opkg = "opkg"
-
-# deploy gta01 and gta02 in ${MACHINE_CLASS} directory
-DEPLOY_DIR_IMAGE_om-gta01 = "${DEPLOY_DIR}/images/${MACHINE_CLASS}"
-DEPLOY_DIR_IMAGE_om-gta02 = "${DEPLOY_DIR}/images/${MACHINE_CLASS}"