Integrate swupd software updater

Include some patches to remove hard-coded state directory and backport some fixes.

Signed-off-by Joshua Lock <[email protected]>

---
 ...S-to-take-the-state-data-dir-as-an-argume.patch | 782 +++++++++++++++++++++
 ...argv-helper-for-safer-calls-to-system-uti.patch | 133 ++++
 ...re-option-to-re-enable-config-files-in-ma.patch |  66 ++
 ...ression-that-introduced-a-directory-named.patch |  29 +
 meta/recipes-devtools/swupd/swupd-server_2.53.bb   |  33 +
 5 files changed, 1043 insertions(+)
 create mode 100644 meta/recipes-devtools/swupd/swupd-server/0001-Add-option-S-to-take-the-state-data-dir-as-an-argume.patch
 create mode 100644 meta/recipes-devtools/swupd/swupd-server/0001-Add-system_argv-helper-for-safer-calls-to-system-uti.patch
 create mode 100644 meta/recipes-devtools/swupd/swupd-server/0002-Add-configure-option-to-re-enable-config-files-in-ma.patch
 create mode 100644 meta/recipes-devtools/swupd/swupd-server/0002-Fix-regression-that-introduced-a-directory-named.patch
 create mode 100644 meta/recipes-devtools/swupd/swupd-server_2.53.bb

meta/recipes-devtools/swupd/swupd-server/0001-Add-option-S-to-take-the-state-data-dir-as-an-argume.patch new file +782 -0

