| Message ID | 1436349264-11797-4-git-send-email-johan.oudinet@gmail.com |
|---|---|
| State | Accepted |
| Headers | show |
Dear Johan Oudinet, On Wed, 8 Jul 2015 11:54:16 +0200, Johan Oudinet wrote: > + AC_PREREQ(2.53) > +-AC_INIT(ejabberd, m4_esyscmd([echo `git describe --tags 2>/dev/null || echo 0.0` | sed 's/-g.*//;s/-/./' | tr -d '\012']), [ejabberd@process-one.net], [ejabberd]) > ++AC_INIT(ejabberd, [15.06], [ejabberd@process-one.net], [ejabberd]) > + REQUIRE_ERLANG_MIN="5.9.1 (Erlang/OTP R15B01)" > + REQUIRE_ERLANG_MAX="9.0.0 (No Max)" I've merged this patch, but I'm not too happy with it, because it has no chance to be upstreamed as is. Do you think this is a problem you could report upstream, so that they can fix it in a way that works both for them and for Buildroot? Thanks! Thomas
Thomas, All, On Sat, Jul 11, 2015 at 12:31 PM, Thomas Petazzoni <thomas.petazzoni@free-electrons.com> wrote: > > On Wed, 8 Jul 2015 11:54:16 +0200, Johan Oudinet wrote: > >> + AC_PREREQ(2.53) >> +-AC_INIT(ejabberd, m4_esyscmd([echo `git describe --tags 2>/dev/null || echo 0.0` | sed 's/-g.*//;s/-/./' | tr -d '\012']), [ejabberd@process-one.net], [ejabberd]) >> ++AC_INIT(ejabberd, [15.06], [ejabberd@process-one.net], [ejabberd]) >> + REQUIRE_ERLANG_MIN="5.9.1 (Erlang/OTP R15B01)" >> + REQUIRE_ERLANG_MAX="9.0.0 (No Max)" > > I've merged this patch, but I'm not too happy with it, because it > has no chance to be upstreamed as is. Do you think this is a problem > you could report upstream, so that they can fix it in a way that works > both for them and for Buildroot? I've just asked them: https://github.com/processone/ejabberd/issues/658
diff --git a/package/ejabberd/0010-fix-package-version.patch b/package/ejabberd/0010-fix-package-version.patch new file mode 100644 index 0000000..c8b3c10 --- /dev/null +++ b/package/ejabberd/0010-fix-package-version.patch @@ -0,0 +1,19 @@ +Description: fix package version + Without this patch, the configure tries to guess the version from the + last git tag, which is incorrect here as we are not inside ejabberd + git repository. +Signed-off-by: Johan Oudinet <johan.oudinet@gmail.com> + +diff --git a/configure.ac b/configure.ac +index e7bb43b..e7faac4 100644 +--- a/configure.ac ++++ b/configure.ac +@@ -2,7 +2,7 @@ + # Process this file with autoconf to produce a configure script. + + AC_PREREQ(2.53) +-AC_INIT(ejabberd, m4_esyscmd([echo `git describe --tags 2>/dev/null || echo 0.0` | sed 's/-g.*//;s/-/./' | tr -d '\012']), [ejabberd@process-one.net], [ejabberd]) ++AC_INIT(ejabberd, [15.06], [ejabberd@process-one.net], [ejabberd]) + REQUIRE_ERLANG_MIN="5.9.1 (Erlang/OTP R15B01)" + REQUIRE_ERLANG_MAX="9.0.0 (No Max)" +
The configure tries to guess the version from the last git tag, which is incorrect here as we are not inside ejabberd git repository. Signed-off-by: Johan Oudinet <johan.oudinet@gmail.com> --- package/ejabberd/0010-fix-package-version.patch | 19 +++++++++++++++++++ 1 file changed, 19 insertions(+) create mode 100644 package/ejabberd/0010-fix-package-version.patch