[OE-core] [meta-swupd][PATCH v2] swupd-client, swupd-server: Patch swupd to treat /home/* as non-state
Amarnath Valluri
amarnath.valluri at intel.com
Fri Jul 22 10:38:20 UTC 2016
This allows bundles to deploy content specific to user
Signed-off-by: Amarnath Valluri <amarnath.valluri at intel.com>
---
.../0001-Do-not-consider-home-as-user-state.patch | 62 ++++++++++++++++++++++
.../0001-Do-not-consider-home-as-user-state.patch | 62 ++++++++++++++++++++++
recipes-core/swupd-client/swupd-client_2.87.bb | 1 +
recipes-core/swupd-client/swupd-client_git.bb | 1 +
.../0001-Don-t-treat-home-as-user-state.patch | 60 +++++++++++++++++++++
.../0001-Don-t-treate-home-as-user-state.patch | 61 +++++++++++++++++++++
.../0001-Don-t-treat-home-as-user-state.patch | 61 +++++++++++++++++++++
.../0001-Don-t-treate-home-as-user-state.patch | 61 +++++++++++++++++++++
recipes-core/swupd-server/swupd-server_2.53.bb | 1 +
recipes-core/swupd-server/swupd-server_git.bb | 1 +
10 files changed, 371 insertions(+)
create mode 100644 recipes-core/swupd-client/swupd-client-2.87/0001-Do-not-consider-home-as-user-state.patch
create mode 100644 recipes-core/swupd-client/swupd-client/0001-Do-not-consider-home-as-user-state.patch
create mode 100644 recipes-core/swupd-server/swupd-server-2.53/0001-Don-t-treat-home-as-user-state.patch
create mode 100644 recipes-core/swupd-server/swupd-server-2.53/0001-Don-t-treate-home-as-user-state.patch
create mode 100644 recipes-core/swupd-server/swupd-server/0001-Don-t-treat-home-as-user-state.patch
create mode 100644 recipes-core/swupd-server/swupd-server/0001-Don-t-treate-home-as-user-state.patch
diff --git a/recipes-core/swupd-client/swupd-client-2.87/0001-Do-not-consider-home-as-user-state.patch b/recipes-core/swupd-client/swupd-client-2.87/0001-Do-not-consider-home-as-user-state.patch
new file mode 100644
index 0000000..29c8a7b
--- /dev/null
+++ b/recipes-core/swupd-client/swupd-client-2.87/0001-Do-not-consider-home-as-user-state.patch
@@ -0,0 +1,62 @@
+From 6a7101d85ac6c3df4d12c2e31daf3759d3fabecc Mon Sep 17 00:00:00 2001
+From: Amarnath Valluri <amarnath.valluri at intel.com>
+Date: Wed, 13 Jul 2016 14:37:26 +0300
+Subject: [PATCH] Do not consider /home/* as user state
+
+This allows to deploy user home folder as part of a bundle.
+
+Upstream-Status: Pending
+
+Signed-off-by: Amarnath Valluri <amarnath.valluri at intel.com>
+---
+ configure.ac | 11 +++++++++++
+ src/heuristics.c | 4 +++-
+ 2 files changed, 14 insertions(+), 1 deletion(-)
+
+diff --git a/configure.ac b/configure.ac
+index ec26c63..bb4de76 100644
+--- a/configure.ac
++++ b/configure.ac
+@@ -79,6 +79,17 @@ AC_ARG_ENABLE(
+ AC_DEFINE(OS_IS_STATELESS,1,[OS is stateless])
+ )
+
++AC_ARG_ENABLE([stateless-home],
++ AS_HELP_STRING([--disable-stateless-home], [treat /home/* as
++ user state, ignore user home folder changes (stateless by default)]),
++ [enable_stateless_home=$enableval],
++ [enable_stateless_home=yes]
++)
++AS_IF([test "x$enable_stateless_home" = "xyes"],
++ [AC_DEFINE([STATELESS_HOME], [1], [Treat $HOME as user state])],
++ [AC_DEFINE([STATELESS_HOME], [0], [Do not treat $HOME as user state])]
++)
++
+ 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/src/heuristics.c b/src/heuristics.c
+index c488e17..7999015 100644
+--- a/src/heuristics.c
++++ b/src/heuristics.c
+@@ -30,6 +30,8 @@
+ #include "config.h"
+ #include "swupd.h"
+
++#include "config.h"
++
+ /* trailing slash is to indicate dir itself is expected to exist, but
+ * contents are ignored */
+ bool is_config(char *filename)
+@@ -65,7 +67,7 @@ bool is_state(char *filename)
+
+ if ((strncmp(filename, "/data", 5) == 0) ||
+ (strncmp(filename, "/dev/", 5) == 0) ||
+- (strncmp(filename, "/home/", 6) == 0) ||
++ (!STATELESS_HOME && (strncmp(filename, "/home/", 6) == 0)) ||
+ (strncmp(filename, "/lost+found", 11) == 0) ||
+ (strncmp(filename, "/proc/", 6) == 0) ||
+ (strncmp(filename, "/root/", 6) == 0) ||
+--
+2.5.0
+
diff --git a/recipes-core/swupd-client/swupd-client/0001-Do-not-consider-home-as-user-state.patch b/recipes-core/swupd-client/swupd-client/0001-Do-not-consider-home-as-user-state.patch
new file mode 100644
index 0000000..29c8a7b
--- /dev/null
+++ b/recipes-core/swupd-client/swupd-client/0001-Do-not-consider-home-as-user-state.patch
@@ -0,0 +1,62 @@
+From 6a7101d85ac6c3df4d12c2e31daf3759d3fabecc Mon Sep 17 00:00:00 2001
+From: Amarnath Valluri <amarnath.valluri at intel.com>
+Date: Wed, 13 Jul 2016 14:37:26 +0300
+Subject: [PATCH] Do not consider /home/* as user state
+
+This allows to deploy user home folder as part of a bundle.
+
+Upstream-Status: Pending
+
+Signed-off-by: Amarnath Valluri <amarnath.valluri at intel.com>
+---
+ configure.ac | 11 +++++++++++
+ src/heuristics.c | 4 +++-
+ 2 files changed, 14 insertions(+), 1 deletion(-)
+
+diff --git a/configure.ac b/configure.ac
+index ec26c63..bb4de76 100644
+--- a/configure.ac
++++ b/configure.ac
+@@ -79,6 +79,17 @@ AC_ARG_ENABLE(
+ AC_DEFINE(OS_IS_STATELESS,1,[OS is stateless])
+ )
+
++AC_ARG_ENABLE([stateless-home],
++ AS_HELP_STRING([--disable-stateless-home], [treat /home/* as
++ user state, ignore user home folder changes (stateless by default)]),
++ [enable_stateless_home=$enableval],
++ [enable_stateless_home=yes]
++)
++AS_IF([test "x$enable_stateless_home" = "xyes"],
++ [AC_DEFINE([STATELESS_HOME], [1], [Treat $HOME as user state])],
++ [AC_DEFINE([STATELESS_HOME], [0], [Do not treat $HOME as user state])]
++)
++
+ 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/src/heuristics.c b/src/heuristics.c
+index c488e17..7999015 100644
+--- a/src/heuristics.c
++++ b/src/heuristics.c
+@@ -30,6 +30,8 @@
+ #include "config.h"
+ #include "swupd.h"
+
++#include "config.h"
++
+ /* trailing slash is to indicate dir itself is expected to exist, but
+ * contents are ignored */
+ bool is_config(char *filename)
+@@ -65,7 +67,7 @@ bool is_state(char *filename)
+
+ if ((strncmp(filename, "/data", 5) == 0) ||
+ (strncmp(filename, "/dev/", 5) == 0) ||
+- (strncmp(filename, "/home/", 6) == 0) ||
++ (!STATELESS_HOME && (strncmp(filename, "/home/", 6) == 0)) ||
+ (strncmp(filename, "/lost+found", 11) == 0) ||
+ (strncmp(filename, "/proc/", 6) == 0) ||
+ (strncmp(filename, "/root/", 6) == 0) ||
+--
+2.5.0
+
diff --git a/recipes-core/swupd-client/swupd-client_2.87.bb b/recipes-core/swupd-client/swupd-client_2.87.bb
index 96e7a10..8a005ff 100644
--- a/recipes-core/swupd-client/swupd-client_2.87.bb
+++ b/recipes-core/swupd-client/swupd-client_2.87.bb
@@ -18,6 +18,7 @@ SRC_URI = "\
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 \
+ file://0001-Do-not-consider-home-as-user-state.patch \
"
SRC_URI[md5sum] = "5d272c62edb8a9c576005ac5e1182ea3"
diff --git a/recipes-core/swupd-client/swupd-client_git.bb b/recipes-core/swupd-client/swupd-client_git.bb
index 1815db0..2a23c19 100644
--- a/recipes-core/swupd-client/swupd-client_git.bb
+++ b/recipes-core/swupd-client/swupd-client_git.bb
@@ -10,6 +10,7 @@ SRC_URI = "\
git://github.com/clearlinux/swupd-client.git;protocol=https \
file://Change-systemctl-path-to-OE-systemctl-path.patch \
file://0001-Add-configure-option-to-re-enable-updating-of-config.patch \
+ file://0001-Do-not-consider-home-as-user-state.patch \
"
SRCREV = "f4000c5b22be47ec1af2f8748fd71a36148b5dc4"
diff --git a/recipes-core/swupd-server/swupd-server-2.53/0001-Don-t-treat-home-as-user-state.patch b/recipes-core/swupd-server/swupd-server-2.53/0001-Don-t-treat-home-as-user-state.patch
new file mode 100644
index 0000000..e2aaa5d
--- /dev/null
+++ b/recipes-core/swupd-server/swupd-server-2.53/0001-Don-t-treat-home-as-user-state.patch
@@ -0,0 +1,60 @@
+From 3d79a5bef173edfc34a612d1ef5994faedea723b Mon Sep 17 00:00:00 2001
+From: Amarnath Valluri <amarnath.valluri at intel.com>
+Date: Fri, 15 Jul 2016 14:29:53 +0300
+Subject: [PATCH] Don't treat /home/* as user state
+
+This allows to deploy user home folder as part of a bundle
+
+Upstream-status: Pending
+
+Signed-off-by: Amarnath Valluri <amarnath.valluri at intel.com>
+---
+ configure.ac | 11 +++++++++++
+ src/heuristics.c | 3 ++-
+ 2 files changed, 13 insertions(+), 1 deletion(-)
+
+diff --git a/configure.ac b/configure.ac
+index 32d1412..fb70313 100644
+--- a/configure.ac
++++ b/configure.ac
+@@ -53,5 +53,16 @@ AS_IF([test "$enable_lzma" = "check"],
+
+ AM_CONDITIONAL([ENABLE_LZMA], [test "$enable_lzma" = "yes"])
+
++AC_ARG_ENABLE([stateless-home],
++ AS_HELP_STRING([--disable-stateless-home], [treat /home/* as user state, ignore user home folder changes (stateless by default)]),
++ [enable_stateless_home=$enableval],
++ [enable_stateless_home=yes]
++)
++AS_IF([test "x$enable_stateless_home" = "xyes"],
++ [AC_DEFINE([STATELESS_HOME], [1], [Treat $HOME as user state])],
++ [AC_DEFINE([STATELESS_HOME], [0], [Do not treat $HOME as user state])]
++)
++
++
+ AC_CONFIG_FILES([Makefile])
+ AC_OUTPUT
+diff --git a/src/heuristics.c b/src/heuristics.c
+index 18fa9b9..e52af76 100644
+--- a/src/heuristics.c
++++ b/src/heuristics.c
+@@ -31,6 +31,7 @@
+
+ #include <swupd.h>
+
++#include "config.h"
+
+
+ /* TODO: this needs to come from a file that has a list of regexps */
+@@ -62,7 +63,7 @@ static void runtime_state_heuristics(struct file *file)
+ /* the contents of these directory are state, ideally this never
+ * triggers if our package builds are clean */
+ if ((strncmp(file->filename, "/dev/", 5) == 0) ||
+- (strncmp(file->filename, "/home/", 6) == 0) ||
++ (!STATELESS_HOME && (strncmp(file->filename, "/home/", 6) == 0)) ||
+ (strncmp(file->filename, "/proc/", 6) == 0) ||
+ (strncmp(file->filename, "/root/", 6) == 0) ||
+ (strncmp(file->filename, "/run/", 5) == 0) ||
+--
+2.5.0
+
diff --git a/recipes-core/swupd-server/swupd-server-2.53/0001-Don-t-treate-home-as-user-state.patch b/recipes-core/swupd-server/swupd-server-2.53/0001-Don-t-treate-home-as-user-state.patch
new file mode 100644
index 0000000..5555e14
--- /dev/null
+++ b/recipes-core/swupd-server/swupd-server-2.53/0001-Don-t-treate-home-as-user-state.patch
@@ -0,0 +1,61 @@
+From 60dcc111ba50419f31af970690b4a9bba59af232 Mon Sep 17 00:00:00 2001
+From: Amarnath Valluri <amarnath.valluri at intel.com>
+Date: Fri, 15 Jul 2016 12:44:31 +0300
+Subject: [PATCH] Don't treate /home/* as user state
+
+This allows to deploy user home folder as part of a bundle
+
+Upstream-status: Pending
+
+Signed-off-by: Amarnath Valluri <amarnath.valluri at intel.com>
+---
+ configure.ac | 10 ++++++++++
+ src/heuristics.c | 4 +++-
+ 2 files changed, 13 insertions(+), 1 deletion(-)
+
+diff --git a/configure.ac b/configure.ac
+index c2bd7bf..69ee5e4 100644
+--- a/configure.ac
++++ b/configure.ac
+@@ -82,6 +82,16 @@ AS_IF([test "$enable_lzma" != "no"], [
+ ])
+ AM_CONDITIONAL([ENABLE_LZMA], [test "$enable_lzma" != "no"])
+
++AC_ARG_ENABLE([stateless-home],
++ AS_HELP_STRING([--disable-stateless-home], [treate /home/* as user state, ignore user home folder changes (stateless by default)]),
++ [enable_stateless_home=$enableval],
++ [enable_stateless_home=yes]
++)
++AS_IF([test "x$enable_stateless_home" = "xyes"],
++ [AC_DEFINE([STATELESS_HOME], [1], [Treat $HOME as user state])],
++ [AC_DEFINE([STATELESS_HOME], [0], [Do not treat $HOME as user state])]
++)
++
+ AC_CONFIG_FILES([Makefile])
+ AC_REQUIRE_AUX_FILE([tap-driver.sh])
+ AC_OUTPUT
+diff --git a/src/heuristics.c b/src/heuristics.c
+index 94eee53..35c66f5 100644
+--- a/src/heuristics.c
++++ b/src/heuristics.c
+@@ -28,6 +28,8 @@
+ #include <string.h>
+ #include <unistd.h>
+
++#include "config.h"
++
+ #include "swupd.h"
+
+ /* TODO: this needs to come from a file that has a list of regexps */
+@@ -59,7 +61,7 @@ static void runtime_state_heuristics(struct file *file)
+ /* the contents of these directory are state, ideally this never
+ * triggers if our package builds are clean */
+ if ((strncmp(file->filename, "/dev/", 5) == 0) ||
+- (strncmp(file->filename, "/home/", 6) == 0) ||
++ (!STATELESS_HOME && (strncmp(file->filename, "/home/", 6) == 0)) ||
+ (strncmp(file->filename, "/proc/", 6) == 0) ||
+ (strncmp(file->filename, "/root/", 6) == 0) ||
+ (strncmp(file->filename, "/run/", 5) == 0) ||
+--
+2.5.0
+
diff --git a/recipes-core/swupd-server/swupd-server/0001-Don-t-treat-home-as-user-state.patch b/recipes-core/swupd-server/swupd-server/0001-Don-t-treat-home-as-user-state.patch
new file mode 100644
index 0000000..6cbd30b
--- /dev/null
+++ b/recipes-core/swupd-server/swupd-server/0001-Don-t-treat-home-as-user-state.patch
@@ -0,0 +1,61 @@
+From 60dcc111ba50419f31af970690b4a9bba59af232 Mon Sep 17 00:00:00 2001
+From: Amarnath Valluri <amarnath.valluri at intel.com>
+Date: Fri, 15 Jul 2016 12:44:31 +0300
+Subject: [PATCH] Don't treat /home/* as user state
+
+This allows to deploy user home folder as part of a bundle
+
+Upstream-status: Pending
+
+Signed-off-by: Amarnath Valluri <amarnath.valluri at intel.com>
+---
+ configure.ac | 10 ++++++++++
+ src/heuristics.c | 4 +++-
+ 2 files changed, 13 insertions(+), 1 deletion(-)
+
+diff --git a/configure.ac b/configure.ac
+index c2bd7bf..69ee5e4 100644
+--- a/configure.ac
++++ b/configure.ac
+@@ -82,6 +82,16 @@ AS_IF([test "$enable_lzma" != "no"], [
+ ])
+ AM_CONDITIONAL([ENABLE_LZMA], [test "$enable_lzma" != "no"])
+
++AC_ARG_ENABLE([stateless-home],
++ AS_HELP_STRING([--disable-stateless-home], [treat /home/* as user state, ignore user home folder changes (stateless by default)]),
++ [enable_stateless_home=$enableval],
++ [enable_stateless_home=yes]
++)
++AS_IF([test "x$enable_stateless_home" = "xyes"],
++ [AC_DEFINE([STATELESS_HOME], [1], [Treat $HOME as user state])],
++ [AC_DEFINE([STATELESS_HOME], [0], [Do not treat $HOME as user state])]
++)
++
+ AC_CONFIG_FILES([Makefile])
+ AC_REQUIRE_AUX_FILE([tap-driver.sh])
+ AC_OUTPUT
+diff --git a/src/heuristics.c b/src/heuristics.c
+index 94eee53..35c66f5 100644
+--- a/src/heuristics.c
++++ b/src/heuristics.c
+@@ -28,6 +28,8 @@
+ #include <string.h>
+ #include <unistd.h>
+
++#include "config.h"
++
+ #include "swupd.h"
+
+ /* TODO: this needs to come from a file that has a list of regexps */
+@@ -59,7 +61,7 @@ static void runtime_state_heuristics(struct file *file)
+ /* the contents of these directory are state, ideally this never
+ * triggers if our package builds are clean */
+ if ((strncmp(file->filename, "/dev/", 5) == 0) ||
+- (strncmp(file->filename, "/home/", 6) == 0) ||
++ (!STATELESS_HOME && (strncmp(file->filename, "/home/", 6) == 0)) ||
+ (strncmp(file->filename, "/proc/", 6) == 0) ||
+ (strncmp(file->filename, "/root/", 6) == 0) ||
+ (strncmp(file->filename, "/run/", 5) == 0) ||
+--
+2.5.0
+
diff --git a/recipes-core/swupd-server/swupd-server/0001-Don-t-treate-home-as-user-state.patch b/recipes-core/swupd-server/swupd-server/0001-Don-t-treate-home-as-user-state.patch
new file mode 100644
index 0000000..5555e14
--- /dev/null
+++ b/recipes-core/swupd-server/swupd-server/0001-Don-t-treate-home-as-user-state.patch
@@ -0,0 +1,61 @@
+From 60dcc111ba50419f31af970690b4a9bba59af232 Mon Sep 17 00:00:00 2001
+From: Amarnath Valluri <amarnath.valluri at intel.com>
+Date: Fri, 15 Jul 2016 12:44:31 +0300
+Subject: [PATCH] Don't treate /home/* as user state
+
+This allows to deploy user home folder as part of a bundle
+
+Upstream-status: Pending
+
+Signed-off-by: Amarnath Valluri <amarnath.valluri at intel.com>
+---
+ configure.ac | 10 ++++++++++
+ src/heuristics.c | 4 +++-
+ 2 files changed, 13 insertions(+), 1 deletion(-)
+
+diff --git a/configure.ac b/configure.ac
+index c2bd7bf..69ee5e4 100644
+--- a/configure.ac
++++ b/configure.ac
+@@ -82,6 +82,16 @@ AS_IF([test "$enable_lzma" != "no"], [
+ ])
+ AM_CONDITIONAL([ENABLE_LZMA], [test "$enable_lzma" != "no"])
+
++AC_ARG_ENABLE([stateless-home],
++ AS_HELP_STRING([--disable-stateless-home], [treate /home/* as user state, ignore user home folder changes (stateless by default)]),
++ [enable_stateless_home=$enableval],
++ [enable_stateless_home=yes]
++)
++AS_IF([test "x$enable_stateless_home" = "xyes"],
++ [AC_DEFINE([STATELESS_HOME], [1], [Treat $HOME as user state])],
++ [AC_DEFINE([STATELESS_HOME], [0], [Do not treat $HOME as user state])]
++)
++
+ AC_CONFIG_FILES([Makefile])
+ AC_REQUIRE_AUX_FILE([tap-driver.sh])
+ AC_OUTPUT
+diff --git a/src/heuristics.c b/src/heuristics.c
+index 94eee53..35c66f5 100644
+--- a/src/heuristics.c
++++ b/src/heuristics.c
+@@ -28,6 +28,8 @@
+ #include <string.h>
+ #include <unistd.h>
+
++#include "config.h"
++
+ #include "swupd.h"
+
+ /* TODO: this needs to come from a file that has a list of regexps */
+@@ -59,7 +61,7 @@ static void runtime_state_heuristics(struct file *file)
+ /* the contents of these directory are state, ideally this never
+ * triggers if our package builds are clean */
+ if ((strncmp(file->filename, "/dev/", 5) == 0) ||
+- (strncmp(file->filename, "/home/", 6) == 0) ||
++ (!STATELESS_HOME && (strncmp(file->filename, "/home/", 6) == 0)) ||
+ (strncmp(file->filename, "/proc/", 6) == 0) ||
+ (strncmp(file->filename, "/root/", 6) == 0) ||
+ (strncmp(file->filename, "/run/", 5) == 0) ||
+--
+2.5.0
+
diff --git a/recipes-core/swupd-server/swupd-server_2.53.bb b/recipes-core/swupd-server/swupd-server_2.53.bb
index edb4407..74d4525 100644
--- a/recipes-core/swupd-server/swupd-server_2.53.bb
+++ b/recipes-core/swupd-server/swupd-server_2.53.bb
@@ -17,6 +17,7 @@ SRC_URI = "\
file://0008-Clean-up-tar-commands-always-put-files-after-options.patch \
file://0009-Add-compatibility-with-libarchive-s-bsdtar-command.patch \
file://fullfiles.c-work-around-pseudo-bug.patch \
+ file://0001-Don-t-treat-home-as-user-state.patch \
"
SRC_URI[md5sum] = "14f25677b5a4f0b33785910b03860939"
diff --git a/recipes-core/swupd-server/swupd-server_git.bb b/recipes-core/swupd-server/swupd-server_git.bb
index fccc0fe..7d78736 100644
--- a/recipes-core/swupd-server/swupd-server_git.bb
+++ b/recipes-core/swupd-server/swupd-server_git.bb
@@ -10,6 +10,7 @@ PV = "3.2.3+git${SRCPV}"
SRC_URI = "\
git://github.com/clearlinux/swupd-server.git;protocol=https \
file://fullfiles.c-work-around-pseudo-bug.patch \
+ file://0001-Don-t-treat-home-as-user-state.patch \
"
SRCREV = "9d4df7e0350d3d8d1aa8af9f92d752046dbc72d0"
--
2.5.0
---------------------------------------------------------------------
Intel Finland Oy
Registered Address: PL 281, 00181 Helsinki
Business Identity Code: 0357606 - 4
Domiciled in Helsinki
This e-mail and any attachments may contain confidential material for
the sole use of the intended recipient(s). Any review or distribution
by others is strictly prohibited. If you are not the intended
recipient, please contact the sender and delete all copies.
More information about the Openembedded-core
mailing list