From: Khem Raj <raj.khem@gmail.com>
To: openembedded-devel@lists.openembedded.org
Subject: [meta-oe][PATCH V2 10/25] tcpdump: Upgrade from 4.1.1 -> 4.3.0
Date: Sun, 6 Jan 2013 01:12:33 -0800 [thread overview]
Message-ID: <1357463568-26241-10-git-send-email-raj.khem@gmail.com> (raw)
In-Reply-To: <1357463568-26241-1-git-send-email-raj.khem@gmail.com>
Signed-off-by: Khem Raj <raj.khem@gmail.com>
---
.../0001-minimal-IEEE802.15.4-allowed.patch | 0
.../configure.patch | 0
.../ipv6-cross.patch | 0
.../tcpdump_configure_no_-O2.patch | 0
.../tcpdump/{tcpdump_4.1.1.bb => tcpdump_4.3.0.bb} | 32 +++++++++++---------
5 files changed, 17 insertions(+), 15 deletions(-)
rename meta-oe/recipes-support/tcpdump/{tcpdump-4.1.1 => tcpdump-4.3.0}/0001-minimal-IEEE802.15.4-allowed.patch (100%)
rename meta-oe/recipes-support/tcpdump/{tcpdump-4.1.1 => tcpdump-4.3.0}/configure.patch (100%)
rename meta-oe/recipes-support/tcpdump/{tcpdump-4.1.1 => tcpdump-4.3.0}/ipv6-cross.patch (100%)
rename meta-oe/recipes-support/tcpdump/{tcpdump-4.1.1 => tcpdump-4.3.0}/tcpdump_configure_no_-O2.patch (100%)
rename meta-oe/recipes-support/tcpdump/{tcpdump_4.1.1.bb => tcpdump_4.3.0.bb} (55%)
diff --git a/meta-oe/recipes-support/tcpdump/tcpdump-4.1.1/0001-minimal-IEEE802.15.4-allowed.patch b/meta-oe/recipes-support/tcpdump/tcpdump-4.3.0/0001-minimal-IEEE802.15.4-allowed.patch
similarity index 100%
rename from meta-oe/recipes-support/tcpdump/tcpdump-4.1.1/0001-minimal-IEEE802.15.4-allowed.patch
rename to meta-oe/recipes-support/tcpdump/tcpdump-4.3.0/0001-minimal-IEEE802.15.4-allowed.patch
diff --git a/meta-oe/recipes-support/tcpdump/tcpdump-4.1.1/configure.patch b/meta-oe/recipes-support/tcpdump/tcpdump-4.3.0/configure.patch
similarity index 100%
rename from meta-oe/recipes-support/tcpdump/tcpdump-4.1.1/configure.patch
rename to meta-oe/recipes-support/tcpdump/tcpdump-4.3.0/configure.patch
diff --git a/meta-oe/recipes-support/tcpdump/tcpdump-4.1.1/ipv6-cross.patch b/meta-oe/recipes-support/tcpdump/tcpdump-4.3.0/ipv6-cross.patch
similarity index 100%
rename from meta-oe/recipes-support/tcpdump/tcpdump-4.1.1/ipv6-cross.patch
rename to meta-oe/recipes-support/tcpdump/tcpdump-4.3.0/ipv6-cross.patch
diff --git a/meta-oe/recipes-support/tcpdump/tcpdump-4.1.1/tcpdump_configure_no_-O2.patch b/meta-oe/recipes-support/tcpdump/tcpdump-4.3.0/tcpdump_configure_no_-O2.patch
similarity index 100%
rename from meta-oe/recipes-support/tcpdump/tcpdump-4.1.1/tcpdump_configure_no_-O2.patch
rename to meta-oe/recipes-support/tcpdump/tcpdump-4.3.0/tcpdump_configure_no_-O2.patch
diff --git a/meta-oe/recipes-support/tcpdump/tcpdump_4.1.1.bb b/meta-oe/recipes-support/tcpdump/tcpdump_4.3.0.bb
similarity index 55%
rename from meta-oe/recipes-support/tcpdump/tcpdump_4.1.1.bb
rename to meta-oe/recipes-support/tcpdump/tcpdump_4.3.0.bb
index 46b19a1..d3ca24f 100644
--- a/meta-oe/recipes-support/tcpdump/tcpdump_4.1.1.bb
+++ b/meta-oe/recipes-support/tcpdump/tcpdump_4.3.0.bb
@@ -4,7 +4,6 @@ LICENSE = "BSD"
LIC_FILES_CHKSUM = "file://LICENSE;md5=1d4b0366557951c84a94fabe3529f867"
SECTION = "console/network"
DEPENDS = "libpcap"
-PR = "r2"
SRC_URI = " \
http://www.tcpdump.org/release/tcpdump-${PV}.tar.gz \
@@ -13,29 +12,32 @@ SRC_URI = " \
file://ipv6-cross.patch \
file://configure.patch \
"
+SRC_URI[md5sum] = "a3fe4d30ac85ff5467c889ff46b7e1e8"
+SRC_URI[sha256sum] = "efd08b610210d39977ec3175fa82dad9fbd33587930081be2a905a712dba4286"
inherit autotools
-# ac_cv_linux_vers=${ac_cv_linux_vers=2}
+CACHED_CONFIGUREVARS = "ac_cv_linux_vers=${ac_cv_linux_vers=2}"
-EXTRA_OECONF = "--without-crypto \
+EXTRA_OECONF = "--without-crypto --disable-rpath \
${@base_contains('DISTRO_FEATURES', 'ipv6', '--enable-ipv6', '--disable-ipv6', d)}"
-do_configure() {
+EXTRA_AUTORECONF += " -I m4"
+
+do_configure_prepend() {
+ mkdir -p ${S}/m4
+ if [ -f aclocal.m4 ]; then
+ mv aclocal.m4 ${S}/m4
+ fi
# AC_CHECK_LIB(dlpi.. was looking to host /lib
- sed -i 's:-L/lib:-L${STAGING_LIBDIR}:g' ./configure.in
-
- gnu-configize
- autoconf
- oe_runconf
- sed -i 's:/usr/lib:${STAGING_LIBDIR}:' ./Makefile
- sed -i 's:/usr/include:${STAGING_INCDIR}:' ./Makefile
+ sed -i 's:-L/lib::g' ./configure.in
+}
+do_configure_append() {
+ sed -i 's:-L/usr/lib::' ./Makefile
+ sed -i 's:-Wl,-rpath,${STAGING_LIBDIR}::' ./Makefile
+ sed -i 's:-I/usr/include::' ./Makefile
}
do_install_append() {
# tcpdump 4.0.0 installs a copy to /usr/sbin/tcpdump.4.0.0
rm -f ${D}${sbindir}/tcpdump.${PV}
}
-
-SRC_URI[md5sum] = "d0dd58bbd6cd36795e05c6f1f74420b0"
-SRC_URI[sha256sum] = "e6cd4bbd61ec7adbb61ba8352c4b4734f67b8caaa845d88cb826bc0b9f1e7f0a"
-
--
1.7.9.5
next prev parent reply other threads:[~2013-01-06 9:28 UTC|newest]
Thread overview: 40+ messages / expand[flat|nested] mbox.gz Atom feed top
2013-01-06 9:12 [meta-networking][PATCH V2 01/25] arptables: Import recipe from OE-Classic and update to latest Khem Raj
2013-01-06 9:12 ` [meta-networking][PATCH V2 02/25] ebtables: Fix segfault by linking with no-as-needed Khem Raj
2013-01-06 9:12 ` [meta-networking][PATCH V2 03/25] autofs: Add recipes for 5.0.7 Khem Raj
2013-01-07 15:58 ` Joe MacDonald
2013-01-07 22:48 ` Khem Raj
2013-01-08 17:33 ` Khem Raj
2013-01-08 19:03 ` Joe MacDonald
2013-01-08 22:19 ` Martin Jansa
2013-01-08 22:22 ` Joe MacDonald
2013-01-06 9:12 ` [meta-networking][PATCH V2 04/25] nis: Import recipes from OE classic Khem Raj
2013-01-06 9:12 ` [meta-networking][PATCH V2 05/25] ndisc6: Forward port recipe " Khem Raj
2013-01-06 9:12 ` [meta-oe][PATCH V2 06/25] net-snmp: Use ${PN} instead of hardcoding net-snmp Khem Raj
2013-01-06 9:12 ` [meta-oe][PATCH V2 07/25] jansson_2.3.1.bb: Fix multilib use BPN in SRC_URI instead of PN Khem Raj
2013-01-06 9:12 ` [meta-oe][PATCH V2 08/25] liblockfile: Upgrade 1.06 -> 1.09 Khem Raj
2013-01-06 9:12 ` [meta-oe][PATCH V2 09/25] atftp: Upgrade to latest from git Khem Raj
2013-01-06 9:36 ` Martin Jansa
2013-01-07 1:23 ` Khem Raj
2013-01-07 15:36 ` Joe MacDonald
2013-01-07 16:01 ` Khem Raj
2013-01-07 16:04 ` Joe MacDonald
2013-01-06 9:12 ` Khem Raj [this message]
2013-01-06 9:12 ` [meta-oe][PATCH V2 11/25] cppunit: Upgrade recipes from 1.12.1 -> 1.13.1 Khem Raj
2013-01-06 9:12 ` [meta-oe][PATCH V2 12/25] luajit: Add recipes Khem Raj
2013-01-06 9:12 ` [meta-oe][PATCH V2 13/25] concurrencykit: Add recipe for latest from git Khem Raj
2013-01-07 18:15 ` Martin Jansa
2013-01-07 21:58 ` Khem Raj
2013-01-08 17:33 ` Khem Raj
2013-01-06 9:12 ` [meta-oe][PATCH V2 14/25] tcsh: Add recipes for package Khem Raj
2013-01-06 9:12 ` [meta-oe][PATCH V2 15/25] dmidecode: Forward port from OE-Classic Khem Raj
2013-01-06 9:12 ` [meta-oe][PATCH V2 16/25] libuio: Add recipe for version 0.2.1 Khem Raj
2013-01-06 9:12 ` [meta-oe][PATCH V2 17/25] uml-utilities: Forward port recipe from OE classic Khem Raj
2013-01-06 9:12 ` [meta-systemd][PATCH V2 18/25] systemd: Fix build when base_libdir is not /lib Khem Raj
2013-01-09 10:18 ` Martin Jansa
2013-01-06 9:12 ` [meta-systemd][PATCH V2 19/25] systemd.bbclass: Fixes for living along with multilib Khem Raj
2013-01-06 9:12 ` [meta-systemd][PATCH V2 20/25] at: Add systemd unit file Khem Raj
2013-01-06 9:12 ` [meta-systemd][PATCH V2 21/25] dhcp: Add systemd unit file for dhclient Khem Raj
2013-01-06 9:12 ` [meta-systemd][PATCH V2 22/25] nis: Add support for systemd launch of NIS services Khem Raj
2013-01-06 9:12 ` [meta-systemd][PATCH V2 23/25] rpcbind: Add systemd service unit file Khem Raj
2013-01-06 9:12 ` [meta-systemd][PATCH V2 24/25] dhclient.service: Rearrange the cmdline for dhclient Khem Raj
2013-01-06 9:12 ` [meta-systemd][PATCH V2 25/25] meta-systemd/atftpd: Adjust bbappend to match to recipe upgrade Khem Raj
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1357463568-26241-10-git-send-email-raj.khem@gmail.com \
--to=raj.khem@gmail.com \
--cc=openembedded-devel@lists.openembedded.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox