There is an issue that is caused when doing the install step of rpm on systems
with high parallelization where two jobs of make will fight for the same file
while installing the sub-directory lua. This is caused by the same makefile rule
being called twice in a way that both could be trying to install at the same
time.
This fix renames the linking rule so it will always be run after the needed
files are added and removed it's dependency so the required rule would only
run once.
This was tested heavily using ppss to run mutliple installs in parallel. This
wouldn't happen in practise but it was tested will all the individual rules as
well.
(From OE-Core rev: d05c5da6b972db97d3eb66b659f5641368c9ebe4)
Signed-off-by: Morgan Little <morgan.little@windriver.com>
Signed-off-by: Mark Hatle <mark.hatle@windriver.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
When attempting to build with uuid and all tests compiling will error because
uuid.h doesn't exist in the rpm tarball. Fix this by changing the include to
use the one in ossp which solves the issue.
The recipe already depends on ossp so ossp/uuid.h will be there when rpm-native
is built.
(From OE-Core rev: 52ae2c2439bcb78323f61a3666e9b630b3a40b15)
Signed-off-by: Morgan Little <morgan.little@windriver.com>
Signed-off-by: Mark Hatle <mark.hatle@windriver.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
This solves a problem when installing rpm using the ipk pkg-management
system where /var/cache was conflicting with the existing /var/cache from
base-files.
(From OE-Core rev: 917f57cbb0906996661eebc6656c2c083ef979e9)
Signed-off-by: Saul Wold <sgw@linux.intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
The rpm should depend on bison-native, otherwise errors when "bitbake
rpm-native" in a fresh build:
| make[4]: Entering directory `/path/to/rpm-native-5.4.9-r46/rpm-5.4.9/syck/lib'
| bison -d -t -v -p syck -o gram.c gram.y
| make[4]: bison: Command not found
Basically, both the rpm-native and rpm should depend on bison-native,
but don't need depend on bison, but it seems that it isn't necessary
to add another depend line:
DEPENDS_virtclass-native = "libpcre-native ... bison-native"
So just add it to the DEPENDS.
[YOCTO #3123]
(From OE-Core rev: 839faed2e7ef554668f647732c7ee1c8d339c123)
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>
Rename rpmresolve's -d option to -t and make -d enable debug output;
add a -o option to specify the output file (so rpm debug output doesn't
go to the output file) and also add a little more detail to some of the
error messages.
(From OE-Core rev: 163dd734d79fd7040b48b10bca6fde28460ac20c)
Signed-off-by: Paul Eggleton <paul.eggleton@linux.intel.com>
Signed-off-by: Saul Wold <sgw@linux.intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
We need to call rpmcliInit to ensure the rpm relocation code is called
and it correctly honours the relocation environmental variables.
We can drop the ReadConfigFiles call since the cliInit does this for us.
(From OE-Core rev: eb17fdc1461953382360635480f12357eac4dc43)
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Fixes sstate relocation due to the path to /etc/rpm being baked into the
libraries - this manifested in the form of the following assertion at
runtime:
rpmresolve: dbconfig.c:493: db3New: Assertion `dbOpts != ((void *)0) && *dbOpts != '\0'' failed.
Fixes [YOCTO #2936].
(From OE-Core rev: 44c2fb7ea0228dd749129d334c76a1bd2983e585)
Signed-off-by: Paul Eggleton <paul.eggleton@linux.intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Reduce the number of calls to the packaging tool, especially in the case
of rpm, using helper utilities to gather the required information more
efficiently where possible.
(From OE-Core rev: d0b8a98c5b46c305afd389fc862b3bf0c6f1eaab)
Signed-off-by: Paul Eggleton <paul.eggleton@linux.intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Improve the performance of the RPM backend during do_rootfs by
performing most of the package name to file resolution in a separate
utility written in C, processing the entire list of packages at once
rather than running rpm on the command line which loads the RPM database
for every package.
(From OE-Core rev: 9135d351ba7cb21e50239d2b310565680bd4fdca)
Signed-off-by: Paul Eggleton <paul.eggleton@linux.intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
| dbconvert.o: In function `rpmdb_convert':
| /local/jenkins/jobs/yocto-upstream/workspace/label/master/machine/p4080ds/poky/master/tmp/work/x86_64-linux/rpm-native-5.4.9-r45/rpm-5.4.9/tools/dbconvert.c:126: warning: the use of `tempnam' is dangerous, better use `mkstemp'
| dbconvert.o: In function `main':
| dbconvert.c:(.text+0x923): undefined reference to `htobe32'
| dbconvert.c:(.text+0xaa4): undefined reference to `htole32'
| dbconvert.c:(.text+0xac9): undefined reference to `htole32'
(From OE-Core rev: add2c772cd404e8bea4828959fcb5ee33c35c048)
Signed-off-by: Matthew McClintock <msm@freescale.com>
Signed-off-by: Saul Wold <sgw@linux.intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
neon requires expat to be built first
lua similarly requires expat if enabled
selinux package name should be "libselinux" (from meta-selinux).
(From OE-Core rev: 6b3c9802b659ca1d3b7638ff80e6492cc0e16d6f)
Signed-off-by: Mark Hatle <mark.hatle@windriver.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
These need to appear in DT_NEEDED for librpmio.so
for uclibc somehow it does not get added to link
cmdline so we do it explicitly.
(From OE-Core rev: e5d141fff4a96fbdac63586638fb286f263af216)
Signed-off-by: Khem Raj <raj.khem@gmail.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
-fstack-protector needs libssp to link with
so when checking for this option support we
need to find if libssp is staged in root file
system
(From OE-Core rev: 492297fce0b80547d3dac9f611f463c6cc95160b)
Signed-off-by: Khem Raj <raj.khem@gmail.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
rpmatch is not there in uclibc therefore add logic to configure
to detect it.
x* wrappers need to be defined for uclibc as well.
(From OE-Core rev: 0cd3a4f3cfd0eb70915e3b59be8d04ee2d92749e)
Signed-off-by: Khem Raj <raj.khem@gmail.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Force pkg-config to only look in the install directory, and not be
able to fall back to system pkg-config directories for resolution.
(From OE-Core rev: 7afcfeb1db00c800485b2f3a89dad1ed84083979)
Signed-off-by: Mark Hatle <mark.hatle@windriver.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Add functionality to RPM to directly query the packageorigin (path) from
the resolver database, instead of having to do this via an indirect method.
This results in a minor performance improvement.
(From OE-Core rev: a8ff3141fd78442bf328c9d3a489db88ad27486b)
Signed-off-by: Mark Hatle <mark.hatle@windriver.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
RPM 5.4.9 now strongly encourages you to have the ossp-uuid library available.
Add this recipe, and change RPM to use the uuid functionality.
(From OE-Core rev: 8a2b55c5b7c544ec15113bc21e5c62276449c9c3)
Signed-off-by: Mark Hatle <mark.hatle@windriver.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Beside upreving RPM, add necessary integration patches to libzypp.
Also change the configuration of RPM to support PACKAGECONFIG flags.
RPM is highly configurable, the default configuration is good for
minimal OE-Core use.
(From OE-Core rev: bf94103d4c532ffdfdcdcc6d27c9f65f7824f8f8)
Signed-off-by: Mark Hatle <mark.hatle@windriver.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
RPM 5.4.8 requires db 5.3.x, so both are upgraded together.
(From OE-Core rev: c5898ef3fc3820ff9c44bc5b1b16e5def64aa877)
Signed-off-by: Mark Hatle <mark.hatle@windriver.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
There is a bug if we:
1) bitbake diffutils with MACHINE=crownbay
2) bitbake diffutils with MACHINE=qemux86
3) bitbake core-image-sato with MACHINE=crownbay
Then the diffutils.i586 would be installed to the crownbay's image, this
is because diffutils.i586 is newer than diffutils.core2, and rpm doesn't
respect to the arch priorities:
We have put the archs in order in _solve_dbpath:
crownbay/solvedb:core2/solvedb:i586/solvedb:all/solvedb
Fix rpm to respect to the order, for example, if it finds a pkg in both
core2/ and i586/, and the core2/ comes first, it should not use the one
in i586/ even if it's build time is newer.
Note: Don't worry about the _free(*ptr), it can check whether ptr is
NULL or not.
This is for the denzil branch, and the master branch also needs it.
[YOCTO #2360]
(From OE-Core rev: d76067ae100623dd6dd4858568b98522d1daf474)
Signed-off-by: Robert Yang <liezhi.yang@windriver.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
This module is needed by python scripts from createrepo native package.
[YOCTO #2134]
RP: Add missing DEPENDS on python-native
(From OE-Core rev: 17f3cc1be0e8648cb4579793a9eb5a701deac85f)
Signed-off-by: Andrei Gherzan <andrei@gherzan.ro>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
In lib/rpmts.c we need to make sure to look for missing dependencies,
such as /bin/sh, in both the providename and filepaths DB. Previously
the system would key off an initial '/' and only look in the filepaths DB.
This causes problems when a package such as "bash", has a Provides: /bin/sh.
(From OE-Core rev: 08fb526c42e85c89135960344745e878c5fb633a)
Signed-off-by: Mark Hatle <mark.hatle@windriver.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
rpm links to libmagic from file so it needs to be listed in DEPENDS else we
can have race conditions causing build failures such as those seen on the
autobuilder recently.
(From OE-Core rev: 432e36300d7231c9b01cd2c6c4b39b84cf4fddca)
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
This is a performance enhancement by adding a binary allowing batch processing
of individual file dependencies. The second patch in this series uses the binary
this patch creates.
(From OE-Core rev: 50dc8bfbac42b9a9b52a2f7d0568740c41790c13)
Signed-off-by: Robert Yang <liezhi.yang@windriver.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
* Create libbz2 (and -dev, -staticdev), which can be
installed without the bzip2 executables.
(From OE-Core rev: e27af1f273e9a7348dd8f5542df9206acd9210f3)
Signed-off-by: Andreas Oberritter <obi@opendreambox.org>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
This addresses the warning:
WARNING: rpm: No generic license file exists for: LGPL in any provider
WARNING: rpm: No generic license file exists for: 2.1 in any provider
(From OE-Core rev: 2345f788c9206b87804292c0afdd73f565784d45)
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
automake version 1.11.2 has made use of dir variables more strict.
the use of pkglibdir with SCRIPTS & DATA vars results in automake
errors.
This commits uses pkgdatadir & pkgbindir vars instead of pkglibdir
to avoid the strict check errors.
This change also works with automake-1.11.1
(From OE-Core rev: ca76443522a6bb38d239b9aa0c7932cd44446ff8)
Signed-off-by: Nitin A Kamble <nitin.a.kamble@intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Tune the __db* size in DB_CONFIG.
This will reduce the __db* size from 62MB to 26MB in qemu.
[YOCTO #1769]
(From OE-Core rev: 32d308bb38612cef2a98a4c40f058b4db50787aa)
Signed-off-by: Mei Lei <lei.mei@intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
RPM's configuration assumes if the prefix isn't /usr or /usr/local
that you really want the DB in $prefix/var -- we want it in
$localstatedir.
(From OE-Core rev: 528a2ec8ab53d652d74c51334a40905f009dfd91)
Signed-off-by: Mark Hatle <mark.hatle@windriver.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Fixes [YOCTO #1174]
Rpm logs will grow indefinitely, so change the config to flush those old logs.
(From OE-Core rev: e2c4dff079722f256ddcab9630b5b3f8f6421cc9)
Signed-off-by: Mei Lei <lei.mei@intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
[YOCTO #1755]
We change the want the RPM rootfs install works to install pre and post install
scripts. The new method uses a script helper that is invoked by RPM outside
of the normal chroot.
The wrapper is dynamically generated prior to the install starting. It will
check the return code of the script. If the script fails, it will store a copy
to be executed on the first system boot. This is similar to the previous
mechanism.
In addition, a line of debug was added to the scripts as written by package_rpm
to list which package and which script for later debugging, if necessary.
(From OE-Core rev: 3e7120d6a9fd5e46214673d0a6e1085a7314ff42)
Signed-off-by: Mark Hatle <mark.hatle@windriver.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
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]
(From OE-Core rev: e94d1e7ac1b7952690c37554e618f84b84e561a0)
Signed-off-by: Saul Wold <sgw@linux.intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Previously python dependencies were of the format "python(abi) = ..."
This format is not yet supportable within OE, so revert to a form
we know we can handle.
Introduce a change to package.bbclass that ensures it will causes the
sstate-cache's "package" to invalidate. Since pythondeps changed, the
output of rpmdeps changes, which causes the per-file dependency
information to change.... thus we need to invalidate the cache!
(From OE-Core rev: 30064a98dc9049db4a37f119d15fbb59aa3c8377)
Signed-off-by: Mark Hatle <mark.hatle@windriver.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
In certain combinations of build/host/target, they can end up
inadvertently prefixed, breaking the assumptions in the recipe.
(From OE-Core rev: a00600b853570b6090e68d20f22bb5ef5435e0ea)
Signed-off-by: Chris Larson <chris_larson@mentor.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
[YOCTO #1352]
Fix the canonical arch --target processor to work with the way OE
handles the GNU canonical arch.
Also cleanup a number of files that are no longer used, and refactor
the no-loop patch into the "no-loopmsg" patch.
(From OE-Core rev: 25904ad2bdeadda9189805bb7a210eafe5795024)
Signed-off-by: Mark Hatle <mark.hatle@windriver.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
We need to include file class and file color in order to do the conflict
resolution required with a multilib design. This is normally disabled when
we don't use the internal dependency generator, patch enables it in
all cases.
(From OE-Core rev: 4c43ea3440ecca02d2945b02017f56a8de9ff808)
Signed-off-by: Mark Hatle <mark.hatle@windriver.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
rpm default will use /usr/lib if the --with-path-lib is not specified.
this will not work in non /usr/lib libdir case.
so this patch add the --with-path-lib to fix this issue.
(From OE-Core rev: f707953372dd0962efb5cb8daeb422743376bc29)
Signed-off-by: Yu Ke <ke.yu@intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
For some reason --without-xz doesn't work the same as --with-xz=none.
We need this set to none, or configure will attempt to find an lzma
header which we might or might not have.
(From OE-Core rev: 43e499b0168eefed38a0883cbf2834f6a4622296)
Signed-off-by: Mark Hatle <mark.hatle@windriver.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Mark Hatle
Saul Wold
Robert Yang
Paul Eggleton
Richard Purdie
Matthew McClintock
Khem Raj
Nitin A Kamble
Andrei Gherzan
Andreas Oberritter
Martin Jansa
Mei Lei
Chris Larson
Yu Ke
Dexuan Cui