All of lore.kernel.org
 help / color / mirror / Atom feed
From: Jeremy Sowden <jeremy@azazel.net>
To: Pablo Neira Ayuso <pablo@netfilter.org>
Cc: Netfilter Devel <netfilter-devel@vger.kernel.org>
Subject: [PATCH libnetfilter_log] build: remove broken code from autogen.sh.
Date: Fri, 27 Aug 2021 18:41:43 +0100	[thread overview]
Message-ID: <20210827174143.1094883-1-jeremy@azazel.net> (raw)

The `include` function, which is intended to include a copy of the
kernel's nfnetlink_log.h into the source distribution, has been broken
since 2012 when the header file was moved from where the function
expects to find it.  The header is manually sync'ed when necessary.

Signed-off-by: Jeremy Sowden <jeremy@azazel.net>
---
 autogen.sh | 35 -----------------------------------
 1 file changed, 35 deletions(-)

diff --git a/autogen.sh b/autogen.sh
index 2b2995306786..5e1344a85402 100755
--- a/autogen.sh
+++ b/autogen.sh
@@ -1,39 +1,4 @@
 #!/bin/sh -e
 
-include ()
-{
-    # If we keep a copy of the kernel header in the SVN tree, we'll have
-    # to worry about synchronization issues forever. Instead, we just copy 
-    # the headers that we need from the lastest kernel version at autogen
-    # stage.
-
-    INCLUDEDIR=${KERNEL_DIR:-/lib/modules/`uname -r`/build}/include/linux
-    if [ -f $INCLUDEDIR/netfilter/nfnetlink_log.h ]
-    then
-    	TARGET=include/libnetfilter_log/linux_nfnetlink_log.h
-    	echo "Copying nfnetlink_log.h to linux_nfnetlink_log.h"
-    	cp $INCLUDEDIR/netfilter/nfnetlink_log.h $TARGET
-	TEMP=`tempfile`
-	sed 's/linux\/netfilter\/nfnetlink.h/libnfnetlink\/linux_nfnetlink.h/g' $TARGET > $TEMP
-	# Add aligned_u64 definition after #define _NFNETLINK_LOG_H
-	awk '{
-        if ( $0 == "#define _NFNETLINK_LOG_H" ) {
-		print $0
-		getline
-		print $0
-		print "#ifndef aligned_u64"
-		print "#define aligned_u64 unsigned long long __attribute__((aligned(8)))"
-		print "#endif"
-	}
-
-	print $0
-	}' $TEMP > $TARGET
-    else
-    	echo "can't find nfnetlink_log.h kernel file in $INCLUDEDIR"
-    	exit 1
-    fi
-}
-
-[ "x$1" = "xdistrib" ] && include
 autoreconf -fi
 rm -Rf autom4te.cache
-- 
2.33.0


             reply	other threads:[~2021-08-27 17:44 UTC|newest]

Thread overview: 2+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2021-08-27 17:41 Jeremy Sowden [this message]
2021-08-28  9:18 ` [PATCH libnetfilter_log] build: remove broken code from autogen.sh Pablo Neira Ayuso

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=20210827174143.1094883-1-jeremy@azazel.net \
    --to=jeremy@azazel.net \
    --cc=netfilter-devel@vger.kernel.org \
    --cc=pablo@netfilter.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 an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.