diff options
| author | Alexander Kanavin <alex.kanavin@gmail.com> | 2020-10-30 23:26:13 +0100 |
|---|---|---|
| committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2020-10-31 08:54:13 +0000 |
| commit | 0f34a5b10567333b970ea5c335ee4c98dbe9b9e4 (patch) | |
| tree | 8a92db876b0f0e315f8d3bbbb2fdb2b27aab394d | |
| parent | ebf52f90d824896439aa9a34b07943bbf74363c2 (diff) | |
| download | poky-0f34a5b10567333b970ea5c335ee4c98dbe9b9e4.tar.gz | |
json-glib: fix reproducibility
(From OE-Core rev: fd7e1a40bf29b552b90e3b20863b8c79594bcd85)
Signed-off-by: Alexander Kanavin <alex.kanavin@gmail.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
| -rw-r--r-- | meta/recipes-gnome/json-glib/json-glib/0001-json-glib-json-enum-types.c.in-fix-build-reproducibi.patch | 30 | ||||
| -rw-r--r-- | meta/recipes-gnome/json-glib/json-glib_1.6.0.bb | 3 |
2 files changed, 32 insertions, 1 deletions
diff --git a/meta/recipes-gnome/json-glib/json-glib/0001-json-glib-json-enum-types.c.in-fix-build-reproducibi.patch b/meta/recipes-gnome/json-glib/json-glib/0001-json-glib-json-enum-types.c.in-fix-build-reproducibi.patch new file mode 100644 index 0000000000..e5bfdcd4b7 --- /dev/null +++ b/meta/recipes-gnome/json-glib/json-glib/0001-json-glib-json-enum-types.c.in-fix-build-reproducibi.patch | |||
| @@ -0,0 +1,30 @@ | |||
| 1 | From 0f06c4cb4a57083c08312144b03c8346cf620be6 Mon Sep 17 00:00:00 2001 | ||
| 2 | From: Alexander Kanavin <alex.kanavin@gmail.com> | ||
| 3 | Date: Fri, 30 Oct 2020 22:15:29 +0000 | ||
| 4 | Subject: [PATCH] json-glib/json-enum-types.c.in: fix build reproducibility | ||
| 5 | |||
| 6 | Changes the comment and include to reference the file basename | ||
| 7 | instead of the full path. This ensures that the generated file is | ||
| 8 | reproducible when it is included in source packages meant for debugging. | ||
| 9 | |||
| 10 | Upstream-Status: Pending | ||
| 11 | Signed-off-by: Alexander Kanavin <alex.kanavin@gmail.com> | ||
| 12 | --- | ||
| 13 | json-glib/json-enum-types.c.in | 4 ++-- | ||
| 14 | 1 file changed, 2 insertions(+), 2 deletions(-) | ||
| 15 | |||
| 16 | diff --git a/json-glib/json-enum-types.c.in b/json-glib/json-enum-types.c.in | ||
| 17 | index da07c46..7b39290 100644 | ||
| 18 | --- a/json-glib/json-enum-types.c.in | ||
| 19 | +++ b/json-glib/json-enum-types.c.in | ||
| 20 | @@ -9,8 +9,8 @@ | ||
| 21 | |||
| 22 | /*** BEGIN file-production ***/ | ||
| 23 | |||
| 24 | -/* enumerations from "@filename@" */ | ||
| 25 | -#include "@filename@" | ||
| 26 | +/* enumerations from "@basename@" */ | ||
| 27 | +#include "@basename@" | ||
| 28 | |||
| 29 | /*** END file-production ***/ | ||
| 30 | |||
diff --git a/meta/recipes-gnome/json-glib/json-glib_1.6.0.bb b/meta/recipes-gnome/json-glib/json-glib_1.6.0.bb index 3cb637f220..82f983f3c5 100644 --- a/meta/recipes-gnome/json-glib/json-glib_1.6.0.bb +++ b/meta/recipes-gnome/json-glib/json-glib_1.6.0.bb | |||
| @@ -19,7 +19,8 @@ GTKDOC_MESON_OPTION = "gtk_doc" | |||
| 19 | GTKDOC_MESON_ENABLE_FLAG = 'enabled' | 19 | GTKDOC_MESON_ENABLE_FLAG = 'enabled' |
| 20 | GTKDOC_MESON_DISABLE_FLAG = 'disabled' | 20 | GTKDOC_MESON_DISABLE_FLAG = 'disabled' |
| 21 | 21 | ||
| 22 | SRC_URI += " file://run-ptest" | 22 | SRC_URI += "file://run-ptest \ |
| 23 | file://0001-json-glib-json-enum-types.c.in-fix-build-reproducibi.patch" | ||
| 23 | SRC_URI[archive.sha256sum] = "0d7c67602c4161ea7070fab6c5823afd9bd7f7bc955f652a50d3753b08494e73" | 24 | SRC_URI[archive.sha256sum] = "0d7c67602c4161ea7070fab6c5823afd9bd7f7bc955f652a50d3753b08494e73" |
| 24 | 25 | ||
| 25 | PACKAGECONFIG[manpages] = "-Dman=true,-Dman=false,libxslt-native xmlto-native" | 26 | PACKAGECONFIG[manpages] = "-Dman=true,-Dman=false,libxslt-native xmlto-native" |
