diff options
Diffstat (limited to 'meta/classes/package_ipk.bbclass')
| -rw-r--r-- | meta/classes/package_ipk.bbclass | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/meta/classes/package_ipk.bbclass b/meta/classes/package_ipk.bbclass index f916cf5b90..b441e86c0a 100644 --- a/meta/classes/package_ipk.bbclass +++ b/meta/classes/package_ipk.bbclass | |||
| @@ -10,6 +10,8 @@ PKGWRITEDIRIPK = "${WORKDIR}/deploy-ipks" | |||
| 10 | # Program to be used to build opkg packages | 10 | # Program to be used to build opkg packages |
| 11 | OPKGBUILDCMD ??= "opkg-build" | 11 | OPKGBUILDCMD ??= "opkg-build" |
| 12 | 12 | ||
| 13 | OPKG_ARGS = "-f $INSTALL_CONF_IPK -o $INSTALL_ROOTFS_IPK --force_postinstall --prefer-arch-to-version" | ||
| 14 | |||
| 13 | python package_ipk_fn () { | 15 | python package_ipk_fn () { |
| 14 | d.setVar('PKGFN', d.getVar('PKG')) | 16 | d.setVar('PKGFN', d.getVar('PKG')) |
| 15 | } | 17 | } |
| @@ -71,7 +73,7 @@ package_tryout_install_multilib_ipk() { | |||
| 71 | multilib_tryout_dirs="" | 73 | multilib_tryout_dirs="" |
| 72 | for item in ${MULTILIB_VARIANTS}; do | 74 | for item in ${MULTILIB_VARIANTS}; do |
| 73 | local target_rootfs="${MULTILIB_TEMP_ROOTFS}/${item}" | 75 | local target_rootfs="${MULTILIB_TEMP_ROOTFS}/${item}" |
| 74 | local ipkg_args="-f ${INSTALL_CONF_IPK} -o ${target_rootfs} --force_overwrite" | 76 | local ipkg_args="${OPKG_ARGS}" |
| 75 | local selected_pkg="" | 77 | local selected_pkg="" |
| 76 | local pkgname_prefix="${item}-" | 78 | local pkgname_prefix="${item}-" |
| 77 | local pkgname_len=${#pkgname_prefix} | 79 | local pkgname_len=${#pkgname_prefix} |
| @@ -127,7 +129,6 @@ split_multilib_packages() { | |||
| 127 | package_install_internal_ipk() { | 129 | package_install_internal_ipk() { |
| 128 | 130 | ||
| 129 | local target_rootfs="${INSTALL_ROOTFS_IPK}" | 131 | local target_rootfs="${INSTALL_ROOTFS_IPK}" |
| 130 | local conffile="${INSTALL_CONF_IPK}" | ||
| 131 | local package_attemptonly="${INSTALL_PACKAGES_ATTEMPTONLY_IPK}" | 132 | local package_attemptonly="${INSTALL_PACKAGES_ATTEMPTONLY_IPK}" |
| 132 | local package_linguas="${INSTALL_PACKAGES_LINGUAS_IPK}" | 133 | local package_linguas="${INSTALL_PACKAGES_LINGUAS_IPK}" |
| 133 | local task="${INSTALL_TASK_IPK}" | 134 | local task="${INSTALL_TASK_IPK}" |
| @@ -139,7 +140,7 @@ package_install_internal_ipk() { | |||
| 139 | 140 | ||
| 140 | mkdir -p ${target_rootfs}${localstatedir}/lib/opkg/ | 141 | mkdir -p ${target_rootfs}${localstatedir}/lib/opkg/ |
| 141 | 142 | ||
| 142 | local ipkg_args="-f ${conffile} -o ${target_rootfs} --force_postinstall --prefer-arch-to-version" | 143 | local ipkg_args="${OPKG_ARGS}" |
| 143 | 144 | ||
| 144 | opkg-cl ${ipkg_args} update | 145 | opkg-cl ${ipkg_args} update |
| 145 | 146 | ||
