diff options
Diffstat (limited to 'meta/classes/rootfs_deb.bbclass')
-rw-r--r-- | meta/classes/rootfs_deb.bbclass | 20 |
1 files changed, 10 insertions, 10 deletions
diff --git a/meta/classes/rootfs_deb.bbclass b/meta/classes/rootfs_deb.bbclass index e03e80bdb0..bab8e1e8c7 100644 --- a/meta/classes/rootfs_deb.bbclass +++ b/meta/classes/rootfs_deb.bbclass | |||
@@ -13,7 +13,7 @@ opkglibdir = "${localstatedir}/lib/opkg" | |||
13 | fakeroot rootfs_deb_do_rootfs () { | 13 | fakeroot rootfs_deb_do_rootfs () { |
14 | set +e | 14 | set +e |
15 | 15 | ||
16 | mkdir -p ${IMAGE_ROOTFS}/var/dpkg/alternatives | 16 | mkdir -p ${IMAGE_ROOTFS}/var/lib/dpkg/alternatives |
17 | 17 | ||
18 | # update index | 18 | # update index |
19 | package_update_index_deb | 19 | package_update_index_deb |
@@ -36,15 +36,15 @@ fakeroot rootfs_deb_do_rootfs () { | |||
36 | export OPKG_OFFLINE_ROOT=${IMAGE_ROOTFS} | 36 | export OPKG_OFFLINE_ROOT=${IMAGE_ROOTFS} |
37 | 37 | ||
38 | _flag () { | 38 | _flag () { |
39 | sed -i -e "/^Package: $2\$/{n; s/Status: install ok .*/Status: install ok $1/;}" ${IMAGE_ROOTFS}/var/dpkg/status | 39 | sed -i -e "/^Package: $2\$/{n; s/Status: install ok .*/Status: install ok $1/;}" ${IMAGE_ROOTFS}/var/lib/dpkg/status |
40 | } | 40 | } |
41 | _getflag () { | 41 | _getflag () { |
42 | cat ${IMAGE_ROOTFS}/var/dpkg/status | sed -n -e "/^Package: $2\$/{n; s/Status: install ok .*/$1/; p}" | 42 | cat ${IMAGE_ROOTFS}/var/lib/dpkg/status | sed -n -e "/^Package: $2\$/{n; s/Status: install ok .*/$1/; p}" |
43 | } | 43 | } |
44 | 44 | ||
45 | # Attempt to run preinsts | 45 | # Attempt to run preinsts |
46 | # Mark packages with preinst failures as unpacked | 46 | # Mark packages with preinst failures as unpacked |
47 | for i in ${IMAGE_ROOTFS}/var/dpkg/info/*.preinst; do | 47 | for i in ${IMAGE_ROOTFS}/var/lib/dpkg/info/*.preinst; do |
48 | if [ -f $i ] && ! sh $i; then | 48 | if [ -f $i ] && ! sh $i; then |
49 | _flag unpacked `basename $i .preinst` | 49 | _flag unpacked `basename $i .preinst` |
50 | fi | 50 | fi |
@@ -52,7 +52,7 @@ fakeroot rootfs_deb_do_rootfs () { | |||
52 | 52 | ||
53 | # Attempt to run postinsts | 53 | # Attempt to run postinsts |
54 | # Mark packages with postinst failures as unpacked | 54 | # Mark packages with postinst failures as unpacked |
55 | for i in ${IMAGE_ROOTFS}/var/dpkg/info/*.postinst; do | 55 | for i in ${IMAGE_ROOTFS}/var/lib/dpkg/info/*.postinst; do |
56 | if [ -f $i ] && ! sh $i configure; then | 56 | if [ -f $i ] && ! sh $i configure; then |
57 | _flag unpacked `basename $i .postinst` | 57 | _flag unpacked `basename $i .postinst` |
58 | fi | 58 | fi |
@@ -65,12 +65,12 @@ fakeroot rootfs_deb_do_rootfs () { | |||
65 | 65 | ||
66 | # Hacks to allow opkg's update-alternatives and opkg to coexist for now | 66 | # Hacks to allow opkg's update-alternatives and opkg to coexist for now |
67 | mkdir -p ${IMAGE_ROOTFS}${opkglibdir} | 67 | mkdir -p ${IMAGE_ROOTFS}${opkglibdir} |
68 | if [ -e ${IMAGE_ROOTFS}/var/dpkg/alternatives ]; then | 68 | if [ -e ${IMAGE_ROOTFS}/var/lib/dpkg/alternatives ]; then |
69 | rmdir ${IMAGE_ROOTFS}/var/dpkg/alternatives | 69 | rmdir ${IMAGE_ROOTFS}/var/lib/dpkg/alternatives |
70 | fi | 70 | fi |
71 | ln -s ${opkglibdir}/alternatives ${IMAGE_ROOTFS}/var/dpkg/alternatives | 71 | ln -s ${opkglibdir}/alternatives ${IMAGE_ROOTFS}/var/lib/dpkg/alternatives |
72 | ln -s /var/dpkg/info ${IMAGE_ROOTFS}${opkglibdir}/info | 72 | ln -s /var/lib/dpkg/info ${IMAGE_ROOTFS}${opkglibdir}/info |
73 | ln -s /var/dpkg/status ${IMAGE_ROOTFS}${opkglibdir}/status | 73 | ln -s /var/lib/dpkg/status ${IMAGE_ROOTFS}${opkglibdir}/status |
74 | 74 | ||
75 | ${ROOTFS_POSTPROCESS_COMMAND} | 75 | ${ROOTFS_POSTPROCESS_COMMAND} |
76 | 76 | ||