commit: 04d0f920c4169a94c463633b4eac93fcb3e535d6 Author: Marek Szuba <marecki <AT> gentoo <DOT> org> AuthorDate: Wed Apr 24 13:18:14 2024 +0000 Commit: Marek Szuba <marecki <AT> gentoo <DOT> org> CommitDate: Wed Apr 24 13:27:30 2024 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=04d0f920
sys-apps/flashrom: drop 1.2-r4, 1.3.0 Note that this drops flashrom on ppc64 to ~arch-only, owing to none of the newer versions having been stabilised for this architecture for almost a year. Closes: https://bugs.gentoo.org/906737 Signed-off-by: Marek Szuba <marecki <AT> gentoo.org> sys-apps/flashrom/Manifest | 1 - .../flashrom/files/flashrom-1.2_meson-fixes.patch | 289 --------------------- .../files/flashrom-1.2_meson-install-manpage.patch | 43 --- sys-apps/flashrom/flashrom-1.2-r4.ebuild | 145 ----------- sys-apps/flashrom/flashrom-1.3.0.ebuild | 128 --------- 5 files changed, 606 deletions(-) diff --git a/sys-apps/flashrom/Manifest b/sys-apps/flashrom/Manifest index 20d3cca7fc80..9814b3053ebe 100644 --- a/sys-apps/flashrom/Manifest +++ b/sys-apps/flashrom/Manifest @@ -1,2 +1 @@ -DIST flashrom-v1.2.tar.bz2 366995 BLAKE2B 091e01a91e12b486154ace334a5e74bccbb5f5311ad76e37f43a28167080757873d8c78b8f549d2e77eb984922c830895ba955b23eb6ee4fc24f1ffed259954b SHA512 8e01395a54d0d1344bc55e7e4975f43bb8e59ebe83fb5f2766d14f76756d718b487254ce9a19ef4093aed04fb9d40fff5fe8f709b18c512f6e6fad894f83d7b8 DIST flashrom-v1.3.0.tar.bz2 489782 BLAKE2B e6d2284d83171b003b434251f060fa44edf32ecfd3d397bd4ba39b74c6a0b5c9d1659b703dd6b632b63aa4bf27d08c8aeece72920199712c6a4ae160b2eb3a8a SHA512 73b6e00bd3bc66c98d4ad53966a65b19d3d92f07d7b210d69e041d6f5788605b9791a9bf7aec0a52e13d19fcb62c4bdaf4bab9f805fc31468393ca313129a77b diff --git a/sys-apps/flashrom/files/flashrom-1.2_meson-fixes.patch b/sys-apps/flashrom/files/flashrom-1.2_meson-fixes.patch deleted file mode 100644 index bb185fae8223..000000000000 --- a/sys-apps/flashrom/files/flashrom-1.2_meson-fixes.patch +++ /dev/null @@ -1,289 +0,0 @@ ---- a/meson.build -+++ b/meson.build -@@ -2,7 +2,7 @@ - version : run_command('util/getversion.sh', '-v').stdout().strip(), - license : 'GPL-2.0', - meson_version : '>=0.47.0', -- default_options : ['warning_level=2', 'c_std=c99'], -+ default_options : ['warning_level=2', 'c_std=gnu99'], - ) - - # libtool versioning -@@ -44,6 +44,7 @@ - config_gfxnvidia = get_option('config_gfxnvidia') - config_internal = get_option('config_internal') - config_it8212 = get_option('config_it8212') -+config_jlink_spi = get_option('config_jlink_spi') - config_linux_mtd = get_option('config_linux_mtd') - config_linux_spi = get_option('config_linux_spi') - config_mstarddc_spi = get_option('config_mstarddc_spi') -@@ -67,6 +68,10 @@ - deps = [] - srcs = [] - -+config_bitbang_spi = false -+need_libftdi = false -+need_libpci = false -+need_libusb = false - need_raw_access = false - need_serial = false - -@@ -81,24 +86,24 @@ - add_project_arguments('-DHAVE_UTSNAME=1', language : 'c') - endif - --# some programmers require libusb --if get_option('usb') -- srcs += 'usbdev.c' -- deps += dependency('libusb-1.0') --else -+if get_option('no_libftdi_programmers') -+ message('Disabling ALL libftdi-based programmers') -+ config_ft2232_spi = false -+ config_usbblaster_spi = false -+endif -+ -+if get_option('no_libusb_programmers') -+ message('Disabling ALL libusb-based programmers') - config_ch341a_spi = false - config_dediprog = false -- config_digilent_spi = false - config_developerbox_spi = false -+ config_digilent_spi = false - config_pickit2_spi = false -+ config_stlinkv3_spi = false - endif - --# some programmers require libpci --if get_option('pciutils') -- srcs += 'pcidev.c' -- deps += dependency('libpci') -- cargs += '-DNEED_PCI=1' --else -+if get_option('no_libpci_programmers') -+ message('Disabling ALL libpci-based programmers') - config_atahpt = false - config_atapromise = false - config_atavia = false -@@ -121,14 +126,20 @@ - # set defines for configured programmers - if config_atahpt - srcs += 'atahpt.c' -+ need_libpci = true -+ need_raw_access = true - cargs += '-DCONFIG_ATAHPT=1' - endif - if config_atapromise - srcs += 'atapromise.c' -+ need_libpci = true -+ need_raw_access = true - cargs += '-DCONFIG_ATAPROMISE=1' - endif - if config_atavia - srcs += 'atavia.c' -+ need_libpci = true -+ need_raw_access = true - cargs += '-DCONFIG_ATAVIA=1' - endif - if config_buspirate_spi -@@ -138,22 +149,28 @@ - endif - if config_ch341a_spi - srcs += 'ch341a_spi.c' -+ need_libusb = true - cargs += '-DCONFIG_CH341A_SPI=1' - endif - if config_dediprog - srcs += 'dediprog.c' -+ need_libusb = true - cargs += '-DCONFIG_DEDIPROG=1' - endif - if config_developerbox_spi - srcs += 'developerbox_spi.c' -+ need_libusb = true - cargs += '-DCONFIG_DEVELOPERBOX_SPI=1' - endif - if config_digilent_spi - srcs += 'digilent_spi.c' -+ need_libusb = true - cargs += '-DCONFIG_DIGILENT_SPI=1' - endif - if config_drkaiser - srcs += 'drkaiser.c' -+ need_libpci = true -+ need_raw_access = true - cargs += '-DCONFIG_DRKAISER=1' - endif - if config_dummy -@@ -162,12 +179,14 @@ - endif - if config_ft2232_spi - srcs += 'ft2232_spi.c' -+ need_libftdi = true - cargs += '-DCONFIG_FT2232_SPI=1' -- deps += dependency('libftdi1') - cargs += '-DHAVE_FT232H=1' - endif - if config_gfxnvidia - srcs += 'gfxnvidia.c' -+ need_libpci = true -+ need_raw_access = true - cargs += '-DCONFIG_GFXNVIDIA=1' - endif - if config_internal -@@ -186,6 +205,8 @@ - srcs += 'sb600spi.c' - srcs += 'wbsio_spi.c' - endif -+ need_libpci = true -+ need_raw_access = true - config_bitbang_spi = true - cargs += '-DCONFIG_INTERNAL=1' - if get_option('config_internal_dmi') -@@ -195,6 +216,8 @@ - endif - if config_it8212 - srcs += 'it8212.c' -+ need_libpci = true -+ need_raw_access = true - cargs += '-DCONFIG_IT8212=1' - endif - if config_linux_mtd -@@ -211,36 +234,51 @@ - endif - if config_nic3com - srcs += 'nic3com.c' -+ need_libpci = true -+ need_raw_access = true - cargs += '-DCONFIG_NIC3COM=1' - endif - if config_nicintel - srcs += 'nicintel.c' -+ need_libpci = true -+ need_raw_access = true - cargs += '-DCONFIG_NICINTEL=1' - endif - if config_nicintel_eeprom - srcs += 'nicintel_eeprom.c' -+ need_libpci = true -+ need_raw_access = true - cargs += '-DCONFIG_NICINTEL_EEPROM=1' - endif - if config_nicintel_spi - srcs += 'nicintel_spi.c' -+ need_libpci = true -+ need_raw_access = true - config_bitbang_spi = true - cargs += '-DCONFIG_NICINTEL_SPI=1' - endif - if config_nicnatsemi - srcs += 'nicnatsemi.c' -+ need_libpci = true -+ need_raw_access = true - cargs += '-DCONFIG_NICNATSEMI=1' - endif - if config_nicrealtek - srcs += 'nicrealtek.c' -+ need_libpci = true -+ need_raw_access = true - cargs += '-DCONFIG_NICREALTEK=1' - endif - if config_ogp_spi - config_bitbang_spi = true - srcs += 'ogp_spi.c' -+ need_libpci = true -+ need_raw_access = true - cargs += '-DCONFIG_OGP_SPI=1' - endif - if config_pickit2_spi - srcs += 'pickit2_spi.c' -+ need_libusb = true - cargs += '-DCONFIG_PICKIT2_SPI=1' - endif - if config_pony_spi -@@ -252,15 +290,20 @@ - if config_rayer_spi - srcs += 'rayer_spi.c' - config_bitbang_spi = true -+ need_libpci = true - need_raw_access = true - cargs += '-DCONFIG_RAYER_SPI=1' - endif - if config_satamv - srcs += 'satamv.c' -+ need_libpci = true -+ need_raw_access = true - cargs += '-DCONFIG_SATAMV=1' - endif - if config_satasii - srcs += 'satasii.c' -+ need_libpci = true -+ need_raw_access = true - cargs += '-DCONFIG_SATASII=1' - endif - if config_serprog -@@ -270,12 +313,19 @@ - endif - if config_usbblaster_spi - srcs += 'usbblaster_spi.c' -+ need_libftdi = true - cargs += '-DCONFIG_USBBLASTER_SPI=1' - endif - if config_stlinkv3_spi - srcs += 'stlinkv3_spi.c' -+ need_libusb = true - cargs += '-DCONFIG_STLINKV3_SPI=1' - endif -+if config_jlink_spi -+ srcs += 'jlink_spi.c' -+ cargs += '-DCONFIG_JLINK_SPI=1' -+ deps += dependency('libjaylink') -+endif - - # bitbanging SPI infrastructure - if config_bitbang_spi -@@ -296,6 +346,25 @@ - srcs += 'serial.c' - endif - -+# some programmers require libftdi -+if need_libftdi -+ deps += dependency('libftdi1') -+endif -+ -+# some programmers require libpci -+if need_libpci -+ srcs += 'pcidev.c' -+ deps += dependency('libpci') -+ cargs += '-DNEED_PCI=1' -+endif -+ -+# some programmers require libusb -+if need_libusb -+ srcs += 'usbdev.c' -+ deps += dependency('libusb-1.0') -+endif -+ -+ - prefix = get_option('prefix') - sbindir = join_paths(prefix, get_option('sbindir')) - libdir = join_paths(prefix, get_option('libdir')) ---- a/meson_options.txt -+++ b/meson_options.txt -@@ -1,5 +1,6 @@ --option('pciutils', type : 'boolean', value : true, description : 'use pciutils') --option('usb', type : 'boolean', value : true, description : 'use libusb1') -+option('no_libftdi_programmers', type : 'boolean', value : false, description : 'disable all programmers depending on libftdi') -+option('no_libpci_programmers', type : 'boolean', value : false, description : 'disable all programmers depending on libpci') -+option('no_libusb_programmers', type : 'boolean', value : false, description : 'disable all programmers depending on libusb') - - option('config_atahpt', type : 'boolean', value : false, description : 'Highpoint (HPT) ATA/RAID controllers') - option('config_atapromise', type : 'boolean', value : false, description : 'Promise ATA controller') -@@ -16,6 +17,7 @@ - option('config_internal', type : 'boolean', value : true, description : 'internal/onboard') - option('config_internal_dmi', type : 'boolean', value : true, description : 'Use internal DMI parser') - option('config_it8212', type : 'boolean', value : true, description : 'ITE IT8212F PATA') -+option('config_jlink_spi', type : 'boolean', value : false, description : 'SEGGER J-Link and compatible') - option('config_linux_mtd', type : 'boolean', value : true, description : 'Linux MTD interfaces') - option('config_linux_spi', type : 'boolean', value : true, description : 'Linux spidev interfaces') - option('config_mstarddc_spi', type : 'boolean', value : false, description : 'MSTAR DDC support') diff --git a/sys-apps/flashrom/files/flashrom-1.2_meson-install-manpage.patch b/sys-apps/flashrom/files/flashrom-1.2_meson-install-manpage.patch deleted file mode 100644 index 8783cfeefa7e..000000000000 --- a/sys-apps/flashrom/files/flashrom-1.2_meson-install-manpage.patch +++ /dev/null @@ -1,43 +0,0 @@ -This is essentially the upstream commit 7aea04f7099ad4dde7b1f5900b54ef603eadf25e, -modified so that MAN_DATE is set to simply '-' - the commit generates -the date using the script util/getrevision.sh, which is not included in -release tarballs. - ---- a/flashrom.8.tmpl -+++ b/flashrom.8.tmpl -@@ -40,7 +40,7 @@ - . \} - . \} - .. --.TH FLASHROM 8 "" "" -+.TH FLASHROM 8 "@MAN_DATE@" "@VERSION@" "@MAN_DATE@" - .SH NAME - flashrom \- detect, read, write, verify and erase flash chips - .SH SYNOPSIS ---- a/meson.build -+++ b/meson.build -@@ -321,6 +321,7 @@ endif - prefix = get_option('prefix') - sbindir = join_paths(prefix, get_option('sbindir')) - libdir = join_paths(prefix, get_option('libdir')) -+mandir = join_paths(prefix, get_option('mandir')) - - install_headers([ - 'libflashrom.h', -@@ -394,6 +395,16 @@ pkgg.generate( - description : 'library to interact with flashrom', - ) - -+conf.set('VERSION', version) -+conf.set('MAN_DATE', '-') -+configure_file( -+ input : 'flashrom.8.tmpl', -+ output : 'flashrom.8', -+ configuration : conf, -+ install: true, -+ install_dir: join_paths(mandir, 'man8'), -+) -+ - flashrom_dep = declare_dependency( - link_with : flashrom, - include_directories : include_directories('.'), diff --git a/sys-apps/flashrom/flashrom-1.2-r4.ebuild b/sys-apps/flashrom/flashrom-1.2-r4.ebuild deleted file mode 100644 index 2bb0b89fed55..000000000000 --- a/sys-apps/flashrom/flashrom-1.2-r4.ebuild +++ /dev/null @@ -1,145 +0,0 @@ -# Copyright 1999-2022 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 - -inherit meson - -if [[ ${PV} == "9999" ]] ; then - EGIT_REPO_URI="https://review.coreboot.org/flashrom.git"; - inherit git-r3 -else - MY_P="${PN}-v${PV}" - SRC_URI="https://download.flashrom.org/releases/${MY_P}.tar.bz2"; - KEYWORDS="amd64 arm arm64 ppc ppc64 ~riscv x86" - S="${WORKDIR}/${MY_P}" -fi - -DESCRIPTION="Utility for reading, writing, erasing and verifying flash ROM chips" -HOMEPAGE="https://flashrom.org/Flashrom"; - -LICENSE="GPL-2" -SLOT="0" - -# The defaults match the upstream meson_options.txt. -IUSE_PROGRAMMERS=" - atahpt - atapromise - +atavia - +buspirate-spi - +ch341a-spi - +dediprog - +developerbox-spi - +digilent-spi - +drkaiser - +dummy - +ft2232-spi - +gfxnvidia - +internal - +it8212 - jlink-spi - +linux-mtd - +linux-spi - mstarddc-spi - +nic3com - +nicintel - +nicintel-eeprom - +nicintel-spi - nicnatsemi - +nicrealtek - +ogp-spi - +pickit2-spi - +pony-spi - +rayer-spi - +satamv - +satasii - +serprog - +stlinkv3-spi - +usbblaster-spi -" -IUSE="${IUSE_PROGRAMMERS} +internal-dmi tools" - -RDEPEND="atahpt? ( sys-apps/pciutils ) - atapromise? ( sys-apps/pciutils ) - atavia? ( sys-apps/pciutils ) - ch341a-spi? ( virtual/libusb:1 ) - dediprog? ( virtual/libusb:1 ) - developerbox-spi? ( virtual/libusb:1 ) - digilent-spi? ( virtual/libusb:1 ) - drkaiser? ( sys-apps/pciutils ) - ft2232-spi? ( dev-embedded/libftdi:1= ) - gfxnvidia? ( sys-apps/pciutils ) - internal? ( sys-apps/pciutils ) - it8212? ( sys-apps/pciutils ) - jlink-spi? ( dev-embedded/libjaylink ) - nic3com? ( sys-apps/pciutils ) - nicintel-eeprom? ( sys-apps/pciutils ) - nicintel-spi? ( sys-apps/pciutils ) - nicintel? ( sys-apps/pciutils ) - nicnatsemi? ( sys-apps/pciutils ) - nicrealtek? ( sys-apps/pciutils ) - ogp-spi? ( sys-apps/pciutils ) - pickit2-spi? ( virtual/libusb:1 ) - rayer-spi? ( sys-apps/pciutils ) - satamv? ( sys-apps/pciutils ) - satasii? ( sys-apps/pciutils ) - stlinkv3-spi? ( virtual/libusb:1 ) - usbblaster-spi? ( dev-embedded/libftdi:1= )" -DEPEND="${RDEPEND} - sys-apps/diffutils" -RDEPEND+=" !internal-dmi? ( sys-apps/dmidecode )" - -DOCS=( README Documentation/ ) - -PATCHES=( - "${FILESDIR}"/${PN}-1.2_meson-fixes.patch - "${FILESDIR}"/${PN}-1.2_meson-install-manpage.patch -) - -src_configure() { - local emesonargs=( - $(meson_use atahpt config_atahpt) - $(meson_use atapromise config_atapromise) - $(meson_use atavia config_atavia) - $(meson_use buspirate-spi config_buspirate_spi) - $(meson_use ch341a-spi config_ch341a_spi) - $(meson_use dediprog config_dediprog) - $(meson_use developerbox-spi config_developerbox_spi) - $(meson_use digilent-spi config_digilent_spi) - $(meson_use drkaiser config_drkaiser) - $(meson_use dummy config_dummy) - $(meson_use ft2232-spi config_ft2232_spi) - $(meson_use gfxnvidia config_gfxnvidia) - $(meson_use internal config_internal) - $(meson_use internal-dmi config_internal_dmi) - $(meson_use it8212 config_it8212) - $(meson_use jlink-spi config_jlink_spi) - $(meson_use linux-mtd config_linux_mtd) - $(meson_use linux-spi config_linux_spi) - $(meson_use mstarddc-spi config_mstarddc_spi) - $(meson_use nic3com config_nic3com) - $(meson_use nicintel-eeprom config_nicintel_eeprom) - $(meson_use nicintel-spi config_nicintel_spi) - $(meson_use nicintel config_nicintel) - $(meson_use nicnatsemi config_nicnatsemi) - $(meson_use nicrealtek config_nicrealtek) - $(meson_use ogp-spi config_ogp_spi) - $(meson_use pickit2-spi config_pickit2_spi) - $(meson_use pony-spi config_pony_spi) - $(meson_use rayer-spi config_rayer_spi) - $(meson_use satamv config_satamv) - $(meson_use satasii config_satasii) - $(meson_use stlinkv3-spi config_stlinkv3_spi) - $(meson_use serprog config_serprog) - $(meson_use usbblaster-spi config_usbblaster_spi) - ) - meson_src_configure -} - -src_install() { - meson_src_install - - if use tools; then - dosbin "${BUILD_DIR}"/util/ich_descriptors_tool/ich_descriptors_tool - fi -} diff --git a/sys-apps/flashrom/flashrom-1.3.0.ebuild b/sys-apps/flashrom/flashrom-1.3.0.ebuild deleted file mode 100644 index 1281c12fa3c3..000000000000 --- a/sys-apps/flashrom/flashrom-1.3.0.ebuild +++ /dev/null @@ -1,128 +0,0 @@ -# Copyright 1999-2023 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=8 - -inherit meson - -MY_P="${PN}-v${PV}" -SRC_URI="https://download.flashrom.org/releases/${MY_P}.tar.bz2"; -KEYWORDS="amd64 arm arm64 ppc ~ppc64 ~riscv x86" -S="${WORKDIR}/${MY_P}" - -DESCRIPTION="Utility for reading, writing, erasing and verifying flash ROM chips" -HOMEPAGE="https://flashrom.org/Flashrom"; - -LICENSE="GPL-2" -SLOT="0" - -# The defaults should match the upstream "default" flags in meson.build -IUSE_PROGRAMMERS=" - atahpt - atapromise - +atavia - +buspirate-spi - +ch341a-spi - +dediprog - +developerbox-spi - +digilent-spi - +dirtyjtag-spi - +drkaiser - +dummy - +ft2232-spi - +gfxnvidia - +internal - +it8212 - jlink-spi - +linux-mtd - +linux-spi - mediatek-i2c-spi - mstarddc-spi - +nic3com - +nicintel - +nicintel-eeprom - +nicintel-spi - nicnatsemi - +nicrealtek - +ogp-spi - parade-lspcon - +pickit2-spi - +pony-spi - +raiden-debug-spi - +rayer-spi - realtek-mst-i2c-spi - +satamv - +satasii - +serprog - +stlinkv3-spi - +usbblaster-spi" -IUSE="${IUSE_PROGRAMMERS} +internal-dmi test tools" - -RESTRICT="!test? ( test )" - -COMMON="atahpt? ( sys-apps/pciutils ) - atapromise? ( sys-apps/pciutils ) - atavia? ( sys-apps/pciutils ) - ch341a-spi? ( virtual/libusb:1 ) - dediprog? ( virtual/libusb:1 ) - developerbox-spi? ( virtual/libusb:1 ) - digilent-spi? ( virtual/libusb:1 ) - dirtyjtag-spi? ( virtual/libusb:1 ) - drkaiser? ( sys-apps/pciutils ) - ft2232-spi? ( dev-embedded/libftdi:1= ) - gfxnvidia? ( sys-apps/pciutils ) - internal? ( sys-apps/pciutils ) - it8212? ( sys-apps/pciutils ) - jlink-spi? ( dev-embedded/libjaylink ) - nic3com? ( sys-apps/pciutils ) - nicintel? ( sys-apps/pciutils ) - nicintel-eeprom? ( sys-apps/pciutils ) - nicintel-spi? ( sys-apps/pciutils ) - nicnatsemi? ( sys-apps/pciutils ) - nicrealtek? ( sys-apps/pciutils ) - ogp-spi? ( sys-apps/pciutils ) - pickit2-spi? ( virtual/libusb:1 ) - raiden-debug-spi? ( virtual/libusb:1 ) - satamv? ( sys-apps/pciutils ) - satasii? ( sys-apps/pciutils ) - stlinkv3-spi? ( virtual/libusb:1 ) - usbblaster-spi? ( dev-embedded/libftdi:1= )" -RDEPEND="${COMMON} - !internal-dmi? ( sys-apps/dmidecode )" -DEPEND="${COMMON} - sys-apps/diffutils - linux-mtd? ( sys-kernel/linux-headers ) - linux-spi? ( sys-kernel/linux-headers ) - mediatek-i2c-spi? ( sys-kernel/linux-headers ) - mstarddc-spi? ( sys-kernel/linux-headers ) - parade-lspcon? ( sys-kernel/linux-headers ) - realtek-mst-i2c-spi? ( sys-kernel/linux-headers )" -BDEPEND="test? ( dev-util/cmocka )" - -DOCS=( README Documentation/ ) - -src_configure() { - local programmers="$(printf '%s,' $(for flag in ${IUSE_PROGRAMMERS//+/}; do usev ${flag}; done))" - programmers="${programmers%,}" - programmers="${programmers//-/_}" - local emesonargs=( - -Dclassic_cli="enabled" - -Dprogrammer="${programmers}" - $(meson_feature test tests) - $(meson_feature tools ich_descriptors_tool) - ) - meson_src_configure -} - -src_install() { - meson_src_install - - # Upstream requires libflashrom.a to be present at build time because the classic CLI - # executable uses internal symbols from that library. Therefore, we let it be built - # but keep it out of the installed tree. - find "${ED}" -name '*.a' -delete || die - - if use tools; then - dosbin "${BUILD_DIR}"/util/ich_descriptors_tool/ich_descriptors_tool - fi -}
