Patchwork [0/9,v7] Uprev RPM to 5.4.9

login
register
mail settings
Submitter Mark Hatle
Date June 11, 2012, 6:18 p.m.
Message ID <cover.1339438568.git.mark.hatle@windriver.com>
Download mbox
Permalink /patch/29667/
State New
Headers show

Pull-request

git://git.pokylinux.org/poky-contrib mhatle/rpm

Comments

Mark Hatle - June 11, 2012, 6:18 p.m.
Fix a regression in rpm dependency generated caused by default settings
changing.  This has been fixed (and verified on the yocto project build
servers.)  This should be the final version....

This has been rebased, and patches 1 and 2 were changed to deal with the
fix for the macros files.

v6 message follows:

Patch 6/8 was reworked to remove the manifest size check.
Patch 8/8 is new and includes the manifest check removed from 6/8 as well as
one that was missed in previous testing.

v5 message follows:

Only 7/7 is new in the version.  Due to the removal of the RPMVSF_NOSIGNATURES
flag in RPM5 5.4.9, createrepo also needed to have this flag removed.

v4 message follows:

Only 6/6 is new in this version.  RPM 5.4.9 appears to be more demanding
for both the DB_CONFIG file and empty manifest files.  The new patch resolves
this issue by ensuring that the DB_CONFIG is always generated, and empty
manifest files do not get installed.

Patches 1-5 are identical to the v3 versions.

v3 messages follows:

Rebase of the v2 changes.

Re-disabled the "test" chunk..  this should resolve the hang problem a
few people have observed.

v2 message follows:

Berkley DB also gets upreved, and a new package ossp-uuid gets added to
the system.

This was -heavily- tested with and without zypper on IA, and PPC.

In addition a minor performance enhancement with a query operation was added.

The uprev also adds the capability of using PACKAGECONFIG settings to tailor
the behavior of RPM.

V2 changes:

Fix a problem with libuuid.so from util-linux would sometimes be linked into
the binary.

Also force libzypp, sat-solver and zypper to refresh via a PR bump.

The following changes since commit ba22e4fcf07eb8007f6d500908d503f1d3dbdd16:

  nasm: updated to 2.10.01 (2012-06-11 13:55:46 +0100)

are available in the git repository at:
  git://git.pokylinux.org/poky-contrib mhatle/rpm
  http://git.pokylinux.org/cgit.cgi/poky-contrib/log/?h=mhatle/rpm

