From f9fb58382bb6b68c670ed9aa0a164cd8fe8afa34 Mon Sep 17 00:00:00 2001 From: inference Date: Sat, 8 Jul 2023 16:58:38 +0100 Subject: [PATCH] Rename package sys-kernel/firmware-xa000 to sys-kernel/firmware-xa000_0 To allow fine-grained firmware control over each operating system running on each Inferencium system, split the firmware packages into per-OS packages rather than per physical system. --- sys-kernel/firmware-xa000/Manifest | 2 -- sys-kernel/firmware-xa000_0/Manifest | 2 ++ .../firmware-xa000_0-0.0.0.0.ebuild} | 35 ++++++------------- .../firmware-xa000_0-1.0.0.1.ebuild} | 35 ++++++------------- .../metadata.xml | 0 5 files changed, 22 insertions(+), 52 deletions(-) delete mode 100644 sys-kernel/firmware-xa000/Manifest create mode 100644 sys-kernel/firmware-xa000_0/Manifest rename sys-kernel/{firmware-xa000/firmware-xa000-0.0.0.0.ebuild => firmware-xa000_0/firmware-xa000_0-0.0.0.0.ebuild} (92%) rename sys-kernel/{firmware-xa000/firmware-xa000-1.0.0.1.ebuild => firmware-xa000_0/firmware-xa000_0-1.0.0.1.ebuild} (92%) rename sys-kernel/{firmware-xa000 => firmware-xa000_0}/metadata.xml (100%) diff --git a/sys-kernel/firmware-xa000/Manifest b/sys-kernel/firmware-xa000/Manifest deleted file mode 100644 index ea6912e..0000000 --- a/sys-kernel/firmware-xa000/Manifest +++ /dev/null @@ -1,2 +0,0 @@ -DIST firmware-xa000-0.0.0.0.tar.gz 499676 BLAKE2B 2b4ec39697fe0e2736c357978f17eba249e2f850f9f363935e814d5c30c5ee28091a3f97980b967b745fae7a88ce707ba173694f66d45abec5d836ff29916e2e SHA512 87f6baf88de97562ec1d8d8c19ddb075dc32ec1d2aaa8b3428b3001d310ab3e122bcc4c296d6c58a3ccaaf1c0a96410825723b320a11545d87589b3cfe450980 -DIST firmware-xa000-1.0.0.1.tar.gz 499695 BLAKE2B 093084f0b0bb0e5ecb25c387319e01c91e55c3d0803d0f5b67a80610ada7dab5a7171e896e8af4fc2a7ae66bd3be068dc37561ec5c6d2da73979c20a020becd0 SHA512 0fadca35eb2a4059777cd3666551a5d86dac90a28647dae7a44a6bdc30286a3df8b86d6f54393a37e72132b9637834ea0ce9aec5d523e4c1f2361a40b5a2e060 diff --git a/sys-kernel/firmware-xa000_0/Manifest b/sys-kernel/firmware-xa000_0/Manifest new file mode 100644 index 0000000..31b59a8 --- /dev/null +++ b/sys-kernel/firmware-xa000_0/Manifest @@ -0,0 +1,2 @@ +DIST firmware-xa000-0-0.0.0.0.tar.gz 499706 BLAKE2B efb7af4cb2622f60eb7d90993df7ab52d03838f4ff9393516f17e6c29c24f64fb3b92909cd57e007027035cbc534eacf87829fbe7d3822f2909b10f5346f3c78 SHA512 74bdf54be489edd714040ec8e35058774c8fe7a092980c0977e8d3a5e177c42d36ea2f6489930df0ea7128e0ef9dfb76faee97f8f039a004378a947fdbd54e53 +DIST firmware-xa000-0-1.0.0.1.tar.gz 499732 BLAKE2B 98230dea5d780e9a149b25c664528dd6c4d4bded276997fd30246464bb161826b80bdf0024a3dd173b006cd86d3dd5a0f3b0464b370c2b02b3fce6406e9ed5c6 SHA512 9bb874561f96ed4fc96f991b1c2323475f3100ece6afd3b9ace34a41546d21e4ae67f3cbf7a70fb81e223fa442abcd91514b2e1045929f5abe2f809832431533 diff --git a/sys-kernel/firmware-xa000/firmware-xa000-0.0.0.0.ebuild b/sys-kernel/firmware-xa000_0/firmware-xa000_0-0.0.0.0.ebuild similarity index 92% rename from sys-kernel/firmware-xa000/firmware-xa000-0.0.0.0.ebuild rename to sys-kernel/firmware-xa000_0/firmware-xa000_0-0.0.0.0.ebuild index ce33744..352939b 100644 --- a/sys-kernel/firmware-xa000/firmware-xa000-0.0.0.0.ebuild +++ b/sys-kernel/firmware-xa000_0/firmware-xa000_0-0.0.0.0.ebuild @@ -5,42 +5,26 @@ EAPI=8 inherit linux-info mount-boot savedconfig multiprocessing -# In case this is a real snapshot, fill in commit below. -# For normal, tagged releases, leave blank -MY_COMMIT="" - -if [[ ${PV} == 99999999* ]]; then - inherit git-r3 - EGIT_REPO_URI="https://git.kernel.org/pub/scm/linux/kernel/git/firmware/${PN}.git" -else - if [[ -n "${MY_COMMIT}" ]]; then - SRC_URI="https://git.kernel.org/cgit/linux/kernel/git/firmware/linux-firmware.git/snapshot/${MY_COMMIT}.tar.gz -> ${P}.tar.gz" - S="${WORKDIR}/${MY_COMMIT}" - else - SRC_URI="https://src.inferencium.net/Inferencium/firmware-xa000/archive/${P}.tar.gz" - S="${WORKDIR}/firmware-xa000" - fi - - KEYWORDS="amd64 arm64" -fi - -DESCRIPTION="Inferencium server Linux firmware." -HOMEPAGE="https://src.inferencium.net/Inferencium/firmware-xa000.git" +DESCRIPTION="Inferencium system xa000-0 firmware." +HOMEPAGE="https://src.inferencium.net/Inferencium/firmware-xa000-0.git" +SRC_URI="https://src.inferencium.net/Inferencium/firmware-xa000-0/archive/firmware-xa000-0-${PV}.tar.gz" +## WORKDIR must use actual name of the tagged package directory; Portage package name limitations +## prevent actual package name from being used +S="${WORKDIR}/firmware-xa000-0" +KEYWORDS="amd64" +SLOT="0" LICENSE="GPL-2 GPL-2+ GPL-3 BSD MIT || ( MPL-1.1 GPL-2 ) redistributable? ( linux-fw-redistributable ( BSD-2 BSD BSD-4 ISC MIT no-source-code ) ) unknown-license? ( all-rights-reserved )" -SLOT="0" + IUSE="compress initramfs +redistributable savedconfig unknown-license" REQUIRED_USE="initramfs? ( redistributable )" - RESTRICT="binchecks strip test unknown-license? ( bindist )" BDEPEND="initramfs? ( app-arch/cpio )" - -#add anything else that collides to this RDEPEND="!savedconfig? ( redistributable? ( !sys-firmware/alsa-firmware[alsa_cards_ca0132] @@ -63,6 +47,7 @@ RDEPEND="!savedconfig? ( QA_PREBUILT="*" + pkg_setup() { if ! use compress ; then return diff --git a/sys-kernel/firmware-xa000/firmware-xa000-1.0.0.1.ebuild b/sys-kernel/firmware-xa000_0/firmware-xa000_0-1.0.0.1.ebuild similarity index 92% rename from sys-kernel/firmware-xa000/firmware-xa000-1.0.0.1.ebuild rename to sys-kernel/firmware-xa000_0/firmware-xa000_0-1.0.0.1.ebuild index ce33744..352939b 100644 --- a/sys-kernel/firmware-xa000/firmware-xa000-1.0.0.1.ebuild +++ b/sys-kernel/firmware-xa000_0/firmware-xa000_0-1.0.0.1.ebuild @@ -5,42 +5,26 @@ EAPI=8 inherit linux-info mount-boot savedconfig multiprocessing -# In case this is a real snapshot, fill in commit below. -# For normal, tagged releases, leave blank -MY_COMMIT="" - -if [[ ${PV} == 99999999* ]]; then - inherit git-r3 - EGIT_REPO_URI="https://git.kernel.org/pub/scm/linux/kernel/git/firmware/${PN}.git" -else - if [[ -n "${MY_COMMIT}" ]]; then - SRC_URI="https://git.kernel.org/cgit/linux/kernel/git/firmware/linux-firmware.git/snapshot/${MY_COMMIT}.tar.gz -> ${P}.tar.gz" - S="${WORKDIR}/${MY_COMMIT}" - else - SRC_URI="https://src.inferencium.net/Inferencium/firmware-xa000/archive/${P}.tar.gz" - S="${WORKDIR}/firmware-xa000" - fi - - KEYWORDS="amd64 arm64" -fi - -DESCRIPTION="Inferencium server Linux firmware." -HOMEPAGE="https://src.inferencium.net/Inferencium/firmware-xa000.git" +DESCRIPTION="Inferencium system xa000-0 firmware." +HOMEPAGE="https://src.inferencium.net/Inferencium/firmware-xa000-0.git" +SRC_URI="https://src.inferencium.net/Inferencium/firmware-xa000-0/archive/firmware-xa000-0-${PV}.tar.gz" +## WORKDIR must use actual name of the tagged package directory; Portage package name limitations +## prevent actual package name from being used +S="${WORKDIR}/firmware-xa000-0" +KEYWORDS="amd64" +SLOT="0" LICENSE="GPL-2 GPL-2+ GPL-3 BSD MIT || ( MPL-1.1 GPL-2 ) redistributable? ( linux-fw-redistributable ( BSD-2 BSD BSD-4 ISC MIT no-source-code ) ) unknown-license? ( all-rights-reserved )" -SLOT="0" + IUSE="compress initramfs +redistributable savedconfig unknown-license" REQUIRED_USE="initramfs? ( redistributable )" - RESTRICT="binchecks strip test unknown-license? ( bindist )" BDEPEND="initramfs? ( app-arch/cpio )" - -#add anything else that collides to this RDEPEND="!savedconfig? ( redistributable? ( !sys-firmware/alsa-firmware[alsa_cards_ca0132] @@ -63,6 +47,7 @@ RDEPEND="!savedconfig? ( QA_PREBUILT="*" + pkg_setup() { if ! use compress ; then return diff --git a/sys-kernel/firmware-xa000/metadata.xml b/sys-kernel/firmware-xa000_0/metadata.xml similarity index 100% rename from sys-kernel/firmware-xa000/metadata.xml rename to sys-kernel/firmware-xa000_0/metadata.xml