diff options
Diffstat (limited to 'sys-apps/flashrom')
| -rw-r--r-- | sys-apps/flashrom/Manifest | 7 | ||||
| -rw-r--r-- | sys-apps/flashrom/files/flashrom-1.3.0-libflashrom.patch | 32 | ||||
| -rw-r--r-- | sys-apps/flashrom/files/flashrom-1.3.0_spi-master.patch | 8 | ||||
| -rw-r--r-- | sys-apps/flashrom/flashrom-1.3.0-r3.ebuild (renamed from sys-apps/flashrom/flashrom-1.3.0-r2.ebuild) | 15 | ||||
| -rw-r--r-- | sys-apps/flashrom/metadata.xml | 4 |
5 files changed, 59 insertions, 7 deletions
diff --git a/sys-apps/flashrom/Manifest b/sys-apps/flashrom/Manifest index fa7ec8f75fef..1fd7c807a536 100644 --- a/sys-apps/flashrom/Manifest +++ b/sys-apps/flashrom/Manifest @@ -1,6 +1,7 @@ AUX flashrom-1.3.0-c99.patch 2134 BLAKE2B d1f0216a5281719972208d22ae31ca19fd6e34d10f3e2c9fb9e9633ea04fe989fd9fbe47939b2f1a9a51f99dd7ca450c479ad3abbcda9f61488d3fd8b4ee1209 SHA512 5c1c8a9663f1d584a4a27a8826062127be9ac2737d40a41c90a3e955c293c7151ed6038cbeaf41cdcb5b28ec654024e9d7ec83f7a22a3c7128cf0074b57f1adb -AUX flashrom-1.3.0_spi-master.patch 9106 BLAKE2B 594a921aa48ceb67a6370080a0b51665efde24844e3523eaa84d69d49a1384272553bd5dae0642dd8540e13ba67e6d8feb2ac6edfc95949bd0edd8a2eaa164c8 SHA512 78d08c853d9dbe75610b5b0ec14df753a0780bf19309c0d9be34ebfdc4c364b8875a183307da6394456becd19b22f8987569feb9c718ca123764539ef0e52444 +AUX flashrom-1.3.0-libflashrom.patch 935 BLAKE2B e982b5872a9588cf7b792ff533911e86cc849180ff79b00c1a9469368f9c8ea2c843de90c7e59128c3c76c414c8376811ceccf5776fb520d3b39d23a3229995a SHA512 dce40f9ab1624942888d2db62169147281aadba448d12e54484b5b14e5df49f62f39b742ac6baf38f13328332336c5e40e8c7b2f964f0ebd22e9f3685a22240c +AUX flashrom-1.3.0_spi-master.patch 9287 BLAKE2B 5e85ec4ce06edce61cfaa00a7dc5e954c76f4d404fb096009f14c11771719996679d185a0271ffcfc7518bc3e93b3264c1cc9c3cc61796a651df7a3a6027fef6 SHA512 b97e4546692273e787c8e1f8f01074978484ef8dab4d13887d58e60d3c643368bf853c7ee2a883c8aecdff432281f3539ace3d08253c84c8405cbfbecf9187bc DIST flashrom-v1.3.0.tar.bz2 489782 BLAKE2B e6d2284d83171b003b434251f060fa44edf32ecfd3d397bd4ba39b74c6a0b5c9d1659b703dd6b632b63aa4bf27d08c8aeece72920199712c6a4ae160b2eb3a8a SHA512 73b6e00bd3bc66c98d4ad53966a65b19d3d92f07d7b210d69e041d6f5788605b9791a9bf7aec0a52e13d19fcb62c4bdaf4bab9f805fc31468393ca313129a77b EBUILD flashrom-1.3.0-r1.ebuild 3316 BLAKE2B 8bf9cd5852d5802b40da3446b865608f3a33e8e843acdd548ef3d1a9b1b969bad78f81c2321766b631c5c2ce6d03a508b9082622a0d92863587db49a600673e0 SHA512 508611ca0f0d59062db946fb9d3722db241aa81a78922c1a2ac37490e7ff605e480d301577d455ff2cf682f3daa389106020178def57b7bdfcc9f5e71caaa9d3 -EBUILD flashrom-1.3.0-r2.ebuild 3358 BLAKE2B a362efb7b3b7c3977fa2b5eb3b180d60790da3364bf3b9ede5232c09bb752a420c6827806e057700c8616bdb4b0af450478c50e59d37b3ab1be4f75fd0ffc92c SHA512 e536abc35405b26c32cfbc3277217a280ac96a43ee4a4437bef401066916ea907d95576fb909d3a1b83d2c35acabead6d24e84ebe0ff1980a40ecca9140f811a -MISC metadata.xml 5072 BLAKE2B 5e11d250b2d59b71281ef50bf9cc79c30b2b2000002fae9725f75c73f89d02e297714d23d63dcaa55fb980162e54395b5ec5a528d15ada6c0fe8b6d020e1e3e9 SHA512 bec32f9d6d997e487f2560c89e68c041ae4162a2cc7b80dc38f20e610c300e76e8fa35144c371055f6a4594653c5af4865ba23634be87bd3e36cc8d66069ebc3 +EBUILD flashrom-1.3.0-r3.ebuild 3698 BLAKE2B d5dab9b199d182b226ebb88343fdf13cdbd2f642b8bf11ca629ca38f4e4aa4a9d638ef7e321cac1b82937149a0ebb2e83e711d9ec28c5c90ffe93c9268f05314 SHA512 bcc4a9bc9a2441bdc71313da3c1beb71723bbb0af94e25d747f84dc9110802be8fcd058671b91d33a1879353f346a154f827a14c9eeb2c7e143863a90bd3e875 +MISC metadata.xml 5075 BLAKE2B a698e5756c49254e9365a613dc418ac9ba27a0f54d5a0e4550d89c9938b32dbe01f0be03a296bc08973cf31cda4e7af33cd681c81869c8ab91aced6c760d9638 SHA512 6a8d44d70af1d630f791648c05023e059d97e799bf1112e1cdffe3ff1167e52edfe7fd0d9a5aa6834844d305827ef2fa92264277c4c63c6015641da36b028d81 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 <grobian@gentoo.org> +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 <grobian@gentoo.org> + +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_spi-master.patch b/sys-apps/flashrom/files/flashrom-1.3.0_spi-master.patch index 72298f8cfca3..ae2641af4a0a 100644 --- a/sys-apps/flashrom/files/flashrom-1.3.0_spi-master.patch +++ b/sys-apps/flashrom/files/flashrom-1.3.0_spi-master.patch @@ -1,6 +1,10 @@ Backported upstream commit https://github.com/flashrom/flashrom/commit/e1f30bbce7a603d518ecec9d7e6885719f396719 +This commit didn't apply straight because const/non-const changes were +made inbetween, so there are some additional changes to silence more +picky compilers like https://bugs.gentoo.org/915617 + --- a/bitbang_spi.c +++ b/bitbang_spi.c @@ -148,7 +148,6 @@ @@ -77,7 +81,7 @@ https://github.com/flashrom/flashrom/commit/e1f30bbce7a603d518ecec9d7e6885719f39 int spi_aai_write(struct flashctx *flash, const uint8_t *buf, unsigned int start, unsigned int len); int spi_chip_write_256(struct flashctx *flash, const uint8_t *buf, unsigned int start, unsigned int len); int spi_chip_read(struct flashctx *flash, uint8_t *buf, unsigned int start, int unsigned len); -+bool spi_probe_opcode(const struct flashctx *flash, uint8_t opcode); ++bool spi_probe_opcode(struct flashctx *flash, uint8_t opcode); /* spi25.c */ int probe_spi_rdid(struct flashctx *flash); @@ -235,7 +239,7 @@ https://github.com/flashrom/flashrom/commit/e1f30bbce7a603d518ecec9d7e6885719f39 } -bool default_spi_probe_opcode(struct flashctx *flash, uint8_t opcode) -+bool spi_probe_opcode(const struct flashctx *flash, uint8_t opcode) ++bool spi_probe_opcode(struct flashctx *flash, uint8_t opcode) { - return true; + if (!flash->mst->spi.probe_opcode) diff --git a/sys-apps/flashrom/flashrom-1.3.0-r2.ebuild b/sys-apps/flashrom/flashrom-1.3.0-r3.ebuild index 1e3b19367f39..ce98d59584d8 100644 --- a/sys-apps/flashrom/flashrom-1.3.0-r2.ebuild +++ b/sys-apps/flashrom/flashrom-1.3.0-r3.ebuild @@ -103,10 +103,25 @@ BDEPEND="test? ( dev-util/cmocka )" PATCHES=( "${FILESDIR}"/${PN}-1.3.0_spi-master.patch "${FILESDIR}"/${PN}-1.3.0-c99.patch + "${FILESDIR}"/${PN}-1.3.0-libflashrom.patch ) DOCS=( README Documentation/ ) +src_prepare() { + default + if use elibc_musl ; then + # skip failing test #908539 + sed -i -e 's/-DCONFIG_LINUX_MTD=1/-UCONFIG_LINUX_MTD/' \ + meson.build || die + fi + + # enable warnings + sed -i \ + -e 's:^warning_flags = \[:warning_flags = \[ '"'-Wall'"' \]\nno = \[:' \ + meson.build || die +} + src_configure() { local programmers="$(printf '%s,' $(for flag in ${IUSE_PROGRAMMERS//+/}; do usev ${flag}; done))" programmers="${programmers%,}" diff --git a/sys-apps/flashrom/metadata.xml b/sys-apps/flashrom/metadata.xml index 6f60f84bb3d6..c6597aa60e82 100644 --- a/sys-apps/flashrom/metadata.xml +++ b/sys-apps/flashrom/metadata.xml @@ -2,8 +2,8 @@ <!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd"> <pkgmetadata> <maintainer type="person"> - <email>marecki@gentoo.org</email> - <name>Marek Szuba</name> + <email>grobian@gentoo.org</email> + <name>Fabian Groffen</name> </maintainer> <use> <flag name="atahpt">Highpoint (HPT) ATA/RAID controller support</flag> |