rpm: Uprev to rpm-5.4.16 (pre) and rpm-5.4+cvs to current CVS head

meta/lib/oe/package_manager.py was also updated.  This ensures that any
diagnostic messages are ignored from the output of rpmresolve.

The patches have been split into bug fixes (things that belong upstream)
and local changes that are OE specific.

The following patches are obsolete and have been removed:

rpm-remove-sykcparse-decl.patch
fstack-protector-configure-check.patch
rpm-disable-Wno-override-init.patch
rpm-lua-fix-print.patch
rpm-rpmpgp-fix.patch
verify-fix-broken-logic-for-ghost-avoidance-Mark-Hat.patch

(From OE-Core rev: ee97e53fcceabc6ef4ddc68f38c5fa0e05c5d9a8)

Signed-off-by: Mark Hatle <mark.hatle@windriver.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>

1 files changed, 663 insertions, 0 deletions

diff --git a/meta/recipes-devtools/rpm/rpm_5.4.16.bb b/meta/recipes-devtools/rpm/rpm_5.4.16.bb
new file mode 100644
index 0000000000..142706f30c
--- /dev/null
+++ b/meta/recipes-devtools/rpm/rpm_5.4.16.bb
@@ -0,0 +1,663 @@
+SUMMARY = "The RPM package management system"
+DESCRIPTION = "The RPM Package Manager (RPM) is a powerful command line driven \
+package management system capable of installing, uninstalling, \
+verifying, querying, and updating software packages. Each software \
+package consists of an archive of files along with information about \
+the package like its version, a description, etc."
+
+SUMMARY_${PN}-libs = "Libraries for manipulating RPM packages"
+DESCRIPTION_${PN}-libs = "This package contains the RPM shared libraries."
+
+SUMMARY_${PN}-dev = "Development files for manipulating RPM packages"
+DESCRIPTION_${PN}-dev = "This package contains the RPM C library and header files. These \
+development files will simplify the process of writing programs that \
+manipulate RPM packages and databases. These files are intended to \
+simplify the process of creating graphical package managers or any \
+other tools that need an intimate knowledge of RPM packages in order \
+to function."
+
+SUMMARY_${PN}-common = "Common RPM paths, scripts, documentation and configuration"
+DESCRIPTION_${PN}-common = "The rpm-common package contains paths, scripts, documentation \
+and configuration common between RPM Package Manager."
+
+SUMMARY_${PN}-build = "Scripts and executable programs used to build packages"
+DESCRIPTION_${PN}-build = "The rpm-build packagec ontains the scripts and executable programs \
+that are used to build packages using the RPM Package Manager."
+
+SUMMARY_python-rpm = "Python bindings for apps which will manupulate RPM packages"
+DESCRIPTION_python-rpm = "The rpm-python package contains a module that permits applications \
+written in the Python programming language to use the interface \
+supplied by the RPM Package Manager libraries."
+
+SUMMARY_perl-module-rpm = "Perl bindings for apps which will manipulate RPM packages"
+DESCRIPTION_perl-modules-rpm = "The perl-modules-rpm package contains a module that permits applications \
+written in the Perl programming language to use the interface \
+supplied by the RPM Package Manager libraries."
+
+HOMEPAGE = "http://rpm5.org/"
+LICENSE = "LGPLv2.1 & Apache-2.0"
+LIC_FILES_CHKSUM = "file://COPYING.LIB;md5=2d5025d4aa3495befef8f17206a5b0a1"
+LIC_FILES_CHKSUM += "file://rpmio/mongo.c;begin=5;end=18;md5=d8327ba2c71664c059143e6d333b8901"
+
+# We must have gettext-native, we need gettextize, which may not be provided
+DEPENDS = "libpcre attr acl ossp-uuid file byacc-native gettext-native"
+DEPENDS_append_class-native = " file-replacement-native"
+
+# rpm2cpio is a shell script, which is part of the rpm src.rpm.  It is needed
+# in order to extract the distribution SRPM into a format we can extract...
+
+# There is no official 5.4.16 release yet, so start w/ 5.4.15 and patch it
+# based on CVS
+S = "${WORKDIR}/rpm-5.4.15"
+
+SRC_URI = "http://www.rpm5.org/files/rpm/rpm-5.4/rpm-5.4.15-0.20140824.src.rpm;name=srpm;extract=rpm-5.4.15.tar.gz \
+           http://downloads.yoctoproject.org/releases/rpm5/rpm-5.4.15-to-5.4.16-20160225.patch.gz;name=rpm-patch \
+           http://downloads.yoctoproject.org/releases/rpm5/syck-5.4.15-to-5.4.16-20160225.patch.gz;name=syck-patch \
+           http://downloads.yoctoproject.org/releases/rpm5/beecrypt-5.4.15-to-5.4.16-20160225.patch.gz;name=beecrypt-patch \
+           http://downloads.yoctoproject.org/releases/rpm5/lua-5.4.15-to-5.4.16-20160225.patch.gz;name=lua-patch \
+           file://perfile_rpmdeps.sh \
+           file://pythondeps.sh \
+"
+
+SRC_URI[srpm.md5sum] = "d53782842ac11b3100a43fb2958c9bc0"
+SRC_URI[srpm.sha256sum] = "d4ae5e9ed5df8ab9931b660f491418d20ab5c4d72eb17ed9055b80b71ef6c4ee"
+
+SRC_URI[rpm-patch.md5sum] = "8b7deb1c9574d3d47ed8ba8c690fd8bf"
+SRC_URI[rpm-patch.sha256sum] = "1c1983d001b04eaa23eb2c8d9598b9d0899acb0a89f54a2d4c4e974086fd17a5"
+
+SRC_URI[syck-patch.md5sum] = "f31d7a32105a364688354419ec3559e4"
+SRC_URI[syck-patch.sha256sum] = "4dd1d04489206d8b5d1970f2a8d143a002f2895cefbe15d73459785096545e8a"
+
+SRC_URI[beecrypt-patch.md5sum] = "9e71ee3ccb0a52985a071dd250279132"
+SRC_URI[beecrypt-patch.sha256sum] ="df7c0708a7fab9bdf6d46194519b42e736f99cb0599dcc1c3c1bf1b228705cde"
+
+SRC_URI[lua-patch.md5sum] = "ca10d03d83b1fc1c31a0b50819534cd7"
+SRC_URI[lua-patch.sha256sum] = "6bde435cc827a7d4b2520e8f3e1c9bd2ca74375de0a4402aa99ef4d48eab9a7e"
+
+# Bug fixes
+SRC_URI += " \
+           file://header-include-fix.patch \
+           file://rpm-libsql-fix.patch \
+           file://rpm-platform.patch \
+           file://rpm-platform2.patch \
+           file://rpm-tools-mtree-LDFLAGS.patch \
+           file://rpm-canonarch.patch \
+           file://rpm-no-loopmsg.patch \
+           file://rpm-resolvedep.patch \
+           file://rpm-packageorigin.patch \
+           file://uclibc-support.patch \
+           file://rpmatch.patch \
+           file://makefile-am-exec-hook.patch \
+           file://python-rpm-rpmsense.patch \
+           file://debugedit-segv.patch \
+           file://debugedit-valid-file-to-fix-segment-fault.patch \
+           file://rpm-platform-file-fix.patch \
+           file://rpm-lsb-compatibility.patch \
+           file://rpm-tag-generate-endian-conversion-fix.patch \
+           file://rpm-hardlink-segfault-fix.patch \
+           file://rpm-payload-use-hashed-inode.patch \
+           file://rpm-fix-logio-cp.patch \
+           file://0001-using-poptParseArgvString-to-parse-the-_gpg_check_pa.patch \
+           file://rpm-opendb-before-verifyscript-to-avoid-null-point.patch \
+           file://0001-define-EM_AARCH64.patch \
+           file://rpm-rpmfc.c-fix-for-N32-MIPS64.patch \
+           file://rpm-lib-transaction.c-fix-file-conflicts-for-mips64-N32.patch \
+           file://rpm-mongodb-sasl.patch \
+           file://rpm-fix-parseEmbedded.patch \
+           file://rpm-rpmio-headers.patch \
+           file://rpm-python-restore-origin.patch \
+           file://rpm-keccak-sse-intrin.patch \
+           file://rpm-atomic-ops.patch \
+           file://rpm-gnu-atomic.patch \
+           file://rpm-tagname-type.patch \
+           file://rpm-python-tagname.patch \
+           file://rpm-python-AddErase.patch \
+           file://rpm-rpmpgp-popt.patch \
+"
+
+# OE specific changes
+SRC_URI += " \
+           file://rpm-log-auto-rm.patch \
+           file://rpm-db-reduce.patch \
+           file://rpm-autogen.patch \
+           file://rpm-showrc.patch \
+           file://rpm-fileclass.patch \
+           file://rpm-scriptletexechelper.patch \
+           file://rpmdeps-oecore.patch \
+           file://rpm-no-perl-urpm.patch \
+           file://rpm-macros.patch \
+           file://rpm-lua.patch \
+           file://rpm-ossp-uuid.patch \
+           file://rpm-uuid-include.patch \
+           file://rpm-pkgconfigdeps.patch \
+           file://no-ldflags-in-pkgconfig.patch \
+           file://dbconvert.patch \
+           file://rpm-db_buffer_small.patch \
+           file://rpm-py-init.patch \
+           file://rpm-reloc-macros.patch \
+           file://rpm-db5-or-db6.patch \
+           file://rpm-db60.patch \
+           file://rpmqv_cc_b_gone.patch \
+           file://rpm-realpath.patch \
+           file://rpm-check-rootpath-reasonableness.patch \
+           file://rpm-macros.in-disable-external-key-server.patch \
+           file://configure.ac-check-for-both-gpg2-and-gpg.patch \
+           file://rpm-disable-auto-stack-protector.patch \
+           file://popt-disable-auto-stack-protector.patch \
+           file://rpm-syck-fix-gram.patch \
+           file://rpm-rpmdb-grammar.patch \
+           file://rpm-disable-blaketest.patch \
+"
+
+SRC_URI_append_libc-musl = "\
+           file://0001-rpm-Fix-build-on-musl.patch \
+"
+# Uncomment the following line to enable platform score debugging
+# This is useful when identifying issues with Smart being unable
+# to process certain package feeds.
+#SRC_URI += "file://rpm-debug-platform.patch"
+
+UPSTREAM_CHECK_REGEX = "rpm-(?P<pver>(\d+[\.\-_]*)+)-.*$"
+
+inherit autotools gettext
+
+acpaths = "-I ${S}/db/dist/aclocal -I ${S}/db/dist/aclocal_java"
+
+# The local distribution macro directory
+distromacrodir = "${libdir}/rpm/poky"
+
+# Specify the default rpm macros in terms of adjustable variables
+rpm_macros = "%{_usrlibrpm}/macros:%{_usrlibrpm}/${DISTRO}/macros:%{_usrlibrpm}/${DISTRO}/%{_target}/macros:%{_etcrpm}/macros.*:%{_etcrpm}/macros:%{_etcrpm}/%{_target}/macros:~/.oerpmmacros"
+rpm_macros_class-native = "%{_usrlibrpm}/macros:%{_usrlibrpm}/${DISTRO}/macros:%{_usrlibrpm}/${DISTRO}/%{_target}/macros:~/.oerpmmacros"
+rpm_macros_class-nativesdk = "%{_usrlibrpm}/macros:%{_usrlibrpm}/${DISTRO}/macros:%{_usrlibrpm}/${DISTRO}/%{_target}/macros:~/.oerpmmacros"
+
+# sqlite lua tcl augeas nss gcrypt neon xz xar keyutils perl selinux
+
+# Note: perl and sqlite w/o db specified does not currently work.
+#       tcl, augeas, nss, gcrypt, xar and keyutils support is untested.
+PACKAGECONFIG ??= "db bzip2 zlib popt openssl libelf python"
+
+# Note: switching to internal popt may not work, as it will generate
+# a shared library which will intentionally not be packaged.
+#
+# If you intend to use the internal version, additional work may be required.
+PACKAGECONFIG[popt] = "--with-popt=external,--with-popt=internal,popt,"
+
+PACKAGECONFIG[bzip2] = "--with-bzip2,--without-bzip2,bzip2,"
+PACKAGECONFIG[xz] = "--with-xz,--without-xz,xz,"
+PACKAGECONFIG[zlib] = "--with-zlib,--without-zlib,zlib,"
+PACKAGECONFIG[xar] = "--with-xar,--without-xar,xar,"
+
+WITH_PYTHON = " --with-python=${PYTHON_BASEVERSION} \
+                --with-python-inc-dir=${STAGING_INCDIR}/python${PYTHON_BASEVERSION} \
+                --with-python-lib-dir=${libdir}/python${PYTHON_BASEVERSION}/site-packages \
+                --without-pythonembed"
+PACKAGECONFIG[python] = "${WITH_PYTHON},--without-python,python,"
+
+# Perl modules are not built, but they could be enabled fairly easily
+# the perl module creation and installation would need to be patched.
+# (currently has host perl contamination issues)
+WITH_PERL = "--with-perl --without-perlembed --without-perl-urpm"
+WITHOUT_PERL = "--without-perl --without-perl-urpm"
+PACKAGECONFIG[perl] = "${WITH_PERL},${WITHOUT_PERL},perl,"
+
+# The --with-dbsql will only tell RPM to check for support, db
+# may or may not be built w/ the dbsql support.
+WITH_DB = "--with-db --with-dbsql --without-db-tools-integrated"
+PACKAGECONFIG[db] = "${WITH_DB},--without-db,db,"
+
+PACKAGECONFIG[sqlite] = "--with-sqlite,--without-sqlite,sqlite3,"
+
+PACKAGECONFIG[beecrypt] = "--with-beecrypt=external,--with-beecrypt=internal,beecrypt,"
+PACKAGECONFIG[openssl] = "--with-openssl,--without-openssl,openssl,"
+PACKAGECONFIG[nss] = "--with-nss,--without-nss,nss,"
+PACKAGECONFIG[gcrypt] = "--with-gcrypt,--without-gcrypt,gcrypt,"
+PACKAGECONFIG[keyutils] = "--with-keyutils,--without-keyutils,keyutils,"
+PACKAGECONFIG[libelf] = "--with-libelf,--without-libelf,elfutils,"
+
+WITH_SELINUX = "--with-selinux --with-sepol --with-semanage"
+WITHOUT_SELINUX = "--without-selinux --without-sepol --without-semanage"
+PACKAGECONFIG[selinux] = "${WITH_SELINUX},${WITHOUT_SELINUX},libselinux,"
+
+WITH_NEON = "--with-neon --with-libproxy --with-expat --without-gssapi"
+WITHOUT_NEON = "--without-neon --without-libproxy --without-expat --without-gssapi"
+PACKAGECONFIG[neon] = "${WITH_NEON},${WITHOUT_NEON},neon expat,"
+
+PACKAGECONFIG[lua] = "--with-lua,--without-lua,expat,"
+PACKAGECONFIG[tcl] = "--with-tcl,--without-tcl,tcl,"
+
+PACKAGECONFIG[augeas] = "--with-augeas,--without-augeas,augeas,"
+
+EXTRA_OECONF += "--verbose \
+                --sysconfdir=${sysconfdir} \
+                --with-file \
+                --with-path-magic=%{_usrlibrpm}/../../share/misc/magic.mgc \
+                --with-syck=internal \
+                --without-readline \
+                --without-libtasn1 \
+                --without-pakchois \
+                --without-gnutls \
+                --with-pcre \
+                --enable-utf8 \
+                --with-uuid \
+                --with-attr \
+                --with-acl \
+                --with-pthreads \
+                --without-cudf \
+                --without-ficl \
+                --without-aterm \
+                --without-nix \
+                --without-bash \
+                --without-rc \
+                --without-js \
+                --without-gpsee \
+                --without-ruby \
+                --without-squirrel \
+                --without-sasl2 \
+                --with-build-extlibdep \
+                --with-build-maxextlibdep \
+                --without-valgrind \
+                --disable-openmp \
+                --enable-build-pic \
+                --enable-build-versionscript \
+                --enable-build-warnings \
+                --enable-build-debug \
+                --enable-maintainer-mode \
+                --with-path-macros=${rpm_macros} \
+                --with-path-lib=${libdir}/rpm \
+                --with-bugreport=http://bugzilla.yoctoproject.org \
+                --program-prefix= \
+                YACC=byacc"
+
+CFLAGS_append = " -DRPM_VENDOR_WINDRIVER -DRPM_VENDOR_POKY -DRPM_VENDOR_OE"
+
+LDFLAGS_append_libc-uclibc = "-lrt -lpthread"
+
+PACKAGES = "${PN}-dbg ${PN} ${PN}-doc ${PN}-libs ${PN}-dev ${PN}-staticdev ${PN}-common ${PN}-build python-rpm perl-module-rpm ${PN}-locale"
+
+SOLIBS = "5.4.so"
+
+# Based on %files section in the rpm.spec
+
+FILES_${PN} =  "${bindir}/rpm \
+                ${bindir}/rpmconstant \
+                ${libdir}/rpm/rpm.* \
+                ${libdir}/rpm/tgpg \
+                ${libdir}/rpm/macros \
+                ${libdir}/rpm/rpmpopt \
+                ${libdir}/rpm/rpm2cpio \
+                ${libdir}/rpm/vcheck \
+                ${libdir}/rpm/helpers \
+                ${libdir}/rpm/qf \
+                ${libdir}/rpm/cpuinfo.yaml \
+                ${libdir}/rpm/bin/mtree \
+                ${libdir}/rpm/bin/rpmkey \
+                ${libdir}/rpm/bin/rpmrepo \
+                ${libdir}/rpm/bin/rpmrepo.real \
+                ${libdir}/rpm/bin/rpmspecdump \
+                ${libdir}/rpm/bin/rpmspecdump.real \
+                ${libdir}/rpm/bin/wget \
+                ${localstatedir}/cache \
+                ${localstatedir}/cache/rpm \
+                ${localstatedir}/cache/wdj \
+                ${localstatedir}/lib \
+                ${localstatedir}/lib/rpm \
+                ${localstatedir}/lib/wdj \
+                ${bindir}/rpm.real \
+                ${bindir}/rpmconstant.real \
+                ${bindir}/rpm2cpio.real \
+                "
+
+FILES_${PN}-common = "${bindir}/rpm2cpio \
+                ${bindir}/gendiff \
+                ${sysconfdir}/rpm \
+                ${localstatedir}/spool/repackage \
+                "
+
+FILES_${PN}-libs = "${libdir}/librpm-*.so \
+                ${libdir}/librpmconstant-*.so \
+                ${libdir}/librpmdb-*.so \
+                ${libdir}/librpmio-*.so \
+                ${libdir}/librpmmisc-*.so \
+                ${libdir}/librpmbuild-*.so \
+                "
+
+FILES_${PN}-build = "${prefix}/src/rpm \
+                ${bindir}/rpmbuild \
+                ${bindir}/rpmbuild.real \
+                ${libdir}/rpm/brp-* \
+                ${libdir}/rpm/check-files \
+                ${libdir}/rpm/cross-build \
+                ${libdir}/rpm/find-debuginfo.sh \
+                ${libdir}/rpm/find-lang.sh \
+                ${libdir}/rpm/find-prov.pl \
+                ${libdir}/rpm/find-provides.perl \
+                ${libdir}/rpm/find-req.pl \
+                ${libdir}/rpm/find-requires.perl \
+                ${libdir}/rpm/getpo.sh \
+                ${libdir}/rpm/http.req \
+                ${libdir}/rpm/javadeps.sh \
+                ${libdir}/rpm/mono-find-provides \
+                ${libdir}/rpm/mono-find-requires \
+                ${libdir}/rpm/executabledeps.sh \
+                ${libdir}/rpm/libtooldeps.sh \
+                ${libdir}/rpm/osgideps.pl \
+                ${libdir}/rpm/perldeps.pl \
+                ${libdir}/rpm/perl.prov \
+                ${libdir}/rpm/perl.req \
+                ${libdir}/rpm/php.prov \
+                ${libdir}/rpm/php.req \
+                ${libdir}/rpm/pkgconfigdeps.sh \
+                ${libdir}/rpm/pythondeps.sh \
+                ${libdir}/rpm/bin/debugedit \
+                ${libdir}/rpm/bin/debugedit.real \
+                ${libdir}/rpm/bin/rpmcache \
+                ${libdir}/rpm/bin/rpmcache.real \
+                ${libdir}/rpm/bin/rpmcmp \
+                ${libdir}/rpm/bin/rpmcmp.real \
+                ${libdir}/rpm/bin/rpmdeps \
+                ${libdir}/rpm/bin/rpmdeps.real \
+                ${libdir}/rpm/bin/rpmdeps-oecore \
+                ${libdir}/rpm/bin/rpmdeps-oecore.real \
+                ${libdir}/rpm/bin/rpmdigest \
+                ${libdir}/rpm/bin/rpmdigest.real \
+                ${libdir}/rpm/bin/abi-compliance-checker.pl \
+                ${libdir}/rpm/bin/api-sanity-autotest.pl \
+                ${libdir}/rpm/bin/chroot \
+                ${libdir}/rpm/bin/cp \
+                ${libdir}/rpm/bin/dbsql \
+                ${libdir}/rpm/bin/find \
+                ${libdir}/rpm/bin/install-sh \
+                ${libdir}/rpm/bin/lua \
+                ${libdir}/rpm/bin/luac \
+                ${libdir}/rpm/bin/mkinstalldirs \
+                ${libdir}/rpm/bin/rpmlua \
+                ${libdir}/rpm/bin/rpmluac \
+                ${libdir}/rpm/bin/sqlite3 \
+                ${libdir}/rpm/macros.d/cmake \
+                ${libdir}/rpm/macros.d/java \
+                ${libdir}/rpm/macros.d/libtool \
+                ${libdir}/rpm/macros.d/mandriva \
+                ${libdir}/rpm/macros.d/mono \
+                ${libdir}/rpm/macros.d/perl \
+                ${libdir}/rpm/macros.d/php \
+                ${libdir}/rpm/macros.d/pkgconfig \
+                ${libdir}/rpm/macros.d/python \
+                ${libdir}/rpm/macros.d/ruby \
+                ${libdir}/rpm/macros.d/selinux \
+                ${libdir}/rpm/macros.d/tcl \
+                ${libdir}/rpm/macros.rpmbuild \
+                ${libdir}/rpm/u_pkg.sh \
+                ${libdir}/rpm/vpkg-provides.sh \
+                ${libdir}/rpm/vpkg-provides2.sh \
+                ${libdir}/rpm/perfile_rpmdeps.sh \
+                ${distromacrodir} \
+                "
+RDEPENDS_${PN} = "base-files run-postinsts"
+RDEPENDS_${PN}_class-native = ""
+RDEPENDS_${PN}_class-nativesdk = ""
+RDEPENDS_${PN}-build = "file bash perl"
+
+RDEPENDS_python-rpm = "${PN} python"
+
+FILES_python-rpm = "${libdir}/python*/site-packages/rpm"
+PROVIDES += "python-rpm"
+
+FILES_perl-module-rpm = "${libdir}/perl/*/* \
+                "
+
+RDEPENDS_${PN}-dev += "bash"
+
+FILES_${PN}-dev = "${includedir}/rpm \
+                ${libdir}/librpm.la \
+                ${libdir}/librpm.so \
+                ${libdir}/librpmconstant.la \
+                ${libdir}/librpmconstant.so \
+                ${libdir}/librpmdb.la \
+                ${libdir}/librpmdb.so \
+                ${libdir}/librpmio.la \
+                ${libdir}/librpmio.so \
+                ${libdir}/librpmmisc.la \
+                ${libdir}/librpmmisc.so \
+                ${libdir}/librpmbuild.la \
+                ${libdir}/librpmbuild.so \
+                ${libdir}/rpm/lib/liblua.la \
+                ${libdir}/pkgconfig/rpm.pc \
+                ${libdir}/rpm/rpmdb_loadcvt \
+                "
+
+FILES_${PN}-staticdev = " \
+                ${libdir}/librpm.a \
+                ${libdir}/librpmconstant.a \
+                ${libdir}/librpmdb.a \
+                ${libdir}/librpmio.a \
+                ${libdir}/librpmmisc.a \
+                ${libdir}/librpmbuild.a \
+                ${libdir}/rpm/lib/liblua.a \
+                ${libdir}/python*/site-packages/rpm/*.a \
+                "
+
+do_configure() {
+        # Disable tests!
+        echo "all:" > ${S}/tests/Makefile.am
+        sed -e 's/@__MKDIR_P@/%{__mkdir} -p/' -i ${S}/macros/macros.in
+
+        ( cd ${S}; ${S}/autogen.sh )
+
+        # NASTY hack to make sure configure files the right pkg-config file...
+        sed -e 's/pkg-config --exists uuid/pkg-config --exists ossp-uuid/g' \
+            -e 's/pkg-config uuid/pkg-config ossp-uuid/g' -i ${S}/configure
+
+        ( cd ${S}/syck ; set +e ; rm -- -l* ; make distclean ) || :
+
+        export varprefix=${localstatedir}
+        oe_runconf
+}
+
+do_install_append() {
+        # Preserve the previous default of DSA self-signed pkgs
+        sed -i -e 's,%_build_sign.*,%_build_sign DSA,' ${D}/${libdir}/rpm/macros.rpmbuild
+
+        sed -i -e 's,%__scriptlet_requires,#%%__scriptlet_requires,' ${D}/${libdir}/rpm/macros
+        sed -i -e 's,%__perl_provides,#%%__perl_provides,' ${D}/${libdir}/rpm/macros ${D}/${libdir}/rpm/macros.d/*
+        sed -i -e 's,%__perl_requires,#%%__perl_requires,' ${D}/${libdir}/rpm/macros ${D}/${libdir}/rpm/macros.d/*
+        sed -i -e 's,%_repackage_all_erasures[^_].*,%_repackage_all_erasures 0,' ${D}/${libdir}/rpm/macros
+        sed -i -e 's,^#%_openall_before_chroot.*,%_openall_before_chroot\t1,' ${D}/${libdir}/rpm/macros
+
+        # Enable MIPS64 N32 transactions.  (This is a no-op on non-MIPS targets.)
+        sed -i -e 's,%_transaction_color[^_].*,%_transaction_color 7,' ${D}/${libdir}/rpm/macros
+
+        # Enable Debian style arbitrary tags...
+        sed -i -e 's,%_arbitrary_tags[^_].*,%_arbitrary_tags %{_arbitrary_tags_debian},' ${D}/${libdir}/rpm/macros
+
+        install -m 0755 ${WORKDIR}/pythondeps.sh ${D}/${libdir}/rpm/pythondeps.sh
+        install -m 0755 ${WORKDIR}/perfile_rpmdeps.sh ${D}/${libdir}/rpm/perfile_rpmdeps.sh
+
+        # Remove unpackaged files (based on list in rpm.spec)
+        rm -f ${D}/${libdir}/rpm/{Specfile.pm,cpanflute,cpanflute2,rpmdiff,rpmdiff.cgi,sql.prov,sql.req,tcl.req,trpm}
+
+        rm -f ${D}/${mandir}/man8/rpmcache.8*
+        rm -f ${D}/${mandir}/man8/rpmgraph.8*
+        rm -f ${D}/${mandir}/*/man8/rpmcache.8*
+        rm -f ${D}/${mandir}/*/man8/rpmgraph.8*
+        rm -rf ${D}/${mandir}/{fr,ko}
+
+        rm -f ${D}/${includedir}/popt.h
+        rm -f ${D}/${libdir}/libpopt.*
+        rm -f ${D}/${libdir}/pkgconfig/popt.pc
+        rm -f ${D}/${datadir}/locale/*/LC_MESSAGES/popt.mo
+        rm -f ${D}/${mandir}/man3/popt.3
+
+        rm -f ${D}/${mandir}/man1/xar.1*
+        rm -f ${D}/${bindir}/xar
+        rm -rf ${D}/${includedir}/xar
+        rm -f ${D}/${libdir}/libxar*
+
+        rm -f ${D}/${bindir}/lz*
+        rm -f ${D}/${bindir}/unlzma
+        rm -f ${D}/${bindir}/unxz
+        rm -f ${D}/${bindir}/xz*
+        rm -rf ${D}/${includedir}/lzma*
+        rm -f ${D}/${mandir}/man1/lz*.1
+        rm -f ${D}/${libdir}/pkgconfig/liblzma*
+
+        rm -f ${D}/${libdir}/python%{with_python_version}/site-packages/*.{a,la}
+        rm -f ${D}/${libdir}/python%{with_python_version}/site-packages/rpm/*.{a,la}
+
+        #find ${D}/${libdir}/perl5 -type f -a \( -name perllocal.pod -o -name .packlist \
+        #       -o \( -name '*.bs' -a -empty \) \) -exec rm -f {} ';'
+        #find ${D}/${libdir}/perl5 -type d -depth -exec rmdir {} 2>/dev/null ';'
+
+        # We don't want the default macro set
+        rm -rf ${D}/${libdir}/rpm/{i[3456]86*,athlon*,pentium*,x86_64*,alpha*,sparc*,ia64*,ppc*,s390*,armv[34][lb]*,armv[345]*,mips*,noarch*}
+
+        rm -f ${D}/${libdir}/rpm/dbconvert.sh
+
+        rm -f ${D}/${libdir}/rpm/libsqldb.*
+
+        # We don't want, nor need the Mandriva multiarch items
+        rm -f ${D}/${bindir}/multiarch-dispatch
+        rm -f ${D}/${bindir}/multiarch-platform
+        rm -f ${D}/${libdir}/rpm/check-multiarch-files
+        rm -f ${D}/${libdir}/rpm/mkmultiarch
+        rm -f ${D}/${includedir}/multiarch-dispatch.h
+
+        rm -f ${D}/${libdir}/rpm/gstreamer.sh
+        rm -f ${D}/${libdir}/rpm/gem_helper.rb
+        rm -f ${D}/${libdir}/rpm/rubygems.rb
+        rm -f ${D}/${libdir}/rpm/kmod-deps.sh
+        rm -f ${D}/${libdir}/rpm/pythoneggs.py
+        rm -f ${D}/${libdir}/rpm/macros.d/kernel
+        rm -f ${D}/${libdir}/rpm/macros.d/gstreamer
+        rm -f ${D}/${libdir}/rpm/bin/mgo
+        rm -f ${D}/${libdir}/rpm/bin/dbconvert
+        rm -f ${D}/${libdir}/rpm/bin/pom2spec
+
+        rm -rf ${D}/var/lib/wdj ${D}/var/cache/wdj
+        rm -f ${D}/${libdir}/rpm/bin/api-sanity-checker.pl
+
+}
+
+do_install_append_class-target() {
+        # Create and install distribution specific macros
+        mkdir -p ${D}/${distromacrodir}
+        cat << EOF > ${D}/${distromacrodir}/macros
+%_defaultdocdir         ${docdir}
+
+%_prefix                ${prefix}
+%_exec_prefix           ${exec_prefix}
+%_datarootdir           ${datadir}
+%_bindir                ${bindir}
+%_sbindir               ${sbindir}
+%_libexecdir            %{_libdir}/%{name}
+%_datadir               ${datadir}
+%_sysconfdir            ${sysconfdir}
+%_sharedstatedir        ${sharedstatedir}
+%_localstatedir         ${localstatedir}
+%_lib                   lib
+%_libdir                %{_exec_prefix}/%{_lib}
+%_includedir            ${includedir}
+%_oldincludedir         ${oldincludedir}
+%_infodir               ${infodir}
+%_mandir                ${mandir}
+%_localedir             %{_libdir}/locale
+EOF
+
+        # Create and install multilib specific macros
+        ${@multilib_rpmmacros(d)}
+}
+
+do_install_append_class-native () {
+        sed -i -e 's|^#!.*/usr/bin/python|#! /usr/bin/env nativepython|' ${D}/${libdir}/python2.7/site-packages/rpm/transaction.py
+}
+
+do_install_append_class-nativesdk () {
+        sed -i -e 's|^#!.*/usr/bin/python|#! /usr/bin/env python|' ${D}/${libdir}/python2.7/site-packages/rpm/transaction.py
+}
+
+def multilib_rpmmacros(d):
+    localdata = d.createCopy()
+    # We need to clear the TOOLCHAIN_OPTIONS (--sysroot)
+    localdata.delVar('TOOLCHAIN_OPTIONS')
+
+    # Set 'localdata' values to be consistent with 'd' values.
+    localdata.setVar('distromacrodir', d.getVar('distromacrodir', True))
+    localdata.setVar('WORKDIR', d.getVar('WORKDIR', True))
+
+    ret = gen_arch_macro(localdata)
+
+    variants = d.getVar("MULTILIB_VARIANTS", True) or ""
+    for item in variants.split():
+        # Load overrides from 'd' to avoid having to reset the value...
+        localdata = d.createCopy()
+        overrides = d.getVar("OVERRIDES", False) + ":virtclass-multilib-" + item
+        localdata.setVar("OVERRIDES", overrides)
+        localdata.setVar("MLPREFIX", item + "-")
+        bb.data.update_data(localdata)
+        ret += gen_arch_macro(localdata)
+    return ret
+
+def gen_arch_macro(d):
+    # Generate shell script to produce the file as part of do_install
+    val  = "mkdir -p ${D}/${distromacrodir}/${TARGET_ARCH}-${TARGET_OS}\n"
+    val += "cat << EOF > ${D}/${distromacrodir}/${TARGET_ARCH}-${TARGET_OS}/macros\n"
+    val += "%_lib               ${baselib}\n"
+    val += "%_libdir            ${libdir}\n"
+    val += "%_localedir         ${localedir}\n"
+    val += "\n"
+    val += "# Toolchain configuration\n"
+    val += "%TOOLCHAIN_OPTIONS  %{nil}\n"
+    val += "%__ar               ${@d.getVar('AR', True).replace('$','%')}\n"
+    val += "%__as               ${@d.getVar('AS', True).replace('$','%')}\n"
+    val += "%__cc               ${@d.getVar('CC', True).replace('$','%')}\n"
+    val += "%__cpp              ${@d.getVar('CPP', True).replace('$','%')}\n"
+    val += "%__cxx              ${@d.getVar('CXX', True).replace('$','%')}\n"
+    val += "%__ld               ${@d.getVar('LD', True).replace('$','%')}\n"
+    val += "%__nm               ${@d.getVar('NM', True).replace('$','%')}\n"
+    val += "%__objcopy          ${@d.getVar('OBJCOPY', True).replace('$','%')}\n"
+    val += "%__objdump          ${@d.getVar('OBJDUMP', True).replace('$','%')}\n"
+    val += "%__ranlib           ${@d.getVar('RANLIB', True).replace('$','%')}\n"
+    val += "%__strip            ${@d.getVar('STRIP', True).replace('$','%')}\n"
+    val += "EOF\n"
+    val += "\n"
+    return d.expand(val)
+
+
+add_native_wrapper() {
+        create_wrapper ${D}/${bindir}/rpm \
+                RPM_USRLIBRPM='`dirname $''realpath`'/${@os.path.relpath(d.getVar('libdir', True), d.getVar('bindir', True))}/rpm \
+                RPM_ETCRPM='$'{RPM_ETCRPM-'`dirname $''realpath`'/${@os.path.relpath(d.getVar('sysconfdir', True), d.getVar('bindir', True))}/rpm} \
+                RPM_LOCALEDIRRPM='`dirname $''realpath`'/${@os.path.relpath(d.getVar('datadir', True), d.getVar('bindir', True))}/locale
+
+        create_wrapper ${D}/${bindir}/rpm2cpio \
+                RPM_USRLIBRPM='`dirname $''realpath`'/${@os.path.relpath(d.getVar('libdir', True), d.getVar('bindir', True))}/rpm \
+                RPM_ETCRPM='$'{RPM_ETCRPM-'`dirname $''realpath`'/${@os.path.relpath(d.getVar('sysconfdir', True), d.getVar('bindir', True))}/rpm} \
+                RPM_LOCALEDIRRPM='`dirname $''realpath`'/${@os.path.relpath(d.getVar('datadir', True), d.getVar('bindir', True))}/locale
+
+        create_wrapper ${D}/${bindir}/rpmbuild \
+                RPM_USRLIBRPM='`dirname $''realpath`'/${@os.path.relpath(d.getVar('libdir', True), d.getVar('bindir', True))}/rpm \
+                RPM_ETCRPM='$'{RPM_ETCRPM-'`dirname $''realpath`'/${@os.path.relpath(d.getVar('sysconfdir', True), d.getVar('bindir', True))}/rpm} \
+                RPM_LOCALEDIRRPM='`dirname $''realpath`'/${@os.path.relpath(d.getVar('datadir', True), d.getVar('bindir', True))}/locale
+
+        create_wrapper ${D}/${bindir}/rpmconstant \
+                RPM_USRLIBRPM='`dirname $''realpath`'/${@os.path.relpath(d.getVar('libdir', True), d.getVar('bindir', True))}/rpm \
+                RPM_ETCRPM='$'{RPM_ETCRPM-'`dirname $''realpath`'/${@os.path.relpath(d.getVar('sysconfdir', True), d.getVar('bindir', True))}/rpm} \
+                RPM_LOCALEDIRRPM='`dirname $''realpath`'/${@os.path.relpath(d.getVar('datadir', True), d.getVar('bindir', True))}/locale
+
+        for rpm_binary in ${D}/${libdir}/rpm/bin/rpm* ${D}/${libdir}/rpm/bin/debugedit; do
+                create_wrapper $rpm_binary \
+                        RPM_USRLIBRPM='`dirname $''realpath`'/${@os.path.relpath(d.getVar('libdir', True), d.getVar('bindir', True))}/rpm \
+                        RPM_ETCRPM='$'{RPM_ETCRPM-'`dirname $''realpath`'/${@os.path.relpath(d.getVar('sysconfdir', True), d.getVar('bindir', True))}/rpm} \
+                        RPM_LOCALEDIRRPM='`dirname $''realpath`'/${@os.path.relpath(d.getVar('datadir', True), d.getVar('bindir', True))}/locale
+        done
+}
+
+do_install_append_class-native() {
+        add_native_wrapper
+}
+
+do_install_append_class-nativesdk() {
+        add_native_wrapper
+}
+
+BBCLASSEXTEND = "native nativesdk"