Re: busybox v. 1.18.3
23.02.2011 19:43, Otavio Salvador wrote:
> On Wed, Feb 23, 2011 at 07:51, Michael Tokarev <mjt@tls.msk.ru> wrote:
> ...
>> As I mentioned already, there was no _config_ changes in
>> this 1.18 package compared with 1.17, so the only possible
>> changes are bugs introduced in busybox itself, but there
>> should - hopefully - be none, and even if there are such
>> bugs, we'll fix them later.
>
> IMO we ought to merge Chris changes first (that are not refreshing
> already merged patches) and then merge 1.18. For uploading I'd like to
> get current busybox ready for testing before uploading to sid a new
> one.
>
> Seems fine? If it does, can you prepare it all in a branch for we to merge?
So we ended up mergeing 5 out of 6 patches from
Cristian Greco (except of the patch that refreshes
all patches), and applying 1.18.3 changes into
master branch.
Now it's time to finally refresh the patches for
good, for new release.
Unfortunately the resulting git tree as it is now can't
be built directly using apt/dpkg - dpkg-source uses diff
with -F0 (disables fuzz factor), but the first patch applies
with some fuzz - I didn't refresh it when applying 1.18,
I just didn't know that fact -- quilt works just fine since
it does not restrict patch to 'no fuzz'. This is something
I especially tried to avoid, -- unbuildable commits, in
order to not break git bisect. Now I understand how it
happened (the result was that we removed references to
quilt before my 1.18 changes).
(Note it's trivial to work around this still, by running
quilt manually).
I'm refreshing all patches now as suggested by Cristian Greco,
now against 1.18 tree, -- in order to make it buildable again.
My first attempt, let's hope subsequent attempts will
be more successful.
Thanks!
/mjt
Reply to: