[oe-commits] Graeme Gregory : rootfs_deb.bbclass : fix merge problems where I removed ${libdir}

[GIT User account]

Module: openembedded.git
Branch: org.openembedded.dev
Commit: 32e4a25abe2093f11b8976c571286f6d17cb21f9
URL:    http://gitweb.openembedded.net/?p=openembedded.git&a=commit;h=32e4a25abe2093f11b8976c571286f6d17cb21f9

Author: Graeme Gregory <dp at xora.org.uk>
Date:   Fri Jan 30 13:41:03 2009 +0000

rootfs_deb.bbclass : fix merge problems where I removed ${libdir}

---

 classes/rootfs_deb.bbclass |   10 +++++-----
 1 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/classes/rootfs_deb.bbclass b/classes/rootfs_deb.bbclass
index 6bc251f..2768c2a 100644
--- a/classes/rootfs_deb.bbclass
+++ b/classes/rootfs_deb.bbclass
@@ -119,13 +119,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}${libdir}/opkg
 	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 ${libdir}/opkg/alternatives ${IMAGE_ROOTFS}/var/dpkg/alternatives
+	ln -s /var/dpkg/info ${IMAGE_ROOTFS}${libdir}/opkg/info
+	ln -s /var/dpkg/status ${IMAGE_ROOTFS}${libdir}/opkg/status
 
 	${ROOTFS_POSTPROCESS_COMMAND}
 
@@ -153,6 +153,6 @@ rootfs_deb_log_check() {
 }
 
 remove_packaging_data_files() {
-	rm -rf ${IMAGE_ROOTFS}/usr/lib/opkg/
+	rm -rf ${IMAGE_ROOTFS}${libdir}/opkg/
 	rm -rf ${IMAGE_ROOTFS}/usr/dpkg/
 }