Resetting PR for PR service

Resetting PR for PR service

[Bryan Evenson]

I am on poky/dylan and I am using the PR service for the first time.  At this time I am making some cosmetic .bbappend recipe changes (reordering and spacing with no affect on the final built package).  Of course, after rebuilding the recipe the PR service bumped the PR since it saw a change in the metadata.  I don't want this package PR to change at this time; the package would "upgrade" on the next release even though the contents are identical.  I would like to revert the PR for this package but I am having difficulty.

I had not previously used the PR service, so the old package name was foo_1.0.0-r0_arm926ejste.ipk.  After being rebuilt, the new package name was foo_1.0.0-r0.0_arm926ejste.ipk (added the .0).  I tried to revert the PR for this package as follows:
1. Export the current PR service data by calling "bitbake-prserv-tool export prserv_export.inc"
2. Moved the file cache/prserv.sqlite3 to effectively delete the PR Service database.
3. Opened prserv_export.inc and removed the two lines related to package foo.
4. Cleaned package foo by calling "bitbake -c clean foo"
5. Imported the PR service data by calling "bitbake-prserv-tool import prserv_export.inc"
6. Rebuilt package foo by calling "bitbake foo"

After step 6, the resulting package name was still foo_1.0.0-r0.0_arm926ejste.ipk.  Is there a step I'm missing in reverting the PR value?

On another note, I discovered that to import the prserv data the filename needs to end with .inc, otherwise you get an error stating that Bitbake does not know what to do with the file.  Or more specifically, the file to be imported at least can't be a .txt extension.  If there is a specific file extension needed for import, I'd suggest the info be included on the PR Service wiki.

Regards,
Bryan

Re: Resetting PR for PR service

[Richard Purdie]

On Thu, 2014-11-20 at 19:43 +0000, Bryan Evenson wrote:
> I am on poky/dylan and I am using the PR service for the first time.  At this time I am making some cosmetic .bbappend recipe changes (reordering and spacing with no affect on the final built package).  Of course, after rebuilding the recipe the PR service bumped the PR since it saw a change in the metadata.  I don't want this package PR to change at this time; the package would "upgrade" on the next release even though the contents are identical.  I would like to revert the PR for this package but I am having difficulty.
> 
> I had not previously used the PR service, so the old package name was foo_1.0.0-r0_arm926ejste.ipk.  After being rebuilt, the new package name was foo_1.0.0-r0.0_arm926ejste.ipk (added the .0).  I tried to revert the PR for this package as follows:
> 1. Export the current PR service data by calling "bitbake-prserv-tool export prserv_export.inc"
> 2. Moved the file cache/prserv.sqlite3 to effectively delete the PR Service database.
> 3. Opened prserv_export.inc and removed the two lines related to package foo.
> 4. Cleaned package foo by calling "bitbake -c clean foo"

This is just off the top of my head but have you tried a -c cleansstate
here?

> 5. Imported the PR service data by calling "bitbake-prserv-tool import prserv_export.inc"
> 6. Rebuilt package foo by calling "bitbake foo"
> 
> After step 6, the resulting package name was still foo_1.0.0-r0.0_arm926ejste.ipk.  Is there a step I'm missing in reverting the PR value?
> 
> On another note, I discovered that to import the prserv data the
> filename needs to end with .inc, otherwise you get an error stating
> that Bitbake does not know what to do with the file.  Or more
> specifically, the file to be imported at least can't be a .txt
> extension.  If there is a specific file extension needed for import,
> I'd suggest the info be included on the PR Service wiki.

That sounds like a good idea. You should be able to update the wiki?

Cheers,

Richard

Re: Resetting PR for PR service

[Bryan Evenson]

Richard,

> -----Original Message-----
> From: Richard Purdie [mailto:richard.purdie@linuxfoundation.org]
> Sent: Thursday, November 20, 2014 3:05 PM
> To: Bryan Evenson
> Cc: Openembedded-core@lists.openembedded.org
> Subject: Re: [OE-core] Resetting PR for PR service
> 
> On Thu, 2014-11-20 at 19:43 +0000, Bryan Evenson wrote:
> > I am on poky/dylan and I am using the PR service for the first time.  At this
> time I am making some cosmetic .bbappend recipe changes (reordering and
> spacing with no affect on the final built package).  Of course, after rebuilding
> the recipe the PR service bumped the PR since it saw a change in the
> metadata.  I don't want this package PR to change at this time; the package
> would "upgrade" on the next release even though the contents are identical.
> I would like to revert the PR for this package but I am having difficulty.
> >
> > I had not previously used the PR service, so the old package name was
> foo_1.0.0-r0_arm926ejste.ipk.  After being rebuilt, the new package name
> was foo_1.0.0-r0.0_arm926ejste.ipk (added the .0).  I tried to revert the PR
> for this package as follows:
> > 1. Export the current PR service data by calling "bitbake-prserv-tool export
> prserv_export.inc"
> > 2. Moved the file cache/prserv.sqlite3 to effectively delete the PR Service
> database.
> > 3. Opened prserv_export.inc and removed the two lines related to package
> foo.
> > 4. Cleaned package foo by calling "bitbake -c clean foo"
> 
> This is just off the top of my head but have you tried a -c cleansstate here?
> 

I'd misread your response and I tried -c cleanall and that didn't help.  I tried again this time disabling the PR service after the export, then "bitbake -c cleanall foo" followed by "bitbake foo".  I then got the errors stating the PR went backwards and the PR had reverted to what I was looking for.

I think this is a special case since there is no .0 added yet.  I suspect if I wanted to back up a PR that had a value already (such as going from .3 to .2) I could just change the value in the imported text and it'd do what I suspected.  I have a few more packages that were modified that I don't want the PR to change, so I have a few more items I could do some testing with.

> > 5. Imported the PR service data by calling "bitbake-prserv-tool import
> prserv_export.inc"
> > 6. Rebuilt package foo by calling "bitbake foo"
> >
> > After step 6, the resulting package name was still foo_1.0.0-
> r0.0_arm926ejste.ipk.  Is there a step I'm missing in reverting the PR value?
> >
> > On another note, I discovered that to import the prserv data the
> > filename needs to end with .inc, otherwise you get an error stating
> > that Bitbake does not know what to do with the file.  Or more
> > specifically, the file to be imported at least can't be a .txt
> > extension.  If there is a specific file extension needed for import,
> > I'd suggest the info be included on the PR Service wiki.
> 
> That sounds like a good idea. You should be able to update the wiki?

I'll create an account on the wiki and do some edits.

Regards,
Bryan