diff options
| author | Rolf Leggewie <oe-devel@rolf.leggewie.biz> | 2007-02-12 15:50:07 +0000 |
|---|---|---|
| committer | Rolf Leggewie <oe-devel@rolf.leggewie.biz> | 2007-02-12 15:50:07 +0000 |
| commit | 70211bf9611becd78daefde81ce10aa226aecc45 (patch) | |
| tree | 2ab7f40fb7df33cc606e5f8a35eabac650e96a35 /packages/meta | |
| parent | da18f9946b649da2a694bef91b64cb2b5dad8afe (diff) | |
| parent | 59feb2d71f1da6ef8e8d0838b382569b631d0c5e (diff) | |
merge of 'd869db4c0ac7d1350976e17e00fe6ec914dd9499'
and 'dede9079788e02b5f4efb62d0efbe5df90c32ee0'
Diffstat (limited to 'packages/meta')
| -rw-r--r-- | packages/meta/slugos-native-packages.bb | 1 | ||||
| -rw-r--r-- | packages/meta/slugos-native.bb | 1 | ||||
| -rw-r--r-- | packages/meta/slugos-packages.bb | 4 |
3 files changed, 2 insertions, 4 deletions
diff --git a/packages/meta/slugos-native-packages.bb b/packages/meta/slugos-native-packages.bb index db2ab46a3c..4505c9979c 100644 --- a/packages/meta/slugos-native-packages.bb +++ b/packages/meta/slugos-native-packages.bb @@ -2,7 +2,6 @@ DESCRIPTION = "Packages that are to be compiled natively for the SlugOS firmware" LICENSE = "MIT" PR = "r1" -PROVIDES += "${SLUGOS_DISTRO}-native-packages" INHIBIT_DEFAULT_DEPS = "1" EXCLUDE_FROM_WORLD = "1" diff --git a/packages/meta/slugos-native.bb b/packages/meta/slugos-native.bb index 9a4e17d56a..3b4023ba45 100644 --- a/packages/meta/slugos-native.bb +++ b/packages/meta/slugos-native.bb @@ -11,7 +11,6 @@ INHIBIT_DEFAULT_DEPS = "1" EXCLUDE_FROM_WORLD = "1" ALLOW_EMPTY = "1" PACKAGES = "${PN}" -PROVIDES += "${SLUGOS_DISTRO}-native" # Run-time only (RDEPENDS) stuff - no package explicitly provides # these targets. diff --git a/packages/meta/slugos-packages.bb b/packages/meta/slugos-packages.bb index 507600df32..064adaf03e 100644 --- a/packages/meta/slugos-packages.bb +++ b/packages/meta/slugos-packages.bb @@ -5,9 +5,8 @@ DESCRIPTION = "Packages that are compatible with the SlugOS firmware" HOMEPAGE = "http://www.nslu2-linux.org" LICENSE = "MIT" -PR = "r17" +PR = "r18" CONFLICTS = "db3" -PROVIDES += "${SLUGOS_DISTRO}-packages" COMPATIBLE_MACHINE = "nslu2" EXCLUDE_FROM_WORLD = "1" @@ -106,6 +105,7 @@ SLUGOS_PACKAGES = "\ make \ masqmail \ mdadm \ + mediatomb \ memtester \ mgetty \ miau \ |