diff options
| author |   Jonathan Liu <net147@gmail.com> | 2015-09-26 09:35:21 +1000 |
|---|---|---|
| committer |   Richard Purdie <richard.purdie@linuxfoundation.org> | 2015-09-29 15:15:47 +0100 |
| commit | 76d71f6637f0cbdc61f76652c5affd41f6ab4854 (patch) | |
| tree | e6f290b334a1da446d96d7b256aad30f6b888bd1 | |
| parent | a619f8e5fd8b88278d41a3d82aca5a8d03cb2907 (diff) | |
| download | openembedded-core-contrib-76d71f6637f0cbdc61f76652c5affd41f6ab4854.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.
Signed-off-by: Jonathan Liu <net147@gmail.com>
Acked-by: Anders Darander <anders@chargestorm.se>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
| -rw-r--r-- | meta/recipes-devtools/opkg/opkg/0001-opkg_conf-create-opkg.lock-in-run-instead-of-var-run.patch | 34 | ||||
| -rw-r--r-- | meta/recipes-devtools/opkg/opkg_0.3.0.bb | 1 |
2 files changed, 35 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 @@ +From a4628a6171f393add9a2b287483ca39bb72b4dd6 Mon Sep 17 00:00:00 2001 +From: Jonathan Liu <net147@gmail.com> +Date: Mon, 21 Sep 2015 20:23:23 +1000 +Subject: [PATCH] opkg_conf: 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 a 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. + +Upstream-Status: Inappropriate [OE-Specific] +Signed-off-by: Jonathan Liu <net147@gmail.com> +--- + libopkg/opkg_conf.h | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/libopkg/opkg_conf.h b/libopkg/opkg_conf.h +index 7bca948..5a1bc44 100644 +--- a/libopkg/opkg_conf.h ++++ b/libopkg/opkg_conf.h +@@ -40,7 +40,7 @@ extern "C" { + #define OPKG_CONF_DEFAULT_STATUS_FILE "/var/lib/opkg/status" + #define OPKG_CONF_DEFAULT_CACHE_DIR "/var/cache/opkg" + #define OPKG_CONF_DEFAULT_CONF_FILE_DIR "/etc/opkg" +-#define OPKG_CONF_DEFAULT_LOCK_FILE "/var/run/opkg.lock" ++#define OPKG_CONF_DEFAULT_LOCK_FILE "/run/opkg.lock" + + /* In case the config file defines no dest */ + #define OPKG_CONF_DEFAULT_DEST_NAME "root" +-- +2.5.0 + diff --git a/meta/recipes-devtools/opkg/opkg_0.3.0.bb b/meta/recipes-devtools/opkg/opkg_0.3.0.bb index 884368f749..588250e456 100644 --- a/meta/recipes-devtools/opkg/opkg_0.3.0.bb +++ b/meta/recipes-devtools/opkg/opkg_0.3.0.bb @@ -16,6 +16,7 @@ SRC_URI = "http://downloads.yoctoproject.org/releases/${BPN}/${BPN}-${PV}.tar.gz file://opkg.conf \ file://0001-opkg_archive-add-support-for-empty-compressed-files.patch \ file://0001-libopkg-include-stdio.h-for-getting-FILE-defined.patch \ + file://0001-opkg_conf-create-opkg.lock-in-run-instead-of-var-run.patch \ " SRC_URI[md5sum] = "3412cdc71d78b98facc84b19331ec64e" |