summaryrefslogtreecommitdiffstats
path: root/meta
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-02-26 15:21:21 +0000
commit38f513bfc74a87e0425c0ec7d8f5b3bd20233250 (patch)
tree2b227eec0d6683a0a896b889ee71fa52aee9ca88 /meta
parentb351f54b9ffc115720737e46a7f64a98e1f8c21a (diff)
downloadpoky-38f513bfc74a87e0425c0ec7d8f5b3bd20233250.tar.gz
epiphany: Fix distributor contamination from /etc/os-release
Set our own distro string rather than using the value from /etc/os-release. (From OE-Core rev: 77f23ece471e8855bfd8be06951f21cabce25545) Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta')
-rw-r--r--meta/recipes-gnome/epiphany/epiphany_3.38.2.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.38.2.bb b/meta/recipes-gnome/epiphany/epiphany_3.38.2.bb
index a9440af35e..71b4a8a162 100644
--- a/meta/recipes-gnome/epiphany/epiphany_3.38.2.bb
+++ b/meta/recipes-gnome/epiphany/epiphany_3.38.2.bb
@@ -14,6 +14,7 @@ REQUIRED_DISTRO_FEATURES = "x11 opengl"
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 file://migrator.patch \
17 file://distributor.patch \
17 " 18 "
18SRC_URI[archive.sha256sum] = "8b05f2bcc1e80ecf4a10f6f01b3285087eb4cbdf5741dffb8c0355715ef5116d" 19SRC_URI[archive.sha256sum] = "8b05f2bcc1e80ecf4a10f6f01b3285087eb4cbdf5741dffb8c0355715ef5116d"
19 20
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 @@
1Don't encode the distro from /etc/os-release into the binaries.
2
3Upstream-Status: Pending
4RP 2021/2/26
5
6Index: epiphany-3.38.2/meson.build
7===================================================================
8--- epiphany-3.38.2.orig/meson.build
9+++ epiphany-3.38.2/meson.build
10@@ -15,6 +15,7 @@ if r.returncode() == 0
11 else
12 distributor_name = 'GNOME Web'
13 endif
14+distributor_name = 'OpenEmbedded'
15
16 prefix = get_option('prefix')
17 datadir = join_paths(prefix, get_option('datadir'))