Mark Hatle (9):
  rpm: Upgrade RPM to 5.4.8  (db to 5.3.15)
  rpm: Upgrade RPM to 5.4.9
  ossp-uuid: Add oss-uuid package and RPM 5.4.9 integration
  package_rpm: Add capability to directly query packageorigin
  rpm: Bump PR numbers on componets that require RPM
  rootfs_rpm.bbclass: Update database configuration file
  createrepo: For compatibility w/ RPM 5.4.9 remove RPMVSF_NOSIGNATURES
    flag
  package_rpm: Verify that the package manifests are not empty
  rpm: Ensure pkgconfig deps don't stray from the package being built

 meta/classes/package_rpm.bbclass                   |  105 ++++--
 meta/classes/rootfs_rpm.bbclass                    |   29 --
 .../ossp-uuid/0001-Change-library-name.patch       |  112 +++++
 ...erve-m-option-status-in-v-option-handling.patch |   55 +++
 .../ossp-uuid/0003-Fix-whatis-entries.patch        |   51 +++
 .../ossp-uuid/0004-fix-data-uuid-from-string.patch |   36 ++
 .../ossp-uuid/ossp-uuid/uuid-libtool.patch         |   24 +
 .../ossp-uuid/ossp-uuid/uuid-nostrip.patch         |   16 +
 meta/recipes-devtools/ossp-uuid/ossp-uuid_1.6.2.bb |   58 +++
 .../rpm/rpm/fix_for_automake_1.11.2.patch          |   54 ---
 .../rpm/rpm/fprint-pointer-fix.patch               |   35 --
 .../rpm/rpm/remove-compiled-tests.patch            |  443 --------------------
 meta/recipes-devtools/rpm/rpm/rpm-autoconf.patch   |   22 -
 meta/recipes-devtools/rpm/rpm/rpm-autogen.patch    |   41 +--
 meta/recipes-devtools/rpm/rpm/rpm-db-reduce.patch  |   16 +-
 .../recipes-devtools/rpm/rpm/rpm-log-auto-rm.patch |   12 +-
 meta/recipes-devtools/rpm/rpm/rpm-lua.patch        |   29 ++
 meta/recipes-devtools/rpm/rpm/rpm-macros.patch     |   61 +++
 .../rpm/rpm/rpm-no-perl-urpm.patch                 |   43 ++
 meta/recipes-devtools/rpm/rpm/rpm-nofsync.patch    |   36 --
 meta/recipes-devtools/rpm/rpm/rpm-ossp-uuid.patch  |   20 +
 .../rpm/rpm/rpm-packageorigin.patch                |   23 +
 .../rpm/rpm/rpm-pkgconfigdeps.patch                |   34 ++
 .../rpm/rpm/rpm-scriptletexechelper.patch          |   33 +-
 meta/recipes-devtools/rpm/rpm/rpmdeps-oecore.patch |   26 +-
 .../rpm/{rpm_5.4.0.bb => rpm_5.4.9.bb}             |  160 ++++----
 .../libzypp/libzypp/libzypp-rpm549.patch           |   28 ++
 meta/recipes-extended/libzypp/libzypp_git.bb       |    3 +-
 meta/recipes-extended/sat-solver/sat-solver_git.bb |    2 +-
 meta/recipes-extended/zypper/zypper_git.bb         |    2 +-
 .../createrepo/createrepo/createrepo-rpm549.patch  |   19 +
 .../createrepo/createrepo_0.4.11.bb                |    3 +-
 .../db/{db_5.1.19.bb => db_5.3.15.bb}              |    8 +-
 33 files changed, 822 insertions(+), 817 deletions(-)
 create mode 100644 meta/recipes-devtools/ossp-uuid/ossp-uuid/0001-Change-library-name.patch
 create mode 100644 meta/recipes-devtools/ossp-uuid/ossp-uuid/0002-uuid-preserve-m-option-status-in-v-option-handling.patch
 create mode 100644 meta/recipes-devtools/ossp-uuid/ossp-uuid/0003-Fix-whatis-entries.patch
 create mode 100644 meta/recipes-devtools/ossp-uuid/ossp-uuid/0004-fix-data-uuid-from-string.patch
 create mode 100644 meta/recipes-devtools/ossp-uuid/ossp-uuid/uuid-libtool.patch
 create mode 100644 meta/recipes-devtools/ossp-uuid/ossp-uuid/uuid-nostrip.patch
 create mode 100644 meta/recipes-devtools/ossp-uuid/ossp-uuid_1.6.2.bb
 delete mode 100644 meta/recipes-devtools/rpm/rpm/fix_for_automake_1.11.2.patch
 delete mode 100644 meta/recipes-devtools/rpm/rpm/fprint-pointer-fix.patch
 delete mode 100644 meta/recipes-devtools/rpm/rpm/remove-compiled-tests.patch
 delete mode 100644 meta/recipes-devtools/rpm/rpm/rpm-autoconf.patch
 create mode 100644 meta/recipes-devtools/rpm/rpm/rpm-lua.patch
 create mode 100644 meta/recipes-devtools/rpm/rpm/rpm-macros.patch
 create mode 100644 meta/recipes-devtools/rpm/rpm/rpm-no-perl-urpm.patch
 delete mode 100644 meta/recipes-devtools/rpm/rpm/rpm-nofsync.patch
 create mode 100644 meta/recipes-devtools/rpm/rpm/rpm-ossp-uuid.patch
 create mode 100644 meta/recipes-devtools/rpm/rpm/rpm-packageorigin.patch
 create mode 100644 meta/recipes-devtools/rpm/rpm/rpm-pkgconfigdeps.patch
 rename meta/recipes-devtools/rpm/{rpm_5.4.0.bb => rpm_5.4.9.bb} (76%)
 create mode 100644 meta/recipes-extended/libzypp/libzypp/libzypp-rpm549.patch
 create mode 100644 meta/recipes-support/createrepo/createrepo/createrepo-rpm549.patch
 rename meta/recipes-support/db/{db_5.1.19.bb => db_5.3.15.bb} (93%)
