summaryrefslogtreecommitdiff
path: root/conf
diff options
context:
space:
mode:
Diffstat (limited to 'conf')
-rw-r--r--conf/distro/angstrom-2007.1.conf18
-rw-r--r--conf/distro/include/angstrom.inc3
-rw-r--r--conf/distro/include/sane-srcdates.inc6
3 files changed, 17 insertions, 10 deletions
diff --git a/conf/distro/angstrom-2007.1.conf b/conf/distro/angstrom-2007.1.conf
index 0e4285f633..4e187a6887 100644
--- a/conf/distro/angstrom-2007.1.conf
+++ b/conf/distro/angstrom-2007.1.conf
@@ -30,14 +30,14 @@ DISTRO_TYPE ?= "debug"
IMAGE_LINGUAS = '${@base_less_or_equal("ROOT_FLASH_SIZE", "16", "", "en-gb", d)}'
# These will be put under package management soon
-FEED_URIS += " \
- no-arch##${ANGSTROM_URI}/unstable/feed/all \
- base##${ANGSTROM_URI}/unstable/feed/${FEED_ARCH}/base \
- perl##${ANGSTROM_URI}/unstable/feed/${FEED_ARCH}/perl \
- python##${ANGSTROM_URI}/unstable/feed/${FEED_ARCH}/python \
- debug##${ANGSTROM_URI}/unstable/feed/${FEED_ARCH}/debug \
- gstreamer##${ANGSTROM_URI}/unstable/feed/${FEED_ARCH}/gstreamer \
- ${MACHINE}##${ANGSTROM_URI}/unstable/feed/${FEED_ARCH}/machine/${MACHINE}"
+#FEED_URIS += " \
+# no-arch##${ANGSTROM_URI}/unstable/feed/all \
+# base##${ANGSTROM_URI}/unstable/feed/${FEED_ARCH}/base \
+# perl##${ANGSTROM_URI}/unstable/feed/${FEED_ARCH}/perl \
+# python##${ANGSTROM_URI}/unstable/feed/${FEED_ARCH}/python \
+# debug##${ANGSTROM_URI}/unstable/feed/${FEED_ARCH}/debug \
+# gstreamer##${ANGSTROM_URI}/unstable/feed/${FEED_ARCH}/gstreamer \
+# ${MACHINE}##${ANGSTROM_URI}/unstable/feed/${FEED_ARCH}/machine/${MACHINE}"
# base##${ANGSTROM_URI}/releases/${DISTRO_VERSION}/feed/${FEED_ARCH}/base \
# ${MACHINE}##${ANGSTROM_URI}/releases/${DISTRO_VERSION}/feed/${FEED_ARCH}/machine/${MACHINE} \
# updates##${ANGSTROM_URI}/releases/${DISTRO_VERSION}/feed/${FEED_ARCH}/updates"
@@ -237,7 +237,7 @@ DISTRO_EXTRA_RDEPENDS += "\
update-modules \
${@base_contains("MACHINE_FEATURES", "screen", "psplash", "",d)} \
angstrom-version \
- ipkg ipkg-collateral \
+ ipkg ipkg-collateral angstrom-feed-configs \
util-linux-mount util-linux-umount \
${EXTRA_STUFF} \
${DEBUG_APPS} \
diff --git a/conf/distro/include/angstrom.inc b/conf/distro/include/angstrom.inc
index 85c0d9d128..510a752211 100644
--- a/conf/distro/include/angstrom.inc
+++ b/conf/distro/include/angstrom.inc
@@ -35,6 +35,9 @@ require conf/distro/include/angstrom-package-${ANGSTROM_PKG_FORMAT}.inc
PREFERRED_PROVIDER_qemu-native = "qemu-native"
ENABLE_BINARY_LOCALE_GENERATION ?= "1"
+# We only want to build UTF8 locales
+LOCALE_UTF8_ONLY = "1"
+
#qemu doesn't like armv6/eabi/vfp
ENABLE_BINARY_LOCALE_GENERATION_mx31ads = "0"
ENABLE_BINARY_LOCALE_GENERATION_nokia800 = "0"
diff --git a/conf/distro/include/sane-srcdates.inc b/conf/distro/include/sane-srcdates.inc
index ccd458da89..4d9509fc15 100644
--- a/conf/distro/include/sane-srcdates.inc
+++ b/conf/distro/include/sane-srcdates.inc
@@ -53,7 +53,7 @@ SRCDATE_gtkhtml2 ?= "20060323"
# Enlightenment Foundation Libraries
# Caution: This is not alphabetically, but (roughly) dependency-sorted.
# Please leave it like that.
-EFL_SRCDATE = "20070819"
+EFL_SRCDATE = "20071206"
SRCDATE_edb-native ?= "${EFL_SRCDATE}"
SRCDATE_edb ?= "${EFL_SRCDATE}"
SRCDATE_eet-native ?= "${EFL_SRCDATE}"
@@ -89,6 +89,7 @@ SRCDATE_python-evas ?= "${EFL_SRCDATE}"
SRCDATE_python-ecore ?= "${EFL_SRCDATE}"
SRCDATE_python-edje ?= "${EFL_SRCDATE}"
SRCDATE_python-emotion ?= "${EFL_SRCDATE}"
+SRCDATE_python-epsilon ?= "${EFL_SRCDATE}"
SRCDATE_python-ewl ?= "${EFL_SRCDATE}"
SRCDATE_python-etk ?= "${EFL_SRCDATE}"
@@ -102,8 +103,11 @@ SRCDATE_exhibit ?= "${EFL_SRCDATE}"
SRCDATE_expedite ?= "${EFL_SRCDATE}"
SRCDATE_elitaire ?= "${EFL_SRCDATE}"
SRCDATE_entice ?= "${EFL_SRCDATE}"
+SRCDATE_entrance ?= "${EFL_SRCDATE}"
SRCDATE_e-utils ?= "${EFL_SRCDATE}"
+SRCDATE_e-wm ?= "${EFL_SRCDATE}"
SRCDATE_enna ?= "${EFL_SRCDATE}"
+SRCDATE_exquisite ?= "${EFL_SRCDATE}"
# Misc packages, sorted by alphabet
SRCDATE_avetanabt ?= "20060814"