1 files changed, 7 insertions, 5 deletions

diff --git a/meta/classes/rootfs_deb.bbclass b/meta/classes/rootfs_deb.bbclass
index 16b8a86a58..b33d153dae 100644
--- a/meta/classes/rootfs_deb.bbclass
+++ b/meta/classes/rootfs_deb.bbclass
@@ -8,6 +8,8 @@ ROOTFS_PKGMANAGE_BOOTSTRAP  = "run-postinsts"
 do_rootfs[depends] += "dpkg-native:do_populate_sysroot apt-native:do_populate_sysroot"
 do_rootfs[recrdeptask] += "do_package_write_deb"
 
+opkglibdir = "${localstatedir}/lib/opkg"
+
 fakeroot rootfs_deb_do_rootfs () {
         set +e
         mkdir -p ${IMAGE_ROOTFS}/var/dpkg/info
@@ -120,13 +122,13 @@ fakeroot rootfs_deb_do_rootfs () {
         set -e
 
         # Hacks to allow opkg's update-alternatives and opkg to coexist for now
-        mkdir -p ${IMAGE_ROOTFS}/usr/lib/opkg
+        mkdir -p ${IMAGE_ROOTFS}${opkglibdir}
         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
+        ln -s ${opkglibdir}/alternatives ${IMAGE_ROOTFS}/var/dpkg/alternatives
+        ln -s /var/dpkg/info ${IMAGE_ROOTFS}${opkglibdir}/info
+        ln -s /var/dpkg/status ${IMAGE_ROOTFS}${opkglibdir}/status
 
         ${ROOTFS_POSTPROCESS_COMMAND}
 
@@ -154,6 +156,6 @@ rootfs_deb_log_check() {
 }
 
 remove_packaging_data_files() {
-        rm -rf ${IMAGE_ROOTFS}/usr/lib/opkg/
+        rm -rf ${IMAGE_ROOTFS}${opkglibdir}
         rm -rf ${IMAGE_ROOTFS}/usr/dpkg/
 }