Commit Graph

13 Commits

Author SHA1 Message Date
Mark Hatle a2e7adad27 rpm: Fix file contention issue
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>
2012-10-02 11:40:49 +01:00
Mark Hatle fc3b6656af rpm-native: Fix 'uuid_rc_t' undeclared error when compiling
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>
2012-10-02 11:40:49 +01:00
Saul Wold 4d7fb79eef rpm: Add base-files as RDEPENDS
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>
2012-09-25 10:41:27 +01:00
Robert Yang 5f3ae0650f rpm 5.4.9: DEPENDS on bison-native
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>
2012-09-21 11:10:18 +01:00
Matthew McClintock 659220973f rpm_5.4.9.bb: fix builds on systems with older libc
| 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>
2012-07-17 10:53:54 +01:00
Mark Hatle 0e832baadf rpm: Fix PACKAGECONFIG dependencies
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>
2012-07-09 11:38:02 +01:00
Khem Raj 13136e4c20 rpm: pass lrt and lpthread to link step explicitly for uclibc
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>
2012-06-18 17:26:26 +01:00
Khem Raj bdc73dfc11 rpm: Use link time check for libssp
-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>
2012-06-18 17:24:49 +01:00
Khem Raj eaedf2e941 rpm: Fix compilation on uclibc
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>
2012-06-18 17:24:40 +01:00
Mark Hatle d7b7f13492 rpm: Ensure pkgconfig deps don't stray from the package being built
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>
2012-06-12 11:10:36 +01:00
Mark Hatle 75c302ca80 package_rpm: Add capability to directly query packageorigin
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>
2012-06-12 11:10:35 +01:00
Mark Hatle b81d788c79 ossp-uuid: Add oss-uuid package and RPM 5.4.9 integration
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>
2012-06-12 11:10:35 +01:00
Mark Hatle bc4a29df84 rpm: Upgrade RPM to 5.4.9
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>
2012-06-12 11:10:35 +01:00