Gentoo Websites Logo
Go to: Gentoo Home Documentation Forums Lists Bugs Planet Store Wiki Get Gentoo!
Bug 834021 - sys-apps/flashrom-9999 fails to patch during emerge, needs updated flashrom-9999-meson-fixes.patch
Summary: sys-apps/flashrom-9999 fails to patch during emerge, needs updated flashrom-9...
Status: RESOLVED FIXED
Alias: None
Product: Gentoo Linux
Classification: Unclassified
Component: Current packages (show other bugs)
Hardware: All Linux
: Normal normal
Assignee: Marek Szuba (RETIRED)
URL:
Whiteboard:
Keywords:
Depends on:
Blocks:
 
Reported: 2022-02-25 09:39 UTC by Gabriel Marcano
Modified: 2022-03-11 16:40 UTC (History)
2 users (show)

See Also:
Package list:
Runtime testing required: ---


Attachments

Note You need to log in before you can comment on or make changes to this bug.
Description Gabriel Marcano 2022-02-25 09:39:48 UTC
I tried installing sys-apps/flashrom-9999 and it failed in the prepare phase by failing to apply flashrom-9999_meson-fixes.patch.

I am not using any user patches.

Looking upstream, they have modified their meson.build file quite a lot since release 1.2, including renaming some options (or so it seemed to me).

Reproducible: Always

Steps to Reproduce:
1. Unmask sys-apps/flashrom-9999
2. emerge =sys-apps/flashrom-9999
Actual Results:  
...
 * Applying flashrom-9999_meson-fixes.patch ...
patching file meson.build
Hunk #2 FAILED at 105.
Hunk #3 FAILED at 119.
Hunk #4 succeeded at 189 (offset 28 lines).
Hunk #5 succeeded at 208 (offset 27 lines).
Hunk #6 succeeded at 232 (offset 26 lines).
Hunk #7 FAILED at 215.
Hunk #8 FAILED at 243.
Hunk #9 succeeded at 276 (offset 24 lines).
Hunk #10 FAILED at 269.
Hunk #11 succeeded at 333 (offset 18 lines).
Hunk #12 succeeded at 347 (offset 17 lines).
Hunk #13 FAILED at 357.
Hunk #14 succeeded at 533 (offset 27 lines).
Hunk #15 succeeded at 561 (offset 27 lines).
6 out of 15 hunks FAILED -- saving rejects to file meson.build.rej
...

Expected Results:  
Emerge success.

# emerge --info flashrom
Portage 3.0.30 (python 3.9.10-final-0, default/linux/amd64/17.1/desktop/plasma/systemd, gcc-11.2.1, glibc-2.34-r9, 5.16.9-gentoo x86_64)
=================================================================
                         System Settings
=================================================================
System uname: Linux-5.16.9-gentoo-x86_64-AMD_Ryzen_9_5900X_12-Core_Processor-with-glibc2.34
KiB Mem:    65848128 total,  11684804 free
KiB Swap:   67108544 total,  67108544 free
Timestamp of repository gentoo: Thu, 24 Feb 2022 22:07:05 +0000
Head commit of repository gentoo: a56e963f074c59383de7da9b4f85fb4a78cb1b9b

sh bash 5.1_p16
ld GNU ld (Gentoo 2.37_p1 p2) 2.37
app-misc/pax-utils:        1.3.3::gentoo
app-shells/bash:           5.1_p16::gentoo
dev-java/java-config:      2.3.1::gentoo
dev-lang/perl:             5.34.0-r7::gentoo
dev-lang/python:           2.7.18_p13::gentoo, 3.9.10-r1::gentoo, 3.10.2-r1::gentoo
dev-lang/rust:             1.58.1::gentoo
dev-util/cmake:            3.22.2::gentoo
dev-util/meson:            0.60.3::gentoo
sys-apps/baselayout:       2.8::gentoo
sys-apps/sandbox:          2.29::gentoo
sys-apps/systemd:          250.3::gentoo
sys-devel/autoconf:        2.13-r1::gentoo, 2.71-r1::gentoo
sys-devel/automake:        1.16.5::gentoo
sys-devel/binutils:        2.37_p1-r2::gentoo
sys-devel/binutils-config: 5.4.1::gentoo
sys-devel/clang:           13.0.1::gentoo
sys-devel/gcc:             11.2.1_p20220115::gentoo
sys-devel/gcc-config:      2.5-r1::gentoo
sys-devel/libtool:         2.4.6-r6::gentoo
sys-devel/lld:             13.0.1::gentoo
sys-devel/llvm:            13.0.1::gentoo
sys-devel/make:            4.3::gentoo
sys-kernel/linux-headers:  5.16::gentoo (virtual/os-headers)
sys-libs/glibc:            2.34-r9::gentoo
Repositories:

gentoo
    location: /var/db/repos/gentoo
    sync-type: git
    sync-uri: git://github.com/gentoo-mirror/gentoo
    priority: -1000
    sync-git-verify-commit-signature: yes

