Gentoo Archives: gentoo-commits

From: Florian Schmaus <flow@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] repo/proj/guru:master commit in: dev-embedded/rauc/files/, dev-embedded/rauc/
Date: Sat, 26 Feb 2022 18:16:44
Message-Id: 1645822608.8671d54ed327861b789ba740498533abcc5d4b5f.flow@gentoo
1 commit: 8671d54ed327861b789ba740498533abcc5d4b5f
2 Author: Kurt Kanzenbach <kurt <AT> kmk-computers <DOT> de>
3 AuthorDate: Fri Feb 25 20:56:48 2022 +0000
4 Commit: Florian Schmaus <flow <AT> gentoo <DOT> org>
5 CommitDate: Fri Feb 25 20:56:48 2022 +0000
6 URL: https://gitweb.gentoo.org/repo/proj/guru.git/commit/?id=8671d54e
7
8 dev-embedded/rauc: Drop old
9
10 Package-Manager: Portage-3.0.30, Repoman-3.0.3
11 Signed-off-by: Kurt Kanzenbach <kurt <AT> kmk-computers.de>
12
13 dev-embedded/rauc/Manifest | 1 -
14 dev-embedded/rauc/files/rauc-1.5.1-tests.patch | 72 --------------------------
15 dev-embedded/rauc/rauc-1.5.1.ebuild | 65 -----------------------
16 3 files changed, 138 deletions(-)
17
18 diff --git a/dev-embedded/rauc/Manifest b/dev-embedded/rauc/Manifest
19 index 471945007..5a4f3ade0 100644
20 --- a/dev-embedded/rauc/Manifest
21 +++ b/dev-embedded/rauc/Manifest
22 @@ -1,2 +1 @@
23 -DIST rauc-1.5.1.tar.xz 837056 BLAKE2B 9c035925aa0ff84029e6163ac2f5f2e53bba9174db8ab84328809d7cb68d5bb807d4d6e432e30581fa7eb4234444af7b38607a1b6ce208eb803d8ebafe700bea SHA512 d8b20cdf8e2eacbf4cf219ce4d2bd116faac27d951e9100ec154eb6693471b50159f3005c209119e06306355a9687216460206f38238f951642fcd53794ec1ea
24 DIST rauc-1.6.tar.xz 878684 BLAKE2B 0fa4686db47793fefb675d3f3b873741a46a7f7ae4bdf931d66dfcba480963504b9d140edf65c4f88aff9753e61658f56e39189603a51d52583a90b50b1b810c SHA512 265646e3abb97c47344a8c9a62c022824b5cae12264915a06987ba4f9d63f25ee56b7e7df5aa59489bdb3f34cad72b6ec1c4b58d041e6203dab529b517ec0388
25
26 diff --git a/dev-embedded/rauc/files/rauc-1.5.1-tests.patch b/dev-embedded/rauc/files/rauc-1.5.1-tests.patch
27 deleted file mode 100644
28 index 2459d6ca8..000000000
29 --- a/dev-embedded/rauc/files/rauc-1.5.1-tests.patch
30 +++ /dev/null
31 @@ -1,72 +0,0 @@
32 -From cfeab43e8c1ebbe952bca9b71fb8400a9947d229 Mon Sep 17 00:00:00 2001
33 -From: Kurt Kanzenbach <kurt@×××××××××××××.de>
34 -Date: Sat, 15 Aug 2020 08:45:21 +0200
35 -Subject: [PATCH] tests: Disable failed tests
36 -
37 -The network and squashfs tests won't work within portage. Disable them.
38 -
39 -Signed-off-by: Kurt Kanzenbach <kurt@×××××××××××××.de>
40 ----
41 - Makefile.am | 7 -------
42 - test/rauc.t | 20 ++++++++++----------
43 - 2 files changed, 10 insertions(+), 17 deletions(-)
44 -
45 -diff --git a/Makefile.am b/Makefile.am
46 -index d394a53b607a..79098ec5d1c8 100644
47 ---- a/Makefile.am
48 -+++ b/Makefile.am
49 -@@ -155,10 +155,6 @@ check_PROGRAMS = \
50 - test/progress.test \
51 - test/slot.test
52 -
53 --if WANT_NETWORK
54 --check_PROGRAMS += test/network.test
55 --endif
56 --
57 - if WANT_JSON
58 - check_PROGRAMS += test/boot_switch.test
59 - endif
60 -@@ -242,9 +238,6 @@ test_utils_test_LDADD = librauctest.la
61 - test_install_test_SOURCES = test/install.c
62 - test_install_test_LDADD = librauctest.la
63 -
64 --test_network_test_SOURCES = test/network.c
65 --test_network_test_LDADD = librauctest.la
66 --
67 - test_progress_test_SOURCES = test/progress.c
68 - test_progress_test_LDADD = librauctest.la
69 -
70 -diff --git a/test/rauc.t b/test/rauc.t
71 -index 20e7f59221bc..43d82cd3a583 100755
72 ---- a/test/rauc.t
73 -+++ b/test/rauc.t
74 -@@ -270,16 +270,16 @@ test_expect_success "rauc bundle" "
75 - test -f ${TEST_TMPDIR}/out.raucb
76 - "
77 -
78 --test_expect_success "rauc bundle mksquashfs extra args" "
79 -- rm -f ${TEST_TMPDIR}/out.raucb &&
80 -- rauc \
81 -- --cert $SHARNESS_TEST_DIRECTORY/openssl-ca/dev/autobuilder-1.cert.pem \
82 -- --key $SHARNESS_TEST_DIRECTORY/openssl-ca/dev/private/autobuilder-1.pem \
83 -- bundle \
84 -- --mksquashfs-args=\"-comp xz -info -progress\" \
85 -- $SHARNESS_TEST_DIRECTORY/install-content ${TEST_TMPDIR}/out.raucb &&
86 -- rauc -c $SHARNESS_TEST_DIRECTORY/test.conf info ${TEST_TMPDIR}/out.raucb
87 --"
88 -+# test_expect_success "rauc bundle mksquashfs extra args" "
89 -+# rm -f ${TEST_TMPDIR}/out.raucb &&
90 -+# rauc \
91 -+# --cert $SHARNESS_TEST_DIRECTORY/openssl-ca/dev/autobuilder-1.cert.pem \
92 -+# --key $SHARNESS_TEST_DIRECTORY/openssl-ca/dev/private/autobuilder-1.pem \
93 -+# bundle \
94 -+# --mksquashfs-args=\"-comp xz -info -progress\" \
95 -+# $SHARNESS_TEST_DIRECTORY/install-content ${TEST_TMPDIR}/out.raucb &&
96 -+# rauc -c $SHARNESS_TEST_DIRECTORY/test.conf info ${TEST_TMPDIR}/out.raucb
97 -+# "
98 -
99 - test_expect_success PKCS11 "rauc bundle with PKCS11 (key 1)" "
100 - rm -f ${TEST_TMPDIR}/out.raucb &&
101 ---
102 -2.26.2
103 -
104
105 diff --git a/dev-embedded/rauc/rauc-1.5.1.ebuild b/dev-embedded/rauc/rauc-1.5.1.ebuild
106 deleted file mode 100644
107 index c6419ee09..000000000
108 --- a/dev-embedded/rauc/rauc-1.5.1.ebuild
109 +++ /dev/null
110 @@ -1,65 +0,0 @@
111 -# Copyright 1999-2021 Gentoo Authors
112 -# Distributed under the terms of the GNU General Public License v2
113 -
114 -EAPI=8
115 -
116 -PYTHON_COMPAT=( python3_{8..10} )
117 -DOCS_BUILDER="sphinx"
118 -DOCS_DIR="${S}/docs"
119 -
120 -inherit autotools python-any-r1 docs
121 -
122 -DESCRIPTION="Lightweight update client that runs on your Embedded Linux device"
123 -HOMEPAGE="https://rauc.io/"
124 -SRC_URI="https://github.com/${PN}/${PN}/releases/download/v${PV}/${P}.tar.xz"
125 -
126 -SLOT="0"
127 -LICENSE="LGPL-2.1"
128 -KEYWORDS="~amd64"
129 -IUSE="gpt json network service test"
130 -
131 -RESTRICT="!test? ( test )"
132 -
133 -BDEPEND="
134 - dev-util/gdbus-codegen
135 - virtual/pkgconfig
136 - test? (
137 - dev-libs/opensc
138 - net-misc/casync
139 - sys-fs/mtd-utils
140 - sys-fs/squashfs-tools
141 - sys-libs/libfaketime
142 - )
143 -"
144 -RDEPEND="
145 - dev-libs/glib:2
146 - dev-libs/openssl:0=
147 - json? ( dev-libs/json-glib )
148 - network? ( net-misc/curl )
149 - service? ( sys-apps/dbus )
150 -"
151 -DEPEND="
152 - ${RDEPEND}
153 -"
154 -
155 -PATCHES=( "${FILESDIR}/${P}-tests.patch" )
156 -
157 -src_prepare() {
158 - default
159 - eautoreconf
160 -}
161 -
162 -src_configure() {
163 - local myconf=(
164 - $(use_enable gpt)
165 - $(use_enable json)
166 - $(use_enable network)
167 - $(use_enable service)
168 - )
169 - econf "${myconf[@]}"
170 -}
171 -
172 -src_compile() {
173 - default
174 - docs_compile
175 -}