summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRichard Purdie <richard.purdie@linuxfoundation.org>2021-02-25 14:52:32 +0000
committerRichard Purdie <richard.purdie@linuxfoundation.org>2021-03-10 00:24:26 +0000
commit30d921b46a7a8656f2472329ae87e064835e65a5 (patch)
tree18952651a6a927a6aff953df8cb81a10acacd7b1
parentfce639f1ebee5a15694a40049a10b860d6d7da34 (diff)
downloadpoky-30d921b46a7a8656f2472329ae87e064835e65a5.tar.gz
epiphany: Fix reproducibility issue
We don't want to encide BUILD_ROOT into target packages. This is used for build time tests but in our case those would be on target anyway do use the target paths. (From OE-Core rev: f6012c0d39430dc085b25108d727db4896d2064b) Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org> (cherry picked from commit 2818dc90bd62487879e7da2c68357b39282415b0) Signed-off-by: Anuj Mittal <anuj.mittal@intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
-rw-r--r--meta/recipes-gnome/epiphany/epiphany_3.36.4.bb1
-rw-r--r--meta/recipes-gnome/epiphany/files/migrator.patch24
2 files changed, 25 insertions, 0 deletions
diff --git a/meta/recipes-gnome/epiphany/epiphany_3.36.4.bb b/meta/recipes-gnome/epiphany/epiphany_3.36.4.bb
index 4c3b18331a..dcb337f4cb 100644
--- a/meta/recipes-gnome/epiphany/epiphany_3.36.4.bb
+++ b/meta/recipes-gnome/epiphany/epiphany_3.36.4.bb
@@ -13,6 +13,7 @@ REQUIRED_DISTRO_FEATURES = "x11 opengl"
13 13
14SRC_URI = "${GNOME_MIRROR}/${GNOMEBN}/${@gnome_verdir("${PV}")}/${GNOMEBN}-${PV}.tar.${GNOME_COMPRESS_TYPE};name=archive \ 14SRC_URI = "${GNOME_MIRROR}/${GNOMEBN}/${@gnome_verdir("${PV}")}/${GNOMEBN}-${PV}.tar.${GNOME_COMPRESS_TYPE};name=archive \
15 file://0002-help-meson.build-disable-the-use-of-yelp.patch \ 15 file://0002-help-meson.build-disable-the-use-of-yelp.patch \
16 file://migrator.patch \
16 " 17 "
17SRC_URI[archive.sha256sum] = "588a75b1588f5a509c33cf0be6a38a0f4fc1748eeb499a51d991ddef485242bf" 18SRC_URI[archive.sha256sum] = "588a75b1588f5a509c33cf0be6a38a0f4fc1748eeb499a51d991ddef485242bf"
18 19
diff --git a/meta/recipes-gnome/epiphany/files/migrator.patch b/meta/recipes-gnome/epiphany/files/migrator.patch
new file mode 100644
index 0000000000..a9a650a64a
--- /dev/null
+++ b/meta/recipes-gnome/epiphany/files/migrator.patch
@@ -0,0 +1,24 @@
1We don't want to encide BUILD_ROOT into target packages. This is used
2for build time tests but in our case those would be on target anyway
3do use the target paths.
4
5Upstream-Status: Pending
6RP 2021/2/25
7
8Index: epiphany-3.38.2/lib/ephy-profile-utils.c
9===================================================================
10--- epiphany-3.38.2.orig/lib/ephy-profile-utils.c
11+++ epiphany-3.38.2/lib/ephy-profile-utils.c
12@@ -130,10 +130,10 @@ ephy_profile_utils_do_migration (const c
13 argv[i++] = NULL;
14
15 #if DEVELOPER_MODE
16- argv[0] = BUILD_ROOT "/src/" EPHY_PROFILE_MIGRATOR;
17+ argv[0] = PKGLIBEXECDIR "/" EPHY_PROFILE_MIGRATOR;
18 #else
19 if (debug)
20- argv[0] = BUILD_ROOT "/src/" EPHY_PROFILE_MIGRATOR;
21+ argv[0] = PKGLIBEXECDIR "/" EPHY_PROFILE_MIGRATOR;
22 #endif
23
24 g_spawn_sync (NULL, (char **)argv, envp, G_SPAWN_SEARCH_PATH,