From patchwork Mon Oct 4 19:50:30 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andrea Claudi X-Patchwork-Id: 12534721 X-Patchwork-Delegate: dsahern@gmail.com Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id CCC2CC433EF for ; Mon, 4 Oct 2021 19:51:11 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id B42286147F for ; Mon, 4 Oct 2021 19:51:11 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S234557AbhJDTxA (ORCPT ); Mon, 4 Oct 2021 15:53:00 -0400 Received: from us-smtp-delivery-124.mimecast.com ([170.10.133.124]:36784 "EHLO us-smtp-delivery-124.mimecast.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S232319AbhJDTw7 (ORCPT ); Mon, 4 Oct 2021 15:52:59 -0400 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1633377069; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=yIWffICX3mHAU5/5D00jA0Ixn3NQl7mBNsTu+BjI09M=; b=JWmvhMI6Q8auJ62yhPyp9a58JFdj0VeK8KRjQAfnucpUDJH6hLG+xtC1OShXa8o4g5j3LT RX4O3A2g+PzoxxqyQhojoJfbW9YDs/RrSF2NtXpnVydll4z/5XBFAA9MxtW5Oqd5Rauc6n nMO6OoK2tUI6R4bK/TiFVCRHk7ffoPo= Received: from mimecast-mx01.redhat.com (mimecast-mx01.redhat.com [209.132.183.4]) (Using TLS) by relay.mimecast.com with ESMTP id us-mta-416-f0GuKqI1PH-UmSxDutS1LA-1; Mon, 04 Oct 2021 15:51:08 -0400 X-MC-Unique: f0GuKqI1PH-UmSxDutS1LA-1 Received: from smtp.corp.redhat.com (int-mx04.intmail.prod.int.phx2.redhat.com [10.5.11.14]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id 760BA802935; Mon, 4 Oct 2021 19:51:07 +0000 (UTC) Received: from renaissance-vector.redhat.com (unknown [10.39.195.138]) by smtp.corp.redhat.com (Postfix) with ESMTP id 9DA6D5D9DE; Mon, 4 Oct 2021 19:51:05 +0000 (UTC) From: Andrea Claudi To: netdev@vger.kernel.org Cc: stephen@networkplumber.org, dsahern@gmail.com, bluca@debian.org Subject: [PATCH iproute2 v2 1/3] configure: support --param=value style Date: Mon, 4 Oct 2021 21:50:30 +0200 Message-Id: <189942255eec5688c214c6ff48815836b7d7e1c6.1633369677.git.aclaudi@redhat.com> In-Reply-To: References: MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.79 on 10.5.11.14 Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org X-Patchwork-Delegate: dsahern@gmail.com This commit makes it possible to specify values for configure params using the common autotools configure syntax '--param=value'. Signed-off-by: Andrea Claudi --- configure | 32 ++++++++++++++++++++++---------- 1 file changed, 22 insertions(+), 10 deletions(-) diff --git a/configure b/configure index 7f4f3bd9..cebfda6e 100755 --- a/configure +++ b/configure @@ -501,18 +501,30 @@ if [ $# -eq 1 ] && [ "$(echo $1 | cut -c 1)" != '-' ]; then else while true; do case "$1" in - --include_dir) - INCLUDE=$2 - shift 2 ;; - --libbpf_dir) - LIBBPF_DIR="$2" - shift 2 ;; - --libbpf_force) - if [ "$2" != 'on' ] && [ "$2" != 'off' ]; then + --include_dir*) + INCLUDE="${1#*=}" + if [ "$INCLUDE" == "--include_dir" ]; then + INCLUDE=$2 + shift + fi + shift ;; + --libbpf_dir*) + LIBBPF_DIR="${1#*=}" + if [ "$LIBBPF_DIR" == "--libbpf_dir" ]; then + LIBBPF_DIR="$2" + shift + fi + shift ;; + --libbpf_force*) + LIBBPF_FORCE="${1#*=}" + if [ "$LIBBPF_FORCE" == "--libbpf_force" ]; then + LIBBPF_FORCE="$2" + shift + fi + if [ "$LIBBPF_FORCE" != 'on' ] && [ "$LIBBPF_FORCE" != 'off' ]; then usage 1 fi - LIBBPF_FORCE=$2 - shift 2 ;; + shift ;; -h | --help) usage 0 ;; "") From patchwork Mon Oct 4 19:50:31 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andrea Claudi X-Patchwork-Id: 12534723 X-Patchwork-Delegate: dsahern@gmail.com Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id D1126C433F5 for ; Mon, 4 Oct 2021 19:51:14 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id B9E216147F for ; Mon, 4 Oct 2021 19:51:14 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S234686AbhJDTxD (ORCPT ); Mon, 4 Oct 2021 15:53:03 -0400 Received: from us-smtp-delivery-124.mimecast.com ([170.10.133.124]:42104 "EHLO us-smtp-delivery-124.mimecast.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S232319AbhJDTxB (ORCPT ); Mon, 4 Oct 2021 15:53:01 -0400 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1633377072; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=11osw1sJrLJ5+LcZ7sYXCHrKu+b1sDCRg6TWbiyOyyc=; b=eS/Rt2/cbL+QGozwnMCSfQEg7Dx4jcms1sAfnk98KX+ITJz3hlBu/ar8NZqFqophdvquZK Cc9/4GmSvM2EeN9c0NlTUEmWgm/gAzxYZf07GU+Ugkt7Um/Q3DzG7jV2fX0ASUP3dBtyuH ZQ17arfSHc1h7wu4kLRV0/yW0CKTHWc= Received: from mimecast-mx01.redhat.com (mimecast-mx01.redhat.com [209.132.183.4]) (Using TLS) by relay.mimecast.com with ESMTP id us-mta-240-TL9v7Lz8N_66Hwi3_0g66A-1; Mon, 04 Oct 2021 15:51:11 -0400 X-MC-Unique: TL9v7Lz8N_66Hwi3_0g66A-1 Received: from smtp.corp.redhat.com (int-mx04.intmail.prod.int.phx2.redhat.com [10.5.11.14]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id 294DB100C661; Mon, 4 Oct 2021 19:51:10 +0000 (UTC) Received: from renaissance-vector.redhat.com (unknown [10.39.195.138]) by smtp.corp.redhat.com (Postfix) with ESMTP id 36AAE17CF0; Mon, 4 Oct 2021 19:51:07 +0000 (UTC) From: Andrea Claudi To: netdev@vger.kernel.org Cc: stephen@networkplumber.org, dsahern@gmail.com, bluca@debian.org Subject: [PATCH iproute2 v2 2/3] configure: add the --prefix option Date: Mon, 4 Oct 2021 21:50:31 +0200 Message-Id: <23b07323c5dab89c789c6ef7f94ddee3b65e51e4.1633369677.git.aclaudi@redhat.com> In-Reply-To: References: MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.79 on 10.5.11.14 Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org X-Patchwork-Delegate: dsahern@gmail.com This commit add the '--prefix' option to the iproute2 configure script. This mimics the '--prefix' option that autotools configure provides, and will be used later to allow users or packagers to set the lib directory. Signed-off-by: Andrea Claudi --- configure | 18 ++++++++++++++++++ 1 file changed, 18 insertions(+) diff --git a/configure b/configure index cebfda6e..f51247a8 100755 --- a/configure +++ b/configure @@ -148,6 +148,15 @@ EOF rm -f $TMPDIR/ipttest.c $TMPDIR/ipttest } +check_prefix() +{ + if [ -n "$PREFIX" ]; then + prefix="$PREFIX" + else + prefix="/usr" + fi +} + check_ipt() { if ! grep TC_CONFIG_XT $CONFIG > /dev/null; then @@ -490,6 +499,7 @@ Usage: $0 [OPTIONS] --libbpf_force Enable/disable libbpf by force. Available options: on: require link against libbpf, quit config if no libbpf support off: disable libbpf probing + --prefix Path prefix of the lib files to install -h | --help Show this usage info EOF exit $1 @@ -525,6 +535,13 @@ else usage 1 fi shift ;; + --prefix*) + PREFIX="${1#*=}" + if [ "$PREFIX" == "--prefix" ]; then + PREFIX="$2" + shift + fi + shift ;; -h | --help) usage 0 ;; "") @@ -558,6 +575,7 @@ if ! grep -q TC_CONFIG_NO_XT $CONFIG; then fi echo +check_prefix if ! grep -q TC_CONFIG_NO_XT $CONFIG; then echo -n "iptables modules directory: " check_ipt_lib_dir From patchwork Mon Oct 4 19:50:32 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andrea Claudi X-Patchwork-Id: 12534725 X-Patchwork-Delegate: dsahern@gmail.com Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 3EE88C433EF for ; Mon, 4 Oct 2021 19:51:20 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id 22C016140B for ; Mon, 4 Oct 2021 19:51:20 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S234688AbhJDTxI (ORCPT ); Mon, 4 Oct 2021 15:53:08 -0400 Received: from us-smtp-delivery-124.mimecast.com ([170.10.133.124]:24837 "EHLO us-smtp-delivery-124.mimecast.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S232319AbhJDTxD (ORCPT ); Mon, 4 Oct 2021 15:53:03 -0400 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1633377074; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=6tVdezFE8dC0nL7OmD05dX5kB5cHUxoCDeGNtIW5VbU=; b=iH211lPh/A9DEtdxGyxBLRHM7J89lsGPeRkivkEdKyEfjmXXGo3mBcRTW6g7Gm9iUedNJz 5DBiZyluF2wX9ESbLnPuFys+jItkrEQE5Py84ALsjWpliOdTN73yLHG4gzcrUQLDTtpHl4 D+MVTsMFY8srZty/+oaV7teddmNaeyk= Received: from mimecast-mx01.redhat.com (mimecast-mx01.redhat.com [209.132.183.4]) (Using TLS) by relay.mimecast.com with ESMTP id us-mta-318-IJCmVoTKOG66xyLETZRmTg-1; Mon, 04 Oct 2021 15:51:13 -0400 X-MC-Unique: IJCmVoTKOG66xyLETZRmTg-1 Received: from smtp.corp.redhat.com (int-mx04.intmail.prod.int.phx2.redhat.com [10.5.11.14]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id 4AB11814313; Mon, 4 Oct 2021 19:51:12 +0000 (UTC) Received: from renaissance-vector.redhat.com (unknown [10.39.195.138]) by smtp.corp.redhat.com (Postfix) with ESMTP id B71D25D9DE; Mon, 4 Oct 2021 19:51:10 +0000 (UTC) From: Andrea Claudi To: netdev@vger.kernel.org Cc: stephen@networkplumber.org, dsahern@gmail.com, bluca@debian.org Subject: [PATCH iproute2 v2 3/3] configure: add the --libdir option Date: Mon, 4 Oct 2021 21:50:32 +0200 Message-Id: In-Reply-To: References: MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.79 on 10.5.11.14 Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org X-Patchwork-Delegate: dsahern@gmail.com This commit allows users/packagers to choose a lib directory to store iproute2 lib files. At the moment iproute2 ship lib files in /usr/lib and offers no way to modify this setting. However, according to the FHS, distros may choose "one or more variants of the /lib directory on systems which support more than one binary format" (e.g. /usr/lib64 on Fedora). As Luca states in commit a3272b93725a ("configure: restore backward compatibility"), packaging systems may assume that 'configure' is from autotools, and try to pass it some parameters. Allowing the '--libdir=/path/to/libdir' syntax, we can use this to our advantage, and let the lib directory to be chosen by the distro packaging system. Signed-off-by: Andrea Claudi --- Makefile | 7 ++++--- configure | 22 ++++++++++++++++++++++ 2 files changed, 26 insertions(+), 3 deletions(-) diff --git a/Makefile b/Makefile index 5bc11477..45655ca4 100644 --- a/Makefile +++ b/Makefile @@ -1,6 +1,8 @@ # SPDX-License-Identifier: GPL-2.0 # Top level Makefile for iproute2 +-include config.mk + ifeq ("$(origin V)", "command line") VERBOSE = $(V) endif @@ -13,7 +15,6 @@ MAKEFLAGS += --no-print-directory endif PREFIX?=/usr -LIBDIR?=$(PREFIX)/lib SBINDIR?=/sbin CONFDIR?=/etc/iproute2 NETNS_RUN_DIR?=/var/run/netns @@ -60,7 +61,7 @@ SUBDIRS=lib ip tc bridge misc netem genl tipc devlink rdma dcb man vdpa LIBNETLINK=../lib/libutil.a ../lib/libnetlink.a LDLIBS += $(LIBNETLINK) -all: config +all: config.mk @set -e; \ for i in $(SUBDIRS); \ do echo; echo $$i; $(MAKE) -C $$i; done @@ -80,7 +81,7 @@ help: @echo "Make Arguments:" @echo " V=[0|1] - set build verbosity level" -config: +config.mk: @if [ ! -f config.mk -o configure -nt config.mk ]; then \ sh configure $(KERNEL_INCLUDE); \ fi diff --git a/configure b/configure index f51247a8..38a81405 100755 --- a/configure +++ b/configure @@ -157,6 +157,19 @@ check_prefix() fi } +check_lib_dir() +{ + echo -n "lib directory: " + if [ -n "$LIBDIR" ]; then + eval echo "$LIBDIR" + eval echo "LIBDIR:=$LIBDIR" >> $CONFIG + return + fi + + eval echo "${prefix}/lib" + eval echo "LIBDIR:=${prefix}/lib" >> $CONFIG +} + check_ipt() { if ! grep TC_CONFIG_XT $CONFIG > /dev/null; then @@ -495,6 +508,7 @@ usage() cat <