familiar-feeds.inc: use familiar.handhelds.org as base uri again.

[familiar-h63xx-build.git] / org.handhelds.familiar / conf / distro / familiar-feeds.inc

diff --git a/org.handhelds.familiar/conf/distro/familiar-feeds.inc b/org.handhelds.familiar/conf/distro/familiar-feeds.inc
index 411c97e742ef4c8649aa42ef2bf3bbb69646054d..18948dcf607f09ff53772aa44f4639eeb9d683e3 100644 (file)
--- a/org.handhelds.familiar/conf/distro/familiar-feeds.inc
+++ b/org.handhelds.familiar/conf/distro/familiar-feeds.inc
@@ -1,24 +1,16 @@
-DISTRO_FEED_PREFIX = "http://ftp.handhelds.org/distributions/familiar/releases/${DISTRO_VERSION}/feed"
+DISTRO_FEEDS_PREFIX = "http://familiar.handhelds.org/releases/${DISTRO_VERSION}"
 
-DISTRO_FEEDS_prepend () {
-# Familiar ${DISTRO_VERSION} feeds
+DISTRO_FEEDS_COLLECTIONS = "feed universe"
+DISTRO_FEEDS_COLLECTION_DESC_feed = "Familiar ${DISTRO_VERSION} feeds"
+DISTRO_FEEDS_COLLECTION_DESC_universe = "Familiar ${DISTRO_VERSION} universe feeds"
 
-# base - essential packages
-src/gz base ${DISTRO_FEED_PREFIX}/base
-src/gz base-${MACHINE} ${DISTRO_FEED_PREFIX}/base/machine/${MACHINE}
+# opie and gpe images append to this
+DISTRO_FEEDS_IN_feed = "base updates common"
+DISTRO_FEEDS_IN_universe = "common"
 
-# updates - security and bugfix updates go in this feed
-src/gz updates ${DISTRO_FEED_PREFIX}/updates
-src/gz updates-${MACHINE} ${DISTRO_FEED_PREFIX}/updates/machine/${MACHINE}
+DISTRO_FEEDS_FEED_DESC_base = "essential packages"
+DISTRO_FEEDS_FEED_DESC_updates = "security updates"
+DISTRO_FEEDS_FEED_DESC_common = "additional packages not specific to any graphical environment"
+DISTRO_FEEDS_FEED_DESC_x11 = "additional packages specific to the x11 graphical environment"
+DISTRO_FEEDS_FEED_DESC_opie = "additional packages specific to the opie graphical environment"
 
-# common - additional packages not specific to any graphical environment
-src/gz common ${DISTRO_FEED_PREFIX}/common
-src/gz common-${MACHINE} ${DISTRO_FEED_PREFIX}/common/machine/${MACHINE}
-}
-
-DISTRO_LOCALE_FEEDS_PREFIXES = "${DISTRO_FEED_PREFIX}/base ${DISTRO_FEED_PREFIX}/updates ${DISTRO_FEED_PREFIX}/common"
-
-DISTRO_LOCALE_FEEDS_HEADER_prepend () {
-# Familiar ${DISTRO_VERSION} locale feeds
-
-}