From 61addcc8536caef8cd8a2bf7ed3c6c34ce6a7f83 Mon Sep 17 00:00:00 2001 From: Paul Eggleton Date: Mon, 13 Aug 2012 18:54:32 +0000 Subject: rpmresolve: add wrapper script to fix paths 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 Signed-off-by: Richard Purdie --- meta/recipes-devtools/rpm/rpmresolve_1.0.bb | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/meta/recipes-devtools/rpm/rpmresolve_1.0.bb b/meta/recipes-devtools/rpm/rpmresolve_1.0.bb index f8750e02ba..3ce4369d0c 100644 --- a/meta/recipes-devtools/rpm/rpmresolve_1.0.bb +++ b/meta/recipes-devtools/rpm/rpmresolve_1.0.bb @@ -4,7 +4,7 @@ DESCRIPTION = "OpenEmbedded RPM resolver - performs RPM database lookups in batc DEPENDS = "rpm" LICENSE = "GPLv2" LIC_FILES_CHKSUM = "file://${COMMON_LICENSE_DIR}/GPL-2.0;md5=801f80980d171dd6425610833a22dbe6" -PR = "r0" +PR = "r1" SRC_URI = "file://rpmresolve.c" @@ -19,4 +19,11 @@ do_install() { install -m 0755 rpmresolve ${D}${bindir} } +do_install_append_virtclass-native() { + create_wrapper ${D}/${bindir}/rpmresolve \ + RPM_USRLIBRPM=${STAGING_LIBDIR_NATIVE}/rpm \ + RPM_ETCRPM=${STAGING_ETCDIR_NATIVE}/rpm \ + RPM_LOCALEDIRRPM=${STAGING_DATADIR_NATIVE}/locale +} + BBCLASSEXTEND = "native" -- cgit v1.2.3-54-g00ecf