diff options
Diffstat (limited to 'dev-embedded')
32 files changed, 207 insertions, 526 deletions
diff --git a/dev-embedded/Manifest.gz b/dev-embedded/Manifest.gz Binary files differindex 9d99eafe237f..b8d132958235 100644 --- a/dev-embedded/Manifest.gz +++ b/dev-embedded/Manifest.gz diff --git a/dev-embedded/arduino/Manifest b/dev-embedded/arduino/Manifest index bd62302c9fd5..638faa8ccb09 100644 --- a/dev-embedded/arduino/Manifest +++ b/dev-embedded/arduino/Manifest @@ -4,6 +4,5 @@ DIST arduino-1.8.19.tar.gz 34715155 BLAKE2B d0bb23548db5b5c402e418f85339c1ace9a2 DIST arduino-WiFi101-Updater-ArduinoIDE-Plugin-0.12.0.zip 21873817 BLAKE2B ef2ee6291c452b58b990594a1cbae0daf86e1b6078b51225a7253d782554648610d39c2761ed67914e54a757d1345c7de4c8a63fbe12483f0134c21eac5dc303 SHA512 17e2d07fbdca491a8d80abb6f2ceb000c68af59b755da7db70dce2d5f781204340f43365c40e641acf0b084b2073b3b056f63d68990f405adefb76887f4c5b72 DIST arduino-avr-1.8.3.tar.bz2 4941548 BLAKE2B 48d84a30f3ccf1074df6ec006ccc58d702a572dee51cff1753121055d660ad6cea4176e74488af93227a9eeea4d3a9c0c0856711ebded26ee14a755fb519dd6f SHA512 c8a63ad79f16c380def83b1215762f5cbddfc51480d658853370c3210724bb04627272f3affc0ad01af4463a68980665a4e1c37cc8fabcec16e97c4550d1bb03 DIST arduino-examples-1.9.1.zip 4810227 BLAKE2B 0781ecb330adc444e660f6db89533dfb01995ec87dec7b5f55e28e65bfaf7f505aa79362f5815193ea6500cb1d6a16a86d5f300acf70fc4eaff0265c2891d371 SHA512 c0e21dd374b2751a1e5f2b790202d4883879da2e26e9a23ccbaec478647e2b8160cbc085e76888deafc05b9b14b1aff4ce2a9b834a7b83e8226c3bc41801015c -EBUILD arduino-1.8.19-r1.ebuild 4330 BLAKE2B 6d72a7d814868d06cfd51e59ad85d17c471583178d1a064c023473ff840aed961a57c1881160262ed3786f4ccaa9b157f819ac1e048fb9e429ac0b005921f948 SHA512 b94aa905b172ee03f01ab4c7e63c53e55bba1bb3fbc37d03c7ad12d379339e10581d57f5c6ea45eb92d8b7ee30a7eba62603766ffe73c52a9d5314b10926ccdc -EBUILD arduino-1.8.19.ebuild 4266 BLAKE2B 6af8ff54ceabf53225cb3dc5624be7a8e9ea7ea5e883290acd3340158dd68e8ee3661263c63d9df5c6af0c319050d340a4863aa7036818176d9fc94c4c444ca5 SHA512 1cce98090b29e1033f851cae757a5b3d96e2ef06c465ee1cc54678d4663d848805dd6e5f60c462c8f50acc249a6d8733cfbaaaeb63142250b49458aa4110f29c +EBUILD arduino-1.8.19-r1.ebuild 4328 BLAKE2B efc846693bc1ee24b5a7662f02419183d02378e25cffdda2216a3cee9dcb73ad53021e4e7600d5bf29bbeb4fb1da7ab004e12c5471c5f645e089c6829ab06385 SHA512 61ecc51d8a99088350d5c200701818b4313c143e21aea7406f3c73f4bd64048b47fae4a88b5e9de848d874c8f68b2a42efdd0a05dea161011efb4a714c49c104 MISC metadata.xml 332 BLAKE2B 384c8751a6538aaca49c8fd242c5493d8321e957a1d186c9c6cf8db579ab74fe9bd25c96dda56a19afa063ade2833fe4b6d307163be7a7681421c65620fe40b7 SHA512 1d58a915f882ee70c55b5541e66cd33a1367e2f686949e1a13d7dcad62d1f1ec180d433898e5ba41f52ba9630a116b92c52cb5ad3be02127c144c1d37cfa35a0 diff --git a/dev-embedded/arduino/arduino-1.8.19-r1.ebuild b/dev-embedded/arduino/arduino-1.8.19-r1.ebuild index 458ce8fcbd07..33921c46fe52 100644 --- a/dev-embedded/arduino/arduino-1.8.19-r1.ebuild +++ b/dev-embedded/arduino/arduino-1.8.19-r1.ebuild @@ -21,7 +21,7 @@ S="${WORKDIR}/Arduino-${PV}" LICENSE="GPL-2 LGPL-2.1 CC-BY-SA-3.0" SLOT="0" -KEYWORDS="~amd64 ~x86" +KEYWORDS="amd64 x86" BDEPEND=">=dev-java/ant-1.10.14-r3:0" CDEPEND="dev-embedded/arduino-builder" diff --git a/dev-embedded/arduino/arduino-1.8.19.ebuild b/dev-embedded/arduino/arduino-1.8.19.ebuild deleted file mode 100644 index 4dd3c76f3613..000000000000 --- a/dev-embedded/arduino/arduino-1.8.19.ebuild +++ /dev/null @@ -1,118 +0,0 @@ -# Copyright 1999-2024 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=8 - -inherit java-pkg-2 java-ant-2 desktop xdg-utils - -DESCRIPTION="An open-source AVR electronics prototyping platform" -HOMEPAGE="https://www.arduino.cc/ https://github.com/arduino/" - -AVR_VERSION="1.8.3" -EXAMPLES_VERSION="1.9.1" -PLUGIN_VERSION="0.12.0" - -SRC_URI="https://github.com/arduino/Arduino/archive/${PV}.tar.gz -> ${P}.tar.gz - https://downloads.arduino.cc/cores/avr-${AVR_VERSION}.tar.bz2 -> ${PN}-avr-${AVR_VERSION}.tar.bz2 - https://github.com/arduino/arduino-examples/archive/refs/tags/${EXAMPLES_VERSION}.zip -> ${PN}-examples-${EXAMPLES_VERSION}.zip - https://github.com/arduino/WiFi101-FirmwareUpdater-Plugin/releases/download/v${PLUGIN_VERSION}/WiFi101-Updater-ArduinoIDE-Plugin-${PLUGIN_VERSION}.zip -> ${PN}-WiFi101-Updater-ArduinoIDE-Plugin-${PLUGIN_VERSION}.zip - " - -LICENSE="GPL-2 LGPL-2.1 CC-BY-SA-3.0" -SLOT="0" -KEYWORDS="amd64 x86" - -CDEPEND="dev-embedded/arduino-builder" - -RDEPEND="${CDEPEND} - >=dev-util/astyle-3.1[java] - dev-embedded/arduino-listserialportsc - >=virtual/jre-1.8" - -DEPEND="${CDEPEND} - app-arch/unzip - >=virtual/jdk-1.8" - -EANT_BUILD_TARGET="build" -# don't run the default "javadoc" target, we don't have one. -EANT_DOC_TARGET="" -EANT_BUILD_XML="build/build.xml" -EANT_EXTRA_ARGS=" -Dlight_bundle=1 -Dlocal_sources=1 -Dno_arduino_builder=1 -Dversion=${PV}" - -RESTRICT="strip" -QA_PREBUILT="usr/share/arduino/hardware/arduino/avr/firmwares/*" - -S="${WORKDIR}/Arduino-${PV}" - -PATCHES=( - # We need to load system astyle/listserialportsc instead of bundled ones. - "${FILESDIR}/${PN}-1.8.5-lib-loading.patch" -) - -src_unpack() { - # We don't want to unpack tools, just move zip files into the work dir - local a=( ${A} ) - unpack "${a[0]}" - - cp "${DISTDIR}/${PN}-avr-${AVR_VERSION}.tar.bz2" "${S}/build/avr-${AVR_VERSION}.tar.bz2" || die - cp "${DISTDIR}/${PN}-examples-${EXAMPLES_VERSION}.zip" "${S}/build/" || die - cp "${DISTDIR}/${PN}-WiFi101-Updater-ArduinoIDE-Plugin-${PLUGIN_VERSION}.zip" "${S}/build/shared/WiFi101-Updater-ArduinoIDE-Plugin-${PLUGIN_VERSION}.zip" || die -} - -src_prepare() { - default - - # Unbundle libastyle - sed -i 's/\(target name="linux-libastyle-[a-zA-Z0-9]*"\)/\1 if="never"/g' "$S/build/build.xml" || die - - # Unbundle avr toolchain - sed -i 's/target name="avr-toolchain-bundle" unless="light_bundle"/target name="avr-toolchain-bundle" if="never"/' "$S/build/build.xml" || die - - # Install avr hardware - sed -i 's/target name="assemble-hardware" unless="light_bundle"/target name="assemble-hardware"/' "$S/build/build.xml" || die -} - -src_install() { - cd "${S}"/build/linux/work || die - - # We need to replace relative paths for toolchain executable by paths to system ones. - sed -i -e 's@^compiler.path=.*@compiler.path=/usr/bin/@' -e 's@^tools.avrdude.path=.*@tools.avrdude.path=/usr@' \ - -e 's@^tools.avrdude.config.path=.*@tools.avrdude.config.path=/etc/avrdude.conf@' hardware/arduino/avr/platform.txt || die - - java-pkg_dojar lib/*.jar - java-pkg_dolauncher ${PN} \ - --pwd "/usr/share/${PN}" \ - --main "processing.app.Base" \ - --java_args "-DAPP_DIR=/usr/share/${PN} -Djava.library.path=${EPREFIX}/usr/$(get_libdir)" - - insinto "/usr/share/${PN}" - - doins -r examples hardware lib tools - - # In upstream's build process, we copy these fiels below from the bundled arduino-builder. - # Here we do the same thing, but from the system arduino-builder. - dosym "../../arduino-builder/platform.txt" "/usr/share/${PN}/hardware/platform.txt" - dosym "../../arduino-builder/platform.keys.rewrite.txt" "/usr/share/${PN}/hardware/platform.keys.rewrite.txt" - dosym "../../bin/arduino-builder" "/usr/share/${PN}/arduino-builder" - - # hardware/tools/avr needs to exist or arduino-builder will - # complain about missing required -tools arg - dodir "/usr/share/${PN}/hardware/tools/avr" - - # Install menu and icons - domenu "${FILESDIR}/${PN}.desktop" - cd lib/icons || die - local icondir - for icondir in *; do - # icondir name is something like "24x24" we want the "24" part - local iconsize=`cut -dx -f1 <<< "${icondir}"` - newicon -s $iconsize \ - "${icondir}/apps/arduino.png" \ - "${PN}.png" - done -} - -pkg_postinst() { - xdg_icon_cache_update - [[ ! -x /usr/bin/avr-g++ ]] && ewarn "Missing avr-g++; you need to crossdev -s4 avr" -} diff --git a/dev-embedded/avra/Manifest b/dev-embedded/avra/Manifest index 0e282cfa2a01..f923be9541fe 100644 --- a/dev-embedded/avra/Manifest +++ b/dev-embedded/avra/Manifest @@ -1,3 +1,4 @@ DIST avra-1.4.2.tar.gz 392445 BLAKE2B 6b556583838e0e5bef0207f7291da7c5e6dad01e695d9592b3de8f528bc7a5dafc3015f75934bcc8f9e0b6baca39ff0ae13c88ee290e657868bbb522d27da068 SHA512 f51a43b1b28102d6180ce27e74b50642de8f3d18fa35a82904fddaac993e87e1096667f2245bebfad92e4ba3283330f6ac4b6083e486be5af9edca7b7e90e56f +EBUILD avra-1.4.2-r1.ebuild 575 BLAKE2B 728c22b2357a6d829de41d45d7f5d8e12694bee261667eca8bb5635388104d14e60b07fe2ac1e26bbe3605b4a1970ba7df820ffee78a60b490b263e2b2af964a SHA512 14973832995acea68b81a85144bc042a9adcf9ac8fa3b2dde8101ae2016b0836414c9824f767a3485e60ef170e696456f7b5c582ca9fb699019724b5fc9bef46 EBUILD avra-1.4.2.ebuild 574 BLAKE2B ff0a9407a6a19e3f4482d51e529b0660f235104a0f00da07c69811dbb8dd69217c8a383bcc46d177b1aa6839004ea5dfc4d12b962411d66beadc7d82d448103c SHA512 e9b91a7986a48803e5aef3e7690ab5c20d3f92bb6c23c6acbcf9d4bd491ff83c4611a28319c3d90bee83a14328dc0d9391160b5307d450ba6e01fffd51ce5c77 MISC metadata.xml 323 BLAKE2B 5ff1de617c8e77cc6c78ae1e403434b74f9104a2b8311b78bd14911cd651b4b9fde8f3db94a7ca13bb51307ed1a702c17306cf798dad2c5bddcc13694f969260 SHA512 90dc9ae6fd87ae414d3e27a725c197523b659aaf047f0f1127ffe028627020c0e19da8d46ce89bb148254b87a7fd33d66f9a8d9eef6c206f90a543d68cf52812 diff --git a/dev-embedded/avra/avra-1.4.2-r1.ebuild b/dev-embedded/avra/avra-1.4.2-r1.ebuild new file mode 100644 index 000000000000..b9203427a9b2 --- /dev/null +++ b/dev-embedded/avra/avra-1.4.2-r1.ebuild @@ -0,0 +1,27 @@ +# Copyright 1999-2024 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +inherit toolchain-funcs + +DESCRIPTION="Atmel AVR Assembler" +HOMEPAGE="https://github.com/hsoft/avra" +SRC_URI="https://github.com/hsoft/avra/archive/${PV}.tar.gz -> ${P}.tar.gz" + +LICENSE="GPL-2" +SLOT="0" +KEYWORDS="~amd64 ~ppc ~x86" + +src_compile() { + emake \ + CC="$(tc-getCC)" \ + PREFIX=/usr \ + CFLAGS="${CFLAGS} \$(CDEFS)" \ + LDFLAGS="${LDFLAGS}" +} + +src_install() { + emake PREFIX=/usr DESTDIR="${ED}" install + dodoc {AUTHORS,CHANGELOG.md,README.md,USAGE.md} +} diff --git a/dev-embedded/libftdi/Manifest b/dev-embedded/libftdi/Manifest index 30a656fb7905..919663283ac4 100644 --- a/dev-embedded/libftdi/Manifest +++ b/dev-embedded/libftdi/Manifest @@ -6,8 +6,8 @@ AUX libftdi-1.5-tests-no-cxx.patch 1017 BLAKE2B ff3e05ae2cc48a023c74142f986159f6 DIST libftdi-0.20.tar.gz 423570 BLAKE2B f0aa420a704e18c4257b99a4593dbaf46a15806d980b24909fe8678b36e74b568cd5915db1e14f8b904541334fbf3d18f069dc479a0bf66b2ea8e113611cb82b SHA512 540e5eb201a65936c3dbabff70c251deba1615874b11ff27c5ca16c39d71c150cf61758a68b541135a444fe32ab403b0fba0daf55c587647aaf9b3f400f1dee7 DIST libftdi1-1.5.tar.bz2 116297 BLAKE2B 460ab93026e14a452e31fcc6930d305638fdc0ed06cb44fb9d50ad8f80199b17057d2f48a27b8295b43b956934289c872a2ef1ddb7f93fa93c6816511ef7607d SHA512 c525b2ab6aff9ef9254971ae7d57f3549a36a36875765c48f947d52532814a2a004de1232389d4fe824a8c8ab84277b08427308573476e1da9b7db83db802f6f EBUILD libftdi-0.20-r2.ebuild 1934 BLAKE2B 33de7434c3034e134dd8dbd6aabf5ebff8749625b44506025561f7669002026c3d0381ed9addb28b3edfcc32dc86855ec7580fc35ffe08eddea389a523a607e3 SHA512 5cf7dc0ef8f0b905dd2cdad429c38d2ddc74dad99629113013d866de278b70e33ba008730222926fe97cfecc3004dbe00e1ce577f105c171527f8d146dfa9b36 -EBUILD libftdi-0.20-r3.ebuild 1944 BLAKE2B b1afd62cd41ab060543f44cdd0aaed11b797848d23cc7e31b5d35e56378997fbaa435cccb4468be7f4ec21fa3b5558c3a47f981919ae38bce35d398c1c6b5d2a SHA512 91fcd547ab5b0fcbc21adb78df60b6d1af87864e2fefa0a40bc95391442436c28955176bd62f7c3577be63865dcf68d90fa854f6a2e8b549c1b4060eefece7f4 +EBUILD libftdi-0.20-r3.ebuild 1943 BLAKE2B b6035a4373636ed04f9c495a94f20f970bba465a2c8a486eefb335732caf42cc469089e59c3d29ac4d38b76fd87cf9942142afe4e598d251c0bc2fb1d9b00b20 SHA512 a28c5a254ec9a4a5a1a0f8336655a68dfb0e8fad8afb2464b1243f07fb6e2fe38967229c848dfe3de76c463792f2bf4e83a3cdc16d06aaa56797cbc05982033c EBUILD libftdi-1.5-r5.ebuild 1946 BLAKE2B 55d8e7a04218032ea30f68fb0e8d8defd3473252ca6e0680e14e5fa5bf8d0a3dab96f9ff8fd855299d3cb1a442bded5d38c3c1c319262f0b98da95483fc6622a SHA512 66a6412fa2eee65872235f45684c2f3f09caaca07251a9f46ed3df4ae947bad7f3e56143ed32cc925c3ba04cb17d92ae80228149b943411c9be7d03b5dfd3286 -EBUILD libftdi-1.5-r7.ebuild 1984 BLAKE2B b8226b6260e3db5e977f4210c9b489ffc0b210ab3a41deb294f69447126e38e9d9267c1068ee30bab7d6622ec80a0e5e58200f153c439b562c58c9d86781e2d7 SHA512 d5c10f2044966921c5c1d6567f61939f037089d8663b559b7e543c2c3882b66f196f532bb8b3ddaea1f48855da19f2b093d138d73a22544ca9f494fbe84d0997 +EBUILD libftdi-1.5-r7.ebuild 1983 BLAKE2B 6c3f94028504eabeef775b150b5a3a195ae41687ee79793a71b6325b662970ebee42055d4d8caa6eef982fc9829bd3a9f308f7797346f60ff884fe5d4391dac2 SHA512 20216ea9d19ed86e7f712e1fadf44d9628df89c74983381da7d112bc9c91a5f6032f8e1ee5c8b184d3fce26d10fec97e70d4c0e0d31beba5fa993207f0d1663e EBUILD libftdi-9999.ebuild 1830 BLAKE2B fbe0d8d27c3d52ba56cc61463e16605ffeb182c7af9e9e7569d8f11828f844a3d2884259d5a419a12b307af14e7857d2d103cf183625838a4b975577ac26d7bd SHA512 49d92090880b0a449638c585dff4a541db4656f1212d068502e6a56bcc6bfdb4ecdcb2e43e01b8e84b333ab4f17075c22fa55548b20808f09ee88394ff35d6a7 MISC metadata.xml 318 BLAKE2B c2c9ab83d57a082ed6608367f53f0f9420056c909d4ee50641da5b8f12b6a6ca996740fbdcadb0fa08460cb0cbef36dbedfaaf98acaea3eeeeee6afcf7724f54 SHA512 313b5c5dfcf5feb7dc8e41c1cb74939619451cb0747c1a281c9a0e763d26e0850a43e05d8fd2a836389bd75c2a4f153b80986e11be8171e9d93ca234f9df05f2 diff --git a/dev-embedded/libftdi/libftdi-0.20-r3.ebuild b/dev-embedded/libftdi/libftdi-0.20-r3.ebuild index 2f941a5555ef..9e661dab9d64 100644 --- a/dev-embedded/libftdi/libftdi-0.20-r3.ebuild +++ b/dev-embedded/libftdi/libftdi-0.20-r3.ebuild @@ -11,7 +11,7 @@ if [[ ${PV} == 9999* ]] ; then EGIT_REPO_URI="git://developer.intra2net.com/${PN}" else SRC_URI="https://www.intra2net.com/en/developer/${PN}/download/${P}.tar.gz" - KEYWORDS="amd64 arm arm64 ~loong ~ppc ppc64 ~riscv ~sparc x86" + KEYWORDS="amd64 arm arm64 ~loong ppc ppc64 ~riscv ~sparc x86" fi DESCRIPTION="Userspace access to FTDI USB interface chips" diff --git a/dev-embedded/libftdi/libftdi-1.5-r7.ebuild b/dev-embedded/libftdi/libftdi-1.5-r7.ebuild index daaffe17cdac..57ad6000b906 100644 --- a/dev-embedded/libftdi/libftdi-1.5-r7.ebuild +++ b/dev-embedded/libftdi/libftdi-1.5-r7.ebuild @@ -14,7 +14,7 @@ else SRC_URI="https://www.intra2net.com/en/developer/${PN}/download/${MY_P}.tar.bz2" S="${WORKDIR}/${MY_P}" - KEYWORDS="amd64 arm arm64 ~loong ~mips ~ppc ppc64 ~riscv ~sparc x86" + KEYWORDS="amd64 arm arm64 ~loong ~mips ppc ppc64 ~riscv ~sparc x86" fi DESCRIPTION="Userspace access to FTDI USB interface chips" diff --git a/dev-embedded/nodemcu-uploader/Manifest b/dev-embedded/nodemcu-uploader/Manifest index e677b6a38281..162664033e39 100644 --- a/dev-embedded/nodemcu-uploader/Manifest +++ b/dev-embedded/nodemcu-uploader/Manifest @@ -1,4 +1,3 @@ -DIST nodemcu-uploader-1.0.0.tar.gz 855474 BLAKE2B f61e10d8c55653003063f93f276fda3d22eb7f4b30cf36bf23dac68775e6be55b73931a4cab54eb244f158b61b7dd4bb5290994386fb355b4be103bf429b5b3c SHA512 9196f8394a26bb5d412d667f7ad423c38b23f906c800e190bbc6f93206a2cbf7da28609a0803bff8b83b32c699df073c49525c05d2dbf276530156224c539864 -EBUILD nodemcu-uploader-1.0.0-r1.ebuild 718 BLAKE2B 33bb83c6ec261282d5f37a208451d2cdab01517a310685d8aaed5f0092775ba9db204f884947841127cef7aa217077c772e83caef24fc903796983aa314079b3 SHA512 802e2fb982ad5701b801d328c5ca4581650121540eac57891905da3f1ef44c7c38284f5d9af3953a72d107fd10ab45ee3834b76a4d06c170be507fa69a7d1a70 -EBUILD nodemcu-uploader-1.0.0.ebuild 685 BLAKE2B 13b979ae0bf4a119543927da7086612dca216d26864f61a41e87b8b88fc9c4eb2f3584be0fd7cffa694d6215e1e7add8d840deb5cab848b7eb33ad593db89779 SHA512 39915aa3be963828c112f4ea344aefcf12f2441e078501dc5f54e231dcfae2f324c461537634acf2abed28417d774af53dc79533e73b7b9870b6c1de5a50dea6 +DIST nodemcu-uploader-1.0.0.gh.tar.gz 855474 BLAKE2B f61e10d8c55653003063f93f276fda3d22eb7f4b30cf36bf23dac68775e6be55b73931a4cab54eb244f158b61b7dd4bb5290994386fb355b4be103bf429b5b3c SHA512 9196f8394a26bb5d412d667f7ad423c38b23f906c800e190bbc6f93206a2cbf7da28609a0803bff8b83b32c699df073c49525c05d2dbf276530156224c539864 +EBUILD nodemcu-uploader-1.0.0-r1.ebuild 875 BLAKE2B e4611253e168ae35dbac7b3c783a8ad0037249e1f568f3f81cebd4f851da720643495ce1ebd1dc9b1d5d2e560ca3307d4f446dc5afbf82e1a6ad110f1b86aa1b SHA512 edded56577bc37a4f3b7ffb6e8b28376eb4a860cbfda209b97f4a7150b52f150235df65742b550d8f4894f99dd4a388acf080e70237e1dacf625bb5a17bcc99d MISC metadata.xml 332 BLAKE2B 5c5b56b41cc365544be813e3de4769a552a19ff9507a9919e61e99bede556c638bc6e9c2a2aa014cebf1f7aa6711071d87289e70300293b7ede1a9301217d764 SHA512 671aaed13d9b55f2806b496985959ac0a7116680fee3afef4ad50614c9de4c56f349a35624a5399f70fa6385472c712b45e6be560c2bb7c0f26ab0b29b9a3daf diff --git a/dev-embedded/nodemcu-uploader/nodemcu-uploader-1.0.0-r1.ebuild b/dev-embedded/nodemcu-uploader/nodemcu-uploader-1.0.0-r1.ebuild index bf82f1c4fcba..e13505b028f7 100644 --- a/dev-embedded/nodemcu-uploader/nodemcu-uploader-1.0.0-r1.ebuild +++ b/dev-embedded/nodemcu-uploader/nodemcu-uploader-1.0.0-r1.ebuild @@ -4,20 +4,31 @@ EAPI=8 DISTUTILS_USE_PEP517=setuptools -PYTHON_COMPAT=( python3_{10..12} ) +PYTHON_COMPAT=( python3_{10..13} ) + inherit distutils-r1 DESCRIPTION="Simple tool for uploading files to the filesystem of an ESP8266 running NodeMCU" HOMEPAGE="https://github.com/kmpm/nodemcu-uploader" -SRC_URI="https://github.com/kmpm/nodemcu-uploader/archive/v${PV}.tar.gz -> ${P}.tar.gz" +SRC_URI=" + https://github.com/kmpm/nodemcu-uploader/archive/v${PV}.tar.gz + -> ${P}.gh.tar.gz +" LICENSE="MIT" SLOT="0" KEYWORDS="~amd64 ~x86" - -RDEPEND=">=dev-python/pyserial-3.4[${PYTHON_USEDEP}]" - -distutils_enable_tests setup.py +IUSE="test" +RESTRICT="!test? ( test )" + +RDEPEND=" + >=dev-python/pyserial-3.4[${PYTHON_USEDEP}] +" +BDEPEND=" + test? ( + ${RDEPEND} + ) +" src_prepare() { # https://bugs.gentoo.org/796422 @@ -25,3 +36,8 @@ src_prepare() { distutils-r1_src_prepare } + +python_test() { + "${EPYTHON}" -m unittest -v tests.get_tests || + die "Tests failed on ${EPYTHON}" +} diff --git a/dev-embedded/nodemcu-uploader/nodemcu-uploader-1.0.0.ebuild b/dev-embedded/nodemcu-uploader/nodemcu-uploader-1.0.0.ebuild deleted file mode 100644 index d6a6dde13414..000000000000 --- a/dev-embedded/nodemcu-uploader/nodemcu-uploader-1.0.0.ebuild +++ /dev/null @@ -1,26 +0,0 @@ -# Copyright 1999-2023 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 - -PYTHON_COMPAT=( python3_{9..10} ) -inherit distutils-r1 - -DESCRIPTION="Simple tool for uploading files to the filesystem of an ESP8266 running NodeMCU" -HOMEPAGE="https://github.com/kmpm/nodemcu-uploader" -SRC_URI="https://github.com/kmpm/nodemcu-uploader/archive/v${PV}.tar.gz -> ${P}.tar.gz" - -LICENSE="MIT" -SLOT="0" -KEYWORDS="~amd64 ~x86" - -RDEPEND=">=dev-python/pyserial-3.4[${PYTHON_USEDEP}]" - -distutils_enable_tests setup.py - -src_prepare() { - # https://bugs.gentoo.org/796422 - sed -i -e 's:description-file:description_file:' setup.cfg || die - - distutils-r1_src_prepare -} diff --git a/dev-embedded/picotool/Manifest b/dev-embedded/picotool/Manifest index b6b272cc846b..0a5f888a8f48 100644 --- a/dev-embedded/picotool/Manifest +++ b/dev-embedded/picotool/Manifest @@ -1,5 +1,8 @@ AUX picotool-1.1.2-musl.patch 420 BLAKE2B fae2e2cfb951e309a2a3be4ef98b05979ef58a832ffbf2fa7d802f9c31983b566a4c8055c0d11f154a2df552ebe0d00dc51615790cfb2ebe564d454015e80d34 SHA512 c5a73731a734baaf5af4a938d4c00996f3cf28343c728e0cfe575d2797fcd45d730fa5fed22846dc691f69da2825f01b52ced5e4a9b681e99290b4f0ae8d3a75 DIST pico-sdk-1.4.0.tar.gz 959068 BLAKE2B 95c5e61c4d66c345daa4b8aff8e9e2cd90bcc722289ac67c1a18ce00dfa02ef7fb07512a0fdc7558f989746c215cff31979f1ad8a582e20ff2d151fdd109914f SHA512 4be28cf41e5b808a504b4c949f6c3e9fbc425beb4f838a7898bfd78925cc54e0390ff56c036bc7f60a26efac0d6c1bd811b27f7b60a1c8d7bb4750f3fa37690e +DIST pico-sdk-2.0.0.tar.gz 2345905 BLAKE2B a1360fe30a56eef6ea2e786bb3d0f2522c4d37cd2424ea08a377d3f70f681cac1650a0967c4e447e9f47c692cf0ec7f9865af78cf8f4f8d699271f390750a3a1 SHA512 ae7c470a63581503d591b7aa19281eaf75248a668d0ce266b766a2261db8584d372d4f6d52cb1a90dc8b1d5afdfee1802980c0f2819f0193d6112db934d3e575 DIST picotool-1.1.2.tar.gz 45282 BLAKE2B b7425ae197adef3f72aafa9450338ab1c3ddd4b1a13ff9f4847951ee3d7fd91226f780061416c0d72f963ad0afcf4a14d85c72b6199482738eb5344c8dc6563f SHA512 63e0c77865243aca0b46cb844f5eb104c762d2b38f645c75f32224b61d9768ef0ba59b55d94480559627ec4b23ad6edc49d013f90646644a5dc798090d37a257 +DIST picotool-2.0.0.tar.gz 637989 BLAKE2B aad9463f1f26ba921dc681fb784bec0e6ed9917919c12cb616b10642e359560f9b1304013a8a20dfaffe0f373b690d8527f93195212c01c76cb01439590143c8 SHA512 96808cea70a38cd108bbfe8f227d0e66167d0d0611d234e849793ec02d7cb319b065e7988c070c46488a7e99e1a2c1779f78d70782fc67fbbb81229d8e4c4ffa EBUILD picotool-1.1.2.ebuild 907 BLAKE2B c86001d1ef64bebf938e176330a082b93696ccfbd9c0ff69b7997eb19e3a793b6eaac75c44159b90c061a61938e35fced10dd0d8fd7fd42e99d45cd4e6433f1d SHA512 4e23de6ae3978f2eec040652da01fb258bb1bfd38fcd6fc981b66d5188d17455d8067ab7ab1c0ae57a85f8dfab3eb7ce5203f95905db9a7dc03582ee1d5d3e30 +EBUILD picotool-2.0.0.ebuild 1076 BLAKE2B c3dc4eac03788d45cd3782d15db8a9c1d5548012dcf60a6ee1c65ed276a046d71dfa79c0b9fefc0e48a9e801a9e83cb46e497b923cb926903032d77d06400851 SHA512 5306be562533701b081cc20fecdedf6afd248824d85751d6cdb0bf5de091c9cbddc8f1ed9d489bb478f8c07daf9f578a4778dad8197edcc74d73d8bd35fa6689 MISC metadata.xml 343 BLAKE2B fb4e41f84c22fe08f905251eae2cb5381faa7adb43ed3895a4059b3d76aa79235745530be48316f24f5eff99abeac3452d7ebd76cd0bb3cfc3c228b2d0250d03 SHA512 8e22662a7cb2a4a80981b95201ee3ee7c800a4bfddf16b836fd75a0353a281ec59872227682635dc556725718b98a96c413ec118369acbc0e2a2b841060197fd diff --git a/dev-embedded/picotool/picotool-2.0.0.ebuild b/dev-embedded/picotool/picotool-2.0.0.ebuild new file mode 100644 index 000000000000..acc716c5c113 --- /dev/null +++ b/dev-embedded/picotool/picotool-2.0.0.ebuild @@ -0,0 +1,50 @@ +# Copyright 2022-2024 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +inherit cmake + +SDK_PV=2.0.0 +SDK_PN=pico-sdk +SDK_P=${SDK_PN}-${SDK_PV} + +DESCRIPTION="tool for interacting with rp2040 devices and binaries" +HOMEPAGE="https://github.com/raspberrypi/picotool" +SRC_URI=" + https://github.com/raspberrypi/${PN}/archive/refs/tags/${PV}.tar.gz -> ${P}.tar.gz + https://github.com/raspberrypi/${SDK_PN}/archive/refs/tags/${SDK_PV}.tar.gz -> ${SDK_P}.tar.gz +" + +# picotool (BSD) +# |- clipp (MIT) +# |- pico-sdk (BSD) +LICENSE="BSD MIT" +SLOT="0" +KEYWORDS="~amd64" + +RDEPEND="virtual/libusb:1" +DEPEND="${RDEPEND}" +BDEPEND="virtual/pkgconfig" + +PATCHES=( "${FILESDIR}"/${PN}-1.1.2-musl.patch ) + +# Binary that runs on-chip. +QA_PREBUILT="usr/share/picotool/xip_ram_perms.elf" + +src_prepare() { + mv "${WORKDIR}"/${SDK_P} "${S}"/pico-sdk || die + cmake_src_prepare +} + +src_configure() { + local mycmakeargs=( + -DPICO_SDK_PATH="${S}"/pico-sdk + ) + cmake_src_configure +} + +src_install() { + cmake_src_install + dostrip -x /usr/share/picotool/xip_ram_perms.elf +} diff --git a/dev-embedded/raspberrypi-utils/Manifest b/dev-embedded/raspberrypi-utils/Manifest index c33fa07ac138..50c0f5e2106c 100644 --- a/dev-embedded/raspberrypi-utils/Manifest +++ b/dev-embedded/raspberrypi-utils/Manifest @@ -1,4 +1,6 @@ AUX raspberrypi-utils-werror.patch 2504 BLAKE2B 31dcf606fb47fd459e2ae1908917a5584a46c042612988f82a8c62139446cd452d450be3f17f4602907052327ec1d5b841ba5c6d89065f482707610bfa5ebcfc SHA512 7d0ea3573394b91af0d1904b378991545c6537f939543b724b5c642c50c2c9330af7938b323667be3043c507d6da68e7bff6072a06ac4a1d0e20d4f465fa1175 DIST raspberrypi-utils-0_p20240203.tar.gz 122695 BLAKE2B 178b84b5210ba47a51e9815710b05d3916981f5413986cefcdb621420c9e9ab33b67026ea95692c6aff900dd2c31302059eb39aae32267b88cf765a7575f8bed SHA512 bdbe47d87a4bcd0d37ea4567e95e41fbc8240f5ffbc805d4a1f576060535af13e272b262ddad87dac0f9ea43b8b2ff9092378e67de080bd651701435b4c67008 +DIST raspberrypi-utils-0_p20240903.tar.gz 123998 BLAKE2B 4281fee7761df03b3a555d5e36f4bec1621c8402a5d5456752ab2d95482ca355e51d174f461ed8a1f89ed5d420a14d5f09872c090eccff6751d0c00ab20cf398 SHA512 96504004a1b7b541fe126d973f60321769a4b54a1b603b1d9278ba902bed7c008c2f86906dfaf30632ce75e1073b2a97e9317a799a0bc8cea255d713cb26ae67 EBUILD raspberrypi-utils-0_p20240203.ebuild 930 BLAKE2B b48a70dbcde478607c7db57101fa238f47c87b7c616cd0af755ee2b67c0c779c1142efae1f87b3cd4080561bccb3d347f785d8bd406501b213013819bd0881b9 SHA512 d153a72107270c2a2c05fed3d4a6eeb81e2881757cb79b62927f819146467c4669f08feee159e0d575a7ab71b113cc094f2f9a0a0b53592090f70c60d1fa8547 +EBUILD raspberrypi-utils-0_p20240903.ebuild 945 BLAKE2B 8ab9b8bc5c543dc25d96649cee794dd6df9f3ac0af4246c1db9d5ee8a1ee4e413dc31f9b1dd4340cb76c33b16e5e122d56991b5796f769f59bc7c399d97b3b32 SHA512 aec70cab7f6ba31e5521f26842ddfebb3e2dcadcc381613bd1ac2cee15de8a9175a82b842ccde7fc14ded69978c6bf0bc949e4b693957806de721958a45b4b44 MISC metadata.xml 330 BLAKE2B e7285a8024f322ab0f8c8789bdfa2601c046c776c24c7e411ef9c5be424bd3000c2749d47e5cac3c0f5f870decd1106e019b279c229dc27de238cfad8f2e4979 SHA512 f0cd8ffa52484dc9ff84623ddf51d9f4c696c1d7cc357042bfae47b7da62eb94336703d038b1511138b40a0b545d96b4a4faa8e5b2787d0bcdac3b9259c883fc diff --git a/dev-embedded/raspberrypi-utils/raspberrypi-utils-0_p20240903.ebuild b/dev-embedded/raspberrypi-utils/raspberrypi-utils-0_p20240903.ebuild new file mode 100644 index 000000000000..0ede982eed41 --- /dev/null +++ b/dev-embedded/raspberrypi-utils/raspberrypi-utils-0_p20240903.ebuild @@ -0,0 +1,47 @@ +# Copyright 1999-2024 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +inherit bash-completion-r1 cmake + +COMMIT="d4f8fb543a892ba65bfc608511bf582c0425aa81" + +DESCRIPTION="Raspberry Pi userspace utilities" +HOMEPAGE="https://github.com/raspberrypi/utils" +SRC_URI="https://github.com/raspberrypi/utils/archive/${COMMIT}.tar.gz -> ${P}.tar.gz" +S="${WORKDIR}/utils-${COMMIT}" +LICENSE="BSD" +SLOT="0" +KEYWORDS="~arm ~arm64" + +DEPEND=" + sys-apps/dtc +" + +RDEPEND=" + ${DEPEND} + dev-lang/perl + !media-libs/raspberrypi-userland + !media-libs/raspberrypi-userland-bin +" + +PATCHES=( + "${FILESDIR}"/${PN}-werror.patch +) + +src_configure() { + local mycmakeargs=( -DBUILD_SHARED_LIBS=OFF ) + cmake_src_configure +} + +src_install() { + cmake_src_install + + local SRC + rm -r "${ED}"/usr/share/bash-completion/ || die + for SRC in */*-completion.bash; do + local DEST=${SRC%-completion.bash} + newbashcomp "${SRC}" "${DEST##*/}" + done +} diff --git a/dev-embedded/stm32flash/Manifest b/dev-embedded/stm32flash/Manifest index 163be1341cd9..7e8cb5919b56 100644 --- a/dev-embedded/stm32flash/Manifest +++ b/dev-embedded/stm32flash/Manifest @@ -1,8 +1,3 @@ -AUX stm32flash-0.6-fix-i2c-erase-01fbb65.patch 897 BLAKE2B 1b0885926d95c828dfa3ae04050ce7c1b4a10cac22e0d33776a2ab2e2e32fbdce825d05dd21dcbecc60a4bd88e7b302103b7809e999084bc881b724dce56c2a4 SHA512 3646b737bdd8d7f1ad750d230b6d975a92557f3204261b8637aaef75fad311c6b43717c4a989e23d566a9d37c4a464a8ef0736acee1e2be15683f2c8d17bb07e -AUX stm32flash-0.6-fix-i2c-erase-17a24f8.patch 2355 BLAKE2B 450e7bf2da49e38eeeabfb380ef6f30bf8154226ed12e0392dd00a01cd37e423957a37d63ebcb35ddebbd84899b07f0ed730e8bd79b2e8eacf9594757e917afc SHA512 b97d2a303a218622587e08a369e5971d4df4502f0088b10746d97ed4950a44460e5856d51ad90f787975d701a0166b0f15718e8e05b35755e4a4b9b92d0bcab0 -AUX stm32flash-0.6-fix-i2c-erase-b079cd0.patch 3165 BLAKE2B a3a6c78bfae85e3fad0c8e4d8a7f2b0759d5baac7c1001c5f45dac012258f9fa05f1c8191e58a424e3462d6b24a8dacf4ca761ccb952522e4d8eade93a2824f5 SHA512 a1619ab49943047b47a6e96137a9157dffbeb43d06b801642c6c822427cd86ea6025dfea4d202d7998c062309f33a04802d08e8c13fbeae059de979e80a2d7d6 -DIST stm32flash-0.6.tar.gz 376186 BLAKE2B 82e479b4fad2c3ff832aea9d0d62d556500fd8c0530e879690b9b83cdf05f078b0051e1e104e7cb64b9c360ef84415904639ee67ee147045ce8e15ca3f6c61e1 SHA512 2d92ecf4f82b8a702b596cbf3c4ff594f67083f7dcec82c064555f73b47834b41a918efa1846e47fc8740ae63fa818b16dfb5b38fa242c17f465666a651eee3a DIST stm32flash-0.7.tar.gz 380166 BLAKE2B 98522968072821e3cf110e62486a3b9ee90ac6c7e600f6633acbfac904024390157743f0895cae181fc9b20f4f14dc5b833c36e02de4adbfc644c797abd12d63 SHA512 328254dd043dc707cf8c3edf8ddd4a9441c85d9cb2ca1682bcb3f5301d526b04ed6fb335e72a94e3d26341f18bef45968bf321f0ffeb80eaa0c3add6701349ff -EBUILD stm32flash-0.6.ebuild 671 BLAKE2B 4c8404006fd8ccf66ebb3094b14dc9698dbec00fbb701a1a316952e7b9264e4d049873a88249925be894e39b8ac589dec23f1846a31e443134feb5a4f00ab798 SHA512 4ff141435294dc82302afa7ce56262cfde1f00f26c806fc2fa9d7d01ab937c338a83c40fa0083e3d2561f292a08a0cb6cf7757b8b8afd8da9b5fbb1c31278c3a EBUILD stm32flash-0.7.ebuild 372 BLAKE2B c0a9506d4872553d0dee7b5ca9d9a13ac417d87f22cb73d9d3cc57df4da1b6499fae498e3ac40faf8b886414e1f5232095489091fcf8c584f216c9ecd0b81186 SHA512 4a2c637b3b5c4969436a6e7af32b265a2722d3dc2b1ab6eab1d58fcf6a9a8d263a81e4876ee5519ddf48cbae3acc8e32dc3963c68a7ee181de5386c0af8a8213 MISC metadata.xml 248 BLAKE2B 62a02d1d6c2528ce44a3f3cb59d494b6e2707d195f38d2b0e6641cb11270bde3a3ddc2a0e1d52ebe354f832590af24b122e6c8c2a2356a802e0bcdc039585d88 SHA512 9ad0817759b2a2ccc47f9f1ba2eae5438dcaf2c685ba752c80dad2df5008bd513f050409be11124e5ea61a9605643ccf591443d275fe6e22b3fe33aa3210c55c diff --git a/dev-embedded/stm32flash/files/stm32flash-0.6-fix-i2c-erase-01fbb65.patch b/dev-embedded/stm32flash/files/stm32flash-0.6-fix-i2c-erase-01fbb65.patch deleted file mode 100644 index c4c7a2a7fedc..000000000000 --- a/dev-embedded/stm32flash/files/stm32flash-0.6-fix-i2c-erase-01fbb65.patch +++ /dev/null @@ -1,28 +0,0 @@ -From 01fbb65d4626e1c122e329075526bd6035cb0be6 Mon Sep 17 00:00:00 2001 -From: Tormod Volden <debian.tormod@gmail.com> -Date: Thu, 2 Sep 2021 16:25:57 +0200 -Subject: [PATCH 06/15] stm32: Fix typo from recent commit - -Oops, I got this wrong while amending commit b079cd09. - -Signed-off-by: Tormod Volden <debian.tormod@gmail.com> ---- - stm32.c | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/stm32.c b/stm32.c -index 6e2e402..0edaf01 100644 ---- a/stm32.c -+++ b/stm32.c -@@ -851,7 +851,7 @@ static stm32_err_t stm32_pages_erase(const stm32_t *stm, uint32_t spage, uint32_ - buf[i++] = pages - 1; - cs ^= (pages-1); - /* For I2C send a checksum after the number of pages (AN4221) */ -- if (port->flags && PORT_NPAG_CSUM) { -+ if (port->flags & PORT_NPAG_CSUM) { - buf[i++] = cs; - p_err = port->write(port, buf, i); - if (p_err != PORT_ERR_OK) { --- -2.33.0.309.g3052b89438-goog - diff --git a/dev-embedded/stm32flash/files/stm32flash-0.6-fix-i2c-erase-17a24f8.patch b/dev-embedded/stm32flash/files/stm32flash-0.6-fix-i2c-erase-17a24f8.patch deleted file mode 100644 index e0b519c48413..000000000000 --- a/dev-embedded/stm32flash/files/stm32flash-0.6-fix-i2c-erase-17a24f8.patch +++ /dev/null @@ -1,65 +0,0 @@ -From 17a24f873122b96481adefaadc128bd1abba594f Mon Sep 17 00:00:00 2001 -From: Tormod Volden <debian.tormod@gmail.com> -Date: Sat, 21 Aug 2021 13:06:34 +0200 -Subject: [PATCH 02/15] stm32: Consistent and unique erase error messages - -Signed-off-by: Tormod Volden <debian.tormod@gmail.com> ---- - stm32.c | 11 ++++++----- - 1 file changed, 6 insertions(+), 5 deletions(-) - -diff --git a/stm32.c b/stm32.c -index 82fa26a..e071905 100644 ---- a/stm32.c -+++ b/stm32.c -@@ -797,7 +797,7 @@ static stm32_err_t stm32_mass_erase(const stm32_t *stm) - return STM32_ERR_OK; - } - -- /* extended erase */ -+ /* extended erase (0x44 or 0x45) */ - buf[0] = 0xFF; /* 0xFFFF the magic number for mass erase */ - buf[1] = 0xFF; - buf[2] = 0x00; /* checksum */ -@@ -870,11 +870,12 @@ static stm32_err_t stm32_pages_erase(const stm32_t *stm, uint32_t spage, uint32_ - p_err = port->write(port, buf, i); - free(buf); - if (p_err != PORT_ERR_OK) { -- fprintf(stderr, "Erase failed.\n"); -+ fprintf(stderr, "Erase failed sending list of pages.\n"); - return STM32_ERR_UNKNOWN; - } - s_err = stm32_get_ack_timeout(stm, pages * STM32_PAGEERASE_TIMEOUT); - if (s_err != STM32_ERR_OK) { -+ fprintf(stderr, "Erase failed.\n"); - if (port->flags & PORT_STRETCH_W) - stm32_warn_stretching("erase"); - return STM32_ERR_UNKNOWN; -@@ -882,7 +883,7 @@ static stm32_err_t stm32_pages_erase(const stm32_t *stm, uint32_t spage, uint32_ - return STM32_ERR_OK; - } - -- /* extended erase */ -+ /* extended erase (0x44 or 0x45) */ - buf = malloc(2 + 2 * pages + 1); - if (!buf) - return STM32_ERR_UNKNOWN; -@@ -925,13 +926,13 @@ static stm32_err_t stm32_pages_erase(const stm32_t *stm, uint32_t spage, uint32_ - p_err = port->write(port, buf, i); - free(buf); - if (p_err != PORT_ERR_OK) { -- fprintf(stderr, "Page-by-page erase error.\n"); -+ fprintf(stderr, "Extended erase failed sending list of pages.\n"); - return STM32_ERR_UNKNOWN; - } - - s_err = stm32_get_ack_timeout(stm, pages * STM32_PAGEERASE_TIMEOUT); - if (s_err != STM32_ERR_OK) { -- fprintf(stderr, "Page-by-page erase failed. Check the maximum pages your device supports.\n"); -+ fprintf(stderr, "Extended erase failed. Check the maximum pages your device supports.\n"); - if ((port->flags & PORT_STRETCH_W) - && stm->cmd->er != STM32_CMD_EE_NS) - stm32_warn_stretching("erase"); --- -2.33.0.309.g3052b89438-goog - diff --git a/dev-embedded/stm32flash/files/stm32flash-0.6-fix-i2c-erase-b079cd0.patch b/dev-embedded/stm32flash/files/stm32flash-0.6-fix-i2c-erase-b079cd0.patch deleted file mode 100644 index dcd7299570c5..000000000000 --- a/dev-embedded/stm32flash/files/stm32flash-0.6-fix-i2c-erase-b079cd0.patch +++ /dev/null @@ -1,103 +0,0 @@ -From b079cd09bc942b4a489cad29524418441a44fc82 Mon Sep 17 00:00:00 2001 -From: Yann Sionneau <ysionneau@kalray.eu> -Date: Wed, 28 Apr 2021 14:16:01 +0200 -Subject: [PATCH 01/15] Follow bootloader protocol for page-by-page erase over - I2C - -For I2C the protocol is slighly different than for USART, -requiring a checksum after the number of pages. - -https://sourceforge.net/p/stm32flash/tickets/98/ - -Signed-off-by: Yann Sionneau <ysionneau@kalray.eu> -[Tormod: Add port flag, no wait, amend messages] -Signed-off-by: Tormod Volden <debian.tormod@gmail.com> ---- - i2c.c | 2 +- - port.h | 1 + - stm32.c | 37 +++++++++++++++++++++++++++++++++++++ - 3 files changed, 39 insertions(+), 1 deletion(-) - -diff --git a/i2c.c b/i2c.c -index bb99545..8425b41 100644 ---- a/i2c.c -+++ b/i2c.c -@@ -204,7 +204,7 @@ static port_err_t i2c_flush(struct port_interface __unused *port) - - struct port_interface port_i2c = { - .name = "i2c", -- .flags = PORT_STRETCH_W, -+ .flags = PORT_STRETCH_W | PORT_NPAG_CSUM, - .open = i2c_open, - .close = i2c_close, - .flush = i2c_flush, -diff --git a/port.h b/port.h -index 4e728d7..1a28dc6 100644 ---- a/port.h -+++ b/port.h -@@ -34,6 +34,7 @@ typedef enum { - #define PORT_CMD_INIT (1 << 2) /* use INIT cmd to autodetect speed */ - #define PORT_RETRY (1 << 3) /* allowed read() retry after timeout */ - #define PORT_STRETCH_W (1 << 4) /* warning for no-stretching commands */ -+#define PORT_NPAG_CSUM (1 << 5) /* checksum after number of pages to erase */ - - /* all options and flags used to open and configure an interface */ - struct port_options { -diff --git a/stm32.c b/stm32.c -index 966048b..82fa26a 100644 ---- a/stm32.c -+++ b/stm32.c -@@ -843,6 +843,25 @@ static stm32_err_t stm32_pages_erase(const stm32_t *stm, uint32_t spage, uint32_ - - buf[i++] = pages - 1; - cs ^= (pages-1); -+ /* For I2C send a checksum after the number of pages (AN4221) */ -+ if (port->flags && PORT_NPAG_CSUM) { -+ buf[i++] = cs; -+ p_err = port->write(port, buf, i); -+ if (p_err != PORT_ERR_OK) { -+ fprintf(stderr, "Erase failed sending number of pages."); -+ free(buf); -+ return STM32_ERR_UNKNOWN; -+ } -+ s_err = stm32_get_ack(stm); -+ if (s_err != STM32_ERR_OK) { -+ fprintf(stderr, "Erase failed, no ack after number of pages."); -+ free(buf); -+ return STM32_ERR_UNKNOWN; -+ } -+ cs = 0; -+ i = 0; -+ } -+ - for (pg_num = spage; pg_num < (pages + spage); pg_num++) { - buf[i++] = pg_num; - cs ^= pg_num; -@@ -876,6 +895,24 @@ static stm32_err_t stm32_pages_erase(const stm32_t *stm, uint32_t spage, uint32_ - buf[i++] = pg_byte; - cs ^= pg_byte; - -+ if (port->flags & PORT_NPAG_CSUM) { -+ buf[i++] = cs; -+ p_err = port->write(port, buf, i); -+ if (p_err != PORT_ERR_OK) { -+ fprintf(stderr, "Extended erase failed sending number of pages."); -+ free(buf); -+ return STM32_ERR_UNKNOWN; -+ } -+ s_err = stm32_get_ack(stm); -+ if (s_err != STM32_ERR_OK) { -+ fprintf(stderr, "Extended erase failed, no ack after number of pages."); -+ free(buf); -+ return STM32_ERR_UNKNOWN; -+ } -+ cs = 0; -+ i = 0; -+ } -+ - for (pg_num = spage; pg_num < spage + pages; pg_num++) { - pg_byte = pg_num >> 8; - cs ^= pg_byte; --- -2.33.0.309.g3052b89438-goog - diff --git a/dev-embedded/stm32flash/stm32flash-0.6.ebuild b/dev-embedded/stm32flash/stm32flash-0.6.ebuild deleted file mode 100644 index 34348ceabecc..000000000000 --- a/dev-embedded/stm32flash/stm32flash-0.6.ebuild +++ /dev/null @@ -1,30 +0,0 @@ -# Copyright 1999-2024 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=8 - -inherit toolchain-funcs - -DESCRIPTION="Open source flash program for STM32 using the ST serial bootloader" -HOMEPAGE="https://sourceforge.net/projects/stm32flash/" -SRC_URI="https://downloads.sourceforge.net/project/${PN}/${P}.tar.gz" - -LICENSE="GPL-2+" -SLOT="0" -KEYWORDS="~amd64 ~x86" - -PATCHES=( - "${FILESDIR}/stm32flash-0.6-fix-i2c-erase-b079cd0.patch" - "${FILESDIR}/stm32flash-0.6-fix-i2c-erase-17a24f8.patch" - "${FILESDIR}/stm32flash-0.6-fix-i2c-erase-01fbb65.patch" -) - -src_prepare() { - default - tc-export CC -} - -src_install() { - dobin ${PN} - doman ${PN}.1 -} diff --git a/dev-embedded/u-boot-tools/Manifest b/dev-embedded/u-boot-tools/Manifest index d9d9e02df96f..baa0737da2f7 100644 --- a/dev-embedded/u-boot-tools/Manifest +++ b/dev-embedded/u-boot-tools/Manifest @@ -1,8 +1,4 @@ -AUX disable-unused-mkeficapsule.patch 558 BLAKE2B 139a3f6a7637984c3dfd2ac1fac8e3907fe99fc9f3a48e729de503cf6430a3bd2842a7f650e1e6afd20591d50e40e12cdfea4aaa1c79d3bdb619612a8d8b5005 SHA512 f88bbe68a258931dcf72c329fe1dcecda21eedd267900f481ccdc4f12dce86f4158373fe0c4481029dc0fa66709b9d9bac8e0bdbd472fcfd71f521a5d233a00b -AUX disable-unused-pylibfdt.patch 471 BLAKE2B eeb65f9a5b158d4b13b633419d0e174d65903c5e23114862cfd49a7467d641e28968bd2893bf32492976609b4922becd7565f477d6fee1a545ba75b9068491b3 SHA512 0bbc980b092c33af1d4be750dedce374b3b2fd420268ceffb6f7029e6199a6f753d2708f6fba9a61020b4adec47996d8de858a1e7e64e8d09bd7405b66694d0c -DIST u-boot-2023.10.tar.bz2 19645392 BLAKE2B 1404ab42e8b0c821fbfdf612cc00ed5d6b1a1d15d4e69647e788cf97536234f89fe000f480107f8a78b56f7dae7a022f5e742c06ca7f381050e2251889fcdb83 SHA512 f238a69b9cc08ee0a69ea8ca2fa26975f2f2ede14e978b4db274b1e4095e43af0052307ac39034658a72ec9706951cd03c0f316d0591f391adecaf2cc9496fc4 DIST u-boot-2024.01.tar.bz2 19926911 BLAKE2B c62a22f56276426917b0db508ad7dc82efa4fe7be14c5e7d79ecdea172b2b383981b7e65b7e920b196d0162a17fb362ef97a8d758a1b30e509e3c66748d2c106 SHA512 45bd093ba3bda23e43cdde83d8656c1ee1348ac2886ecff1fee475f101ac4965a5be6565408fa5b990c723f3fdc833edfca60a719f735a43040cd14a1b59a88b DIST u-boot-tools-2024.01-fix-invalid-escape-sequence.patch 1285 BLAKE2B ad0af975b59794f21a44472a1f1b4542e75e478d51e649a6c339a4af9963cb4b822e6eba6819cbd3d35c09f3c33f1995288ef296e07466a427cf1f0dd0a399e1 SHA512 8675c267ca5a234924bdf8fc03dcaf75501cf86ac7a9b2e7fbc7982b9620e8863af289c124c5e91cccee58cc116b4d2798be745dedc1b28099a143f3464ad4d6 -EBUILD u-boot-tools-2023.10-r1.ebuild 1671 BLAKE2B 3f20384f8aa8d982341c0c596a03968d39512879087cec89b2a3de474889f1c098d680a670f40a12bccf75f62ef22d9e447bddacf01813a38a50bf4eddc05857 SHA512 07bf471cbcdabcb894dfb7f6d4a297dea6a818b368824a1f87eb3a171626e461c2bd8c5789d7daa4b793459e7602e48ef1926f288a1d15abb94a5d8395985421 -EBUILD u-boot-tools-2024.01.ebuild 1841 BLAKE2B e55ea90fb3ec1fe2f67e03b11f3b9431a73c60f0d70c2b69f0fdc964a5b21cf9cda25e4cd2d6f19340d79dddb27c2ea0f805b1e6fc0bec4fd3fbc130139481d2 SHA512 6be9d4630ae18242952bf0315f8e3441a07a01cb7e424428811cd1ef50901f30be997dd8257aa3a1eea6a5811fc66648df1f1d738306c9823c80a61b4ce36c92 +EBUILD u-boot-tools-2024.01-r1.ebuild 1899 BLAKE2B e88bdcebeaea50e8a27638367cef6561bba5f1be2e6b836cead7fa8751d1256d9379513575acac0d8195deae952af7d333a52a168cf90c3dedf741a11368269f SHA512 f7ffe79cbdd9aa816e37e2fa862dbb4a5caee6d3cebdced974319a52a8ddbc10b6001258901ec705db80f887778c2a2e6dc1932da6f353683746b0758751eed0 MISC metadata.xml 343 BLAKE2B 4115ff47d73727feb01367f4f6a419d46cfed433ac0f8e0b40366f61cefa9beef9c28511a0f8db727b22e04e38b0c741b415bf6edc3b8b4ef0867255beed1935 SHA512 1523312fc43fd850cf4d24b17d17a2607f5dd2786c4827c48014f750b97088ff95c97148cb8e9cbac2fc6b3e759dee32d04a9b5da62c130a7708b34db82e5196 diff --git a/dev-embedded/u-boot-tools/files/disable-unused-mkeficapsule.patch b/dev-embedded/u-boot-tools/files/disable-unused-mkeficapsule.patch deleted file mode 100644 index 90c8ce3f0a4d..000000000000 --- a/dev-embedded/u-boot-tools/files/disable-unused-mkeficapsule.patch +++ /dev/null @@ -1,14 +0,0 @@ -Disable unused mkeficapsule - -`CONFIG_TOOLS_MKEFICAPSULE` requires gnutls to build. Since we don't actually -expose the tool, we can just disable it. - -diff -ur a/configs/tools-only_defconfig b/configs/tools-only_defconfig ---- a/configs/tools-only_defconfig 2023-01-09 09:07:33.000000000 -0700 -+++ b/configs/tools-only_defconfig 2023-08-11 14:01:50.151294889 -0600 -@@ -33,4 +33,4 @@ - # CONFIG_VIRTIO_SANDBOX is not set - # CONFIG_GENERATE_ACPI_TABLE is not set - # CONFIG_EFI_LOADER is not set --CONFIG_TOOLS_MKEFICAPSULE=y -+# CONFIG_TOOLS_MKEFICAPSULE is not set diff --git a/dev-embedded/u-boot-tools/files/disable-unused-pylibfdt.patch b/dev-embedded/u-boot-tools/files/disable-unused-pylibfdt.patch deleted file mode 100644 index 8686341a8776..000000000000 --- a/dev-embedded/u-boot-tools/files/disable-unused-pylibfdt.patch +++ /dev/null @@ -1,17 +0,0 @@ -Disable unused pylibfdt - -The `imply BINMAN` causes `pylibfdt` to be built, which requires python. We -don't currently expose `pylibfdt`, or declare python dependencies, so disable -it. - -diff -ur a/arch/Kconfig b/arch/Kconfig ---- a/arch/Kconfig 2023-01-09 09:07:33.000000000 -0700 -+++ b/arch/Kconfig 2023-08-11 14:01:05.998403114 -0600 -@@ -205,7 +205,6 @@ - imply KEYBOARD - imply PHYSMEM - imply GENERATE_ACPI_TABLE -- imply BINMAN - - config SH - bool "SuperH architecture" diff --git a/dev-embedded/u-boot-tools/u-boot-tools-2023.10-r1.ebuild b/dev-embedded/u-boot-tools/u-boot-tools-2023.10-r1.ebuild deleted file mode 100644 index 05e693d9e34a..000000000000 --- a/dev-embedded/u-boot-tools/u-boot-tools-2023.10-r1.ebuild +++ /dev/null @@ -1,86 +0,0 @@ -# Copyright 1999-2024 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=8 - -inherit toolchain-funcs - -MY_P="u-boot-${PV/_/-}" -DESCRIPTION="utilities for working with Das U-Boot" -HOMEPAGE="https://www.denx.de/wiki/U-Boot/WebHome" -SRC_URI="https://ftp.denx.de/pub/u-boot/${MY_P}.tar.bz2" -S="${WORKDIR}/${MY_P}" - -LICENSE="GPL-2" -SLOT="0" -KEYWORDS="amd64 arm arm64 ppc ppc64 ~riscv x86" -IUSE="envtools" - -RDEPEND="dev-libs/openssl:=" -DEPEND="${RDEPEND}" -BDEPEND=" - app-alternatives/yacc - app-alternatives/lex - sys-apps/which - virtual/pkgconfig -" - -PATCHES=( - "${FILESDIR}/disable-unused-mkeficapsule.patch" - "${FILESDIR}/disable-unused-pylibfdt.patch" -) - -src_prepare() { - default - sed -i 's:\bpkg-config\b:${PKG_CONFIG}:g' \ - scripts/kconfig/{g,m,n,q}conf-cfg.sh \ - scripts/kconfig/Makefile \ - tools/Makefile || die -} - -src_configure() { - tc-export AR BUILD_CC CC PKG_CONFIG - tc-export_build_env -} - -src_compile() { - # Unset a few KBUILD variables. Bug #540476 - unset KBUILD_OUTPUT KBUILD_SRC - - local myemakeargs=( - V=1 - AR="${AR}" - CC="${CC}" - HOSTCC="${BUILD_CC}" - HOSTCFLAGS="${BUILD_CFLAGS} ${BUILD_CPPFLAGS}"' $(HOSTCPPFLAGS)' - HOSTLDFLAGS="${BUILD_LDFLAGS}" - ) - - emake "${myemakeargs[@]}" tools-only_defconfig - - emake "${myemakeargs[@]}" \ - NO_SDL=1 \ - HOSTSTRIP=: \ - STRIP=: \ - CONFIG_ENV_OVERWRITE=y \ - $(usex envtools envtools tools-all) -} - -src_test() { :; } - -src_install() { - cd tools || die - - if ! use envtools; then - dobin dumpimage fdtgrep gen_eth_addr img2srec mkenvimage mkimage - fi - - dobin env/fw_printenv - - dosym fw_printenv /usr/bin/fw_setenv - - insinto /etc - doins env/fw_env.config - - doman ../doc/mkimage.1 -} diff --git a/dev-embedded/u-boot-tools/u-boot-tools-2024.01.ebuild b/dev-embedded/u-boot-tools/u-boot-tools-2024.01-r1.ebuild index f4ac4ba3e697..1e13270fe5ad 100644 --- a/dev-embedded/u-boot-tools/u-boot-tools-2024.01.ebuild +++ b/dev-embedded/u-boot-tools/u-boot-tools-2024.01-r1.ebuild @@ -20,7 +20,11 @@ SLOT="0" KEYWORDS="amd64 arm arm64 ppc ppc64 ~riscv x86" IUSE="envtools" -RDEPEND="dev-libs/openssl:=" +RDEPEND=" + dev-libs/openssl:= + net-libs/gnutls:= + sys-apps/util-linux:= +" DEPEND="${RDEPEND}" BDEPEND=" dev-lang/swig @@ -76,7 +80,7 @@ src_install() { cd tools || die if ! use envtools; then - dobin dumpimage fdtgrep gen_eth_addr img2srec mkenvimage mkimage + dobin dumpimage fdtgrep gen_eth_addr img2srec mkeficapsule mkenvimage mkimage fi dobin env/fw_printenv diff --git a/dev-embedded/urjtag/Manifest b/dev-embedded/urjtag/Manifest index f9de638e296d..9c5f7ef0b8dc 100644 --- a/dev-embedded/urjtag/Manifest +++ b/dev-embedded/urjtag/Manifest @@ -1,5 +1,5 @@ AUX urjtag-2021.03-fix-python-setup.patch 598 BLAKE2B 9c466950fb3dad58c1eeb0b781f8dc2217fd6d44446d8592a35ac70f5edc755e543f63e895f07f9fac004e522a2d15ff4d8fdbfdf42b71487ffd8cec251cf644 SHA512 5be37a5313ae26adf38fbe33518f3b4412e6b7a9709d04a98a7055d05b3515c643f2a9967c6b43faf0ffd69dae89d74c2900ae3bcd95198153a0a649763c2226 DIST urjtag-2021.03.tar.xz 1208440 BLAKE2B 68d0f0ec15c25ef351e0523eea21c18e723871032a046d31c031809a2774b0b8339b0b5d1a6f11a681ab3d3074b7f5f4fcd819fa7de1fdcac5f20ab39c6a40dd SHA512 baf203e556d1d41437539d3f5c018b35fbb496f71391c2bec2786ffa47bff33d38654b3e7d106e38bcf36d075d86fc02b18eaaf634cdb65e2840ff50ca0da8b2 -EBUILD urjtag-2021.03.ebuild 1707 BLAKE2B b8a17f4f5a83e30dbe6ea006c28850d0c0402bb9d1034ee1a37d0afd70c752d4f6a0e80a217a798bbae6b8132639ff0011352cfe96780e9a66fc1cd132fc6ef7 SHA512 ae5ecb36f2b16b5b43804c5f9ee11465f742b663a77edb746e2e9fd7ed31b7da3cd4bd9c057902cf81d7e7fe9a6cd97eec21e2e620b18f0e002e381cc2edef8f -EBUILD urjtag-9999.ebuild 1711 BLAKE2B 5920aa3244083dbef4c2704de6126bf201c62f9bd6ee5dfa5e4037e4b2264a82c0d93c518d921b9543b3ac998201c11c55faac18c1a102b7aed2cf213ca55ad6 SHA512 8614d5709876d4567adb8caa09b04f2c6cadcf6c53ffcfa7ee616c42028e7dd84525e719f93ab30d6baa6bc25cb22e68838eac4b7fb7fae405179d21181bdd1a +EBUILD urjtag-2021.03.ebuild 1727 BLAKE2B 81e21a0749f66e51d1fdd7631c6f9d4becbda894a3442eff5051d98b13f410dff1cc53765456a4eba6c631bfd2a2cbd1847b71bdf075269eb1c629e47bb6f832 SHA512 fd9a50759b8d9e8c5e84c3a6d53528d63d873e85a51fdaa2cc9b4e84a5e5f781aae4415651a4ffd915d7b70b17866fc2bb8ec64c7ee937e4cd94c2148d4bef86 +EBUILD urjtag-9999.ebuild 1712 BLAKE2B f7c01fd2795159eb4a408c8357c11e523453ea547eeb9a12daf132ce3c1acc16455469ccd7f6f486d712a62e26fcbee33ab07cef87514dae5e09f86f37d20c2e SHA512 95cb109ff7c345434a804a62d22f173fa4cec16295565ec235b0bc52cfc3e0ab8556a24d081f68d6336cb2ac6d76a408299d63f911899e9e6c169830bbd12b9a MISC metadata.xml 541 BLAKE2B d55c3fb90be36d6e3f26aeff7e82f1a62cf0cedbf5b7260674b33fcf6269fa758c5012d106db60fa69cc9f7ae6b1f62290814948231c7339b3699700ba4cde88 SHA512 4c88c663470a1c04f6d94a28ddaf16f69d6fdc4c660a58c0e2d7daac5b92f9c8639e1287c2ca314d943bf1fd8409ea7aab3dedbf51439ffbeb7324db0662c73e diff --git a/dev-embedded/urjtag/urjtag-2021.03.ebuild b/dev-embedded/urjtag/urjtag-2021.03.ebuild index 1b765b94391a..56275fc855ba 100644 --- a/dev-embedded/urjtag/urjtag-2021.03.ebuild +++ b/dev-embedded/urjtag/urjtag-2021.03.ebuild @@ -8,16 +8,16 @@ PYTHON_COMPAT=( python3_{10..12} ) inherit python-r1 if [[ ${PV} == "9999" ]] ; then - EGIT_REPO_URI="git://git.code.sf.net/p/urjtag/git" + EGIT_REPO_URI="https://git.code.sf.net/p/urjtag/git" inherit git-r3 autotools S="${WORKDIR}/${P}/${PN}" else - SRC_URI="https://downloads.sourceforge.net/urjtag/${P}.tar.xz" + SRC_URI="https://downloads.sourceforge.net/project/${PN}/${PN}/${PV}/${P}.tar.xz" KEYWORDS="amd64 ppc sparc x86" fi DESCRIPTION="Tool for communicating over JTAG with flash chips, CPUs, and many more" -HOMEPAGE="https://urjtag.sourceforge.net/" +HOMEPAGE="https://urjtag.sourceforge.io/" LICENSE="GPL-2" SLOT="0" diff --git a/dev-embedded/urjtag/urjtag-9999.ebuild b/dev-embedded/urjtag/urjtag-9999.ebuild index d01057522264..60327e2adb4b 100644 --- a/dev-embedded/urjtag/urjtag-9999.ebuild +++ b/dev-embedded/urjtag/urjtag-9999.ebuild @@ -8,7 +8,7 @@ PYTHON_COMPAT=( python3_{10..12} ) inherit python-r1 if [[ ${PV} == "9999" ]] ; then - EGIT_REPO_URI="git://git.code.sf.net/p/urjtag/git" + EGIT_REPO_URI="https://git.code.sf.net/p/urjtag/git" inherit git-r3 autotools S="${WORKDIR}/${P}/${PN}" else @@ -17,7 +17,7 @@ else fi DESCRIPTION="Tool for communicating over JTAG with flash chips, CPUs, and many more" -HOMEPAGE="https://urjtag.sourceforge.net/" +HOMEPAGE="https://urjtag.sourceforge.io/" LICENSE="GPL-2" SLOT="0" diff --git a/dev-embedded/xa/Manifest b/dev-embedded/xa/Manifest index db7143a36091..b9b3061427bd 100644 --- a/dev-embedded/xa/Manifest +++ b/dev-embedded/xa/Manifest @@ -1,4 +1,5 @@ AUX xa-2.4.0-make.patch 599 BLAKE2B c36cbebe508944f9d730596d4ef2e68691e083afce97df5d4c402497d431babcd213debb9cdae4231b3f0a8f4dbdb5d006942a62ddf6712df2b7ff03da08b57f SHA512 89b8c3f40bf6beee05db1a10078e0facab24e03afe9c3c31d0647c11c415cf51904307019cb2868756e4b4d58e0def715b13771696d1a9af3ce76c0decc80c7a -DIST xa-2.4.0.tar.gz 197862 BLAKE2B 27f8b41dafee9c1c4158681d57f971297a0a63e09df164469f665528cffae0cdd78441c0a939d742463e851f32a73ee30a95f2b2b41e2fe42137041a03041255 SHA512 eebaf67715324735203405016df7311bf2ed568ab0e609c0fec7d9d803c173cde5dea161b7f713cb5215454d1ce69acbde43372016dfe9866ed99acecb9aafb1 -EBUILD xa-2.4.0.ebuild 565 BLAKE2B dd7ee16286af4c88ff1e833c058827b94a1ab670853fc073ad7caec5c4a710d7bb52ad42bc1931d1915980c32106655d583ea0ed8466e03f73b4952b91c8bce2 SHA512 4e9131999b233fc8bb1d27e7ae156c3748858f2d86162433e3c959d22c386dbfeb779b98b0c9b0e1a1279a4bb59e920bb7922a2a815a2d40d941747deac3a548 +AUX xa-2.4.1-make.patch 601 BLAKE2B 6d1d14c79ea7bb733b946c240e35e66c5eb0ef4c93aa67533f0837e39d08f89102eb1095ce746fa4b5428a2c78d3554bcf8027ec9b0e3c6d6d7a516f23eb657c SHA512 996434d11b42ed6fb79353e9c6e88e84954dada178b1ba8651625725c711927f77ed5b79ac0a4409cc42827f5ed1edf092a06bb19b598ea2a1d4b5eccfd9e353 +DIST xa-2.4.1.tar.gz 208553 BLAKE2B 86092d2a215d141f76bb8a31861f20e5124f2ec7125a5649b9b28a86e727d5f201826581c38aea8693d16692d8be13103a917c1152980d6a4764555751af7dac SHA512 aaec796bec362ab253abc33320cb36ef879fa661c2091c7e3b2ce96ccc56063c59335fb7eb1d6a3de9486ab8973cbbc71c445e1ef816572a55a1338ffed19dc0 +EBUILD xa-2.4.1.ebuild 565 BLAKE2B b646420d91ad64477b09e46eb9a2b64b6ef03928b6aea8f885d16298f4c7828ad5e7f39c0944ae268966cd31eacfbdb8ff92ad8c572f0c52046122f32700871f SHA512 2721195fca17cbb443a63c96a3962ae7ef5c0baa46f035bc942c531547005afed19f60dc57484fff4e5cec5536e048ad0210b8228d4a6bef58438b619922e40d MISC metadata.xml 548 BLAKE2B 3acb4c1e9192f25578d0e57f4527c1fd9af3738f48978cd5af39e9728336a23576f19e48568028c47b9db1394539280553590bcd29c206d11ab4acba50c5dbda SHA512 6b1274a1ee5456a5e2cdee2e1bfd34777b66d5178034b11f314549640c3085d069d96e71da9d476c03977540b6a08f8acb034b8df938b8caac1005eee4d2066d diff --git a/dev-embedded/xa/files/xa-2.4.1-make.patch b/dev-embedded/xa/files/xa-2.4.1-make.patch new file mode 100644 index 000000000000..c4fd2f667584 --- /dev/null +++ b/dev-embedded/xa/files/xa-2.4.1-make.patch @@ -0,0 +1,28 @@ +https://bugs.gentoo.org/722600 +--- a/Makefile ++++ b/Makefile +@@ -4,2 +3,0 @@ +-CC = gcc +-LD = gcc +@@ -8,2 +5,0 @@ +-CFLAGS = -O2 -g +-LDFLAGS = -lc +@@ -32 +28 @@ +-all: killxa xa uncpk ++all: xa uncpk +@@ -38 +34 @@ +- (cd src && LD=${LD} CC="${CC} ${CFLAGS}" ${MAKE}) ++ (cd src && ${MAKE}) +@@ -44 +40 @@ +- (cd misc && CC="${CC} ${CFLAGS}" ${MAKE}) ++ (cd misc && ${MAKE}) +--- a/misc/Makefile ++++ b/misc/Makefile +@@ -5 +5 @@ +-CFLAGS = -O2 -g ++CFLAGS := $(CFLAGS) $(CPPFLAGS) $(LDFLAGS) +--- a/src/Makefile ++++ b/src/Makefile +@@ -12 +12 @@ +- ${LD} -o ../xa ${OBJ} ${LDFLAGS} ++ ${CC} ${LDFLAGS} -o ../xa ${OBJ} diff --git a/dev-embedded/xa/xa-2.4.0.ebuild b/dev-embedded/xa/xa-2.4.1.ebuild index df008580717d..8c7876bee858 100644 --- a/dev-embedded/xa/xa-2.4.0.ebuild +++ b/dev-embedded/xa/xa-2.4.1.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2023 Gentoo Authors +# Copyright 1999-2024 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=8 @@ -14,7 +14,7 @@ SLOT="0" KEYWORDS="amd64 ~arm ~arm64 x86" PATCHES=( - "${FILESDIR}"/${PN}-2.4.0-make.patch + "${FILESDIR}"/${PN}-2.4.1-make.patch ) src_configure() { |