diff options
author | Martin Jansa <martin.jansa@gmail.com> | 2012-11-28 15:40:07 +0000 |
---|---|---|
committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2012-12-03 14:32:46 +0000 |
commit | 88a9f6db3482623c9cb54fb03db1045051cec9f6 (patch) | |
tree | 06f7cc73f0ead4dc22df12c755b08c57f57479e2 | |
parent | d65514bf60ff0e3a8433395c6cad6f1fdeb9c9ea (diff) | |
download | poky-88a9f6db3482623c9cb54fb03db1045051cec9f6.tar.gz |
rootfs_ipk, package_ipk: drop --force-overwrite
* it was introduced in 2010 by 8c3a7ebac8bed700bcc37f778d5a883cfeee8de8
but doesn't seem needed anymore
* also such do_rootfs failure is good indication that runtime packages
installed are not sane, ignoring this error in do_rootfs just
transfers the issue to end user when he does "opkg upgrade" later
on device
* tested on SHR images with whole feed included and only issue was
gstreamer/gst-plugins-* locale packages (and there is patch for this
on oe-core ML)
(From OE-Core rev: 1f7d3a2e9071ff78170c06ebf58c7400a5ee09bf)
Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
Signed-off-by: Saul Wold <sgw@linux.intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
-rw-r--r-- | meta/classes/package_ipk.bbclass | 2 | ||||
-rw-r--r-- | meta/classes/rootfs_ipk.bbclass | 4 |
2 files changed, 3 insertions, 3 deletions
diff --git a/meta/classes/package_ipk.bbclass b/meta/classes/package_ipk.bbclass index 4bf1b10aae..f916cf5b90 100644 --- a/meta/classes/package_ipk.bbclass +++ b/meta/classes/package_ipk.bbclass | |||
@@ -139,7 +139,7 @@ package_install_internal_ipk() { | |||
139 | 139 | ||
140 | mkdir -p ${target_rootfs}${localstatedir}/lib/opkg/ | 140 | mkdir -p ${target_rootfs}${localstatedir}/lib/opkg/ |
141 | 141 | ||
142 | local ipkg_args="-f ${conffile} -o ${target_rootfs} --force-overwrite --force_postinstall --prefer-arch-to-version" | 142 | local ipkg_args="-f ${conffile} -o ${target_rootfs} --force_postinstall --prefer-arch-to-version" |
143 | 143 | ||
144 | opkg-cl ${ipkg_args} update | 144 | opkg-cl ${ipkg_args} update |
145 | 145 | ||
diff --git a/meta/classes/rootfs_ipk.bbclass b/meta/classes/rootfs_ipk.bbclass index d5792e54f7..fc69b7edf4 100644 --- a/meta/classes/rootfs_ipk.bbclass +++ b/meta/classes/rootfs_ipk.bbclass | |||
@@ -14,9 +14,9 @@ do_rootfs[recrdeptask] += "do_package_write_ipk" | |||
14 | 14 | ||
15 | do_rootfs[lockfiles] += "${WORKDIR}/ipk.lock" | 15 | do_rootfs[lockfiles] += "${WORKDIR}/ipk.lock" |
16 | 16 | ||
17 | IPKG_ARGS = "-f ${IPKGCONF_TARGET} -o ${IMAGE_ROOTFS} --force-overwrite --force_postinstall --prefer-arch-to-version" | 17 | IPKG_ARGS = "-f ${IPKGCONF_TARGET} -o ${IMAGE_ROOTFS} --force_postinstall --prefer-arch-to-version" |
18 | # The _POST version also works when constructing the matching SDK | 18 | # The _POST version also works when constructing the matching SDK |
19 | IPKG_ARGS_POST = "-f ${IPKGCONF_TARGET} -o $INSTALL_ROOTFS_IPK --force-overwrite --force_postinstall --prefer-arch-to-version" | 19 | IPKG_ARGS_POST = "-f ${IPKGCONF_TARGET} -o $INSTALL_ROOTFS_IPK --force_postinstall --prefer-arch-to-version" |
20 | 20 | ||
21 | OPKG_PREPROCESS_COMMANDS = "package_update_index_ipk; package_generate_ipkg_conf" | 21 | OPKG_PREPROCESS_COMMANDS = "package_update_index_ipk; package_generate_ipkg_conf" |
22 | 22 | ||