Merged,
Maxim.
On 03/31/16 06:15, Ricardo Salveti wrote:
On Wed, Mar 30, 2016 at 4:38 PM, Anders Roxell <anders.rox...@linaro.org> wrote:
On 30 March 2016 at 21:26, Ricardo Salveti <ricardo.salv...@linaro.org> wrote:
On Wed, Mar 30, 2016 at 4:08 PM, Anders Roxell <anders.rox...@linaro.org> wrote:
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.
Disconnecting the project version/releases with the SO-version is
probably a good thing to do as we have monthly releases for ODP.
Not expecting the disconnection so soon because the ABI is constantly
changed, but this will at least allow consumers to avoid rebuilding
their software when it's not really required.
We just need to be a bit more careful when doing releases if this gets
merged, since it is one more thing to check and update.
Yes, but we should already be careful when doing releases. =)
Signed-off-by: Anders Roxell <anders.rox...@linaro.org>
---
.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
--
2.1.4
Should we break this into 2 separated patches? Might be probably good
to change builddeb in a separated patch.
if we break it into two patches we can't guarantee to be "debian bisectable"
Indeed, +1 from my side then.
Reviewed-by: Ricardo Salveti <ricardo.salv...@linaro.org>
_______________________________________________
lng-odp mailing list
lng-odp@lists.linaro.org
https://lists.linaro.org/mailman/listinfo/lng-odp
