5 files changed, 19 insertions, 7 deletions
diff --git a/recipes/opkg/opkg-collateral.bb b/recipes/opkg/opkg-collateral.bb
index 401e76e8be..a7ec321c6f 100644
--- a/recipes/opkg/opkg-collateral.bb
+++ b/recipes/opkg/opkg-collateral.bb
@@ -1,11 +1,12 @@
 DESCRIPTION = "opkg configuration files"
 SECTION = "base"
 LICENSE = "MIT"
-PR = "r1"
+PR = "r2"
 
 SRC_URI = "file://opkg.conf.comments \
 	   file://lists \
 	   file://dest \
+	   file://tmp_dir \
 	   file://src "
 
 do_compile () {
@@ -15,9 +16,17 @@ do_compile () {
 	cat ${WORKDIR}/lists	>>${WORKDIR}/opkg.conf
 }
 
+do_compile_append_shr () {
+	cat ${WORKDIR}/tmp_dir	>>${WORKDIR}/opkg.conf
+}
+
 do_install () {
 	install -d ${D}${sysconfdir}/opkg
 	install -m 0644 ${WORKDIR}/opkg.conf ${D}${sysconfdir}/opkg/opkg.conf
 }
 
+do_install_append_shr () {
+	install -d ${D}/var/lib/opkg/tmp
+}
+
 CONFFILES_${PN} = "${sysconfdir}/opkg/opkg.conf"
diff --git a/recipes/opkg/opkg-collateral/tmp_dir b/recipes/opkg/opkg-collateral/tmp_dir
new file mode 100644
index 0000000000..7ba6abf6cf
--- /dev/null
+++ b/recipes/opkg/opkg-collateral/tmp_dir
@@ -0,0 +1,4 @@
+# We have whole /tmp in volatile tmpfs which is better than wear leveling NAND or uSD
+# But also bad for big upgrades where tmpfs eats whole memory,
+# device starts swapping (possibly using more NAND/uSD than temporary unpack) and then segfaults because of lack of space
+option tmp_dir /var/lib/opkg/tmp
diff --git a/recipes/opkg/opkg.inc b/recipes/opkg/opkg.inc
index 20f415e3de..9a3d3dc71b 100644
--- a/recipes/opkg/opkg.inc
+++ b/recipes/opkg/opkg.inc
@@ -1,10 +1,10 @@
 DESCRIPTION = "Opkg Package Manager"
 DESCRIPTION_libopkg = "Opkg Package Manager Library"
 SECTION = "base"
-LICENSE = "GPL"
-DEPENDS = "curl gpgme"
+LICENSE = "GPLv2"
+DEPENDS = "curl gpgme openssl"
 PV = "0.1.6+svnr${SRCPV}"
-INC_PR = "r19"
+INC_PR = "r21"
 
 FILESPATHPKG =. "opkg:"
 
diff --git a/recipes/opkg/opkg_svn.bb b/recipes/opkg/opkg_svn.bb
index 4945260065..5138458498 100644
--- a/recipes/opkg/opkg_svn.bb
+++ b/recipes/opkg/opkg_svn.bb
@@ -1,7 +1,5 @@
 require opkg.inc
 
-DEPENDS_append = " openssl"
-
 PR = "${INC_PR}"
 
 PROVIDES =+ "virtual/update-alternatives"
diff --git a/recipes/opkg/update-alternatives-merge.inc b/recipes/opkg/update-alternatives-merge.inc
index a07275d038..f129fdbe84 100644
--- a/recipes/opkg/update-alternatives-merge.inc
+++ b/recipes/opkg/update-alternatives-merge.inc
@@ -4,7 +4,8 @@
 pkg_postinst_${PN}_append () {
         alternatives_dir_old="${prefix}/lib/ipkg/alternatives"
         alternatives_dir_new="${prefix}/lib/opkg/alternatives"
-        if [ -e "${alternatives_dir_old}" ] ; then
+	# if ${prefix}/lib/ipkg is already link (probably to ${prefix}/lib/opkg), then nothing needs to be merged and definitely we don't want "rm -rf ${alternatives_dir_old}" to happen
+        if [ ! -h ${prefix}/lib/ipkg -a -e "${alternatives_dir_old}" ] ; then
                 if [ ! -e "${alternatives_dir_new}" ] ; then
                         mkdir -p "${alternatives_dir_new}";
                 fi