[oe-commits] Filip Zyzniewski : rootfs_deb.bbclass: fix alternatives handling
git version control
git at git.openembedded.org
Tue Feb 8 14:21:40 UTC 2011
Module: openembedded.git
Branch: org.openembedded.dev
Commit: 0bf03ff7ee9bb145c3eb5c2602dc7acd6fe2880c
URL: http://gitweb.openembedded.net/?p=openembedded.git&a=commit;h=0bf03ff7ee9bb145c3eb5c2602dc7acd6fe2880c
Author: Filip Zyzniewski <filip.zyzniewski at gmail.com>
Date: Mon Feb 7 04:12:05 2011 +0000
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 at gmail.com>
Signed-off-by: Tom Rini <tom_rini at mentor.com>
---
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 59072aa..6a87c7d 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
More information about the Openembedded-commits
mailing list