summaryrefslogtreecommitdiffstats
path: root/meta/recipes-devtools/rpm
Commit message (Collapse)AuthorAgeFilesLines
* rpm: prevent race in tempdir creationMarkus Lehtonen2016-11-083-24/+44
| | | | | | | | | | | | | | | | | | This patch fixes an extramely rare race condition in creation of rpmdb temporary directory. The "rpmdb-more-verbose-error-logging" patch is still left in place, just for the case. [YOCTO #9416] (From OE-Core rev: 84de3283fa2a2908d367eb58953903ae685b0298) (From OE-Core rev: 1ae228ee5181f12955356c1fe10d341373dd5fcc) 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> Signed-off-by: Armin Kuster <akuster808@gmail.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
* rpm: manually cleanup sysckJérémy Rosen2016-09-231-1/+1
| | | | | | | | | | | | | | | | | | | | | version 5.4.1 of rpm was not properly distclean before release, which causes problems when cross-compiling. The previous version this recipe called make distclean, but that would trigger a call to ./configure which would fail when no gcc is available and make the whole do_configure fail further down the line This patch manually removes the files from the recipe. (From OE-Core rev: 6c9f61233f64356291a0c42761a833f3b151114c) (From OE-Core rev: 66dd4d3abb708376fbfbf37cab1ef1f2dee2049b) Signed-off-by: Jérémy Rosen <jeremy.rosen@smile.fr> Signed-off-by: Ross Burton <ross.burton@intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org> Signed-off-by: Armin Kuster <akuster808@gmail.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
* rpm: ensure rpm2cpio call rpm relocation codeZhixiong Chi2016-09-232-0/+26
| | | | | | | | | | | | | | | | | | | | | | | We need to call rpmcliInit to ensure the rpm relocation code is called. when we allow rpm2cpio to be relocatable, The adjusted path used to find the macro files was being built into the binary and this path was valid for the machine it was built on and some of our other build machines, but invalid on some others, and was not being properly overridden at runtime. when we export the wrsdk and source the sdk, then execute rpm2cpio xxx.rpm|cpio -t. we will get the following error : "rpm-5.4.14/rpmdb/dbconfig.c:493: db3New: Assertion `dbOpts != ((void *)0) && *dbOpts != '\0'' failed. (From OE-Core rev: aea2bf5c8101ac0bb27776a5614be345835c4a03) (From OE-Core rev: b55e1de5b7371e06ec999fdf588052b4babbc3d2) Signed-off-by: Zhixiong Chi <Zhixiong.Chi@windriver.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org> Signed-off-by: Armin Kuster <akuster808@gmail.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
* rpm: make --nosignature workRobert Yang2016-09-232-0/+65
| | | | | | | | | | | | | | | | | | | | | | | | | | | OE-core uses rpm's --nosignature, but it never worked: self._invoke_smart('config --set rpm-check-signatures=false') Now fix it with: * Define SUPPORT_NOSIGNATURES to 1 in system.h * !QVA_ISSET(qva->qva_flags, SIGNATURE) -> QVA_ISSET(qva->qva_flags, SIGNATURE), otherwise, when use --nosignature would read database and verify signature, this is not expected. This can fix some race issues, for example, when more than one process are querying rpm file with "rpm -qp --nosignature", they may hang up because of race issues (the processes are trying to get RW/RD lock on the database, but they shouldn't read the database at all since -qp and --nosignature are used). (From OE-Core rev: 038c09d6ab9581030efdc16aa1b96972970eeaab) (From OE-Core rev: 6a09190c7b7b316c9988b7e5e279bd124f331b17) 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> Signed-off-by: Armin Kuster <akuster808@gmail.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
* rpm: Fix build with gcc6Khem Raj2016-07-272-1/+56
| | | | | | | | | | | (From OE-Core rev: e9c86d85460f45011bd978e1495a2b802d733020) (From OE-Core rev: d60a2ce4b5169d8e903981f492304dadd2a205fb) Signed-off-by: Khem Raj <raj.khem@gmail.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org> Signed-off-by: Armin Kuster <akuster808@gmail.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
* rpm: explicitly disable tomcryptAndreas Oberritter2016-04-291-0/+1
| | | | | | | | | | | | | | | | | Configure autodetects libtomcrypt, but then it adds libtommath to $LIBS and fails to link subsequent tests if it's unavailable. | checking for pcre.h... yes | checking for pcre_compile in -lpcre... no | checking whether to build with PCRE library... no | ++ executing failure action | configure: error: unable to find usable PCRE library (From OE-Core rev: 54665fb9e27ba1b0e4eddaf170303d4f2db66fae) Signed-off-by: Andreas Oberritter <obi@opendreambox.org> Signed-off-by: Ross Burton <ross.burton@intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
* rpm: Disable __sync_add_and_fetch_8 on nios2Marek Vasut2016-04-183-0/+32
| | | | | | | | | | | | | | | | The NIOS2 softcore does not implement the __sync_add_and_fetch_8, so disable it accordingly. (From OE-Core rev: 9ef23b0273a87bd19dcc9c21cc1c53b1f8480668) Signed-off-by: Marek Vasut <marex@denx.de> Cc: Ley Foon Tan <lftan@altera.com> Cc: Richard Purdie <richard.purdie@linuxfoundation.org> Cc: Ross Burton <ross.burton@intel.com> Cc: Thomas Chou <thomas@wytron.com.tw> Cc: Walter Goossens <waltergoossens@home.nl> Signed-off-by: Ross Burton <ross.burton@intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
* rpm: more verbose errors in rpmTempFileMarkus Lehtonen2016-04-142-0/+54
| | | | | | | | | | | | | | This patch adds better error logging inside the rpm tempfile function in order to be able to better analyze a rare and very hard-to-reproduce failure in oe-selftest for rpm signing. [YOCTO #9416] (From OE-Core rev: aba432ea3ada509b24075c159081e8f0f942c308) 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>
* rpm: brace expansion is a bashismRoss Burton2016-04-092-10/+8
| | | | | | | | | | | | The constuct rm *.{a,la} is a bashism and as tasks are run under /bin/sh this may not work as expected. Expand the {a,la} to two separate calls, and remove the architecture-specific macro deletion as they are not installed in the first place anymore. (From OE-Core rev: 0edd06d15d2501ed0961681b56ecbb4ca5e75647) Signed-off-by: Ross Burton <ross.burton@intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
* rpm: remove two unused patchRobert Yang2016-04-062-154/+0
| | | | | | | | | | | They are already in the source: rpm-CVE-2013-6435.patch rpm-CVE-2014-8118.patch (From OE-Core rev: 8bed58160316c84bb4c4e866058f695c4402b95e) Signed-off-by: Robert Yang <liezhi.yang@windriver.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
* rpm: check _gpg_passphrase before ask for inputRobert Yang2016-03-252-0/+71
| | | | | | | | | | | | rpm always asked for pass phrasae when add signature, which made it can't work non-interactively, this patch fix the problem. It will work non-interactively if _gpg_passphrase is defined, and work as before if not. (From OE-Core rev: 3cd4f96e94d8756d332b13215ce3ac2e1eaddee7) Signed-off-by: Robert Yang <liezhi.yang@windriver.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
* rpm: remove RPM 4Joshua Lock2016-03-2010-875/+0
| | | | | | | | | | | RPM4 support is buggy and incomplete. As we don't have the resources or interest to maintain it this patch removes it. (From OE-Core rev: a6e7a86f1635be9a688c56c25e9d215ea4d2cc84) Signed-off-by: Joshua Lock <joshua.g.lock@intel.com> Signed-off-by: Ross Burton <ross.burton@intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
* rpm: fix error when 'lua' is enabledChen Qi2016-03-202-0/+45
| | | | | | | | | | | | | | | Fix the following compilation error when 'lua' is enabled in PACKAGECONFIG. | gcc: error: lib21.c: No such file or directory | gcc: fatal error: no input files Modify FILES for dev package to avoid installed-not-shipped error. (From OE-Core rev: 6b43539e6624113acbcd06b11cfe8cfe6586244f) Signed-off-by: Chen Qi <Qi.Chen@windriver.com> Signed-off-by: Ross Burton <ross.burton@intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
* rpm: Sync CVS to regular versionMark Hatle2016-03-101-0/+8
| | | | | | | | | A previous fix for a python dep issue was not merged to the CVS version. (From OE-Core rev: 1a9efb0be07c62b7780da68dc19c834ade1cb533) Signed-off-by: Mark Hatle <mark.hatle@windriver.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
* rpm: Fix musl integration with RPM5Mark Hatle2016-03-104-55/+267
| | | | | | | (From OE-Core rev: e4d6f4f48f83a5881351007aae66427e0b11fc8a) Signed-off-by: Mark Hatle <mark.hatle@windriver.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
* rpmresolve: It is not necessary to manually specify -lpoptMark Hatle2016-03-091-1/+1
| | | | | | | | | | Popt may be internal or external to rpm. Either way the rpm libraries will link properly with or without -lpopt. (From OE-Core rev: b79a628d59382fdba812c67133c93e9f4ea365c2) Signed-off-by: Mark Hatle <mark.hatle@windriver.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
* rpm: A number of the patches have been submitted upstreamMark Hatle2016-03-0935-36/+36
| | | | | | | | | Note the upstream submission in the patches. (From OE-Core rev: 9672f7620a365d29afca81d357d1d4d5fcedb3ed) Signed-off-by: Mark Hatle <mark.hatle@windriver.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
* rpm: Enable specific crypto and digest settings via variablesMark Hatle2016-03-092-10/+152
| | | | | | | | | | | | | | | | | | Allow the user to set the specific digest and non-repudiable signature algorithms. This should be done on a distribution wide basis. See recipe for exact instructions, but values are now set using: RPM_FILE_DIGEST_ALGO (default 1 - md5) RPM_SELF_SIGN_ALGO (default DSA) Also, change the PACKAGECONFIG to define the default crypto engine for RPM5. Not just the available crypto engines. If a crypto engine is not selected, the system will default to the internal beecrypt version. (From OE-Core rev: 2f6529d9dc8aa82eb5bdcccec9c69d93dad63505) Signed-off-by: Mark Hatle <mark.hatle@windriver.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
* rpm: Uprev to rpm-5.4.16 (pre) and rpm-5.4+cvs to current CVS headMark Hatle2016-03-0937-528/+2215
| | | | | | | | | | | | | | | | | | | | | | 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>
* rpm: fix building rpm 5 with internal beecryptJoshua Lock2016-02-222-2/+2
| | | | | | | | | | | | | RPM 5 cannot be built without beecrypt, therefore the EXTRA_OECONF arguments to pass when the beecrypt PACKAGECONFIG is disabled should enable the internal/bundled beecrypt. [YOCTO #9150] (From OE-Core rev: ed1c47e7c621491b892fb82bd18644dba42212b9) Signed-off-by: Joshua Lock <joshua.g.lock@intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
* rpm: Fix build with muslKhem Raj2016-02-152-1/+166
| | | | | | | (From OE-Core rev: d0fc6e8593b951163d48665f41d6ef1eb74b8926) Signed-off-by: Khem Raj <raj.khem@gmail.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
* Revert "xz: Allow to work with ASSUME_PROVIDED xz-native"Richard Purdie2016-01-251-3/+0
| | | | | | | | | | | This reverts commit 5c69c561a76cb10d7896ae0a0399190f11b2e0ca. The change was incomplete, not handling cases such as the fetcher using xz, or linux-yocto, dpkg or apt or the lzma image type. (From OE-Core rev: fc4209baa098caebf9c4cb75f9a6f2e85f43333c) Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
* xz: Allow to work with ASSUME_PROVIDED xz-nativeRichard Purdie2016-01-241-0/+3
| | | | | | | | | | At some point we may want to add xz-native to ASSUME_PROVIDED. This allows that to work whilst still allowing access to liblzma for those things which need it (e.g. pixz). (From OE-Core rev: 5c69c561a76cb10d7896ae0a0399190f11b2e0ca) Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
* rpm: remove bashisms: [ x == x ] -> [ x = x ]Olof Johansson2016-01-191-3/+2
| | | | | | | | | | | | | | | The postinst and postrm of rpm contained a bashism, that could in some situations potentially cause ldconfig not be triggered when it should be. If you use dash on host, test would fail because of syntax errors. But on host, it should fail because of the comparison. On target, you often use busybox ash, and it supports == as an alias for =. So in practice, only if you use a shell like dash on target, you'll run into issues with this. (From OE-Core rev: 4fd33ca846ba9f61e72a176a6462443c9fb5ddc2) Signed-off-by: Olof Johansson <olofjn@axis.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
* Add "CVE:" tag to current patches in OE-coreMariano Lopez2016-01-112-0/+2
| | | | | | | | | | | | | | The currnet patches in OE-core doesn't have the "CVE:" tag, now part of the policy of the patches. This is patch add this tag to several patches. There might be patches that I miss; the tag can be added in the future. (From OE-Core rev: 065ebeb3e15311d0d45385e15bf557b1c95b1669) Signed-off-by: Mariano Lopez <mariano.lopez@linux.intel.com> Signed-off-by: Ross Burton <ross.burton@intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
* rpmresolve.c: Fix unfreed pointers that keep DB openedMariano Lopez2016-01-111-4/+6
| | | | | | | | | | | | | | | | | There are some unfreed rpmmi pointers in printDepList() function; this happens when the package have null as the requirement. This patch fixes these unfreed pointers and add small changes to keep consistency with some variables. [YOCTO #8028] (From OE-Core rev: da7aa183f94adc1d0fff5bb81e827c584f9938ec) Signed-off-by: Mariano Lopez <mariano.lopez@linux.intel.com> Signed-off-by: Ross Burton <ross.burton@intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
* 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>
* rpm: Fix support for db5 and db6Yuanjie Huang2015-12-221-40/+55
| | | | | | | | | | | | | | The previous attempt to let rpm configuration support both db5 and db6 has a flaw that when the building host provides db6 without its header the db_create test will false pass. This new patch addresses this issue by test against the DB_VERSION_MAJOR macro value, which is defined in both db5 and db6's header. (From OE-Core rev: 59934080f8311a810e7b5ce82a264d4b9de650ec) Signed-off-by: Yuanjie Huang <Yuanjie.Huang@windriver.com> Signed-off-by: Ross Burton <ross.burton@intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
* meta: more removals of redunant FILES_${PN}-dbgRoss Burton2015-12-161-1/+1
| | | | | | | | | | In some recipes overly-split -dbg packages were merged into PN-dbg. Unless there's a very good reason, recipes should have a single -dev and -dbg package. (From OE-Core rev: a3b000643898d7402b9e57c02e8d10e677cc9722) 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-163-15/+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-122-0/+53
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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-013-0/+36
| | | | | | | | | | | | | | | 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-162-0/+36
| | | | | | | | | | | | | | | | | 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-273-0/+3
| | | | Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
* rpm: remove spurious build dependenciesRoss Burton2015-10-211-1/+1
| | | | | | | | | | | make, patch and binutils are assumed to exist on the host, so there's no need to have them in DEPENDS and can result in the building of make-native for no good reason. (From OE-Core rev: 4f48eeb9396ef904202ab1abeb38ec971feaeb4b) Signed-off-by: Ross Burton <ross.burton@intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
* rpm: fix return without value in patchRoss Burton2015-10-071-1/+1
| | | | | | | | | | | The error patch in rpm-check-rootpath-reasonableness.patch did a bare return from a function that should be returning an int. As this is the error path, return -1 instead. (From OE-Core rev: 26e90d64b51e1e53e9314f9c56939f5f6d525449) Signed-off-by: Ross Burton <ross.burton@intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
* rpm: search for gpg if gpg2 is not foundMarkus Lehtonen2015-09-282-0/+30
| | | | | | | | | | | | | | | | | | | | | | | | 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>
* meta: Fix Upstream-Status statementsRoss Burton2015-09-125-5/+5
| | | | | | | | | | Fix a variety of problems such as typos, bad punctuations, or incorrect Upstream-Status values. (From OE-Core rev: bd220fe6ce8c3a0805f13a14706d3130ea872604) 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-192-0/+25
| | | | | | | | | | | | | | | | | | | | 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>
* rpm4: Drop native RDEPENDSRichard Purdie2015-07-231-1/+1
| | | | | | | | | | | | | | | Native recipes should *never* depend on target recipes since this would cause them to rebuild every time the target changes. Before the recent datastore changes, this happened to work. Now, this makes rpm-native unbuildable since base-files-native doesn't exist and the code remaps the variable. Dropping these dependencies here is the correct way to resolve this issue and fix an autobuilder selftest failure. (From OE-Core rev: ef84c4bf1d93e9fa674300b80d0442ae1069c473) Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
* rpm: remove invalid sed commandRobert Yang2015-07-122-2/+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-092-0/+28
| | | | | | | | | | | | | | | | 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-082-0/+97
| | | | | | | | | | | | | | | 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: fix typo in rpm-reloc-macros.patchAndre McCurdy2015-07-071-1/+1
| | | | | | | (From OE-Core rev: c8a1c3082f1c7cee535af490af58b4bce644f413) Signed-off-by: Andre McCurdy <armccurdy@gmail.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
* rpm: fix typo in rpm-realpath.patchAndre McCurdy2015-07-071-1/+1
| | | | | | | (From OE-Core rev: 83e891d2f3e9ff858b0523c350ebe77265d51522) Signed-off-by: Andre McCurdy <armccurdy@gmail.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-232-0/+105
| | | | | | | | | | | | | | | | 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>