From patchwork Sun Jan 10 21:24:50 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Bernd Kuhls X-Patchwork-Id: 1424314 Return-Path: X-Original-To: incoming-buildroot@patchwork.ozlabs.org Delivered-To: patchwork-incoming-buildroot@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=busybox.net (client-ip=140.211.166.133; helo=hemlock.osuosl.org; envelope-from=buildroot-bounces@busybox.net; receiver=) Authentication-Results: ozlabs.org; dmarc=none (p=none dis=none) header.from=t-online.de Received: from hemlock.osuosl.org (smtp2.osuosl.org [140.211.166.133]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 4DDVH81fxtz9sWL for ; Mon, 11 Jan 2021 08:25:08 +1100 (AEDT) Received: from localhost (localhost [127.0.0.1]) by hemlock.osuosl.org (Postfix) with ESMTP id 87D6B87070; Sun, 10 Jan 2021 21:25:02 +0000 (UTC) X-Virus-Scanned: amavisd-new at osuosl.org Received: from hemlock.osuosl.org ([127.0.0.1]) by localhost (.osuosl.org [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id lRTCSz4qBiE9; Sun, 10 Jan 2021 21:25:00 +0000 (UTC) Received: from ash.osuosl.org (ash.osuosl.org [140.211.166.34]) by hemlock.osuosl.org (Postfix) with ESMTP id 3890887059; Sun, 10 Jan 2021 21:25:00 +0000 (UTC) X-Original-To: buildroot@lists.busybox.net Delivered-To: buildroot@osuosl.org Received: from fraxinus.osuosl.org (smtp4.osuosl.org [140.211.166.137]) by ash.osuosl.org (Postfix) with ESMTP id 380B61BF426 for ; Sun, 10 Jan 2021 21:24:59 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by fraxinus.osuosl.org (Postfix) with ESMTP id 350ED84EE4 for ; Sun, 10 Jan 2021 21:24:59 +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 iL2jyxQHD2N5 for ; Sun, 10 Jan 2021 21:24:58 +0000 (UTC) X-Greylist: domain auto-whitelisted by SQLgrey-1.7.6 Received: from mailout04.t-online.de (mailout04.t-online.de [194.25.134.18]) by fraxinus.osuosl.org (Postfix) with ESMTPS id AD0DF85D11 for ; Sun, 10 Jan 2021 21:24:57 +0000 (UTC) Received: from fwd38.aul.t-online.de (fwd38.aul.t-online.de [172.20.26.138]) by mailout04.t-online.de (Postfix) with SMTP id 3D94041ED403 for ; Sun, 10 Jan 2021 22:24:55 +0100 (CET) Received: from fli4l.lan.fli4l (V+a-9MZF8hr7J-UMZH6mMRF9ckV6MP5dEwL30yXl1kjYzez5VpcEJ4twoJ63e7IQm1@[91.58.7.116]) by fwd38.t-online.de with (TLSv1:ECDHE-RSA-AES256-SHA encrypted) esmtp id 1kyiCi-24Djua0; Sun, 10 Jan 2021 22:24:52 +0100 Received: from mahler.lan.fli4l ([192.168.1.1]:54304) by fli4l.lan.fli4l with esmtp (Exim 4.94) (envelope-from ) id 1kyiCh-0008Mo-RU for buildroot@buildroot.org; Sun, 10 Jan 2021 22:24:52 +0100 From: Bernd Kuhls To: buildroot@buildroot.org Date: Sun, 10 Jan 2021 22:24:50 +0100 Message-Id: <20210110212451.136365-1-bernd.kuhls@t-online.de> X-Mailer: git-send-email 2.29.2 MIME-Version: 1.0 X-ID: V+a-9MZF8hr7J-UMZH6mMRF9ckV6MP5dEwL30yXl1kjYzez5VpcEJ4twoJ63e7IQm1 X-TOI-EXPURGATEID: 150726::1610313892-00000BB4-98105B5C/0/0 CLEAN NORMAL X-TOI-MSGID: a4b7f4e7-4219-4627-ab6c-1caaa31a2ae3 Subject: [Buildroot] [PATCH 1/2] package/inih: new package X-BeenThere: buildroot@busybox.net X-Mailman-Version: 2.1.29 Precedence: list List-Id: Discussion and development of buildroot List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: buildroot-bounces@busybox.net Sender: "buildroot" needed for xfsprogs >= 5.10.0: https://www.spinics.net/lists/linux-xfs/msg47554.html Added upstream patch to avoid dependency for c++. Signed-off-by: Bernd Kuhls --- DEVELOPERS | 1 + package/Config.in | 1 + .../0001-meson-optionally-depend-on-c.patch | 34 +++++++++++++++++++ package/inih/Config.in | 7 ++++ package/inih/inih.hash | 3 ++ package/inih/inih.mk | 20 +++++++++++ 6 files changed, 66 insertions(+) create mode 100644 package/inih/0001-meson-optionally-depend-on-c.patch create mode 100644 package/inih/Config.in create mode 100644 package/inih/inih.hash create mode 100644 package/inih/inih.mk diff --git a/DEVELOPERS b/DEVELOPERS index 05b509c9c4..757294b351 100644 --- a/DEVELOPERS +++ b/DEVELOPERS @@ -329,6 +329,7 @@ F: package/gli/ F: package/glmark2/ F: package/gpsd/ F: package/hdparm/ +F: package/inih/ F: package/jsoncpp/ F: package/kodi* F: package/lame/ diff --git a/package/Config.in b/package/Config.in index 07e923bde1..56f0b118e2 100644 --- a/package/Config.in +++ b/package/Config.in @@ -1979,6 +1979,7 @@ menu "Text and terminal handling" source "package/fmt/Config.in" source "package/fstrcmp/Config.in" source "package/icu/Config.in" + source "package/inih/Config.in" source "package/libcli/Config.in" source "package/libedit/Config.in" source "package/libenca/Config.in" diff --git a/package/inih/0001-meson-optionally-depend-on-c.patch b/package/inih/0001-meson-optionally-depend-on-c.patch new file mode 100644 index 0000000000..a039dde1db --- /dev/null +++ b/package/inih/0001-meson-optionally-depend-on-c.patch @@ -0,0 +1,34 @@ +From e192e4762749cfe3bc350e0353aa82b1a849256d Mon Sep 17 00:00:00 2001 +From: bkuhls +Date: Sun, 10 Jan 2021 21:56:56 +0100 +Subject: [PATCH] meson: optionally depend on c++ (#124) + +This fix is needed to allow building with toolchains which lack c++. + +Downloaded from upstream commit: +https://github.com/benhoyt/inih/commit/e192e4762749cfe3bc350e0353aa82b1a849256d + +Signed-off-by: Bernd Kuhls +--- + meson.build | 3 ++- + 1 file changed, 2 insertions(+), 1 deletion(-) + +diff --git a/meson.build b/meson.build +index 4602326..5393af4 100644 +--- a/meson.build ++++ b/meson.build +@@ -1,5 +1,5 @@ + project('inih', +- ['c','cpp'], ++ ['c'], + default_options : ['default_library=static'], + license : 'BSD-3-Clause', + ) +@@ -83,6 +83,7 @@ inih_dep = declare_dependency( + + #### INIReader #### + if get_option('with_INIReader') ++ add_languages('cpp') + inc_INIReader = include_directories('cpp') + + lib_INIReader = library('INIReader', diff --git a/package/inih/Config.in b/package/inih/Config.in new file mode 100644 index 0000000000..2c6553a8ce --- /dev/null +++ b/package/inih/Config.in @@ -0,0 +1,7 @@ +config BR2_PACKAGE_INIH + bool "inih" + help + inih (INI Not Invented Here) is a simple .INI file parser + written in C. + + https://github.com/benhoyt/inih/ diff --git a/package/inih/inih.hash b/package/inih/inih.hash new file mode 100644 index 0000000000..2560a91fed --- /dev/null +++ b/package/inih/inih.hash @@ -0,0 +1,3 @@ +# Locally computed +sha256 439cff9ce9a8afc52d08772ac3e93b3cecd79c7707f871fb4534fb3a48201880 inih-52.tar.gz +sha256 9ae3b39e83e9158e44b67733baa3bb2d84e80efdcfb14a5820210a42c7abdf7f LICENSE.txt diff --git a/package/inih/inih.mk b/package/inih/inih.mk new file mode 100644 index 0000000000..4b1616a684 --- /dev/null +++ b/package/inih/inih.mk @@ -0,0 +1,20 @@ +################################################################################ +# +# INIH +# +################################################################################ + +INIH_VERSION = 52 +INIH_SITE = $(call github,benhoyt,inih,r$(INIH_VERSION)) +INIH_INSTALL_STAGING = YES +INIH_LICENSE = BSD +INIH_LICENSE_FILES = LICENSE.txt +INIH_CONF_OPTS = -Ddistro_install=true + +ifeq ($(BR2_INSTALL_LIBSTDCPP),y) +INIH_CONF_OPTS += -Dwith_INIReader=true +else +INIH_CONF_OPTS += -Dwith_INIReader=false +endif + +$(eval $(meson-package)) From patchwork Sun Jan 10 21:24:51 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Bernd Kuhls X-Patchwork-Id: 1424313 Return-Path: X-Original-To: incoming-buildroot@patchwork.ozlabs.org Delivered-To: patchwork-incoming-buildroot@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=busybox.net (client-ip=140.211.166.133; helo=hemlock.osuosl.org; envelope-from=buildroot-bounces@busybox.net; receiver=) Authentication-Results: ozlabs.org; dmarc=none (p=none dis=none) header.from=t-online.de Received: from hemlock.osuosl.org (smtp2.osuosl.org [140.211.166.133]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 4DDVH862Wvz9sWP for ; Mon, 11 Jan 2021 08:25:08 +1100 (AEDT) Received: from localhost (localhost [127.0.0.1]) by hemlock.osuosl.org (Postfix) with ESMTP id CF98487077; Sun, 10 Jan 2021 21:25:03 +0000 (UTC) X-Virus-Scanned: amavisd-new at osuosl.org Received: from hemlock.osuosl.org ([127.0.0.1]) by localhost (.osuosl.org [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id RHe6cJyH8CKt; Sun, 10 Jan 2021 21:25:02 +0000 (UTC) Received: from ash.osuosl.org (ash.osuosl.org [140.211.166.34]) by hemlock.osuosl.org (Postfix) with ESMTP id 572788706D; Sun, 10 Jan 2021 21:25:02 +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 21E991BF426 for ; Sun, 10 Jan 2021 21:25:01 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by whitealder.osuosl.org (Postfix) with ESMTP id 1EC21866DE for ; Sun, 10 Jan 2021 21:25:01 +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 XChXd-lQZFee for ; Sun, 10 Jan 2021 21:24:59 +0000 (UTC) X-Greylist: domain auto-whitelisted by SQLgrey-1.7.6 Received: from mailout04.t-online.de (mailout04.t-online.de [194.25.134.18]) by whitealder.osuosl.org (Postfix) with ESMTPS id AD81586656 for ; Sun, 10 Jan 2021 21:24:59 +0000 (UTC) Received: from fwd33.aul.t-online.de (fwd33.aul.t-online.de [172.20.27.144]) by mailout04.t-online.de (Postfix) with SMTP id E33CA41ED408 for ; Sun, 10 Jan 2021 22:24:57 +0100 (CET) Received: from fli4l.lan.fli4l (SmpBT2ZZQh1YMDYw3GbF5zlB1uVsUmqRdhsAerKBxeM+ER6BCtPyM-M1V31DwrWQmm@[91.58.7.116]) by fwd33.t-online.de with (TLSv1:ECDHE-RSA-AES256-SHA encrypted) esmtp id 1kyiCj-076FIe0; Sun, 10 Jan 2021 22:24:53 +0100 Received: from mahler.lan.fli4l ([192.168.1.1]:54304) by fli4l.lan.fli4l with esmtp (Exim 4.94) (envelope-from ) id 1kyiCi-0008Mo-B8 for buildroot@buildroot.org; Sun, 10 Jan 2021 22:24:52 +0100 From: Bernd Kuhls To: buildroot@buildroot.org Date: Sun, 10 Jan 2021 22:24:51 +0100 Message-Id: <20210110212451.136365-2-bernd.kuhls@t-online.de> X-Mailer: git-send-email 2.29.2 In-Reply-To: <20210110212451.136365-1-bernd.kuhls@t-online.de> References: <20210110212451.136365-1-bernd.kuhls@t-online.de> MIME-Version: 1.0 X-ID: SmpBT2ZZQh1YMDYw3GbF5zlB1uVsUmqRdhsAerKBxeM+ER6BCtPyM-M1V31DwrWQmm X-TOI-EXPURGATEID: 150726::1610313893-0000F1CF-D4367FC5/0/0 CLEAN NORMAL X-TOI-MSGID: 167ae082-52eb-4d6d-a782-01c4db5a22e1 Subject: [Buildroot] [PATCH 2/2] package/xfsprogs: bump version to 5.10.0 X-BeenThere: buildroot@busybox.net X-Mailman-Version: 2.1.29 Precedence: list List-Id: Discussion and development of buildroot List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: buildroot-bounces@busybox.net Sender: "buildroot" Release notes: https://www.spinics.net/lists/linux-xfs/msg47553.html Added dependency to inih: https://www.spinics.net/lists/linux-xfs/msg47554.html Signed-off-by: Bernd Kuhls --- package/xfsprogs/Config.in | 1 + package/xfsprogs/xfsprogs.hash | 2 +- package/xfsprogs/xfsprogs.mk | 4 ++-- 3 files changed, 4 insertions(+), 3 deletions(-) diff --git a/package/xfsprogs/Config.in b/package/xfsprogs/Config.in index 024cde9fe6..b8e07cc83d 100644 --- a/package/xfsprogs/Config.in +++ b/package/xfsprogs/Config.in @@ -6,6 +6,7 @@ config BR2_PACKAGE_XFSPROGS bool "xfsprogs" depends on BR2_USE_MMU # fork() depends on BR2_TOOLCHAIN_HAS_THREADS + select BR2_PACKAGE_INIH select BR2_PACKAGE_UTIL_LINUX select BR2_PACKAGE_UTIL_LINUX_LIBUUID select BR2_PACKAGE_UTIL_LINUX_LIBBLKID diff --git a/package/xfsprogs/xfsprogs.hash b/package/xfsprogs/xfsprogs.hash index 79f953b33c..b379839e7e 100644 --- a/package/xfsprogs/xfsprogs.hash +++ b/package/xfsprogs/xfsprogs.hash @@ -1,5 +1,5 @@ # From https://www.kernel.org/pub/linux/utils/fs/xfs/xfsprogs/sha256sums.asc -sha256 8ef46ed9e6bb927f407f541dc4324857c908ddf1374265edc910d23724048c6b xfsprogs-5.8.0.tar.xz +sha256 e04017e46d43e4d54b9a560fd7cea922520f8f6ef882404969d20cd4e5c790e9 xfsprogs-5.10.0.tar.xz # Hash for license files sha256 f6b78c087c3ebdf0f3c13415070dd480a3f35d8fc76f3d02180a407c1c812f79 LICENSES/GPL-2.0 diff --git a/package/xfsprogs/xfsprogs.mk b/package/xfsprogs/xfsprogs.mk index bfaf9fd712..71d02278e9 100644 --- a/package/xfsprogs/xfsprogs.mk +++ b/package/xfsprogs/xfsprogs.mk @@ -4,13 +4,13 @@ # ################################################################################ -XFSPROGS_VERSION = 5.8.0 +XFSPROGS_VERSION = 5.10.0 XFSPROGS_SITE = $(BR2_KERNEL_MIRROR)/linux/utils/fs/xfs/xfsprogs XFSPROGS_SOURCE = xfsprogs-$(XFSPROGS_VERSION).tar.xz XFSPROGS_LICENSE = GPL-2.0, GPL-2.0+, LGPL-2.1 (libhandle, few headers) XFSPROGS_LICENSE_FILES = LICENSES/GPL-2.0 LICENSES/LGPL-2.1 -XFSPROGS_DEPENDENCIES = util-linux +XFSPROGS_DEPENDENCIES = inih util-linux XFSPROGS_CONF_ENV = ac_cv_header_aio_h=yes ac_cv_lib_rt_lio_listio=yes PLATFORM="linux" XFSPROGS_CONF_OPTS = \