diff options
Diffstat (limited to 'meta/classes')
-rw-r--r-- | meta/classes/package_deb.bbclass | 10 | ||||
-rw-r--r-- | meta/classes/populate_sdk_deb.bbclass | 4 | ||||
-rw-r--r-- | meta/classes/rootfs_deb.bbclass | 20 |
3 files changed, 17 insertions, 17 deletions
diff --git a/meta/classes/package_deb.bbclass b/meta/classes/package_deb.bbclass index 5a3204732..6733e6453 100644 --- a/meta/classes/package_deb.bbclass +++ b/meta/classes/package_deb.bbclass @@ -135,11 +135,11 @@ package_install_internal_deb () { export APT_CONFIG="${STAGING_ETCDIR_NATIVE}/apt/apt-${task}.conf" - mkdir -p ${target_rootfs}/var/dpkg/info - mkdir -p ${target_rootfs}/var/dpkg/updates + mkdir -p ${target_rootfs}/var/lib/dpkg/info + mkdir -p ${target_rootfs}/var/lib/dpkg/updates - > ${target_rootfs}/var/dpkg/status - > ${target_rootfs}/var/dpkg/available + > ${target_rootfs}/var/lib/dpkg/status + > ${target_rootfs}/var/lib/dpkg/available apt-get update @@ -179,7 +179,7 @@ package_install_internal_deb () { done # Mark all packages installed - sed -i -e "s/Status: install ok unpacked/Status: install ok installed/;" ${target_rootfs}/var/dpkg/status + sed -i -e "s/Status: install ok unpacked/Status: install ok installed/;" ${target_rootfs}/var/lib/dpkg/status } deb_log_check() { diff --git a/meta/classes/populate_sdk_deb.bbclass b/meta/classes/populate_sdk_deb.bbclass index 2cff69e82..be7b5520c 100644 --- a/meta/classes/populate_sdk_deb.bbclass +++ b/meta/classes/populate_sdk_deb.bbclass @@ -52,8 +52,8 @@ fakeroot populate_sdk_deb () { populate_sdk_post_deb ${SDK_OUTPUT}/${SDKPATHNATIVE} #move remainings - install -d ${SDK_OUTPUT}/${SDKPATHNATIVE}/var/dpkg - mv ${SDK_OUTPUT}/var/dpkg/* ${SDK_OUTPUT}/${SDKPATHNATIVE}/var/dpkg + install -d ${SDK_OUTPUT}/${SDKPATHNATIVE}/var/lib/dpkg + mv ${SDK_OUTPUT}/var/lib/dpkg/* ${SDK_OUTPUT}/${SDKPATHNATIVE}/var/lib/dpkg rm -rf ${SDK_OUTPUT}/var populate_sdk_log_check populate_sdk diff --git a/meta/classes/rootfs_deb.bbclass b/meta/classes/rootfs_deb.bbclass index e03e80bdb..bab8e1e8c 100644 --- a/meta/classes/rootfs_deb.bbclass +++ b/meta/classes/rootfs_deb.bbclass @@ -13,7 +13,7 @@ opkglibdir = "${localstatedir}/lib/opkg" fakeroot rootfs_deb_do_rootfs () { set +e - mkdir -p ${IMAGE_ROOTFS}/var/dpkg/alternatives + mkdir -p ${IMAGE_ROOTFS}/var/lib/dpkg/alternatives # update index package_update_index_deb @@ -36,15 +36,15 @@ fakeroot rootfs_deb_do_rootfs () { export OPKG_OFFLINE_ROOT=${IMAGE_ROOTFS} _flag () { - sed -i -e "/^Package: $2\$/{n; s/Status: install ok .*/Status: install ok $1/;}" ${IMAGE_ROOTFS}/var/dpkg/status + sed -i -e "/^Package: $2\$/{n; s/Status: install ok .*/Status: install ok $1/;}" ${IMAGE_ROOTFS}/var/lib/dpkg/status } _getflag () { - cat ${IMAGE_ROOTFS}/var/dpkg/status | sed -n -e "/^Package: $2\$/{n; s/Status: install ok .*/$1/; p}" + cat ${IMAGE_ROOTFS}/var/lib/dpkg/status | sed -n -e "/^Package: $2\$/{n; s/Status: install ok .*/$1/; p}" } # Attempt to run preinsts # Mark packages with preinst failures as unpacked - for i in ${IMAGE_ROOTFS}/var/dpkg/info/*.preinst; do + for i in ${IMAGE_ROOTFS}/var/lib/dpkg/info/*.preinst; do if [ -f $i ] && ! sh $i; then _flag unpacked `basename $i .preinst` fi @@ -52,7 +52,7 @@ fakeroot rootfs_deb_do_rootfs () { # Attempt to run postinsts # Mark packages with postinst failures as unpacked - for i in ${IMAGE_ROOTFS}/var/dpkg/info/*.postinst; do + for i in ${IMAGE_ROOTFS}/var/lib/dpkg/info/*.postinst; do if [ -f $i ] && ! sh $i configure; then _flag unpacked `basename $i .postinst` fi @@ -65,12 +65,12 @@ fakeroot rootfs_deb_do_rootfs () { # Hacks to allow opkg's update-alternatives and opkg to coexist for now mkdir -p ${IMAGE_ROOTFS}${opkglibdir} - if [ -e ${IMAGE_ROOTFS}/var/dpkg/alternatives ]; then - rmdir ${IMAGE_ROOTFS}/var/dpkg/alternatives + if [ -e ${IMAGE_ROOTFS}/var/lib/dpkg/alternatives ]; then + rmdir ${IMAGE_ROOTFS}/var/lib/dpkg/alternatives fi - ln -s ${opkglibdir}/alternatives ${IMAGE_ROOTFS}/var/dpkg/alternatives - ln -s /var/dpkg/info ${IMAGE_ROOTFS}${opkglibdir}/info - ln -s /var/dpkg/status ${IMAGE_ROOTFS}${opkglibdir}/status + ln -s ${opkglibdir}/alternatives ${IMAGE_ROOTFS}/var/lib/dpkg/alternatives + ln -s /var/lib/dpkg/info ${IMAGE_ROOTFS}${opkglibdir}/info + ln -s /var/lib/dpkg/status ${IMAGE_ROOTFS}${opkglibdir}/status ${ROOTFS_POSTPROCESS_COMMAND} |