roots_rpm: Enable installation of recommended packages

Within RPM there is a field called "Suggests".  This filed behaves like
"Recommends" does in ipk.  So we write out the packages using the Suggests
field with the Poky 'Recommends' values... and then use the arbitrary tags to
capture the Poky 'Suggests' within a new "Recommends" tag.

Slightly confusing, but the end result is a functioning install.

Also some performance enhancements were add at the same time.

Signed-off-by: Mark Hatle <mark.hatle@windriver.com>

2 files changed, 104 insertions, 32 deletions

diff --git a/meta/classes/package_rpm.bbclass b/meta/classes/package_rpm.bbclass
index a5225dd809..3967ae294e 100644
--- a/meta/classes/package_rpm.bbclass
+++ b/meta/classes/package_rpm.bbclass
@@ -270,8 +270,10 @@ python write_specfile () {
                                         splitrobsoletes = dep
 
                 print_deps(splitrdepends,       "Requires", spec_preamble_bottom, d)
-                print_deps(splitrrecommends,    "Recommends", spec_preamble_bottom, d)
-                print_deps(splitrsuggests,      "Suggests", spec_preamble_bottom, d)
+                # Suggests in RPM are like recommends in Poky!
+                print_deps(splitrrecommends,    "Suggests", spec_preamble_bottom, d)
+                # While there is no analog for suggests... (So call them recommends for now)
+                print_deps(splitrsuggests,      "Recommends", spec_preamble_bottom, d)
                 print_deps(splitrprovides,      "Provides", spec_preamble_bottom, d)
                 print_deps(splitrobsoletes,     "Obsoletes", spec_preamble_bottom, d)
 
@@ -352,8 +354,10 @@ python write_specfile () {
 
         print_deps(srcdepends,          "BuildRequires", spec_preamble_top, d)
         print_deps(srcrdepends,         "Requires", spec_preamble_top, d)
-        print_deps(srcrrecommends,      "Recommends", spec_preamble_top, d)
-        print_deps(srcrsuggests,        "Suggests", spec_preamble_top, d)
+        # Suggests in RPM are like recommends in Poky!
+        print_deps(srcrrecommends,      "Suggests", spec_preamble_top, d)
+        # While there is no analog for suggests... (So call them recommends for now)
+        print_deps(srcrsuggests,        "Recommends", spec_preamble_top, d)
         print_deps(srcrprovides,        "Provides", spec_preamble_top, d)
         print_deps(srcrobsoletes,       "Obsoletes", spec_preamble_top, d)
 
diff --git a/meta/classes/rootfs_rpm.bbclass b/meta/classes/rootfs_rpm.bbclass
index f56acada7c..ace9677f06 100644
--- a/meta/classes/rootfs_rpm.bbclass
+++ b/meta/classes/rootfs_rpm.bbclass
@@ -5,9 +5,6 @@
 ROOTFS_PKGMANAGE = "rpm" 
 ROOTFS_PKGMANAGE_BOOTSTRAP  = "run-postinsts"
 
-RPMOPTS="--dbpath /var/lib/rpm --define='_openall_before_chroot 1'"
-RPM="${BUILD_ARCH}-${BUILD_OS}-rpm ${RPMOPTS}"
-
 do_rootfs[depends] += "rpm-native:do_populate_sysroot"
 
 # Needed for update-alternatives
@@ -20,8 +17,12 @@ AWKPOSTINSTSCRIPT = "${POKYBASE}/scripts/rootfs_rpm-extract-postinst.awk"
 RPM_PREPROCESS_COMMANDS = "package_update_index_rpm; package_generate_rpm_conf"
 RPM_POSTPROCESS_COMMANDS = ""
 
+rpmlibdir = "/var/lib/rpm"
 opkglibdir = "${localstatedir}/lib/opkg"
 
+RPMOPTS="--dbpath ${rpmlibdir} --define='_openall_before_chroot 1'"
+RPM="${BUILD_ARCH}-${BUILD_OS}-rpm ${RPMOPTS}"
+
 fakeroot rootfs_rpm_do_rootfs () {
         set +x
 
@@ -38,9 +39,14 @@ fakeroot rootfs_rpm_do_rootfs () {
         # Uclibc builds don't provide this stuff...
         if [ x${TARGET_OS} = "xlinux" ] || [ x${TARGET_OS} = "xlinux-gnueabi" ] ; then 
                 if [ ! -z "${LINGUAS_INSTALL}" ]; then
-                        for i in ${LINGUAS_INSTALL}; do
-                                echo "LINGUAS: $i"
-                                : # Do not support locales yet
+                        for pkg in ${LINGUAS_INSTALL}; do
+                                echo "Processing $pkg..."
+                                pkg_name=$(resolve_package $pkg)
+                                if [ -z '$pkg_name' ]; then
+                                        echo "Unable to find package $pkg!"
+                                        exit 1
+                                fi
+                                echo $pkg_name >> ${IMAGE_ROOTFS}/install/install.manifest
                         done
                 fi
         fi
@@ -48,44 +54,89 @@ fakeroot rootfs_rpm_do_rootfs () {
         if [ ! -z "${PACKAGE_INSTALL}" ]; then
                 for pkg in ${PACKAGE_INSTALL} ; do
                         echo "Processing $pkg..."
-                        for solve in `cat ${DEPLOY_DIR_RPM}/solvedb.conf`; do
-                                pkg_name=$(${RPM} -D "_dbpath $solve" -D "_dbi_tags_3 Packages:Name:Basenames:Providename:Nvra" -D "__dbi_cdb create mp_mmapsize=128Mb mp_size=1Mb nofsync" -q --yaml $pkg | grep -i 'Packageorigin' | cut -d : -f 2)
-                                if [ -n "$pkg_name" ]; then
-                                        break;
-                                fi
-                        done
-                        if [ -z "$pkg_name" ]; then
-                                echo "ERROR: Unable to find $pkg!"
+                        pkg_name=$(resolve_package $pkg)
+                        if [ -z '$pkg_name' ]; then
+                                echo "Unable to find package $pkg!"
                                 exit 1
                         fi
                         echo $pkg_name >> ${IMAGE_ROOTFS}/install/install.manifest
                 done
         fi
 
-        echo "Manifest: ${IMAGE_ROOTFS}/install/install.manifest"
-
         # Generate an install solution by doing a --justdb install, then recreate it with
         # an actual package install!
         ${RPM} -D "_dbpath ${IMAGE_ROOTFS}/install" -D "`cat ${DEPLOY_DIR_RPM}/solvedb.macro`" \
+                -D "__dbi_cdb create mp_mmapsize=128Mb mp_size=1Mb nofsync" \
                 -U --justdb --noscripts --notriggers --noparentdirs --nolinktos \
                 ${IMAGE_ROOTFS}/install/install.manifest
 
+        if [ ! -z "${PACKAGE_INSTALL_ATTEMPTONLY}" ]; then
+                echo "Adding attempt only packages..."
+                for pkg in ${PACKAGE_INSTALL_ATTEMPTONLY} ; do
+                        echo "Processing $pkg..."
+                        pkg_name=$(resolve_package $pkg)
+                        if [ -z '$pkg_name' ]; then
+                                echo "Unable to find package $pkg!"
+                                exit 1
+                        fi
+                        echo "Attempting $pkg_name..." >> "${WORKDIR}/temp/log.do_rootfs_attemptonly.${PID}"
+                        ${RPM} -D "_dbpath ${IMAGE_ROOTFS}/install" -D "`cat ${DEPLOY_DIR_RPM}/solvedb.macro`" \
+                                -D "__dbi_cdb create mp_mmapsize=128Mb mp_size=1Mb nofsync private" \
+                                -U --justdb --noscripts --notriggers --noparentdirs --nolinktos \
+                        $pkg_name >> "${WORKDIR}/temp/log.do_rootfs_attemptonly.${PID}" || true
+                done
+        fi
+
+#### Note: 'Recommends' is an arbitrary tag that means _SUGGESTS_ in Poky..
+        # Add any recommended packages to the image
+        # RPM does not solve for recommended packages because they are optional...
+        # So we query them and tree them like the ATTEMPTONLY packages above...
+        # Change the loop to "1" to run this code...
+        loop=0
+        if [ $loop -eq 1 ]; then
+         echo "Processing recommended packages..."
+         cat /dev/null >  ${IMAGE_ROOTFS}/install/recommend.list
+         while [ $loop -eq 1 ]; do
+                # Dump the full set of recommends...
+                ${RPM} -D "_dbpath ${IMAGE_ROOTFS}/install" -D "`cat ${DEPLOY_DIR_RPM}/solvedb.macro`" \
+                        -qa --qf "[%{RECOMMENDS}\n]" | sort -u > ${IMAGE_ROOTFS}/install/recommend
+                # Did we add more to the list?
+                grep -v -x -F -f ${IMAGE_ROOTFS}/install/recommend.list ${IMAGE_ROOTFS}/install/recommend > ${IMAGE_ROOTFS}/install/recommend.new || true
+                # We don't want to loop unless there is a change to the list!
+                loop=0
+                cat ${IMAGE_ROOTFS}/install/recommend.new | \
+                 while read pkg ; do
+                        # Ohh there was a new one, we'll need to loop again...
+                        loop=1
+                        echo "Processing $pkg..."
+                        pkg_name=$(resolve_package $pkg || true)
+                        if [ -z "$pkg_name" ]; then
+                                echo "Unable to find package $pkg." >> "${WORKDIR}/temp/log.do_rootfs_recommend.${PID}"
+                                continue
+                        fi
+                        echo "Attempting $pkg_name..." >> "${WORKDIR}/temp/log.do_rootfs_recommend.${PID}"
+                        ${RPM} -D "_dbpath ${IMAGE_ROOTFS}/install" -D "`cat ${DEPLOY_DIR_RPM}/solvedb.macro`" \
+                                -D "__dbi_cdb create mp_mmapsize=128Mb mp_size=1Mb nofsync private" \
+                                -U --justdb --noscripts --notriggers --noparentdirs --nolinktos \
+                                $pkg_name >> "${WORKDIR}/temp/log.do_rootfs_recommend.${PID}" 2>&1 || true
+                done
+                cat ${IMAGE_ROOTFS}/install/recommend.list ${IMAGE_ROOTFS}/install/recommend.new | sort -u > ${IMAGE_ROOTFS}/install/recommend.new.list
+                mv ${IMAGE_ROOTFS}/install/recommend.new.list ${IMAGE_ROOTFS}/install/recommend.list
+                rm ${IMAGE_ROOTFS}/install/recommend ${IMAGE_ROOTFS}/install/recommend.new
+         done
+        fi
+
+        # Now that we have a solution, pull out a list of what to install...
+        echo "Manifest: ${IMAGE_ROOTFS}/install/install.manifest"
         ${RPM} -D "_dbpath ${IMAGE_ROOTFS}/install" -qa --yaml \
                 | grep -i 'Packageorigin' | cut -d : -f 2 > ${IMAGE_ROOTFS}/install/install_solution.manifest
 
         # Attempt install
-        ${RPM} --root ${IMAGE_ROOTFS} -D "_dbpath /var/lib/rpm" \
+        ${RPM} --root ${IMAGE_ROOTFS} -D "_dbpath ${rpmlibdir}" \
                 --noscripts --notriggers --noparentdirs --nolinktos \
+                -D "__dbi_cdb create mp_mmapsize=128Mb mp_size=1Mb nofsync private" \
                 -Uhv ${IMAGE_ROOTFS}/install/install_solution.manifest
 
-        if [ ! -z "${PACKAGE_INSTALL_ATTEMPTONLY}" ]; then
-: #             fakechroot yum ${YUMARGS} -y install ${PACKAGE_INSTALL_ATTEMPTONLY} > ${WORKDIR}/temp/log.do_rootfs-attemptonly.${PID} || true
-        fi
-
-        # Add any recommended packages to the image
-        # (added as an extra script since yum itself doesn't support this)
-: #     yum-install-recommends.py ${IMAGE_ROOTFS} "fakechroot yum ${YUMARGS} -y install"
-
         export D=${IMAGE_ROOTFS}
         export OFFLINE_ROOT=${IMAGE_ROOTFS}
         export IPKG_OFFLINE_ROOT=${IMAGE_ROOTFS}
@@ -94,7 +145,7 @@ fakeroot rootfs_rpm_do_rootfs () {
         ${ROOTFS_POSTINSTALL_COMMAND}
 
         mkdir -p ${IMAGE_ROOTFS}/etc/rpm-postinsts/
-        ${RPM} --root ${IMAGE_ROOTFS} -D '_dbpath /var/lib/rpm' -qa \
+        ${RPM} --root ${IMAGE_ROOTFS} -D '_dbpath ${rpmlibdir}' -qa \
                 --qf 'Name: %{NAME}\n%|POSTIN?{postinstall scriptlet%|POSTINPROG?{ (using %{POSTINPROG})}|:\n%{POSTIN}\n}:{%|POSTINPROG?{postinstall program: %{POSTINPROG}\n}|}|' \
                 > ${IMAGE_ROOTFS}/etc/rpm-postinsts/combined
         awk -f ${AWKPOSTINSTSCRIPT} < ${IMAGE_ROOTFS}/etc/rpm-postinsts/combined
@@ -136,7 +187,7 @@ EOF
         rm -rf ${IMAGE_ROOTFS}/var/log2/
 
         # remove lock files
-        rm -f ${IMAGE_ROOTFS}/var/lib/rpm/__db.*
+        rm -f ${IMAGE_ROOTFS}${rpmlibdir}/__db.*
 
         # remove resolver files and manifests
         rm -f ${IMAGE_ROOTFS}/install/install.manifest
@@ -165,11 +216,28 @@ rootfs_rpm_log_check() {
 }
 
 remove_packaging_data_files() {
-        exit 1
+        rm -rf ${IMAGE_ROOTFS}${rpmlibdir}
         rm -rf ${IMAGE_ROOTFS}${opkglibdir}
 }
 
+# Resolve package names to filepaths
+resolve_package() {
+        pkg="$1"
+        for solve in `cat ${DEPLOY_DIR_RPM}/solvedb.conf`; do
+                pkg_name=$(${RPM} -D "_dbpath $solve" -D "_dbi_tags_3 Packages:Name:Basenames:Providename:Nvra" -D "__dbi_cdb create mp_mmapsize=128Mb mp_size=1Mb nofsync" -q --yaml $pkg | grep -i 'Packageorigin' | cut -d : -f 2)
+                if [ -n "$pkg_name" ]; then
+                        break;
+                fi
+        done
+        if [ -z "$pkg_name" ]; then
+                return 1
+        fi
+        echo $pkg_name
+        return 0
+}       
+
 install_all_locales() {
+        echo "install_all_locales: not yet implemented!"
         exit 1
 
     PACKAGES_TO_INSTALL=""