[OE-core] [PATCH] rootfs.py: Remove rpm database from staging area

[Mark Hatle]

On 3/30/15 2:00 PM, Ed Bartosh wrote:
> On Mon, Mar 30, 2015 at 10:14:36AM -0500, Mark Hatle wrote:
>> On 3/30/15 3:53 AM, Richard Purdie wrote:
>>> On Mon, 2015-03-30 at 11:30 +0300, Ed Bartosh wrote:
>>>> Rpm database in staging area is used only by createrepo.
>>>> createrepo fails with the error
>>>> "rpmdb: BDB0060 PANIC: fatal region error detected"
>>>> if rpm database is broken from the previous run of createrepo.
>>>>
>>>> Removing the databae before running createrepo can hopefully
>>>> prevent this failure to happen.
>>>>
>>>> [YOCTO #6571]
>>>>
>>>> Signed-off-by: Ed Bartosh <ed.bartosh at linux.intel.com>
>>>> ---
>>>>  meta/lib/oe/rootfs.py | 3 +++
>>>>  1 file changed, 3 insertions(+)
>>>>
>>>> diff --git a/meta/lib/oe/rootfs.py b/meta/lib/oe/rootfs.py
>>>> index 4e4e6eb..9f7dc65 100644
>>>> --- a/meta/lib/oe/rootfs.py
>>>> +++ b/meta/lib/oe/rootfs.py
>>>> @@ -306,6 +306,9 @@ class RpmRootfs(Rootfs):
>>>>              bb.utils.remove(self.image_rootfs, True)
>>>>          else:
>>>>              self.pm.recovery_packaging_data()
>>>> +        dbpath = os.path.join(self.d.getVar('STAGING_DIR_NATIVE', True),
>>>> +                              'var/lib/rpm/*')
>>>> +        bb.utils.remove(dbpath, recurse=True)
>>>>          bb.utils.remove(self.d.getVar('MULTILIB_TEMP_ROOTFS', True), True)
>>>>  
>>>>          self.pm.crea
>>>
>>> This patch helps me see the problem a lot. I'd never realised there was
>>> an rpm database in the native sysroot that was getting corrupted, I'd
>>> always assumed it was the target rootfs one.
>>>
>>> I'm a little worried about what happens if you have multiple images
>>> generating at the same time as this change as above may delete something
>>> being worked on by another process.
>>>
>>> I'm wondering why is it getting into the sysroot at all? Rather than
>>> delete it here, could we either not generate it at all, or place it
>>> somewhere in WORKDIR (so that other tasks can't see it or race against
>>> it)?
>>
>> I did some quick looking.  It appears (at least on first glance) that the call to:
>>
>> rpm.TransactionSet()
>>
>> is what is opening the DB.  It appears to me that we can change the call
>> slightly, and it should do what is being requested:
>>
>>     { "TransactionSet", (PyCFunction) rpmts_Create, METH_VARARGS|METH_KEYWORDS,
>> "rpm.TransactionSet([rootDir, [db]]) -> ts\n\
>> - Create a transaction set.\n" },
>>
>> So transaction set takes two arguments, the rootDir of the thing we're working
>> against, and a DB path.  It -should- be as simply as setting a rootDir to the
>> WORKDIR.  If that doesn't work, then both arguments will be needed.
>>
>> I'd suggest just adding a "--root" option to genpkgmetadata.py in the
>> createrepo, and maybe a "--dbpath" option as well (second argument).  Then only
>> call the function with their values IF they were defined. I.e.
>>
>> if root:
>>   if dbpath:
>>     self.ts = rpm.TransactionSet(root, dbpath)
>>   else:
>>     self.ts = rpm.TransactionSet(root)
>> else:
>>   self.ts = rpm.TransactionSet()
>>
>> (If there is a better way to do that in python, fine.. but passing in "None" or
>> "" won't result in the desired behavior.. since RPM is actually parsing
>> arguments and appears like it will use the values if passed in, whatever they are.)
>>
> 
> I was going to do something like this:
> 
> if dbpath:
>     rpm.addMacro("_dbpath", dbpath)
> 
> self.ts = rpm.TransactionSet()
> 
> Brief test showed that this approach works just fine.

Yes, that can work as well..  but the transactionSet actually has arguments for
root and dbpath built in.  It's a good idea to select the WORKDIR as the 'root',
and the dbpath as somewhere "in the WORKDIR".

(This will prevent rpm for intentionally writing anything into the execution
sysroot, and restrict it to the WORKDIR.)

--Mark

> Regards,
> Ed
>