diff mbox series

[meta-gnome] tracker-miners: drop buildpath from tracker-miner-fs-3

Message ID 20240322174540.1624-1-f_l_k@t-online.de
State Accepted
Headers show
Series [meta-gnome] tracker-miners: drop buildpath from tracker-miner-fs-3 | expand

Commit Message

Markus Volk March 22, 2024, 5:45 p.m. UTC 
Remove the buildpath from /usr/libexec/tracker-miner-fs-3 without breaking the binary

Signed-off-by: Markus Volk <f_l_k@t-online.de>
---
 .../0001-fix-reproducibility.patch               | 16 ++++++++++++++++
 .../tracker/tracker-miners_3.7.0.bb              |  5 -----
 2 files changed, 16 insertions(+), 5 deletions(-)
diff mbox series

Patch

diff --git a/meta-gnome/recipes-gnome/tracker/tracker-miners/0001-fix-reproducibility.patch b/meta-gnome/recipes-gnome/tracker/tracker-miners/0001-fix-reproducibility.patch
index c6b07dc6c..68ff95e79 100644
--- a/meta-gnome/recipes-gnome/tracker/tracker-miners/0001-fix-reproducibility.patch
+++ b/meta-gnome/recipes-gnome/tracker/tracker-miners/0001-fix-reproducibility.patch
@@ -76,6 +76,22 @@  index e131b85ad..59e509fa6 100644
  
  libtracker_miner_test_deps = [tracker_miners_common_dep, tracker_miner_dep, tracker_sparql]
  
+ 
+diff --git a/src/miners/fs/meson.build b/src/miners/fs/meson.build
+index 6e5883288..04750f82b 100644
+--- a/src/miners/fs/meson.build
++++ b/src/miners/fs/meson.build
+@@ -67,8 +67,8 @@ executable('tracker-miner-fs-@0@'.format(tracker_api_major),
+     dependencies: tracker_miner_fs_deps,
+     c_args: [
+         tracker_c_args,
+-        '-DBUILDROOT="@0@"'.format(meson.global_build_root()),
+-        '-DBUILD_EXTRACTDIR="@0@"'.format(meson.build_root() / 'src' / 'tracker-extract'),
++        '-DBUILDROOT="@0@"'.format(get_option('prefix') / 'src'),
++        '-DBUILD_EXTRACTDIR="@0@"'.format(get_option('prefix') / 'src' / 'tracker-extract'),
+         '-DLIBEXECDIR="@0@"'.format(get_option('prefix') / get_option('libexecdir')),
+     ],
+     install: true,
 -- 
 2.41.0
 
diff --git a/meta-gnome/recipes-gnome/tracker/tracker-miners_3.7.0.bb b/meta-gnome/recipes-gnome/tracker/tracker-miners_3.7.0.bb
index dfebd0d2e..333bb6267 100644
--- a/meta-gnome/recipes-gnome/tracker/tracker-miners_3.7.0.bb
+++ b/meta-gnome/recipes-gnome/tracker/tracker-miners_3.7.0.bb
@@ -76,14 +76,9 @@  EXTRA_OEMESON += " \
     -Dsystemd_user_services_dir=${systemd_user_unitdir} \
 "
 
-do_install:append() {
-    sed -i -e 's|${B}||g' ${D}${libexecdir}/tracker-miner-fs-3
-}
 
 FILES:${PN} += " \
     ${datadir} \
     ${libdir}/tracker-miners-3.0 \
     ${systemd_user_unitdir} \
 "
-
-INSANE_SKIP:${PN} = "already-stripped"