From patchwork Sun Jan 10 08:35:35 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Yair Ben-Avraham X-Patchwork-Id: 1424207 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.138; helo=whitealder.osuosl.org; envelope-from=buildroot-bounces@busybox.net; receiver=) Authentication-Results: ozlabs.org; dmarc=none (p=none dis=none) header.from=busybox.net Authentication-Results: ozlabs.org; dkim=fail reason="signature verification failed" (1024-bit key; secure) header.d=protonmail.com header.i=@protonmail.com header.a=rsa-sha256 header.s=protonmail header.b=BGmU8c3B; dkim-atps=neutral Received: from whitealder.osuosl.org (smtp1.osuosl.org [140.211.166.138]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 4DD9Cf4x5cz9sVy for ; Sun, 10 Jan 2021 19:35:57 +1100 (AEDT) Received: from localhost (localhost [127.0.0.1]) by whitealder.osuosl.org (Postfix) with ESMTP id A6BB48697B; Sun, 10 Jan 2021 08:35:55 +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 21lJAmafpNFq; Sun, 10 Jan 2021 08:35:54 +0000 (UTC) Received: from ash.osuosl.org (ash.osuosl.org [140.211.166.34]) by whitealder.osuosl.org (Postfix) with ESMTP id 7FA9686912; Sun, 10 Jan 2021 08:35:54 +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 8E8861BF278 for ; Sun, 10 Jan 2021 08:35:52 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by whitealder.osuosl.org (Postfix) with ESMTP id 8993A86912 for ; Sun, 10 Jan 2021 08:35:52 +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 Dmx9VNjsckrV for ; Sun, 10 Jan 2021 08:35:49 +0000 (UTC) X-Greylist: domain auto-whitelisted by SQLgrey-1.7.6 Received: from mail-40131.protonmail.ch (mail-40131.protonmail.ch [185.70.40.131]) by whitealder.osuosl.org (Postfix) with ESMTPS id 45E218690A for ; Sun, 10 Jan 2021 08:35:49 +0000 (UTC) Date: Sun, 10 Jan 2021 08:35:35 +0000 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=protonmail.com; s=protonmail; t=1610267745; bh=AMXjBPjL3sqdriqhkg+0qFEDgVBu4rE8NXIG5wtC2qo=; h=Date:To:From:Reply-To:Subject:From; b=BGmU8c3B+EqIYRfflBDm6QKyrDuMgww7ls/oqthODRWxE18+7OF8afc0MOwAATqfC NyACXxCGQX9ds5rci3GJn3CN7CZ+1ldvkFNZKZmq5mXeO31SVNiW9c8EMDOTsIfVNo zh0wpZvG0E3CNL54ap1yTSuXNgjl9gPjWH5R7lb4= To: "buildroot@buildroot.org" Message-ID: MIME-Version: 1.0 Subject: [Buildroot] [PATCH v3 1/1] package/casync: 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: , From: Yair Ben-Avraham via buildroot Reply-To: Yair Ben-Avraham Errors-To: buildroot-bounces@busybox.net Sender: "buildroot" Content-Addressable Data Synchronization Tool Signed-off-by: Yair Ben-Avraham --- DEVELOPERS | 1 + package/Config.in | 1 + .../0001-Insert-lzma-into-if-directive.patch | 30 ++++++++++ package/casync/Config.in | 13 ++++ package/casync/casync.hash | 3 + package/casync/casync.mk | 60 +++++++++++++++++++ 6 files changed, 108 insertions(+) create mode 100644 package/casync/0001-Insert-lzma-into-if-directive.patch create mode 100644 package/casync/Config.in create mode 100644 package/casync/casync.hash create mode 100644 package/casync/casync.mk -- 2.20.1 diff --git a/DEVELOPERS b/DEVELOPERS index ee175b7586..91d3756557 100644 --- a/DEVELOPERS +++ b/DEVELOPERS @@ -2716,6 +2716,7 @@ F: package/fwup/ N: Yair Ben Avraham F: package/gloox/ +F: package/casync/ N: Yann CARDAILLAC F: package/open62541/ diff --git a/package/Config.in b/package/Config.in index f497fbffde..c24969f723 100644 --- a/package/Config.in +++ b/package/Config.in @@ -2072,6 +2072,7 @@ menu "Networking applications" source "package/c-icap-modules/Config.in" source "package/can-utils/Config.in" source "package/cannelloni/Config.in" + source "package/casync/Config.in" source "package/chrony/Config.in" source "package/civetweb/Config.in" source "package/connman/Config.in" diff --git a/package/casync/0001-Insert-lzma-into-if-directive.patch b/package/casync/0001-Insert-lzma-into-if-directive.patch new file mode 100644 index 0000000000..552294391b --- /dev/null +++ b/package/casync/0001-Insert-lzma-into-if-directive.patch @@ -0,0 +1,30 @@ +From d72e66f87f31f288f5445c3540520a8c82f6ff89 Mon Sep 17 00:00:00 2001 +From: Yair Ben-Avraham +Date: Sun, 10 Jan 2021 06:34:58 +0100 +Subject: [PATCH] Insert lzma into if directive + +lzma is a feature option in meson_options.txt + +Signed-off-by: Yair Ben-Avraham +--- + src/castore.c | 4 +++- + 1 file changed, 3 insertions(+), 1 deletion(-) + +diff --git a/src/castore.c b/src/castore.c +index c290dfd..73cbf8d 100644 +--- a/src/castore.c ++++ b/src/castore.c +@@ -2,7 +2,9 @@ + + #include + #include +-#include ++#if HAVE_LIBLZMA ++# include ++#endif + #include + #include + +-- +2.20.1 + diff --git a/package/casync/Config.in b/package/casync/Config.in new file mode 100644 index 0000000000..89a9520e35 --- /dev/null +++ b/package/casync/Config.in @@ -0,0 +1,13 @@ +config BR2_PACKAGE_CASYNC + bool "casync" + depends on BR2_TOOLCHAIN_USES_GLIBC # scandirat() is not implemented by musl and uclibc-ng + select BR2_PACKAGE_ACL + select BR2_PACKAGE_LIBCURL + select BR2_PACKAGE_OPENSSL + help + Content-Addressable Data Synchronization Tool + + https://github.com/systemd/casync + +comment "casync needs a glibc toolchain" + depends on !BR2_TOOLCHAIN_USES_GLIBC diff --git a/package/casync/casync.hash b/package/casync/casync.hash new file mode 100644 index 0000000000..dbb85520de --- /dev/null +++ b/package/casync/casync.hash @@ -0,0 +1,3 @@ +# sha256 locally computed +sha256 d07f43e70e3c466152033da4c55c065f815d3025234a046c2bce1cfe4ac7d273 casync-4ad9bcb94bc83ff36cfc65515107ea06a88c2dfc.tar.gz +sha256 dc626520dcd53a22f727af3ee42c770e56c97a64fe3adb063799d8ab032fe551 LICENSE.LGPL2.1 diff --git a/package/casync/casync.mk b/package/casync/casync.mk new file mode 100644 index 0000000000..cc00a5e885 --- /dev/null +++ b/package/casync/casync.mk @@ -0,0 +1,60 @@ +################################################################################ +# +# casync +# +################################################################################ + +CASYNC_VERSION = 4ad9bcb94bc83ff36cfc65515107ea06a88c2dfc +CASYNC_SITE = $(call github,systemd,casync,$(CASYNC_VERSION)) +CASYNC_LICENSE = LGPL-2.1+ +CASYNC_LICENSE_FILES = LICENSE.LGPL2.1 +CASYNC_DEPENDENCIES = acl libcurl openssl +CASYNC_CONF_OPTS += -Dman=false + +# meson booleans +ifeq ($(BR2_PACKAGE_LIBFUSE),y) +CASYNC_DEPENDENCIES += libfuse +CASYNC_CONF_OPTS += -Dfuse=true +else +CASYNC_CONF_OPTS += -Dfuse=false +endif + +ifeq ($(BR2_PACKAGE_LIBSELINUX),y) +CASYNC_DEPENDENCIES += libselinux +CASYNC_CONF_OPTS += -Dselinux=true +else +CASYNC_CONF_OPTS += -Dselinux=false +endif + +ifeq ($(BR2_PACKAGE_HAS_UDEV),y) +CASYNC_DEPENDENCIES += libudev +CASYNC_CONF_OPTS += -Dudev=true +else +CASYNC_CONF_OPTS += -Dudev=false +# Due to a bug in ./meson.build, 'udevrulesdir' must not be empty +CASYNC_CONF_OPTS += -Dudevrulesdir=this_is_a_bug +endif + +# meson features +ifeq ($(BR2_PACKAGE_LIBZSTD),y) +CASYNC_DEPENDENCIES += libzstd +CASYNC_CONF_OPTS += -Dlibzstd=enabled +else +CASYNC_CONF_OPTS += -Dlibzstd=disabled +endif + +ifeq ($(BR2_PACKAGE_XZ),y) +CASYNC_DEPENDENCIES += xz +CASYNC_CONF_OPTS += -Dliblzma=enabled +else +CASYNC_CONF_OPTS += -Dliblzma=disabled +endif + +ifeq ($(BR2_PACKAGE_ZLIB),y) +CASYNC_DEPENDENCIES += zlib +CASYNC_CONF_OPTS += -Dlibz=enabled +else +CASYNC_CONF_OPTS += -Dlibz=disabled +endif + +$(eval $(meson-package))