diff options
Diffstat (limited to 'meta/recipes-devtools/rpm/rpm_5.4.0.bb')
| -rw-r--r-- | meta/recipes-devtools/rpm/rpm_5.4.0.bb | 24 |
1 files changed, 15 insertions, 9 deletions
diff --git a/meta/recipes-devtools/rpm/rpm_5.4.0.bb b/meta/recipes-devtools/rpm/rpm_5.4.0.bb index 356512aa5d..7795914a70 100644 --- a/meta/recipes-devtools/rpm/rpm_5.4.0.bb +++ b/meta/recipes-devtools/rpm/rpm_5.4.0.bb @@ -45,11 +45,12 @@ LIC_FILES_CHKSUM = "file://COPYING.LIB;md5=2d5025d4aa3495befef8f17206a5b0a1" DEPENDS = "bzip2 zlib db openssl elfutils expat libpcre attr acl popt ${extrarpmdeps}" extrarpmdeps = "python perl" extrarpmdeps_virtclass-native = "file-native" -PR = "r22" +PR = "r25" # 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... SRC_URI = "http://www.rpm5.org/files/rpm/rpm-5.4/rpm-5.4.0-0.20101229.src.rpm;extract=rpm-5.4.0.tar.gz \ + file://rpm-log-auto-rm.patch \ file://perfile_rpmdeps.sh \ file://rpm-autogen.patch \ file://rpm-libsql-fix.patch \ @@ -63,6 +64,7 @@ SRC_URI = "http://www.rpm5.org/files/rpm/rpm-5.4/rpm-5.4.0-0.20101229.src.rpm;ex file://rpm-fileclass.patch \ file://rpm-canonarch.patch \ file://rpm-no-loopmsg.patch \ + file://rpm-scriptletexechelper.patch \ file://pythondeps.sh \ " @@ -155,6 +157,7 @@ EXTRA_OECONF = "--verbose \ --with-build-extlibdep \ --with-build-maxextlibdep \ --without-valgrind \ + --without-xz \ --disable-openmp \ --enable-build-pic \ --enable-build-versionscript \ @@ -168,7 +171,7 @@ EXTRA_OECONF = "--verbose \ CFLAGS_append = " -DRPM_VENDOR_WINDRIVER -DRPM_VENDOR_POKY" -PACKAGES = "${PN}-dbg ${PN} ${PN}-doc ${PN}-libs ${PN}-dev ${PN}-common ${PN}-build python-rpm-dbg python-rpm perl-module-rpm perl-module-rpm-dev ${PN}-locale" +PACKAGES = "${PN}-dbg ${PN} ${PN}-doc ${PN}-libs ${PN}-dev ${PN}-staticdev ${PN}-common ${PN}-build python-rpm-dbg python-rpm perl-module-rpm perl-module-rpm-dev ${PN}-locale" SOLIBS = "5.4.so" @@ -191,6 +194,7 @@ FILES_${PN} = "${bindir}/rpm \ ${libdir}/rpm/bin/rpmrepo \ ${libdir}/rpm/bin/rpmspecdump \ ${libdir}/rpm/bin/wget \ + /var/lib/rpm \ " # ${libdir}/rpm/magic @@ -207,7 +211,6 @@ FILES_${PN}-dbg += "${libdir}/rpm/.debug \ FILES_${PN}-common = "${bindir}/rpm2cpio \ ${bindir}/gendiff \ /etc/rpm \ - /var/lib/rpm \ /var/spool/repackage \ " @@ -304,27 +307,30 @@ FILES_perl-module-rpm-dev = "${prefix}/share/man/man3/RPM* \ " FILE_${PN}-dev = "${includedir}/rpm \ - ${libdir}/librpm.a \ ${libdir}/librpm.la \ ${libdir}/librpm.so \ - ${libdir}/librpmconstant.a \ ${libdir}/librpmconstant.la \ ${libdir}/librpmconstant.so \ - ${libdir}/librpmdb.a \ ${libdir}/librpmdb.la \ ${libdir}/librpmdb.so \ - ${libdir}/librpmio.a \ ${libdir}/librpmio.la \ ${libdir}/librpmio.so \ - ${libdir}/librpmmisc.a \ ${libdir}/librpmmisc.la \ ${libdir}/librpmmisc.so \ - ${libdir}/librpmbuild.a \ ${libdir}/librpmbuild.la \ ${libdir}/librpmbuild.so \ ${libdir}/pkgconfig/rpm.pc \ " +FILE_${PN}-staticdev = " \ + ${libdir}/librpm.a \ + ${libdir}/librpmconstant.a \ + ${libdir}/librpmdb.a \ + ${libdir}/librpmio.a \ + ${libdir}/librpmmisc.a \ + ${libdir}/librpmbuild.a \ + " + ###%{_rpmhome}/lib/libxar.a ###%{_rpmhome}/lib/libxar.la ###%{_rpmhome}/lib/libxar.so |