diff options
| author | Marcin Juszkiewicz <hrw@openembedded.org> | 2004-11-05 22:05:51 +0000 |
|---|---|---|
| committer | Marcin Juszkiewicz <hrw@openembedded.org> | 2004-11-05 22:05:51 +0000 |
| commit | 665fec1dab60751a907be201eae05159e17d5a44 (patch) | |
| tree | 04d14b98e67c01dc8f00f8f6e74cdabee747eadf /meta | |
| parent | 763b191d632bf8ccf39ae77d54e49482fd2817c1 (diff) | |
Merge bk://openembedded@openembedded.bkbits.net/packages
into home.hrw.one.pl:/home/hrw/zaurus/oe/packages
2004/11/05 13:26:33+01:00 (none)!br1
unik-olsrd: add version script patch for libraries
2004/11/05 12:16:32+01:00 (none)!br1
nylon updates, split base, standard and extra image
2004/11/05 11:49:11+01:00 (none)!br1
added mtr 0.65
2004/11/05 11:47:07+01:00 (none)!br1
added chillispot 0.98
2004/11/05 11:42:27+01:00 (none)!br1
rrdtool: patch to build perl-modules
BKrev: 418bf93fxy3gt7AnsYZJ3xtQYZ1bmA
Diffstat (limited to 'meta')
| -rw-r--r-- | meta/nylon-feed.oe | 5 | ||||
| -rw-r--r-- | meta/nylon-image-base.oe | 28 | ||||
| -rw-r--r-- | meta/nylon-image-extra.oe | 0 | ||||
| -rw-r--r-- | meta/nylon-image-standard.oe | 0 |
4 files changed, 15 insertions, 18 deletions
diff --git a/meta/nylon-feed.oe b/meta/nylon-feed.oe index e0521f1754..49721aceb8 100644 --- a/meta/nylon-feed.oe +++ b/meta/nylon-feed.oe @@ -3,6 +3,7 @@ base-files \ bash \ bridge-utils \ busybox \ +chillispot \ db3 \ ddclient \ dhcp-forwarder \ @@ -38,6 +39,7 @@ mc \ mobilemesh \ modutils \ mtd \ +mtr \ nano \ ncurses \ netbase \ @@ -45,6 +47,7 @@ netperf \ net-snmp \ ntp \ nylon-scripts \ +nylon-statistics \ openssh \ openssl \ openvpn \ @@ -74,7 +77,7 @@ zlib \ # strace: SYS_read? # gdb-cross: install paths, sdk? # screen: sgttyb? -# nocat +# nocat? # pptp # meshroaming diff --git a/meta/nylon-image-base.oe b/meta/nylon-image-base.oe index 4f33369165..fa09de961a 100644 --- a/meta/nylon-image-base.oe +++ b/meta/nylon-image-base.oe @@ -1,29 +1,23 @@ export IMAGE_BASENAME = "nylon-base" -NYLON_COMMON = "base-files base-passwd bash busybox bridge-utils \ - dnsmasq \ - hostap-utils \ - ipkg initscripts iproute2 iptables \ - less \ - mobilemesh modutils modutils-initscripts mtd \ - nano ncurses netbase nylon-scripts \ - openssh openvpn ppp rp-pppoe \ - shorewall sysvinit \ - tcpdump timezones tinylogin \ - wireless-tools" +NYLON_BASE = "base-files base-passwd bash busybox \ + ipkg initscripts less \ + modutils modutils-initscripts mtd \ + nano ncurses netbase \ + openssh sysvinit \ + timezones tinylogin" -DEPENDS = "virtual/kernel hostap-modules ntp \ - ${NYLON_COMMON} ${BOOTSTRAP_EXTRA_DEPENDS}" +DEPENDS = "virtual/kernel \ + ${NYLON_BASE} ${BOOTSTRAP_EXTRA_DEPENDS}" RDEPENDS = "kernel modutils-depmod modutils-modinfo \ - ntpdate hostap-modules-pci \ - ${NYLON_COMMON} ${BOOTSTRAP_EXTRA_RDEPENDS}" + ${NYLON_BASE} ${BOOTSTRAP_EXTRA_RDEPENDS}" export IPKG_INSTALL = "${RDEPENDS}" IMAGE_LINGUAS = "" -inherit image_ipk - # we dont need the kernel in the image ROOTFS_POSTPROCESS_COMMAND = "rm -f ${IMAGE_ROOTFS}/tmp/zImage*" + +inherit image_ipk diff --git a/meta/nylon-image-extra.oe b/meta/nylon-image-extra.oe new file mode 100644 index 0000000000..e69de29bb2 --- /dev/null +++ b/meta/nylon-image-extra.oe diff --git a/meta/nylon-image-standard.oe b/meta/nylon-image-standard.oe new file mode 100644 index 0000000000..e69de29bb2 --- /dev/null +++ b/meta/nylon-image-standard.oe |