From: Alexander Dahl <ada@thorsis.com>
To: ptxdist@pengutronix.de
Cc: Alexander Dahl <post@lespocky.de>
Subject: [ptxdist] [PATCH] libnet: upgrade from 1.1.4 to 1.1.6
Date: Thu, 19 Oct 2017 13:59:36 +0200 [thread overview]
Message-ID: <20171019115936.4446-1-ada@thorsis.com> (raw)
From: Alexander Dahl <post@lespocky.de>
New upstream version includes general improvements, and bugfixes. The
old patch series can be dropped, a similar check was included upstream.
configure options were reviewed, set two of them to fix values.
Signed-off-by: Alexander Dahl <post@lespocky.de>
---
patches/libnet-1.1.4/autogen.sh | 1 -
patches/libnet-1.1.4/libnet-1.1.3-endianess.diff | 59 ------------------------
patches/libnet-1.1.4/series | 1 -
rules/libnet.make | 12 ++---
4 files changed, 6 insertions(+), 67 deletions(-)
delete mode 120000 patches/libnet-1.1.4/autogen.sh
delete mode 100644 patches/libnet-1.1.4/libnet-1.1.3-endianess.diff
delete mode 100644 patches/libnet-1.1.4/series
diff --git a/patches/libnet-1.1.4/autogen.sh b/patches/libnet-1.1.4/autogen.sh
deleted file mode 120000
index 9f8a4cb7dd..0000000000
--- a/patches/libnet-1.1.4/autogen.sh
+++ /dev/null
@@ -1 +0,0 @@
-../autogen.sh
\ No newline at end of file
diff --git a/patches/libnet-1.1.4/libnet-1.1.3-endianess.diff b/patches/libnet-1.1.4/libnet-1.1.3-endianess.diff
deleted file mode 100644
index be45754118..0000000000
--- a/patches/libnet-1.1.4/libnet-1.1.3-endianess.diff
+++ /dev/null
@@ -1,59 +0,0 @@
-Subject: fix endianess check for cross-compiling
-From: Michael Olbrich <m.olbrich@pengutronix.de>
-
-The original check tries to run a program to check the endianess.
-This fails when cross-compiling. Use autoconf stuff instead.
-
-Signed-off-by: Michael Olbrich <m.olbrich@pengutronix.de>
-
----
-# 20091229 rsc: there's already a similar patch in the libnet git, so we
-# wait for a new release
-
- autogen.sh | 8 ++++++++
- configure.in | 12 +++++++++++-
- 2 files changed, 19 insertions(+), 1 deletion(-)
-
-Index: b/autogen.sh
-===================================================================
---- /dev/null
-+++ b/autogen.sh
-@@ -0,0 +1,8 @@
-+rm -fr autom4te.cache
-+libtoolize --copy --force
-+aclocal -I .
-+#autoheader
-+automake -a -c --foreign
-+autoconf
-+rm -fr autom4te.cache
-+
-Index: b/configure.in
-===================================================================
---- a/configure.in
-+++ b/configure.in
-@@ -6,6 +6,7 @@ dnl All rights reserved.
- dnl
- dnl Process this file with autoconf to produce a configure script.
-
-+AC_PREREQ(2.52)
- AC_INIT(libnet, 1.1.4)
- AC_MSG_RESULT(beginning autoconfiguration process for libnet-${PACKAGE_VERSION} ...)
- AC_CANONICAL_SYSTEM
-@@ -29,7 +30,16 @@ dnl
- dnl And some custom things
- dnl
-
--AC_LIBNET_ENDIAN_CHECK
-+AC_C_BIGENDIAN([
-+ AC_DEFINE([LIBNET_BIG_ENDIAN], [1], [big endian])
-+ ENDIANESS="LIBNET_BIG_ENDIAN"
-+ LIBNET_CONFIG_DEFINES="$LIBNET_CONFIG_DEFINES -DLIBNET_BIG_ENDIAN"
-+],[
-+ AC_DEFINE([LIBNET_LIL_ENDIAN], [1], [little endian])
-+ ENDIANESS="LIBNET_LIL_ENDIAN"
-+ LIBNET_CONFIG_DEFINES="$LIBNET_CONFIG_DEFINES -DLIBNET_LIL_ENDIAN"
-+], AC_MSG_WARN(cannot detect endianess. try setting ac_cv_c_bigendian to yes or no))
-+
- AC_LBL_UNALIGNED_ACCESS
- dnl AC_LBL_LIBRARY_NET
-
diff --git a/patches/libnet-1.1.4/series b/patches/libnet-1.1.4/series
deleted file mode 100644
index b96f6cd61a..0000000000
--- a/patches/libnet-1.1.4/series
+++ /dev/null
@@ -1 +0,0 @@
-libnet-1.1.3-endianess.diff
diff --git a/rules/libnet.make b/rules/libnet.make
index 15faf7af5f..457db71bfd 100644
--- a/rules/libnet.make
+++ b/rules/libnet.make
@@ -17,8 +17,8 @@ PACKAGES-$(PTXCONF_LIBNET) += libnet
#
# Paths and names
#
-LIBNET_VERSION := 1.1.4
-LIBNET_MD5 := c5e06418a89cc4209f677a776a798fd9
+LIBNET_VERSION := 1.1.6
+LIBNET_MD5 := 710296fe424a49344e5fcc0d09e53317
LIBNET := libnet-$(LIBNET_VERSION)
LIBNET_SUFFIX := tar.gz
LIBNET_URL := $(call ptx/mirror, SF, libnet-dev/$(LIBNET).$(LIBNET_SUFFIX))
@@ -29,14 +29,14 @@ LIBNET_DIR := $(BUILDDIR)/$(LIBNET)
# Prepare
# ----------------------------------------------------------------------------
-#
-# autoconf
-#
LIBNET_CONF_TOOL := autoconf
-
LIBNET_CONF_ENV := \
$(CROSS_ENV) \
libnet_cv_have_packet_socket=yes
+LIBNET_CONF_OPT := \
+ $(CROSS_AUTOCONF_USR) \
+ --disable-samples \
+ --with-link-layer=linux
# ----------------------------------------------------------------------------
# Target-Install
--
2.11.0
_______________________________________________
ptxdist mailing list
ptxdist@pengutronix.de
reply other threads:[~2017-10-19 12:00 UTC|newest]
Thread overview: [no followups] expand[flat|nested] mbox.gz Atom feed
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=20171019115936.4446-1-ada@thorsis.com \
--to=ada@thorsis.com \
--cc=post@lespocky.de \
--cc=ptxdist@pengutronix.de \
/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