[oe-commits] org.oe.dev angstrom-2008.1.conf: sync with 2007.1 changes

[pH5 commit]

angstrom-2008.1.conf: sync with 2007.1 changes
* update to packaged feed configuration
* handhelds.org kernel update to hh19

Author: pH5 at openembedded.org
Branch: org.openembedded.dev
Revision: 2c6d0b83f23027006f7d02dcdf375f45dbd5300f
ViewMTN: http://monotone.openembedded.org/revision/info/2c6d0b83f23027006f7d02dcdf375f45dbd5300f
Files:
1
conf/distro/angstrom-2008.1.conf
Diffs:

#
# mt diff -r1d90679b945127361a4677733c372c992d2034f9 -r2c6d0b83f23027006f7d02dcdf375f45dbd5300f
#
# 
# 
# patch "conf/distro/angstrom-2008.1.conf"
#  from [48eeeef2da4e7f0a0dd6bb78271647732c326f66]
#    to [71653d68abac9cadecd9c4f46a1cfadaff2d3f11]
# 
============================================================
--- conf/distro/angstrom-2008.1.conf	48eeeef2da4e7f0a0dd6bb78271647732c326f66
+++ conf/distro/angstrom-2008.1.conf	71653d68abac9cadecd9c4f46a1cfadaff2d3f11
@@ -35,14 +35,6 @@ IMAGE_LINGUAS = '${@base_less_or_equal("
 # Also, it appears that no locales fit in 16Mb for now. "C" locale rules!
 IMAGE_LINGUAS = '${@base_less_or_equal("ROOT_FLASH_SIZE", "16", "", "en-gb", d)}'
 
-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}"
 
 # set feed path variables
 FEED_BASEPATH = "feeds/2008/${ANGSTROM_PKG_FORMAT}/${ANGSTROM_MODE}/"
@@ -61,7 +53,7 @@ PCMCIA_MANAGER = "pcmciautils"
 PCMCIA_MANAGER = "pcmciautils"
 
 #Preferred version for the kernel on various machines
-PREFERRED_VERSION_linux-handhelds-2.6 ?= "2.6.21-hh18"
+PREFERRED_VERSION_linux-handhelds-2.6 ?= "2.6.21-hh19"
 
 #This is unrelated to the kernel version, but userspace apps (e.g. HAL) require a recent version to build against
 PREFERRED_VERSION_linux-libc-headers 	= "2.6.23"
@@ -182,7 +174,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 \
     ${DEBUG_APPS} \
     "