diff options
Diffstat (limited to 'meta/classes/rootfs_ipk.bbclass')
-rw-r--r-- | meta/classes/rootfs_ipk.bbclass | 35 |
1 files changed, 5 insertions, 30 deletions
diff --git a/meta/classes/rootfs_ipk.bbclass b/meta/classes/rootfs_ipk.bbclass index 3709f89743..3c9d03f9dd 100644 --- a/meta/classes/rootfs_ipk.bbclass +++ b/meta/classes/rootfs_ipk.bbclass | |||
@@ -8,41 +8,16 @@ | |||
8 | do_rootfs[depends] += "ipkg-native:do_populate_staging ipkg-utils-native:do_populate_staging" | 8 | do_rootfs[depends] += "ipkg-native:do_populate_staging ipkg-utils-native:do_populate_staging" |
9 | do_rootfs[recrdeptask] += "do_package_write_ipk" | 9 | do_rootfs[recrdeptask] += "do_package_write_ipk" |
10 | 10 | ||
11 | IPKG_ARGS = "-f ${T}/ipkg.conf -o ${IMAGE_ROOTFS}" | 11 | IPKG_ARGS = "-f ${IPKGCONF_TARGET} -o ${IMAGE_ROOTFS}" |
12 | |||
13 | rootfs_ipk_do_indexes () { | ||
14 | set -x | ||
15 | |||
16 | ipkgarchs="${PACKAGE_ARCHS}" | ||
17 | |||
18 | if [ -z "${DEPLOY_KEEP_PACKAGES}" ]; then | ||
19 | touch ${DEPLOY_DIR_IPK}/Packages | ||
20 | ipkg-make-index -r ${DEPLOY_DIR_IPK}/Packages -p ${DEPLOY_DIR_IPK}/Packages -l ${DEPLOY_DIR_IPK}/Packages.filelist -m ${DEPLOY_DIR_IPK} | ||
21 | fi | ||
22 | |||
23 | for arch in $ipkgarchs; do | ||
24 | if [ -z "${DEPLOY_KEEP_PACKAGES}" ]; then | ||
25 | if [ -e ${DEPLOY_DIR_IPK}/$arch/ ] ; then | ||
26 | touch ${DEPLOY_DIR_IPK}/$arch/Packages | ||
27 | ipkg-make-index -r ${DEPLOY_DIR_IPK}/$arch/Packages -p ${DEPLOY_DIR_IPK}/$arch/Packages -l ${DEPLOY_DIR_IPK}/$arch/Packages.filelist -m ${DEPLOY_DIR_IPK}/$arch/ | ||
28 | fi | ||
29 | fi | ||
30 | done | ||
31 | } | ||
32 | 12 | ||
33 | fakeroot rootfs_ipk_do_rootfs () { | 13 | fakeroot rootfs_ipk_do_rootfs () { |
34 | set -x | 14 | set -x |
35 | 15 | ||
36 | rootfs_ipk_do_indexes | 16 | package_update_index_ipk |
17 | package_generate_ipkg_conf | ||
37 | 18 | ||
38 | mkdir -p ${T} | 19 | mkdir -p ${T} |
39 | echo "src oe file:${DEPLOY_DIR_IPK}" > ${T}/ipkg.conf | 20 | |
40 | ipkgarchs="${PACKAGE_ARCHS}" | ||
41 | priority=1 | ||
42 | for arch in $ipkgarchs; do | ||
43 | echo "arch $arch $priority" >> ${T}/ipkg.conf | ||
44 | priority=$(expr $priority + 5) | ||
45 | done | ||
46 | ipkg-cl ${IPKG_ARGS} update | 21 | ipkg-cl ${IPKG_ARGS} update |
47 | if [ ! -z "${LINGUAS_INSTALL}" ]; then | 22 | if [ ! -z "${LINGUAS_INSTALL}" ]; then |
48 | ipkg-cl ${IPKG_ARGS} install glibc-localedata-i18n | 23 | ipkg-cl ${IPKG_ARGS} install glibc-localedata-i18n |
@@ -58,7 +33,7 @@ fakeroot rootfs_ipk_do_rootfs () { | |||
58 | export OFFLINE_ROOT=${IMAGE_ROOTFS} | 33 | export OFFLINE_ROOT=${IMAGE_ROOTFS} |
59 | export IPKG_OFFLINE_ROOT=${IMAGE_ROOTFS} | 34 | export IPKG_OFFLINE_ROOT=${IMAGE_ROOTFS} |
60 | mkdir -p ${IMAGE_ROOTFS}/etc/ipkg/ | 35 | mkdir -p ${IMAGE_ROOTFS}/etc/ipkg/ |
61 | grep "^arch" ${T}/ipkg.conf >${IMAGE_ROOTFS}/etc/ipkg/arch.conf | 36 | grep "^arch" ${IPKGCONF_TARGET} >${IMAGE_ROOTFS}/etc/ipkg/arch.conf |
62 | 37 | ||
63 | for i in ${IMAGE_ROOTFS}${libdir}/ipkg/info/*.preinst; do | 38 | for i in ${IMAGE_ROOTFS}${libdir}/ipkg/info/*.preinst; do |
64 | if [ -f $i ] && ! sh $i; then | 39 | if [ -f $i ] && ! sh $i; then |