diff options
author | Richard Purdie <richard.purdie@linuxfoundation.org> | 2021-02-26 10:17:52 +0000 |
---|---|---|
committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2021-03-10 00:24:27 +0000 |
commit | e4f5e6a39b59f15ab601ac5b22e7e9dadec5c412 (patch) | |
tree | 7536915defa173309464308145993c23a356cfd6 /meta | |
parent | 30d921b46a7a8656f2472329ae87e064835e65a5 (diff) | |
download | poky-e4f5e6a39b59f15ab601ac5b22e7e9dadec5c412.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: 431dae3ff30b162b8a63344f559601e590f64a54)
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
(cherry picked from commit 77f23ece471e8855bfd8be06951f21cabce25545)
Signed-off-by: Anuj Mittal <anuj.mittal@intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta')
-rw-r--r-- | meta/recipes-gnome/epiphany/epiphany_3.36.4.bb | 1 | ||||
-rw-r--r-- | meta/recipes-gnome/epiphany/files/distributor.patch | 17 |
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" | |||
14 | SRC_URI = "${GNOME_MIRROR}/${GNOMEBN}/${@gnome_verdir("${PV}")}/${GNOMEBN}-${PV}.tar.${GNOME_COMPRESS_TYPE};name=archive \ | 14 | SRC_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 | " |
18 | SRC_URI[archive.sha256sum] = "588a75b1588f5a509c33cf0be6a38a0f4fc1748eeb499a51d991ddef485242bf" | 19 | SRC_URI[archive.sha256sum] = "588a75b1588f5a509c33cf0be6a38a0f4fc1748eeb499a51d991ddef485242bf" |
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 @@ | |||
1 | Don't encode the distro from /etc/os-release into the binaries. | ||
2 | |||
3 | Upstream-Status: Pending | ||
4 | RP 2021/2/26 | ||
5 | |||
6 | Index: 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')) | ||