opkg: Don't call sync() when installing into an offline root

Even when installing onto a live target system, calling sync() during
package installation is of somewhat questionable benefit.  But calling
it on the build host during rootfs construction is certainly useless and
can cause I/O to stall for several seconds on even a moderately sized
host which is clearly not desirable.

(From a patch originally by Mike Crowe.)

(From OE-Core rev: f48a68177510e8f2d4fcc3725a6dfc41a9a8e96b)

Signed-off-by: Phil Blundell <philb@gnu.org>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>

diff --git a/meta/recipes-devtools/opkg/opkg/opkg-no-sync-offline.patch b/meta/recipes-devtools/opkg/opkg/opkg-no-sync-offline.patch
new file mode 100644 (file)
index 0000000..b1b3453
--- /dev/null
+++ b/meta/recipes-devtools/opkg/opkg/opkg-no-sync-offline.patch
@@ -0,0 +1,18 @@
+When installing into an offline root, calling sync() is pointless and just 
+hurts performance.  Don't let's do that.
+
+Signed-off-by: Phil Blundell <philb@gnu.org>
+Upstream-Status: Pending
+
+--- a/libopkg/opkg_cmd.c       2011-09-08 10:53:07.000000000 +0100
++++ b/libopkg/opkg_cmd.c       2011-10-04 10:45:22.278615584 +0100
+@@ -64,7 +64,8 @@ write_status_files_if_changed(void)
+         opkg_msg(INFO, "Writing status file.\n");
+         opkg_conf_write_status_files();
+         pkg_write_changed_filelists();
+-        sync();
++        if (!conf->offline_root)
++            sync();
+      } else {
+         opkg_msg(DEBUG, "Nothing to be done.\n");
+      }

diff --git a/meta/recipes-devtools/opkg/opkg_svn.bb b/meta/recipes-devtools/opkg/opkg_svn.bb
index d89a3f6..59bb2d9 100644 (file)
--- a/meta/recipes-devtools/opkg/opkg_svn.bb
+++ b/meta/recipes-devtools/opkg/opkg_svn.bb
@@ -11,6 +11,7 @@ SRC_URI = "svn://opkg.googlecode.com/svn;module=trunk;protocol=http \
   file://0008-select_higher_version.patch \
   file://0009-pkg_depends-fix-version-constraints.patch \
   file://0010-pkg_depends-fix-version_constraints_satisfied.patch \
+  file://opkg-no-sync-offline.patch \
 "
 
 S = "${WORKDIR}/trunk"
@@ -18,4 +19,4 @@ S = "${WORKDIR}/trunk"
 SRCREV = "633"
 PV = "0.1.8+svnr${SRCPV}"
 
-PR = "${INC_PR}.5"
+PR = "${INC_PR}.6"