[Rebase review] Hardy netbook-lpia branch rebase to 2.6.24-28.70
Stefan Bader
stefan.bader at canonical.com
Wed Jun 16 07:42:38 UTC 2010
On 06/16/2010 09:32 AM, Stefan Bader wrote:
> On 06/15/2010 02:10 PM, Ike Panhc wrote:
>> Hi,
>>
>> I remove the commit of removing control/control.stub and re-push the four trees
>> in order to make it "as it was". Not to surprise anyone for buildenv change.
>>
>> For Hardy kernel the change is
>> * Rebase to tag Ubuntu-2.6.24-28.70
>
> This rebase implies an ABI bump. The files seem not to be updated. From a
> workflow point of view, whenever you rebase you need to be careful. Strangely I
> thought this was covered by the script...
>
Ok, I just checked and remembered wrongly. Maybe you should add some hints to
the hints printed, that
- if last abi != new abi of the base kernel
- touch debian/control.stub.in
- ./debian/rules clean
- git add debian/d-i/kernel-versions debian/control*
bfore
- git add debian/changelog
> The other packages look good.
>
> Stefan
>
>> * Disable LGUEST_GUEST
>>
>> For lbm/lrm/lum the change is
>> * Bump ABI number with kernel tree
>>
>> The git tree is at the following place:
>>
>> git://kernel.ubuntu.com/ikepanhc/hardy-kernel/.git branch netbook-lpia and
>> tag NBK-Ubuntu-2.6.24-28.70netbook01
>>
>> git://kernel.ubuntu.com/ikepanhc/hardy-lbm/.git branch netbook-lpia and
>> tag NBK-Ubuntu-2.6.24-28.70netbook01
>>
>> git://kernel.ubuntu.com/ikepanhc/hardy-lrm/.git branch netbook-lpia and
>> tag NBK-Ubuntu-2.6.24.25-28.1netbook01
>>
>> git://kernel.ubuntu.com/ikepanhc/hardy-lum/.git branch netbook-lpia and
>> tag NBK-Ubuntu-2.6.24-28.70netbook01
>>
>> I have built and tested the binary and it looks fine.
>>
>> --
>> Ike Panhc
>>
>> On 06/14/2010 08:17 PM, Stefan Bader wrote:
>>> On 06/10/2010 03:01 PM, Ike Panhc wrote:
>>>> Hi,
>>>>
>>>> Please review for the rebase on Hardy netbook-lpia branch including lbm/lrm/lum.
>>>> The git tree is at the following place:
>>>>
>>>> git://kernel.ubuntu.com/ikepanhc/hardy-kernel/.git branch netbook-lpia and
>>>> tag NBK-Ubuntu-2.6.24-28.70netbook01
>>>>
>>>> git://kernel.ubuntu.com/ikepanhc/hardy-lbm/.git branch netbook-lpia and
>>>> tag NBK-Ubuntu-2.6.24-28.70netbook01
>>>>
>>>> git://kernel.ubuntu.com/ikepanhc/hardy-lrm/.git branch netbook-lpia and
>>>> tag NBK-Ubuntu-2.6.24.25-28.1netbook01
>>>>
>>>> git://kernel.ubuntu.com/ikepanhc/hardy-lum/.git branch netbook-lpia and
>>>> tag NBK-Ubuntu-2.6.24-28.70netbook01
>>>>
>>>>
>>>> What has been done list below.
>>>>
>>>> For Hardy kernel:
>>>> * Rebase to tag Ubuntu-2.6.24-28.70
>>>> * Disable LGUEST_GUEST for two reason: we dont need it and build failed on it.
>>>> * Remove debian/control and debian/control.stub: Those are auto-generated files
>>>>
>>>> For LBM/LRM/LUM:
>>>> * Bump ABI number with kernel tree
>>>> * Remove debian/control and debian/control.stub
>>>>
>>>>
>>>> Please review and let me know if you have any feedback for each step.
>>>> If everything is fine, I will upload them to build server.
>>>>
>>>> --
>>>> Ike Panhc
>>>>
>>>
>>> Hi Ike,
>>>
>>> sorry that it took so long. I went over the trees today. As those are currently,
>>> they should be generally correct. You might either now and update the trees
>>> before uploading or for the next release, consider to remove kernel-versions as
>>> well. If you decide to do it now. You could move the commit that removes those
>>> before the abi bump, which then will touch only the changelog.
>>> But as this is only build infrastructure you may as well decide to make that
>>> change not now but for the next rebase/upload.
>>> Otherwise I think this looks good.
>>>
>>> -Stefan
>>
>
>
More information about the kernel-team
mailing list