opkg: finalize the change to var directory

commit 1d0757f16beb31551733d9d755d72337ccda9642 changes opkg run state from
/usr/lib/opkg to /var/lib/opkg, which however is incomplete and still many
important information is kept under old directory including postinst methods.
This makes latest boot into a mess.

So finalize this movement to /var here. Fix [BUGID #229]

Signed-off-by: Kevin Tian <kevin.tian@intel.com>

1 files changed, 4 insertions, 2 deletions

diff --git a/meta/classes/rootfs_rpm.bbclass b/meta/classes/rootfs_rpm.bbclass
index 9c681f382b..9cbfdd3db3 100644
--- a/meta/classes/rootfs_rpm.bbclass
+++ b/meta/classes/rootfs_rpm.bbclass
@@ -20,6 +20,8 @@ AWKPOSTINSTSCRIPT = "${POKYBASE}/scripts/rootfs_rpm-extract-postinst.awk"
 RPM_PREPROCESS_COMMANDS = "package_update_index_rpm; package_generate_rpm_conf"
 RPM_POSTPROCESS_COMMANDS = ""
 
+opkglibdir = "${localstatedir}/lib/opkg"
+
 fakeroot rootfs_rpm_do_rootfs () {
         set +x
 
@@ -164,7 +166,7 @@ rootfs_rpm_log_check() {
 
 remove_packaging_data_files() {
         exit 1
-        rm -rf ${IMAGE_ROOTFS}/usr/lib/opkg/
+        rm -rf ${IMAGE_ROOTFS}${opkglibdir}
 }
 
 install_all_locales() {
@@ -172,7 +174,7 @@ install_all_locales() {
 
     PACKAGES_TO_INSTALL=""
 
-        INSTALLED_PACKAGES=`grep ^Package: ${IMAGE_ROOTFS}${libdir}/opkg/status |sed "s/^Package: //"|egrep -v -- "(-locale-|-dev$|-doc$|^kernel|^glibc|^ttf|^task|^perl|^python)"`
+        INSTALLED_PACKAGES=`grep ^Package: ${IMAGE_ROOTFS}${opkglibdir}/status |sed "s/^Package: //"|egrep -v -- "(-locale-|-dev$|-doc$|^kernel|^glibc|^ttf|^task|^perl|^python)"`
 
     for pkg in $INSTALLED_PACKAGES
     do