From 22fc8de2e65f5f1969e33b9199748438e24869ee Mon Sep 17 00:00:00 2001
From: Koen Kooi <koen@openembedded.org>
Date: Thu, 6 Dec 2007 17:06:12 +0000
Subject: angstrom 2007: put feeds under package management

---
 conf/distro/angstrom-2007.1.conf | 18 +++++++++---------
 1 file changed, 9 insertions(+), 9 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} \
-- 
cgit v1.2.3


From 2076ae6e3491d28396ec6c12a3dd23da41e89639 Mon Sep 17 00:00:00 2001
From: Koen Kooi <koen@openembedded.org>
Date: Thu, 6 Dec 2007 17:07:12 +0000
Subject: task-base: bump PR for angstrom DISTRO_EXTRA_REDEPENDS change

---
 packages/tasks/task-base.bb | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/packages/tasks/task-base.bb b/packages/tasks/task-base.bb
index bfb673293d..03a3fd35b3 100644
--- a/packages/tasks/task-base.bb
+++ b/packages/tasks/task-base.bb
@@ -1,5 +1,5 @@
 DESCRIPTION = "Merge machine and distro options to create a basic machine task/package"
-PR = "r47"
+PR = "r48"
 
 inherit task
 
-- 
cgit v1.2.3