rootfs_deb.bbclass: Use /var/dpkg for dpkg status data

git-svn-id: https://svn.o-hand.com/repos/poky/trunk@4511 311d38ba-8fff-0310-9ca6-ca027cbcb966

diff --git a/meta/classes/rootfs_deb.bbclass b/meta/classes/rootfs_deb.bbclass
index 358658fb6b946a440331f17610d1dbe6dcddfbd1..467626b2b1eb908b81a0a92258c4e34ac84f8d2c 100644 (file)
--- a/meta/classes/rootfs_deb.bbclass
+++ b/meta/classes/rootfs_deb.bbclass
@@ -14,7 +14,7 @@ fakeroot rootfs_deb_do_rootfs () {
        rm -f ${STAGING_ETCDIR_NATIVE}/apt/preferences
        > ${IMAGE_ROOTFS}/var/dpkg/status
        > ${IMAGE_ROOTFS}/var/dpkg/available
-       # > ${STAGING_DIR}/var/dpkg/status
+       mkdir -p ${IMAGE_ROOTFS}/var/dpkg/alternatives
 
        priority=1
        for arch in ${PACKAGE_ARCHS}; do
@@ -48,8 +48,6 @@ fakeroot rootfs_deb_do_rootfs () {
        export IPKG_OFFLINE_ROOT=${IMAGE_ROOTFS}
        export OPKG_OFFLINE_ROOT=${IMAGE_ROOTFS}
 
-       mkdir -p ${IMAGE_ROOTFS}/var/lib/dpkg/alternatives
-
        apt-get update
 
        _flag () {
@@ -110,15 +108,14 @@ fakeroot rootfs_deb_do_rootfs () {
 
        set -e
 
-       # Hacks to make dpkg/opkg coexist for now
-       mv ${IMAGE_ROOTFS}/var/dpkg ${IMAGE_ROOTFS}/usr/
-       if [ -e ${IMAGE_ROOTFS}/usr/dpkg/alternatives ]; then
-               rmdir ${IMAGE_ROOTFS}/usr/dpkg/alternatives
-       fi
+       # Hacks to allow opkg's update-alternatives and opkg to coexist for now
        mkdir -p ${IMAGE_ROOTFS}/usr/lib/opkg
-       ln -s /usr/lib/opkg/alternatives ${IMAGE_ROOTFS}/usr/dpkg/alternatives
-       ln -s /usr/dpkg/onfo ${IMAGE_ROOTFS}/usr/lib/opkg/info
-       ln -s /usr/dpkg/status ${IMAGE_ROOTFS}/usr/lib/opkg/status
+       if [ -e ${IMAGE_ROOTFS}/var/dpkg/alternatives ]; then
+               rmdir ${IMAGE_ROOTFS}/var/dpkg/alternatives
+       fi
+       ln -s /usr/lib/opkg/alternatives ${IMAGE_ROOTFS}/var/dpkg/alternatives
+       ln -s /var/dpkg/info ${IMAGE_ROOTFS}/usr/lib/opkg/info
+       ln -s /var/dpkg/status ${IMAGE_ROOTFS}/usr/lib/opkg/status
 
        ${ROOTFS_POSTPROCESS_COMMAND}
 

diff --git a/meta/packages/meta/run-postinsts/run-postinsts b/meta/packages/meta/run-postinsts/run-postinsts
index 46b3327f4f82687bf2f4af65b6792ff04cd751af..f632d1c7d3fdc7eba1c5daab4040ff2861b98f28 100755 (executable)
--- a/meta/packages/meta/run-postinsts/run-postinsts
+++ b/meta/packages/meta/run-postinsts/run-postinsts
@@ -5,7 +5,7 @@
 # Author: Richard Purdie <rpurdie@openedhand.com>
 #
 
-PKGSYSTEM=/usr/dpkg
+PKGSYSTEM=/var/dpkg
 
 if [ ! -e $PKGSYSTEM/status ]; then
   if [ -e /usr/lib/opkg/status ]; then

diff --git a/meta/packages/meta/run-postinsts/run-postinsts.awk b/meta/packages/meta/run-postinsts/run-postinsts.awk
index bdea8c95ada86d0c9bc7cbf5d533458f4f58d6bb..09a1400cf46ba806b4ccfb9fe0b5663d17179d38 100644 (file)
--- a/meta/packages/meta/run-postinsts/run-postinsts.awk
+++ b/meta/packages/meta/run-postinsts/run-postinsts.awk
@@ -9,7 +9,7 @@
 BEGIN {
   rc=system("test -d /usr/dpkg/info/")
   if (rc==0)
-    pkgdir="/usr/dpkg/info"
+    pkgdir="/var/dpkg/info"
   else
     pkgdir="/usr/lib/opkg/info"
   package=""

diff --git a/meta/packages/meta/run-postinsts_1.0.bb b/meta/packages/meta/run-postinsts_1.0.bb
index ec3412738581bf18aa3c1c84ffb2ac795310ab13..79333dc7feb3bf82366b6d46ead1e4aa49811f53 100644 (file)
--- a/meta/packages/meta/run-postinsts_1.0.bb
+++ b/meta/packages/meta/run-postinsts_1.0.bb
@@ -1,6 +1,6 @@
 DESCRIPTION = "Run postinstall scripts on device using awk"
 SECTION = "devel"
-PR = "r4"
+PR = "r6"
 
 SRC_URI = "file://run-postinsts file://run-postinsts.awk"