[gentoo-commits] repo/proj/guru:master commit in: dev-embedded/rauc/, dev-embedded/rauc/files/

["Haelwenn Monnier" <contact@hacktivis.me>]

commit:     9d278e82dc14b3c1978f36207982e9fa8fe3d26a
Author:     Kurt Kanzenbach <kurt <AT> kmk-computers <DOT> de>
AuthorDate: Fri Dec 25 11:00:33 2020 +0000
Commit:     Haelwenn Monnier <contact <AT> hacktivis <DOT> me>
CommitDate: Fri Dec 25 11:02:42 2020 +0000
URL:        https://gitweb.gentoo.org/repo/proj/guru.git/commit/?id=9d278e82

dev-embedded/rauc: Add v1.5

Package-Manager: Portage-3.0.9, Repoman-3.0.2
Signed-off-by: Kurt Kanzenbach <kurt <AT> kmk-computers.de>

 dev-embedded/rauc/Manifest                   |  1 +
 dev-embedded/rauc/files/rauc-1.5-tests.patch | 72 ++++++++++++++++++++++++++++
 dev-embedded/rauc/metadata.xml               |  3 ++
 dev-embedded/rauc/rauc-1.5.ebuild            | 65 +++++++++++++++++++++++++
 4 files changed, 141 insertions(+)

diff --git a/dev-embedded/rauc/Manifest b/dev-embedded/rauc/Manifest
index 6e64fb69..1ac0fce7 100644
--- a/dev-embedded/rauc/Manifest
+++ b/dev-embedded/rauc/Manifest
@@ -1 +1,2 @@
 DIST rauc-1.4.tar.xz 807676 BLAKE2B e8dc46daf861c4ff5e80ac5af08eb03afb071b313dce38cbc127205f24c2f25793f51812c95ae4a0d914ea4cfec257ee06e3776b78b20488a6a33edd9b08e5c0 SHA512 6ac572d396cae609060ff4a7d2a26f5b8ed839504e76628f47388b1dac93ad1794114a9c105c5a9eb070478f9bd1b6f2cd6aeb5e84c64fdce4d7cbe30bb9ea31
+DIST rauc-1.5.tar.xz 826404 BLAKE2B 6ef8e16299e666be525fdfc3db3933b8944b41950821313dd76178e638827aeec93b608ddba26b3b0a22e493946748c49d3cd19fbc9f2a3f739c156dde83b8bb SHA512 5d942993e5db87440aee589722efc2e5d2151941c99652d25831192f8a6e1c9955f74512a92f45c052ddeec29f02a10119346f56bb200202c1d02a6d7fff699c

