[tracker-oci-images/sam/fedora-eatmydata-fix] fedora: Fix eatmydata script



commit d222aafd59d438f5e21220c7a9bfeea8b5df2595
Author: Sam Thursfield <sam afuera me uk>
Date:   Thu Apr 2 01:17:25 2020 +0200

    fedora: Fix eatmydata script
    
    The /usr/bin/eatmydata script tries to call the `dpkg-architecture`
    command, which doesn't exist on Fedora. Remove that line.
    
    This wasn't directly causing test failures, but it may be leading
    to timeout errors; I'm seeing more on Fedora images than Ubuntu
    now. (eatmydata is working on Ubuntu).
    
    See https://gitlab.gnome.org/GNOME/tracker-miners/pipelines/159401
    for example.

 fedora/prepare.sh | 1 +
 1 file changed, 1 insertion(+)
---
diff --git a/fedora/prepare.sh b/fedora/prepare.sh
index 0062fea..aaa98e6 100644
--- a/fedora/prepare.sh
+++ b/fedora/prepare.sh
@@ -45,5 +45,6 @@ tar -x -f ./libeatmydata-105.tar.gz
 cd libeatmydata-105
 ./configure --prefix=/usr
 make install
+sed -e '/dpkg-architecture/ d' -i /usr/bin/eatmydata
 sed -e 's@shlib="/usr/lib/$DEB_BUILD_MULTIARCH/eatmydata.sh@shlib="/usr/libexec/eatmydata.sh@' -i 
/usr/bin/eatmydata
 cd ..


[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]