Local_Overlay
    location: /var/db/repos/local
    masters: gentoo
    eclass-overrides: gentoo Local_Overlay

crossdev
    location: /var/db/repos/crossdev
    masters: gentoo
    eclass-overrides: gentoo crossdev

guru
    location: /var/lib/layman/guru
    sync-type: laymansync
    sync-uri: https://anongit.gentoo.org/git/repo/proj/guru.git
    masters: gentoo
    priority: 50

Installed sets: @binwalk
ACCEPT_KEYWORDS="amd64 ~amd64"
ACCEPT_LICENSE="@FREE"
CBUILD="x86_64-pc-linux-gnu"
CFLAGS="-O3 -fomit-frame-pointer -pipe -march=native -flto"
CHOST="x86_64-pc-linux-gnu"
CONFIG_PROTECT="/etc /usr/lib64/libreoffice/program/sofficerc /usr/share/config /usr/share/gnupg/qualified.txt"
CONFIG_PROTECT_MASK="/etc/ca-certificates.conf /etc/dconf /etc/env.d /etc/fonts/fonts.conf /etc/gconf /etc/gentoo-release /etc/revdep-rebuild /etc/sandbox.d /etc/terminfo"
CXXFLAGS="-O3 -fomit-frame-pointer -pipe -march=native -flto"
DISTDIR="/var/cache/distfiles"
ENV_UNSET="CARGO_HOME DBUS_SESSION_BUS_ADDRESS DISPLAY GOBIN GOPATH PERL5LIB PERL5OPT PERLPREFIX PERL_CORE PERL_MB_OPT PERL_MM_OPT XAUTHORITY XDG_CACHE_HOME XDG_CONFIG_HOME XDG_DATA_HOME XDG_RUNTIME_DIR"
FCFLAGS="-O3 -fomit-frame-pointer -pipe -march=native -flto"
FEATURES="assume-digests binpkg-docompress binpkg-dostrip binpkg-logs buildpkg-live config-protect-if-modified distlocks ebuild-locks fixlafiles ipc-sandbox merge-sync multilib-strict network-sandbox news parallel-fetch pid-sandbox preserve-libs protect-owned qa-unresolved-soname-deps sandbox sfperms strict unknown-features-warn unmerge-logs unmerge-orphans userfetch userpriv usersandbox usersync xattr"
FFLAGS="-O3 -fomit-frame-pointer -pipe -march=native -flto"
GENTOO_MIRRORS="http://distfiles.gentoo.org"
LANG="en_US.utf8"
LDFLAGS="-Wl,-O1 -Wl,--as-needed"
MAKEOPTS="-j14"
PKGDIR="/var/cache/binpkgs"
PORTAGE_CONFIGROOT="/"
PORTAGE_RSYNC_OPTS="--recursive --links --safe-links --perms --times --omit-dir-times --compress --force --whole-file --delete --stats --human-readable --timeout=180 --exclude=/distfiles --exclude=/local --exclude=/packages --exclude=/.git"
PORTAGE_TMPDIR="/var/tmp"
SHELL="/bin/bash"
USE="X a52 aac acl acpi activities alsa amd64 bluetooth branding bzip2 cairo cdda cdr cli crypt cups dbus declarative dri dts dvd dvdr encode exif flac fortran gdbm gif gpm gtk gui iconv icu ipv6 jpeg kde kwallet lcms libglvnd libnotify libtirpc mad mng mp3 mp4 mpeg multilib ncurses nls nptl ogg opengl openmp pam pango pcre pdf plasma png policykit ppds pulseaudio qml qt5 readline sdl seccomp semantic-desktop spell split-usr ssl startup-notification svg systemd tiff truetype udev udisks unicode upower usb vorbis widgets wxwidgets x264 xattr xcb xml xv xvid zeroconf zlib" ABI_X86="64" ADA_TARGET="gnat_2020" APACHE2_MODULES="authn_core authz_core socache_shmcb unixd actions alias auth_basic authn_alias authn_anon authn_dbm authn_default authn_file authz_dbm authz_default authz_groupfile authz_host authz_owner authz_user autoindex cache cgi cgid dav dav_fs dav_lock deflate dir disk_cache env expires ext_filter file_cache filter headers include info log_config logio mem_cache mime mime_magic negotiation rewrite setenvif speling status unique_id userdir usertrack vhost_alias" CALLIGRA_FEATURES="karbon sheets words" COLLECTD_PLUGINS="df interface irq load memory rrdtool swap syslog" CPU_FLAGS_X86="mmx mmxext sse sse2 aes avx avx2 f16c fma3 pclmul popcnt rdrand sha sse3 sse4_1 sse4_2 sse4a ssse3" ELIBC="glibc" GPSD_PROTOCOLS="ashtech aivdm earthmate evermore fv18 garmin garmintxt gpsclock greis isync itrax mtk3301 nmea ntrip navcom oceanserver oldstyle oncore rtcm104v2 rtcm104v3 sirf skytraq superstar2 timing tsip tripmate tnt ublox ubx" GRUB_PLATFORMS="efi-64" INPUT_DEVICES="libinput" KERNEL="linux" L10N="en en-US es es-US" LCD_DEVICES="bayrad cfontz cfontz633 glk hd44780 lb216 lcdm001 mtxorb ncurses text" LIBREOFFICE_EXTENSIONS="presenter-console presenter-minimizer" LUA_SINGLE_TARGET="lua5-1" LUA_TARGETS="lua5-1" OFFICE_IMPLEMENTATION="libreoffice" PHP_TARGETS="php7-4 php8-0" POSTGRES_TARGETS="postgres12 postgres13" PYTHON_SINGLE_TARGET="python3_9" PYTHON_TARGETS="python3_9" QEMU_SOFTMMU_TARGETS="aarch64 arm avr i386 m68k mips mips64 mips64el mipsel ppc ppc64 riscv32 riscv64 x86_64" QEMU_USER_TARGETS="aarch64 arm avr i386 m68k mips mips64 mips64el mipsel ppc ppc64 riscv32 riscv64 x86_64" RUBY_TARGETS="ruby26 ruby27 ruby30" USERLAND="GNU" VIDEO_CARDS="nvidia" XTABLES_ADDONS="quota2 psd pknock lscan length2 ipv4options ipset ipp2p iface geoip fuzzy condition tee tarpit sysrq proto steal rawnat logmark ipmark dhcpmac delude chaos account"
Unset:  ADDR2LINE, AR, ARFLAGS, AS, ASFLAGS, CC, CCLD, CONFIG_SHELL, CPP, CPPFLAGS, CTARGET, CXX, CXXFILT, ELFEDIT, EMERGE_DEFAULT_OPTS, EXTRA_ECONF, F77FLAGS, FC, GCOV, GPROF, INSTALL_MASK, LC_ALL, LD, LEX, LFLAGS, LIBTOOL, LINGUAS, MAKE, MAKEFLAGS, NM, OBJCOPY, OBJDUMP, PORTAGE_BINHOST, PORTAGE_BUNZIP2_COMMAND, PORTAGE_COMPRESS, PORTAGE_COMPRESS_FLAGS, PORTAGE_RSYNC_EXTRA_OPTS, RANLIB, READELF, RUSTFLAGS, SIZE, STRINGS, STRIP, YACC, YFLAGS

