* [PATCH 0/3] Fix ATTEMPTONLY and SUGGESTS in package_rpm @ 2011-08-12 1:14 Mark Hatle 2011-08-12 1:14 ` [PATCH 3/3] package_rpm: Fix attemptonly and suggest packages Mark Hatle 2011-08-12 17:55 ` [PATCH 0/3] Fix ATTEMPTONLY and SUGGESTS in package_rpm Saul Wold 0 siblings, 2 replies; 3+ messages in thread From: Mark Hatle @ 2011-08-12 1:14 UTC (permalink / raw) To: openembedded-core Fix ATTEMPTONLY and SUGGESTS in package_rpm. This relies on the previous changes to the rpm platform and package_rpm.bbclass I sent earlier today. Note patch 1 and 2 are the earlier set, which I am not resending. The following changes since commit a92d56058b21913570bb17ae416c3b00afce055e: gnome-doc-utils: respect python-dir setting EXTRA_OECONF (2011-08-11 19:13:38 +0100) are available in the git repository at: git://git.pokylinux.org/poky-contrib mhatle/fix_1366 http://git.pokylinux.org/cgit.cgi/poky-contrib/log/?h=mhatle/fix_1366 Mark Hatle (3): rpm: Fix the canonical arch --target processing and cleanup package_rpm.bbclass: Update the platform config and --target package_rpm: Fix attemptonly and suggest packages meta/classes/package_rpm.bbclass | 39 +++++-- .../recipes-devtools/rpm/rpm/export-rpmbag-h.patch | 45 ------- meta/recipes-devtools/rpm/rpm/hdraddorappend.patch | 22 ---- meta/recipes-devtools/rpm/rpm/rpm-canonarch.patch | 134 ++++++++++++++++++++ meta/recipes-devtools/rpm/rpm/rpm-no-loop.patch | 38 ------ meta/recipes-devtools/rpm/rpm/rpm-no-loopmsg.patch | 16 +++ meta/recipes-devtools/rpm/rpm/rpm-nrescan.patch | 17 --- meta/recipes-devtools/rpm/rpm_5.4.0.bb | 8 +- 8 files changed, 184 insertions(+), 135 deletions(-) delete mode 100644 meta/recipes-devtools/rpm/rpm/export-rpmbag-h.patch delete mode 100644 meta/recipes-devtools/rpm/rpm/hdraddorappend.patch create mode 100644 meta/recipes-devtools/rpm/rpm/rpm-canonarch.patch delete mode 100644 meta/recipes-devtools/rpm/rpm/rpm-no-loop.patch create mode 100644 meta/recipes-devtools/rpm/rpm/rpm-no-loopmsg.patch delete mode 100644 meta/recipes-devtools/rpm/rpm/rpm-nrescan.patch -- 1.7.3.4 ^ permalink raw reply [flat|nested] 3+ messages in thread
* [PATCH 3/3] package_rpm: Fix attemptonly and suggest packages 2011-08-12 1:14 [PATCH 0/3] Fix ATTEMPTONLY and SUGGESTS in package_rpm Mark Hatle @ 2011-08-12 1:14 ` Mark Hatle 2011-08-12 17:55 ` [PATCH 0/3] Fix ATTEMPTONLY and SUGGESTS in package_rpm Saul Wold 1 sibling, 0 replies; 3+ messages in thread From: Mark Hatle @ 2011-08-12 1:14 UTC (permalink / raw) To: openembedded-core [YOCTO #1325] [YOCTO #1366] Packages that were in the PACKAGE_ATTEMPTONLY and SUGGESTS were not being properly found, which was causing image creation failures. In PACKAGE_ATTEMPTONLY, when an item was not found, it caused an error. This should have been a note, followed by skipping the package. The SUGGESTS processing was simply broken. It was using a non-existant function, due to an apparently typo. In addition to the above, the MLPREFIX processing was not being done properly, preventing multilib packages from working in this with PACKAGE_ATTEMPTONLY. (SUGGESTS doesn't need this as the names are munged when creating the packages.) Signed-off-by: Mark Hatle <mark.hatle@windriver.com> --- meta/classes/package_rpm.bbclass | 25 ++++++++++++++++++++----- 1 files changed, 20 insertions(+), 5 deletions(-) diff --git a/meta/classes/package_rpm.bbclass b/meta/classes/package_rpm.bbclass index 5c67f69..b15786d 100644 --- a/meta/classes/package_rpm.bbclass +++ b/meta/classes/package_rpm.bbclass @@ -257,10 +257,16 @@ package_install_internal_rpm () { echo "Adding attempt only packages..." for pkg in ${package_attemptonly} ; do echo "Processing $pkg..." - pkg_name=$(resolve_package_rpm $pkg ${confbase}.conf) + archvar=base_archs + ml_pkg=$(echo ${pkg} | sed "s,^${MLPREFIX}\(.*\),\1,") + if [ "${ml_pkg}" != "${pkg}" ]; then + archvar=ml_archs + fi + + pkg_name=$(resolve_package_rpm ${confbase}-${archvar}.conf ${ml_pkg}) if [ -z "$pkg_name" ]; then - echo "Unable to find package $pkg!" - exit 1 + echo "Note: Unable to find package $pkg ($ml_pkg) -- PACKAGE_INSTALL_ATTEMPTONLY" + continue fi echo "Attempting $pkg_name..." >> "${WORKDIR}/temp/log.do_${task}_attemptonly.${PID}" ${RPM} --predefine "_rpmds_sysinfo_path ${target_rootfs}/etc/rpm/sysinfo" \ @@ -297,8 +303,17 @@ package_install_internal_rpm () { # Ohh there was a new one, we'll need to loop again... loop=1 echo "Processing $pkg..." - pkg_name=$(resolve_package $pkg ${confbase}.conf) - if [ -z "$pkg_name" ]; then + found=0 + for archvar in base_archs ml_archs ; do + pkg_name=$(resolve_package_rpm ${confbase}-${archvar}.conf ${pkg}) + if [ -n "$pkg_name" ]; then + found=1 + break + fi + done + + if [ $found -eq 0 ]; then + echo "Note: Unable to find package $pkg -- suggests" echo "Unable to find package $pkg." >> "${WORKDIR}/temp/log.do_${task}_recommend.${PID}" continue fi -- 1.7.3.4 ^ permalink raw reply related [flat|nested] 3+ messages in thread
* Re: [PATCH 0/3] Fix ATTEMPTONLY and SUGGESTS in package_rpm 2011-08-12 1:14 [PATCH 0/3] Fix ATTEMPTONLY and SUGGESTS in package_rpm Mark Hatle 2011-08-12 1:14 ` [PATCH 3/3] package_rpm: Fix attemptonly and suggest packages Mark Hatle @ 2011-08-12 17:55 ` Saul Wold 1 sibling, 0 replies; 3+ messages in thread From: Saul Wold @ 2011-08-12 17:55 UTC (permalink / raw) To: Patches and discussions about the oe-core layer On 08/11/2011 06:14 PM, Mark Hatle wrote: > Fix ATTEMPTONLY and SUGGESTS in package_rpm. This relies on the previous > changes to the rpm platform and package_rpm.bbclass I sent earlier today. > > Note patch 1 and 2 are the earlier set, which I am not resending. > > The following changes since commit a92d56058b21913570bb17ae416c3b00afce055e: > > gnome-doc-utils: respect python-dir setting EXTRA_OECONF (2011-08-11 19:13:38 +0100) > > are available in the git repository at: > git://git.pokylinux.org/poky-contrib mhatle/fix_1366 > http://git.pokylinux.org/cgit.cgi/poky-contrib/log/?h=mhatle/fix_1366 > > Mark Hatle (3): > rpm: Fix the canonical arch --target processing and cleanup > package_rpm.bbclass: Update the platform config and --target > package_rpm: Fix attemptonly and suggest packages > > meta/classes/package_rpm.bbclass | 39 +++++-- > .../recipes-devtools/rpm/rpm/export-rpmbag-h.patch | 45 ------- > meta/recipes-devtools/rpm/rpm/hdraddorappend.patch | 22 ---- > meta/recipes-devtools/rpm/rpm/rpm-canonarch.patch | 134 ++++++++++++++++++++ > meta/recipes-devtools/rpm/rpm/rpm-no-loop.patch | 38 ------ > meta/recipes-devtools/rpm/rpm/rpm-no-loopmsg.patch | 16 +++ > meta/recipes-devtools/rpm/rpm/rpm-nrescan.patch | 17 --- > meta/recipes-devtools/rpm/rpm_5.4.0.bb | 8 +- > 8 files changed, 184 insertions(+), 135 deletions(-) > delete mode 100644 meta/recipes-devtools/rpm/rpm/export-rpmbag-h.patch > delete mode 100644 meta/recipes-devtools/rpm/rpm/hdraddorappend.patch > create mode 100644 meta/recipes-devtools/rpm/rpm/rpm-canonarch.patch > delete mode 100644 meta/recipes-devtools/rpm/rpm/rpm-no-loop.patch > create mode 100644 meta/recipes-devtools/rpm/rpm/rpm-no-loopmsg.patch > delete mode 100644 meta/recipes-devtools/rpm/rpm/rpm-nrescan.patch > Merged into OE-Core Thanks Sau! ^ permalink raw reply [flat|nested] 3+ messages in thread
end of thread, other threads:[~2011-08-12 18:00 UTC | newest] Thread overview: 3+ messages (download: mbox.gz follow: Atom feed -- links below jump to the message on this page -- 2011-08-12 1:14 [PATCH 0/3] Fix ATTEMPTONLY and SUGGESTS in package_rpm Mark Hatle 2011-08-12 1:14 ` [PATCH 3/3] package_rpm: Fix attemptonly and suggest packages Mark Hatle 2011-08-12 17:55 ` [PATCH 0/3] Fix ATTEMPTONLY and SUGGESTS in package_rpm Saul Wold
This is a public inbox, see mirroring instructions for how to clone and mirror all data and code used for this inbox