diff options
author | Bruno Randolf <br1@subnet.at> | 2004-12-20 18:12:31 +0000 |
---|---|---|
committer | Bruno Randolf <br1@subnet.at> | 2004-12-20 18:12:31 +0000 |
commit | dd611438f87ba92770ef18cf5c8e9dc6dfbdbd07 (patch) | |
tree | 057c7a1c39a34b3a3ad42568b5c02cc03292aa0e /packages/meta | |
parent | eb5831bf134fd2917053bb8ebde2b9a696eb09ee (diff) |
Merge http://oe-devel@oe-devel.bkbits.net/openembedded
into null.(none):/data/mtx/oe/openembedded
2004/12/20 19:12:09+01:00 (none)!br1
rename unik-olsrd -> olsrd
BKrev: 41c7160fNmZNA3byVti3-GIavJY4_w
Diffstat (limited to 'packages/meta')
-rw-r--r-- | packages/meta/nylon-feed.bb | 2 | ||||
-rw-r--r-- | packages/meta/nylon-image-standard.bb | 4 |
2 files changed, 3 insertions, 3 deletions
diff --git a/packages/meta/nylon-feed.bb b/packages/meta/nylon-feed.bb index 63b99e3bf2..a0fd32f408 100644 --- a/packages/meta/nylon-feed.bb +++ b/packages/meta/nylon-feed.bb @@ -50,6 +50,7 @@ net-snmp \ ntp \ nylon-scripts \ nylon-statistics \ +olsrd \ openssh \ openssl \ openvpn \ @@ -70,7 +71,6 @@ sysvinit \ tcpdump \ tinc \ timezones \ -unik-olsrd \ usbutils \ vtun \ wireless-tools \ diff --git a/packages/meta/nylon-image-standard.bb b/packages/meta/nylon-image-standard.bb index 65599af776..1cd0853678 100644 --- a/packages/meta/nylon-image-standard.bb +++ b/packages/meta/nylon-image-standard.bb @@ -10,13 +10,13 @@ NYLON_STANDARD = "\ ifplugd iproute2 iptables \ mobilemesh \ nylon-scripts \ + olsrd \ ppp pciutils \ rp-pppoe \ shorewall \ tcpdump \ usbutils \ - wireless-tools \ - unik-olsrd" + wireless-tools" DEPENDS += "hostap-modules ntp \ ${NYLON_STANDARD}" |