diff options
| author | Koen Kooi <koen@openembedded.org> | 2008-12-19 09:20:25 +0100 |
|---|---|---|
| committer | Koen Kooi <koen@openembedded.org> | 2008-12-19 09:20:25 +0100 |
| commit | 89becd13888f321e4f7e1d88165db41f86caaaf8 (patch) | |
| tree | 47c3b02c7f8de78003f446c9a5bc5b73d3f4a40c /conf/distro/openmoko.conf | |
| parent | 26102276cb26e256186d841390988460c52bde8a (diff) | |
| parent | ef5ad935d6efd350b24e141e34bf26744ca31409 (diff) | |
Merge branch 'org.openembedded.dev' of git@git.openembedded.net:openembedded into org.openembedded.dev
Diffstat (limited to 'conf/distro/openmoko.conf')
| -rw-r--r-- | conf/distro/openmoko.conf | 15 |
1 files changed, 8 insertions, 7 deletions
diff --git a/conf/distro/openmoko.conf b/conf/distro/openmoko.conf index 8caa9ecb5f..7e7aa1d022 100644 --- a/conf/distro/openmoko.conf +++ b/conf/distro/openmoko.conf @@ -18,11 +18,17 @@ DISTRO = "openmoko" OVERRIDES = "local:${MACHINE}:openmoko:angstrom:${TARGET_OS}:${TARGET_ARCH}:build-${BUILD_OS}:fail-fast:pn-${PN}" +INHERIT += "packaged-staging" + CVS_TARBALL_STASH += "http://downloads.openmoko.org/sources/" PREMIRRORS = "(ftp|https?)$://.*/.* http://downloads.openmoko.org/sources/" -ANGSTROM_FEED_CONFIGS ?= "openmoko-feed-configs" +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}" # 2.18 seems to break badly on 64-bit systems PREFERRED_VERSION_binutils ?= "2.17.50.0.12" @@ -56,8 +62,7 @@ PACKAGE_ARCH_pn-neod_om-gta01 = "${MACHINE_CLASS}" PACKAGE_ARCH_pn-neod_om-gta02 = "${MACHINE_CLASS}" # Select package versions we want to use. -PREFERRED_PROVIDER_gtk+ = "gtk+-fastscaling" -PREFERRED_VERSION_gtk+-fastscaling = "2.10.14" +PREFERRED_PROVIDER_gtk+ = "gtk+" # for jalimo PREFERRED_PROVIDER_virtual/javac-native = "ecj-bootstrap-native" @@ -81,7 +86,3 @@ 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}" |