On 21/09/2015 10:02 PM, Jussi Kukkonen wrote:
On 21 September 2015 at 14:09, Jonathan Liu <net...@gmail.com
<mailto:net...@gmail.com>> wrote:
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 <net...@gmail.com
<mailto:net...@gmail.com>>
---
...reate-opkg.lock-in-run-instead-of-var-run.patch | 34
++++++++++++++++++++++
meta/recipes-devtools/opkg/opkg_0.3.0.bb <http://opkg_0.3.0.bb>
| 1 +
2 files changed, 35 insertions(+)
create mode 100644
meta/recipes-devtools/opkg/opkg/0001-opkg_conf-create-opkg.lock-in-run-instead-of-var-run.patch
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 0000000..255021b
--- /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 <net...@gmail.com <mailto:net...@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]
Isn't using /run for this appropriate for everyone? I would have
expected this to be an uncontroversial change.
Jussi
I didn't want to create a behavior change for other projects using opkg
that aren't necessarily following the FHS 3 Draft.
Regards,
Jonathan
+Signed-off-by: Jonathan Liu <net...@gmail.com
<mailto:net...@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
<http://opkg_0.3.0.bb> b/meta/recipes-devtools/opkg/opkg_0.3.0.bb
<http://opkg_0.3.0.bb>
index f4dbb2d..08fb62c 100644
--- a/meta/recipes-devtools/opkg/opkg_0.3.0.bb <http://opkg_0.3.0.bb>
+++ b/meta/recipes-devtools/opkg/opkg_0.3.0.bb <http://opkg_0.3.0.bb>
@@ -15,6 +15,7 @@ SRC_URI =
"http://downloads.yoctoproject.org/releases/${BPN}/${BPN}-${PV}.tar.gz
<http://downloads.yoctoproject.org/releases/$%7BBPN%7D/$%7BBPN%7D-$%7BPV%7D.tar.gz>
file://opkg-configure.service \
file://opkg.conf \
file://0001-opkg_archive-add-support-for-empty-compressed-files.patch
\
+
file://0001-opkg_conf-create-opkg.lock-in-run-instead-of-var-run.patch
\
"
SRC_URI[md5sum] = "3412cdc71d78b98facc84b19331ec64e"
--
2.5.0
--
_______________________________________________
Openembedded-core mailing list
Openembedded-core@lists.openembedded.org
<mailto:Openembedded-core@lists.openembedded.org>
http://lists.openembedded.org/mailman/listinfo/openembedded-core
--
_______________________________________________
Openembedded-core mailing list
Openembedded-core@lists.openembedded.org
http://lists.openembedded.org/mailman/listinfo/openembedded-core
