diff options
| author |   Filip Zyzniewski <filip.zyzniewski@gmail.com> | 2011-02-07 04:12:05 +0000 |
|---|---|---|
| committer |   Tom Rini <tom_rini@mentor.com> | 2011-02-08 07:20:17 -0700 |
| commit | 0bf03ff7ee9bb145c3eb5c2602dc7acd6fe2880c (patch) | |
| tree | d8acaacd8c20e163aadad3f398463539dfa2fc10 /classes | |
| parent | 980b11d6703e70725e88b1292a30b1eeeec8449f (diff) | |
| download | openembedded-0bf03ff7ee9bb145c3eb5c2602dc7acd6fe2880c.tar.gz | |
rootfs_deb.bbclass: fix alternatives handling
After fixing update-alternatives-native the command:
rmdir ${IMAGE_ROOTFS}/var/dpkg/alternatives
fails, because the directory is not empty, and the command:
ln -s ${libdir}/opkg/alternatives ${IMAGE_ROOTFS}/var/dpkg/alternatives
creates a dangling symlink, because we mkdir only the parent directory of
the target.
Fixes: mkdir -p the alternatives directory itself and move alternatives
definitions into it before rmdiring the original alternatives directory
Signed-off-by: Filip Zyzniewski <filip.zyzniewski@gmail.com>
Signed-off-by: Tom Rini <tom_rini@mentor.com>
Diffstat (limited to 'classes')
| -rw-r--r-- | classes/rootfs_deb.bbclass | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/classes/rootfs_deb.bbclass b/classes/rootfs_deb.bbclass index 59072aa096..6a87c7ddb8 100644 --- a/classes/rootfs_deb.bbclass +++ b/classes/rootfs_deb.bbclass @@ -123,8 +123,9 @@ fakeroot rootfs_deb_do_rootfs () { set -e # Hacks to allow opkg's update-alternatives and opkg to coexist for now - mkdir -p ${IMAGE_ROOTFS}${libdir}/opkg + mkdir -p ${IMAGE_ROOTFS}${libdir}/opkg/alternatives if [ -e ${IMAGE_ROOTFS}/var/dpkg/alternatives ]; then + mv ${IMAGE_ROOTFS}/var/dpkg/alternatives/* ${IMAGE_ROOTFS}${libdir}/opkg/alternatives/ rmdir ${IMAGE_ROOTFS}/var/dpkg/alternatives fi ln -s ${libdir}/opkg/alternatives ${IMAGE_ROOTFS}/var/dpkg/alternatives |