From 35609c69069f40f082d37d0476e417a9346a59f5 Mon Sep 17 00:00:00 2001 From: "Rick Farina (Zero_Chaos)" Date: Thu, 2 May 2024 12:07:12 -0400 Subject: [PATCH 01/19] pentoo-radio: pkgcheck fixes --- ...ntoo-radio-2023.2-r4.ebuild => pentoo-radio-2024.1.ebuild} | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) rename pentoo/pentoo-radio/{pentoo-radio-2023.2-r4.ebuild => pentoo-radio-2024.1.ebuild} (93%) diff --git a/pentoo/pentoo-radio/pentoo-radio-2023.2-r4.ebuild b/pentoo/pentoo-radio/pentoo-radio-2024.1.ebuild similarity index 93% rename from pentoo/pentoo-radio/pentoo-radio-2023.2-r4.ebuild rename to pentoo/pentoo-radio/pentoo-radio-2024.1.ebuild index 92c8b6fd4..6508dcdc3 100644 --- a/pentoo/pentoo-radio/pentoo-radio-2023.2-r4.ebuild +++ b/pentoo/pentoo-radio/pentoo-radio-2024.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 @@ -17,7 +17,7 @@ PDEPEND="net-wireless/gnuradio[uhd?] hackrf? ( net-wireless/hackrf-tools ) bladerf? ( net-wireless/bladerf ) limesdr? ( net-wireless/limesuite ) - plutosdr? ( || ( net-wireless/gnuradio[iio] net-wireless/gr-iio ) ) + plutosdr? ( net-wireless/gnuradio[iio] ) rtlsdr? ( net-wireless/rtl-sdr ) bluetooth? ( From a7c7373a6d01660b3edd4c090f877a7e8291d12f Mon Sep 17 00:00:00 2001 From: "Rick Farina (Zero_Chaos)" Date: Thu, 2 May 2024 12:08:38 -0400 Subject: [PATCH 02/19] ft60x_driver: drop old --- sys-kernel/ft60x_driver/Manifest | 1 - .../ft60x_driver/ft60x_driver-20180209.ebuild | 31 ------------------- 2 files changed, 32 deletions(-) delete mode 100644 sys-kernel/ft60x_driver/ft60x_driver-20180209.ebuild diff --git a/sys-kernel/ft60x_driver/Manifest b/sys-kernel/ft60x_driver/Manifest index ab6b2b711..108b69629 100644 --- a/sys-kernel/ft60x_driver/Manifest +++ b/sys-kernel/ft60x_driver/Manifest @@ -1,2 +1 @@ -DIST ft60x_driver-20180209.zip 17430 BLAKE2B f3f7fff75add035ec390982d9df9079f95970d12f877d6d1baa8ebbb54aa691eb5e93b60fb4191fae2cba86d22b2f385b9d21fe1eeec980d443de36e7150ae93 SHA512 0f9af5697486d645dd9c0b9995212df73b03a2f4559ef98d8bdec49cf5be4da11ca387712ebe3c66da0b34f363e1b4d8f77c7d3fd7e9ece4ba72e6cf4b476827 DIST ft60x_driver-20190318.zip 18240 BLAKE2B 3cbcf14a2d4abea06b24651af00ab5b8b55b3c708dcb659b2957cd32573fade5de499d176ea4935756f17ab95c2ebd3895cde9f3e1f7532ed7ba891416ed26b4 SHA512 9a19209f01a48d416ac5a93f8a5e807d5a374d98dc5cdc9653f0922f0248a417770d1aa98bcaa32319178cf4c707965b2b8e7acefca4d4cfa563052b2f857886 diff --git a/sys-kernel/ft60x_driver/ft60x_driver-20180209.ebuild b/sys-kernel/ft60x_driver/ft60x_driver-20180209.ebuild deleted file mode 100644 index a3db342a6..000000000 --- a/sys-kernel/ft60x_driver/ft60x_driver-20180209.ebuild +++ /dev/null @@ -1,31 +0,0 @@ -# Copyright 1999-2020 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 - -inherit linux-mod udev - -MY_COMMIT="4299a497c043cc3ddf4cb8dfcc0d4a45d44b80f9" - -DESCRIPTION="USB FT60x driver" -HOMEPAGE="https://github.com/lambdaconcept/ft60x_driver" -SRC_URI="https://github.com/lambdaconcept/ft60x_driver/archive/${MY_COMMIT}.zip -> ${P}.zip" - -LICENSE="GPL-2" -SLOT="0" - -KEYWORDS="amd64 ~arm64 x86" - -S="${WORKDIR}/${PN}-${MY_COMMIT}" - -MODULE_NAMES="ft60x(usb:${S}:${S})" -BUILD_TARGETS="all" - -pkg_setup() { - linux-mod_pkg_setup -} - -src_install() { - linux-mod_src_install - udev_dorules 51-ft60x.rules -} From 707bcc325c9052de7bfd10d8ca770676c224e479 Mon Sep 17 00:00:00 2001 From: "Rick Farina (Zero_Chaos)" Date: Thu, 2 May 2024 12:16:46 -0400 Subject: [PATCH 03/19] ft60x_driver: still unbuildable but cleaned up --- sys-kernel/ft60x_driver/Manifest | 2 +- .../ft60x_driver/ft60x_driver-20190318.ebuild | 32 +++++++++++-------- sys-kernel/ft60x_driver/metadata.xml | 11 +++++++ 3 files changed, 30 insertions(+), 15 deletions(-) create mode 100644 sys-kernel/ft60x_driver/metadata.xml diff --git a/sys-kernel/ft60x_driver/Manifest b/sys-kernel/ft60x_driver/Manifest index 108b69629..d13a267e8 100644 --- a/sys-kernel/ft60x_driver/Manifest +++ b/sys-kernel/ft60x_driver/Manifest @@ -1 +1 @@ -DIST ft60x_driver-20190318.zip 18240 BLAKE2B 3cbcf14a2d4abea06b24651af00ab5b8b55b3c708dcb659b2957cd32573fade5de499d176ea4935756f17ab95c2ebd3895cde9f3e1f7532ed7ba891416ed26b4 SHA512 9a19209f01a48d416ac5a93f8a5e807d5a374d98dc5cdc9653f0922f0248a417770d1aa98bcaa32319178cf4c707965b2b8e7acefca4d4cfa563052b2f857886 +DIST ft60x_driver-20190318.tar.gz 16016 BLAKE2B b30026d2ddc320373c809a193a42e77c880d73f3a2c6323fe209d81db705a9dd6fecf9af3bce93a383f49199d5eb13dd64994b76b9b345083dfc5623aac73ba6 SHA512 7f1c84511619890bb9b637cc0c63e73681aa79acf3177d67aced90af6173608acae6e7dd394966667b720f15d2416aa7caaf0df5e659f7b32d37b8f21e8865ac diff --git a/sys-kernel/ft60x_driver/ft60x_driver-20190318.ebuild b/sys-kernel/ft60x_driver/ft60x_driver-20190318.ebuild index 2e9737cb7..7c07cf070 100644 --- a/sys-kernel/ft60x_driver/ft60x_driver-20190318.ebuild +++ b/sys-kernel/ft60x_driver/ft60x_driver-20190318.ebuild @@ -1,31 +1,35 @@ -# Copyright 1999-2021 Gentoo Authors +# Copyright 1999-2024 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI=7 +EAPI=8 -inherit linux-mod udev +inherit linux-mod-r1 udev MY_COMMIT="c216cc41a2f9e4b4bc356fb2ca17359275a4f3cd" DESCRIPTION="USB FT60x driver" HOMEPAGE="https://github.com/lambdaconcept/ft60x_driver" -SRC_URI="https://github.com/lambdaconcept/ft60x_driver/archive/${MY_COMMIT}.zip -> ${P}.zip" - -LICENSE="GPL-2" -SLOT="0" - -KEYWORDS="amd64 ~arm64 x86" +SRC_URI="https://github.com/lambdaconcept/ft60x_driver/archive/${MY_COMMIT}.tar.gz -> ${P}.tar.gz" S="${WORKDIR}/${PN}-${MY_COMMIT}" - -MODULE_NAMES="ft60x(usb:${S}:${S})" -BUILD_TARGETS="all" +LICENSE="GPL-2" +SLOT="0" +KEYWORDS="amd64 ~arm64 x86" pkg_setup() { - linux-mod_pkg_setup + if use kernel_linux; then + linux-mod-r1_pkg_setup + else + die "Could not determine proper ${PN} package" + fi +} + +src_compile() { + local modlist=( ft60x=usb ) + linux-mod-r1_src_compile } src_install() { - linux-mod_src_install + linux-mod-r1_src_install udev_dorules 51-ft60x.rules } diff --git a/sys-kernel/ft60x_driver/metadata.xml b/sys-kernel/ft60x_driver/metadata.xml new file mode 100644 index 000000000..f94232837 --- /dev/null +++ b/sys-kernel/ft60x_driver/metadata.xml @@ -0,0 +1,11 @@ + + + + + noone@pentoo.org + No One + + + lambdaconcept/ft60x_driver + + From 1e5d12830a10067f12a96e0de6a92ba08c6549bc Mon Sep 17 00:00:00 2001 From: "Rick Farina (Zero_Chaos)" Date: Thu, 2 May 2024 12:17:18 -0400 Subject: [PATCH 04/19] ft60x_driver: drop, unbuildable for years --- sys-kernel/ft60x_driver/Manifest | 1 - .../ft60x_driver/ft60x_driver-20190318.ebuild | 35 ------------------- sys-kernel/ft60x_driver/metadata.xml | 11 ------ 3 files changed, 47 deletions(-) delete mode 100644 sys-kernel/ft60x_driver/Manifest delete mode 100644 sys-kernel/ft60x_driver/ft60x_driver-20190318.ebuild delete mode 100644 sys-kernel/ft60x_driver/metadata.xml diff --git a/sys-kernel/ft60x_driver/Manifest b/sys-kernel/ft60x_driver/Manifest deleted file mode 100644 index d13a267e8..000000000 --- a/sys-kernel/ft60x_driver/Manifest +++ /dev/null @@ -1 +0,0 @@ -DIST ft60x_driver-20190318.tar.gz 16016 BLAKE2B b30026d2ddc320373c809a193a42e77c880d73f3a2c6323fe209d81db705a9dd6fecf9af3bce93a383f49199d5eb13dd64994b76b9b345083dfc5623aac73ba6 SHA512 7f1c84511619890bb9b637cc0c63e73681aa79acf3177d67aced90af6173608acae6e7dd394966667b720f15d2416aa7caaf0df5e659f7b32d37b8f21e8865ac diff --git a/sys-kernel/ft60x_driver/ft60x_driver-20190318.ebuild b/sys-kernel/ft60x_driver/ft60x_driver-20190318.ebuild deleted file mode 100644 index 7c07cf070..000000000 --- a/sys-kernel/ft60x_driver/ft60x_driver-20190318.ebuild +++ /dev/null @@ -1,35 +0,0 @@ -# Copyright 1999-2024 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=8 - -inherit linux-mod-r1 udev - -MY_COMMIT="c216cc41a2f9e4b4bc356fb2ca17359275a4f3cd" - -DESCRIPTION="USB FT60x driver" -HOMEPAGE="https://github.com/lambdaconcept/ft60x_driver" -SRC_URI="https://github.com/lambdaconcept/ft60x_driver/archive/${MY_COMMIT}.tar.gz -> ${P}.tar.gz" - -S="${WORKDIR}/${PN}-${MY_COMMIT}" -LICENSE="GPL-2" -SLOT="0" -KEYWORDS="amd64 ~arm64 x86" - -pkg_setup() { - if use kernel_linux; then - linux-mod-r1_pkg_setup - else - die "Could not determine proper ${PN} package" - fi -} - -src_compile() { - local modlist=( ft60x=usb ) - linux-mod-r1_src_compile -} - -src_install() { - linux-mod-r1_src_install - udev_dorules 51-ft60x.rules -} diff --git a/sys-kernel/ft60x_driver/metadata.xml b/sys-kernel/ft60x_driver/metadata.xml deleted file mode 100644 index f94232837..000000000 --- a/sys-kernel/ft60x_driver/metadata.xml +++ /dev/null @@ -1,11 +0,0 @@ - - - - - noone@pentoo.org - No One - - - lambdaconcept/ft60x_driver - - From 99eeb56ebca8fd2fd2d2c9de32d1d86b4bf427bf Mon Sep 17 00:00:00 2001 From: "Rick Farina (Zero_Chaos)" Date: Thu, 2 May 2024 12:18:06 -0400 Subject: [PATCH 05/19] profile: cleanup ft60x_driver reference --- profiles/pentoo/base/package.accept_keywords/sys-kernel | 2 -- 1 file changed, 2 deletions(-) diff --git a/profiles/pentoo/base/package.accept_keywords/sys-kernel b/profiles/pentoo/base/package.accept_keywords/sys-kernel index 4aef111fb..e18e6d429 100644 --- a/profiles/pentoo/base/package.accept_keywords/sys-kernel +++ b/profiles/pentoo/base/package.accept_keywords/sys-kernel @@ -8,5 +8,3 @@ sys-kernel/ax88179_178a sys-kernel/pf_ring-kmod sys-kernel/minipli-sources - -sys-kernel/ft60x_driver From e9e1eb2f06733586039d7870d3a998864b5c583b Mon Sep 17 00:00:00 2001 From: "Rick Farina (Zero_Chaos)" Date: Thu, 2 May 2024 12:18:59 -0400 Subject: [PATCH 06/19] pcileech: drop old 4.16 --- app-forensics/pcileech/Manifest | 1 - app-forensics/pcileech/pcileech-4.16.ebuild | 33 --------------------- 2 files changed, 34 deletions(-) delete mode 100644 app-forensics/pcileech/pcileech-4.16.ebuild diff --git a/app-forensics/pcileech/Manifest b/app-forensics/pcileech/Manifest index b4f692419..251bed200 100644 --- a/app-forensics/pcileech/Manifest +++ b/app-forensics/pcileech/Manifest @@ -1,2 +1 @@ -DIST pcileech-4.16.tar.gz 384465 BLAKE2B 8c67d6db418909f82192833b49b09d96876ce0fd1939a63f94c582fa8ee3d936b73640039c51b746118855dc61aa5e815e29c8bab68afe775c51690286cdb222 SHA512 3ca92ea3b9a795c22baa4ac1aa31e1e4019fec83a4e406e654f8306add9b523acda6feab891228f7d812924399b74a8df250dd3a23f1036d2dfe3eb8963d2967 DIST pcileech-4.17.tar.gz 393124 BLAKE2B fd6d044e1475ff364f49c1d0ed65bebb5bb412f97e29432d50ed548be2c6d16fd2ecb81629261b6b17b274d1797b4a1bc7c3ea94bbeb672f21a4faed0a5a1504 SHA512 1c4370f6b9dbe3d6aee42d60f682645517ea818d14f8e4e8d515fdfb70eead2668fe9640de0caf1403a665310528a319fd77e7db7754bc68f570dbf64e174f76 diff --git a/app-forensics/pcileech/pcileech-4.16.ebuild b/app-forensics/pcileech/pcileech-4.16.ebuild deleted file mode 100644 index bbb3c836e..000000000 --- a/app-forensics/pcileech/pcileech-4.16.ebuild +++ /dev/null @@ -1,33 +0,0 @@ -# Copyright 1999-2023 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=8 - -DESCRIPTION="Direct Memory Access (DMA) Attack Software" -HOMEPAGE="https://github.com/ufrisk/pcileech" -SRC_URI="https://github.com/ufrisk/pcileech/archive/v${PV}.tar.gz -> ${P}.tar.gz" - -LICENSE="Apache-2.0" -SLOT="0" -KEYWORDS="amd64 ~arm64 x86" -IUSE="ft60x_driver" - -DEPEND="virtual/libusb:1 - >=dev-libs/LeechCore-2.7 - >=dev-libs/memprocfs-4.7 - ft60x_driver? ( sys-kernel/ft60x_driver )" -RDEPEND="${DEPEND}" - -src_prepare() { - sed '/mv leechcore.so/d' -i pcileech/Makefile || die - sed '/mv vmm.so/d' -i pcileech/Makefile || die - eapply_user -} - -src_compile() { - emake -C pcileech -} - -src_install(){ - dobin files/pcileech -} From 8fe1303ab606c94636199b50f4440a0ea725a932 Mon Sep 17 00:00:00 2001 From: "Rick Farina (Zero_Chaos)" Date: Thu, 2 May 2024 12:23:16 -0400 Subject: [PATCH 07/19] pcileech: pkgcheck fixes --- app-forensics/pcileech/metadata.xml | 6 +++--- app-forensics/pcileech/pcileech-4.17.ebuild | 6 ++---- 2 files changed, 5 insertions(+), 7 deletions(-) diff --git a/app-forensics/pcileech/metadata.xml b/app-forensics/pcileech/metadata.xml index 9a1abb085..8473c0a9b 100644 --- a/app-forensics/pcileech/metadata.xml +++ b/app-forensics/pcileech/metadata.xml @@ -5,7 +5,7 @@ unknown@pentoo.ch Author Unknown - - Use sys-kernel/ft60x_driver for USB FT60x driver support - + + ufrisk/pcileech + diff --git a/app-forensics/pcileech/pcileech-4.17.ebuild b/app-forensics/pcileech/pcileech-4.17.ebuild index bbb3c836e..c43e29395 100644 --- a/app-forensics/pcileech/pcileech-4.17.ebuild +++ b/app-forensics/pcileech/pcileech-4.17.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 @@ -10,12 +10,10 @@ SRC_URI="https://github.com/ufrisk/pcileech/archive/v${PV}.tar.gz -> ${P}.tar.gz LICENSE="Apache-2.0" SLOT="0" KEYWORDS="amd64 ~arm64 x86" -IUSE="ft60x_driver" DEPEND="virtual/libusb:1 >=dev-libs/LeechCore-2.7 - >=dev-libs/memprocfs-4.7 - ft60x_driver? ( sys-kernel/ft60x_driver )" + >=dev-libs/memprocfs-4.7" RDEPEND="${DEPEND}" src_prepare() { From d118d27b30dcca5fe1ba0633b893d0a28a5858b8 Mon Sep 17 00:00:00 2001 From: "Rick Farina (Zero_Chaos)" Date: Thu, 2 May 2024 12:24:37 -0400 Subject: [PATCH 08/19] liteeth: drop unmaintained --- sci-electronics/liteeth/Manifest | 2 -- .../liteeth/liteeth-20180301.ebuild | 29 ------------------- .../liteeth/liteeth-20180719.ebuild | 24 --------------- 3 files changed, 55 deletions(-) delete mode 100644 sci-electronics/liteeth/Manifest delete mode 100644 sci-electronics/liteeth/liteeth-20180301.ebuild delete mode 100644 sci-electronics/liteeth/liteeth-20180719.ebuild diff --git a/sci-electronics/liteeth/Manifest b/sci-electronics/liteeth/Manifest deleted file mode 100644 index 65a74fc8f..000000000 --- a/sci-electronics/liteeth/Manifest +++ /dev/null @@ -1,2 +0,0 @@ -DIST liteeth-20180301.zip 246584 BLAKE2B 3179195b067782438ac2e7fcd8c19d725e311d1e4f2d734d3e5ff671aecc29eaf135e438d490ebb1f8dbda5352a12d206e21228c469d658901713d060185c3b4 SHA512 12e59f4f2603e07533d90bdfa96bf25b6ba3ff7719da24b0524e3729abb47f977c576f7584e23f417f19b3e91e7b6c844563b7ec1208abfa4dd2c8834819c85c -DIST liteeth-20180719.zip 256039 BLAKE2B b0c1686fd78a348a868275ac46e82a5fdf685743aedc8c39826c472d9add7b87bc4845e2d59ff208544f7787155c1a7d49f9d5f3b499a508d074be6a53b952be SHA512 7378400faaa9aca800a444768e461b9c62989a28238bdf6a3f5d2cd96bef3418835047691f1498cf7289628b283187d58ee50d2be1ada116a273737970cdd77f diff --git a/sci-electronics/liteeth/liteeth-20180301.ebuild b/sci-electronics/liteeth/liteeth-20180301.ebuild deleted file mode 100644 index 39301da35..000000000 --- a/sci-electronics/liteeth/liteeth-20180301.ebuild +++ /dev/null @@ -1,29 +0,0 @@ -# Copyright 1999-2018 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 - -PYTHON_COMPAT=( python3_{10..12} ) -inherit distutils-r1 - -MY_COMMIT="95849a0fed26c2f7e88e731e8ba7cb6b95d873e8" - -DESCRIPTION="Small footprint and configurable Ethernet core" -HOMEPAGE="https://github.com/enjoy-digital/liteeth" -SRC_URI="https://github.com/enjoy-digital/liteeth/archive/${MY_COMMIT}.zip -> ${P}.zip" - -LICENSE="BSD" -SLOT="0" -KEYWORDS="~amd64 ~arm ~arm64 ~x86" - -RDEPEND="sci-electronics/litex[${PYTHON_USEDEP}] - sci-electronics/migen[${PYTHON_USEDEP}]" -DEPEND="${RDEPEND} - dev-python/setuptools[${PYTHON_USEDEP}]" - -S=${WORKDIR}/${PN}-${MY_COMMIT} - -src_prepare(){ - rm test/__init__.py example_designs/__init__.py - eapply_user -} diff --git a/sci-electronics/liteeth/liteeth-20180719.ebuild b/sci-electronics/liteeth/liteeth-20180719.ebuild deleted file mode 100644 index c108dfe15..000000000 --- a/sci-electronics/liteeth/liteeth-20180719.ebuild +++ /dev/null @@ -1,24 +0,0 @@ -# Copyright 1999-2018 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 - -PYTHON_COMPAT=( python3_{10..12} ) -inherit distutils-r1 - -MY_COMMIT="24b0d2b8c2cfcf96a8c6cb56ec01af9a56952aad" - -DESCRIPTION="Small footprint and configurable Ethernet core" -HOMEPAGE="https://github.com/enjoy-digital/liteeth" -SRC_URI="https://github.com/enjoy-digital/liteeth/archive/${MY_COMMIT}.zip -> ${P}.zip" - -LICENSE="BSD" -SLOT="0" -KEYWORDS="~amd64 ~arm ~arm64 ~x86" - -RDEPEND="sci-electronics/litex[${PYTHON_USEDEP}] - sci-electronics/migen[${PYTHON_USEDEP}]" -DEPEND="${RDEPEND} - dev-python/setuptools[${PYTHON_USEDEP}]" - -S=${WORKDIR}/${PN}-${MY_COMMIT} From fd8eeb3882d4bfca2d440624f8b9a193994e732e Mon Sep 17 00:00:00 2001 From: "Rick Farina (Zero_Chaos)" Date: Thu, 2 May 2024 12:25:18 -0400 Subject: [PATCH 09/19] Revert "liteeth: drop unmaintained" This reverts commit d118d27b30dcca5fe1ba0633b893d0a28a5858b8. --- sci-electronics/liteeth/Manifest | 2 ++ .../liteeth/liteeth-20180301.ebuild | 29 +++++++++++++++++++ .../liteeth/liteeth-20180719.ebuild | 24 +++++++++++++++ 3 files changed, 55 insertions(+) create mode 100644 sci-electronics/liteeth/Manifest create mode 100644 sci-electronics/liteeth/liteeth-20180301.ebuild create mode 100644 sci-electronics/liteeth/liteeth-20180719.ebuild diff --git a/sci-electronics/liteeth/Manifest b/sci-electronics/liteeth/Manifest new file mode 100644 index 000000000..65a74fc8f --- /dev/null +++ b/sci-electronics/liteeth/Manifest @@ -0,0 +1,2 @@ +DIST liteeth-20180301.zip 246584 BLAKE2B 3179195b067782438ac2e7fcd8c19d725e311d1e4f2d734d3e5ff671aecc29eaf135e438d490ebb1f8dbda5352a12d206e21228c469d658901713d060185c3b4 SHA512 12e59f4f2603e07533d90bdfa96bf25b6ba3ff7719da24b0524e3729abb47f977c576f7584e23f417f19b3e91e7b6c844563b7ec1208abfa4dd2c8834819c85c +DIST liteeth-20180719.zip 256039 BLAKE2B b0c1686fd78a348a868275ac46e82a5fdf685743aedc8c39826c472d9add7b87bc4845e2d59ff208544f7787155c1a7d49f9d5f3b499a508d074be6a53b952be SHA512 7378400faaa9aca800a444768e461b9c62989a28238bdf6a3f5d2cd96bef3418835047691f1498cf7289628b283187d58ee50d2be1ada116a273737970cdd77f diff --git a/sci-electronics/liteeth/liteeth-20180301.ebuild b/sci-electronics/liteeth/liteeth-20180301.ebuild new file mode 100644 index 000000000..39301da35 --- /dev/null +++ b/sci-electronics/liteeth/liteeth-20180301.ebuild @@ -0,0 +1,29 @@ +# Copyright 1999-2018 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 + +EAPI=7 + +PYTHON_COMPAT=( python3_{10..12} ) +inherit distutils-r1 + +MY_COMMIT="95849a0fed26c2f7e88e731e8ba7cb6b95d873e8" + +DESCRIPTION="Small footprint and configurable Ethernet core" +HOMEPAGE="https://github.com/enjoy-digital/liteeth" +SRC_URI="https://github.com/enjoy-digital/liteeth/archive/${MY_COMMIT}.zip -> ${P}.zip" + +LICENSE="BSD" +SLOT="0" +KEYWORDS="~amd64 ~arm ~arm64 ~x86" + +RDEPEND="sci-electronics/litex[${PYTHON_USEDEP}] + sci-electronics/migen[${PYTHON_USEDEP}]" +DEPEND="${RDEPEND} + dev-python/setuptools[${PYTHON_USEDEP}]" + +S=${WORKDIR}/${PN}-${MY_COMMIT} + +src_prepare(){ + rm test/__init__.py example_designs/__init__.py + eapply_user +} diff --git a/sci-electronics/liteeth/liteeth-20180719.ebuild b/sci-electronics/liteeth/liteeth-20180719.ebuild new file mode 100644 index 000000000..c108dfe15 --- /dev/null +++ b/sci-electronics/liteeth/liteeth-20180719.ebuild @@ -0,0 +1,24 @@ +# Copyright 1999-2018 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 + +EAPI=7 + +PYTHON_COMPAT=( python3_{10..12} ) +inherit distutils-r1 + +MY_COMMIT="24b0d2b8c2cfcf96a8c6cb56ec01af9a56952aad" + +DESCRIPTION="Small footprint and configurable Ethernet core" +HOMEPAGE="https://github.com/enjoy-digital/liteeth" +SRC_URI="https://github.com/enjoy-digital/liteeth/archive/${MY_COMMIT}.zip -> ${P}.zip" + +LICENSE="BSD" +SLOT="0" +KEYWORDS="~amd64 ~arm ~arm64 ~x86" + +RDEPEND="sci-electronics/litex[${PYTHON_USEDEP}] + sci-electronics/migen[${PYTHON_USEDEP}]" +DEPEND="${RDEPEND} + dev-python/setuptools[${PYTHON_USEDEP}]" + +S=${WORKDIR}/${PN}-${MY_COMMIT} From 4a106c152d1c73c3e182dbaf74115928f9199f57 Mon Sep 17 00:00:00 2001 From: "Rick Farina (Zero_Chaos)" Date: Thu, 2 May 2024 12:26:02 -0400 Subject: [PATCH 10/19] liteeth: drop old --- sci-electronics/liteeth/Manifest | 1 - .../liteeth/liteeth-20180301.ebuild | 29 ------------------- 2 files changed, 30 deletions(-) delete mode 100644 sci-electronics/liteeth/liteeth-20180301.ebuild diff --git a/sci-electronics/liteeth/Manifest b/sci-electronics/liteeth/Manifest index 65a74fc8f..a649c750b 100644 --- a/sci-electronics/liteeth/Manifest +++ b/sci-electronics/liteeth/Manifest @@ -1,2 +1 @@ -DIST liteeth-20180301.zip 246584 BLAKE2B 3179195b067782438ac2e7fcd8c19d725e311d1e4f2d734d3e5ff671aecc29eaf135e438d490ebb1f8dbda5352a12d206e21228c469d658901713d060185c3b4 SHA512 12e59f4f2603e07533d90bdfa96bf25b6ba3ff7719da24b0524e3729abb47f977c576f7584e23f417f19b3e91e7b6c844563b7ec1208abfa4dd2c8834819c85c DIST liteeth-20180719.zip 256039 BLAKE2B b0c1686fd78a348a868275ac46e82a5fdf685743aedc8c39826c472d9add7b87bc4845e2d59ff208544f7787155c1a7d49f9d5f3b499a508d074be6a53b952be SHA512 7378400faaa9aca800a444768e461b9c62989a28238bdf6a3f5d2cd96bef3418835047691f1498cf7289628b283187d58ee50d2be1ada116a273737970cdd77f diff --git a/sci-electronics/liteeth/liteeth-20180301.ebuild b/sci-electronics/liteeth/liteeth-20180301.ebuild deleted file mode 100644 index 39301da35..000000000 --- a/sci-electronics/liteeth/liteeth-20180301.ebuild +++ /dev/null @@ -1,29 +0,0 @@ -# Copyright 1999-2018 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 - -PYTHON_COMPAT=( python3_{10..12} ) -inherit distutils-r1 - -MY_COMMIT="95849a0fed26c2f7e88e731e8ba7cb6b95d873e8" - -DESCRIPTION="Small footprint and configurable Ethernet core" -HOMEPAGE="https://github.com/enjoy-digital/liteeth" -SRC_URI="https://github.com/enjoy-digital/liteeth/archive/${MY_COMMIT}.zip -> ${P}.zip" - -LICENSE="BSD" -SLOT="0" -KEYWORDS="~amd64 ~arm ~arm64 ~x86" - -RDEPEND="sci-electronics/litex[${PYTHON_USEDEP}] - sci-electronics/migen[${PYTHON_USEDEP}]" -DEPEND="${RDEPEND} - dev-python/setuptools[${PYTHON_USEDEP}]" - -S=${WORKDIR}/${PN}-${MY_COMMIT} - -src_prepare(){ - rm test/__init__.py example_designs/__init__.py - eapply_user -} From 907c7fe4b8f4b3d168d2487b8b0324260e910515 Mon Sep 17 00:00:00 2001 From: "Rick Farina (Zero_Chaos)" Date: Thu, 2 May 2024 12:34:39 -0400 Subject: [PATCH 11/19] liteeth: pkgcheck fixes --- sci-electronics/liteeth/Manifest | 2 +- sci-electronics/liteeth/liteeth-20180719.ebuild | 10 +++++----- sci-electronics/liteeth/metadata.xml | 11 +++++++++++ 3 files changed, 17 insertions(+), 6 deletions(-) create mode 100644 sci-electronics/liteeth/metadata.xml diff --git a/sci-electronics/liteeth/Manifest b/sci-electronics/liteeth/Manifest index a649c750b..6e28e0169 100644 --- a/sci-electronics/liteeth/Manifest +++ b/sci-electronics/liteeth/Manifest @@ -1 +1 @@ -DIST liteeth-20180719.zip 256039 BLAKE2B b0c1686fd78a348a868275ac46e82a5fdf685743aedc8c39826c472d9add7b87bc4845e2d59ff208544f7787155c1a7d49f9d5f3b499a508d074be6a53b952be SHA512 7378400faaa9aca800a444768e461b9c62989a28238bdf6a3f5d2cd96bef3418835047691f1498cf7289628b283187d58ee50d2be1ada116a273737970cdd77f +DIST liteeth-20180719.tar.gz 215729 BLAKE2B 34acd485e4bc3a1801cb6352f5282c07201982171d9f4a8b00073b6cc96c096d3f2cf62ec059e33df409586337edf4099036bac477b42058d361830e49e38a74 SHA512 e55cfe6cbea3043abb7c202a50acc74c185d56ea447a334efe1b691f37b514e3c5d13e0cefff93d4544ed599f1463af37e4a2e90910dbfae1ff4d497772eb5d8 diff --git a/sci-electronics/liteeth/liteeth-20180719.ebuild b/sci-electronics/liteeth/liteeth-20180719.ebuild index c108dfe15..5c40851f9 100644 --- a/sci-electronics/liteeth/liteeth-20180719.ebuild +++ b/sci-electronics/liteeth/liteeth-20180719.ebuild @@ -1,8 +1,9 @@ -# Copyright 1999-2018 Gentoo Foundation +# Copyright 1999-2024 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -EAPI=7 +EAPI=8 +DISTUTILS_USE_PEP517=setuptools PYTHON_COMPAT=( python3_{10..12} ) inherit distutils-r1 @@ -10,8 +11,9 @@ MY_COMMIT="24b0d2b8c2cfcf96a8c6cb56ec01af9a56952aad" DESCRIPTION="Small footprint and configurable Ethernet core" HOMEPAGE="https://github.com/enjoy-digital/liteeth" -SRC_URI="https://github.com/enjoy-digital/liteeth/archive/${MY_COMMIT}.zip -> ${P}.zip" +SRC_URI="https://github.com/enjoy-digital/liteeth/archive/${MY_COMMIT}.tar.gz -> ${P}.tar.gz" +S=${WORKDIR}/${PN}-${MY_COMMIT} LICENSE="BSD" SLOT="0" KEYWORDS="~amd64 ~arm ~arm64 ~x86" @@ -20,5 +22,3 @@ RDEPEND="sci-electronics/litex[${PYTHON_USEDEP}] sci-electronics/migen[${PYTHON_USEDEP}]" DEPEND="${RDEPEND} dev-python/setuptools[${PYTHON_USEDEP}]" - -S=${WORKDIR}/${PN}-${MY_COMMIT} diff --git a/sci-electronics/liteeth/metadata.xml b/sci-electronics/liteeth/metadata.xml new file mode 100644 index 000000000..0561cd3d9 --- /dev/null +++ b/sci-electronics/liteeth/metadata.xml @@ -0,0 +1,11 @@ + + + + + noone@pentoo.org + No one + + + enjoy-digital/liteeth + + From b9e81d26ec7c66a065c39cf8e0f5ea22f57095ca Mon Sep 17 00:00:00 2001 From: "Rick Farina (Zero_Chaos)" Date: Thu, 2 May 2024 12:49:17 -0400 Subject: [PATCH 12/19] gcc-arm-none-eabi: pkgcheck fixes, allow use of 12 and 13 --- profiles/pentoo/base/package.mask | 3 --- .../gcc-arm-none-eabi-10.3_p202110.ebuild | 4 ++-- ...1.ebuild => gcc-arm-none-eabi-12.2_p1-r1.ebuild} | 13 ++++++++----- ...1.ebuild => gcc-arm-none-eabi-13.2_p1-r1.ebuild} | 13 ++++++++----- sys-devel/gcc-arm-none-eabi/metadata.xml | 1 - 5 files changed, 18 insertions(+), 16 deletions(-) rename sys-devel/gcc-arm-none-eabi/{gcc-arm-none-eabi-12.2_p1.ebuild => gcc-arm-none-eabi-12.2_p1-r1.ebuild} (88%) rename sys-devel/gcc-arm-none-eabi/{gcc-arm-none-eabi-13.2_p1.ebuild => gcc-arm-none-eabi-13.2_p1-r1.ebuild} (88%) diff --git a/profiles/pentoo/base/package.mask b/profiles/pentoo/base/package.mask index dc099d61f..7068ef7f1 100644 --- a/profiles/pentoo/base/package.mask +++ b/profiles/pentoo/base/package.mask @@ -144,9 +144,6 @@ dev-lang/lua:0 #https://bugs.gentoo.org/816453 ~media-libs/codec2-1.0.1 -#okay so this still doesn't work and seems to be riddled with Internal Compiler Errors ->=sys-devel/gcc-arm-none-eabi-11.2_p202202-r2 - #https://github.com/intoolswetrust/jd-cli/issues/81 >dev-java/jcommander-1.32 diff --git a/sys-devel/gcc-arm-none-eabi/gcc-arm-none-eabi-10.3_p202110.ebuild b/sys-devel/gcc-arm-none-eabi/gcc-arm-none-eabi-10.3_p202110.ebuild index 24a8cd713..d5b32e3c3 100644 --- a/sys-devel/gcc-arm-none-eabi/gcc-arm-none-eabi-10.3_p202110.ebuild +++ b/sys-devel/gcc-arm-none-eabi/gcc-arm-none-eabi-10.3_p202110.ebuild @@ -1,7 +1,7 @@ -# Copyright 1999-2021 Gentoo Authors +# Copyright 1999-2024 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI=7 +EAPI=8 #https://bugs.launchpad.net/gcc-arm-embedded/+bug/1949004 #major/update diff --git a/sys-devel/gcc-arm-none-eabi/gcc-arm-none-eabi-12.2_p1.ebuild b/sys-devel/gcc-arm-none-eabi/gcc-arm-none-eabi-12.2_p1-r1.ebuild similarity index 88% rename from sys-devel/gcc-arm-none-eabi/gcc-arm-none-eabi-12.2_p1.ebuild rename to sys-devel/gcc-arm-none-eabi/gcc-arm-none-eabi-12.2_p1-r1.ebuild index d7158568b..199743cad 100644 --- a/sys-devel/gcc-arm-none-eabi/gcc-arm-none-eabi-12.2_p1.ebuild +++ b/sys-devel/gcc-arm-none-eabi/gcc-arm-none-eabi-12.2_p1-r1.ebuild @@ -1,7 +1,9 @@ -# Copyright 1999-2022 Gentoo Authors +# Copyright 1999-2024 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=8 +PYTHON_COMPAT=( python3_{11..12} ) +inherit python-r1 # https://bugs.launchpad.net/gcc-arm-embedded/+bug/1949004 #major/update @@ -32,19 +34,20 @@ S="${WORKDIR}/arm-gnu-toolchain-${MY_PV}-x86_64-arm-none-eabi" LICENSE="BSD GPL-2 LGPL-2 LGPL-3 MIT NEWLIB ZLIB" SLOT="0" KEYWORDS="amd64" -IUSE="python3" +IUSE="python" RESTRICT="strip" +REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )" QA_PREBUILT="*" -RDEPEND="sys-libs/ncurses-compat +RDEPEND="sys-libs/ncurses-compat:5 virtual/libcrypt dev-libs/expat - python3? ( =dev-lang/python-3* )" + python? ( ${PYTHON_DEPS} )" src_install() { dodir /opt/${PN} \cp -r "${S}"/* "${ED}"/opt/${PN} - use python3 || rm "${ED}"/opt/gcc-arm-none-eabi/bin/arm-none-eabi-gdb-py + use python || rm "${ED}"/opt/gcc-arm-none-eabi/bin/arm-none-eabi-gdb-py fowners -R root:0 /opt/${PN} local DEST="${EPREFIX}/opt/${PN}" diff --git a/sys-devel/gcc-arm-none-eabi/gcc-arm-none-eabi-13.2_p1.ebuild b/sys-devel/gcc-arm-none-eabi/gcc-arm-none-eabi-13.2_p1-r1.ebuild similarity index 88% rename from sys-devel/gcc-arm-none-eabi/gcc-arm-none-eabi-13.2_p1.ebuild rename to sys-devel/gcc-arm-none-eabi/gcc-arm-none-eabi-13.2_p1-r1.ebuild index 242871e8f..d757b8702 100644 --- a/sys-devel/gcc-arm-none-eabi/gcc-arm-none-eabi-13.2_p1.ebuild +++ b/sys-devel/gcc-arm-none-eabi/gcc-arm-none-eabi-13.2_p1-r1.ebuild @@ -1,7 +1,9 @@ -# Copyright 1999-2022 Gentoo Authors +# Copyright 1999-2024 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=8 +PYTHON_COMPAT=( python3_{11..12} ) +inherit python-r1 # https://bugs.launchpad.net/gcc-arm-embedded/+bug/1949004 #major/update @@ -32,19 +34,20 @@ S="${WORKDIR}/arm-gnu-toolchain-${MY_PV}-x86_64-arm-none-eabi" LICENSE="BSD GPL-2 LGPL-2 LGPL-3 MIT NEWLIB ZLIB" SLOT="0" KEYWORDS="amd64" -IUSE="python3" +IUSE="python" RESTRICT="strip" +REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )" QA_PREBUILT="*" -RDEPEND="sys-libs/ncurses-compat +RDEPEND="sys-libs/ncurses-compat:5 virtual/libcrypt dev-libs/expat - python3? ( =dev-lang/python-3* )" + python? ( ${PYTHON_DEPS} )" src_install() { dodir /opt/${PN} \cp -r "${S}"/* "${ED}"/opt/${PN} - use python3 || rm "${ED}"/opt/gcc-arm-none-eabi/bin/arm-none-eabi-gdb-py + use python || rm "${ED}"/opt/gcc-arm-none-eabi/bin/arm-none-eabi-gdb-py fowners -R root:0 /opt/${PN} local DEST="${EPREFIX}/opt/${PN}" diff --git a/sys-devel/gcc-arm-none-eabi/metadata.xml b/sys-devel/gcc-arm-none-eabi/metadata.xml index d49d58dcc..e0af71015 100644 --- a/sys-devel/gcc-arm-none-eabi/metadata.xml +++ b/sys-devel/gcc-arm-none-eabi/metadata.xml @@ -7,6 +7,5 @@ Include python 2 support - Include python 3 support From 349f026bb60af9115e4183ef7adc45285759d12e Mon Sep 17 00:00:00 2001 From: "Rick Farina (Zero_Chaos)" Date: Thu, 2 May 2024 12:54:05 -0400 Subject: [PATCH 13/19] migen: pkgcheck fixes --- sci-electronics/migen/Manifest | 2 +- sci-electronics/migen/metadata.xml | 11 +++++++++++ .../migen/{migen-0.7.ebuild => migen-0.7-r1.ebuild} | 7 ++++--- 3 files changed, 16 insertions(+), 4 deletions(-) create mode 100644 sci-electronics/migen/metadata.xml rename sci-electronics/migen/{migen-0.7.ebuild => migen-0.7-r1.ebuild} (78%) diff --git a/sci-electronics/migen/Manifest b/sci-electronics/migen/Manifest index 070c09e05..ccd1da862 100644 --- a/sci-electronics/migen/Manifest +++ b/sci-electronics/migen/Manifest @@ -1 +1 @@ -DIST 0.7.tar.gz 226575 BLAKE2B ba5897a71e546a081469475e4cec760d61b8c401480ea4dc49f201421be78444567be9436a86b3ed76c019d423977bdc3b828780092b19d68322a7132a9f3adc SHA512 8e84d2c2c8a2b262dc8f55b778305d89d206f0f15cc050b08ffa5e68ab4e0bd6da82afbfc19f1f5b1c1d7cc602cf3e9baa4e4d441c8fb142c25fa15cdd0afde9 +DIST migen-0.7.tar.gz 226575 BLAKE2B ba5897a71e546a081469475e4cec760d61b8c401480ea4dc49f201421be78444567be9436a86b3ed76c019d423977bdc3b828780092b19d68322a7132a9f3adc SHA512 8e84d2c2c8a2b262dc8f55b778305d89d206f0f15cc050b08ffa5e68ab4e0bd6da82afbfc19f1f5b1c1d7cc602cf3e9baa4e4d441c8fb142c25fa15cdd0afde9 diff --git a/sci-electronics/migen/metadata.xml b/sci-electronics/migen/metadata.xml new file mode 100644 index 000000000..7b7cfed4b --- /dev/null +++ b/sci-electronics/migen/metadata.xml @@ -0,0 +1,11 @@ + + + + + noone@pentoo.org + No one + + + m-labs/migen + + diff --git a/sci-electronics/migen/migen-0.7.ebuild b/sci-electronics/migen/migen-0.7-r1.ebuild similarity index 78% rename from sci-electronics/migen/migen-0.7.ebuild rename to sci-electronics/migen/migen-0.7-r1.ebuild index f680ed1fd..9861c6a2f 100644 --- a/sci-electronics/migen/migen-0.7.ebuild +++ b/sci-electronics/migen/migen-0.7-r1.ebuild @@ -1,14 +1,15 @@ -# Copyright 1999-2018 Gentoo Foundation +# Copyright 1999-2024 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -EAPI=7 +EAPI=8 PYTHON_COMPAT=( python3_{10..12} ) +DISTUTILS_USE_PEP517=setuptools inherit distutils-r1 DESCRIPTION="A Python toolbox for building complex digital hardware" HOMEPAGE="https://m-labs.hk/migen/index.html" -SRC_URI="https://github.com/m-labs/migen/archive/${PV}.tar.gz" +SRC_URI="https://github.com/m-labs/migen/archive/${PV}.tar.gz -> ${P}.tar.gz" LICENSE="BSD" SLOT="0" From 78ac2a7ff2b12da135ed44580fccde0696648fec Mon Sep 17 00:00:00 2001 From: "Rick Farina (Zero_Chaos)" Date: Thu, 2 May 2024 12:58:50 -0400 Subject: [PATCH 14/19] litedram: pkgcheck fixes --- sci-electronics/litedram/Manifest | 2 +- sci-electronics/litedram/litedram-20180514.ebuild | 10 +++++----- sci-electronics/litedram/metadata.xml | 11 +++++++++++ 3 files changed, 17 insertions(+), 6 deletions(-) create mode 100644 sci-electronics/litedram/metadata.xml diff --git a/sci-electronics/litedram/Manifest b/sci-electronics/litedram/Manifest index 617b56d7d..b04906e74 100644 --- a/sci-electronics/litedram/Manifest +++ b/sci-electronics/litedram/Manifest @@ -1 +1 @@ -DIST litedram-20180514.zip 216187 BLAKE2B 29fd4c6843b2bd47b05d6be687cd54a14f0b8e25cc4123ab1b3d5f4c79ccd0316ee39beb090958b3ce2e6a940e6feeda1cc8fcb37f6f80a522ff9f439da3a664 SHA512 4786e27947c717f2a41c13441084b639f57d8a668fbd9b1bf7c5c3f13b5537bdf8ac6d8c44153b4a695c238ef3e7c591473a2bb701af4b155bc0a3aff2bb0c12 +DIST litedram-20180514.tar.gz 200253 BLAKE2B 1c5571a854cf831c0c200167f4676c5a61321526389fee62a557fcc933a80c2ae113c25bfc953525a370f90bb12535a72b353ac70dd11b1483e7b632ac712eca SHA512 736632b9d23190205e1b6766d1901406b6f3eb5c58d8fe66f69c0bbe638f405621096a7398474765f51331348a5fe3d109a28b4bf481f1c8138181539650e4a9 diff --git a/sci-electronics/litedram/litedram-20180514.ebuild b/sci-electronics/litedram/litedram-20180514.ebuild index 6cf676862..c04e772f8 100644 --- a/sci-electronics/litedram/litedram-20180514.ebuild +++ b/sci-electronics/litedram/litedram-20180514.ebuild @@ -1,8 +1,9 @@ -# Copyright 1999-2018 Gentoo Foundation +# Copyright 1999-2024 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -EAPI=7 +EAPI=8 +DISTUTILS_USE_PEP517=setuptools PYTHON_COMPAT=( python3_{10..12} ) inherit distutils-r1 @@ -10,8 +11,9 @@ MY_COMMIT="c23814961d71ab6508c855db3c643b71d8990e8c" DESCRIPTION="Small footprint and configurable DRAM core" HOMEPAGE="https://github.com/enjoy-digital/litedram" -SRC_URI="https://github.com/enjoy-digital/litedram/archive/${MY_COMMIT}.zip -> ${P}.zip" +SRC_URI="https://github.com/enjoy-digital/litedram/archive/${MY_COMMIT}.tar.gz -> ${P}.tar.gz" +S=${WORKDIR}/${PN}-${MY_COMMIT} LICENSE="BSD" SLOT="0" KEYWORDS="~amd64 ~arm ~arm64 ~x86" @@ -21,8 +23,6 @@ RDEPEND="sci-electronics/litex[${PYTHON_USEDEP}] DEPEND="${RDEPEND} dev-python/setuptools[${PYTHON_USEDEP}]" -S=${WORKDIR}/${PN}-${MY_COMMIT} - src_prepare(){ rm test/__init__.py eapply_user diff --git a/sci-electronics/litedram/metadata.xml b/sci-electronics/litedram/metadata.xml new file mode 100644 index 000000000..27a9e8d96 --- /dev/null +++ b/sci-electronics/litedram/metadata.xml @@ -0,0 +1,11 @@ + + + + + noone@pentoo.org + No one + + + enjoy-digital/litedram + + From 41d60173e9528e01a9fdd48e5969b0af159fd128 Mon Sep 17 00:00:00 2001 From: "Rick Farina (Zero_Chaos)" Date: Thu, 2 May 2024 13:00:03 -0400 Subject: [PATCH 15/19] magic-pax: pkgcheck fixes --- sys-apps/magic-pax/files/magic-pax | 0 sys-apps/magic-pax/magic-pax-0.0.1.ebuild | 3 +-- 2 files changed, 1 insertion(+), 2 deletions(-) mode change 100755 => 100644 sys-apps/magic-pax/files/magic-pax diff --git a/sys-apps/magic-pax/files/magic-pax b/sys-apps/magic-pax/files/magic-pax old mode 100755 new mode 100644 diff --git a/sys-apps/magic-pax/magic-pax-0.0.1.ebuild b/sys-apps/magic-pax/magic-pax-0.0.1.ebuild index 15b47af9d..41e406e82 100644 --- a/sys-apps/magic-pax/magic-pax-0.0.1.ebuild +++ b/sys-apps/magic-pax/magic-pax-0.0.1.ebuild @@ -6,14 +6,13 @@ EAPI=8 DESCRIPTION="Attempt at applying pax marks effectively" HOMEPAGE="https://none.com" +S="${WORKDIR}" LICENSE="BSD" SLOT="0" KEYWORDS="amd64 arm x86" PDEPEND="sys-apps/elfix" -S="${WORKDIR}" - src_install() { dobin "${FILESDIR}"/magic-pax } From 5729eeee154172273bba7f8157ee9f44bbcec429 Mon Sep 17 00:00:00 2001 From: "Rick Farina (Zero_Chaos)" Date: Thu, 2 May 2024 13:03:13 -0400 Subject: [PATCH 16/19] pentoo-livecd: pkgcheck fixes --- pentoo/pentoo-livecd/files/flushchanges-2018.0 | 0 pentoo/pentoo-livecd/files/toggle_hidpi | 0 2 files changed, 0 insertions(+), 0 deletions(-) mode change 100755 => 100644 pentoo/pentoo-livecd/files/flushchanges-2018.0 mode change 100755 => 100644 pentoo/pentoo-livecd/files/toggle_hidpi diff --git a/pentoo/pentoo-livecd/files/flushchanges-2018.0 b/pentoo/pentoo-livecd/files/flushchanges-2018.0 old mode 100755 new mode 100644 diff --git a/pentoo/pentoo-livecd/files/toggle_hidpi b/pentoo/pentoo-livecd/files/toggle_hidpi old mode 100755 new mode 100644 From 2c76ff44ebd56bc813afb39cd0d0fd7f69d327c9 Mon Sep 17 00:00:00 2001 From: "Rick Farina (Zero_Chaos)" Date: Thu, 2 May 2024 13:04:40 -0400 Subject: [PATCH 17/19] fragattacks-drivers58: dropping was easier than fixing --- sys-kernel/fragattacks-drivers58/Manifest | 1 - .../files/Makefile_kver.patch | 20 ------ .../fragattacks-drivers58-20210507.ebuild | 65 ------------------- 3 files changed, 86 deletions(-) delete mode 100644 sys-kernel/fragattacks-drivers58/Manifest delete mode 100644 sys-kernel/fragattacks-drivers58/files/Makefile_kver.patch delete mode 100644 sys-kernel/fragattacks-drivers58/fragattacks-drivers58-20210507.ebuild diff --git a/sys-kernel/fragattacks-drivers58/Manifest b/sys-kernel/fragattacks-drivers58/Manifest deleted file mode 100644 index 3e1028fb9..000000000 --- a/sys-kernel/fragattacks-drivers58/Manifest +++ /dev/null @@ -1 +0,0 @@ -DIST fragattacks-drivers58-20210507.tar.gz 10862132 BLAKE2B 2fbefacaf98ff329a7390f2458e2a019166ec7f0503c996bc7f7e0d0280a87f2792ef3565e14ba6c99b016ad46d4b244e637d00101647cb09bb16ac38b2ae015 SHA512 c6e698e3b81470bc775276eb9ad9095f30050c500c0ef20a5c1dd91612d418a7853e52e2d18d9de78ddaf72b65637122e149804f0e3f21c0b23e686f87e5f5f1 diff --git a/sys-kernel/fragattacks-drivers58/files/Makefile_kver.patch b/sys-kernel/fragattacks-drivers58/files/Makefile_kver.patch deleted file mode 100644 index dfd1db4c2..000000000 --- a/sys-kernel/fragattacks-drivers58/files/Makefile_kver.patch +++ /dev/null @@ -1,20 +0,0 @@ ---- Makefile.oirg 2021-05-07 19:54:54.000000000 +0800 -+++ Makefile 2021-05-13 21:55:15.595107961 +0800 -@@ -8,6 +8,8 @@ - SHELL := /bin/bash - BACKPORT_DIR := $(shell pwd) - -+kver ?= $(shell uname -r) -+ - KMODDIR ?= updates - ifneq ($(origin KLIB), undefined) - KMODPATH_ARG := "INSTALL_MOD_PATH=$(KLIB)" -@@ -84,8 +86,6 @@ - echo "" ;\ - done \ - ) > Kconfig.kernel ;\ -- kver=$$($(MAKE) --no-print-directory -C $(KLIB_BUILD) kernelversion | \ -- sed 's/^\(\([3-5]\|2\.6\)\.[0-9]\+\).*/\1/;t;d') ;\ - test "$$kver" != "" || echo "Kernel version parse failed!" ;\ - test "$$kver" != "" ;\ - kvers="$$(seq 14 39 | sed 's/^/2.6./')" ;\ diff --git a/sys-kernel/fragattacks-drivers58/fragattacks-drivers58-20210507.ebuild b/sys-kernel/fragattacks-drivers58/fragattacks-drivers58-20210507.ebuild deleted file mode 100644 index 2ab2e2f75..000000000 --- a/sys-kernel/fragattacks-drivers58/fragattacks-drivers58-20210507.ebuild +++ /dev/null @@ -1,65 +0,0 @@ -# Copyright 1999-2021 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -#copy more hacks from compat-drivers-3.8-r1.ebuild - -EAPI=7 - -inherit linux-mod linux-info - -DESCRIPTION="Wi-Fi fragmentation and aggregation vulnerability tests" -HOMEPAGE="https://github.com/vanhoefm/fragattacks-drivers58" - -if [[ ${PV} == *9999 ]]; then - inherit git-r3 - EGIT_REPO_URI="https://github.com/vanhoefm/fragattacks-drivers58.git" -# EGIT_BRANCH="v5.6.4.2" -else - HASH_COMMIT="92453e8ab9cf1db26fca29aa0155870f6bdd2bf9" - SRC_URI="https://github.com/vanhoefm/fragattacks-drivers58/archive/${HASH_COMMIT}.tar.gz -> ${P}.tar.gz" - KEYWORDS="~amd64 ~x86" - - S="${WORKDIR}/fragattacks-drivers58-${HASH_COMMIT}" -fi - -LICENSE="GPL-2" -SLOT="0" -IUSE="kernel_linux" - -DEPEND=" - !!net-wireless/rtl8812au - !!net-wireless/rtl8812au_asus - !!net-wireless/rtl8812au_astsam" - -#pkg_setup() { -# linux-mod_pkg_setup -# ARCH=x86_64 -# BUILD_PARAMS="kver=${KV_FULL} V=1" -#} - -src_prepare() { - eapply -p0 "${FILESDIR}/Makefile_kver.patch" - eapply_user - - #see /defconfigs -# emake kver="{KV_FULL}" defconfig-wifi -# emake kver="{KV_FULL}" defconfig-experiments -# emake kver="{KV_FULL}" defconfig-b43 - #rtl88x cards - emake kver="{KV_FULL}" defconfig-rtlwifi - -} - -src_compile() { - addpredict "${KERNEL_DIR}" - set_arch_to_kernel - emake KLIB_BUILD="${DESTDIR}"/lib/modules/"${KV_FULL}"/build || die "emake failed" -# emake -} - -src_install() { - for file in $(find -name \*.ko); do - insinto "/lib/modules/${KV_FULL}/updates/$(dirname ${file})" - doins "${file}" - done -} From 0eef2ad5ede047cb48a36fa05e8a8676b087b093 Mon Sep 17 00:00:00 2001 From: "Rick Farina (Zero_Chaos)" Date: Thu, 2 May 2024 13:10:03 -0400 Subject: [PATCH 18/19] nrf_sniffer_ble: pkgcheck fixes --- ...e-4.1.1.ebuild => nrf_sniffer_ble-4.1.1-r1.ebuild} | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) rename net-wireless/nrf_sniffer_ble/{nrf_sniffer_ble-4.1.1.ebuild => nrf_sniffer_ble-4.1.1-r1.ebuild} (91%) diff --git a/net-wireless/nrf_sniffer_ble/nrf_sniffer_ble-4.1.1.ebuild b/net-wireless/nrf_sniffer_ble/nrf_sniffer_ble-4.1.1-r1.ebuild similarity index 91% rename from net-wireless/nrf_sniffer_ble/nrf_sniffer_ble-4.1.1.ebuild rename to net-wireless/nrf_sniffer_ble/nrf_sniffer_ble-4.1.1-r1.ebuild index 7892cd53e..73cbeb6fc 100644 --- a/net-wireless/nrf_sniffer_ble/nrf_sniffer_ble-4.1.1.ebuild +++ b/net-wireless/nrf_sniffer_ble/nrf_sniffer_ble-4.1.1-r1.ebuild @@ -1,22 +1,23 @@ -# Copyright 2022-2023 Gentoo Authors +# Copyright 2022-2024 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=8 PYTHON_COMPAT=( python3_{10..12} ) - -inherit python-any-r1 +inherit python-r1 DESCRIPTION="nRF Sniffer for Bluetooth LE" HOMEPAGE="https://www.nordicsemi.com/Products/Development-tools/nRF-Sniffer-for-Bluetooth-LE" #SRC_URI="https://www.nordicsemi.com/-/media/Software-and-other-downloads/Desktop-software/nRF-Sniffer/sw/nrf_sniffer_for_bluetooth_le_${PV}.zip -> ${P}.zip" SRC_URI="https://nsscprodmedia.blob.core.windows.net/prod/software-and-other-downloads/desktop-software/nrf-sniffer/sw/nrf_sniffer_for_bluetooth_le_${PV}.zip -> ${P}.zip" -KEYWORDS="amd64 arm arm64 x86" -S="${WORKDIR}" +S="${WORKDIR}" LICENSE="MIT" SLOT="0" +KEYWORDS="amd64 arm arm64 x86" +REQUIRED_USE="${PYTHON_REQUIRED_USE}" +BDEPEND="app-arch/unzip" DEPEND="net-analyzer/wireshark ${PYTHON_DEPS}" RDEPEND="${DEPEND} From 83c0fa576d045553a69a9ac9d3e5290e0df0d5bf Mon Sep 17 00:00:00 2001 From: "Rick Farina (Zero_Chaos)" Date: Thu, 2 May 2024 13:24:04 -0400 Subject: [PATCH 19/19] fix workflow Many pkgcheck tests do not work without full repo history and cannot be run against specific commits. Don't run UnknownProfilePackage on specific commits because it needs the full repo history to check for the package information (and possibly the gentoo repo history too) --- .github/workflows/pkgcheck.yaml | 2 +- .github/workflows/pkgcheck_merge.yaml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/pkgcheck.yaml b/.github/workflows/pkgcheck.yaml index ed16177ee..e2b124d30 100644 --- a/.github/workflows/pkgcheck.yaml +++ b/.github/workflows/pkgcheck.yaml @@ -20,4 +20,4 @@ jobs: - name: Commit pkgcheck warnings uses: pkgcore/pkgcheck-action@v1 with: - args: --exit warning -k ,-NonsolvableDepsInStable,-NonsolvableDepsInDev,-PotentialStable --commits HEAD^..${{ github.sha }} + args: --exit warning -k ,-NonsolvableDepsInStable,-NonsolvableDepsInDev,-PotentialStable,-UnknownProfilePackage --commits HEAD^..${{ github.sha }} diff --git a/.github/workflows/pkgcheck_merge.yaml b/.github/workflows/pkgcheck_merge.yaml index 8116c2308..2010ed57c 100644 --- a/.github/workflows/pkgcheck_merge.yaml +++ b/.github/workflows/pkgcheck_merge.yaml @@ -21,4 +21,4 @@ jobs: - name: Commit pkgcheck warnings uses: pkgcore/pkgcheck-action@v1 with: - args: --exit warning -k ,-NonsolvableDepsInStable,-NonsolvableDepsInDev,-PotentialStable --commits HEAD^..${{ github.sha }} + args: --exit warning -k ,-NonsolvableDepsInStable,-NonsolvableDepsInDev,-PotentialStable,-UnknownProfilePackage --commits HEAD^..${{ github.sha }}