summaryrefslogtreecommitdiffstats
path: root/meta/recipes-devtools/rpm/rpm_5.4.14.bb
Commit message (Collapse)AuthorAgeFilesLines
* rpm: Generate per distribution and multilib macro filesMark Hatle2015-12-281-0/+81
| | | | | | | | | | | | | The distribution and multilib macro files are required for rpmbuild, on the target, to work properly. These override the default settings from the upstream macro files with the proper values for the OE configuration. (From OE-Core rev: 65e160ae521386d80cd21df72d23814afb9e445c) Signed-off-by: Mark Hatle <mark.hatle@windriver.com> Signed-off-by: Robert Yang <liezhi.yang@windriver.com> Signed-off-by: Ross Burton <ross.burton@intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
* meta: Drop now pointless manual -dbg packagingRichard Purdie2015-12-161-5/+0
| | | | | | | | | With the autodebug package generation logic, specifically setting FILES_${PN}-dbg isn't needed in most cases, we can remove them. (From OE-Core rev: 3ab59d49dd7c18e194b58d1248b4b87709b5a738) Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
* rpm: fix file conflicts for MIPS64 N32Robert Yang2015-12-121-0/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | The following error can occur: smart install libc6-2.22-r0.1@lib32_mips32r2octeon3 libc6-dbg-2.22-r0.1@lib32_mips32r2octeon3 error: file /sbin/ldconfig conflicts between attempted installs of libc6-2.22-r0.1.lib32_mips32r2octeon3 and libc6-2.22-r0.1.octeon3_n32 error: file /sbin/.debug/ldconfig conflicts between attempted installs of libc6-dbg-2.22-r0.1.lib32_mips32r2octeon3 and libc6-dbg-2.22-r0.1.octeon3_n32 This was because: transactions_color = 001 (ELF32) & 010 (ELF64) & 100 (ELF32 N32 MIPS64) FColor = Current file color (001) & transaction_color (111) oFcolor = Previous file color (100) & transaction_color (111) There are two places where the conflict comparisons occur. In both places the 'else' clause was too restrictive (opposite of the 'positive' clause). This caused the system to only permit a binary comparison - "new preferred" or "old preferred". It did not permissing "neither preferred". By removing the else comparison the system will now perform a 'last-in-wins' resolution when "neither is preferred". Note, if _transaction_color is 3, MIPS64 N32 will be skipped (pretend as installed). (From OE-Core rev: 36c225704daa58b98a4b7f2ef315eb944d8628b5) Signed-off-by: Robert Yang <liezhi.yang@windriver.com> Signed-off-by: Mark Hatle <mark.hatle@windriver.com> Signed-off-by: Ross Burton <ross.burton@intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
* rpm: Enable MIPS64 N32 transactionsMark Hatle2015-12-121-0/+3
| | | | | | | | | | | | | | | In a multilib install RPM will break a conflict using the transaction color. However, by default MIPS64 N32 transactions are not enabled. This change always enables them. This is effectively a no-op on non-MIPS systems, and required if we need to support N32 on MIPS. (From OE-Core rev: dd86624034574484574d75adfcf68c2df4a7a6b7) Signed-off-by: Mark Hatle <mark.hatle@windriver.com> Signed-off-by: Robert Yang <liezhi.yang@windriver.com> Signed-off-by: Ross Burton <ross.burton@intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
* package_regex.inc: split the rest of the entries to their recipesAlexander Kanavin2015-12-081-0/+2
| | | | | | | | (From OE-Core rev: 73e2555cc7d529a93362b3fcfea3fbc7a4c60ca1) Signed-off-by: Alexander Kanavin <alexander.kanavin@linux.intel.com> Signed-off-by: Ross Burton <ross.burton@intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
* rpm: fix for N32 MIPS64Robert Yang2015-12-011-0/+1
| | | | | | | | | | | | | | | It is 'N32 MIPS64', not 'N32 MIPS32' as command file shows: $ file image/usr/bin/getent getent: ELF 32-bit MSB executable, MIPS, N32 MIPS64 [snip] And "rpm -qp --filecolor" was wrong (it was 1, but should be 4), which caused multilib installation error. (From OE-Core rev: a598f6ee369c2a55b080ac7cfc058c1d30c7be2e) Signed-off-by: Robert Yang <liezhi.yang@windriver.com> Signed-off-by: Ross Burton <ross.burton@intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
* rpm: define EM_AARCH64 for debugeditRoy Li2015-11-161-0/+1
| | | | | | | | | | | | | | | | | EM_AARCH64 maybe not be defined due to old version elf.h when compile rpm-native, and lead to that debugedit can not work on aarch64 elf object files, since there is no other dependence, except these two macro, define them to make debugedit work on aarch64 elf files. debugedit: /bitbake_build/tmp/work/aarch64-wrs-linux/libvirt/1.2.19-r0/ package/usr/lib64/libvirt/ptest/daemon/libvirtd_admin_la-admin_server.o: Unhandled relocation 258 in .debug_info section (From OE-Core rev: 91a159e64d404653b2d9178caf027f797a4d3f3b) Signed-off-by: Roy Li <rongqing.li@windriver.com> Signed-off-by: Ross Burton <ross.burton@intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
* rpm: add explicit dependency on file-replacement-native for native buildsRoss Burton2015-10-271-0/+1
| | | | Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
* rpm: search for gpg if gpg2 is not foundMarkus Lehtonen2015-09-281-0/+1
| | | | | | | | | | | | | | | | | | | | | | | | Some (host) systems only have a binary named 'gpg' (e.g. Fedora) while some only have 'gpg2' (Ubuntu) and others have both of them (openSUSE). Currently the behavior of rpm-native with regards to GnuPG depends on the host platform: rpm(-native) is configured to use GnuPG binary of the host system if 'gpg2' is found in $PATH. Otherwise, rpm(-native) will default to using '%{_bindir}/gpg2' which will be pointing to a sysroot binary which usually does not exist. This patch changes rpm to look for both 'gpg' and 'gpg2' when searching for the GnuPG binary in PATH. This makes possible to create signed RPM packages on different host platforms, using the GnuPG binary of the host, without the need to explicitly define the gpg binary in bitbake configuration (via GPG_BIN variable). [YOCTO #8134] (From OE-Core rev: eb76b668e815fbecd18271808b871fc3b0f15e65) Signed-off-by: Markus Lehtonen <markus.lehtonen@linux.intel.com> Signed-off-by: Ross Burton <ross.burton@intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
* upstream_tracking.inc: deprecate and move contents to recipesAlexander Kanavin2015-09-011-0/+2
| | | | | | | | | | No-update reasons and manual version checks should be in the recipes themselves because otherwise they're prone to getting out of date. (From OE-Core rev: b384345d9a693cbc3fd0dbeed9edd8c24618259d) Signed-off-by: Alexander Kanavin <alexander.kanavin@linux.intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
* rpm: opendb before rpmverifyscript to avoid null point inputZhixiong Chi2015-08-191-0/+1
| | | | | | | | | | | | | | | | | | | | If the command is "rpm -V" and the return value of (headerIsEntry(h, RPMTAG_VERIFYSCRIPT) || headerIsEntry(h, RPMTAG_SANITYCHECK)) located in /lib/verify.c is true, it will call rpmpsmStage function(rpmVerifyScript->rpmpsmScriptStage->rpmpsmStage) and occur segment fault because of null point(rpmtsGetRdb(ts) == NULL and rpmtsGetRdb(ts)->db_txn). So we open rpmdb to avoid bad input when find headerIsEntry true. workflow: main()->rpmcliVerify()->rpmcliArgIter()->rpmQueryVerify()->rpmgiShowMatches()->showVerifyPackage()-> rpmqv.c verify.c query.c query.c verify.c(headerIsEntry) rpmVerifyScript()->rpmpsmScriptStage()->rpmpsmStage()-> rpmtxnCommit(rpmtsGetRdb(ts)->db_txn); verify.c psm.c psm.c psm.c (From OE-Core rev: 91945b7fcb0c83ca72543e5327e965eca9c269c4) Signed-off-by: Zhixiong Chi <zhixiong.chi@windriver.com> Signed-off-by: Ross Burton <ross.burton@intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
* rpm: remove invalid sed commandRobert Yang2015-07-121-1/+0
| | | | | | | | | | There is no __check_files in rpm/macros any more, so remove the sed command. (From OE-Core rev: 53c8c290e5d25976909a821eead31633b25b9952) Signed-off-by: Robert Yang <liezhi.yang@windriver.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
* rpm: disable external key serveryzhu12015-07-091-0/+1
| | | | | | | | | | | | | | | | When RPM experiences a signed package, with a signature that it does NOT know. By default it will send the -fingerprint- (and only the 16 digit fingerprint) to an external HKP server, trying to get the key down. This is probably not a reasonable default behavior for the system to do, instead it should simply fail the key lookup. If someone wants to enable the HKP server it's easy enough to do by enabling the necessary macros. (From OE-Core rev: fdaa9115fb20d4af49ce8407b5785096c66ecf6c) Signed-off-by: yzhu1 <yanjun.zhu@windriver.com> Signed-off-by: Roy Li <rongqing.li@windriver.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
* rpm: check if the argument(rootpath) exists or be writableZhixiong Chi2015-07-081-0/+1
| | | | | | | | | | | | | | | When user execute the command "rpm -qai --root=$dir",if $dir doesn't exist or is unwritable as result of making a typo in rootpath,then it will create dirent $dir and subdirectory. So we should add the check function to fix it before creating relational subdirectory,and warn the incorrect rootpath to user. It just checks the rootpath reasonableness when the user input the argument(--root=/-r=). (From OE-Core rev: dded280d26b2a5ca2a1e4ac787d36cdd13b603d3) Signed-off-by: Zhixiong Chi <zchi@windriver.com> Signed-off-by: Ross Burton <ross.burton@intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
* rpm: Rebrand rpm custom macro paths to be distro specificMark Hatle2015-06-231-3/+3
| | | | | | | | | | | RPM was previously hard coded to use the 'poky' directory. We really want the directory name to be distribution specific. (From OE-Core rev: 2c2fd0391df377cb9151598569e7e7c4a622bc0e) Signed-off-by: Mark Hatle <mark.hatle@windriver.com> Signed-off-by: Ross Burton <ross.burton@intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
* rpm: Fix lua 'print' statement captureMark Hatle2015-06-231-0/+1
| | | | | | | | | | | | | | | | The print statement should capture the output and send it to the script processing engine, and not display it directly to the screen. Note, this is only a bug if 'lua' support has been enabled in the RPM recipe's PACKAGECONFIG. This patch is from: http://rpm5.org/cvs/patchset?cn=17671 (From OE-Core rev: 6bc0e8207d0e7b1d6f2eac8ed1b75a3fd9fab87b) Signed-off-by: Mark Hatle <mark.hatle@windriver.com> Signed-off-by: Ross Burton <ross.burton@intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
* rpm: remove extra dev and dbg packagesRobert Yang2015-06-081-11/+3
| | | | | | | | | | | | There should be only one dev and dbg package. [YOCTO #7481] (From OE-Core rev: b412306418c3915bb11e3d5201cafb68e2f2b453) Signed-off-by: Robert Yang <liezhi.yang@windriver.com> Signed-off-by: Ross Burton <ross.burton@intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
* rpm: don't put LDFLAGS into the .pc fileRoss Burton2015-03-101-0/+1
| | | | | | | | | | The LDFLAGS are not generally useful with pkg-config and mean that the .pc file contains references to the sysroot directory, so remove it. (From OE-Core rev: f50c4c4e26edeaf01393fe7a06c42f86fd4680a5) Signed-off-by: Ross Burton <ross.burton@intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
* rpm: fix the rpm addsign functionRoy.Li2014-11-201-0/+1
| | | | | | | | (From OE-Core rev: d382c1541bec301468119268f4940ae15c326b1c) Signed-off-by: Roy.Li <rongqing.li@windriver.com> Signed-off-by: Ross Burton <ross.burton@intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
* rpm: realpath is required before expanding _dbpath in chrootMing Liu2014-10-241-0/+1
| | | | | | | | | | | | | | | A regression is introduced by commit 66573093: [ rpm: Fix rpm relocation macro usage ] _usr turned out to be a relative path to support dyanmic config after that, but it's being used somewhere as a indicator to locate substrings, so we must get the real path of it in advance. (From OE-Core rev: 1247955a907f51aac7efd305d26856e263c11a65) Signed-off-by: Ming Liu <ming.liu@windriver.com> Signed-off-by: Ross Burton <ross.burton@intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
* rpm5: add python-rpm PROVIDESSaul Wold2014-09-301-0/+1
| | | | | | | | | Since python-smartpm depends on python-rpm, we should provide here as appropriate. (From OE-Core rev: a3598f87bd22354cce2f2be06f09c2b24f2adb63) Signed-off-by: Saul Wold <sgw@linux.intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
* rpm: add perl to RDEPENDS_rpm-buildRobert Yang2014-08-231-3/+1
| | | | | | | | | | | | | | | | | Perl scripts: rpm-build/usr/lib64/rpm/http.req rpm-build/usr/lib64/rpm/php.prov rpm-build/usr/lib64/rpm/osgideps.pl rpm-build/usr/lib64/rpm/perl.prov rpm-build/usr/lib64/rpm/bin/api-sanity-autotest.pl rpm-build/usr/lib64/rpm/php.req rpm-build/usr/lib64/rpm/perldeps.pl rpm-build/usr/lib64/rpm/perl.req (From OE-Core rev: c951d443daca22a3dd90897bf5b26cc113b9343d) Signed-off-by: Robert Yang <liezhi.yang@windriver.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
* rpm: compile rpmqv.c instead of rpmqv.ccJoe Slater2014-07-191-0/+1
| | | | | | | | | | | | | Some versions of gcc will put a reference to __gxx_personality_v0 into rpm.o and rpmbuild.o. This means we must link using g++, and Makefile does not. Go back to using rpmqv.c (which is currently identical to rpmqv.cc). (From OE-Core rev: a36327ee2d159b3791cc6ce0c36af4b9e0693e51) Signed-off-by: Joe Slater <jslater@windriver.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
* rpm: disable -Wno-override-initRobert Yang2014-07-101-0/+1
| | | | | | | | | | | | | | | Fixed rpm-native.do_configure error on CentOS 5.x: cc1: error: unrecognized command line option "-Wno-override-init" The -Wno-override-init was commented in rpm-5.4.9, but commented out in rpm-5.4.14 thus it is failed to build on CentOS 5.x, comment it again to fix the problem. (From OE-Core rev: ad4a54a0f5bb667f5d5e3df2bcf841b05e0d0f2c) Signed-off-by: Robert Yang <liezhi.yang@windriver.com> Signed-off-by: Saul Wold <sgw@linux.intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
* rpm: Replace patch with backport from SCM version of RPM5Mark Hatle2014-07-081-1/+1
| | | | | | | (From OE-Core rev: 17419e4577eb4b5786d4c0120f070e1660fa28ec) Signed-off-by: Mark Hatle <mark.hatle@windriver.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
* rpm: Upgrade to 5.4.14Mark Hatle2014-07-081-0/+515
Update various patches. A few corrections to the patch descriptions, otherwise simple quilt refresh or conflict resolution. Remove rpm-solvedb.patch and rpm-respect-arch.patch. These are both related to the old solvedb package dependency solver. This is no longer used since we moved to smartpm. rpm-stub-out-git_strerror was a backport and is no longer needed. RPM 5.4.12 and newer normally requires Berkley DB 6.0 or newer. A small patch to configure allows RPM to dynamically select DB 5.3 or DB 6.0 based on what is available at configure time. (From OE-Core rev: 0c7b4a5e23836889196f85f472f081d51529e94e) Signed-off-by: Mark Hatle <mark.hatle@windriver.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>