Fix for RPM host contamination issue
cover Fix for RPM host contamination issue
Richard,
The first patch of this set fixes the host contamination issue that was found.
The second 2 fixes are doing some RDEPENDS clean up and QA warning on un-packaged files.
Sau!
The following changes since commit 684a4b517d13884c315688967fadd5e6a4845b71:
libffi: really populate -dev package (2011-09-26 20:50:27 +0100)
are available in the git repository at:
git://git.yoctoproject.org/poky-contrib sgw/oe-fix
http://git.yoctoproject.org/cgit.cgi/poky-contrib/log/?h=sgw/oe-fix
Saul Wold (3):
rpm: ensure that magic file is relocatable
zypper & sat-solver: needs RDEPENDS on rpm-lib
rpm: fix QA Warning on installed but not shipped staticdev filesw
meta/recipes-devtools/rpm/rpm_5.4.0.bb | 31 +++++++++++++------ meta/recipes-extended/libzypp/libzypp_git.bb | 8 ++-- meta/recipes-extended/sat-solver/sat-solver_git.bb | 4 ++- meta/recipes-extended/zypper/zypper_git.bb | 6 ++- 4 files changed, 32 insertions(+), 17 deletions(-)
Signature · 1 line
1.7.6
PATCH 1/3 rpm: ensure that magic file is relocatable
rpm-native was reading from /usr/share/misc/magic which is wrong it needs to be set to read from the sysroot. This also adds wrappers to the rpm-build tools to ensure they know were to find the macros that point to the right directories.
Fixes [YOCTO #1532]
Signed-off-by Saul Wold <[email protected]>
--- meta/recipes-devtools/rpm/rpm_5.4.0.bb | 14 +++++++++++--- 1 files changed, 11 insertions(+), 3 deletions(-)
meta/recipes-devtools/rpm/rpm_5.4.0.bb +11 -3
@@ -44,8 +44,8 @@ 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 = "" -PR = "r21" +extrarpmdeps_virtclass-native = "file-native" +PR = "r22" # 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...
@@ -119,7 +119,7 @@ EXTRA_OECONF = "--verbose \ ${WITH_DB} \ ${WITH_Z} \ --with-file \ - --with-path-magic=/usr/share/misc/magic \ + --with-path-magic=%{_usrlibrpm}/../../share/misc/magic \ --without-lua \ --without-tcl \ --with-syck=internal \
@@ -289,6 +289,7 @@ FILES_${PN}-build = "${prefix}/src/rpm \ ${libdir}/rpm/vpkg-provides2.sh \ ${libdir}/rpm/perfile_rpmdeps.sh \ " +RDEPENDS_${PN}-build = "file" #%rpmattr %{_rpmhome}/gem_helper.rb #%rpmattr %{_rpmhome}/symclash.*
@@ -420,6 +421,13 @@ do_install_append_virtclass-native() { RPM_ETCRPM=${STAGING_ETCDIR_NATIVE}/rpm \ RPM_LOCALEDIRRPM=${STAGING_DATADIR_NATIVE}/locale + for rpm_binary in ${D}/${libdir}/rpm/bin/rpm*; do + create_wrapper $rpm_binary + RPM_USRLIBRPM=${STAGING_LIBDIR_NATIVE}/rpm \ + RPM_ETCRPM=${STAGING_ETCDIR_NATIVE}/rpm \ + RPM_LOCALEDIRRPM=${STAGING_DATADIR_NATIVE}/locale + done + # Adjust popt macros to match... cat ${D}/${libdir}/rpm/rpmpopt | sed -e "s,^\(rpm[^ ]*\)\([ ]\),\1.real\2," > ${D}/${libdir}/rpm/rpmpopt.new mv ${D}/${libdir}/rpm/rpmpopt.new ${D}/${libdir}/rpm/rpmpopt
Signature · 1 line
1.7.6
PATCH 2/3 zypper & sat-solver: needs RDEPENDS on rpm-lib
In reply to Saul WoldSigned-off-by Saul Wold <[email protected]>
--- meta/recipes-extended/libzypp/libzypp_git.bb | 8 ++++---- meta/recipes-extended/sat-solver/sat-solver_git.bb | 4 +++- meta/recipes-extended/zypper/zypper_git.bb | 6 ++++-- 3 files changed, 11 insertions(+), 7 deletions(-)
meta/recipes-extended/libzypp/libzypp_git.bb +4 -4
@@ -8,13 +8,10 @@ inherit cmake gettext DEPENDS = "rpm boost curl libxml2 zlib sat-solver expat openssl udev" -# rpmdb2solv from sat-solver is run from libzypp -RDEPENDS_${PN} = "sat-solver" - S = "${WORKDIR}/git" SRCREV = "15b6c52260bbc52b3d8e585e271b67e10cc7c433" PV = "0.0-git${SRCPV}" -PR = "r14" +PR = "r15" SRC_URI = "git://github.com/openSUSE/libzypp.git;protocol=git \ file://no-doc.patch \
@@ -32,6 +29,9 @@ SRC_URI_append_mips = " file://mips-workaround-gcc-tribool-error.patch" # ARM specific global constructor workaround SRC_URI_append_arm = " file://arm-workaround-global-constructor.patch" +# rpmdb2solv from sat-solver is run from libzypp +RDEPENDS_${PN} = "sat-solver rpm-libs" + PACKAGES =+ "${PN}-pkgmgt" FILES_${PN} += "${libdir}/zypp ${datadir}/zypp ${datadir}/icons"
meta/recipes-extended/sat-solver/sat-solver_git.bb +3 -1
@@ -8,7 +8,7 @@ DEPENDS = "libcheck rpm zlib expat db" SRCREV = "0a7378d5f482f477a01cf1690d76871ab8bdcc32" PV = "0.0-git${SRCPV}" -PR = "r11" +PR = "r12" PARALLEL_MAKE=""
@@ -29,6 +29,8 @@ EXTRA_OECMAKE += " -DLIB=${@os.path.basename('${libdir}')}" inherit cmake pkgconfig +RDEPENDS_${PN} = "rpm-libs" + PACKAGE_ARCH = "${MACHINE_ARCH}" do_archgen () {
meta/recipes-extended/zypper/zypper_git.bb +4 -2
@@ -5,8 +5,7 @@ LICENSE = "GPLv2+" LIC_FILES_CHKSUM = "file://COPYING;md5=3201406e350b39e05a82e28b5020f413" DEPENDS = "libzypp augeas" -RRECOMMENDS_${PN} = "procps util-linux-uuidgen" -PR = "r5" +PR = "r6" SRCREV = "2c5bb6ceb99ecd950ef993e43d77bf0569ea0582" inherit cmake
@@ -20,4 +19,7 @@ S = "${WORKDIR}/git" PV = "1.5.3-git${SRCPV}" +RDEPENDS_${PN} = "rpm-libs" +RRECOMMENDS_${PN} = "procps util-linux-uuidgen" + PACKAGE_ARCH = "${MACHINE_ARCH}"
Signature · 1 line
1.7.6
PATCH 3/3 rpm: fix QA Warning on installed but not shipped staticdev filesw
In reply to Saul WoldSigned-off-by Saul Wold <[email protected]>
--- meta/recipes-devtools/rpm/rpm_5.4.0.bb | 17 ++++++++++------- 1 files changed, 10 insertions(+), 7 deletions(-)
meta/recipes-devtools/rpm/rpm_5.4.0.bb +10 -7
@@ -168,7 +168,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"
@@ -304,27 +304,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
Signature · 1 line
1.7.6