From patchwork Wed Nov 18 21:36:35 2015 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: James Knight X-Patchwork-Id: 546215 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from whitealder.osuosl.org (smtp1.osuosl.org [140.211.166.138]) by ozlabs.org (Postfix) with ESMTP id E0CF4141491 for ; Thu, 19 Nov 2015 08:36:46 +1100 (AEDT) Received: from localhost (localhost [127.0.0.1]) by whitealder.osuosl.org (Postfix) with ESMTP id 2CF6A8BEA2; Wed, 18 Nov 2015 21:36:46 +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 KbEo1bk9rk3A; Wed, 18 Nov 2015 21:36:45 +0000 (UTC) Received: from ash.osuosl.org (ash.osuosl.org [140.211.166.34]) by whitealder.osuosl.org (Postfix) with ESMTP id 031448BE92; Wed, 18 Nov 2015 21:36:45 +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 4E0F91C1619 for ; Wed, 18 Nov 2015 21:36:43 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by whitealder.osuosl.org (Postfix) with ESMTP id 4904B8BE92 for ; Wed, 18 Nov 2015 21:36:43 +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 oKWoeHbQL6Q2 for ; Wed, 18 Nov 2015 21:36:42 +0000 (UTC) X-Greylist: domain auto-whitelisted by SQLgrey-1.7.6 Received: from da1vs01.rockwellcollins.com (da1vs01.rockwellcollins.com [205.175.227.27]) by whitealder.osuosl.org (Postfix) with ESMTPS id 43AD18BE82 for ; Wed, 18 Nov 2015 21:36:42 +0000 (UTC) Received: from ofwda1n02.rockwellcollins.com (HELO crulimr01.rockwellcollins.com) ([205.175.227.14]) by da1vs01.rockwellcollins.com with ESMTP; 18 Nov 2015 15:36:41 -0600 X-Received: from JDKNIGHT-PC.rccalab.inside (unknown [192.168.162.69]) by crulimr01.rockwellcollins.com (Postfix) with ESMTP id 2F5B260198; Wed, 18 Nov 2015 15:36:41 -0600 (CST) From: James Knight To: buildroot@busybox.net Date: Wed, 18 Nov 2015 16:36:35 -0500 Message-Id: <1447882595-6228-1-git-send-email-james.knight@rockwellcollins.com> X-Mailer: git-send-email 1.9.5.msysgit.1 Cc: James Knight Subject: [Buildroot] [PATCH v2 1/1] chrony: bump to version 2.2 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" With the new version, documentation is not generated part of the main build. This removes the need to alter the Makefile to remove the invoke on the `chrony.txt` target. Cleanup also explicitly disabling seccomp (since its experimental) and tomcrypt (Buildroot does not have libtomcrypt at this time). Signed-off-by: James Knight --- Changes v1 -> v2: - Restore use of generic-package infrastructure (based off of comments from Thomas Petazzoni). --- package/chrony/chrony.hash | 6 +++--- package/chrony/chrony.mk | 15 +++++++-------- 2 files changed, 10 insertions(+), 11 deletions(-) diff --git a/package/chrony/chrony.hash b/package/chrony/chrony.hash index ba7f95e..066ecb5 100644 --- a/package/chrony/chrony.hash +++ b/package/chrony/chrony.hash @@ -1,3 +1,3 @@ -# From http://listengine.tuxfamily.org/chrony.tuxfamily.org/chrony-announce/2014/09/msg00000.html -md5 04ab702fc81150db06809562a9aaed92 chrony-1.31.tar.gz -sha1 71bb46cad2f15760192795e60efdf23069973908 chrony-1.31.tar.gz +# From http://listengine.tuxfamily.org/chrony.tuxfamily.org/chrony-announce/2015/10/msg00002.html +md5 17bc77d3d2ce942675f9600b60452717 chrony-2.2.tar.gz +sha1 eed81b53ef504430128a3a6fa5b56f7ee2fdf2b1 chrony-2.2.tar.gz diff --git a/package/chrony/chrony.mk b/package/chrony/chrony.mk index 72c4c4b..7f1c198 100644 --- a/package/chrony/chrony.mk +++ b/package/chrony/chrony.mk @@ -4,12 +4,17 @@ # ################################################################################ -CHRONY_VERSION = 1.31 +CHRONY_VERSION = 2.2 CHRONY_SITE = http://download.tuxfamily.org/chrony CHRONY_LICENSE = GPLv2 CHRONY_LICENSE_FILES = COPYING -CHRONY_CONF_OPTS = --host-system=Linux --host-machine=$(BR2_ARCH) --prefix=/usr +CHRONY_CONF_OPTS = \ + --host-system=Linux \ + --host-machine=$(BR2_ARCH) \ + --prefix=/usr \ + --without-seccomp \ + --without-tomcrypt ifeq ($(BR2_PACKAGE_LIBNSS),y) CHRONY_DEPENDENCIES += host-pkgconf libnss @@ -23,12 +28,6 @@ else CHRONY_CONF_OPTS += --disable-readline endif -# Ditch the doc build, needs makeinfo and we don't need them -define CHRONY_DISABLE_DOCS - $(SED) 's/chronyc chrony.txt/chronyc/' $(@D)/Makefile.in -endef -CHRONY_POST_PATCH_HOOKS += CHRONY_DISABLE_DOCS - define CHRONY_CONFIGURE_CMDS cd $(@D) && $(TARGET_CONFIGURE_OPTS) ./configure $(CHRONY_CONF_OPTS) endef