Gentoo Archives: gentoo-commits

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