diff options
| author | Paul Sokolovsky <pmiscml@gmail.com> | 2007-02-18 09:15:16 +0000 |
|---|---|---|
| committer | Paul Sokolovsky <pmiscml@gmail.com> | 2007-02-18 09:15:16 +0000 |
| commit | 216d5f022fa56d81d52118945476a6b9acce0132 (patch) | |
| tree | f4d5ba584865e9f3823f15a2ee6a3e673c64e573 /packages/meta | |
| parent | 17b59827785d3f488a9b72d9c9a6d51ba5c933c4 (diff) | |
| parent | 9c9415a87de6a1cf058b99d304b31c78e4f31438 (diff) | |
merge of '8cde5e5064761c45e322d841a3b3313245cb264a'
and 'd6f1925c439f5b0608c0189c89b17a335f9fbbb6'
Diffstat (limited to 'packages/meta')
| -rw-r--r-- | packages/meta/slugos-native.bb | 1 | ||||
| -rw-r--r-- | packages/meta/slugos-packages.bb | 11 |
2 files changed, 6 insertions, 6 deletions
diff --git a/packages/meta/slugos-native.bb b/packages/meta/slugos-native.bb index d8e8ee96bb..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_IMAGENAME}-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 01a79a8e75..ecb296324c 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 = "r19" CONFLICTS = "db3" -PROVIDES += "${SLUGOS_IMAGENAME}-packages" COMPATIBLE_MACHINE = "nslu2" EXCLUDE_FROM_WORLD = "1" @@ -45,6 +44,7 @@ SLUGOS_PACKAGES = "\ cron \ ctorrent \ cvs \ + cyrus-imapd \ cyrus-sasl \ db \ devlabel \ @@ -106,6 +106,7 @@ SLUGOS_PACKAGES = "\ make \ masqmail \ mdadm \ + mediatomb \ memtester \ mgetty \ miau \ @@ -123,6 +124,8 @@ SLUGOS_PACKAGES = "\ netcat \ nmap \ ntp \ + obexftp \ + obexpush \ openobex-apps \ openldap \ openntpd \ @@ -136,7 +139,6 @@ SLUGOS_PACKAGES = "\ pkgconfig \ ppp \ procps \ - pvrusb2-mci \ python \ quilt \ reiserfsprogs reiser4progs \ @@ -179,13 +181,12 @@ SLUGOS_BROKEN_PACKAGES = "\ irssi \ libgphoto2 \ netpbm \ - obexftp \ puppy \ + pvrusb2-mci \ qc-usb-messenger \ sane-backends \ unionfs-modules \ unionfs-utils \ - cyrus-imapd \ lirc \ pwc \ zd1211 \ |