From patchwork Wed Mar 30 19:08:18 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Anders Roxell X-Patchwork-Id: 64729 Delivered-To: patch@linaro.org Received: by 10.112.199.169 with SMTP id jl9csp2771629lbc; Wed, 30 Mar 2016 12:15:46 -0700 (PDT) X-Received: by 10.107.19.157 with SMTP id 29mr13173279iot.11.1459365345816; Wed, 30 Mar 2016 12:15:45 -0700 (PDT) Return-Path: Received: from lists.linaro.org (lists.linaro.org. [54.225.227.206]) by mx.google.com with ESMTP id l66si7460398iol.136.2016.03.30.12.15.45; Wed, 30 Mar 2016 12:15:45 -0700 (PDT) Received-SPF: pass (google.com: domain of lng-odp-bounces@lists.linaro.org designates 54.225.227.206 as permitted sender) client-ip=54.225.227.206; Authentication-Results: mx.google.com; spf=pass (google.com: domain of lng-odp-bounces@lists.linaro.org designates 54.225.227.206 as permitted sender) smtp.mailfrom=lng-odp-bounces@lists.linaro.org; dmarc=pass (p=NONE dis=NONE) header.from=linaro.org Received: by lists.linaro.org (Postfix, from userid 109) id 3F9AC619BA; Wed, 30 Mar 2016 19:15:45 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on ip-10-142-244-252 X-Spam-Level: X-Spam-Status: No, score=-2.6 required=5.0 tests=BAYES_00, RCVD_IN_DNSWL_LOW, RCVD_IN_MSPIKE_H3, RCVD_IN_MSPIKE_WL, URIBL_BLOCKED autolearn=disabled version=3.4.0 Received: from [127.0.0.1] (localhost [127.0.0.1]) by lists.linaro.org (Postfix) with ESMTP id CB77D61070; Wed, 30 Mar 2016 19:15:43 +0000 (UTC) X-Original-To: lng-odp@lists.linaro.org Delivered-To: lng-odp@lists.linaro.org Received: by lists.linaro.org (Postfix, from userid 109) id A124361204; Wed, 30 Mar 2016 19:15:37 +0000 (UTC) Received: from mail-lf0-f43.google.com (mail-lf0-f43.google.com [209.85.215.43]) by lists.linaro.org (Postfix) with ESMTPS id 8ECAF60181 for ; Wed, 30 Mar 2016 19:15:36 +0000 (UTC) Received: by mail-lf0-f43.google.com with SMTP id p188so16175263lfd.0 for ; Wed, 30 Mar 2016 12:15:36 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20130820; h=x-gm-message-state:from:to:cc:subject:date:message-id; bh=GluGOJASe/NVaIKMem1chsOtUrvyNHvgY/9ch2VWsSU=; b=kkk1VZ+RKd52rLQAaWBMbOPm5DIIZtmu9q7GtKkr/JrsVfv0fmQeUxWxvR/qpyN+Gl nofb7uuQTWvRU+LvOFP4iLRVf1kkO+gxCNQaNPkrkA0hkQHlfU5rUIKb19hjXEJV6r2M OR4UOa2NEAHXbbuqY3IeiuqL3vFEAoufxQGxjz2PvhWlBvNTriqnbGWcfHsMtKwgbyWU YD+Q7fgbUfW4dwRmYNcSsOeyA5j8nKyguCPQAGqUKFGMkDz/iWgyb2Bv3NKtDXG/dmKx v/utCiop6kRJjoZh76igXUk4DvJXUFvvwdH04wFIPm0ywilvfe42IV2q0ymjz/NWX0h8 xKfA== X-Gm-Message-State: AD7BkJIikXY3jL2m9bcLNhclvguOV6mDfINegDCpWXmSztb20arl6EX8X/9P6qFMNuBhLQvdlJo= X-Received: by 10.25.148.71 with SMTP id w68mr4897399lfd.23.1459365335017; Wed, 30 Mar 2016 12:15:35 -0700 (PDT) Received: from localhost (c-c82171d5.07-21-73746f28.cust.bredbandsbolaget.se. [213.113.33.200]) by smtp.gmail.com with ESMTPSA id o192sm802206lfe.37.2016.03.30.12.15.34 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Wed, 30 Mar 2016 12:15:34 -0700 (PDT) From: Anders Roxell To: lng-odp@lists.linaro.org Date: Wed, 30 Mar 2016 21:08:18 +0200 Message-Id: <1459364898-22876-1-git-send-email-anders.roxell@linaro.org> X-Mailer: git-send-email 2.1.4 X-Topics: patch Subject: [lng-odp] [PATCH] configure: disconnect API version with SO version X-BeenThere: lng-odp@lists.linaro.org X-Mailman-Version: 2.1.16 Precedence: list List-Id: "The OpenDataPlane \(ODP\) List" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Errors-To: lng-odp-bounces@lists.linaro.org Sender: "lng-odp" We used to force applications to rebuild when a ODP released a new version that changed one of the first two digits. That shouldn't be needed if we use the SO-verson as it is intended to be used. Signed-off-by: Anders Roxell Reviewed-by: Ricardo Salveti --- .so_version | 1 + Makefile.am | 2 +- configure.ac | 3 +-- scripts/builddeb | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) create mode 100644 .so_version diff --git a/.so_version b/.so_version new file mode 100644 index 0000000..dfa6588 --- /dev/null +++ b/.so_version @@ -0,0 +1 @@ +108:0:0 diff --git a/Makefile.am b/Makefile.am index 2129472..a90eb91 100644 --- a/Makefile.am +++ b/Makefile.am @@ -17,4 +17,4 @@ SUBDIRS = @platform_with_platform@ \ @DX_RULES@ -EXTRA_DIST = bootstrap $(DX_CONFIG) CHANGELOG config/README .scmversion +EXTRA_DIST = bootstrap $(DX_CONFIG) CHANGELOG config/README .scmversion .so_version diff --git a/configure.ac b/configure.ac index c8fb91e..e2e18e8 100644 --- a/configure.ac +++ b/configure.ac @@ -63,8 +63,7 @@ AC_SUBST([ARCH]) ########################################################################## # Set correct platform library version ########################################################################## -AGE=0 -ODP_LIBSO_VERSION=$(echo $VERSION.$AGE | awk -F . '{printf("%d:%d:%d\n", (($1 * 100) + $2), $3, $4)}') +ODP_LIBSO_VERSION=$(cat ./.so_version) AC_SUBST(ODP_LIBSO_VERSION) ########################################################################## diff --git a/scripts/builddeb b/scripts/builddeb index 8bde7cf..b832df6 100755 --- a/scripts/builddeb +++ b/scripts/builddeb @@ -20,7 +20,7 @@ fi pushd ${ROOT_DIR}/${package}-${version} cp -r ${ROOT_DIR}/pkg/debian . -current=$(echo ${version} | awk -F . '{printf("%d\n", (($1 * 100) + $2))}') +current=$(cat .so_version |awk -F : '{print $1}') rename 's,(.*linux)(.*),${1}'"${current}"'${2},' debian/*odp*-linux.install sed -i "s:\(libodp[a-zA-Z\-]\+linux\)\(-dbg\|$\| \):\1${current}\2:g" debian/control