From patchwork Sat Jun 4 11:54:58 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Heiko Thiery X-Patchwork-Id: 1638933 Return-Path: X-Original-To: incoming-buildroot@patchwork.ozlabs.org Delivered-To: patchwork-incoming-buildroot@bilbo.ozlabs.org Authentication-Results: bilbo.ozlabs.org; dkim=fail reason="signature verification failed" (2048-bit key; unprotected) header.d=gmail.com header.i=@gmail.com header.a=rsa-sha256 header.s=20210112 header.b=V01vBRlU; dkim-atps=neutral Authentication-Results: ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=buildroot.org (client-ip=140.211.166.138; helo=smtp1.osuosl.org; envelope-from=buildroot-bounces@buildroot.org; receiver=) Received: from smtp1.osuosl.org (smtp1.osuosl.org [140.211.166.138]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits) server-digest SHA256) (No client certificate requested) by bilbo.ozlabs.org (Postfix) with ESMTPS id 4LFdVJ6Zg2z9sGJ for ; Sat, 4 Jun 2022 21:55:20 +1000 (AEST) Received: from localhost (localhost [127.0.0.1]) by smtp1.osuosl.org (Postfix) with ESMTP id 485B8844B6; Sat, 4 Jun 2022 11:55:19 +0000 (UTC) X-Virus-Scanned: amavisd-new at osuosl.org Received: from smtp1.osuosl.org ([127.0.0.1]) by localhost (smtp1.osuosl.org [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id eaz7I2jxZfPK; Sat, 4 Jun 2022 11:55:18 +0000 (UTC) Received: from ash.osuosl.org (ash.osuosl.org [140.211.166.34]) by smtp1.osuosl.org (Postfix) with ESMTP id 58C4F844B3; Sat, 4 Jun 2022 11:55:17 +0000 (UTC) X-Original-To: buildroot@lists.busybox.net Delivered-To: buildroot@osuosl.org Received: from smtp4.osuosl.org (smtp4.osuosl.org [140.211.166.137]) by ash.osuosl.org (Postfix) with ESMTP id 301171BF5AA for ; Sat, 4 Jun 2022 11:55:16 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by smtp4.osuosl.org (Postfix) with ESMTP id 1D51241B3F for ; Sat, 4 Jun 2022 11:55:16 +0000 (UTC) X-Virus-Scanned: amavisd-new at osuosl.org Authentication-Results: smtp4.osuosl.org (amavisd-new); dkim=pass (2048-bit key) header.d=gmail.com Received: from smtp4.osuosl.org ([127.0.0.1]) by localhost (smtp4.osuosl.org [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id YrbjpeVZctKe for ; Sat, 4 Jun 2022 11:55:14 +0000 (UTC) X-Greylist: whitelisted by SQLgrey-1.8.0 Received: from mail-ej1-x62e.google.com (mail-ej1-x62e.google.com [IPv6:2a00:1450:4864:20::62e]) by smtp4.osuosl.org (Postfix) with ESMTPS id 91A5941A1E for ; Sat, 4 Jun 2022 11:55:14 +0000 (UTC) Received: by mail-ej1-x62e.google.com with SMTP id s12so13283599ejx.3 for ; Sat, 04 Jun 2022 04:55:14 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; h=from:to:cc:subject:date:message-id:mime-version :content-transfer-encoding; bh=aNuXXCdE44b6f+0zzJKrkD/bH/DTUoiCOnABdcZf+TI=; b=V01vBRlUxVKipb+33nlQAK9yWyV6XsWglRP02b0K+mg+voJZvwyNvSSf2EedPT/+mM t2Egs4rcP+TlCt45g0xLdYRLo+jZyHI+OwIvAIynxyDqmX/3f6D8DzB5vLOI/3OeyGoe 5lB3HO1ev5a4D4TMmxthjz0PqEcLfMmlrcvBjcBsxUnwgoNMfyBuqrVcxBBWp8kb0Mri gWKfwqsxnr0Oe3egesdNG52QFZL9OT2b4eIVZc/XO2jXi97WOAl9MOlz+IC5bZDqKiFF yP/ib2LJPs4KYE3yFe9++pecfDScdhWqk5ux1gmEMNy6C+9DsvSigLH5PDB/ViRl5K87 GH9w== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:from:to:cc:subject:date:message-id:mime-version :content-transfer-encoding; bh=aNuXXCdE44b6f+0zzJKrkD/bH/DTUoiCOnABdcZf+TI=; b=Ww540xSQaHNELfwn2/8NngMKBkdxx1t6PEzOWQccUY6GBxPJSqPU808caAKgOWj0G4 AODgH4vPJQIiIiuXGeRKZE53gF1WCz3SNgX7OWpy3Hdzg0li1hrVvIqmAMAFpxIciAPa QUuxgt0IREYiLDoZWREkRlUFl1uyfsJaKW3PF90MAwpG5m4ESpGKgLnZrwXgXZpbob7G cJTrSNPivQotwkVBToXD97m9135dqEcqcjw0XtxUuRQDJHywTPHWCfJT7DyShwqGc5tl uK/QOxkIVkiqw1yS4alTBaGbLxOhiCLSxFGzZC7iXxnYal2pEWYoL9zyH4PYpQX9QqT6 lmgg== X-Gm-Message-State: AOAM53166aSXHjcYLxbq1iMlhQTSPMsd1n7pG/BxUSY6B6f0MmSD5ZXn 0mOxc1sSJLTw8botUl79KdUx4HgfMvU= X-Google-Smtp-Source: ABdhPJyHxCanI8Re0V+Jm9XDoZKRCqsTN9AcyQ+Uqg3nb84EnlieVN4c4StkmOapscmQzPOe60slfQ== X-Received: by 2002:a17:907:60d3:b0:6f5:c4c3:2f96 with SMTP id hv19-20020a17090760d300b006f5c4c32f96mr12567524ejc.724.1654343712294; Sat, 04 Jun 2022 04:55:12 -0700 (PDT) Received: from t450s.fritz.box (ip4d15a215.dynamic.kabel-deutschland.de. [77.21.162.21]) by smtp.gmail.com with ESMTPSA id d10-20020a1709063cea00b006f3ef214e5bsm3891829ejh.193.2022.06.04.04.55.11 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sat, 04 Jun 2022 04:55:11 -0700 (PDT) From: Heiko Thiery To: buildroot@buildroot.org Date: Sat, 4 Jun 2022 13:54:58 +0200 Message-Id: <20220604115458.7914-1-heiko.thiery@gmail.com> X-Mailer: git-send-email 2.20.1 MIME-Version: 1.0 Subject: [Buildroot] [PATCH 1/2] package/rauc: bump to version 1.7 X-BeenThere: buildroot@buildroot.org 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: , Cc: Heiko Thiery , Fabrice Fontaine , Andrey Yurovsky Errors-To: buildroot-bounces@buildroot.org Sender: "buildroot" Drop patch that is already in upstream. Signed-off-by: Heiko Thiery --- ...src-verify_hash.c-include-inttypes.h.patch | 38 ------------------- package/rauc/rauc.hash | 2 +- package/rauc/rauc.mk | 2 +- 3 files changed, 2 insertions(+), 40 deletions(-) delete mode 100644 package/rauc/0001-src-verify_hash.c-include-inttypes.h.patch diff --git a/package/rauc/0001-src-verify_hash.c-include-inttypes.h.patch b/package/rauc/0001-src-verify_hash.c-include-inttypes.h.patch deleted file mode 100644 index 916c8cca0b..0000000000 --- a/package/rauc/0001-src-verify_hash.c-include-inttypes.h.patch +++ /dev/null @@ -1,38 +0,0 @@ -From b19a9c26d88a913417e77aaf60c72cdbf393d1f6 Mon Sep 17 00:00:00 2001 -From: Fabrice Fontaine -Date: Tue, 31 May 2022 21:22:36 +0200 -Subject: [PATCH] src/verify_hash.c: include inttypes.h - -Include inttypes.h to avoid the following build failure: - -In file included from /nvmedata/autobuild/instance-22/output-1/host/bin/../sparc-buildroot-linux-uclibc/sysroot/usr/include/glib-2.0/glib.h:62, - from src/verity_hash.c:26: -src/verity_hash.c: In function 'verify_zero': -src/verity_hash.c:69:55: error: expected ')' before 'PRIu64' - 69 | g_message("Spare area is not zeroed at position %" PRIu64 ".", - | ^~~~~~ - -Fixes: - - http://autobuild.buildroot.org/results/1a093c0e194a061836884419d2f50506105db01e - -Signed-off-by: Fabrice Fontaine -[Upstream status: https://github.com/rauc/rauc/pull/914] ---- - src/verity_hash.c | 1 + - 1 file changed, 1 insertion(+) - -diff --git a/src/verity_hash.c b/src/verity_hash.c -index db82a78..3b2c2a0 100644 ---- a/src/verity_hash.c -+++ b/src/verity_hash.c -@@ -19,6 +19,7 @@ - */ - - #include -+#include - #include - #include - #include --- -2.35.1 - diff --git a/package/rauc/rauc.hash b/package/rauc/rauc.hash index f6c1446de4..677d358158 100644 --- a/package/rauc/rauc.hash +++ b/package/rauc/rauc.hash @@ -1,4 +1,4 @@ # Locally calculated, after verifying against # https://github.com/rauc/rauc/releases/download/v1.6/rauc-1.6.tar.xz.asc -sha256 86013788dd02321b7c3f913ad3a1f8802afbc784ec076fa278524a9e1ef9e7b0 rauc-1.6.tar.xz +sha256 8b7d37cc1eb57df4f03de3c943dd7be290b78d47be28881e8b1f070e1d5e55df rauc-1.7.tar.xz sha256 dc626520dcd53a22f727af3ee42c770e56c97a64fe3adb063799d8ab032fe551 COPYING diff --git a/package/rauc/rauc.mk b/package/rauc/rauc.mk index 0520b30521..90b2317d4b 100644 --- a/package/rauc/rauc.mk +++ b/package/rauc/rauc.mk @@ -4,7 +4,7 @@ # ################################################################################ -RAUC_VERSION = 1.6 +RAUC_VERSION = 1.7 RAUC_SITE = https://github.com/rauc/rauc/releases/download/v$(RAUC_VERSION) RAUC_SOURCE = rauc-$(RAUC_VERSION).tar.xz RAUC_LICENSE = LGPL-2.1 From patchwork Sat Jun 4 11:55:00 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Heiko Thiery X-Patchwork-Id: 1638934 Return-Path: X-Original-To: incoming-buildroot@patchwork.ozlabs.org Delivered-To: patchwork-incoming-buildroot@bilbo.ozlabs.org Authentication-Results: bilbo.ozlabs.org; dkim=fail reason="signature verification failed" (2048-bit key; unprotected) header.d=gmail.com header.i=@gmail.com header.a=rsa-sha256 header.s=20210112 header.b=iPjdKxnE; dkim-atps=neutral Authentication-Results: ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=buildroot.org (client-ip=2605:bc80:3010::137; helo=smtp4.osuosl.org; envelope-from=buildroot-bounces@buildroot.org; receiver=) Received: from smtp4.osuosl.org (smtp4.osuosl.org [IPv6:2605:bc80:3010::137]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits) server-digest SHA256) (No client certificate requested) by bilbo.ozlabs.org (Postfix) with ESMTPS id 4LFdVq39gTz9sGJ for ; Sat, 4 Jun 2022 21:55:47 +1000 (AEST) Received: from localhost (localhost [127.0.0.1]) by smtp4.osuosl.org (Postfix) with ESMTP id 8DF3841B58; Sat, 4 Jun 2022 11:55:43 +0000 (UTC) X-Virus-Scanned: amavisd-new at osuosl.org Received: from smtp4.osuosl.org ([127.0.0.1]) by localhost (smtp4.osuosl.org [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id 4B6MiMsoHwKv; Sat, 4 Jun 2022 11:55:41 +0000 (UTC) Received: from ash.osuosl.org (ash.osuosl.org [140.211.166.34]) by smtp4.osuosl.org (Postfix) with ESMTP id EA6C241B3F; Sat, 4 Jun 2022 11:55:39 +0000 (UTC) X-Original-To: buildroot@lists.busybox.net Delivered-To: buildroot@osuosl.org Received: from smtp3.osuosl.org (smtp3.osuosl.org [140.211.166.136]) by ash.osuosl.org (Postfix) with ESMTP id DDD7B1BF5AA for ; Sat, 4 Jun 2022 11:55:38 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by smtp3.osuosl.org (Postfix) with ESMTP id CCF7A61181 for ; Sat, 4 Jun 2022 11:55:38 +0000 (UTC) X-Virus-Scanned: amavisd-new at osuosl.org Authentication-Results: smtp3.osuosl.org (amavisd-new); dkim=pass (2048-bit key) header.d=gmail.com Received: from smtp3.osuosl.org ([127.0.0.1]) by localhost (smtp3.osuosl.org [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id 0NyAIGYfYbUJ for ; Sat, 4 Jun 2022 11:55:38 +0000 (UTC) X-Greylist: whitelisted by SQLgrey-1.8.0 Received: from mail-ej1-x62d.google.com (mail-ej1-x62d.google.com [IPv6:2a00:1450:4864:20::62d]) by smtp3.osuosl.org (Postfix) with ESMTPS id 0D37860E70 for ; Sat, 4 Jun 2022 11:55:37 +0000 (UTC) Received: by mail-ej1-x62d.google.com with SMTP id bg6so666031ejb.0 for ; Sat, 04 Jun 2022 04:55:37 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=Fkbrxq6CRtzCK/zgS7r90ITUBExzmxjNtokOcgLzNuI=; b=iPjdKxnEVc3nQW0Kh71JMPLSlFHvrpRzpjRTa2O9A99bNREvbNEjnQ0O7krvcOx+cf BC64NHH3YWm3su4CcP3QVIoWxtAGyX6wxJ/KQuFxTMkOXaqlbCUBfZgHNllPm3y+UUvk YpcS8vki6JmnecjXzQxUN6Mc/FXmsLiUicKN72kTS5ollMwdZWjzkk5DF03DqFqrBqn5 0lslz4lJvommGpnZTh+GbEChzargnfg4xryaCogXMauQAmpVL2HTVs1yQp27zxpNcfjS gacn7NnZWRhEFp+zihPdntqW+7iaHaZilKAxrR1bfUn7djBvD8gIfNsu0RQjt4z3YUlQ s3xg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=Fkbrxq6CRtzCK/zgS7r90ITUBExzmxjNtokOcgLzNuI=; b=PnGh2hWpLy9KFky+S06WOuMOHVuYRtk/VKLSN2LUk8qOQjjNJuXQ5RfR7zIohEyyhP ncQd9MoDPl2lojX98P+Gm0YkJrSrpHn51EM51vdtG701EMih+vCriOFX/3bHaLr8EMXU k9CVtpfIR7JK0sBkfP4arDp/epLmiJSUbA/h+xrd5WXx21WqxIHMXBkv5v104bewAYD9 yozYrD6plzxYlDpM4ED/dKunWCk3h4rvzI9zs+E//ZKJN58tsbtc1agTXPc/xC0nUVWY K47Snh+zPWW/kHlnzF4ugMqp1CbLFz4dsOOFRDiFx+0TmW7Wvaxb/ER3tRAWdzvzJBgO ZGrA== X-Gm-Message-State: AOAM531VLVD6MdvnrPkT3fhhWJBfuRz3vpoKacbOwJTf6MilAcMn2JVn vDJ3cjwayVnWdIT9+fi6urt7WfEZbHc= X-Google-Smtp-Source: ABdhPJytK6UEO3h4Sl+asfwwqPCQBImW2W5DAUJD2OKNI3ZcR2EBPKX2fyDuHEVH8CSXtgRkoE4iTg== X-Received: by 2002:a17:906:58d2:b0:6fd:daa7:3a6e with SMTP id e18-20020a17090658d200b006fddaa73a6emr12792041ejs.0.1654343735784; Sat, 04 Jun 2022 04:55:35 -0700 (PDT) Received: from t450s.fritz.box (ip4d15a215.dynamic.kabel-deutschland.de. [77.21.162.21]) by smtp.gmail.com with ESMTPSA id d10-20020a1709063cea00b006f3ef214e5bsm3891829ejh.193.2022.06.04.04.55.35 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sat, 04 Jun 2022 04:55:35 -0700 (PDT) From: Heiko Thiery To: buildroot@buildroot.org Date: Sat, 4 Jun 2022 13:55:00 +0200 Message-Id: <20220604115458.7914-2-heiko.thiery@gmail.com> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20220604115458.7914-1-heiko.thiery@gmail.com> References: <20220604115458.7914-1-heiko.thiery@gmail.com> MIME-Version: 1.0 Subject: [Buildroot] [PATCH 2/2] package/rauc: add option to enable/disable streaming support X-BeenThere: buildroot@buildroot.org 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: , Cc: Heiko Thiery , Andrey Yurovsky Errors-To: buildroot-bounces@buildroot.org Sender: "buildroot" RAUC 1.7 introduces streaming update support. Make this configurable and add required dependency to libnl. Signed-off-by: Heiko Thiery --- package/rauc/Config.in | 13 +++++++++++++ package/rauc/rauc.mk | 7 +++++++ 2 files changed, 20 insertions(+) diff --git a/package/rauc/Config.in b/package/rauc/Config.in index 1170e50845..fe029c73ca 100644 --- a/package/rauc/Config.in +++ b/package/rauc/Config.in @@ -40,6 +40,19 @@ config BR2_PACKAGE_RAUC_NETWORK This option enables support for updating firmware over the network using libcurl. +comment "rauc streaming support needs network support" + depends on !BR2_PACKAGE_RAUC_NETWORK + +if BR2_PACKAGE_RAUC_NETWORK + +config BR2_PACKAGE_RAUC_STREAMING + bool "streaming update support" + select BR2_PACKAGE_LIBNL + help + This option enables support for streaming update mode. + +endif + config BR2_PACKAGE_RAUC_JSON bool "JSON output support" select BR2_PACKAGE_JSON_GLIB diff --git a/package/rauc/rauc.mk b/package/rauc/rauc.mk index 90b2317d4b..8bfb0b79ba 100644 --- a/package/rauc/rauc.mk +++ b/package/rauc/rauc.mk @@ -52,6 +52,13 @@ else RAUC_CONF_OPTS += --disable-json endif +ifeq ($(BR2_PACKAGE_RAUC_STREAMING),y) +RAUC_CONF_OPTS += --enable-streaming +RAUC_DEPENDENCIES += libnl +else +RAUC_CONF_OPTS += --disable-streaming +endif + HOST_RAUC_DEPENDENCIES = \ host-pkgconf \ host-openssl \