jeans/operating-system
jeans/operating-system
1
0
Fork 0
mirror of https://github.com/home-assistant/operating-system.git synced 2025-07-28 15:36:29 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fix Barebox Environment handling (#1037)

Browse Source 
Similar to U-Boot dt-utils (barebox-state in particular) use /var/lock
as location for lockfiles. Use the recommended location /run.
This commit is contained in:
Stefan Agner 2020-11-29 21:41:37 +01:00
parent b82707ff9a
commit 8682d8af78
No known key found for this signature in database
GPG Key ID: AE01353D1E44747D
3 changed files with 83 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

33
buildroot-external/board/intel/patches/dt-utils/0001-get-devicetree-from-file.patch → buildroot-external/board/intel/patches/dt-utils/0001-barebox-state-get-devicetree-from-file.patch
View File

@ -1,12 +1,18 @@
From 405590bdb7ae434798010458e810c415e4e99db4 Mon Sep 17 00:00:00 2001 From 4e9abe7945370765a9e8e88b01a7ef5f266bf7fd Mon Sep 17 00:00:00 2001
Message-Id: <4e9abe7945370765a9e8e88b01a7ef5f266bf7fd.1606682453.git.stefan@agner.ch>
From: Steffen Trumtrar <s.trumtrar@pengutronix.de> From: Steffen Trumtrar <s.trumtrar@pengutronix.de>
Date: Fri, 30 Jun 2017 16:53:34 +0200 Date: Fri, 30 Jun 2017 16:53:34 +0200
Subject: barebox-state: get devicetree from file Subject: [PATCH dt-utils 1/3] barebox-state: get devicetree from file
Signed-off-by: Steffen Trumtrar <s.trumtrar@pengutronix.de> Signed-off-by: Steffen Trumtrar <s.trumtrar@pengutronix.de>
---
src/barebox-state.c | 30 ++++++++++++++++++++++--------
src/barebox-state.h | 2 +-
src/keystore-blob.c | 2 +-
3 files changed, 24 insertions(+), 10 deletions(-)
diff --git a/src/barebox-state.c b/src/barebox-state.c diff --git a/src/barebox-state.c b/src/barebox-state.c
index e68b8cb..3622e76 100644 index f8b8df6..76f9c41 100644
--- a/src/barebox-state.c --- a/src/barebox-state.c
+++ b/src/barebox-state.c +++ b/src/barebox-state.c
@@ -308,7 +308,7 @@ static int state_set_var(struct state *state, const char *var, const char *val) @@ -308,7 +308,7 @@ static int state_set_var(struct state *state, const char *var, const char *val)
@ -16,11 +22,11 @@ index e68b8cb..3622e76 100644
-struct state *state_get(const char *name, bool readonly, bool auth) -struct state *state_get(const char *name, bool readonly, bool auth)
+struct state *state_get(const char *name, const char *filename, bool readonly, bool auth) +struct state *state_get(const char *name, const char *filename, bool readonly, bool auth)
{ {
struct device_node *root, *node, *partition_node; struct device_node *root, *node;
char *path; char *path;
@@ -320,11 +320,19 @@ struct state *state_get(const char *name, bool readonly, bool auth) @@ -317,11 +317,19 @@ struct state *state_get(const char *name, bool readonly, bool auth)
off_t offset; const char *backend_type = NULL;
size_t size; struct state_variable *v;
- root = of_read_proc_devicetree(); - root = of_read_proc_devicetree();
- if (IS_ERR(root)) { - if (IS_ERR(root)) {
@ -43,7 +49,7 @@ index e68b8cb..3622e76 100644
} }
of_set_root_node(root); of_set_root_node(root);
@@ -387,6 +395,7 @@ static struct option long_options[] = { @@ -372,6 +380,7 @@ static struct option long_options[] = {
{"get", required_argument, 0, 'g' }, {"get", required_argument, 0, 'g' },
{"set", required_argument, 0, 's' }, {"set", required_argument, 0, 's' },
{"name", required_argument, 0, 'n' }, {"name", required_argument, 0, 'n' },
@ -51,7 +57,7 @@ index e68b8cb..3622e76 100644
{"dump", no_argument, 0, 'd' }, {"dump", no_argument, 0, 'd' },
{"dump-shell", no_argument, 0, OPT_DUMP_SHELL }, {"dump-shell", no_argument, 0, OPT_DUMP_SHELL },
{"verbose", no_argument, 0, 'v' }, {"verbose", no_argument, 0, 'v' },
@@ -402,6 +411,7 @@ static void usage(char *name) @@ -387,6 +396,7 @@ static void usage(char *name)
"-g, --get <variable> get the value of a variable\n" "-g, --get <variable> get the value of a variable\n"
"-s, --set <variable>=<value> set the value of a variable\n" "-s, --set <variable>=<value> set the value of a variable\n"
"-n, --name <name> specify the state to use (default=\"state\"). Multiple states are allowed.\n" "-n, --name <name> specify the state to use (default=\"state\"). Multiple states are allowed.\n"
@ -59,7 +65,7 @@ index e68b8cb..3622e76 100644
"-d, --dump dump the state\n" "-d, --dump dump the state\n"
"--dump-shell dump the state suitable for shell sourcing\n" "--dump-shell dump the state suitable for shell sourcing\n"
"-v, --verbose increase verbosity\n" "-v, --verbose increase verbosity\n"
@@ -439,12 +449,13 @@ int main(int argc, char *argv[]) @@ -424,12 +434,13 @@ int main(int argc, char *argv[])
bool readonly = true; bool readonly = true;
int pr_level = 5; int pr_level = 5;
int auth = 1; int auth = 1;
@ -74,7 +80,7 @@ index e68b8cb..3622e76 100644
if (c < 0) if (c < 0)
break; break;
switch (c) { switch (c) {
@@ -490,6 +501,9 @@ int main(int argc, char *argv[]) @@ -475,6 +486,9 @@ int main(int argc, char *argv[])
++nr_states; ++nr_states;
break; break;
} }
@ -84,7 +90,7 @@ index e68b8cb..3622e76 100644
case ':': case ':':
case '?': case '?':
default: default:
@@ -530,7 +544,7 @@ int main(int argc, char *argv[]) @@ -515,7 +529,7 @@ int main(int argc, char *argv[])
} }
list_for_each_entry(state, &state_list.list, list) { list_for_each_entry(state, &state_list.list, list) {
@ -120,4 +126,5 @@ index 028dd8b..4572431 100644
return PTR_ERR(tmp); return PTR_ERR(tmp);
state = tmp; state = tmp;
-- --
cgit v0.10.2 2.29.2

16
buildroot-external/board/intel/patches/dt-utils/0002-support-finding-devices-by-partuuid.patch → buildroot-external/board/intel/patches/dt-utils/0002-libdt-support-finding-devices-by-partuuid.patch
View File

@ -1,15 +1,21 @@
From 26148417fab419a0c7f301fb8f2be015324d5374 Mon Sep 17 00:00:00 2001 From 4eb260d97419349320aa688866b4cf1eb177df70 Mon Sep 17 00:00:00 2001
Message-Id: <4eb260d97419349320aa688866b4cf1eb177df70.1606682453.git.stefan@agner.ch>
In-Reply-To: <4e9abe7945370765a9e8e88b01a7ef5f266bf7fd.1606682453.git.stefan@agner.ch>
References: <4e9abe7945370765a9e8e88b01a7ef5f266bf7fd.1606682453.git.stefan@agner.ch>
From: Steffen Trumtrar <s.trumtrar@pengutronix.de> From: Steffen Trumtrar <s.trumtrar@pengutronix.de>
Date: Fri, 30 Jun 2017 16:53:17 +0200 Date: Fri, 30 Jun 2017 16:53:17 +0200
Subject: libdt: support finding devices by partuuid Subject: [PATCH dt-utils 2/3] libdt: support finding devices by partuuid
Signed-off-by: Steffen Trumtrar <s.trumtrar@pengutronix.de> Signed-off-by: Steffen Trumtrar <s.trumtrar@pengutronix.de>
---
src/libdt.c | 12 ++++++++++++
1 file changed, 12 insertions(+)
diff --git a/src/libdt.c b/src/libdt.c diff --git a/src/libdt.c b/src/libdt.c
index 3adeed2..2bc6cc1 100644 index 4638678..b52f80c 100644
--- a/src/libdt.c --- a/src/libdt.c
+++ b/src/libdt.c +++ b/src/libdt.c
@@ -2393,6 +2393,18 @@ int of_get_devicepath(struct device_node *partition_node, char **devpath, off_t @@ -2416,6 +2416,18 @@ int of_get_devicepath(struct device_node *partition_node, char **devpath, off_t
*/ */
node = partition_node->parent; node = partition_node->parent;
@ -29,5 +35,5 @@ index 3adeed2..2bc6cc1 100644
* Respect flash "partitions" subnode. Use parent of parent in this * Respect flash "partitions" subnode. Use parent of parent in this
* case. * case.
-- --
cgit v0.10.2 2.29.2

52
buildroot-external/board/intel/patches/dt-utils/0003-state-use-run-to-store-lockfile.patch Normal file
View File

@ -0,0 +1,52 @@
From 665603ecadb8385dd6c18840d3b0120859a00369 Mon Sep 17 00:00:00 2001
Message-Id: <665603ecadb8385dd6c18840d3b0120859a00369.1606682453.git.stefan@agner.ch>
In-Reply-To: <4e9abe7945370765a9e8e88b01a7ef5f266bf7fd.1606682453.git.stefan@agner.ch>
References: <4e9abe7945370765a9e8e88b01a7ef5f266bf7fd.1606682453.git.stefan@agner.ch>
From: Stefan Agner <stefan@agner.ch>
Date: Fri, 13 Nov 2020 10:39:03 +0100
Subject: [PATCH dt-utils 3/3] state: use /run to store lockfile
The current location /var/lock is considered legacy (at least by
systemd). Just use /run to store the lockfile and append the usual .lock
suffix.
Signed-off-by: Stefan Agner <stefan@agner.ch>
---
src/barebox-state.c | 8 +++++---
1 file changed, 5 insertions(+), 3 deletions(-)
diff --git a/src/barebox-state.c b/src/barebox-state.c
index 76f9c41..53e5eb6 100644
--- a/src/barebox-state.c
+++ b/src/barebox-state.c
@@ -38,6 +38,8 @@
#include <dt/dt.h>
#include <state.h>
+#define BAREBOX_STATE_LOCKFILE "/run/barebox-state.lock"
+
struct state_variable;
static int __state_uint8_set(struct state_variable *var, const char *val);
@@ -515,15 +517,15 @@ int main(int argc, char *argv[])
++nr_states;
}
- lock_fd = open("/var/lock/barebox-state", O_CREAT | O_RDWR, 0600);
+ lock_fd = open(BAREBOX_STATE_LOCKFILE, O_CREAT | O_RDWR, 0600);
if (lock_fd < 0) {
- pr_err("Failed to open lock-file /var/lock/barebox-state\n");
+ pr_err("Failed to open lock-file " BAREBOX_STATE_LOCKFILE "\n");
exit(1);
}
ret = flock(lock_fd, LOCK_EX);
if (ret < 0) {
- pr_err("Failed to lock /var/lock/barebox-state: %m\n");
+ pr_err("Failed to lock " BAREBOX_STATE_LOCKFILE ": %m\n");
close(lock_fd);
exit(1);
}
--
2.29.2