=================================================================
                        Package Settings
=================================================================

sys-apps/flashrom-9999::gentoo was built with the following:
USE="atavia buspirate-spi ch341a-spi dediprog developerbox-spi digilent-spi drkaiser dummy ft2232-spi gfxnvidia internal internal-dmi it8212 linux-mtd linux-spi nic3com nicintel nicintel-eeprom nicintel-spi nicrealtek ogp-spi pickit2-spi pony-spi raiden-debug-spi rayer-spi satamv satasii serprog stlinkv3-spi usbblaster-spi wiki -atahpt -atapromise -jlink-spi -lspcon-i2c-spi -mstarddc-spi -nicnatsemi -realtek-mst-i2c-spi -test -tools" ABI_X86="(64)"
FEATURES="xattr sfperms ipc-sandbox ebuild-locks merge-sync unmerge-logs fixlafiles network-sandbox unmerge-orphans parallel-fetch usersync binpkg-dostrip pid-sandbox protect-owned usersandbox sandbox strict userfetch preserve-libs binpkg-docompress config-protect-if-modified binpkg-logs userpriv qa-unresolved-soname-deps assume-digests distlocks news multilib-strict unknown-features-warn"
Comment 1 Larry the Git Cow gentoo-dev 2022-03-11 16:40:38 UTC
The bug has been closed via the following commit(s):

https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=f9226e226265bc83bfb9427deec51f1bbbb67192

commit f9226e226265bc83bfb9427deec51f1bbbb67192
Author:     Marek Szuba <marecki@gentoo.org>
AuthorDate: 2022-03-11 16:00:52 +0000
Commit:     Marek Szuba <marecki@gentoo.org>
CommitDate: 2022-03-11 16:40:25 +0000

    sys-apps/flashrom: remove live ebuild
    
    Live ebuilds are only useful if someone is interested in keeping
    them functional. I am not, especially given how large a patch is
    currently required for dependencies of Meson builds to be sane.
    
    Closes: https://bugs.gentoo.org/834021
    Signed-off-by: Marek Szuba <marecki@gentoo.org>

 .../flashrom/files/flashrom-9999_meson-fixes.patch | 281 ---------------------
 sys-apps/flashrom/flashrom-9999.ebuild             | 159 ------------
 sys-apps/flashrom/metadata.xml                     |   5 +-
 3 files changed, 1 insertion(+), 444 deletions(-)