diff --git a/dev-embedded/rauc/files/rauc-1.5-tests.patch b/dev-embedded/rauc/files/rauc-1.5-tests.patch
new file mode 100644
index 00000000..2459d6ca
--- /dev/null
+++ b/dev-embedded/rauc/files/rauc-1.5-tests.patch
@@ -0,0 +1,72 @@
+From cfeab43e8c1ebbe952bca9b71fb8400a9947d229 Mon Sep 17 00:00:00 2001
+From: Kurt Kanzenbach <kurt@kmk-computers.de>
+Date: Sat, 15 Aug 2020 08:45:21 +0200
+Subject: [PATCH] tests: Disable failed tests
+
+The network and squashfs tests won't work within portage. Disable them.
+
+Signed-off-by: Kurt Kanzenbach <kurt@kmk-computers.de>
+---
+ Makefile.am |  7 -------
+ test/rauc.t | 20 ++++++++++----------
+ 2 files changed, 10 insertions(+), 17 deletions(-)
+
+diff --git a/Makefile.am b/Makefile.am
+index d394a53b607a..79098ec5d1c8 100644
+--- a/Makefile.am
++++ b/Makefile.am
+@@ -155,10 +155,6 @@ check_PROGRAMS = \
+ 	test/progress.test \
+ 	test/slot.test
+ 
+-if WANT_NETWORK
+-check_PROGRAMS += test/network.test
+-endif
+-
+ if WANT_JSON
+ check_PROGRAMS += test/boot_switch.test
+ endif
+@@ -242,9 +238,6 @@ test_utils_test_LDADD = librauctest.la
+ test_install_test_SOURCES = test/install.c
+ test_install_test_LDADD = librauctest.la
+ 
+-test_network_test_SOURCES = test/network.c
+-test_network_test_LDADD = librauctest.la
+-
+ test_progress_test_SOURCES = test/progress.c
+ test_progress_test_LDADD = librauctest.la
+ 
+diff --git a/test/rauc.t b/test/rauc.t
+index 20e7f59221bc..43d82cd3a583 100755
+--- a/test/rauc.t
++++ b/test/rauc.t
+@@ -270,16 +270,16 @@ test_expect_success "rauc bundle" "
+   test -f ${TEST_TMPDIR}/out.raucb
+ "
+ 
+-test_expect_success "rauc bundle mksquashfs extra args" "
+-  rm -f ${TEST_TMPDIR}/out.raucb &&
+-  rauc \
+-    --cert $SHARNESS_TEST_DIRECTORY/openssl-ca/dev/autobuilder-1.cert.pem \
+-    --key $SHARNESS_TEST_DIRECTORY/openssl-ca/dev/private/autobuilder-1.pem \
+-    bundle \
+-    --mksquashfs-args=\"-comp xz -info -progress\" \
+-    $SHARNESS_TEST_DIRECTORY/install-content ${TEST_TMPDIR}/out.raucb &&
+-  rauc -c $SHARNESS_TEST_DIRECTORY/test.conf info ${TEST_TMPDIR}/out.raucb
+-"
++# test_expect_success "rauc bundle mksquashfs extra args" "
++#   rm -f ${TEST_TMPDIR}/out.raucb &&
++#   rauc \
++#     --cert $SHARNESS_TEST_DIRECTORY/openssl-ca/dev/autobuilder-1.cert.pem \
++#     --key $SHARNESS_TEST_DIRECTORY/openssl-ca/dev/private/autobuilder-1.pem \
++#     bundle \
++#     --mksquashfs-args=\"-comp xz -info -progress\" \
++#     $SHARNESS_TEST_DIRECTORY/install-content ${TEST_TMPDIR}/out.raucb &&
++#   rauc -c $SHARNESS_TEST_DIRECTORY/test.conf info ${TEST_TMPDIR}/out.raucb
++# "
+ 
+ test_expect_success PKCS11 "rauc bundle with PKCS11 (key 1)" "
+   rm -f ${TEST_TMPDIR}/out.raucb &&
+-- 
+2.26.2
+

diff --git a/dev-embedded/rauc/metadata.xml b/dev-embedded/rauc/metadata.xml
index 699bca6b..877afe8f 100644
--- a/dev-embedded/rauc/metadata.xml
+++ b/dev-embedded/rauc/metadata.xml
@@ -12,6 +12,9 @@
     create, inspect and modify update artifacts for your device.
   </longdescription>
   <use>
+    <flag name="gpt">
+      Add GPT support
+    </flag>
     <flag name="json">
       Add JSON support
     </flag>

diff --git a/dev-embedded/rauc/rauc-1.5.ebuild b/dev-embedded/rauc/rauc-1.5.ebuild
new file mode 100644
index 00000000..f839e95d
--- /dev/null
+++ b/dev-embedded/rauc/rauc-1.5.ebuild
@@ -0,0 +1,65 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python3_{7..9} )
+DOCS_BUILDER="sphinx"
+DOCS_DIR="${S}/docs"
+
+inherit autotools python-any-r1 docs
+
+DESCRIPTION="Lightweight update client that runs on your Embedded Linux device"
+HOMEPAGE="https://rauc.io/"
+SRC_URI="https://github.com/${PN}/${PN}/releases/download/v${PV}/${P}.tar.xz"
+
+SLOT="0"
+LICENSE="LGPL-2.1"
+KEYWORDS="~amd64"
+IUSE="gpt json network service test"
+
+RESTRICT="!test? ( test )"
+
+BDEPEND="
+	dev-util/gdbus-codegen
+	virtual/pkgconfig
+	test? (
+		dev-libs/opensc
+		net-misc/casync
+		sys-fs/mtd-utils
+		sys-fs/squashfs-tools
+		sys-libs/libfaketime
+	)
+"
+RDEPEND="
+	dev-libs/glib:2
+	dev-libs/openssl:0=
+	json? ( dev-libs/json-glib )
+	network? ( net-misc/curl )
+	service? ( sys-apps/dbus )
+"
+DEPEND="
+	${RDEPEND}
+"
+
+PATCHES=( "${FILESDIR}/${P}-tests.patch" )
+
+src_prepare() {
+	default
+	eautoreconf
+}
+
+src_configure() {
+	local myconf=(
+		$(use_enable gpt)
+		$(use_enable json)
+		$(use_enable network)
+		$(use_enable service)
+	)
+	econf "${myconf[@]}"
+}
+
+src_compile() {
+	default
+	docs_compile
+}