aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRichard Purdie <richard.purdie@linuxfoundation.org>2021-02-26 10:17:52 +0000
committerRichard Purdie <richard.purdie@linuxfoundation.org>2021-03-10 00:24:18 +0000
commit431dae3ff30b162b8a63344f559601e590f64a54 (patch)
treea247c67b382d6ac53505c1f840f69a9c2a5e9ae7
parentf6012c0d39430dc085b25108d727db4896d2064b (diff)
downloadopenembedded-core-contrib-431dae3ff30b162b8a63344f559601e590f64a54.tar.gz
openembedded-core-contrib-431dae3ff30b162b8a63344f559601e590f64a54.tar.bz2
openembedded-core-contrib-431dae3ff30b162b8a63344f559601e590f64a54.zip
epiphany: Fix distributor contamination from /etc/os-release
Set our own distro string rather than using the value from /etc/os-release. Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org> (cherry picked from commit 77f23ece471e8855bfd8be06951f21cabce25545) Signed-off-by: Anuj Mittal <anuj.mittal@intel.com>
-rw-r--r--meta/recipes-gnome/epiphany/epiphany_3.36.4.bb1
-rw-r--r--meta/recipes-gnome/epiphany/files/distributor.patch17
2 files changed, 18 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 dcb337f4cb..0c22a67bde 100644
--- a/meta/recipes-gnome/epiphany/epiphany_3.36.4.bb
+++ b/meta/recipes-gnome/epiphany/epiphany_3.36.4.bb
@@ -14,6 +14,7 @@ REQUIRED_DISTRO_FEATURES = "x11 opengl"
SRC_URI = "${GNOME_MIRROR}/${GNOMEBN}/${@gnome_verdir("${PV}")}/${GNOMEBN}-${PV}.tar.${GNOME_COMPRESS_TYPE};name=archive \
file://0002-help-meson.build-disable-the-use-of-yelp.patch \
file://migrator.patch \
+ file://distributor.patch \
"
SRC_URI[archive.sha256sum] = "588a75b1588f5a509c33cf0be6a38a0f4fc1748eeb499a51d991ddef485242bf"
diff --git a/meta/recipes-gnome/epiphany/files/distributor.patch b/meta/recipes-gnome/epiphany/files/distributor.patch
new file mode 100644
index 0000000000..b09c9b38d2
--- /dev/null
+++ b/meta/recipes-gnome/epiphany/files/distributor.patch
@@ -0,0 +1,17 @@
+Don't encode the distro from /etc/os-release into the binaries.
+
+Upstream-Status: Pending
+RP 2021/2/26
+
+Index: epiphany-3.38.2/meson.build
+===================================================================
+--- epiphany-3.38.2.orig/meson.build
++++ epiphany-3.38.2/meson.build
+@@ -15,6 +15,7 @@ if r.returncode() == 0
+ else
+ distributor_name = 'GNOME Web'
+ endif
++distributor_name = 'OpenEmbedded'
+
+ prefix = get_option('prefix')
+ datadir = join_paths(prefix, get_option('datadir'))