diff options
Diffstat (limited to 'meta/classes/rootfs_deb.bbclass')
-rw-r--r-- | meta/classes/rootfs_deb.bbclass | 12 |
1 files changed, 7 insertions, 5 deletions
diff --git a/meta/classes/rootfs_deb.bbclass b/meta/classes/rootfs_deb.bbclass index 16b8a86a58..b33d153dae 100644 --- a/meta/classes/rootfs_deb.bbclass +++ b/meta/classes/rootfs_deb.bbclass | |||
@@ -8,6 +8,8 @@ ROOTFS_PKGMANAGE_BOOTSTRAP = "run-postinsts" | |||
8 | do_rootfs[depends] += "dpkg-native:do_populate_sysroot apt-native:do_populate_sysroot" | 8 | do_rootfs[depends] += "dpkg-native:do_populate_sysroot apt-native:do_populate_sysroot" |
9 | do_rootfs[recrdeptask] += "do_package_write_deb" | 9 | do_rootfs[recrdeptask] += "do_package_write_deb" |
10 | 10 | ||
11 | opkglibdir = "${localstatedir}/lib/opkg" | ||
12 | |||
11 | fakeroot rootfs_deb_do_rootfs () { | 13 | fakeroot rootfs_deb_do_rootfs () { |
12 | set +e | 14 | set +e |
13 | mkdir -p ${IMAGE_ROOTFS}/var/dpkg/info | 15 | mkdir -p ${IMAGE_ROOTFS}/var/dpkg/info |
@@ -120,13 +122,13 @@ fakeroot rootfs_deb_do_rootfs () { | |||
120 | set -e | 122 | set -e |
121 | 123 | ||
122 | # Hacks to allow opkg's update-alternatives and opkg to coexist for now | 124 | # Hacks to allow opkg's update-alternatives and opkg to coexist for now |
123 | mkdir -p ${IMAGE_ROOTFS}/usr/lib/opkg | 125 | mkdir -p ${IMAGE_ROOTFS}${opkglibdir} |
124 | if [ -e ${IMAGE_ROOTFS}/var/dpkg/alternatives ]; then | 126 | if [ -e ${IMAGE_ROOTFS}/var/dpkg/alternatives ]; then |
125 | rmdir ${IMAGE_ROOTFS}/var/dpkg/alternatives | 127 | rmdir ${IMAGE_ROOTFS}/var/dpkg/alternatives |
126 | fi | 128 | fi |
127 | ln -s /usr/lib/opkg/alternatives ${IMAGE_ROOTFS}/var/dpkg/alternatives | 129 | ln -s ${opkglibdir}/alternatives ${IMAGE_ROOTFS}/var/dpkg/alternatives |
128 | ln -s /var/dpkg/info ${IMAGE_ROOTFS}/usr/lib/opkg/info | 130 | ln -s /var/dpkg/info ${IMAGE_ROOTFS}${opkglibdir}/info |
129 | ln -s /var/dpkg/status ${IMAGE_ROOTFS}/usr/lib/opkg/status | 131 | ln -s /var/dpkg/status ${IMAGE_ROOTFS}${opkglibdir}/status |
130 | 132 | ||
131 | ${ROOTFS_POSTPROCESS_COMMAND} | 133 | ${ROOTFS_POSTPROCESS_COMMAND} |
132 | 134 | ||
@@ -154,6 +156,6 @@ rootfs_deb_log_check() { | |||
154 | } | 156 | } |
155 | 157 | ||
156 | remove_packaging_data_files() { | 158 | remove_packaging_data_files() { |
157 | rm -rf ${IMAGE_ROOTFS}/usr/lib/opkg/ | 159 | rm -rf ${IMAGE_ROOTFS}${opkglibdir} |
158 | rm -rf ${IMAGE_ROOTFS}/usr/dpkg/ | 160 | rm -rf ${IMAGE_ROOTFS}/usr/dpkg/ |
159 | } | 161 | } |