projects
/
vuplus_openembedded
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (parent:
267aa2d
)
rootfs_deb.bbclass : fix merge problems where I removed ${libdir}
author
Graeme Gregory
<dp@xora.org.uk>
Fri, 30 Jan 2009 13:41:03 +0000
(13:41 +0000)
committer
Graeme Gregory
<dp@xora.org.uk>
Fri, 30 Jan 2009 13:41:37 +0000
(13:41 +0000)
classes/rootfs_deb.bbclass
patch
|
blob
|
history
diff --git
a/classes/rootfs_deb.bbclass
b/classes/rootfs_deb.bbclass
index
6bc251f
..
2768c2a
100644
(file)
--- 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
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
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}
${ROOTFS_POSTPROCESS_COMMAND}
@@
-153,6
+153,6
@@
rootfs_deb_log_check() {
}
remove_packaging_data_files() {
}
remove_packaging_data_files() {
- rm -rf ${IMAGE_ROOTFS}
/usr/lib
/opkg/
+ rm -rf ${IMAGE_ROOTFS}
${libdir}
/opkg/
rm -rf ${IMAGE_ROOTFS}/usr/dpkg/
}
rm -rf ${IMAGE_ROOTFS}/usr/dpkg/
}