diff options
Diffstat (limited to 'meta')
| -rw-r--r-- | meta/classes/rootfs_deb.bbclass | 19 | ||||
| -rwxr-xr-x | meta/packages/meta/run-postinsts/run-postinsts | 2 | ||||
| -rw-r--r-- | meta/packages/meta/run-postinsts/run-postinsts.awk | 2 | ||||
| -rw-r--r-- | meta/packages/meta/run-postinsts_1.0.bb | 2 |
4 files changed, 11 insertions, 14 deletions
diff --git a/meta/classes/rootfs_deb.bbclass b/meta/classes/rootfs_deb.bbclass index 358658fb6b..467626b2b1 100644 --- a/meta/classes/rootfs_deb.bbclass +++ b/meta/classes/rootfs_deb.bbclass @@ -14,7 +14,7 @@ fakeroot rootfs_deb_do_rootfs () { rm -f ${STAGING_ETCDIR_NATIVE}/apt/preferences > ${IMAGE_ROOTFS}/var/dpkg/status > ${IMAGE_ROOTFS}/var/dpkg/available - # > ${STAGING_DIR}/var/dpkg/status + mkdir -p ${IMAGE_ROOTFS}/var/dpkg/alternatives priority=1 for arch in ${PACKAGE_ARCHS}; do @@ -48,8 +48,6 @@ fakeroot rootfs_deb_do_rootfs () { export IPKG_OFFLINE_ROOT=${IMAGE_ROOTFS} export OPKG_OFFLINE_ROOT=${IMAGE_ROOTFS} - mkdir -p ${IMAGE_ROOTFS}/var/lib/dpkg/alternatives - apt-get update _flag () { @@ -110,15 +108,14 @@ fakeroot rootfs_deb_do_rootfs () { set -e - # Hacks to make dpkg/opkg coexist for now - mv ${IMAGE_ROOTFS}/var/dpkg ${IMAGE_ROOTFS}/usr/ - if [ -e ${IMAGE_ROOTFS}/usr/dpkg/alternatives ]; then - rmdir ${IMAGE_ROOTFS}/usr/dpkg/alternatives - fi + # Hacks to allow opkg's update-alternatives and opkg to coexist for now mkdir -p ${IMAGE_ROOTFS}/usr/lib/opkg - ln -s /usr/lib/opkg/alternatives ${IMAGE_ROOTFS}/usr/dpkg/alternatives - ln -s /usr/dpkg/onfo ${IMAGE_ROOTFS}/usr/lib/opkg/info - ln -s /usr/dpkg/status ${IMAGE_ROOTFS}/usr/lib/opkg/status + 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 ${ROOTFS_POSTPROCESS_COMMAND} diff --git a/meta/packages/meta/run-postinsts/run-postinsts b/meta/packages/meta/run-postinsts/run-postinsts index 46b3327f4f..f632d1c7d3 100755 --- a/meta/packages/meta/run-postinsts/run-postinsts +++ b/meta/packages/meta/run-postinsts/run-postinsts @@ -5,7 +5,7 @@ # Author: Richard Purdie <rpurdie@openedhand.com> # -PKGSYSTEM=/usr/dpkg +PKGSYSTEM=/var/dpkg if [ ! -e $PKGSYSTEM/status ]; then if [ -e /usr/lib/opkg/status ]; then diff --git a/meta/packages/meta/run-postinsts/run-postinsts.awk b/meta/packages/meta/run-postinsts/run-postinsts.awk index bdea8c95ad..09a1400cf4 100644 --- a/meta/packages/meta/run-postinsts/run-postinsts.awk +++ b/meta/packages/meta/run-postinsts/run-postinsts.awk @@ -9,7 +9,7 @@ BEGIN { rc=system("test -d /usr/dpkg/info/") if (rc==0) - pkgdir="/usr/dpkg/info" + pkgdir="/var/dpkg/info" else pkgdir="/usr/lib/opkg/info" package="" diff --git a/meta/packages/meta/run-postinsts_1.0.bb b/meta/packages/meta/run-postinsts_1.0.bb index ec34127385..79333dc7fe 100644 --- a/meta/packages/meta/run-postinsts_1.0.bb +++ b/meta/packages/meta/run-postinsts_1.0.bb @@ -1,6 +1,6 @@ DESCRIPTION = "Run postinstall scripts on device using awk" SECTION = "devel" -PR = "r4" +PR = "r6" SRC_URI = "file://run-postinsts file://run-postinsts.awk" |