]> code.ossystems Code Review - openembedded-core.git/commitdiff
epiphany: Fix distributor contamination from /etc/os-release
authorRichard Purdie <richard.purdie@linuxfoundation.org>
Fri, 26 Feb 2021 10:17:52 +0000 (10:17 +0000)
committerRichard Purdie <richard.purdie@linuxfoundation.org>
Fri, 26 Feb 2021 15:19:28 +0000 (15:19 +0000)
Set our own distro string rather than using the value from
/etc/os-release.

Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
meta/recipes-gnome/epiphany/epiphany_3.38.2.bb
meta/recipes-gnome/epiphany/files/distributor.patch [new file with mode: 0644]

index a9440af35efc87c0b0ce774c2939ad726837f510..71b4a8a162a067dab48acfa7f3403ed3ccd8853f 100644 (file)
@@ -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] = "8b05f2bcc1e80ecf4a10f6f01b3285087eb4cbdf5741dffb8c0355715ef5116d"
 
diff --git a/meta/recipes-gnome/epiphany/files/distributor.patch b/meta/recipes-gnome/epiphany/files/distributor.patch
new file mode 100644 (file)
index 0000000..b09c9b3
--- /dev/null
@@ -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'))