commit: b3a9f5e9e86ba28ddf9888c2867467c71129bbbd Author: Fabian Groffen <grobian <AT> gentoo <DOT> org> AuthorDate: Fri Jun 28 19:00:39 2024 +0000 Commit: Fabian Groffen <grobian <AT> gentoo <DOT> org> CommitDate: Fri Jun 28 19:08:10 2024 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=b3a9f5e9
sys-apps/flashrom-1.3.0-r2: fix libflashrom mapfile #928955 Closes: https://bugs.gentoo.org/928955 Signed-off-by: Fabian Groffen <grobian <AT> gentoo.org> .../files/flashrom-1.3.0-libflashrom.patch | 32 ++++++++++++++++++++++ .../files/flashrom-1.3.0-llvm-dummyflasher.patch | 11 ++++++++ sys-apps/flashrom/flashrom-1.3.0-r2.ebuild | 1 + 3 files changed, 44 insertions(+) diff --git a/sys-apps/flashrom/files/flashrom-1.3.0-libflashrom.patch b/sys-apps/flashrom/files/flashrom-1.3.0-libflashrom.patch new file mode 100644 index 000000000000..d228d8be5577 --- /dev/null +++ b/sys-apps/flashrom/files/flashrom-1.3.0-libflashrom.patch @@ -0,0 +1,32 @@ +commit b544f055c32dd9c839cdf49009531decb80af8e5 +Author: Fabian Groffen <[email protected]> +Date: Fri Jun 28 20:46:25 2024 +0200 + + libflashrom.map: remove non-existant functions + + Remove symbol names from the map that do not exist in the code. + https://bugs.gentoo.org/928955 + + Change-Id: I30bab842d9cbd2daaa9902fd3223f47145cb0e7f + Signed-off-by: Fabian Groffen <[email protected]> + +diff --git a/libflashrom.map b/libflashrom.map +index 77abf727..e1cdfa6a 100644 +--- a/libflashrom.map ++++ b/libflashrom.map +@@ -1,7 +1,5 @@ + LIBFLASHROM_1.0 { + global: +- flashrom_board_info; +- flashrom_chipset_info; + flashrom_data_free; + flashrom_flag_get; + flashrom_flag_set; +@@ -9,7 +7,6 @@ LIBFLASHROM_1.0 { + flashrom_flash_getsize; + flashrom_flash_probe; + flashrom_flash_release; +- flashrom_flashchip_info; + flashrom_image_read; + flashrom_image_verify; + flashrom_image_write; diff --git a/sys-apps/flashrom/files/flashrom-1.3.0-llvm-dummyflasher.patch b/sys-apps/flashrom/files/flashrom-1.3.0-llvm-dummyflasher.patch new file mode 100644 index 000000000000..22243937b960 --- /dev/null +++ b/sys-apps/flashrom/files/flashrom-1.3.0-llvm-dummyflasher.patch @@ -0,0 +1,11 @@ +--- a/dummyflasher.c ++++ b/dummyflasher.c +@@ -930,7 +930,7 @@ + .read = default_spi_read, + .write_256 = dummy_spi_write_256, + .write_aai = default_spi_write_aai, +- .probe_opcode = dummy_spi_probe_opcode, ++ .probe_opcode = &dummy_spi_probe_opcode, + }; + + static const struct par_master par_master_dummyflasher = { diff --git a/sys-apps/flashrom/flashrom-1.3.0-r2.ebuild b/sys-apps/flashrom/flashrom-1.3.0-r2.ebuild index d9bda60a6cdd..0607f1d76a6d 100644 --- a/sys-apps/flashrom/flashrom-1.3.0-r2.ebuild +++ b/sys-apps/flashrom/flashrom-1.3.0-r2.ebuild @@ -104,6 +104,7 @@ PATCHES=( "${FILESDIR}"/${PN}-1.3.0_spi-master.patch "${FILESDIR}"/${PN}-1.3.0-c99.patch "${FILESDIR}"/${PN}-1.3.0-llvm-dummyflasher.patch + "${FILESDIR}"/${PN}-1.3.0-libflashrom.patch ) DOCS=( README Documentation/ )
