diff options
| author |   Marcin Juszkiewicz <hrw@openembedded.org> | 2004-10-26 06:44:28 +0000 |
|---|---|---|
| committer | Marcin Juszkiewicz <hrw@openembedded.org> | 2004-10-26 06:44:28 +0000 |
| commit | 660e281cd2e2ebb81d8566219b0ec42846761446 (patch) | |
| tree | f4dab6608f2fe0da95512b87e4ccbaab371c0ddb | |
| parent | 6583122828372dafd5e2c614358f23d925e2de6c (diff) | |
| download | openembedded-660e281cd2e2ebb81d8566219b0ec42846761446.tar.gz | |
Merge bk://openembedded@openembedded.bkbits.net/packages
into home.hrw.one.pl:/home/hrw/zaurus/oe/packages
2004/10/25 19:32:24+02:00 (none)!br1
added htb-init to nylon-feed
2004/10/25 19:31:00+02:00 (none)!br1
htb-init added: configure HTB traffic shaping
2004/10/25 19:30:08+02:00 (none)!br1
iproute2: use /sbin
2004/10/25 18:21:55+02:00 (none)!br1
Merge bk://openembedded@openembedded.bkbits.net/packages
into null.(none):/data/mtx/oe/oe.write/packages
2004/10/23 16:46:19+02:00 (none)!br1
nylon-feed: dont use split_ipk_feeds, make index
2004/10/23 16:45:37+02:00 (none)!br1
base-files: fixed hostname
BKrev: 417df24cuj6iXCmlI08J7NJ8U1XglQ
| -rw-r--r-- | base-files/base-files_3.0.14.oe | 2 | ||||
| -rw-r--r-- | htb-init/htb-init-0.8.5/htb-basic-verbose.diff | 0 | ||||
| -rw-r--r-- | htb-init/htb-init-0.8.5/htb.init+ingress+predef+verbose.diff | 0 | ||||
| -rw-r--r-- | htb-init/htb-init_0.8.5.oe | 0 | ||||
| -rw-r--r-- | iproute2/iproute2_2.6.8.oe | 4 | ||||
| -rw-r--r-- | meta/nylon-feed.oe | 12 |
6 files changed, 9 insertions, 9 deletions
diff --git a/base-files/base-files_3.0.14.oe b/base-files/base-files_3.0.14.oe index 5ca5958053..26cfa0f6e2 100644 --- a/base-files/base-files_3.0.14.oe +++ b/base-files/base-files_3.0.14.oe @@ -56,7 +56,7 @@ do_install () { install -m 2755 -d ${D}/$d done - if [ -z "${MACHINE}" -a "${hostname}" == "openembedded" ]; then + if [ -n "${MACHINE}" -a "${hostname}" == "openembedded" ]; then echo ${MACHINE} > ${D}/${sysconfdir}/hostname else echo ${hostname} > ${D}/${sysconfdir}/hostname diff --git a/htb-init/htb-init-0.8.5/htb-basic-verbose.diff b/htb-init/htb-init-0.8.5/htb-basic-verbose.diff new file mode 100644 index 0000000000..e69de29bb2 --- /dev/null +++ b/htb-init/htb-init-0.8.5/htb-basic-verbose.diff diff --git a/htb-init/htb-init-0.8.5/htb.init+ingress+predef+verbose.diff b/htb-init/htb-init-0.8.5/htb.init+ingress+predef+verbose.diff new file mode 100644 index 0000000000..e69de29bb2 --- /dev/null +++ b/htb-init/htb-init-0.8.5/htb.init+ingress+predef+verbose.diff diff --git a/htb-init/htb-init_0.8.5.oe b/htb-init/htb-init_0.8.5.oe new file mode 100644 index 0000000000..e69de29bb2 --- /dev/null +++ b/htb-init/htb-init_0.8.5.oe diff --git a/iproute2/iproute2_2.6.8.oe b/iproute2/iproute2_2.6.8.oe index fc0892d9a1..982458d0dc 100644 --- a/iproute2/iproute2_2.6.8.oe +++ b/iproute2/iproute2_2.6.8.oe @@ -3,8 +3,10 @@ DESCRIPTION = "kernel routing and traffic control utilities" SRC_URI="http://developer.osdl.org/dev/iproute2/download/iproute2-2.6.8-ss040730.tar.gz \ file://iproute2-2.6.8_no_strip.diff;patch=1;pnum=0" + +PR="r1" -EXTRA_OEMAKE = "CC='${CC}' KERNEL_INCLUDE=${STAGING_KERNEL_DIR}/include DOCDIR=/usr/share/doc/iproute2 SUBDIRS='lib tc ip'" +EXTRA_OEMAKE = "CC='${CC}' KERNEL_INCLUDE=${STAGING_KERNEL_DIR}/include DOCDIR=/usr/share/doc/iproute2 SUBDIRS='lib tc ip' SBINDIR=/sbin" do_install () { oe_runmake DESTDIR=${D} install diff --git a/meta/nylon-feed.oe b/meta/nylon-feed.oe index 87b868c714..1dd1bc593d 100644 --- a/meta/nylon-feed.oe +++ b/meta/nylon-feed.oe @@ -18,6 +18,7 @@ hostap-modules \ hostap-utils \ hostap-daemon \ hotplug \ +htb-init \ initscripts \ iperf \ ipkg \ @@ -75,15 +76,12 @@ zlib \ # snmp # mrtg # ipac-ng -# dyndns: http://ez-ipupdate.com/ # pptp # meshroaming -# egrep -i Pattern matched against "$Section $Package-Name" -export FEED_PATTERN = "^locale-|^glibc-|^net|^libs|^base" -export FEED_NAME = "nylon-${MACHINE}" +do_index() { + ipkg-make-index -r ${DEPLOY_DIR_IPK}/Packages -p ${DEPLOY_DIR_IPK}/Packages -l ${DEPLOY_DIR_IPK}/Packages.filelist -m ${DEPLOY_DIR_IPK} +} -# egrep -i regexp matching package name -export EXCLUDE_FROM_FEED = "" +addtask index before do_build after do_install -inherit split_ipk_feeds |