angstrom: fix FEED URIs

diff --git a/conf/distro/angstrom-2007.1.conf b/conf/distro/angstrom-2007.1.conf
index aae3677..91b2729 100644 (file)
--- a/conf/distro/angstrom-2007.1.conf
+++ b/conf/distro/angstrom-2007.1.conf
@@ -8,7 +8,7 @@
 
 #DISTRO_VERSION = "2007.1"
 DISTRO_VERSION = "test-${DATE}"
-DISTRO_REVISION = "5"
+DISTRO_REVISION = "6"
 
 require conf/distro/include/angstrom.inc
 require conf/distro/include/sane-srcdates.inc
@@ -16,19 +16,51 @@ require conf/distro/include/sane-srcdates.inc
 DISTRO_TYPE = "debug"
 #DISTRO_TYPE = "release"
 
+#Set the right arch for the feeds
+#Alphabetically sorted
+
+FEED_ARCH ?= ${TARGET_ARCH} 
+
+#armv4t machines
+
+FEED_ARCH_ep93xx       = "armv4t"
+
+#armv5t machines
+
+FEED_ARCH_a780                 = "armv5te"
+FEED_ARCH_akita                = "armv5te"
+FEED_ARCH_c7x0         = "armv5te"
+FEED_ARCH_h2200                = "armv5te"
+FEED_ARCH_h4000                = "armv5te"
+FEED_ARCH_h5xxx                = "armv5te"
+FEED_ARCH_htcuniversal         = "armv5te"
+FEED_ARCH_hx2000       = "armv5te"
+FEED_ARCH_hx4700       = "armv5te"
+FEED_ARCH_netbook-pro  = "armv5te"
+FEED_ARCH_nokia770     = "armv5te"
+FEED_ARCH_poodle       = "armv5te"
+FEED_ARCH_spitz                = "armv5te"
+FEED_ARCH_tosa         = "armv5te"
+
+#i686 machines
+
+FEED_ARCH_guinness     = "i686"
+
 FEED_URIS += " \
                no-arch##${ANGSTROM_URI}/unstable/feed/all \
-               base##${ANGSTROM_URI}/unstable/feed/${TARGET_ARCH}/base \
-               perl##${ANGSTROM_URI}/unstable/feed/${TARGET_ARCH}/perl \
-               python##${ANGSTROM_URI}/unstable/feed/${TARGET_ARCH}/python \
-               debug##${ANGSTROM_URI}/unstable/feed/${TARGET_ARCH}/debug \
-               ${MACHINE}##${ANGSTROM_URI}/unstable/feed/${TARGET_ARCH}/machine/${MACHINE}"
-#        base##${ANGSTROM_URI}/releases/${DISTRO_VERSION}/feed/${TARGET_ARCH}/base \
-#        ${MACHINE}##${ANGSTROM_URI}/releases/${DISTRO_VERSION}/feed/${TARGET_ARCH}/machine/${MACHINE} \
-#        updates##${ANGSTROM_URI}/releases/${DISTRO_VERSION}/feed/${TARGET_ARCH}/updates"
-
-#SRCDATE = "20060630"
-#SRCDATE_linux-handhelds-2.6 = "20060622"
+               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 \
+               ${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"
+
+
+# We will lock down a SRCDATE when we go into release mode
+#SRCDATE = "20061029"
+
 PREFERRED_VERSION_linux-handhelds-2.6 = "2.6.16-hh7"
 PREFERRED_VERSION_linux-handhelds-2.6_htcuniversal = "2.6.17-hh1+cvs${SRCDATE}"