aboutsummaryrefslogtreecommitdiffstats
path: root/recipes-core
diff options
context:
space:
mode:
authorDmitry Rozhkov <dmitry.rozhkov@linux.intel.com>2016-03-30 16:29:20 +0300
committerJoshua Lock <joshua.g.lock@intel.com>2016-03-30 21:36:58 +0100
commitd9d026e8a8729503bbbaeca7783349086fa0300c (patch)
treef98e6868a4beb96ed19113c4ffdbbce01749dff9 /recipes-core
parenta38d4bbb0e9137cd6d34a5f39d553b1d94ad3465 (diff)
downloadmeta-swupd-d9d026e8a8729503bbbaeca7783349086fa0300c.tar.gz
meta-swupd-d9d026e8a8729503bbbaeca7783349086fa0300c.tar.bz2
meta-swupd-d9d026e8a8729503bbbaeca7783349086fa0300c.zip
swupd-client: Update patch fixing quotes in os-release
Update 0001-Tolerate-quotes-in-os-release-files.patch to the final version that got accepted upstream. Signed-off-by: Dmitry Rozhkov <dmitry.rozhkov@linux.intel.com>
Diffstat (limited to 'recipes-core')
-rw-r--r--recipes-core/swupd-client/swupd-client/0001-Tolerate-quotes-in-os-release-files.patch17
1 files changed, 8 insertions, 9 deletions
diff --git a/recipes-core/swupd-client/swupd-client/0001-Tolerate-quotes-in-os-release-files.patch b/recipes-core/swupd-client/swupd-client/0001-Tolerate-quotes-in-os-release-files.patch
index 49c71ae..c5faae8 100644
--- a/recipes-core/swupd-client/swupd-client/0001-Tolerate-quotes-in-os-release-files.patch
+++ b/recipes-core/swupd-client/swupd-client/0001-Tolerate-quotes-in-os-release-files.patch
@@ -1,7 +1,7 @@
-From 586e7b927461f6604ee3a3159cd7a6d4ac22ef30 Mon Sep 17 00:00:00 2001
+From 0ac7226645db1c7048863755a296e1e5f7d8319c Mon Sep 17 00:00:00 2001
From: Dmitry Rozhkov <dmitry.rozhkov@intel.com>
-Date: Thu, 11 Feb 2016 13:29:57 +0200
-Subject: [PATCH 1/2] Tolerate quotes in os-release files
+Date: Thu, 11 Feb 2016 12:49:30 +0200
+Subject: [PATCH] Tolerate quotes in os-release files
Some systems like Yocto or OpenSUSE prefer to wrap values in
/etc/os-release file with quotes always and that still conforms
@@ -10,19 +10,18 @@ to the format defined in systemd.
This patch removes quotes from the values before trying to
transform them into integer version id.
-Signed-off-by: Dmitry Rozhkov <dmitry.rozhkov@intel.com>
-
Upstream-Status: Backport (v3.0.0+)
+Signed-off-by: Dmitry Rozhkov <dmitry.rozhkov@intel.com>
---
src/version.c | 18 +++++++++++++++++-
1 file changed, 17 insertions(+), 1 deletion(-)
diff --git a/src/version.c b/src/version.c
-index 0e09cd9..83d6ad4 100644
+index d8ad76b..1708a98 100644
--- a/src/version.c
+++ b/src/version.c
-@@ -88,6 +88,7 @@ int read_version_from_subvol_file(char *path_prefix)
+@@ -95,6 +95,7 @@ int read_version_from_subvol_file(char *path_prefix)
FILE *file;
int v = -1;
char *buildstamp;
@@ -30,9 +29,9 @@ index 0e09cd9..83d6ad4 100644
string_or_die(&buildstamp, "%s/usr/lib/os-release", path_prefix);
file = fopen(buildstamp, "rm");
-@@ -106,7 +107,22 @@ int read_version_from_subvol_file(char *path_prefix)
+@@ -116,7 +117,22 @@ int read_version_from_subvol_file(char *path_prefix)
+ if (fgets(line, LINE_MAX, file) == NULL)
break;
- }
- if (strncmp(line,"VERSION_ID=", 11) == 0) {
+ if (strncmp(line, "VERSION_ID=", 11) == 0) {