new file mode 100644
index 0000000..b771e0a
@@ -0,0 +1,782 @@
+From 83fbb8a78594cf9047e37ed0aa1e931b9d691f2a Mon Sep 17 00:00:00 2001
+From: Joshua Lock <[email protected]>
+Date: Thu, 28 Jan 2016 10:24:56 +0000
+Subject: [PATCH 1/2] Add option -S to take the state data dir as an argument
+
+The optional -S option expects a full path to a directory
+swupd-server should use instead of the default /var/lib/update.
+
+Signed-off-by: Joshua Lock <[email protected]>
+
+Upstream-Status: Accepted (v3.0+)
+
+---
+ include/swupd.h      | 11 ++++++---
+ src/analyze_fs.c     |  4 ++--
+ src/chroot.c         | 13 ++++++-----
+ src/globals.c        | 53 +++++++++++++++++++++++++++++++++++++++++
+ src/main.c           | 50 ++++++++++++++++++++++++++++++---------
+ src/make_fullfiles.c | 63 +++++++++++++++++++++++++++++++++++++++++++++----
+ src/make_packs.c     | 66 ++++++++++++++++++++++++++++++++++++++++++++--------
+ src/pack.c           | 65 +++++++++++++++++++++++++++------------------------
+ src/rename.c         |  6 ++---
+ src/versions.c       |  6 ++---
+ 10 files changed, 264 insertions(+), 73 deletions(-)
+
+diff --git a/include/swupd.h b/include/swupd.h
+index 775c28e..58307d9 100644
+--- a/include/swupd.h
++++ b/include/swupd.h
+@@ -16,9 +16,6 @@
+ #define SWUPD_DEFAULT_FORMAT	3
+
+ #define SWUPD_SERVER_STATE_DIR "/var/lib/update"
+-#define PACKSTAGE_DIR SWUPD_SERVER_STATE_DIR "/packstage"
+-#define IMAGE_DIR SWUPD_SERVER_STATE_DIR "/image"
+-#define STAGING_DIR SWUPD_SERVER_STATE_DIR "/www"
+
+ #if SWUPD_WITH_SELINUX
+ #define TAR_PERM_ATTR_ARGS "--preserve-permissions --xattrs --xattrs-include='*' --selinux"
+@@ -123,9 +120,17 @@ extern int newversion;
+ extern int minversion;
+ extern char *format_string;
+
++extern char *state_dir;
++extern char *packstage_dir;
++extern char *image_dir;
++extern char *staging_dir;
++
+ extern bool init_globals(void);
+ extern void free_globals(void);
+ extern bool set_format_string(char *);
++extern bool set_state_dir(char *);
++extern bool init_state_globals(void);
++extern void free_state_globals(void);
+
+ extern int file_sort_hash(gconstpointer a, gconstpointer b);
+ extern int file_sort_filename(gconstpointer a, gconstpointer b);
+diff --git a/src/analyze_fs.c b/src/analyze_fs.c
+index 2326237..fdc359a 100644
+--- a/src/analyze_fs.c
++++ b/src/analyze_fs.c
+@@ -389,7 +389,7 @@ struct manifest *full_manifest_from_directory(int version)
+
+ 	manifest = alloc_manifest(version, "full");
+
+-	string_or_die(&dir, "%s/%i/full", IMAGE_DIR, version);
++	string_or_die(&dir, "%s/%i/full", image_dir, version);
+
+ 	threadpool = g_thread_pool_new(get_hash, dir, 12, FALSE, NULL);
+
+@@ -413,7 +413,7 @@ struct manifest *sub_manifest_from_directory(char *component, int version)
+
+ 	manifest = alloc_manifest(version, component);
+
+-	string_or_die(&dir, "%s/%i/%s", IMAGE_DIR, version, component);
++	string_or_die(&dir, "%s/%i/%s", image_dir, version, component);
+
+ 	iterate_directory(manifest, dir, "", false);
+
+diff --git a/src/chroot.c b/src/chroot.c
+index 1d7df95..c5bb942 100644
+--- a/src/chroot.c
++++ b/src/chroot.c
+@@ -40,14 +40,15 @@ void chroot_create_full(int newversion)
+ 	char * command;
+ 	char *full_dir;
+
+-	string_or_die(&full_dir, "%s/%i/full/", IMAGE_DIR, newversion);
++	string_or_die(&full_dir, "%s/%i/full/ ", image_dir, newversion);
+
+ 	g_mkdir_with_parents(full_dir, S_IRWXU);
+
+
+ 	/* start with base */
+ 	LOG(NULL, "Copying chroot os-core to full", "");
+-	string_or_die(&command, "rsync -aAX " IMAGE_DIR "/%i/os-core/ %s", newversion, full_dir);
++	string_or_die(&command, "rsync -aAX %s/%i/os-core/ %s",
++	              image_dir, newversion, full_dir);
+ 	ret = system(command);
+ 	assert(ret==0);
+ 	free(command);
+@@ -60,8 +61,8 @@ void chroot_create_full(int newversion)
+ 		}
+
+ 		LOG(NULL, "Overlaying bundle chroot onto full", "%s", group);
+-		string_or_die(&command, "rsync -aAX --ignore-existing " IMAGE_DIR "/%i/%s/ %s",
+-		             newversion, group, full_dir);
++		string_or_die(&command, "rsync -aAX --ignore-existing %s/%i/%s/ %s",
++		             image_dir, newversion, group, full_dir);
+ 		ret = system(command);
+ 		assert(ret==0);
+ 		free(command);
+@@ -80,8 +81,8 @@ void chroot_create_full(int newversion)
+ 		}
+
+ 		LOG(NULL, "Recopy bundle chroot out of full", "%s", group);
+-		string_or_die(&command, "rsync -aAX --existing %s " IMAGE_DIR "/%i/%s",
+-		             full_dir, newversion, group);
++		string_or_die(&command, "rsync -aAX --existing %s %s/%i/%s",
++		             full_dir, image_dir, newversion, group);
+ 		ret = system(command);
+ 		assert(ret==0);
+ 		free(command);
+diff --git a/src/globals.c b/src/globals.c
+index 32dc793..ff6a3fa 100644
+--- a/src/globals.c
++++ b/src/globals.c
+@@ -34,6 +34,11 @@ int newversion = -1;
+ int minversion = 0;
+ char *format_string = NULL;
+
++char *state_dir = NULL;
++char *packstage_dir = NULL;
++char *image_dir = NULL;
++char *staging_dir = NULL;
++
+ bool set_format_string(char *userinput)
+ {
+ 	int version;
+@@ -52,12 +57,36 @@ bool set_format_string(char *userinput)
+ 	return true;
+ }
+
++bool set_state_dir(char *dir)
++{
++	if (dir == NULL || dir[0] == '\0') {
++		return false;
++	}
++
++	/* TODO: more validation of input? */
++	if (dir[0] != '/') {
++		printf("statedir must be a full path starting with '/', not '%c'\n", dir[0]);
++		return false;
++	}
++
++	if (state_dir) {
++		free(state_dir);
++	}
++	string_or_die(&state_dir, "%s", dir);
++
++	return true;
++}
++
+ bool init_globals(void)
+ {
+ 	if (format_string == NULL) {
+ 		string_or_die(&format_string, "%d", SWUPD_DEFAULT_FORMAT);
+ 	}
+
++	if (!init_state_globals()) {
++		return false;
++	}
++
+ 	if (newversion == -1) {
+ 		printf("Missing version parameter: No new version number specified\n");
+ 		return false;
+@@ -71,4 +100,28 @@ bool init_globals(void)
+ void free_globals(void)
+ {
+ 	free(format_string);
++	free(state_dir);
++	free(packstage_dir);
++	free(image_dir);
++	free(staging_dir);
++}
++
++bool init_state_globals(void)
++{
++	if (state_dir == NULL) {
++		string_or_die(&state_dir, "%s", SWUPD_SERVER_STATE_DIR);
++	}
++	string_or_die(&packstage_dir, "%s/%s", state_dir, "packstage");
++	string_or_die(&image_dir, "%s/%s", state_dir, "image");
++	string_or_die(&staging_dir, "%s/%s", state_dir, "www");
++
++	return true;
++}
++
++void free_state_globals(void)
++{
++	free(state_dir);
++	free(packstage_dir);
++	free(image_dir);
++	free(staging_dir);
+ }
+diff --git a/src/main.c b/src/main.c
+index 7ed71d5..3d5f24a 100644
+--- a/src/main.c
++++ b/src/main.c
+@@ -55,6 +55,7 @@ static const struct option prog_opts[] = {
+ 	{"minversion", required_argument, 0, 'm'},
+ 	{"format", required_argument, 0, 'F'},
+ 	{"getformat", no_argument, 0, 'g'},
++	{"statedir", required_argument, 0, 'S'},
+ 	{0, 0, 0, 0}
+ };
+
+@@ -70,6 +71,7 @@ static void print_help(const char *name) {
+ 	printf("   -m, --minversion        Optional minimum file version to write into manifests per file\n");
+ 	printf("   -F, --format            Optional format string [ default:=%d ]\n", SWUPD_DEFAULT_FORMAT);
+ 	printf("   -g, --getformat         Print current format string and exit\n");
++	printf("   -S, --statedir          Optional directory to use for state [ default:=%s ]\n", SWUPD_SERVER_STATE_DIR);
+ 	printf("\n");
+ }
+
+@@ -77,7 +79,7 @@ static bool parse_options(int argc, char **argv)
+ {
+ 	int opt;
+
+-	while ((opt = getopt_long(argc, argv, "hvo:m:F:g", prog_opts, NULL)) != -1) {
++	while ((opt = getopt_long(argc, argv, "hvo:m:F:g:S:", prog_opts, NULL)) != -1) {
+ 		switch (opt) {
+ 		case '?':
+ 		case 'h':
+@@ -107,6 +109,12 @@ static bool parse_options(int argc, char **argv)
+ 				return false;
+ 			}
+ 			break;
++		case 'S':
++			if (!optarg || !set_state_dir(optarg)) {
++				printf("Invalid --statedir argument ''%s'\n\n", optarg);
++				return false;
++			}
++			break;
+ 		case 'g':
+ 			if (format_string == NULL) {
+ 				printf("%d\n", SWUPD_DEFAULT_FORMAT);
+@@ -138,9 +146,14 @@ static void check_root(void)
+ static void populate_dirs(int version)
+ {
+ 	char *newversiondir;
+-	string_or_die(&newversiondir, "%s/%d", IMAGE_DIR, version);
++
++	string_or_die(&newversiondir, "%s/%d", image_dir, version);
+
+ 	if ((access(newversiondir, F_OK | R_OK) != 0) && (version == 0)) {
++		char *latestpath = NULL;
++
++		string_or_die(&latestpath, "%s/latest.version", image_dir);
++
+ 		printf("** %s does not exist... creating and populating\n", newversiondir);
+ 		if (mkdir(newversiondir, 0755) != 0) {
+ 			printf("Failed to create directory\n");
+@@ -151,14 +164,17 @@ static void populate_dirs(int version)
+ 		}
+
+ 		FILE *latestver;
+-		latestver = fopen_exclusive(IMAGE_DIR "/latest.version");
++		latestver = fopen_exclusive(latestpath);
+ 		if (latestver == NULL) {
+-			printf("Failed to create %s/latest.version\n", IMAGE_DIR);
++			printf("Failed to create %s\n", latestpath);
++			free(latestpath);
+ 			return;
+ 		}
+ 		if (fwrite("0\n", 2, 1, latestver) != 1) {
+ 			LOG(NULL, "Failed to write latestver", "errno: %d", errno);
+ 		}
++
++		free(latestpath);
+ 		fclose(latestver);
+ 	}
+ 	/* groups don't exist in version 0 */
+@@ -170,7 +186,7 @@ static void populate_dirs(int version)
+ 				break;
+ 			}
+
+-			string_or_die(&newversiondir, "%s/%d/%s", IMAGE_DIR, version, group);
++			string_or_die(&newversiondir, "%s/%d/%s", image_dir, version, group);
+
+ 			/* Create the bundle directory(s) as needed */
+ 			if (access(newversiondir, F_OK | R_OK) != 0) {
+@@ -186,13 +202,18 @@ static void populate_dirs(int version)
+
+ static int check_build_env(void)
+ {
+-	if (access(SWUPD_SERVER_STATE_DIR "/temp", F_OK | R_OK) != 0) {
+-		LOG(NULL, "/var/lib/update/temp does not exist...creating directory", "");
+-		if (mkdir(SWUPD_SERVER_STATE_DIR "/temp", 0755) != 0) {
++	char *temp_dir = NULL;
++	string_or_die(&temp_dir, "%s/%s", state_dir, "/temp");
++
++	if (access(temp_dir, F_OK | R_OK) != 0) {
++		LOG(NULL, "%s", "does not exist...creating directory", temp_dir);
++		if (mkdir(temp_dir, 0755) != 0) {
+ 			printf("Failed to create build directory, EXITING\n");
++			free(temp_dir);
+ 			return -errno;
+ 		}
+ 	}
++	free(temp_dir);
+
+ 	return 0;
+ }
+@@ -217,6 +238,8 @@ int main(int argc, char **argv)
+ 	int exit_status = EXIT_FAILURE;
+ 	int ret;
+
++	char *file_path = NULL;
++
+ 	/* keep valgrind working well */
+ 	setenv("G_SLICE", "always-malloc", 0);
+
+@@ -240,12 +263,17 @@ int main(int argc, char **argv)
+ 	}
+
+
+-	if (!read_configuration_file(SWUPD_SERVER_STATE_DIR "/server.ini")) {
+-		printf("Failed to read " SWUPD_SERVER_STATE_DIR "/server.ini configuration file!\n");
++	string_or_die(&file_path, "%s/server.ini", state_dir);
++	if (!read_configuration_file(file_path)) {
++		printf("Failed to read %s configuration file!\n", state_dir);
++		free(file_path);
+ 		goto exit;
+ 	}
++	free(file_path);
+
+-	read_group_file(SWUPD_SERVER_STATE_DIR "/groups.ini");
++	string_or_die(&file_path, "%s/groups.ini", state_dir);
++	read_group_file(file_path);
++	free(file_path);
+
+ 	read_current_version("latest.version");
+ 	printf("Last processed version is %i\n", current_version);
+diff --git a/src/make_fullfiles.c b/src/make_fullfiles.c
+index e755a33..bf97a1c 100644
+--- a/src/make_fullfiles.c
++++ b/src/make_fullfiles.c
+@@ -27,8 +27,52 @@
+ #include <string.h>
+ #include <assert.h>
+
++#include <getopt.h>
++
+ #include <swupd.h>
+
++static const struct option prog_opts[] = {
++	{"help", no_argument, 0, 'h'},
++	{"statedir", required_argument, 0, 'S'},
++	{0, 0, 0, 0}
++};
++
++static void usage(const char *name)
++{
++	printf("usage:\n");
++	printf("   %s <version>\n\n", name);
++	printf("Help options:\n");
++	printf("   -h, --help              Show help options\n");
++	printf("   -S, --statedir          Optional directory to use for state [ default:=%s ]\n", SWUPD_SERVER_STATE_DIR);
++	printf("\n");
++}
++
++static bool parse_options(int argc, char **argv)
++{
++	int opt;
++
++	while ((opt = getopt_long(argc, argv, "hS:", prog_opts, NULL)) != -1) {
++		switch (opt) {
++			case '?':
++			case 'h':
++				usage(argv[0]);
++				return false;
++			case 'S':
++				if (!optarg || !set_state_dir(optarg)) {
++					printf("Invalid --statedir argument '%s'\n\n", optarg);
++					return false;
++				}
++				break;
++		}
++	}
++
++	if (!init_state_globals()) {
++		return false;
++	}
++
++	return true;
++}
++
+ static void banner(void)
+ {
+ 	printf(PACKAGE_NAME " update creator -- fullfiles -- version " PACKAGE_VERSION "\n");
+@@ -51,20 +95,29 @@ int main(int argc, char **argv)
+ {
+ 	struct manifest *manifest;
+ 	int version;
++	char *file_path = NULL;
+
+ 	/* keep valgrind working well */
+ 	setenv("G_SLICE", "always-malloc", 0);
+
++	if (!parse_options(argc, argv)) {
++		free_state_globals();
++		return EXIT_FAILURE;
++	}
+ 	banner();
+ 	check_root();
+
+-	read_configuration_file(SWUPD_SERVER_STATE_DIR "/server.ini");
++	string_or_die(&file_path, "%s/server.ini", state_dir);
++	read_configuration_file(file_path);
++	free(file_path);
+
+-	if (argc < 1) {
+-		printf("Usage:\n\tswupd_make_fullfiles <version>\n\n");
++	if (argc - optind < 1) {
++		usage(argv[0]);
++		free_state_globals();
+ 		exit(EXIT_FAILURE);
+ 	}
+-	version = strtoull(argv[1], NULL, 10);
++
++	version = strtoull(argv[optind++], NULL, 10);
+ 	if (version < 0) {
+ 		printf("Usage:\n\tswupd_make_fullfiles <version>\n\n");
+ 		exit(EXIT_FAILURE);
+@@ -73,5 +126,7 @@ int main(int argc, char **argv)
+ 	manifest = manifest_from_file(version, "full");
+ 	create_fullfiles(manifest);
+
++	free_state_globals();
++
+ 	return EXIT_SUCCESS;
+ }
+diff --git a/src/make_packs.c b/src/make_packs.c
+index 20fbd67..2b62b8a 100644
+--- a/src/make_packs.c
++++ b/src/make_packs.c
+@@ -33,6 +33,8 @@
+
+ #include <glib.h>
+
++#include <getopt.h>
++
+ #include <swupd.h>
+
+ static void banner(void)
+@@ -43,12 +45,47 @@ static void banner(void)
+ 	printf("\n");
+ }
+
+-static void usage(void)
++static const struct option prog_opts[] = {
++	{"help", no_argument, 0, 'h'},
++	{"statedir", required_argument, 0, 'S'},
++	{0, 0, 0, 0}
++};
++
++static void usage(const char *name)
+ {
+ 	printf("usage:\n");
+-	printf("   swupd_make_pack <start version> <latest version> <bundle>\n");
++	printf("   %s <start version> <latest version> <bundle>\n\n", name);
++	printf("Help options:\n");
++	printf("   -h, --help              Show help options\n");
++	printf("   -S, --statedir          Optional directory to use for state [ default:=%s ]\n", SWUPD_SERVER_STATE_DIR);
+ 	printf("\n");
+-	exit(EXIT_FAILURE);
++}
++
++static bool parse_options(int argc, char **argv)
++{
++	int opt;
++
++	while ((opt = getopt_long(argc, argv, "hS:", prog_opts, NULL)) != -1) {
++		switch (opt) {
++		case '?':
++		case 'h':
++			usage(argv[0]);
++			return false;
++		case 'S':
++			if (!optarg || !set_state_dir(optarg)) {
++				printf("Invalid --statedir argument ''%s'\n\n", optarg);
++				return false;
++			}
++			break;
++		}
++	}
++
++	/* FIXME: *_state_globals() are ugly hacks */
++	if (!init_state_globals()) {
++		return false;
++	}
++
++	return true;
+ }
+
+ int main(int argc, char **argv)
+@@ -59,11 +96,17 @@ int main(int argc, char **argv)
+ 	char *module;
+ 	struct packdata *pack;
+ 	int exit_status = EXIT_FAILURE;
++	char *file_path = NULL;
+
++	if (!parse_options(argc, argv)) {
++		free_state_globals();
++		return EXIT_FAILURE;
++	}
+ 	banner();
+
+-	if (argc != 4) {
+-		usage();
++	if (argc - optind != 3) {
++		usage(argv[0]);
++		exit(EXIT_FAILURE);
+ 	}
+
+ 	/* FIXME: should use "end_version" not "0" and a unique filename
+@@ -76,12 +119,13 @@ int main(int argc, char **argv)
+ 		return exit_status;
+ 	}
+
+-	read_configuration_file(SWUPD_SERVER_STATE_DIR "/server.ini");
+-
++	string_or_die(&file_path, "%s/server.ini", state_dir);
++	read_configuration_file(file_path);
++	free(file_path);
+
+-	start_version = strtoull(argv[1], NULL, 10);
+-	end_version = strtoull(argv[2], NULL, 10);
+-	module = argv[3];
++	start_version = strtoull(argv[optind++], NULL, 10);
++	end_version = strtoull(argv[optind++], NULL, 10);
++	module = argv[optind++];
+
+ 	if ((start_version < 0) ||
+ 	    (end_version == 0) ||
+@@ -108,5 +152,7 @@ int main(int argc, char **argv)
+ 	printf("Pack creation %s (pack-%s %i to %li)\n",
+ 		exit_status == EXIT_SUCCESS ? "complete" : "failed",
+ 		module, start_version, end_version);
++
++	free_state_globals();
+ 	return exit_status;
+ }
+diff --git a/src/pack.c b/src/pack.c
+index e96e9a4..036853f 100644
+--- a/src/pack.c
++++ b/src/pack.c
+@@ -46,21 +46,21 @@ static void empty_pack_stage(int full, int version, char *module)
+ 	int ret;
+
+ 	// clean any stale data (eg: re-run after a failure)
+-	string_or_die(&cmd, "rm -rf " PACKSTAGE_DIR "/%s/%i/", module, version);
++	string_or_die(&cmd, "rm -rf %s/%s/%i/", packstage_dir, module, version);
+ 	ret = system(cmd);
+ 	if (ret) {
+-		fprintf(stderr, "Failed to clean " PACKSTAGE_DIR "/%s/%i\n",
+-			module, version);
++		fprintf(stderr, "Failed to clean %s/%s/%i\n",
++			packstage_dir, module, version);
+ 		exit(EXIT_FAILURE);
+ 	}
+ 	free(cmd);
+
+ 	if (!full) {
+ 		// (re)create module/version/{delta,staged}
+-		string_or_die(&path, PACKSTAGE_DIR "/%s/%i/delta", module, version);
++		string_or_die(&path, "%s/%s/%i/delta", packstage_dir, module, version);
+ 		g_mkdir_with_parents(path, S_IRWXU | S_IRWXG);
+ 		free(path);
+-		string_or_die(&path, PACKSTAGE_DIR "/%s/%i/staged", module, version);
++		string_or_die(&path, "%s/%s/%i/staged", packstage_dir, module, version);
+ 		g_mkdir_with_parents(path, S_IRWXU | S_IRWXG);
+ 		free(path);
+ 	}
+@@ -76,7 +76,7 @@ static void explode_pack_stage(int version, char *module)
+ 	struct stat buf;
+ 	char *path;
+
+-	string_or_die(&path, PACKSTAGE_DIR "/%s/%i/staged", module, version);
++	string_or_die(&path, "%s/%s/%i/staged", packstage_dir, module, version);
+ 	g_mkdir_with_parents(path, S_IRWXU | S_IRWXG);
+ 	dir = opendir(path);
+ 	if (!dir) {
+@@ -99,7 +99,8 @@ static void explode_pack_stage(int version, char *module)
+ 			continue;
+ 		}
+
+-		string_or_die(&path, PACKSTAGE_DIR "/%s/%i/staged/%s", module, version, entry->d_name);
++		string_or_die(&path, "%s/%s/%i/staged/%s",
++		              packstage_dir, module, version, entry->d_name);
+ 		ret = stat(path, &buf);
+ 		if (ret) {
+ 			free(path);
+@@ -112,8 +113,8 @@ static void explode_pack_stage(int version, char *module)
+ 		 * the resulting pack is slightly smaller, and in addition, we're saving CPU
+ 		 * time on the client...
+ 		 */
+-		string_or_die(&tar, "tar --directory=" PACKSTAGE_DIR "/%s/%i/staged --warning=no-timestamp "
+-				TAR_PERM_ATTR_ARGS " -axf %s", module, version, path);
++		string_or_die(&tar, "tar --directory=%s/%s/%i/staged --warning=no-timestamp "
++				TAR_PERM_ATTR_ARGS " -axf %s", packstage_dir, module, version, path);
+ 		ret = system(tar);
+ 		if (!ret) {
+ 			unlink(path);
+@@ -162,8 +163,8 @@ static void make_pack_full_files(struct packdata *pack)
+ 		if ((!file->peer || file->peer->is_deleted) && !file->is_deleted && !file->rename_peer) {
+ 			char *from, *to;
+ 			/* hardlink each file that is in <end> but not in <X> */
+-			string_or_die(&from, STAGING_DIR "/%i/files/%s.tar", file->last_change, file->hash);
+-			string_or_die(&to, PACKSTAGE_DIR "/%s/%i/staged/%s.tar", pack->module, pack->from, file->hash);
++			string_or_die(&from, "%s/%i/files/%s.tar", staging_dir, file->last_change, file->hash);
++			string_or_die(&to, "%s/%s/%i/staged/%s.tar", packstage_dir, pack->module, pack->from, file->hash);
+ 			ret = link(from, to);
+ 			if (ret) {
+ 				if (errno != EEXIST) {
+@@ -228,8 +229,8 @@ static GList *consolidate_packs_delta_files(GList *files, struct packdata *pack)
+ 			continue;
+ 		}
+
+-		string_or_die(&from, STAGING_DIR "/%i/delta/%i-%i-%s", file->last_change,
+-				file->peer->last_change, file->last_change, file->hash);
++		string_or_die(&from, "%s/%i/delta/%i-%i-%s", staging_dir, file->last_change,
++		              file->peer->last_change, file->last_change, file->hash);
+
+ 		ret = stat(from, &stat_delta);
+ 		if (ret && !find_file_in_list(files, file)) {
+@@ -284,8 +285,8 @@ static int write_pack_signature(struct packdata *pack)
+ 	char *filename = NULL;
+ 	int ret = -1;
+
+-	string_or_die(&filename, STAGING_DIR "/%i/pack-%s-from-%i.tar",
+-			pack->to, pack->module, pack->from);
++	string_or_die(&filename, "%s/%i/pack-%s-from-%i.tar",
++			staging_dir, pack->to, pack->module, pack->from);
+ 	if (!signature_sign(filename)) {
+ 		fprintf(stderr, "Creating signature for '%s' failed\n", filename);
+ 		goto exit;
+@@ -324,12 +325,14 @@ static int make_final_pack(struct packdata *pack)
+
+ 		/* for each file changed since <X> */
+ 		/* locate delta, check if the diff it's from is >= <X> */
+-		string_or_die(&from, STAGING_DIR "/%i/delta/%i-%i-%s", file->last_change,
+-				file->peer->last_change, file->last_change, file->hash);
+-		string_or_die(&to, PACKSTAGE_DIR "/%s/%i/delta/%i-%i-%s", pack->module, pack->from,
++		string_or_die(&from, "%s/%i/delta/%i-%i-%s", staging_dir, file->last_change,
+ 				file->peer->last_change, file->last_change, file->hash);
+-		string_or_die(&tarfrom, STAGING_DIR "/%i/files/%s.tar", file->last_change, file->hash);
+-		string_or_die(&tarto, PACKSTAGE_DIR "/%s/%i/staged/%s.tar", pack->module, pack->from, file->hash);
++		string_or_die(&to, "%s/%s/%i/delta/%i-%i-%s", packstage_dir, pack->module,
++				pack->from, file->peer->last_change, file->last_change, file->hash);
++		string_or_die(&tarfrom, "%s/%i/files/%s.tar", staging_dir,
++				file->last_change, file->hash);
++		string_or_die(&tarto, "%s/%s/%i/staged/%s.tar", packstage_dir, pack->module,
++				pack->from, file->hash);
+
+ 		ret = stat(from, &stat_delta);
+ 		if (ret) {
+@@ -388,8 +391,8 @@ static int make_final_pack(struct packdata *pack)
+ 		char *from, *to;
+ 		struct stat st;
+
+-		string_or_die(&from, STAGING_DIR "/%i/Manifest-%s-delta-from-%i",
+-				pack->to, pack->module, pack->from);
++		string_or_die(&from, "%s/%i/Manifest-%s-delta-from-%i",
++				staging_dir, pack->to, pack->module, pack->from);
+
+ 		ret = stat(from, &st);
+ 		if (ret) {
+@@ -398,8 +401,8 @@ static int make_final_pack(struct packdata *pack)
+ 		}
+
+
+-		string_or_die(&to, PACKSTAGE_DIR "/%s/%i/Manifest-%s-delta-from-%i",
+-				pack->module, pack->from, pack->module, pack->from);
++		string_or_die(&to, "%s/%s/%i/Manifest-%s-delta-from-%i",
++				packstage_dir, pack->module, pack->from, pack->module, pack->from);
+
+ 		ret = link(from, to);
+ 		if (ret) {
+@@ -416,16 +419,16 @@ static int make_final_pack(struct packdata *pack)
+ 		char *from, *to;
+ 		struct stat st;
+
+-		string_or_die(&from, STAGING_DIR "/%i/Manifest-%s-delta-from-%i",
+-				pack->to, "MoM", pack->from);
++		string_or_die(&from, "%s/%i/Manifest-%s-delta-from-%i",
++				staging_dir, pack->to, "MoM", pack->from);
+ 		ret = stat(from, &st);
+ 		if (ret) {
+ 			LOG(NULL, "Making extra manifest delta", "MoM: %i->%i", pack->from, pack->to);
+ 			create_manifest_delta(pack->from, pack->to, "MoM");
+ 		}
+
+-		string_or_die(&to, PACKSTAGE_DIR "/%s/%i/Manifest-%s-delta-from-%i",
+-				pack->module, pack->from, "MoM", pack->from);
++		string_or_die(&to, "%s/%s/%i/Manifest-%s-delta-from-%i",
++				packstage_dir, pack->module, pack->from, "MoM", pack->from);
+
+ 		ret = link(from, to);
+ 		if (ret) {
+@@ -439,9 +442,9 @@ static int make_final_pack(struct packdata *pack)
+
+ 	/* tar the staging directory up */
+ 	LOG(NULL, "starting tar for pack", "%s: %i to %i", pack->module, pack->from, pack->to);
+-	string_or_die(&tar, "tar " TAR_PERM_ATTR_ARGS " --directory=" PACKSTAGE_DIR "/%s/%i/ "
+-			"--numeric-owner -Jcf " STAGING_DIR "/%i/pack-%s-from-%i.tar delta staged",
+-			pack->module, pack->from, pack->to, pack->module, pack->from);
++	string_or_die(&tar, "tar " TAR_PERM_ATTR_ARGS " --directory=%s/%s/%i/ "
++			"--numeric-owner -Jcf %s/%i/pack-%s-from-%i.tar delta staged",
++			packstage_dir, pack->module, pack->from, staging_dir, pack->to, pack->module, pack->from);
+ 	ret = system(tar);
+ 	free(tar);
+ 	LOG(NULL, "finished tar for pack", "%s: %i to %i", pack->module, pack->from, pack->to);
+diff --git a/src/rename.c b/src/rename.c
+index 70f9006..5ea979c 100644
+--- a/src/rename.c
++++ b/src/rename.c
+@@ -153,7 +153,7 @@ static void precompute_file_data(struct manifest *manifest, struct file *file, i
+ 	}
+
+ 	if (manifest)  {
+-		string_or_die(&filename, "%s/%i/%s/%s", IMAGE_DIR, manifest->version, manifest->component, file->filename);
++		string_or_die(&filename, "%s/%i/%s/%s", image_dir, manifest->version, manifest->component, file->filename);
+ 	} else if (old_rename) {
+ 		item = g_list_first(last_versions_list);
+ 		while (item) {
+@@ -161,13 +161,13 @@ static void precompute_file_data(struct manifest *manifest, struct file *file, i
+ 			item = g_list_next(item);
+
+ 			free(filename);
+-			string_or_die(&filename, "%s/%i/full/%s", IMAGE_DIR, last_change, file->filename);
++			string_or_die(&filename, "%s/%i/full/%s", image_dir, last_change, file->filename);
+ 			if (!lstat(filename, &buf)) {
+ 				break;
+ 			}
+ 		}
+ 	} else {
+-		string_or_die(&filename, "%s/%i/full/%s", IMAGE_DIR, file->last_change, file->filename);
++		string_or_die(&filename, "%s/%i/full/%s", image_dir, file->last_change, file->filename);
+ 	}
+
+ 	/* make sure file->stat.st_size is valid */
+diff --git a/src/versions.c b/src/versions.c
+index 6860160..0fb729a 100644
+--- a/src/versions.c
++++ b/src/versions.c
+@@ -215,10 +215,10 @@ GList *get_last_versions_list(int next_version, int max_versions)
+ 	int idx, build_num, build_type, jump_point;
+ 	int jump_point_found;
+
+-	dir = opendir(STAGING_DIR);
++	dir = opendir(staging_dir);
+ 	if (dir == NULL) {
+ 		LOG(NULL, "Cannot open directory", "dir_path= %s, strerror= %s",
+-				STAGING_DIR, strerror(errno));
++				staging_dir, strerror(errno));
+ 		return NULL;
+ 	}
+
+@@ -228,7 +228,7 @@ GList *get_last_versions_list(int next_version, int max_versions)
+ 		}
+
+ 		free(filename);
+-		string_or_die(&filename, STAGING_DIR "/%s", entry.d_name);
++		string_or_die(&filename, "%s/%s", staging_dir, entry.d_name);
+
+ 		if (lstat(filename, &stat)) {
+ 			LOG(NULL, "lstat failed", "path= %s, strerror= %s",
+--
+2.5.0
+

meta/recipes-devtools/swupd/swupd-server/0001-Add-system_argv-helper-for-safer-calls-to-system-uti.patch new file +133 -0

new file mode 100644
index 0000000..f94305e
@@ -0,0 +1,133 @@
+From 8f24ef7f857c9d2c2eb2601a2a1e06123c086001 Mon Sep 17 00:00:00 2001
+From: Dmitry Rozhkov <[email protected]>
+Date: Fri, 29 Jan 2016 17:48:46 +0200
+Subject: [PATCH swupd-server 1/2] Add system_argv() helper for safer calls to
+ system utilities
+
+Often file names contain special characters like hashes or
+whitespaces and that makes escaping a difficult task when using
+system(). Thus add a new helper system_argv() that is based
+on execvp() syscall and doesn't require escaping.
+
+Signed-off-by: Dmitry Rozhkov <[email protected]>
+
+Upstream-Status: Backport (v2.54+)
+
+---
+ include/swupd.h |  1 +
+ src/fullfiles.c |  6 ++----
+ src/helpers.c   | 63 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++
+ 3 files changed, 66 insertions(+), 4 deletions(-)
+
+diff --git a/include/swupd.h b/include/swupd.h
+index 00b88d4..2805186 100644
+--- a/include/swupd.h
++++ b/include/swupd.h
+@@ -223,6 +223,7 @@ extern FILE * fopen_exclusive(const char *filename); /* no mode, opens for write
+ extern void dump_file_info(struct file *file);
+ extern void string_or_die(char **strp, const char *fmt, ...);
+ extern void print_elapsed_time(struct timeval *previous_time, struct timeval *current_time);
++extern int system_argv(char *const argv[]);
+
+ extern bool signature_initialize(void);
+ extern void signature_terminate(void);
+diff --git a/src/fullfiles.c b/src/fullfiles.c
+index 1bb581e..fa78293 100644
+--- a/src/fullfiles.c
++++ b/src/fullfiles.c
+@@ -138,12 +138,10 @@ static void create_fullfile(struct file *file)
+ 		string_or_die(&tempfile, "%s/%s", empty, file->hash);
+ 		if (link(origin, tempfile) < 0) {
+ 			LOG(NULL, "hardlink failed", "%s due to %s (%s -> %s)", file->filename, strerror(errno), origin, tempfile);
+-			string_or_die(&tarcommand, "cp -a %s %s", origin, tempfile);
+-			if (system(tarcommand) != 0) {
+-				LOG(NULL, "Failed to run command:", "%s", tarcommand);
++			char *const argv[] = {"cp", "-a", origin, tempfile, NULL};
++			if (system_argv(argv) != 0) {
+ 				assert(0);
+ 			}
+-			free(tarcommand);
+ 		}
+
+ 		/* step 2a: tar it with each compression type  */
+diff --git a/src/helpers.c b/src/helpers.c
+index 65acffd..5884b51 100644
+--- a/src/helpers.c
++++ b/src/helpers.c
+@@ -29,6 +29,7 @@
+ #include <sys/types.h>
+ #include <sys/stat.h>
+ #include <sys/time.h>
++#include <sys/wait.h>
+ #include <fcntl.h>
+ #include <errno.h>
+
+@@ -124,3 +125,65 @@ void print_elapsed_time(struct timeval *previous_time, struct timeval *current_t
+
+ 	free(elapsed);
+ }
++
++void concat_str_array(char **output, char *const argv[])
++{
++	int size = 0;
++
++	for (int i = 0; argv[i]; i++) {
++		size += strlen(argv[i]) + 1;
++	}
++
++	*output = malloc(size + 1);
++	if (!*output) {
++		LOG(NULL, "Failed to allocate", "%i bytes", size);
++		assert(0);
++	}
++	strcpy(*output, "");
++	for (int i = 0; argv[i]; i++) {
++		strcat(*output, argv[i]);
++		strcat(*output, " ");
++	}
++}
++
++int system_argv(char *const argv[])
++{
++	int child_exit_status;
++	pid_t pid;
++	int status;
++
++	pid = fork();
++
++	if (pid == 0) { /* child */
++		execvp(*argv, argv);
++		LOG(NULL, "This line must not be reached", "");
++		assert(0);
++	} else if (pid < 0) {
++		LOG(NULL, "Failed to fork a child process", "");
++		assert(0);
++	} else {
++		pid_t ws = waitpid(pid, &child_exit_status, 0);
++
++		if (ws == -1) {
++			LOG(NULL, "Failed to wait for child process", "");
++			assert(0);
++		}
++
++		if (WIFEXITED(child_exit_status)) {
++			status = WEXITSTATUS(child_exit_status);
++		} else {
++			LOG(NULL, "Child process didn't exit", "");
++			assert(0);
++		}
++
++		if (status != 0) {
++			char* cmdline = NULL;
++
++			concat_str_array(&cmdline, argv);
++			LOG(NULL, "Failed to run command:", "%s", cmdline);
++			free(cmdline);
++		}
++
++		return status;
++	}
++}
+--
+2.5.0
+

meta/recipes-devtools/swupd/swupd-server/0002-Add-configure-option-to-re-enable-config-files-in-ma.patch new file +66 -0

new file mode 100644
index 0000000..a5ab7af
@@ -0,0 +1,66 @@
+From e209255d8985eb4eb4c43f5e773ee1a0a16eb297 Mon Sep 17 00:00:00 2001
+From: Joshua Lock <[email protected]>
+Date: Fri, 12 Feb 2016 16:02:58 +0000
+Subject: [PATCH 2/2] Add configure option to re-enable config files in
+ manifests
+
+Signed-off-by: Joshua Lock <[email protected]>
+
+Upstream-Status: Accepted (v3.0+)
+
+---
+ configure.ac    | 6 ++++++
+ include/swupd.h | 6 ++++++
+ src/manifest.c  | 2 +-
+ 3 files changed, 13 insertions(+), 1 deletion(-)
+
+diff --git a/configure.ac b/configure.ac
+index 8bb6e3b..afffad5 100644
+--- a/configure.ac
++++ b/configure.ac
+@@ -28,6 +28,12 @@ AC_ARG_ENABLE(
+     AC_DEFINE(SWUPD_WITH_LZMA,1,[Use lzma compression])
+ 	[enable_lzma=check]
+ )
++AC_ARG_ENABLE(
++    [stateless],
++    AS_HELP_STRING([--disable-stateless],[OS is not stateless, do not ignore configuration files (stateless by default)]),
++    AC_DEFINE(SWUPD_WITH_STATELESS,0,[OS is not stateless]),
++		AC_DEFINE(SWUPD_WITH_STATELESS,1,[OS is stateless])
++)
+
+ AS_IF([test "$enable_lzma" = "check"],
+ 	[PKG_CHECK_MODULES([lzma],
+diff --git a/include/swupd.h b/include/swupd.h
+index 58307d9..7cce735 100644
+--- a/include/swupd.h
++++ b/include/swupd.h
+@@ -23,6 +23,12 @@
+ #define TAR_PERM_ATTR_ARGS "--preserve-permissions --xattrs --xattrs-include='*'"
+ #endif
+
++#if SWUPD_WITH_STATELESS
++#define OS_IS_STATELESS 1
++#else
++#define OS_IS_STATELESS 0
++#endif
++
+ /* Build types */
+ #define REGULAR_BUILD 0
+ #define FIX_BUILD     1
+diff --git a/src/manifest.c b/src/manifest.c
+index 69a8fb9..58d0be1 100644
+--- a/src/manifest.c
++++ b/src/manifest.c
+@@ -830,7 +830,7 @@ int prune_manifest(struct manifest *manifest)
+ 		next = g_list_next(list);
+ 		file = list->data;
+
+-		if ((!file->is_deleted) && (file->is_config)) {
++		if (OS_IS_STATELESS && (!file->is_deleted) && (file->is_config)) {
+ 			// toward being a stateless OS
+ 			LOG(file, "Skipping config file in manifest write", "component %s", manifest->component);
+ 			manifest->files = g_list_delete_link(manifest->files, list);
+--
+2.5.0
+

meta/recipes-devtools/swupd/swupd-server/0002-Fix-regression-that-introduced-a-directory-named.patch new file +29 -0

new file mode 100644
index 0000000..9c1d8fa
@@ -0,0 +1,29 @@
+From aba4418696ef31ab5afc9811903a044366619dc4 Mon Sep 17 00:00:00 2001
+From: Patrick McCarty <[email protected]>
+Date: Mon, 22 Feb 2016 22:07:08 -0800
+Subject: [PATCH 2/4] Fix regression that introduced a directory named '/ '
+
+Signed-off-by: Patrick McCarty <[email protected]>
+
+Upstream-Status: Backport (v3.0+)
+
+---
+ src/chroot.c | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/src/chroot.c b/src/chroot.c
+index f961d58..2878496 100644
+--- a/src/chroot.c
++++ b/src/chroot.c
+@@ -40,7 +40,7 @@ void chroot_create_full(int newversion)
+ 	char * command;
+ 	char *full_dir;
+
+-	string_or_die(&full_dir, "%s/%i/full/ ", image_dir, newversion);
++	string_or_die(&full_dir, "%s/%i/full/", image_dir, newversion);
+
+ 	g_mkdir_with_parents(full_dir, S_IRWXU);
+
+--
+2.5.0
+

meta/recipes-devtools/swupd/swupd-server_2.53.bb new file +0 -0

new file mode 100644
index 0000000..fdbd39b

meta/recipes-devtools/swupd/swupd-server_2.53.bb new file +14 -0

+    file://0001-Add-option-S-to-take-the-state-data-dir-as-an-argume.patch \
+    file://0001-Add-system_argv-helper-for-safer-calls-to-system-uti.patch \
+    file://0002-Add-configure-option-to-re-enable-config-files-in-ma.patch \
+    file://0002-Fix-regression-that-introduced-a-directory-named.patch \
+"
+
+SRC_URI[md5sum] = "14f25677b5a4f0b33785910b03860939"
+SRC_URI[sha256sum] = "c2d0e595444fe198c4092dd83d20a929fd1402a13b66b410b76677ed3a993d99"
+
+inherit autotools
+
+EXTRA_OECONF = "--enable-bzip2 --enable-lzma --disable-stateless"
+
+# safer-calls-to-system-utilities.patch uses for loop initial declaration

Quoted 3 lines · Joshua Lock

+SRC_URI = "\
+    https://download.clearlinux.org/releases/5940/clear/source/SRP
MS/${BPN}-${PV}-4.src.rpm;extract=${BP}.tar.gz \

I'm going throught he patches in reverse order, but IIRC you used release 5700 for swupd-client, here it's release 5940. Is there a chance
that client and server might be out of sync?

meta/recipes-extended/hardlink/hardlink_0.3.0.bb new file +6 -0

+do_compile () {
+       oe_runmake 'DESTDIR=${D}' 'PREFIX=${prefix}' BINDIR='${bindir}'
+}
+
+do_install () {
+       oe_runmake install 'DESTDIR=${D}' 'PREFIX=${prefix}'

BINDIR='${bindir}'
+}

---
 meta/recipes-extended/hardlink/hardlink_0.3.0.bb | 19 +++++++++++++++++++
 1 file changed, 19 insertions(+)
 create mode 100644 meta/recipes-extended/hardlink/hardlink_0.3.0.bb

meta/recipes-extended/hardlink/hardlink_0.3.0.bb new file +0 -0

new file mode 100644
index 0000000..2e06ac2

meta/recipes-extended/hardlink/hardlink_0.3.0.bb new file +9 -1

+do_compile () {
+       oe_runmake 'DESTDIR=${D}' 'PREFIX=${prefix}' BINDIR='${bindir}'
+}
+
+do_install () {
+       oe_runmake install 'DESTDIR=${D}' 'PREFIX=${prefix}' BINDIR='${bindir}'
+}
+
+BBCLASSEXTEND = "native nativesdk"
--

2.5.0

--
_______________________________________________
Openembedded-core mailing list
[email protected]
http://lists.openembedded.org/mailman/listinfo/openembedded-core

On Wed, Feb 24, 2016 at 6:52 AM, Joshua Lock <[email protected]

Quoted 23 lines

wrote:

---
 meta/recipes-extended/hardlink/hardlink_0.3.0.bb | 19
+++++++++++++++++++

 1 file changed, 19 insertions(+)

 create mode 100644 meta/recipes-
extended/hardlink/hardlink_0.3.0.bb

meta/recipes-extended/hardlink/hardlink_0.3.0.bb new file +1 -0

new file mode 100644
index 0000000..2e06ac2
@@ -0,0 +1,19 @@
+SUMMARY = "hardlink is a tool which replaces multiple copies of a

file with hardlinks."

meta/recipes-extended/hardlink/hardlink_0.3.0.bb new file +2 -0

+LICENSE = "MIT"
+LIC_FILES_CHKSUM =

"file://hardlink.c;endline=22;md5=168464a4fc92fa7389c53b0755b39fbb"

meta/recipes-extended/hardlink/hardlink_0.3.0.bb new file +2 -0

+
+SRC_URI = "http://jak-linux.org/projects/hardlink/${BPN}_${PV}.tar

meta/recipes-extended/hardlink/hardlink_0.3.0.bb

Quoted 6 lines

.xz"

meta/recipes-extended/hardlink/hardlink_0.3.0.bb new file +2 -0

+SRC_URI[md5sum] = "72f1a460adb6874c151deab766e434ad"
+SRC_URI[sha256sum] =

"e8c93dfcb24aeb44a75281ed73757cb862cc63b225d565db1c270af9dbb7300f"

meta/recipes-extended/hardlink/hardlink_0.3.0.bb new file +2 -0

+
+DEPENDS = "libpcre attr"

According to the style guide, DEPENDS should come between LIC_FILES_CHKSUM and SRC_URI.

---
 meta/recipes-extended/hardlink/hardlink_0.3.0.bb | 19 +++++++++++++++++++
 1 file changed, 19 insertions(+)
 create mode 100644 meta/recipes-extended/hardlink/hardlink_0.3.0.bb

meta/recipes-extended/hardlink/hardlink_0.3.0.bb new file +19 -0

new file mode 100644
index 0000000..2e06ac2
@@ -0,0 +1,19 @@
+SUMMARY = "hardlink is a tool which replaces multiple copies of a file with hardlinks."
+LICENSE = "MIT"
+LIC_FILES_CHKSUM = "file://hardlink.c;endline=22;md5=168464a4fc92fa7389c53b0755b39fbb"
+
+SRC_URI = "http://jak-linux.org/projects/hardlink/${BPN}_${PV}.tar.xz"
+SRC_URI[md5sum] = "72f1a460adb6874c151deab766e434ad"
+SRC_URI[sha256sum] = "e8c93dfcb24aeb44a75281ed73757cb862cc63b225d565db1c270af9dbb7300f"
+
+DEPENDS = "libpcre attr"
+
+do_compile () {
+	oe_runmake 'DESTDIR=${D}' 'PREFIX=${prefix}' BINDIR='${bindir}'
+}
+
+do_install () {
+	oe_runmake install 'DESTDIR=${D}' 'PREFIX=${prefix}' BINDIR='${bindir}'
+}
+
+BBCLASSEXTEND = "native nativesdk"

I just noticed this, any reason to use this over fdupes?

I've used fdupes in the past for this exact thing -- primarily with shrinking
the size of multilib SDKs with a lot of locales.

--Mark

Quoted 41 lines · Joshua Lock

---
 meta/recipes-extended/hardlink/hardlink_0.3.0.bb | 19
+++++++++++++++++++

 1 file changed, 19 insertions(+)

 create mode 100644 meta/recipes-
extended/hardlink/hardlink_0.3.0.bb

meta/recipes-extended/hardlink/hardlink_0.3.0.bb new file +1 -0

new file mode 100644
index 0000000..2e06ac2
@@ -0,0 +1,19 @@
+SUMMARY = "hardlink is a tool which replaces multiple copies of a

file with hardlinks."

meta/recipes-extended/hardlink/hardlink_0.3.0.bb new file +2 -0

+LICENSE = "MIT"
+LIC_FILES_CHKSUM =

"file://hardlink.c;endline=22;md5=168464a4fc92fa7389c53b0755b39fbb"

meta/recipes-extended/hardlink/hardlink_0.3.0.bb new file +2 -0

+
+SRC_URI = "http://jak-linux.org/projects/hardlink/${BPN}_${PV}.tar

.xz"

meta/recipes-extended/hardlink/hardlink_0.3.0.bb new file +2 -0

+SRC_URI[md5sum] = "72f1a460adb6874c151deab766e434ad"
+SRC_URI[sha256sum] =

"e8c93dfcb24aeb44a75281ed73757cb862cc63b225d565db1c270af9dbb7300f"

meta/recipes-extended/hardlink/hardlink_0.3.0.bb new file +5 -0

+
+DEPENDS = "libpcre attr"
+
+do_compile () {
+	oe_runmake 'DESTDIR=${D}' 'PREFIX=${prefix}'

BINDIR='${bindir}'

meta/recipes-extended/hardlink/hardlink_0.3.0.bb new file +4 -0

+}
+
+do_install () {
+	oe_runmake install 'DESTDIR=${D}' 'PREFIX=${prefix}'

BINDIR='${bindir}'

meta/recipes-extended/hardlink/hardlink_0.3.0.bb new file +3 -0

+}
+
+BBCLASSEXTEND = "native nativesdk"

Quoted 1 line · Mark Hatle

I just noticed this, any reason to use this over fdupes?

No reason other than that hardlink is what the Clear Linux team, who authored swupd, are using. Is there a compelling reason to look at fdupes instead?

Thanks,

Joshua

Quoted 49 lines

I've used fdupes in the past for this exact thing -- primarily with shrinking
the size of multilib SDKs with a lot of locales.

--Mark

Quoted 41 lines · Joshua Lock

---
 meta/recipes-extended/hardlink/hardlink_0.3.0.bb | 19
+++++++++++++++++++
 1 file changed, 19 insertions(+)
 create mode 100644 meta/recipes-

extended/hardlink/hardlink_0.3.0.bb

meta/recipes-extended/hardlink/hardlink_0.3.0.bb new file +1 -0

new file mode 100644
index 0000000..2e06ac2
@@ -0,0 +1,19 @@
+SUMMARY = "hardlink is a tool which replaces multiple copies of a

file with hardlinks."

meta/recipes-extended/hardlink/hardlink_0.3.0.bb new file +2 -0

+LICENSE = "MIT"
+LIC_FILES_CHKSUM =

"file://hardlink.c;endline=22;md5=168464a4fc92fa7389c53b0755b39fbb"

meta/recipes-extended/hardlink/hardlink_0.3.0.bb new file +2 -0

+
+SRC_URI = "http://jak-linux.org/projects/hardlink/${BPN}_${PV}.tar

.xz"

meta/recipes-extended/hardlink/hardlink_0.3.0.bb new file +2 -0

+SRC_URI[md5sum] = "72f1a460adb6874c151deab766e434ad"
+SRC_URI[sha256sum] =

"e8c93dfcb24aeb44a75281ed73757cb862cc63b225d565db1c270af9dbb7300f"

meta/recipes-extended/hardlink/hardlink_0.3.0.bb new file +5 -0

+
+DEPENDS = "libpcre attr"
+
+do_compile () {
+	oe_runmake 'DESTDIR=${D}' 'PREFIX=${prefix}'

BINDIR='${bindir}'

meta/recipes-extended/hardlink/hardlink_0.3.0.bb new file +4 -0

+}
+
+do_install () {
+	oe_runmake install 'DESTDIR=${D}' 'PREFIX=${prefix}'

BINDIR='${bindir}'

meta/recipes-extended/hardlink/hardlink_0.3.0.bb new file +3 -0

+}
+
+BBCLASSEXTEND = "native nativesdk"

From: Mariano Lopez <[email protected]>

This commit adds the Clear Linux client updater.
This is experimental and bleeding edge, including the comments on the recipe.

Signed-off-by Mariano Lopez <[email protected]>

Signed-off-by Joshua Lock <[email protected]>

---
 .../0001-Tolerate-quotes-in-os-release-files.patch | 59 ++++++++++++++++++++++
 ...hange-systemctl-path-to-OE-systemctl-path.patch | 31 ++++++++++++
 .../swupd-client/Fix-build-failure-on-Yocto.patch  | 36 +++++++++++++
 .../Right-usage-of-AC_ARG_ENABLE-on-bzip2.patch    | 38 ++++++++++++++
 meta/recipes-devtools/swupd/swupd-client_2.87.bb   | 49 ++++++++++++++++++
 5 files changed, 213 insertions(+)
 create mode 100644 meta/recipes-devtools/swupd/swupd-client/0001-Tolerate-quotes-in-os-release-files.patch
 create mode 100644 meta/recipes-devtools/swupd/swupd-client/Change-systemctl-path-to-OE-systemctl-path.patch
 create mode 100644 meta/recipes-devtools/swupd/swupd-client/Fix-build-failure-on-Yocto.patch
 create mode 100644 meta/recipes-devtools/swupd/swupd-client/Right-usage-of-AC_ARG_ENABLE-on-bzip2.patch
 create mode 100644 meta/recipes-devtools/swupd/swupd-client_2.87.bb

meta/recipes-devtools/swupd/swupd-client/0001-Tolerate-quotes-in-os-release-files.patch new file +59 -0

new file mode 100644
index 0000000..49c71ae
@@ -0,0 +1,59 @@
+From 586e7b927461f6604ee3a3159cd7a6d4ac22ef30 Mon Sep 17 00:00:00 2001
+From: Dmitry Rozhkov <[email protected]>
+Date: Thu, 11 Feb 2016 13:29:57 +0200
+Subject: [PATCH 1/2] 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.
+
+Signed-off-by: Dmitry Rozhkov <[email protected]>
+
+Upstream-Status: Backport (v3.0.0+)
+
+---
+ 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
+--- a/src/version.c
++++ b/src/version.c
+@@ -88,6 +88,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");
+@@ -106,7 +107,22 @@ int read_version_from_subvol_file(char *path_prefix)
+ 			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
+

meta/recipes-devtools/swupd/swupd-client/Change-systemctl-path-to-OE-systemctl-path.patch new file +31 -0

new file mode 100644
index 0000000..5ca6373
@@ -0,0 +1,31 @@
+From 259d86e64146c3156eccfcce0351a9cdc4714766 Mon Sep 17 00:00:00 2001
+From: Jaska Uimonen <[email protected]>
+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
+

meta/recipes-devtools/swupd/swupd-client/Fix-build-failure-on-Yocto.patch new file +36 -0

new file mode 100644
index 0000000..73f1728
@@ -0,0 +1,36 @@
+From ccce73a2d703e6789ded87ca5aa9f3b7c506892a Mon Sep 17 00:00:00 2001
+From: Amarnath Valluri <[email protected]>
+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: Inappropriate
+
+Signed-off-by: Amarnath Valluri <[email protected]>
+---
+ 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
+

meta/recipes-devtools/swupd/swupd-client/Right-usage-of-AC_ARG_ENABLE-on-bzip2.patch new file +38 -0

new file mode 100644
index 0000000..e5b53ef
@@ -0,0 +1,38 @@
+From d80ae9954c5e5b720766274249dbf5309b7c70a9 Mon Sep 17 00:00:00 2001
+From: Amarnath Valluri <[email protected]>
+Date: Wed, 13 Jan 2016 15:46:19 +0200
+Subject: [PATCH] Right usage of AC_ARG_ENABLE on bzip2
+
+Upstream-Status: Pending[Not submitted]
+
+Signed-off-by: Amarnath Valluri <[email protected]>
+---
+ 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
+

meta/recipes-devtools/swupd/swupd-client_2.87.bb new file +35 -0

new file mode 100644
index 0000000..a5afdd6
@@ -0,0 +1,49 @@
+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 \
+"
+
+SRC_URI[md5sum] = "5d272c62edb8a9c576005ac5e1182ea3"
+SRC_URI[sha256sum] = "45df259a7dc2fed985ee9961e112120fc46670dd75476c3262fc6804b1c66fb8"
+
+DEPENDS = "glib-2.0 curl zlib bzip2 xz openssl"
+RDEPENDS_${PN} = "gzip bzip2 tar xz"
+# swupd requires at least an update-triggers target, should it be part of the
+# swupd-client package?
+RDEPENDS_${PN} = "swupd-units"
+# We check /etc/os-release for the current OS version number
+RRECOMMENDS_${PN} = "os-release"
+
+inherit pkgconfig autotools-brokensep systemd
+
+EXTRA_OECONF = "--with-systemdsystemunitdir=${systemd_system_unitdir}"
+
+#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

Quoted 316 lines · Joshua Lock

From: Mariano Lopez <[email protected]>

This commit adds the Clear Linux client updater.
This is experimental and bleeding edge, including the comments on the recipe.

Signed-off-by Mariano Lopez <[email protected]>

Signed-off-by Joshua Lock <[email protected]>

---
 .../0001-Tolerate-quotes-in-os-release-files.patch | 59
++++++++++++++++++++++
 ...hange-systemctl-path-to-OE-systemctl-path.patch | 31
++++++++++++
 .../swupd-client/Fix-build-failure-on-Yocto.patch  | 36
+++++++++++++
 .../Right-usage-of-AC_ARG_ENABLE-on-bzip2.patch    | 38
++++++++++++++
 meta/recipes-devtools/swupd/swupd-client_2.87.bb   | 49
++++++++++++++++++

 5 files changed, 213 insertions(+)

 create mode 100644 meta/recipes-devtools/swupd/swupd-client/0001- Tolerate-quotes-in-os-release-files.patch
 create mode 100644 meta/recipes-devtools/swupd/swupd- client/Change-systemctl-path-to-OE-systemctl-path.patch create mode 100644 meta/recipes-devtools/swupd/swupd-client/Fix- build-failure-on-Yocto.patch
 create mode 100644 meta/recipes-devtools/swupd/swupd-client/Right- usage-of-AC_ARG_ENABLE-on-bzip2.patch
 create mode 100644 meta/recipes-devtools/swupd/swupd- client_2.87.bb

(quoted diff) +0 -0

Tolerate-quotes-in-os-release-files.patch b/meta/recipes- devtools/swupd/swupd-client/0001-Tolerate-quotes-in-os-release- files.patch
new file mode 100644
index 0000000..49c71ae

meta/recipes-devtools/swupd/swupd-client/0001-Tolerate- new file +0 -0

quotes-in-os-release-files.patch

meta/recipes-devtools/swupd/swupd-client/0001-Tolerate- new file +1 -0

@@ -0,0 +1,59 @@
+From 586e7b927461f6604ee3a3159cd7a6d4ac22ef30 Mon Sep 17 00:00:00

2001

meta/recipes-devtools/swupd/swupd-client/0001-Tolerate- new file +24 -0

+From: Dmitry Rozhkov <[email protected]>
+Date: Thu, 11 Feb 2016 13:29:57 +0200
+Subject: [PATCH 1/2] 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.
+
+Signed-off-by: Dmitry Rozhkov <[email protected]>
+
+Upstream-Status: Backport (v3.0.0+)
+
+---
+ 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
+--- a/src/version.c
++++ b/src/version.c
+@@ -88,6 +88,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");
+@@ -106,7 +107,22 @@ int read_version_from_subvol_file(char *path_prefix)
+  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

meta/recipes-devtools/swupd/swupd-client/0001-Tolerate- new file +1 -0

+

(quoted diff) +0 -0

systemctl-path-to-OE-systemctl-path.patch b/meta/recipes- devtools/swupd/swupd-client/Change-systemctl-path-to-OE-systemctl- path.patch
new file mode 100644
index 0000000..5ca6373

meta/recipes-devtools/swupd/swupd-client/Change-systemctl- new file +0 -0

path-to-OE-systemctl-path.patch

meta/recipes-devtools/swupd/swupd-client/Change-systemctl- new file +1 -0

@@ -0,0 +1,31 @@
+From 259d86e64146c3156eccfcce0351a9cdc4714766 Mon Sep 17 00:00:00

2001

meta/recipes-devtools/swupd/swupd-client/Change-systemctl- new file +17 -0

+From: Jaska Uimonen <[email protected]>
+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

meta/recipes-devtools/swupd/swupd-client/Change-systemctl- new file +1 -0

+

(quoted diff) +0 -0

failure-on-Yocto.patch b/meta/recipes-devtools/swupd/swupd- client/Fix-build-failure-on-Yocto.patch
new file mode 100644
index 0000000..73f1728

meta/recipes-devtools/swupd/swupd-client/Fix-build-failure- new file +0 -0

on-Yocto.patch

meta/recipes-devtools/swupd/swupd-client/Fix-build-failure- new file +1 -0

@@ -0,0 +1,36 @@
+From ccce73a2d703e6789ded87ca5aa9f3b7c506892a Mon Sep 17 00:00:00

2001

meta/recipes-devtools/swupd/swupd-client/Fix-build-failure- new file +5 -0

+From: Amarnath Valluri <[email protected]>
+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

meta/recipes-devtools/swupd/swupd-client/Fix-build-failure- new file +27 -0

+_DATA twice. We can use EXTRA_DIST than dist_.
+
+Upstream-Status: Inappropriate
+
+Signed-off-by: Amarnath Valluri <[email protected]>
+---
+ 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

meta/recipes-devtools/swupd/swupd-client/Fix-build-failure- new file +1 -0

+

(quoted diff) +0 -0

of-AC_ARG_ENABLE-on-bzip2.patch b/meta/recipes- devtools/swupd/swupd-client/Right-usage-of-AC_ARG_ENABLE-on- bzip2.patch
new file mode 100644
index 0000000..e5b53ef

meta/recipes-devtools/swupd/swupd-client/Right-usage-of- new file +0 -0

AC_ARG_ENABLE-on-bzip2.patch

meta/recipes-devtools/swupd/swupd-client/Right-usage-of- new file +1 -0

@@ -0,0 +1,38 @@
+From d80ae9954c5e5b720766274249dbf5309b7c70a9 Mon Sep 17 00:00:00

2001

meta/recipes-devtools/swupd/swupd-client/Right-usage-of- new file +21 -0

+From: Amarnath Valluri <[email protected]>
+Date: Wed, 13 Jan 2016 15:46:19 +0200
+Subject: [PATCH] Right usage of AC_ARG_ENABLE on bzip2
+
+Upstream-Status: Pending[Not submitted]
+
+Signed-off-by: Amarnath Valluri <[email protected]>
+---
+ 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

meta/recipes-devtools/swupd/swupd-client/Right-usage-of- new file +1 -0

+

meta/recipes-devtools/swupd/swupd-client_2.87.bb new file +1 -0

new file mode 100644
index 0000000..a5afdd6
@@ -0,0 +1,49 @@
+SUMMARY = "swupd sofware update from Clear Linux - client

component"

meta/recipes-devtools/swupd/swupd-client_2.87.bb new file +2 -0

+LICENSE = "GPL-2.0"
+LIC_FILES_CHKSUM =

"file://COPYING;md5=04d0b48662817042d80393e7511fa41b \
+                    file://bsdiff/LICENSE;md5=0dbe7a50f02826975063 1fcbded3846a"

meta/recipes-devtools/swupd/swupd-client_2.87.bb new file +3 -0

+
+SRC_URI = "\
+    https://download.clearlinux.org/releases/5700/clear/source/SRP

MS/${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 \
+"

meta/recipes-devtools/swupd/swupd-client_2.87.bb new file +3 -0

+
+SRC_URI[md5sum] = "5d272c62edb8a9c576005ac5e1182ea3"
+SRC_URI[sha256sum] =

"45df259a7dc2fed985ee9961e112120fc46670dd75476c3262fc6804b1c66fb8"

meta/recipes-devtools/swupd/swupd-client_2.87.bb new file +4 -0

+
+DEPENDS = "glib-2.0 curl zlib bzip2 xz openssl"
+RDEPENDS_${PN} = "gzip bzip2 tar xz"
+# swupd requires at least an update-triggers target, should it be

part of the

meta/recipes-devtools/swupd/swupd-client_2.87.bb new file +8 -0

+# swupd-client package?
+RDEPENDS_${PN} = "swupd-units"
+# We check /etc/os-release for the current OS version number
+RRECOMMENDS_${PN} = "os-release"
+
+inherit pkgconfig autotools-brokensep systemd
+
+EXTRA_OECONF = "--with-

systemdsystemunitdir=${systemd_system_unitdir}"

meta/recipes-devtools/swupd/swupd-client_2.87.bb new file +4 -0

+
+#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

meta/recipes-devtools/swupd/swupd-client_2.87.bb new file +2 -0

+}
+

Quoted 4 lines

+FILES_${PN} += "\
+    /usr/share/clear \
+    ${systemd_system_unitdir}/multi-user.target.wants* \
+    /var/lib/swupd \

Try using ${datadir} and ${localstatedir} if possible:
    ${datadir}/clear ${localstatedir}/lib//swupd
    install -d ${D}${datadir}/clear/bundles

Our initial strategy to generate bundles for consumption by swupd is to generate images which contain the base image (os-core) plus the additional contents of the bundle, then prune out the core contents. By generating images in this manner we hope to accomodate packages which modify the rootfs outside of installing files, i.e. with postinsts.

To that end this class, to be used via BBCLASSEXTEND, will generate virtual image recipes that add extra packages to the extended image.

Only extensions matching entries in a SWUPD_BUNDLES variable are valid and the bundle contents should be listed in a varFlag matching the bundle's name on the BUNDLE_CONTENTS variable.

An example of usage in an image recipe follows:

SWUPD_BUNDLES = "foo bar"
BUNDLE_CONTENTS[foo] = "foo foo-bar foobaz"
BUNDLE_CONTENTS[bar] = "bar baz quux"

BBCLASSEXTEND = "swupdbundle:foo"

Signed-off-by Joshua Lock <[email protected]>

---
 meta/classes/swupdbundle.bbclass | 59 ++++++++++++++++++++++++++++++++++++++++
 1 file changed, 59 insertions(+)
 create mode 100644 meta/classes/swupdbundle.bbclass

meta/classes/swupdbundle.bbclass new file +41 -0

new file mode 100644
index 0000000..897666d
@@ -0,0 +1,59 @@
+# Our initial strategy to generate bundles for consumption by swupd is to
+# generate images which contain the base image (os-core) plus the additional
+# contents of the bundle, then prune out the core contents. By generating
+# images in this manner we hope to accomodate packages which modify the rootfs
+# outside of installing files, i.e.with postinsts.
+#
+# To that end this class, to be used via BBCLASSEXTEND, will generate virtual
+# image recipes that add extra packages to the extended image.
+#
+# Only extensions matching entries in a SWUPD_BUNDLES variable are valid and
+# the bundle contents should be listed in a varFlag matching the bundle's name
+# on the BUNDLE_CONTENTS variable. i.e in foo-image.bb:
+#
+# SWUPD_BUNDLES = "foo bar"
+# BUNDLE_CONTENTS[foo] = "foo foo-bar foobaz"
+# BUNDLE_CONTENTS[bar] = "bar baz quux"
+# BBCLASSEXTEND = "swupdbundle:foo"
+
+python swupdbundle_virtclass_handler () {
+    pn = e.data.getVar("PN", True)
+    cls = e.data.getVar("BBEXTENDCURR", True)
+    bundle = e.data.getVar("BBEXTENDVARIANT", True)
+
+    if cls != 'swupdbundle':
+        return
+
+    if not bundle:
+        bb.fatal('swupdbundle must be used with a parameter i.e. BBCLASSEXTEND="swupdbundle:foo"')
+
+    # Rename the virtual recipe to create the desired image bundle variant.
+    e.data.setVar("PN_BASE", pn)
+    pn = pn + '-' + bundle
+    e.data.setVar("PN", pn)
+    e.data.setVar("BUNDLE_NAME", bundle)
+
+    bundles = (e.data.getVar('SWUPD_BUNDLES', True) or "").split()
+    if not bundles:
+        bb.fatal('SWUPD_BUNDLES is not defined, this variable should list bundles for the image.')
+
+    curr_install = (e.data.getVar('IMAGE_INSTALL', True) or "").split()
+

meta/classes/swupdbundle.bbclass new file +8 -1

+    else:
+        curr_install += get_bundle_contents(bundle)
+
+    e.data.setVar('IMAGE_INSTALL', ' '.join(curr_install))
+}
+
+addhandler swupdbundle_virtclass_handler
+swupdbundle_virtclass_handler[eventmask] = "bb.event.RecipePreFinalise"
--

2.5.0

--
_______________________________________________
Openembedded-core mailing list
[email protected]
http://lists.openembedded.org/mailman/listinfo/openembedded-core

Quoted 97 lines · Joshua Lock

Our initial strategy to generate bundles for consumption by swupd is to generate images which contain the base image (os-core) plus the additional contents of the bundle, then prune out the core contents. By generating images in this manner we hope to accomodate packages which modify the rootfs outside of installing files, i.e. with postinsts.

To that end this class, to be used via BBCLASSEXTEND, will generate virtual image recipes that add extra packages to the extended image.

Only extensions matching entries in a SWUPD_BUNDLES variable are valid and the bundle contents should be listed in a varFlag matching the bundle's name on the BUNDLE_CONTENTS variable.

An example of usage in an image recipe follows:

SWUPD_BUNDLES = "foo bar"
BUNDLE_CONTENTS[foo] = "foo foo-bar foobaz"
BUNDLE_CONTENTS[bar] = "bar baz quux"

BBCLASSEXTEND = "swupdbundle:foo"

Signed-off-by Joshua Lock <[email protected]>

---
 meta/classes/swupdbundle.bbclass | 59
++++++++++++++++++++++++++++++++++++++++

 1 file changed, 59 insertions(+)

 create mode 100644 meta/classes/swupdbundle.bbclass

meta/classes/swupdbundle.bbclass new file +1 -0

new file mode 100644
index 0000000..897666d
@@ -0,0 +1,59 @@
+# Our initial strategy to generate bundles for consumption by

swupd is to
+# generate images which contain the base image (os-core) plus the additional
+# contents of the bundle, then prune out the core contents. By generating
+# images in this manner we hope to accomodate packages which modify the rootfs

meta/classes/swupdbundle.bbclass new file +3 -0

+# outside of installing files, i.e.with postinsts.
+#
+# To that end this class, to be used via BBCLASSEXTEND, will

generate virtual

meta/classes/swupdbundle.bbclass new file +3 -0

+# image recipes that add extra packages to the extended image.
+#
+# Only extensions matching entries in a SWUPD_BUNDLES variable are

valid and
+# the bundle contents should be listed in a varFlag matching the bundle's name

meta/classes/swupdbundle.bbclass new file +17 -0

+# on the BUNDLE_CONTENTS variable. i.e in foo-image.bb:
+#
+# SWUPD_BUNDLES = "foo bar"
+# BUNDLE_CONTENTS[foo] = "foo foo-bar foobaz"
+# BUNDLE_CONTENTS[bar] = "bar baz quux"
+# BBCLASSEXTEND = "swupdbundle:foo"
+
+python swupdbundle_virtclass_handler () {
+    pn = e.data.getVar("PN", True)
+    cls = e.data.getVar("BBEXTENDCURR", True)
+    bundle = e.data.getVar("BBEXTENDVARIANT", True)
+
+    if cls != 'swupdbundle':
+        return
+
+    if not bundle:
+        bb.fatal('swupdbundle must be used with a parameter i.e.

BBCLASSEXTEND="swupdbundle:foo"')
+
+    # Rename the virtual recipe to create the desired image bundle variant.
+    e.data.setVar("PN_BASE", pn)
+    pn = pn + '-' + bundle
+    e.data.setVar("PN", pn)
+    e.data.setVar("BUNDLE_NAME", bundle)
+
+    bundles = (e.data.getVar('SWUPD_BUNDLES', True) or "").split() +    if not bundles:
+        bb.fatal('SWUPD_BUNDLES is not defined, this variable should list bundles for the image.')
+
+    curr_install = (e.data.getVar('IMAGE_INSTALL', True) or "").split()
+
+    def get_bundle_contents(bndl):
+        contents = e.data.getVarFlag('BUNDLE_CONTENTS', bndl, True)
+        if contents:
+            return contents.split()
+        else:
+            bb.fatal('BUNDLE_CONTENTS[%s] is not set, this should

Quoted 5 lines

list the packages to be included in the bundle.' % bndl) +
+    if bundle == 'mega':
+        for bndl in bundles:
+            curr_install += get_bundle_contents(bndl)

Bundle named 'mega' seems to be very specific (a bundle of bundles) but
is not documented as a reserved name.

Quoted 13 lines

+    else:
+        curr_install += get_bundle_contents(bundle)

meta/classes/swupdbundle.bbclass new file +6 -0

+
+    e.data.setVar('IMAGE_INSTALL', ' '.join(curr_install))
+}
+
+addhandler swupdbundle_virtclass_handler
+swupdbundle_virtclass_handler[eventmask] =

"bb.event.RecipePreFinalise"
--
2.5.0

Quoted 5 lines

--
_______________________________________________
Openembedded-core mailing list
[email protected]
http://lists.openembedded.org/mailman/listinfo/openembedded-core

--
Maciej Borzęcki
Senior Software Developer at Open-RnD Sp. z o.o., Poland

Our initial strategy to generate bundles for consumption by swupd is to generate images which contain the base image (os-core) plus the additional contents of the bundle, then prune out the core contents. By generating images in this manner we hope to accomodate packages which modify the rootfs outside of installing files, i.e. with postinsts.

To that end this class, to be used via BBCLASSEXTEND, will generate virtual image recipes that add extra packages to the extended image.

Quoted 8 lines · Joshua Lock

Our initial strategy to generate bundles for consumption by swupd is to generate images which contain the base image (os-core) plus the additional contents of the bundle, then prune out the core contents. By generating images in this manner we hope to accomodate packages which modify the rootfs outside of installing files, i.e. with postinsts.

Quoted 3 lines

To that end this class, to be used via BBCLASSEXTEND, will generate virtual image recipes that add extra packages to the extended image.

Can this be combined with an image recipe which itself uses BBCLASSEXTEND to generate virtual image recipes, i.e. create a virtual
recipes based on a virtual recipe?

Approach:
An image that inherits the swupd-image bbclass will automatically have bundle 'chroots' created which contain the filesystem contents of the specified bundles, with the contents of the inheriting image forming the default os-core bundle.

The mechanism to achieve this is that several virtual image recipes are created using the swupdbundle class, one for each defined bundle plus a 'mega' image recipe. The 'mega' image contains the base image plus the contents of all of the bundles, whilst bundle images contain only the base image plus the contents of a single bundle.

We took the approach of building images, rather than populating the chroot-like bundle directories with a package manager, because various layers and recipes make changes to the rootfs contents outside of the package manager, particularly with IMAGE_POSTPROCESS_COMMAND, etc.

Hello!

I haven't had a chance to play with the actual code yet and I don't know
yet when I'll be able to. Let me ask for some clarifications about the
approach first anyway.

Quoted 11 lines · Joshua Lock

Approach:
An image that inherits the swupd-image bbclass will automatically have bundle
'chroots' created which contain the filesystem contents of the specified
bundles, with the contents of the inheriting image forming the default os-core
bundle.

The mechanism to achieve this is that several virtual image recipes

Quoted 8 lines

are created
using the swupdbundle class, one for each defined bundle plus a 'mega' image
recipe. The 'mega' image contains the base image plus the contents of all of the
bundles, whilst bundle images contain only the base image plus the contents of a
single bundle.

Just to be sure, the actual "content" (a term that is a bit too overloaded to be used precisely in all cases) of a file and its meta attributes will come from the mega image, and the virtual image recipes,
including the base image, are merely used to generate file lists?

What is the content of the actual image that gets created? It has to match the content (= file content and meta information) of the mega image and not of the base image, otherwise there can be inconsistencies
between the actual running image and the core os bundle. I suppose swupd
will be able to fix that, but I'm not sure.

It sounds like this bundle creation is completely separated from the regular image creation; if so, then I suspect that this may have to change.

Quoted 8 lines

We took the approach of building images, rather than populating the chroot-like
bundle directories with a package manager, because various layers and recipes
make changes to the rootfs contents outside of the package manager, particularly
with IMAGE_POSTPROCESS_COMMAND, etc.

Makes sense to me.

Have you considered generating the file lists more efficiently? I can think of some alternatives, but all have downsides.

Quoted 28 lines · Patrick Ohly

Hello!

I haven't had a chance to play with the actual code yet and I don't know
yet when I'll be able to. Let me ask for some clarifications about the
approach first anyway.

Quoted 10 lines · Joshua Lock

Approach:
An image that inherits the swupd-image bbclass will automatically have bundle
'chroots' created which contain the filesystem contents of the specified
bundles, with the contents of the inheriting image forming the default os-core
bundle.

Quoted 9 lines

The mechanism to achieve this is that several virtual image recipes are created
using the swupdbundle class, one for each defined bundle plus a 'mega' image
recipe. The 'mega' image contains the base image plus the contents of all of the
bundles, whilst bundle images contain only the base image plus the contents of a
single bundle.

Quoted 5 lines

Just to be sure, the actual "content" (a term that is a bit too overloaded to be used precisely in all cases) of a file and its meta attributes will come from the mega image, and the virtual image recipes,
including the base image, are merely used to generate file lists?

That's not currently true, no — the file contents for a bundle come from the bundle image and the file contents for os-core come from the base image. It shouldn't be too difficult a change to make, I'll take a look now.

Quoted 11 lines

What is the content of the actual image that gets created? It has to match the content (= file content and meta information) of the mega image and not of the base image, otherwise there can be inconsistencies
between the actual running image and the core os bundle. I suppose swupd
will be able to fix that, but I'm not sure.

It sounds like this bundle creation is completely separated from the regular image creation; if so, then I suspect that this may have to change.

Right, currently bundle creation happens after image creation and as above bundles are populated from the rootfs of the bundle images.

You're right, of course, we'll need to construct the running image from the bundle contents for more complex images.

Quoted 9 lines

Quoted 7 lines

We took the approach of building images, rather than populating the chroot-like
bundle directories with a package manager, because various layers and recipes
make changes to the rootfs contents outside of the package manager, particularly
with IMAGE_POSTPROCESS_COMMAND, etc.

Makes sense to me.

Quoted 3 lines

Have you considered generating the file lists more efficiently? I can think of some alternatives, but all have downsides.

I did consider a couple of other approaches but with a goal of submitting this for M3 this approach felt like the surest route within the time available. I'd certainly like to find a more efficient method and if you have any suggestions I'd be happy to hear them.

Quoted 44 lines · Joshua G

Quoted 36 lines · Patrick Ohly

Hello!

I haven't had a chance to play with the actual code yet and I don't
know
yet when I'll be able to. Let me ask for some clarifications about
the
approach first anyway.

Quoted 12 lines · Joshua Lock

Approach:
An image that inherits the swupd-image bbclass will automatically
have bundle
'chroots' created which contain the filesystem contents of the specified
bundles, with the contents of the inheriting image forming the default os-core
bundle.

Quoted 12 lines

The mechanism to achieve this is that several virtual image recipes
are created
using the swupdbundle class, one for each defined bundle plus a 'mega' image
recipe. The 'mega' image contains the base image plus the contents
of all of the
bundles, whilst bundle images contain only the base image plus the
contents of a
single bundle.

Quoted 6 lines

Just to be sure, the actual "content" (a term that is a bit too overloaded to be used precisely in all cases) of a file and its meta
attributes will come from the mega image, and the virtual image recipes,
including the base image, are merely used to generate file lists?

Quoted 6 lines

That's not currently true, no — the file contents for a bundle come from the bundle image and the file contents for os-core come from the
base image. It shouldn't be too difficult a change to make, I'll take a
look now.

The prime example that needs to be handled correctly is where installing
additional packages for one of the extra bundles adds a system user to /etc/passwd (*). The content of /etc/passwd must come from the mega
rootfs.

(*) Except that swupd assumes that the distro is stateless and thus automatically excludes /etc from bundles. The example is still valid because preparing bundles does not need to care about that.

Ideally the work done here and the work done on meta-swupdate[1] would be somehow merged so people creating images/distros would only have to learn and integrate one software update solution, instead of having to evaluate and choose between the two (or more?).

[1] https://github.com/sbabic/meta-swupdate

Dnia 24 luty 2016 o 17:35 Philip Balister <[email protected]> napisał(a):

Quoted 6 lines · Trevor Woerner

Ideally the work done here and the work done on meta-swupdate[1] would be somehow merged so people creating images/distros would only have to learn and integrate one software update solution, instead of having to evaluate and choose between the two (or more?).

Quoted 1 line

[1] https://github.com/sbabic/meta-swupdate

Amen. I had the same thoughts reading the patch set intro.

Maybe the swupd should go in a seperate layer so we can see which project works best for oe users before moving something directly into oe-core?

Quoted 6 lines · Trevor Woerner

Ideally the work done here and the work done on meta-swupdate[1] would be somehow merged so people creating images/distros would only have to learn and integrate one software update solution, instead of having to evaluate and choose between the two (or more?).

[1] https://github.com/sbabic/meta-swupdate

Amen. I had the same thoughts reading the patch set intro.

Maybe the swupd should go in a seperate layer so we can see which project works best for oe users before moving something directly into oe-core?

Quoted 9 lines · On Wed, 24 Feb 2016 11:35:25 Philip Balister wrote:

Quoted 6 lines · Trevor Woerner

Ideally the work done here and the work done on meta-swupdate[1] would be somehow merged so people creating images/distros would only have to learn and integrate one software update solution, instead of having to evaluate and choose between the two (or more?).

[1] https://github.com/sbabic/meta-swupdate

Amen. I had the same thoughts reading the patch set intro.

I think it would be hard to integrate these two, since they operate quite differently to eachother.

Quoted 3 lines

Maybe the swupd should go in a seperate layer so we can see which project works best for oe users before moving something directly into oe-core?

This makes sense to me too though FWIW. The os-release patch should probably go straight in, but everything else looks like it could comfortably live in a separate layer without making things too difficult.

Cheers,
Paul

Quoted 24 lines · Paul Eggleton

Quoted 11 lines · On Wed, 24 Feb 2016 11:35:25 Philip Balister wrote:

Quoted 9 lines · Trevor Woerner

Ideally the work done here and the work done on meta- swupdate[1] would
be somehow merged so people creating images/distros would only have to
learn and integrate one software update solution, instead of having to
evaluate and choose between the two (or more?).

Quoted 2 lines

Quoted 1 line

[1] https://github.com/sbabic/meta-swupdate

Amen. I had the same thoughts reading the patch set intro.

I think it would be hard to integrate these two, since they operate quite
differently to eachother.

Quoted 5 lines

Maybe the swupd should go in a seperate layer so we can see which project works best for oe users before moving something directly into
oe-core?

Quoted 5 lines

This makes sense to me too though FWIW. The os-release patch should probably
go straight in, but everything else looks like it could comfortably live in a
separate layer without making things too difficult.

It also makes it easier to update as problems in swupd are resolved since you do not need to go through the entire oe-core testing cycle.