diff options
Diffstat (limited to 'recipes-core/swupd-client')
14 files changed, 0 insertions, 1068 deletions
diff --git a/recipes-core/swupd-client/swupd-client-2.87/0001-Add-configure-option-to-re-enable-updating-of-config.patch b/recipes-core/swupd-client/swupd-client-2.87/0001-Add-configure-option-to-re-enable-updating-of-config.patch deleted file mode 100644 index ac16d06..0000000 --- a/recipes-core/swupd-client/swupd-client-2.87/0001-Add-configure-option-to-re-enable-updating-of-config.patch +++ /dev/null @@ -1,58 +0,0 @@ -From 1f2ad4cdff6b999fcd00193cdd1dc8a35e49c0b2 Mon Sep 17 00:00:00 2001 -From: Joshua Lock <joshua.g.lock@intel.com> -Date: Thu, 3 Mar 2016 19:55:41 +0000 -Subject: [PATCH] Add configure option to re-enable updating of config files - -Signed-off-by: Joshua Lock <joshua.g.lock@intel.com> - -Upstream-Status: Pending - ---- - configure.ac | 7 +++++++ - src/heuristics.c | 5 +++-- - 2 files changed, 10 insertions(+), 2 deletions(-) - -diff --git a/configure.ac b/configure.ac -index f94a17d..0063463 100644 ---- a/configure.ac -+++ b/configure.ac -@@ -78,6 +78,13 @@ AC_ARG_ENABLE( - enable_linux_rootfs_build="no" - ) - -+AC_ARG_ENABLE( -+ [stateless], -+ AS_HELP_STRING([--disable-stateless],[OS is not stateless, do not ignore configuration files (stateless by default)]), -+ AC_DEFINE(OS_IS_STATELESS,0,[OS is not stateless]), -+ AC_DEFINE(OS_IS_STATELESS,1,[OS is stateless]) -+) -+ - AS_IF([test "$enable_linux_btrfs_build" = "yes" -a "$enable_android_build" = "yes"], - [AC_MSG_ERROR([Cannot enable more than one build variant. Choose a single variant.])]) - -diff --git a/src/heuristics.c b/src/heuristics.c -index 12fb59c..92dbcdc 100644 ---- a/src/heuristics.c -+++ b/src/heuristics.c -@@ -27,6 +27,7 @@ - #include <string.h> - #include <assert.h> - -+#include <config.h> - #include <swupd.h> - - /* trailing slash is to indicate dir itself is expected to exist, but -@@ -113,8 +114,8 @@ void apply_heuristics(struct file *file) - - bool ignore(struct file *file) - { -- if ((file->is_config) || -- is_config(file->filename) || // ideally we trust the manifest but short term reapply check here -+ if ((OS_IS_STATELESS && file->is_config) || -+ (OS_IS_STATELESS && is_config(file->filename)) || // ideally we trust the manifest but short term reapply check here - (file->is_state) || - is_state(file->filename) || // ideally we trust the manifest but short term reapply check here - (file->is_boot && fix && file->is_deleted) || // shouldn't happen --- -2.5.0 - diff --git a/recipes-core/swupd-client/swupd-client-2.87/0001-Tolerate-quotes-in-os-release-files.patch b/recipes-core/swupd-client/swupd-client-2.87/0001-Tolerate-quotes-in-os-release-files.patch deleted file mode 100644 index 2e9bd5b..0000000 --- a/recipes-core/swupd-client/swupd-client-2.87/0001-Tolerate-quotes-in-os-release-files.patch +++ /dev/null @@ -1,57 +0,0 @@ -From 0ac7226645db1c7048863755a296e1e5f7d8319c Mon Sep 17 00:00:00 2001 -From: Dmitry Rozhkov <dmitry.rozhkov@intel.com> -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 -to the format defined in systemd. - -This patch removes quotes from the values before trying to -transform them into integer version id. - -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 d8ad76b..1708a98 100644 ---- a/src/version.c -+++ b/src/version.c -@@ -95,6 +95,7 @@ int read_version_from_subvol_file(char *path_prefix) - FILE *file; - int v = -1; - char *buildstamp; -+ char *src, *dest; - - string_or_die(&buildstamp, "%s/usr/lib/os-release", path_prefix); - file = fopen(buildstamp, "rm"); -@@ -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) { -+ src = &line[11]; -+ -+ /* Drop quotes and newline in value */ -+ dest = src; -+ while (*src) { -+ if (*src == '\'' || *src == '"' || *src == '\n') { -+ ++src; -+ } else { -+ *dest = *src; -+ ++dest; -+ ++src; -+ } -+ } -+ *dest = 0; -+ - v = strtoull(&line[11], NULL, 10); - break; - } --- -2.5.0 diff --git a/recipes-core/swupd-client/swupd-client-2.87/0001-globals.c-Use-fake-address-as-default-updates-url.patch b/recipes-core/swupd-client/swupd-client-2.87/0001-globals.c-Use-fake-address-as-default-updates-url.patch deleted file mode 100644 index 491a115..0000000 --- a/recipes-core/swupd-client/swupd-client-2.87/0001-globals.c-Use-fake-address-as-default-updates-url.patch +++ /dev/null @@ -1,37 +0,0 @@ -From e7af0013dd550c72641ea841f1177d6b0af99dce Mon Sep 17 00:00:00 2001 -From: Dmitry Rozhkov <dmitry.rozhkov@linux.intel.com> -Date: Fri, 15 Apr 2016 10:02:45 +0300 -Subject: [PATCH] globals.c: Use fake address as default updates' url - -If a user forgets to provide its swupd server URL then -ClearLinux's default is used unconditionally which may -reult in a corrupted system. - -Upstream-Status: Inappropriate [latest code doesn't use hardcoded defaults] - -Signed-off-by: Dmitry Rozhkov <dmitry.rozhkov@linux.intel.com> ---- - src/globals.c | 4 ++-- - 1 file changed, 2 insertions(+), 2 deletions(-) - -diff --git a/src/globals.c b/src/globals.c -index 8ca3fd9..0e78f34 100644 ---- a/src/globals.c -+++ b/src/globals.c -@@ -62,11 +62,11 @@ bool have_network = false; /* assume no access until proved */ - #define URL_COUNT 2 - char *version_server_urls[URL_COUNT] = { - NULL, -- "https://download.clearlinux.org/update", -+ "https://example.com/update", - }; - char *content_server_urls[URL_COUNT] = { - NULL, -- "https://download.clearlinux.org/update", -+ "https://example.com/update", - }; - char *preferred_version_url; - char *preferred_content_url; --- -2.5.0 - diff --git a/recipes-core/swupd-client/swupd-client-2.87/0001-log.c-avoid-segfault-and-show-staging-file-name.patch b/recipes-core/swupd-client/swupd-client-2.87/0001-log.c-avoid-segfault-and-show-staging-file-name.patch deleted file mode 100644 index 424a3bd..0000000 --- a/recipes-core/swupd-client/swupd-client-2.87/0001-log.c-avoid-segfault-and-show-staging-file-name.patch +++ /dev/null @@ -1,38 +0,0 @@ -From 03ea6060f2992fffe242d0af769b7550a014c28f Mon Sep 17 00:00:00 2001 -From: Patrick Ohly <patrick.ohly@intel.com> -Date: Thu, 14 Apr 2016 11:01:10 +0200 -Subject: [PATCH 1/2] log.c: avoid segfault and show staging file name - -When downloading files, "file->filename" is not set, only -"file->staging" is. Now the code checks both, starting with -"file->filename", and proceeds if both are unset, instead of -segfaulting as before. - -Upstream-Status: Submitted [https://github.com/clearlinux/swupd-client/issues/37] - -Signed-off-by: Patrick Ohly <patrick.ohly@intel.com> ---- - src/log.c | 7 +++++-- - 1 file changed, 5 insertions(+), 2 deletions(-) - -diff --git a/src/log.c b/src/log.c -index 5e5b030..0549f29 100644 ---- a/src/log.c -+++ b/src/log.c -@@ -413,8 +413,11 @@ static char *format_log_message(int log_type, enum log_priority priority, struct - filebuf2[0] = 0; - strncpy(filebuf, filename, PATH_MAXLEN - 1); - if (file) { -- strncpy(filebuf2, file->filename, PATH_MAXLEN - 1); -- filebuf2[PATH_MAXLEN - 1] = 0; -+ const char *filename = file->filename ? file->filename : file->staging; -+ if (filename) { -+ strncpy(filebuf2, filename, PATH_MAXLEN - 1); -+ filebuf2[PATH_MAXLEN - 1] = 0; -+ } - } - while (strlen(filebuf) < 29) - strcat(filebuf, " "); --- -2.1.4 - diff --git a/recipes-core/swupd-client/swupd-client-2.87/0001-manifest.c-Always-initialize-preserver-pointer-of-fi.patch b/recipes-core/swupd-client/swupd-client-2.87/0001-manifest.c-Always-initialize-preserver-pointer-of-fi.patch deleted file mode 100644 index 95a94e9..0000000 --- a/recipes-core/swupd-client/swupd-client-2.87/0001-manifest.c-Always-initialize-preserver-pointer-of-fi.patch +++ /dev/null @@ -1,33 +0,0 @@ -From ad26f092f1b2102bf6e298a2a6dd8115f4e88d99 Mon Sep 17 00:00:00 2001 -From: Dmitry Rozhkov <dmitry.rozhkov@linux.intel.com> -Date: Fri, 15 Apr 2016 18:36:57 +0300 -Subject: [PATCH] manifest.c: Always initialize preserver pointer of file list - -In case a bundle has nothing in common with any other installed -bundle (no files duplicated in different bundles) the preserver -pointer inside deduplicate_files_from_manifest() isn't -initialized which leads to NULL as output of the function. -As result no files of the deleted bundle get deleted at all. - -Upstream-Status: Backport [v3.0.0+] - -Signed-off-by: Dmitry Rozhkov <dmitry.rozhkov@linux.intel.com> ---- - src/manifest.c | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/src/manifest.c b/src/manifest.c -index 7c356d7..10b7daa 100644 ---- a/src/manifest.c -+++ b/src/manifest.c -@@ -1326,7 +1326,7 @@ void deduplicate_files_from_manifest(struct manifest **m1, struct manifest *m2) - int count = 0; - - bmanifest = *m1; -- iter1 = list_head(bmanifest->files); -+ iter1 = preserver = list_head(bmanifest->files); - iter2 = list_head(m2->files); - - while (iter1 && iter2) { --- -2.5.0 diff --git a/recipes-core/swupd-client/swupd-client-2.87/0001-staging.c-Protect-tar-command-against-special-charac.patch b/recipes-core/swupd-client/swupd-client-2.87/0001-staging.c-Protect-tar-command-against-special-charac.patch deleted file mode 100644 index 4b69b2f..0000000 --- a/recipes-core/swupd-client/swupd-client-2.87/0001-staging.c-Protect-tar-command-against-special-charac.patch +++ /dev/null @@ -1,58 +0,0 @@ -From a0136d4c34c1710ae6b38667674f4db6f6eedb9c Mon Sep 17 00:00:00 2001 -From: Dmitry Rozhkov <dmitry.rozhkov@linux.intel.com> -Date: Mon, 18 Apr 2016 11:59:58 +0300 -Subject: [PATCH] staging.c: Protect tar command against special characters - -It may happen that a bundle contains a directory named '#' and -other files under this directory, thus not only target files -need to be escaped in tar commands, but also target directories -where the files get installed. - -Also a target file may have a name with '@' as its first symbol. -Since the symbol has a special meaning in case of bsdtar the -name needs to escaped in tar commands with the prefix './'. - -Upstream-Status: Backport [v3.5.2+] - -Signed-off-by: Dmitry Rozhkov <dmitry.rozhkov@linux.intel.com> ---- - src/staging.c | 10 +++++----- - 1 file changed, 5 insertions(+), 5 deletions(-) - -diff --git a/src/staging.c b/src/staging.c -index 742e8a2..6f7eafb 100644 ---- a/src/staging.c -+++ b/src/staging.c -@@ -402,8 +402,8 @@ int do_staging(struct file *file) - ret = -errno; - goto out; - } -- string_or_die(&tarcommand, TAR_COMMAND " -C %s " TAR_PERM_ATTR_ARGS " -cf - %s 2> /dev/null | " -- TAR_COMMAND " -C %s%s " TAR_PERM_ATTR_ARGS " -xf - 2> /dev/null", -+ string_or_die(&tarcommand, TAR_COMMAND " -C '%s' " TAR_PERM_ATTR_ARGS " -cf - './%s' 2> /dev/null | " -+ TAR_COMMAND " -C '%s%s' " TAR_PERM_ATTR_ARGS " -xf - 2> /dev/null", - rename_tmpdir, base, path_prefix, rel_dir); - LOG_DEBUG(file, "directory overwrite", class_osvol_staging, "%s", tarcommand); - ret = system(tarcommand); -@@ -440,8 +440,8 @@ int do_staging(struct file *file) - ret = -errno; - goto out; - } -- string_or_die(&tarcommand, TAR_COMMAND " -C %s/staged " TAR_PERM_ATTR_ARGS " -cf - .update.%s 2> /dev/null | " -- TAR_COMMAND " -C %s%s " TAR_PERM_ATTR_ARGS " -xf - 2> /dev/null", -+ string_or_die(&tarcommand, TAR_COMMAND " -C '%s/staged' " TAR_PERM_ATTR_ARGS " -cf - '.update.%s' 2> /dev/null | " -+ TAR_COMMAND " -C '%s%s' " TAR_PERM_ATTR_ARGS " -xf - 2> /dev/null", - STATE_DIR, base, path_prefix, rel_dir); - LOG_DEBUG(file, "dotfile install", class_osvol_staging, "%s", tarcommand); - ret = system(tarcommand); -@@ -485,7 +485,7 @@ int do_staging(struct file *file) - /* For initial simplicity replace the file. Ideally this would be - * an intelligent btrfs reflink to maximize block level reuse. */ - //TODO: prove btrfs reflink ioctl works in general, then try using them here -- string_or_die(&tarcommand, TAR_COMMAND " -C %s/staged " TAR_PERM_ATTR_ARGS " -cf - %s 2> /dev/null | " -+ string_or_die(&tarcommand, TAR_COMMAND " -C '%s/staged' " TAR_PERM_ATTR_ARGS " -cf - './%s' 2> /dev/null | " - TAR_COMMAND " -C %s/%s " TAR_PERM_ATTR_ARGS " -xf - --transform=\"s/%s/%s/\" 2> /dev/null", - STATE_DIR, file->hash, STAGING_SUBVOL, rel_dir, file->hash, base); - ret = system(tarcommand); --- -2.5.0 diff --git a/recipes-core/swupd-client/swupd-client-2.87/0002-downloads-minimize-syscalls-to-improve-performance.patch b/recipes-core/swupd-client/swupd-client-2.87/0002-downloads-minimize-syscalls-to-improve-performance.patch deleted file mode 100644 index 0953fcd..0000000 --- a/recipes-core/swupd-client/swupd-client-2.87/0002-downloads-minimize-syscalls-to-improve-performance.patch +++ /dev/null @@ -1,191 +0,0 @@ -From 96d18d373436fda5c643abd8621d932002b2a007 Mon Sep 17 00:00:00 2001 -From: Patrick Ohly <patrick.ohly@intel.com> -Date: Thu, 14 Apr 2016 11:03:31 +0200 -Subject: [PATCH 2/2] downloads: minimize syscalls to improve performance - -The previous approach was to open/fdopen/fclose the file for each -chunk that gets passed from curl. This incurrs a huge performance hit -when close() triggers a hashing of the file content on systems where -integrity protection via IMA is enabled. - -Now the file is opened only once and kept open until the download is -complete. In addition, the unnecessary usage of C file IO is avoided. - -The semantic is changed as little as possible: -- file gets created only after the first chunk of data arrived -- file descriptors do not leak to child processes (O_CLOEXEC) -- data gets appended to existing files (via O_APPEND, used - to keep the code simple and avoid an additional lseek) -- data gets flushed explicitly for each chunk (via fdatasync(), - which somewhat approximates the effect that an explicit - close() may have had) - -As an additional improvement, failures during close() are checked when -downloading single files. However, perform_curl_io_and_complete() -still ignores the error. - -Upstream-Status: Submitted [https://github.com/clearlinux/swupd-client/issues/41] - -Signed-off-by: Patrick Ohly <patrick.ohly@intel.com> ---- - include/swupd.h | 3 +++ - src/curl.c | 69 ++++++++++++++++++++++++++++++++++++--------------------- - src/download.c | 7 ++++++ - 3 files changed, 54 insertions(+), 25 deletions(-) - -diff --git a/include/swupd.h b/include/swupd.h -index 554e795..fbaa5ae 100644 ---- a/include/swupd.h -+++ b/include/swupd.h -@@ -82,6 +82,7 @@ struct file { - int last_change; - struct update_stat stat; - -+ unsigned int fd_valid : 1; - unsigned int is_dir : 1; - unsigned int is_file : 1; - unsigned int is_link : 1; -@@ -101,6 +102,7 @@ struct file { - - char *staging; /* output name used during download & staging */ - CURL *curl; /* curl handle if downloading */ -+ int fd; /* file written into during downloading, unset when fd_valid is false */ - }; - - extern bool download_only; -@@ -183,6 +185,7 @@ extern void swupd_curl_cleanup(void); - extern void swupd_curl_set_current_version(int v); - extern void swupd_curl_set_requested_version(int v); - extern size_t swupd_download_file(void *ptr, size_t size, size_t nmemb, void *userdata); -+extern CURLcode swupd_download_file_complete(CURLcode curl_ret, struct file *file); - extern int swupd_curl_get_file(const char *url, char *filename, struct file *file, - char *tmp_version, bool pack); - #define SWUPD_CURL_LOW_SPEED_LIMIT 1 -diff --git a/src/curl.c b/src/curl.c -index c989426..c4e1398 100644 ---- a/src/curl.c -+++ b/src/curl.c -@@ -122,37 +122,54 @@ size_t swupd_download_file(void *ptr, size_t size, size_t nmemb, void *userdata) - const char *outfile; - int fd; - FILE *f; -- size_t written; -+ size_t written, remaining; - - outfile = file->staging; -+ if (file->fd_valid) { -+ fd = file->fd; -+ } else { -+ fd = open(outfile, O_CREAT | O_RDWR | O_CLOEXEC | O_APPEND, 00600); -+ if (fd < 0) { -+ LOG_ERROR(file, "Cannot open file for write", class_file_io, -+ "\\*outfile=\"%s\",strerror=\"%s\"*\\", outfile, strerror(errno)); -+ return -1; -+ } -+ file->fd = fd; -+ file->fd_valid = 1; -+ } -+ -+ /* handle short writes with repeated write() calls */ -+ for (remaining = size*nmemb; remaining; remaining -= written) { -+ written = write(fd, ptr, size*nmemb); -+ if (written < 0) { -+ LOG_ERROR(file, "write error", class_file_io, -+ "\\*outfile=\"%s\",strerror=\"%s\"*\\", outfile, strerror(errno)); -+ return -1; -+ } -+ } - -- fd = open(outfile, O_CREAT | O_RDWR , 00600); -- if (fd < 0) { -- LOG_ERROR(file, "Cannot open file for write", class_file_io, -- "\\*outfile=\"%s\",strerror=\"%s\"*\\", outfile, strerror(errno)); -+ if (fdatasync(fd)) { -+ LOG_ERROR(file, "fdatasync", class_file_io, -+ "\\*outfile=\"%s\",strerror=\"%s\"*\\", outfile, strerror(errno)); - return -1; -- } -+ } - -- f = fdopen(fd, "a"); -- if (!f) { -- LOG_ERROR(file, "Cannot fdopen file for write", class_file_io, -- "\\*outfile=\"%s\",strerror=\"%s\"*\\", outfile, strerror(errno)); -- close(fd); -- return -1; -- } -- -- written = fwrite(ptr, size*nmemb, 1, f); -- -- fflush(f); -- fclose(f); -+ return size*nmemb; -+} - -- if (written != 1) { -- LOG_ERROR(file, "short write", class_file_io, -- "\\*outfile=\"%s\",strerror=\"%s\"*\\", outfile, strerror(errno)); -- return -1; -+CURLcode swupd_download_file_complete(CURLcode curl_ret, struct file *file) -+{ -+ if (file->fd_valid) { -+ if (close(file->fd)) { -+ LOG_ERROR(file, "Cannot close file after write", class_file_io, -+ "\\*outfile=\"%s\",strerror=\"%s\"*\\", file->staging, strerror(errno)); -+ if (curl_ret == CURLE_OK) { -+ curl_ret = CURLE_WRITE_ERROR; -+ } -+ } -+ file->fd_valid = 0; - } -- -- return size*nmemb; -+ return curl_ret; - } - - /* Download a single file SYNCHRONOUSLY -@@ -193,7 +210,6 @@ int swupd_curl_get_file(const char *url, char *filename, struct file *file, - } - } - local->staging = filename; -- - if (lstat(filename, &stat) == 0) { - if (pack) { - curl_ret = curl_easy_setopt(curl, CURLOPT_RESUME_FROM_LARGE, (curl_off_t) stat.st_size); -@@ -263,6 +279,9 @@ int swupd_curl_get_file(const char *url, char *filename, struct file *file, - } - - exit: -+ if (local) { -+ curl_ret = swupd_download_file_complete(curl_ret, local); -+ } - if (curl_ret == CURLE_OK) { - /* curl command succeeded, download might've failed, let our caller LOG_ */ - switch (ret) { -diff --git a/src/download.c b/src/download.c -index 211ee24..2f88fb1 100644 ---- a/src/download.c -+++ b/src/download.c -@@ -165,6 +165,7 @@ static void free_curl_list_data(void *data) - struct file *file = (struct file*)data; - CURL *curl = file->curl; - -+ swupd_download_file_complete(CURLE_OK, file); - curl_multi_remove_handle(mcurl, curl); - curl_easy_cleanup(curl); - } -@@ -379,6 +380,12 @@ static int perform_curl_io_and_complete(int *left) - continue; - } - -+ curl_ret = swupd_download_file_complete(curl_ret, file); -+ /* -+ * Any error as logged already. Let's continue and -+ * hope for the best... or abort via "return -1"? -+ */ -+ - if (ret == 200) { - untar_full_download(file); - } else { --- -2.1.4 diff --git a/recipes-core/swupd-client/swupd-client-2.87/0005-swupd-client-Add-existence-check-to-staging-target.patch b/recipes-core/swupd-client/swupd-client-2.87/0005-swupd-client-Add-existence-check-to-staging-target.patch deleted file mode 100644 index 9779044..0000000 --- a/recipes-core/swupd-client/swupd-client-2.87/0005-swupd-client-Add-existence-check-to-staging-target.patch +++ /dev/null @@ -1,95 +0,0 @@ -From 1f37511e52754f7231c52489ba4f7d8f7de1e2af Mon Sep 17 00:00:00 2001 -From: "Brad T. Peters" <brad.t.peters@intel.com> -Date: Thu, 7 Jan 2016 14:37:17 -0800 -Subject: [PATCH] swupd-client: Add existence check to staging target - -Patch adds an stat() check to ensure that: -1. target path for a staged file exists, and -2. target path is indeed a directory - -Follow-on patch will add correct corrective behavior once -verify_fix_path() is implemented - -Upstream-Status: Backport [v3.0.0+] - -Signed-off-by: Brad T. Peters <brad.t.peters@intel.com> ---- - src/staging.c | 39 ++++++++++++++++++++++++++++++++------- - 1 file changed, 32 insertions(+), 7 deletions(-) - -diff --git a/src/staging.c b/src/staging.c -index 3a847e2..b8545c1 100644 ---- a/src/staging.c -+++ b/src/staging.c -@@ -277,9 +277,11 @@ int do_staging(struct file *file) - #if SWUPD_LINUX_ROOTFS - char *original = NULL; - char *target = NULL; -+ char *targetpath = NULL; -+ char *symbase = NULL; - #endif - int ret; -- struct stat stat; -+ struct stat s; - - tmp = strdup(file->filename); - tmp2 = strdup(file->filename); -@@ -294,6 +296,29 @@ int do_staging(struct file *file) - string_or_die(&original, "%s/staged/%s", STATE_DIR, file->hash); - - #if SWUPD_LINUX_ROOTFS -+ string_or_die(&targetpath, "%s%s", path_prefix, rel_dir); -+ ret = stat(targetpath, &s); -+ -+ if (S_ISLNK(s.st_mode)) { -+ /* Follow symlink to ultimate target and redo stat */ -+ symbase = realpath(targetpath, NULL); -+ if (symbase != NULL) { -+ free(targetpath); -+ targetpath = strdup(symbase); -+ ret = stat(targetpath, &s); -+ free(symbase); -+ } -+ } -+ -+ /* For now, just report on error conditions. Once we implement -+ * verify_fix_path(char *path, int targetversion), we'll want to call it here */ -+ if ((ret == -1) && (errno == ENOENT)) { -+ printf("Error: Update target directory does not exist: %s\n", targetpath); -+ } else if (!S_ISDIR(s.st_mode)) { -+ printf("Error: Update target exists but is NOT a directory: %s\n", targetpath); -+ } -+ -+ free(targetpath); - string_or_die(&target, "%s%s/.update.%s", path_prefix, rel_dir, base); - ret = swupd_rm(target); - if (ret == 0) -@@ -306,12 +331,12 @@ int do_staging(struct file *file) - string_or_die(&statfile, "%s/%s/%s", STAGING_SUBVOL, rel_dir, base); - #endif - -- memset(&stat, 0, sizeof(struct stat)); -- ret = lstat(statfile, &stat); -+ memset(&s, 0, sizeof(struct stat)); -+ ret = lstat(statfile, &s); - if (ret == 0) { -- if ((file->is_dir && !S_ISDIR(stat.st_mode)) || -- (file->is_link && !S_ISLNK(stat.st_mode)) || -- (file->is_file && !S_ISREG(stat.st_mode))) { -+ if ((file->is_dir && !S_ISDIR(s.st_mode)) || -+ (file->is_link && !S_ISLNK(s.st_mode)) || -+ (file->is_file && !S_ISREG(s.st_mode))) { - LOG_INFO(file, "Type changed!", class_osvol_staging, "%s", statfile); - //file type changed, move old out of the way for new - ret = swupd_rm(statfile); -@@ -325,7 +350,7 @@ int do_staging(struct file *file) - free(statfile); - - #if SWUPD_LINUX_ROOTFS -- if (file->is_dir || S_ISDIR(stat.st_mode)) { -+ if (file->is_dir || S_ISDIR(s.st_mode)) { - /* In the btrfs only scenario there is an implicit - * "create_or_update_dir()" via un-tar-ing a directory.tar after - * download and the untar happens in the staging subvolume which --- -2.5.0 diff --git a/recipes-core/swupd-client/swupd-client-2.87/0006-Backport-Use-rename-instead-of-tar-transform.patch b/recipes-core/swupd-client/swupd-client-2.87/0006-Backport-Use-rename-instead-of-tar-transform.patch deleted file mode 100644 index be4d908..0000000 --- a/recipes-core/swupd-client/swupd-client-2.87/0006-Backport-Use-rename-instead-of-tar-transform.patch +++ /dev/null @@ -1,156 +0,0 @@ -From e9ad32a273efe2d177c1bbd394ae944ae598fd50 Mon Sep 17 00:00:00 2001 -From: Dmitry Rozhkov <dmitry.rozhkov@intel.com> -Date: Mon, 8 Feb 2016 18:12:48 +0200 -Subject: [PATCH] Backport: Use rename instead of tar transform - -This patch is a backport from swupd-client v2.88 -Author: William Douglas <william.douglas@intel.com> -Subject: Use rename instead of tar transform - -In order to prevent issues with transform name escaping, update logic -for moving an object from staging. First rename the object in the -staging path to its final name (in case of a directory the rename places -it in a seperate directory first to avoid hash colisions), then use tar -to update or create the object in the filesystem. Once finished rename -the object back to the hash name so it can be reused as needed. - -This also fixes up some issues with the SWUPD_LINUX_ROOTFS checks not -always encapsulating variable use within the do_staging function. - -Note: the SWUPD_LINUX_ROOTFS checks have been removed entirely, since -they are not used anywhere in the code at present. - -Upstream-Status: Backported [v2.88+] - -Signed-off-by: Dmitry Rozhkov <dmitry.rozhkov@linux.intel.com> ---- - src/staging.c | 73 ++++++++++++++++++++++++++++++++++++++++++++++++++++++----- - 1 file changed, 67 insertions(+), 6 deletions(-) - -diff --git a/src/staging.c b/src/staging.c -index b8545c1..16dafbb 100644 ---- a/src/staging.c -+++ b/src/staging.c -@@ -36,6 +36,31 @@ - #include "swupd-build-variant.h" - #include <swupd.h> - -+/* clean then recreate temporary folder for tar renames */ -+static int create_staging_renamedir(char *rename_tmpdir) -+{ -+ int ret; -+ char *rmcommand = NULL; -+ -+ string_or_die(&rmcommand, "rm -fr %s", rename_tmpdir); -+ if (!system(rmcommand)) { -+ /* Not fatal but pretty scary, likely to really fail at the -+ * next command too. Pass for now as printing may just cause -+ * confusion */ -+ ; -+ } -+ free(rmcommand); -+ -+ ret = mkdir(rename_tmpdir, S_IRWXU); -+ if (ret == -1 && errno != EEXIST) { -+ ret = -errno; -+ } else { -+ ret = 0; -+ } -+ -+ return ret; -+} -+ - #ifdef SWUPD_WITH_BTRFS - static int create_staging_subvol_from(const char *version) - { -@@ -269,6 +294,9 @@ int prepare(bool UNUSED_PARAM *is_corrupted, int UNUSED_PARAM current_version, i - #endif - - /* Do the staging of new files into the filesystem */ -+#warning do_staging is currently not able to be run in parallel -+/* Consider adding a remove_leftovers() that runs in verify/fix in order to -+ * allow this function to mkdtemp create folders for parallel build */ - int do_staging(struct file *file) - { - char *statfile = NULL, *tmp = NULL, *tmp2 = NULL; -@@ -280,6 +308,8 @@ int do_staging(struct file *file) - char *targetpath = NULL; - char *symbase = NULL; - #endif -+ char *rename_target = NULL; -+ char *rename_tmpdir = NULL; - int ret; - struct stat s; - -@@ -360,12 +390,28 @@ int do_staging(struct file *file) - * attributes and it includes internal logic that does the - * right thing to overlay a directory onto something - * pre-existing: */ -- string_or_die(&tarcommand, "tar -C %s/staged " TAR_PERM_ATTR_ARGS " -cf - %s 2> /dev/null | " -- "tar -C %s%s " TAR_PERM_ATTR_ARGS " -xf - --transform=\"s/%s/%s/\" 2> /dev/null", -- STATE_DIR, file->hash, path_prefix, rel_dir, file->hash, base); -+ /* In order to avoid tar transforms with directories, rename -+ * the directory before and after the tar command */ -+ string_or_die(&rename_tmpdir, "%s/tmprenamedir", STATE_DIR); -+ ret = create_staging_renamedir(rename_tmpdir); -+ if (ret) { -+ goto out; -+ } -+ string_or_die(&rename_target, "%s/%s", rename_tmpdir, base); -+ if (rename(original, rename_target)) { -+ ret = -errno; -+ goto out; -+ } -+ string_or_die(&tarcommand, "tar -C %s " TAR_PERM_ATTR_ARGS " -cf - %s 2> /dev/null | " -+ "tar -C %s%s " TAR_PERM_ATTR_ARGS " -xf - 2> /dev/null", -+ rename_tmpdir, base, path_prefix, rel_dir); - LOG_DEBUG(file, "directory overwrite", class_osvol_staging, "%s", tarcommand); - ret = system(tarcommand); - free(tarcommand); -+ if (rename(rename_target, original)) { -+ ret = -errno; -+ goto out; -+ } - if (ret < 0) { - LOG_ERROR(file, "Failed directory overwrite", class_osvol_staging, "%s", strerror(errno)); - ret = -EDIR_OVERWRITE; -@@ -386,12 +432,25 @@ int do_staging(struct file *file) - } - if (ret < 0) { - /* either the hardlink failed, or it was undesirable (config), do a tar-tar dance */ -- string_or_die(&tarcommand, "tar -C %s/staged " TAR_PERM_ATTR_ARGS " -cf - %s 2> /dev/null | " -- "tar -C %s%s " TAR_PERM_ATTR_ARGS " -xf - --transform=\"s/%s/.update.%s/\" 2> /dev/null", -- STATE_DIR, file->hash, path_prefix, rel_dir, file->hash, base); -+ /* In order to avoid tar transforms, rename the file -+ * before and after the tar command */ -+ string_or_die(&rename_target, "%s/staged/.update.%s", STATE_DIR, base); -+ ret = rename(original, rename_target); -+ if (ret) { -+ ret = -errno; -+ goto out; -+ } -+ string_or_die(&tarcommand, "tar -C %s/staged " TAR_PERM_ATTR_ARGS " -cf - .update.%s 2> /dev/null | " -+ "tar -C %s%s " TAR_PERM_ATTR_ARGS " -xf - 2> /dev/null", -+ STATE_DIR, base, path_prefix, rel_dir); - LOG_DEBUG(file, "dotfile install", class_osvol_staging, "%s", tarcommand); - ret = system(tarcommand); - free(tarcommand); -+ ret = rename(rename_target, original); -+ if (ret) { -+ ret = -errno; -+ goto out; -+ } - } - if (ret < 0) { - LOG_ERROR(file, "Failed tar dotfile install", class_osvol_staging, -@@ -436,6 +495,8 @@ int do_staging(struct file *file) - out: - free(target); - free(original); -+ free(rename_target); -+ free(rename_tmpdir); - free(tmp); - free(tmp2); - --- -2.5.0 diff --git a/recipes-core/swupd-client/swupd-client-2.87/0007-Add-compatibility-with-libarchive-s-bsdtar-command.patch b/recipes-core/swupd-client/swupd-client-2.87/0007-Add-compatibility-with-libarchive-s-bsdtar-command.patch deleted file mode 100644 index 5154a0e..0000000 --- a/recipes-core/swupd-client/swupd-client-2.87/0007-Add-compatibility-with-libarchive-s-bsdtar-command.patch +++ /dev/null @@ -1,182 +0,0 @@ -From 29e2fefaf67bfd6db77db87d22782a31c7284982 Mon Sep 17 00:00:00 2001 -From: Dmitry Rozhkov <dmitry.rozhkov@intel.com> -Date: Mon, 8 Feb 2016 16:42:23 +0200 -Subject: [PATCH] Add compatibility with libarchive's bsdtar command - -Since GNU tar fails to extract files with xattrs preserved when -Integrity Measurement Architecture (IMA) is enabled some vendors -may choose to install libarchive-based tar (bsdtar) on their embedded -devices, so the swupd server needs to be able to create archives -in its format. - -This patch adds one compile-time options --enable-bsdtar that is used -to enable/disable GNU tar specific options. - -Upstream-Status: Backport [3.1.0+] - -Signed-off-by: Dmitry Rozhkov <dmitry.rozhkov@linux.intel.com> ---- - configure.ac | 9 +++++++++ - include/swupd-build-variant.h | 12 ++++++++++-- - src/download.c | 4 ++-- - src/esp.c | 4 ++-- - src/manifest.c | 3 ++- - src/packs.c | 2 +- - src/staging.c | 12 ++++++------ - 7 files changed, 32 insertions(+), 14 deletions(-) - -diff --git a/configure.ac b/configure.ac -index b11ef0a..930f64c 100644 ---- a/configure.ac -+++ b/configure.ac -@@ -29,6 +29,15 @@ AS_IF([test "x$enable_bzip2" = "xyes" ], - [AC_DEFINE(SWUPD_WITHOUT_BZIP2,1,[Do not use bzip2 compression])] - ) - -+AC_ARG_ENABLE( -+ [bsdtar], -+ AS_HELP_STRING([--enable-bsdtar], [Use alternative bsdtar command (uses tar by default)]) -+) -+AS_IF([test "x$enable_bsdtar" = "xyes" ], -+ [AC_DEFINE(SWUPD_WITH_BSDTAR, 1, [Use bsdtar])], -+ [AC_DEFINE(SWUPD_WITHOUT_BSDTAR, 1, [Use default tar])] -+) -+ - AC_ARG_WITH([systemdsystemunitdir], AS_HELP_STRING([--with-systemdsystemunitdir=DIR], - [path to systemd system service dir @<:@default=/usr/lib/systemd/system@:>@]), [unitpath=${withval}], - [unitpath="$($PKG_CONFIG --variable=systemdsystemunitdir systemd)"]) -diff --git a/include/swupd-build-variant.h b/include/swupd-build-variant.h -index f2103a2..0c15dca 100644 ---- a/include/swupd-build-variant.h -+++ b/include/swupd-build-variant.h -@@ -13,10 +13,18 @@ - #define VERIFY_FAILED_MAX_VERSIONS_COUNT 20 - #endif - -+#ifdef SWUPD_WITH_BSDTAR -+#define TAR_COMMAND "bsdtar" -+#define TAR_XATTR_ARGS "" -+#else -+#define TAR_COMMAND "tar" -+#define TAR_XATTR_ARGS "--xattrs --xattrs-include='*'" -+#endif -+ - #ifdef SWUPD_WITH_SELINUX --#define TAR_PERM_ATTR_ARGS "--preserve-permissions --xattrs --xattrs-include='*' --selinux" -+#define TAR_PERM_ATTR_ARGS "--preserve-permissions --selinux " TAR_XATTR_ARGS - #else /* SWUPD_WITHOUT_SELINUX */ --#define TAR_PERM_ATTR_ARGS "--preserve-permissions --xattrs --xattrs-include='*'" -+#define TAR_PERM_ATTR_ARGS "--preserve-permissions " TAR_XATTR_ARGS - #endif - - #ifdef SWUPD_WITH_REPAIR -diff --git a/src/download.c b/src/download.c -index cb6d1a2..211ee24 100644 ---- a/src/download.c -+++ b/src/download.c -@@ -194,7 +194,7 @@ static int check_tarfile_content(struct file *file, const char *tarfilename) - int count = 0; - - /* we're using -a because the server side has a choice between different compression methods */ -- string_or_die(&tarcommand, "tar -tf %s/download/%s.tar 2> /dev/null", STATE_DIR, file->hash); -+ string_or_die(&tarcommand, TAR_COMMAND " -tf %s/download/%s.tar 2> /dev/null", STATE_DIR, file->hash); - - err = access(tarfilename, R_OK); - if (err) { -@@ -300,7 +300,7 @@ static void untar_full_download(void *data) - } - - /* modern tar will automatically determine the compression type used */ -- string_or_die(&tarcommand, "tar -C %s/staged/ " TAR_PERM_ATTR_ARGS " -xf %s 2> /dev/null", -+ string_or_die(&tarcommand, TAR_COMMAND " -C %s/staged/ " TAR_PERM_ATTR_ARGS " -xf %s 2> /dev/null", - STATE_DIR, tarfile); - - LOG_DEBUG(file, "Doing tar operation", class_file_compression, "%s", tarcommand); -diff --git a/src/esp.c b/src/esp.c -index e2b2ae9..3483f55 100644 ---- a/src/esp.c -+++ b/src/esp.c -@@ -231,8 +231,8 @@ int copy_files_to_esp(int target_version) - - progress_step(PROGRESS_MSG_UPDATE_ESP); - -- string_or_die(&tarcommand, "tar -C %s/%d/system/vendor/intel/ -cf - esp 2> /dev/null | " -- "tar -C %s/ -xf - --no-same-permissions --no-same-owner --transform=\"s/esp//\" 2> /dev/null", -+ string_or_die(&tarcommand, TAR_COMMAND " -C %s/%d/system/vendor/intel/ -cf - esp 2> /dev/null | " -+ TAR_COMMAND " -C %s/ -xf - --no-same-permissions --no-same-owner --transform=\"s/esp//\" 2> /dev/null", - MOUNT_POINT, target_version, ESP_MOUNT); - - ret = system(tarcommand); -diff --git a/src/manifest.c b/src/manifest.c -index 5757e9f..7c356d7 100644 ---- a/src/manifest.c -+++ b/src/manifest.c -@@ -34,6 +34,7 @@ - #include <fcntl.h> - - #include "config.h" -+#include "swupd-build-variant.h" - #include <swupd.h> - #include <xattrs.h> - #include "progress.h" -@@ -519,7 +520,7 @@ static int retrieve_manifests(int current, int version, char *component, struct - goto out; - } - -- string_or_die(&tar, "tar -C %s/%i -xf %s/%i/Manifest.%s.tar 2> /dev/null", -+ string_or_die(&tar, TAR_COMMAND " -C %s/%i -xf %s/%i/Manifest.%s.tar 2> /dev/null", - STATE_DIR, version, STATE_DIR, version, component); - - LOG_DEBUG(NULL, "tar", class_file_compression, "running %s", tar); -diff --git a/src/packs.c b/src/packs.c -index b176b74..91a83c5 100644 ---- a/src/packs.c -+++ b/src/packs.c -@@ -83,7 +83,7 @@ static int download_pack(int oldversion, int newversion, char *module) - free(url); - - progress_step(PROGRESS_MSG_EXTRACTING_PACK); -- string_or_die(&tar, "tar -C %s " TAR_PERM_ATTR_ARGS " -xf %s/pack-%s-from-%i-to-%i.tar 2> /dev/null", -+ string_or_die(&tar, TAR_COMMAND " -C %s " TAR_PERM_ATTR_ARGS " -xf %s/pack-%s-from-%i-to-%i.tar 2> /dev/null", - STATE_DIR, STATE_DIR, module, oldversion, newversion); - - LOG_INFO(NULL, "Untar of delta pack", class_file_compression, "%s", tar); -diff --git a/src/staging.c b/src/staging.c -index 16dafbb..742e8a2 100644 ---- a/src/staging.c -+++ b/src/staging.c -@@ -402,8 +402,8 @@ int do_staging(struct file *file) - ret = -errno; - goto out; - } -- string_or_die(&tarcommand, "tar -C %s " TAR_PERM_ATTR_ARGS " -cf - %s 2> /dev/null | " -- "tar -C %s%s " TAR_PERM_ATTR_ARGS " -xf - 2> /dev/null", -+ string_or_die(&tarcommand, TAR_COMMAND " -C %s " TAR_PERM_ATTR_ARGS " -cf - %s 2> /dev/null | " -+ TAR_COMMAND " -C %s%s " TAR_PERM_ATTR_ARGS " -xf - 2> /dev/null", - rename_tmpdir, base, path_prefix, rel_dir); - LOG_DEBUG(file, "directory overwrite", class_osvol_staging, "%s", tarcommand); - ret = system(tarcommand); -@@ -440,8 +440,8 @@ int do_staging(struct file *file) - ret = -errno; - goto out; - } -- string_or_die(&tarcommand, "tar -C %s/staged " TAR_PERM_ATTR_ARGS " -cf - .update.%s 2> /dev/null | " -- "tar -C %s%s " TAR_PERM_ATTR_ARGS " -xf - 2> /dev/null", -+ string_or_die(&tarcommand, TAR_COMMAND " -C %s/staged " TAR_PERM_ATTR_ARGS " -cf - .update.%s 2> /dev/null | " -+ TAR_COMMAND " -C %s%s " TAR_PERM_ATTR_ARGS " -xf - 2> /dev/null", - STATE_DIR, base, path_prefix, rel_dir); - LOG_DEBUG(file, "dotfile install", class_osvol_staging, "%s", tarcommand); - ret = system(tarcommand); -@@ -485,8 +485,8 @@ int do_staging(struct file *file) - /* For initial simplicity replace the file. Ideally this would be - * an intelligent btrfs reflink to maximize block level reuse. */ - //TODO: prove btrfs reflink ioctl works in general, then try using them here -- string_or_die(&tarcommand, "tar -C %s/staged " TAR_PERM_ATTR_ARGS " -cf - %s 2> /dev/null | " -- "tar -C %s/%s " TAR_PERM_ATTR_ARGS " -xf - --transform=\"s/%s/%s/\" 2> /dev/null", -+ string_or_die(&tarcommand, TAR_COMMAND " -C %s/staged " TAR_PERM_ATTR_ARGS " -cf - %s 2> /dev/null | " -+ TAR_COMMAND " -C %s/%s " TAR_PERM_ATTR_ARGS " -xf - --transform=\"s/%s/%s/\" 2> /dev/null", - STATE_DIR, file->hash, STAGING_SUBVOL, rel_dir, file->hash, base); - ret = system(tarcommand); - free(tarcommand); --- -2.5.0 diff --git a/recipes-core/swupd-client/swupd-client-2.87/Change-systemctl-path-to-OE-systemctl-path.patch b/recipes-core/swupd-client/swupd-client-2.87/Change-systemctl-path-to-OE-systemctl-path.patch deleted file mode 100644 index 5ca6373..0000000 --- a/recipes-core/swupd-client/swupd-client-2.87/Change-systemctl-path-to-OE-systemctl-path.patch +++ /dev/null @@ -1,31 +0,0 @@ -From 259d86e64146c3156eccfcce0351a9cdc4714766 Mon Sep 17 00:00:00 2001 -From: Jaska Uimonen <jaska.uimonen@intel.com> -Date: Thu, 14 Jan 2016 10:17:43 +0200 -Subject: [PATCH] change systemctl path to OE systemctl path - -Upstream-Status: Inappropriate - ---- - src/scripts.c | 4 ++-- - 1 file changed, 2 insertions(+), 2 deletions(-) - -diff --git a/src/scripts.c b/src/scripts.c -index e426272..9bec0f5 100644 ---- a/src/scripts.c -+++ b/src/scripts.c -@@ -84,10 +84,10 @@ static void update_triggers(void) - int ret; - LOG_INFO(NULL, "calling systemd trigger", class_scripts, ""); - -- ret = system("/usr/bin/systemctl daemon-reload"); -+ ret = system("/bin/systemctl daemon-reload"); - if (ret != 0) - LOG_ERROR(NULL, "systemd daemon reload failed", class_scripts, "%d", ret); -- ret = system("/usr/bin/systemctl restart update-triggers.target"); -+ ret = system("/bin/systemctl restart update-triggers.target"); - if (ret != 0) - LOG_ERROR(NULL, "systemd update triggers failed", class_scripts, "%d", ret); - } --- -2.5.0 - diff --git a/recipes-core/swupd-client/swupd-client-2.87/Fix-build-failure-on-Yocto.patch b/recipes-core/swupd-client/swupd-client-2.87/Fix-build-failure-on-Yocto.patch deleted file mode 100644 index e7dada8..0000000 --- a/recipes-core/swupd-client/swupd-client-2.87/Fix-build-failure-on-Yocto.patch +++ /dev/null @@ -1,35 +0,0 @@ -From ccce73a2d703e6789ded87ca5aa9f3b7c506892a Mon Sep 17 00:00:00 2001 -From: Amarnath Valluri <amarnath.valluri@intel.com> -Date: Thu, 7 Jan 2016 16:19:34 +0200 -Subject: [PATCH] Fix build failure on Yocto - -On install phase certificate files are being installed twice as included in -_DATA twice. We can use EXTRA_DIST than dist_. - -Upstream-Status: Backport [v3.0.0+] - -Signed-off-by: Amarnath Valluri <amarnath.valluri@intel.com> ---- - Makefile.am | 4 ++-- - 1 file changed, 2 insertions(+), 2 deletions(-) - -diff --git a/Makefile.am b/Makefile.am -index 1e65d3d..4d15c55 100644 ---- a/Makefile.am -+++ b/Makefile.am -@@ -111,11 +111,11 @@ SWUPD_CERTS = certs/157753a5.0 \ - certs/d6325660.0 \ - certs/d6325660.1 - swupdcerts_DATA = $(SWUPD_CERTS) --dist_swupdcerts_DATA = $(SWUPD_CERTS) - - EXTRA_DIST += \ - data/check-update.service \ -- data/check-update.timer -+ data/check-update.timer \ -+ $(SWUPD_CERTS) - - DISTCHECK_CONFIGURE_FLAGS = \ - --with-systemdsystemunitdir=$$dc_install_base/$(systemdunitdir) --- -2.1.4 diff --git a/recipes-core/swupd-client/swupd-client-2.87/Right-usage-of-AC_ARG_ENABLE-on-bzip2.patch b/recipes-core/swupd-client/swupd-client-2.87/Right-usage-of-AC_ARG_ENABLE-on-bzip2.patch deleted file mode 100644 index 4e12369..0000000 --- a/recipes-core/swupd-client/swupd-client-2.87/Right-usage-of-AC_ARG_ENABLE-on-bzip2.patch +++ /dev/null @@ -1,37 +0,0 @@ -From d80ae9954c5e5b720766274249dbf5309b7c70a9 Mon Sep 17 00:00:00 2001 -From: Amarnath Valluri <amarnath.valluri@intel.com> -Date: Wed, 13 Jan 2016 15:46:19 +0200 -Subject: [PATCH] Right usage of AC_ARG_ENABLE on bzip2 - -Upstream-Status: Pending - -Signed-off-by: Amarnath Valluri <amarnath.valluri@intel.com> ---- - configure.ac | 12 +++++++----- - 1 file changed, 7 insertions(+), 5 deletions(-) - -diff --git a/configure.ac b/configure.ac -index f94a17d..b11ef0a 100644 ---- a/configure.ac -+++ b/configure.ac -@@ -20,11 +20,13 @@ AC_CONFIG_HEADERS([config.h]) - PKG_CHECK_MODULES([lzma], [liblzma]) - PKG_CHECK_MODULES([zlib], [zlib]) - AC_ARG_ENABLE( -- bzip2, -- AS_HELP_STRING([--disable-bzip2],[Do not use bzip2 compression (uses bzip2 by default)]), -- AC_DEFINE(SWUPD_WITHOUT_BZIP2,1,[Do not use bzip2 compression]) , -- AC_DEFINE(SWUPD_WITH_BZIP2,1,[Use bzip2 compression]) -- AC_CHECK_LIB([bz2], [BZ2_bzBuffToBuffCompress], [], [AC_MSG_ERROR([the libbz2 library is missing])]) -+ [bzip2], -+ AS_HELP_STRING([--disable-bzip2],[Do not use bzip2 compression (uses bzip2 by default)]) -+) -+AS_IF([test "x$enable_bzip2" = "xyes" ], -+ [AC_DEFINE(SWUPD_WITH_BZIP2,1,[Use bzip2 compression]) -+ AC_CHECK_LIB([bz2], [BZ2_bzBuffToBuffCompress], [], [AC_MSG_ERROR([the libbz2 library is missing])])], -+ [AC_DEFINE(SWUPD_WITHOUT_BZIP2,1,[Do not use bzip2 compression])] - ) - - AC_ARG_WITH([systemdsystemunitdir], AS_HELP_STRING([--with-systemdsystemunitdir=DIR], --- -2.1.4 diff --git a/recipes-core/swupd-client/swupd-client_2.87.bb b/recipes-core/swupd-client/swupd-client_2.87.bb deleted file mode 100644 index 96e7a10..0000000 --- a/recipes-core/swupd-client/swupd-client_2.87.bb +++ /dev/null @@ -1,60 +0,0 @@ -SUMMARY = "swupd sofware update from Clear Linux - client component" -LICENSE = "GPL-2.0" -LIC_FILES_CHKSUM = "file://COPYING;md5=04d0b48662817042d80393e7511fa41b \ - file://bsdiff/LICENSE;md5=0dbe7a50f028269750631fcbded3846a" - -SRC_URI = "\ - https://download.clearlinux.org/releases/5700/clear/source/SRPMS/${BPN}-${PV}-105.src.rpm;extract=${BP}.tar.gz \ - file://Fix-build-failure-on-Yocto.patch \ - file://Right-usage-of-AC_ARG_ENABLE-on-bzip2.patch \ - file://Change-systemctl-path-to-OE-systemctl-path.patch \ - file://0001-Tolerate-quotes-in-os-release-files.patch \ - file://0005-swupd-client-Add-existence-check-to-staging-target.patch \ - file://0006-Backport-Use-rename-instead-of-tar-transform.patch \ - file://0007-Add-compatibility-with-libarchive-s-bsdtar-command.patch \ - file://0001-log.c-avoid-segfault-and-show-staging-file-name.patch \ - file://0002-downloads-minimize-syscalls-to-improve-performance.patch \ - file://0001-globals.c-Use-fake-address-as-default-updates-url.patch \ - file://0001-manifest.c-Always-initialize-preserver-pointer-of-fi.patch \ - file://0001-Add-configure-option-to-re-enable-updating-of-config.patch \ - file://0001-staging.c-Protect-tar-command-against-special-charac.patch \ -" - -SRC_URI[md5sum] = "5d272c62edb8a9c576005ac5e1182ea3" -SRC_URI[sha256sum] = "45df259a7dc2fed985ee9961e112120fc46670dd75476c3262fc6804b1c66fb8" - -DEPENDS = "glib-2.0 curl openssl libarchive" -RDEPENDS_${PN}_append_class-target = " oe-swupd-helpers bsdtar" -# We check /etc/os-release for the current OS version number -RRECOMMENDS_${PN}_class-target = "os-release" - -inherit pkgconfig autotools-brokensep systemd - -EXTRA_OECONF = "--with-systemdsystemunitdir=${systemd_system_unitdir} --enable-bsdtar" - -PACKAGECONFIG ??= "stateless" -PACKAGECONFIG[stateless] = ",--disable-stateless" - -#TODO: create and install /var/lib/swupd/{delta,staged/download} -do_install_append () { - # swupd-client 2.87 doesn't (succesfully) create these and fails to update - # should they not exist. This is due to a bash-specific shell command - # called to create the directories 'mkdir -p /var/lib/{delta,staged,download}' - install -d ${D}/var/lib/swupd/delta - install -d ${D}/var/lib/swupd/download - install -d ${D}/var/lib/swupd/staged - - # TODO: This should be a less os-specific directory and not hard-code datadir - install -d ${D}/usr/share/clear/bundles -} - -FILES_${PN} += "\ - /usr/share/clear \ - ${systemd_system_unitdir}/multi-user.target.wants* \ - /var/lib/swupd \ -" - -SYSTEMD_SERVICE_${PN} = "check-update.timer check-update.service" -SYSTEMD_AUTO_ENABLE_${PN} = "disable" - -BBCLASSEXTEND = "native" |