diff options
Diffstat (limited to 'classes/rootfs_ipk.bbclass')
| -rw-r--r-- | classes/rootfs_ipk.bbclass | 58 |
1 files changed, 46 insertions, 12 deletions
diff --git a/classes/rootfs_ipk.bbclass b/classes/rootfs_ipk.bbclass index 889ace2e99..16dd511fcb 100644 --- a/classes/rootfs_ipk.bbclass +++ b/classes/rootfs_ipk.bbclass @@ -5,22 +5,43 @@ # See image.bbclass for a usage of this. # -do_rootfs[depends] += "opkg-native:do_populate_staging ipkg-utils-native:do_populate_staging" -do_rootfs[recrdeptask] += "do_package_write_ipk" +do_rootfs[depends] += "opkg-native:do_populate_staging" IPKG_ARGS = "-f ${IPKGCONF_TARGET} -o ${IMAGE_ROOTFS} ${@base_conditional("PACKAGE_INSTALL_NO_DEPS", "1", "-nodeps", "", d)}" -DISTRO_EXTRA_RDEPENDS += " opkg opkg-collateral " PACKAGE_INSTALL_NO_DEPS ?= "0" +# What support to provide for online management of packages at run time? +# full -> traditional system, opkg is installed with all metadata +# add -> opkg is installed with basic conf files but no status database; can add new packages at runtime but not modify existing ones +# none -> opkg not installed at all, no metadata or config files provided +ONLINE_PACKAGE_MANAGEMENT ?= "full" + +# Which packages to not install on the basis of a recommendation +BAD_RECOMMENDATIONS ?= "" + +IPKG_VARIANT ?= "opkg" + +RDEPENDS_append = " ${@base_conditional("ONLINE_PACKAGE_MANAGEMENT", "none", "", "${IPKG_VARIANT} opkg-collateral", d)}" +PACKAGE_INSTALL_append = " ${@base_conditional("ONLINE_PACKAGE_MANAGEMENT", "none", "", "${IPKG_VARIANT} opkg-collateral", d)}" + fakeroot rootfs_ipk_do_rootfs () { set -x - package_update_index_ipk package_generate_ipkg_conf mkdir -p ${T} mkdir -p ${IMAGE_ROOTFS}${libdir}/opkg/ + + STATUS=${IMAGE_ROOTFS}${libdir}/opkg/status + # prime the status file with bits that we don't want + for i in ${BAD_RECOMMENDATIONS}; do + echo "Package: $i" >> $STATUS + echo "Architecture: ${TARGET_ARCH}" >> $STATUS + echo "Status: deinstall ok not-installed" >> $STATUS + echo >> $STATUS + done + opkg-cl ${IPKG_ARGS} update # Uclibc builds don't provide this stuff... @@ -41,8 +62,10 @@ fakeroot rootfs_ipk_do_rootfs () { export IPKG_OFFLINE_ROOT=${IMAGE_ROOTFS} export OPKG_OFFLINE_ROOT=${IPKG_OFFLINE_ROOT} - mkdir -p ${IMAGE_ROOTFS}${sysconfdir}/opkg/ - grep "^arch" ${IPKGCONF_TARGET} >${IMAGE_ROOTFS}${sysconfdir}/opkg/arch.conf + if [ "${ONLINE_PACKAGE_MANAGEMENT}" != "none" ]; then + mkdir -p ${IMAGE_ROOTFS}${sysconfdir}/opkg/ + grep "^arch" ${IPKGCONF_TARGET} >${IMAGE_ROOTFS}${sysconfdir}/opkg/arch.conf + fi for i in ${IMAGE_ROOTFS}${libdir}/opkg/info/*.preinst; do if [ -f $i ] && ! sh $i; then @@ -58,11 +81,21 @@ fakeroot rootfs_ipk_do_rootfs () { install -d ${IMAGE_ROOTFS}/${sysconfdir} echo ${BUILDNAME} > ${IMAGE_ROOTFS}/${sysconfdir}/version - rm -f ${IMAGE_ROOTFS}${libdir}/opkg/lists/* + if [ "${ONLINE_PACKAGE_MANAGEMENT}" != "none" ]; then + if [ "${ONLINE_PACKAGE_MANAGEMENT}" == "add" ]; then + rm -f ${IMAGE_ROOTFS}${libdir}/opkg/status + rm -f ${IMAGE_ROOTFS}${libdir}/opkg/*/* + else + rm -f ${IMAGE_ROOTFS}${libdir}/opkg/lists/* + fi - # Keep these lines until package manager selection is implemented - ln -s opkg ${IMAGE_ROOTFS}${sysconfdir}/ipkg - ln -s opkg ${IMAGE_ROOTFS}${libdir}/ipkg + # Keep these lines until package manager selection is implemented + ln -s opkg ${IMAGE_ROOTFS}${sysconfdir}/ipkg + ln -s opkg ${IMAGE_ROOTFS}${libdir}/ipkg + else + rm -rf ${IMAGE_ROOTFS}${libdir}/opkg + rm -rf ${IMAGE_ROOTFS}/usr/lib/opkg + fi ${ROOTFS_POSTPROCESS_COMMAND} @@ -74,9 +107,10 @@ rootfs_ipk_log_check() { lf_path="$2" lf_txt="`cat $lf_path`" - for keyword_die in "Cannot find package" "exit 1" ERR Fail + for keyword_die in "Cannot find package" "Cannot satisfy the following dependencies" \ + "exit 1" ERR Fail do - if (echo "$lf_txt" | grep -v log_check | grep "$keyword_die") >/dev/null 2>&1 + if (echo "$lf_txt" | grep -v log_check | grep -w "$keyword_die") >/dev/null 2>&1 then echo "log_check: There were error messages in the logfile" printf "log_check: Matched keyword: [$keyword_die]\n" |