diff options
| author | OpenEmbedded Project <openembedded-devel@lists.openembedded.org> | 2007-12-06 17:45:17 +0000 |
|---|---|---|
| committer | OpenEmbedded Project <openembedded-devel@lists.openembedded.org> | 2007-12-06 17:45:17 +0000 |
| commit | b380997b0218a154943d72856b343eb261d92935 (patch) | |
| tree | 9096707ed5e43a6b6bed3c143baa44e557a2be2a | |
| parent | 288ecdbca2d898bc6aad1d617cee9d64a365567d (diff) | |
| parent | 2076ae6e3491d28396ec6c12a3dd23da41e89639 (diff) | |
merge of '7299736bd45f29d862cdc7e7e31153ea62402566'
and 'dec04e494e7ab4322bcd6dc858d4d3689baf8a25'
| -rw-r--r-- | conf/distro/angstrom-2007.1.conf | 18 | ||||
| -rw-r--r-- | packages/tasks/task-base.bb | 2 |
2 files changed, 10 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/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 |