From patchwork Wed Jul 8 09:54:16 2015 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Johan Oudinet X-Patchwork-Id: 492824 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from fraxinus.osuosl.org (smtp4.osuosl.org [140.211.166.137]) by ozlabs.org (Postfix) with ESMTP id C3759140788 for ; Wed, 8 Jul 2015 19:55:18 +1000 (AEST) Authentication-Results: ozlabs.org; dkim=fail reason="signature verification failed" (2048-bit key; unprotected) header.d=gmail.com header.i=@gmail.com header.b=Mg1cMf3U; dkim-atps=neutral Received: from localhost (localhost [127.0.0.1]) by fraxinus.osuosl.org (Postfix) with ESMTP id D5EE5A4242; Wed, 8 Jul 2015 09:55:15 +0000 (UTC) X-Virus-Scanned: amavisd-new at osuosl.org Received: from fraxinus.osuosl.org ([127.0.0.1]) by localhost (.osuosl.org [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id nrHrdXUEPIva; Wed, 8 Jul 2015 09:55:13 +0000 (UTC) Received: from ash.osuosl.org (ash.osuosl.org [140.211.166.34]) by fraxinus.osuosl.org (Postfix) with ESMTP id 853E7A3FF9; Wed, 8 Jul 2015 09:55:07 +0000 (UTC) X-Original-To: buildroot@lists.busybox.net Delivered-To: buildroot@osuosl.org Received: from whitealder.osuosl.org (smtp1.osuosl.org [140.211.166.138]) by ash.osuosl.org (Postfix) with ESMTP id 31AB31C2B29 for ; Wed, 8 Jul 2015 09:55:04 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by whitealder.osuosl.org (Postfix) with ESMTP id 2D9C591CFC for ; Wed, 8 Jul 2015 09:55:04 +0000 (UTC) X-Virus-Scanned: amavisd-new at osuosl.org Received: from whitealder.osuosl.org ([127.0.0.1]) by localhost (.osuosl.org [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id Cs3r9Eq7eJHt for ; Wed, 8 Jul 2015 09:55:02 +0000 (UTC) X-Greylist: domain auto-whitelisted by SQLgrey-1.7.6 Received: from mail-wi0-f171.google.com (mail-wi0-f171.google.com [209.85.212.171]) by whitealder.osuosl.org (Postfix) with ESMTPS id A991191C40 for ; Wed, 8 Jul 2015 09:55:01 +0000 (UTC) Received: by wiga1 with SMTP id a1so280033417wig.0 for ; Wed, 08 Jul 2015 02:55:00 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=from:to:cc:subject:date:message-id:in-reply-to:references; bh=sD4iskw7grjQJkjc+qtPsZCfsr2vJlqN+C9pE7yzzEQ=; b=Mg1cMf3Uu+1REAwPuk0WphCL54GuJT385AUSrUz9OkN8t/fFHKmMf1qhPPOyzgF294 paw1jV4K84yY0qOhzCEcTMj5Fz4KN9z/4SIGdtTjNtuDEQUZRls54c5pQLxmB/+/X53Q JEIcZAOAwBSP8xHPJT2Xc1UXjF+XEtg4rGolO2AAHF1vTewNnOXAtfWPu4SQx++hfyLK 0J1bGslkC7IpG0r7LvscIfWnl9AtW7XwyjSvvp7HVFOvgnIl1Pa0iQbK70J8pS1LtL1c wpY4UqjGJt4dqCE53X9b3GqkERrZVHEhY1UWNdgNipaIXJ5MloY7wlVmh077tca7182p JVRQ== X-Received: by 10.194.5.74 with SMTP id q10mr17315428wjq.27.1436349300208; Wed, 08 Jul 2015 02:55:00 -0700 (PDT) Received: from localhost.localdomain ([193.51.194.209]) by smtp.gmail.com with ESMTPSA id ny7sm2013288wic.11.2015.07.08.02.54.59 (version=TLSv1.2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Wed, 08 Jul 2015 02:54:59 -0700 (PDT) From: Johan Oudinet To: buildroot@buildroot.org Date: Wed, 8 Jul 2015 11:54:16 +0200 Message-Id: <1436349264-11797-4-git-send-email-johan.oudinet@gmail.com> X-Mailer: git-send-email 2.1.4 In-Reply-To: <1436349264-11797-1-git-send-email-johan.oudinet@gmail.com> References: <1436349264-11797-1-git-send-email-johan.oudinet@gmail.com> Subject: [Buildroot] [PATCH 03/11] ejabberd: fix package version X-BeenThere: buildroot@busybox.net X-Mailman-Version: 2.1.18-1 Precedence: list List-Id: Discussion and development of buildroot List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Errors-To: buildroot-bounces@busybox.net Sender: "buildroot" 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 --- package/ejabberd/0010-fix-package-version.patch | 19 +++++++++++++++++++ 1 file changed, 19 insertions(+) create mode 100644 package/ejabberd/0010-fix-package-version.patch 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 + +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)" +