diff mbox series

[meta-oe] hddtemp: Fix reproducibility in fr locale

Message ID 20240524074819.1981879-1-yoann.congal@smile.fr
State Accepted
Headers show
Series [meta-oe] hddtemp: Fix reproducibility in fr locale | expand

Commit Message

Yoann Congal May 24, 2024, 7:48 a.m. UTC 
hddtemp po files lack the Language header and it is derived from
Language-Team header. This process fails for FR and DE locals and an
empty default is used... but reproducibility test has shown that
sometime it succeeds[0].

Fix this non-reproducibility by forcing the Language header to the
correct value.

[0]: https://autobuilder.yoctoproject.org/typhoon/#/builders/155/builds/23/steps/32/logs/stdio
     https://autobuilder.yocto.io/pub/repro-fail-openembedded/meta-oe/oe-reproducible-20240503-9c4hilsr/packages
     (no nice HTML diffoscope output)

Signed-off-by: Yoann Congal <yoann.congal@smile.fr>
Reviewed-by: Alexandre Truong <alexandre.truong@smile.fr>
---
 ...Language-header-for-fr-and-de-locals.patch | 46 +++++++++++++++++++
 .../hddtemp/hddtemp_0.3-beta15.bb             |  1 +
 2 files changed, 47 insertions(+)
 create mode 100644 meta-oe/recipes-support/hddtemp/hddtemp/0001-po-force-Language-header-for-fr-and-de-locals.patch
diff mbox series

Patch

diff --git a/meta-oe/recipes-support/hddtemp/hddtemp/0001-po-force-Language-header-for-fr-and-de-locals.patch b/meta-oe/recipes-support/hddtemp/hddtemp/0001-po-force-Language-header-for-fr-and-de-locals.patch
new file mode 100644
index 0000000000..38f5c88997
--- /dev/null
+++ b/meta-oe/recipes-support/hddtemp/hddtemp/0001-po-force-Language-header-for-fr-and-de-locals.patch
@@ -0,0 +1,46 @@ 
+From 04149f9ec9b37b5bb4c2b6c38d4560b2c122c483 Mon Sep 17 00:00:00 2001
+From: Yoann Congal <yoann.congal@smile.fr>
+Date: Thu, 23 May 2024 23:28:42 +0200
+Subject: [PATCH] po: force Language: header for "fr" and "de" locals
+
+Language: header is "new" and used to be derived from Language-Team
+header. But, for fr.po and de.po, Language can't be derived.
+
+Force "Language" header to avoid having a default Language header.
+
+Upstream-Status: Inactive-Upstream [lastrelease: 26-Apr-2006]
+See: http://download.savannah.nongnu.org/releases/hddtemp/?C=M&O=D
+
+Signed-off-by: Yoann Congal <yoann.congal@smile.fr>
+---
+ po/de.po | 1 +
+ po/fr.po | 1 +
+ 2 files changed, 2 insertions(+)
+
+diff --git a/po/de.po b/po/de.po
+index 3b79e08..d04976b 100644
+--- a/po/de.po
++++ b/po/de.po
+@@ -13,6 +13,7 @@ msgstr ""
+ "PO-Revision-Date: 2011-08-30 16:40+0200\n"
+ "Last-Translator: Vinzenz Vietzke <vinz@v1nz.org>\n"
+ "Language-Team: <debian-l10n-german@lists.debian.org>\n"
++"Language: de\n"
+ "MIME-Version: 1.0\n"
+ "Content-Type: text/plain; charset=UTF-8\n"
+ "Content-Transfer-Encoding: 8bit"
+diff --git a/po/fr.po b/po/fr.po
+index 2fd97c5..0b3bf19 100644
+--- a/po/fr.po
++++ b/po/fr.po
+@@ -12,6 +12,7 @@ msgstr ""
+ "PO-Revision-Date: 2011-08-30 16:38+0200\n"
+ "Last-Translator: Aurelien Jarno <aurelien@aurel32.net>\n"
+ "Language-Team: FRANCAIS <fr@li.org>\n"
++"Language: fr\n"
+ "MIME-Version: 1.0\n"
+ "Content-Type: text/plain; charset=ISO-8859-1\n"
+ "Content-Transfer-Encoding: 8bit\n"
+-- 
+2.39.2
+
diff --git a/meta-oe/recipes-support/hddtemp/hddtemp_0.3-beta15.bb b/meta-oe/recipes-support/hddtemp/hddtemp_0.3-beta15.bb
index b204ea4dd6..9f0d8aabcf 100644
--- a/meta-oe/recipes-support/hddtemp/hddtemp_0.3-beta15.bb
+++ b/meta-oe/recipes-support/hddtemp/hddtemp_0.3-beta15.bb
@@ -10,6 +10,7 @@  SRC_URI = "${SAVANNAH_NONGNU_MIRROR}/hddtemp/hddtemp-0.3-beta15.tar.bz2 \
            file://0001-backtrace-Replace-struct-ucontext-with-ucontext_t.patch \
            file://0001-configure.ac-Rename-to-configure.ac-and-use-external.patch \
            file://0001-sata.c-Declare-ata_get_powermode-prototype.patch \
+           file://0001-po-force-Language-header-for-fr-and-de-locals.patch \
            file://hddtemp.db \
            file://init \
 "