diff options
-rw-r--r-- | meta/classes/rootfs_deb.bbclass | 17 |
1 files changed, 9 insertions, 8 deletions
diff --git a/meta/classes/rootfs_deb.bbclass b/meta/classes/rootfs_deb.bbclass index 1dc19e746f..7825cf3ec3 100644 --- a/meta/classes/rootfs_deb.bbclass +++ b/meta/classes/rootfs_deb.bbclass | |||
@@ -10,8 +10,8 @@ fakeroot rootfs_deb_do_rootfs () { | |||
10 | mkdir -p ${IMAGE_ROOTFS}/var/dpkg/info | 10 | mkdir -p ${IMAGE_ROOTFS}/var/dpkg/info |
11 | mkdir -p ${IMAGE_ROOTFS}/var/dpkg/updates | 11 | mkdir -p ${IMAGE_ROOTFS}/var/dpkg/updates |
12 | 12 | ||
13 | rm -f ${STAGING_DIR}/etc/apt/sources.list.rev | 13 | rm -f ${STAGING_ETCDIR_NATIVE}/apt/sources.list.rev |
14 | rm -f ${STAGING_DIR}/etc/apt/preferences | 14 | rm -f ${STAGING_ETCDIR_NATIVE}/apt/preferences |
15 | > ${IMAGE_ROOTFS}/var/dpkg/status | 15 | > ${IMAGE_ROOTFS}/var/dpkg/status |
16 | > ${IMAGE_ROOTFS}/var/dpkg/available | 16 | > ${IMAGE_ROOTFS}/var/dpkg/available |
17 | # > ${STAGING_DIR}/var/dpkg/status | 17 | # > ${STAGING_DIR}/var/dpkg/status |
@@ -28,21 +28,21 @@ fakeroot rootfs_deb_do_rootfs () { | |||
28 | apt-ftparchive packages . | bzip2 > Packages.bz2 | 28 | apt-ftparchive packages . | bzip2 > Packages.bz2 |
29 | echo "Label: $arch" > Release | 29 | echo "Label: $arch" > Release |
30 | 30 | ||
31 | echo "deb file:${DEPLOY_DIR_DEB}/$arch/ ./" >> ${STAGING_DIR}/etc/apt/sources.list.rev | 31 | echo "deb file:${DEPLOY_DIR_DEB}/$arch/ ./" >> ${STAGING_ETCDIR_NATIVE}/apt/sources.list.rev |
32 | (echo "Package: *" | 32 | (echo "Package: *" |
33 | echo "Pin: release l=$arch" | 33 | echo "Pin: release l=$arch" |
34 | echo "Pin-Priority: $((800 + $priority))" | 34 | echo "Pin-Priority: $((800 + $priority))" |
35 | echo) >> ${STAGING_DIR}/etc/apt/preferences | 35 | echo) >> ${STAGING_ETCDIR_NATIVE}/apt/preferences |
36 | priority=$(expr $priority + 5) | 36 | priority=$(expr $priority + 5) |
37 | done | 37 | done |
38 | 38 | ||
39 | tac ${STAGING_DIR}/etc/apt/sources.list.rev > ${STAGING_DIR}/etc/apt/sources.list | 39 | tac ${STAGING_ETCDIR_NATIVE}/apt/sources.list.rev > ${STAGING_ETCDIR_NATIVE}/apt/sources.list |
40 | 40 | ||
41 | cat "${STAGING_DIR}/etc/apt/apt.conf.sample" \ | 41 | cat "${STAGING_ETCDIR_NATIVE}/apt/apt.conf.sample" \ |
42 | | sed -e 's#Architecture ".*";#Architecture "${TARGET_ARCH}";#' \ | 42 | | sed -e 's#Architecture ".*";#Architecture "${TARGET_ARCH}";#' \ |
43 | > "${STAGING_DIR}/etc/apt/apt-rootfs.conf" | 43 | > "${STAGING_ETCDIR_NATIVE}/apt/apt-rootfs.conf" |
44 | 44 | ||
45 | export APT_CONFIG="${STAGING_DIR}/etc/apt/apt-rootfs.conf" | 45 | export APT_CONFIG="${STAGING_ETCDIR_NATIVE}/apt/apt-rootfs.conf" |
46 | export D=${IMAGE_ROOTFS} | 46 | export D=${IMAGE_ROOTFS} |
47 | export OFFLINE_ROOT=${IMAGE_ROOTFS} | 47 | export OFFLINE_ROOT=${IMAGE_ROOTFS} |
48 | export IPKG_OFFLINE_ROOT=${IMAGE_ROOTFS} | 48 | export IPKG_OFFLINE_ROOT=${IMAGE_ROOTFS} |
@@ -112,6 +112,7 @@ fakeroot rootfs_deb_do_rootfs () { | |||
112 | if [ -e ${IMAGE_ROOTFS}/usr/dpkg/alternatives ]; then | 112 | if [ -e ${IMAGE_ROOTFS}/usr/dpkg/alternatives ]; then |
113 | rmdir ${IMAGE_ROOTFS}/usr/dpkg/alternatives | 113 | rmdir ${IMAGE_ROOTFS}/usr/dpkg/alternatives |
114 | fi | 114 | fi |
115 | mkdir -p ${IMAGE_ROOTFS}/usr/lib/ipkg | ||
115 | ln -s /usr/lib/ipkg/alternatives ${IMAGE_ROOTFS}/usr/dpkg/alternatives | 116 | ln -s /usr/lib/ipkg/alternatives ${IMAGE_ROOTFS}/usr/dpkg/alternatives |
116 | ln -s /usr/dpkg/info ${IMAGE_ROOTFS}/usr/lib/ipkg/info | 117 | ln -s /usr/dpkg/info ${IMAGE_ROOTFS}/usr/lib/ipkg/info |
117 | ln -s /usr/dpkg/status ${IMAGE_ROOTFS}/usr/lib/ipkg/status | 118 | ln -s /usr/dpkg/status ${IMAGE_ROOTFS}/usr/lib/ipkg/status |