summaryrefslogtreecommitdiff
path: root/classes/rootfs_deb.bbclass
diff options
context:
space:
mode:
authorGraeme Gregory <dp@xora.org.uk>2009-01-30 13:41:03 +0000
committerGraeme Gregory <dp@xora.org.uk>2009-01-30 13:41:37 +0000
commit32e4a25abe2093f11b8976c571286f6d17cb21f9 (patch)
treeb76291d73696cfa93369a1498bb419d760673152 /classes/rootfs_deb.bbclass
parent267aa2df85c912acba5e56f5bb4629cd5326b051 (diff)
rootfs_deb.bbclass : fix merge problems where I removed ${libdir}
Diffstat (limited to 'classes/rootfs_deb.bbclass')
-rw-r--r--classes/rootfs_deb.bbclass10
1 files changed, 5 insertions, 5 deletions
diff --git a/classes/rootfs_deb.bbclass b/classes/rootfs_deb.bbclass
index 6bc251f16d..2768c2afb2 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/
}