diff options
| author |   Koen Kooi <koen@openembedded.org> | 2009-01-30 14:51:21 +0100 |
|---|---|---|
| committer | Koen Kooi <koen@openembedded.org> | 2009-01-30 14:51:21 +0100 |
| commit | bbb4f7c6e50e9fadcb0cec2b80169cdc2276b4b1 (patch) | |
| tree | 805772ffeedbdac336fcd65b2b748f3dbb9a47ca | |
| parent | 86bb1d7cd73f1b9e404f7fb4259d5b842b1d6fe4 (diff) | |
| parent | 32e4a25abe2093f11b8976c571286f6d17cb21f9 (diff) | |
| download | openembedded-bbb4f7c6e50e9fadcb0cec2b80169cdc2276b4b1.tar.gz | |
Merge branch 'org.openembedded.dev' of git@git.openembedded.net:openembedded into org.openembedded.dev
| -rw-r--r-- | 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 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/ } |