summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRichard Purdie <richard.purdie@linuxfoundation.org>2012-08-14 08:28:00 (GMT)
committerRichard Purdie <richard.purdie@linuxfoundation.org>2012-08-14 08:34:12 (GMT)
commit8b8748c8f963900b83dc0fdd7757556f917fe4fd (patch)
treecde5aa043663eb7874eb13503804d2bbf1c3b660
parentd45bbc5c75a8f277fc1185a5f28847116eec376d (diff)
downloadpoky-8b8748c8f963900b83dc0fdd7757556f917fe4fd.tar.gz
rpmresolve: Ensure we call the rpm relocation code at init1.3_M3.rc21.3_M3.final1.3_M3
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>
-rw-r--r--meta/recipes-devtools/rpm/rpmresolve/rpmresolve.c3
1 files changed, 2 insertions, 1 deletions
diff --git a/meta/recipes-devtools/rpm/rpmresolve/rpmresolve.c b/meta/recipes-devtools/rpm/rpmresolve/rpmresolve.c
index 2d9ed14..568b689 100644
--- a/meta/recipes-devtools/rpm/rpmresolve/rpmresolve.c
+++ b/meta/recipes-devtools/rpm/rpmresolve/rpmresolve.c
@@ -343,9 +343,10 @@ int main(int argc, char **argv)
343 343
344 const char *dblistfn = argv[optind]; 344 const char *dblistfn = argv[optind];
345 345
346 rpmcliInit(argc, argv, NULL);
347
346 //rpmSetVerbosity(RPMLOG_DEBUG); 348 //rpmSetVerbosity(RPMLOG_DEBUG);
347 349
348 rpmReadConfigFiles( NULL, NULL );
349 rpmDefineMacro(NULL, "__dbi_txn create nofsync", RMIL_CMDLINE); 350 rpmDefineMacro(NULL, "__dbi_txn create nofsync", RMIL_CMDLINE);
350 351
351 rc = loadTs(&ts, &tscount, dblistfn); 352 rc = loadTs(&ts, &tscount, dblistfn);