diff options
author | Jonathan Liu <net147@gmail.com> | 2015-09-26 09:35:21 +1000 |
---|---|---|
committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2015-10-01 07:43:32 +0100 |
commit | 3b04553a88c629997bfcf955476ff9c3e12320dd (patch) | |
tree | b9722a3cf3d6cb55921572cf57191bf1d3479bc1 /meta/recipes-devtools/opkg/opkg/0001-opkg_conf-create-opkg.lock-in-run-instead-of-var-run.patch | |
parent | c275627212ffc3c60688cefe7e6652fb76db1756 (diff) | |
download | poky-3b04553a88c629997bfcf955476ff9c3e12320dd.tar.gz |
opkg: create opkg.lock in /run instead of /var/run
This avoids a "Could not unlink" warning when extracting a /var/run
symbolic link pointing to /run from the base-files package as it is
unable to unlink the /var/run directory when it contains opkg.lock.
This also fixes an issue where /var/run is created as a directory
instead of a symbolic link to /run.
(From OE-Core rev: 76d71f6637f0cbdc61f76652c5affd41f6ab4854)
Signed-off-by: Jonathan Liu <net147@gmail.com>
Acked-by: Anders Darander <anders@chargestorm.se>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/recipes-devtools/opkg/opkg/0001-opkg_conf-create-opkg.lock-in-run-instead-of-var-run.patch')
-rw-r--r-- | meta/recipes-devtools/opkg/opkg/0001-opkg_conf-create-opkg.lock-in-run-instead-of-var-run.patch | 34 |
1 files changed, 34 insertions, 0 deletions
diff --git a/meta/recipes-devtools/opkg/opkg/0001-opkg_conf-create-opkg.lock-in-run-instead-of-var-run.patch b/meta/recipes-devtools/opkg/opkg/0001-opkg_conf-create-opkg.lock-in-run-instead-of-var-run.patch new file mode 100644 index 0000000000..255021b4b7 --- /dev/null +++ b/meta/recipes-devtools/opkg/opkg/0001-opkg_conf-create-opkg.lock-in-run-instead-of-var-run.patch | |||
@@ -0,0 +1,34 @@ | |||
1 | From a4628a6171f393add9a2b287483ca39bb72b4dd6 Mon Sep 17 00:00:00 2001 | ||
2 | From: Jonathan Liu <net147@gmail.com> | ||
3 | Date: Mon, 21 Sep 2015 20:23:23 +1000 | ||
4 | Subject: [PATCH] opkg_conf: create opkg.lock in /run instead of /var/run | ||
5 | |||
6 | This avoids a "Could not unlink" warning when extracting a /var/run | ||
7 | symbolic link pointing to /run from a package as it is unable to | ||
8 | unlink the /var/run directory when it contains opkg.lock. | ||
9 | |||
10 | This also fixes an issue where /var/run is created as a directory | ||
11 | instead of a symbolic link to /run. | ||
12 | |||
13 | Upstream-Status: Inappropriate [OE-Specific] | ||
14 | Signed-off-by: Jonathan Liu <net147@gmail.com> | ||
15 | --- | ||
16 | libopkg/opkg_conf.h | 2 +- | ||
17 | 1 file changed, 1 insertion(+), 1 deletion(-) | ||
18 | |||
19 | diff --git a/libopkg/opkg_conf.h b/libopkg/opkg_conf.h | ||
20 | index 7bca948..5a1bc44 100644 | ||
21 | --- a/libopkg/opkg_conf.h | ||
22 | +++ b/libopkg/opkg_conf.h | ||
23 | @@ -40,7 +40,7 @@ extern "C" { | ||
24 | #define OPKG_CONF_DEFAULT_STATUS_FILE "/var/lib/opkg/status" | ||
25 | #define OPKG_CONF_DEFAULT_CACHE_DIR "/var/cache/opkg" | ||
26 | #define OPKG_CONF_DEFAULT_CONF_FILE_DIR "/etc/opkg" | ||
27 | -#define OPKG_CONF_DEFAULT_LOCK_FILE "/var/run/opkg.lock" | ||
28 | +#define OPKG_CONF_DEFAULT_LOCK_FILE "/run/opkg.lock" | ||
29 | |||
30 | /* In case the config file defines no dest */ | ||
31 | #define OPKG_CONF_DEFAULT_DEST_NAME "root" | ||
32 | -- | ||
33 | 2.5.0 | ||
34 | |||