Elizabeth Flanagan - June 11, 2012, 6:36 p.m.
On Mon, Jun 11, 2012 at 11:18 AM, Mark Hatle <mark.hatle@windriver.com> wrote:
> Fix a regression in rpm dependency generated caused by default settings
> changing.  This has been fixed (and verified on the yocto project build
> servers.)  This should be the final version....

Ack'd

I've verified that the initial issues around these patches have been fixed.

-b

>
> This has been rebased, and patches 1 and 2 were changed to deal with the
> fix for the macros files.
>
> v6 message follows:
>
> Patch 6/8 was reworked to remove the manifest size check.
> Patch 8/8 is new and includes the manifest check removed from 6/8 as well as
> one that was missed in previous testing.
>
> v5 message follows:
>
> Only 7/7 is new in the version.  Due to the removal of the RPMVSF_NOSIGNATURES
> flag in RPM5 5.4.9, createrepo also needed to have this flag removed.
>
> v4 message follows:
>
> Only 6/6 is new in this version.  RPM 5.4.9 appears to be more demanding
> for both the DB_CONFIG file and empty manifest files.  The new patch resolves
> this issue by ensuring that the DB_CONFIG is always generated, and empty
> manifest files do not get installed.
>
> Patches 1-5 are identical to the v3 versions.
>
> v3 messages follows:
>
> Rebase of the v2 changes.
>
> Re-disabled the "test" chunk..  this should resolve the hang problem a
> few people have observed.
>
> v2 message follows:
>
> Berkley DB also gets upreved, and a new package ossp-uuid gets added to
> the system.
>
> This was -heavily- tested with and without zypper on IA, and PPC.
>
> In addition a minor performance enhancement with a query operation was added.
>
> The uprev also adds the capability of using PACKAGECONFIG settings to tailor
> the behavior of RPM.
>
> V2 changes:
>
> Fix a problem with libuuid.so from util-linux would sometimes be linked into
> the binary.
>
> Also force libzypp, sat-solver and zypper to refresh via a PR bump.
>
> The following changes since commit ba22e4fcf07eb8007f6d500908d503f1d3dbdd16:
>
>  nasm: updated to 2.10.01 (2012-06-11 13:55:46 +0100)
>
> are available in the git repository at:
>  git://git.pokylinux.org/poky-contrib mhatle/rpm
>  http://git.pokylinux.org/cgit.cgi/poky-contrib/log/?h=mhatle/rpm
>
> Mark Hatle (9):
>  rpm: Upgrade RPM to 5.4.8  (db to 5.3.15)
>  rpm: Upgrade RPM to 5.4.9
>  ossp-uuid: Add oss-uuid package and RPM 5.4.9 integration
>  package_rpm: Add capability to directly query packageorigin
>  rpm: Bump PR numbers on componets that require RPM
>  rootfs_rpm.bbclass: Update database configuration file
>  createrepo: For compatibility w/ RPM 5.4.9 remove RPMVSF_NOSIGNATURES
>    flag
>  package_rpm: Verify that the package manifests are not empty
>  rpm: Ensure pkgconfig deps don't stray from the package being built
>
>  meta/classes/package_rpm.bbclass                   |  105 ++++--
>  meta/classes/rootfs_rpm.bbclass                    |   29 --
>  .../ossp-uuid/0001-Change-library-name.patch       |  112 +++++
>  ...erve-m-option-status-in-v-option-handling.patch |   55 +++
>  .../ossp-uuid/0003-Fix-whatis-entries.patch        |   51 +++
>  .../ossp-uuid/0004-fix-data-uuid-from-string.patch |   36 ++
>  .../ossp-uuid/ossp-uuid/uuid-libtool.patch         |   24 +
>  .../ossp-uuid/ossp-uuid/uuid-nostrip.patch         |   16 +
>  meta/recipes-devtools/ossp-uuid/ossp-uuid_1.6.2.bb |   58 +++
>  .../rpm/rpm/fix_for_automake_1.11.2.patch          |   54 ---
>  .../rpm/rpm/fprint-pointer-fix.patch               |   35 --
>  .../rpm/rpm/remove-compiled-tests.patch            |  443 --------------------
>  meta/recipes-devtools/rpm/rpm/rpm-autoconf.patch   |   22 -
>  meta/recipes-devtools/rpm/rpm/rpm-autogen.patch    |   41 +--
>  meta/recipes-devtools/rpm/rpm/rpm-db-reduce.patch  |   16 +-
>  .../recipes-devtools/rpm/rpm/rpm-log-auto-rm.patch |   12 +-
>  meta/recipes-devtools/rpm/rpm/rpm-lua.patch        |   29 ++
>  meta/recipes-devtools/rpm/rpm/rpm-macros.patch     |   61 +++
>  .../rpm/rpm/rpm-no-perl-urpm.patch                 |   43 ++
>  meta/recipes-devtools/rpm/rpm/rpm-nofsync.patch    |   36 --
>  meta/recipes-devtools/rpm/rpm/rpm-ossp-uuid.patch  |   20 +
>  .../rpm/rpm/rpm-packageorigin.patch                |   23 +
>  .../rpm/rpm/rpm-pkgconfigdeps.patch                |   34 ++
>  .../rpm/rpm/rpm-scriptletexechelper.patch          |   33 +-
>  meta/recipes-devtools/rpm/rpm/rpmdeps-oecore.patch |   26 +-
>  .../rpm/{rpm_5.4.0.bb => rpm_5.4.9.bb}             |  160 ++++----
>  .../libzypp/libzypp/libzypp-rpm549.patch           |   28 ++
>  meta/recipes-extended/libzypp/libzypp_git.bb       |    3 +-
>  meta/recipes-extended/sat-solver/sat-solver_git.bb |    2 +-
>  meta/recipes-extended/zypper/zypper_git.bb         |    2 +-
>  .../createrepo/createrepo/createrepo-rpm549.patch  |   19 +
>  .../createrepo/createrepo_0.4.11.bb                |    3 +-
>  .../db/{db_5.1.19.bb => db_5.3.15.bb}              |    8 +-
>  33 files changed, 822 insertions(+), 817 deletions(-)
>  create mode 100644 meta/recipes-devtools/ossp-uuid/ossp-uuid/0001-Change-library-name.patch
>  create mode 100644 meta/recipes-devtools/ossp-uuid/ossp-uuid/0002-uuid-preserve-m-option-status-in-v-option-handling.patch
>  create mode 100644 meta/recipes-devtools/ossp-uuid/ossp-uuid/0003-Fix-whatis-entries.patch
>  create mode 100644 meta/recipes-devtools/ossp-uuid/ossp-uuid/0004-fix-data-uuid-from-string.patch
>  create mode 100644 meta/recipes-devtools/ossp-uuid/ossp-uuid/uuid-libtool.patch
>  create mode 100644 meta/recipes-devtools/ossp-uuid/ossp-uuid/uuid-nostrip.patch
>  create mode 100644 meta/recipes-devtools/ossp-uuid/ossp-uuid_1.6.2.bb
>  delete mode 100644 meta/recipes-devtools/rpm/rpm/fix_for_automake_1.11.2.patch
>  delete mode 100644 meta/recipes-devtools/rpm/rpm/fprint-pointer-fix.patch
>  delete mode 100644 meta/recipes-devtools/rpm/rpm/remove-compiled-tests.patch
>  delete mode 100644 meta/recipes-devtools/rpm/rpm/rpm-autoconf.patch
>  create mode 100644 meta/recipes-devtools/rpm/rpm/rpm-lua.patch
>  create mode 100644 meta/recipes-devtools/rpm/rpm/rpm-macros.patch
>  create mode 100644 meta/recipes-devtools/rpm/rpm/rpm-no-perl-urpm.patch
>  delete mode 100644 meta/recipes-devtools/rpm/rpm/rpm-nofsync.patch
>  create mode 100644 meta/recipes-devtools/rpm/rpm/rpm-ossp-uuid.patch
>  create mode 100644 meta/recipes-devtools/rpm/rpm/rpm-packageorigin.patch
>  create mode 100644 meta/recipes-devtools/rpm/rpm/rpm-pkgconfigdeps.patch
>  rename meta/recipes-devtools/rpm/{rpm_5.4.0.bb => rpm_5.4.9.bb} (76%)
>  create mode 100644 meta/recipes-extended/libzypp/libzypp/libzypp-rpm549.patch
>  create mode 100644 meta/recipes-support/createrepo/createrepo/createrepo-rpm549.patch
>  rename meta/recipes-support/db/{db_5.1.19.bb => db_5.3.15.bb} (93%)
>
> --
> 1.7.3.4
>
>
> _______________________________________________
> Openembedded-core mailing list
> Openembedded-core@lists.openembedded.org
> http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-core
Richard Purdie - June 12, 2012, 10:11 a.m.
On Mon, 2012-06-11 at 13:18 -0500, Mark Hatle wrote:
> Fix a regression in rpm dependency generated caused by default settings
> changing.  This has been fixed (and verified on the yocto project build
> servers.)  This should be the final version....
> 
> This has been rebased, and patches 1 and 2 were changed to deal with the
> fix for the macros files.
> 
> v6 message follows:
> 
> Patch 6/8 was reworked to remove the manifest size check.
> Patch 8/8 is new and includes the manifest check removed from 6/8 as well as
> one that was missed in previous testing.
> 
> v5 message follows:
> 
> Only 7/7 is new in the version.  Due to the removal of the RPMVSF_NOSIGNATURES
> flag in RPM5 5.4.9, createrepo also needed to have this flag removed.
> 
> v4 message follows:
> 
> Only 6/6 is new in this version.  RPM 5.4.9 appears to be more demanding
> for both the DB_CONFIG file and empty manifest files.  The new patch resolves
> this issue by ensuring that the DB_CONFIG is always generated, and empty
> manifest files do not get installed.
> 
> Patches 1-5 are identical to the v3 versions.
> 
> v3 messages follows:
> 
> Rebase of the v2 changes.
> 
> Re-disabled the "test" chunk..  this should resolve the hang problem a
> few people have observed.
> 
> v2 message follows:
> 
> Berkley DB also gets upreved, and a new package ossp-uuid gets added to
> the system.
> 
> This was -heavily- tested with and without zypper on IA, and PPC.
> 
> In addition a minor performance enhancement with a query operation was added.
> 
> The uprev also adds the capability of using PACKAGECONFIG settings to tailor
> the behavior of RPM.
> 
> V2 changes:
> 
> Fix a problem with libuuid.so from util-linux would sometimes be linked into
> the binary.
> 
> Also force libzypp, sat-solver and zypper to refresh via a PR bump.
> 
> The following changes since commit ba22e4fcf07eb8007f6d500908d503f1d3dbdd16:
> 
>   nasm: updated to 2.10.01 (2012-06-11 13:55:46 +0100)
> 
> are available in the git repository at:
>   git://git.pokylinux.org/poky-contrib mhatle/rpm
>   http://git.pokylinux.org/cgit.cgi/poky-contrib/log/?h=mhatle/rpm
> 
> Mark Hatle (9):
>   rpm: Upgrade RPM to 5.4.8  (db to 5.3.15)
>   rpm: Upgrade RPM to 5.4.9
>   ossp-uuid: Add oss-uuid package and RPM 5.4.9 integration
>   package_rpm: Add capability to directly query packageorigin
>   rpm: Bump PR numbers on componets that require RPM
>   rootfs_rpm.bbclass: Update database configuration file
>   createrepo: For compatibility w/ RPM 5.4.9 remove RPMVSF_NOSIGNATURES
>     flag
>   package_rpm: Verify that the package manifests are not empty
>   rpm: Ensure pkgconfig deps don't stray from the package being built

Merged to master, thanks.

Richard