1 |
commit: 8522f8e2ecb6f516f9da23c9988eece74d2ba370 |
2 |
Author: Andrew Ammerlaan <andrewammerlaan <AT> gentoo <DOT> org> |
3 |
AuthorDate: Sun Jul 3 11:55:32 2022 +0000 |
4 |
Commit: Andrew Ammerlaan <andrewammerlaan <AT> gentoo <DOT> org> |
5 |
CommitDate: Sun Jul 3 11:55:32 2022 +0000 |
6 |
URL: https://gitweb.gentoo.org/repo/proj/guru.git/commit/?id=8522f8e2 |
7 |
|
8 |
dev-embedded/esp-idf: treeclean |
9 |
|
10 |
Signed-off-by: Andrew Ammerlaan <andrewammerlaan <AT> gentoo.org> |
11 |
|
12 |
dev-embedded/esp-idf/Manifest | 7 -- |
13 |
dev-embedded/esp-idf/esp-idf-4.4.1.ebuild | 142 ------------------------------ |
14 |
dev-embedded/esp-idf/metadata.xml | 14 --- |
15 |
profiles/package.mask | 5 -- |
16 |
4 files changed, 168 deletions(-) |
17 |
|
18 |
diff --git a/dev-embedded/esp-idf/Manifest b/dev-embedded/esp-idf/Manifest |
19 |
deleted file mode 100644 |
20 |
index 82ad5461b..000000000 |
21 |
--- a/dev-embedded/esp-idf/Manifest |
22 |
+++ /dev/null |
23 |
@@ -1,7 +0,0 @@ |
24 |
-DIST binutils-esp32ulp-linux-amd64-2.28.51-esp-20191205.tar.gz 8248656 BLAKE2B 313e847733f2534d4f5a12609d6757c4245ce4914f1b0e12f2593d8ac559bc615888bed031b83ac8cf4610be9cd3a3aaec8bceb006358f3a386facac3b52d544 SHA512 6ee3af4ed346821f16bf1c029b9cd452453a4cebc8fc64e0b01de2efbf98cea06364d39aab6b3566e615b9d8daab16202b9c50c66776754a232154db30d0b100 |
25 |
-DIST esp-idf-4.4.1.zip 898663301 BLAKE2B b5896efc50a82c1a0c0910f980fd5ce32069b310be4b9efaaf51b735b9b63af9ab04e0192f352021feb26be95955fcc112eb6a66200b4552a13456e6d74551d0 SHA512 cb26959a882231ae8a0747136685314b33daa851a3f15e0d56620dfa1af7f55845e86d9889f9556ad298af79369d95be9e88dd394d94b631df023c7feac7a3cb |
26 |
-DIST openocd-esp32-linux-amd64-0.11.0-esp32-20211220.tar.gz 1901040 BLAKE2B d1fc70dbbb730022162a4d7ebfa5e49880122fb7e12f374be9d168fbe8fab35cd7fb5f81bc573f2d26cbd48f63d5cf41c765f68e1027c36cafa3f3027c7afd82 SHA512 9ea4955a4b204dafefc5c2b99f9557eeedb28320b485193c4478cf797eb09caf9eba9cb0aeb5000482664312daef07f0de9978f7b2c776f6f0973e93875f57b3 |
27 |
-DIST riscv32-esp-elf-gcc8_4_0-esp-2021r2-patch3-linux-amd64.tar.gz 106843321 BLAKE2B 95921f64838d6c5f6e9fc366c7da8e685349e91fc636a2c401d0b0bb6fbc414f54ac0bcff0d6c482173264f1f764c37fefd592941d50f6924720a95b2ef232c4 SHA512 96af5013de4aca521ed3f81f93bb3bd64cb541352663eb1225cad1c5a547a57bafd5f930d3cffaaab057f8f740d83f79a97f4649e2f8f25d9f2002d68d7b9d36 |
28 |
-DIST xtensa-esp32-elf-gcc8_4_0-esp-2021r2-patch3-linux-amd64.tar.gz 90569312 BLAKE2B 7d1f0a2772cffadc4005e579e2f2713c82197171d4e824b088b2bd600739d44caf2d6dce0e3c598a0880417ce84dbc39730f57fde0d553dbfeccbb8fb6cf0810 SHA512 7378e19ca75da07a3454987bdded8e39eb73bb87d604568f482e40a95eba04a65448b63597ec360fcdd4d7df8d1e0cec7ad00d0afb1e63d0484aa8c879f0edad |
29 |
-DIST xtensa-esp32s2-elf-gcc8_4_0-esp-2021r2-patch3-linux-amd64.tar.gz 90894048 BLAKE2B 2f46477d43c585b26dad094b58d6704a61ab7ab5137678fe214cb461944ce9b0f1fe6c7807e9b9e0d20e3e11e9cce3b53b5197a1ae931adc1ebc6909f170318b SHA512 a1c191556367e5137ffb9978725c75aa1b3e96542f8625515824de29caeafccf74eb7e473aa7f49f73a3f400529d275a547309d9e34a2bb0c9c3e2436c596d18 |
30 |
-DIST xtensa-esp32s3-elf-gcc8_4_0-esp-2021r2-patch3-linux-amd64.tar.gz 90903617 BLAKE2B 8d30be8b7610f0f972e87ad9af5f00e2de05e1b52c0cc82da70b021b7cbba3ad0f4693e7d3e0704d5e8a7b0cce7917c180fb3f52a6c8691caad39e7ae3e6d3af SHA512 fc76fb71c02352b2c7daa890d7d73dbcca43b3af2165eb872e3419853e787920b73022a3b826d463064e0d076f0c54f6244151391b938bbc2c031df8c074d6a4 |
31 |
|
32 |
diff --git a/dev-embedded/esp-idf/esp-idf-4.4.1.ebuild b/dev-embedded/esp-idf/esp-idf-4.4.1.ebuild |
33 |
deleted file mode 100644 |
34 |
index 2d21d4be1..000000000 |
35 |
--- a/dev-embedded/esp-idf/esp-idf-4.4.1.ebuild |
36 |
+++ /dev/null |
37 |
@@ -1,142 +0,0 @@ |
38 |
-# Copyright 1999-2022 Gentoo Authors |
39 |
-# Distributed under the terms of the GNU General Public License v2 |
40 |
- |
41 |
-EAPI=8 |
42 |
- |
43 |
-PYTHON_COMPAT=( python3_{8..10} ) |
44 |
- |
45 |
-VER="esp-2021r2-patch3" |
46 |
-CROSSTOOL_URL="https://github.com/espressif/crosstool-NG/releases/download/${VER}" |
47 |
- |
48 |
-inherit python-single-r1 |
49 |
- |
50 |
-DESCRIPTION="Espressif IoT Development Framework" |
51 |
-HOMEPAGE="https://www.espressif.com/" |
52 |
-SRC_URI="https://dl.espressif.com/github_assets/espressif/${PN}/releases/download/v${PV}/${PN}-v${PV}.zip -> ${P}.zip |
53 |
- https://github.com/espressif/binutils-esp32ulp/releases/download/v2.28.51-esp-20191205/binutils-esp32ulp-linux-amd64-2.28.51-esp-20191205.tar.gz |
54 |
- https://github.com/espressif/openocd-esp32/releases/download/v0.11.0-esp32-20211220/openocd-esp32-linux-amd64-0.11.0-esp32-20211220.tar.gz |
55 |
- ${CROSSTOOL_URL}/xtensa-esp32-elf-gcc8_4_0-${VER}-linux-amd64.tar.gz |
56 |
- ${CROSSTOOL_URL}/xtensa-esp32s2-elf-gcc8_4_0-${VER}-linux-amd64.tar.gz |
57 |
- ${CROSSTOOL_URL}/xtensa-esp32s3-elf-gcc8_4_0-${VER}-linux-amd64.tar.gz |
58 |
- ${CROSSTOOL_URL}/riscv32-esp-elf-gcc8_4_0-${VER}-linux-amd64.tar.gz |
59 |
-" |
60 |
- #https://dl.espressif.com/dl/toolchains/preview/riscv32-esp-elf-gcc8_4_0-crosstool-ng-1.24.0-123-g64eb9ff-linux-amd64.tar.gz |
61 |
- |
62 |
-S="${WORKDIR}/${PN}-v${PV}" |
63 |
- |
64 |
-KEYWORDS="~amd64" |
65 |
-LICENSE="Apache-2.0" |
66 |
-SLOT="0" |
67 |
-IUSE="+esp32 esp32s2 esp32s3 riscv32" |
68 |
-REQUIRED_USE="${PYTHON_REQUIRED_USE}" |
69 |
- |
70 |
-RDEPEND="${PYTHON_DEPS} |
71 |
- $(python_gen_cond_dep ' |
72 |
- dev-python/click[${PYTHON_USEDEP}] |
73 |
- dev-python/bitstring[${PYTHON_USEDEP}] |
74 |
- dev-python/construct[${PYTHON_USEDEP}] |
75 |
- dev-python/ecdsa[${PYTHON_USEDEP}] |
76 |
- dev-python/future[${PYTHON_USEDEP}] |
77 |
- dev-python/kconfiglib[${PYTHON_USEDEP}] |
78 |
- dev-python/pyelftools[${PYTHON_USEDEP}] |
79 |
- <dev-python/pyparsing-2.4.0[${PYTHON_USEDEP}] |
80 |
- dev-python/pyserial[${PYTHON_USEDEP}] |
81 |
- dev-python/python-socketio[${PYTHON_USEDEP}] |
82 |
- dev-python/reedsolomon[${PYTHON_USEDEP}] |
83 |
- ') |
84 |
- dev-embedded/esptool[${PYTHON_SINGLE_USEDEP}] |
85 |
-" |
86 |
-BDEPEND="app-arch/unzip" |
87 |
- |
88 |
-RESTRICT="strip" |
89 |
- |
90 |
-QA_PREBUILT="opt/* usr/lib* usr/share/esp-idf/*" |
91 |
-QA_PRESTRIPPED="opt/*" |
92 |
- |
93 |
-install_tool() { |
94 |
- shopt -s globstar || die |
95 |
- |
96 |
- into /opt/${1} |
97 |
- |
98 |
- if [[ -d "../${1}/lib" ]]; then |
99 |
- if stat *.so &>/dev/null; then |
100 |
- for i in ../${1}/lib/**/*.so*; do |
101 |
- dolib.so ${i} |
102 |
- done |
103 |
- fi |
104 |
- |
105 |
- if stat *.a &>/dev/null; then |
106 |
- for i in ../${1}/lib/**/*.a*; do |
107 |
- dolib.a ${i} |
108 |
- done |
109 |
- fi |
110 |
- |
111 |
- insinto /opt/${1}/lib |
112 |
- doins -r ../${1}/lib/* |
113 |
- fi |
114 |
- |
115 |
- exeinto /opt/${1}/bin |
116 |
- doexe ../${1}/bin/* |
117 |
- ( |
118 |
- cd ../${1} |
119 |
- for i in libexec/**/*; do |
120 |
- exeinto /opt/${1}/$(dirname ${i}) |
121 |
- if [[ -x "${i}" && ! -d "${i}" ]]; then |
122 |
- doexe ${i} |
123 |
- fi |
124 |
- done |
125 |
- |
126 |
- if [[ -d "include" ]]; then |
127 |
- insinto /opt/${1} |
128 |
- doins -r include |
129 |
- fi |
130 |
- |
131 |
- if [[ -d "share" ]]; then |
132 |
- insinto /opt/${1} |
133 |
- doins -r share |
134 |
- fi |
135 |
- ) |
136 |
- |
137 |
- ( |
138 |
- cd ${D}/opt/${1}/bin/ || die |
139 |
- for i in *; do |
140 |
- dodir /opt/bin |
141 |
- cd ${D}/opt/bin || die |
142 |
- dosym ../${1}/bin/${i} /opt/bin/${i} |
143 |
- done |
144 |
- ) |
145 |
-} |
146 |
- |
147 |
-src_install() { |
148 |
- echo -e "#!/bin/sh\npython /usr/share/${PN}/tools/idf.py \"\$@\"" > idf |
149 |
- dobin idf |
150 |
- |
151 |
- if use esp32; then |
152 |
- install_tool xtensa-esp32-elf |
153 |
- install_tool xtensa-esp32-elf/xtensa-esp32-elf |
154 |
- fi |
155 |
- |
156 |
- if use esp32s2; then |
157 |
- install_tool xtensa-esp32s2-elf |
158 |
- fi |
159 |
- |
160 |
- if use esp32s3; then |
161 |
- install_tool xtensa-esp32s3-elf |
162 |
- fi |
163 |
- |
164 |
- if use riscv32; then |
165 |
- install_tool riscv32-esp-elf |
166 |
- fi |
167 |
- install_tool esp32ulp-elf-binutils |
168 |
- install_tool openocd-esp32 |
169 |
- |
170 |
- echo "IDF_PATH=/usr/share/${PN}" > 99esp-idf || die |
171 |
- doenvd 99esp-idf |
172 |
- |
173 |
- insinto /usr/share/${PN} |
174 |
- rm requirements.txt || die |
175 |
- touch requirements.txt || die |
176 |
- |
177 |
- rm -r .git || die |
178 |
- doins -r . |
179 |
-} |
180 |
|
181 |
diff --git a/dev-embedded/esp-idf/metadata.xml b/dev-embedded/esp-idf/metadata.xml |
182 |
deleted file mode 100644 |
183 |
index 980d00b17..000000000 |
184 |
--- a/dev-embedded/esp-idf/metadata.xml |
185 |
+++ /dev/null |
186 |
@@ -1,14 +0,0 @@ |
187 |
-<?xml version="1.0" encoding="UTF-8"?> |
188 |
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> |
189 |
-<pkgmetadata> |
190 |
- <maintainer type="person"> |
191 |
- <email>davidroman96@×××××.com</email> |
192 |
- <name>David Roman</name> |
193 |
- </maintainer> |
194 |
- <use> |
195 |
- <flag name="esp32"></flag> |
196 |
- <flag name="esp32s2"></flag> |
197 |
- <flag name="esp32s3"></flag> |
198 |
- <flag name="riscv32"></flag> |
199 |
- </use> |
200 |
-</pkgmetadata> |
201 |
|
202 |
diff --git a/profiles/package.mask b/profiles/package.mask |
203 |
index 9620358bf..abc9f5bd8 100644 |
204 |
--- a/profiles/package.mask |
205 |
+++ b/profiles/package.mask |
206 |
@@ -63,11 +63,6 @@ net-misc/tuir |
207 |
# Test dep (asynctest) doesn't support any recent Python. No revdeps. |
208 |
dev-python/aionotify |
209 |
|
210 |
-# Andrew Ammerlaan <andrewammerlaan@g.o> (2022-05-28) |
211 |
-# Depends on non-existent versions of pyparsing, invalid dependency |
212 |
-# on dev-embedded/esptool. Needs porting to python-single-r1. |
213 |
-dev-embedded/esp-idf |
214 |
- |
215 |
# Christopher Byrne <salah.coronya@×××××.com> (2022-04-15) |
216 |
# Depends on masked dev-libs/openssl-3.0.* |
217 |
app-crypt/tpm2-openssl |