[Libosinfo] [PATCH osinfo-db] dragonflybsd : Add DragonFlyBSD data

[Fabiano Fidêncio]

On Thu, Jul 19, 2018 at 3:08 PM, Pierre-Alain TORET
<pierre-alain.toret at protonmail.com> wrote:
> On 19/07/2018 14:41, Fabiano Fidêncio wrote:
>> On Thu, Jul 19, 2018 at 2:14 PM, Pierre-Alain TORET
>> <pierre-alain.toret at protonmail.com> wrote:
>>> On 19/07/2018 13:30, Fabiano Fidêncio wrote:
>>>> On Thu, Jul 19, 2018 at 10:40 AM, Pierre-Alain TORET
>>>> <pierre-alain.toret at protonmail.com> wrote:
>>>>> On 19/07/2018 10:02, Fabiano Fidêncio wrote:
>>>>>> On Thu, Jul 19, 2018 at 9:47 AM, Pierre-Alain TORET
>>>>>> <pierre-alain.toret at protonmail.com> wrote:
>>>>>>> Hello Fabiano,
>>>>>>>
>>>>>>> On 19/07/2018 07:59, Fabiano Fidêncio wrote:
>>>>>>>> Pierre-Alain,
>>>>>>>>
>>>>>>>> On Wed, Jun 6, 2018 at 10:54 PM, Pierre-Alain TORET
>>>>>>>> <pierre-alain.toret at protonmail.com> wrote:
>>>>>>>>> Hello,
>>>>>>>>>
>>>>>>>>> [...]
>>>>>>>>>
>>>>>>>>> Signed-off-by: Pierre-Alain TORET <pierre-alain.toret at protonmail.com>
>>>>>>>>
>>>>>>>> For some reason I'm not able to apply your patches atop of git master.
>>>>>>>> It may be some issue on my mail client breaking the patches lines in
>>>>>>>> an weird way.
>>>>>>>>
>>>>>>>> Would you have those patches on a git repo that you could point me to?
>>>>>>>> I'd like to review and have them merged sooner than later.
>>>>>>>>
>>>>>>>
>>>>>>> Actually I cleaned my repos just 2 days ago, this is really bad luck.
>>>>>>> I tried and can't apply the patch myself neither so it seems there's an
>>>>>>> issue with what I sent.
>>>>>>> I guess I will have to make a new patch by hand, but this will take a
>>>>>>> little time, except if someone has a better solution.
>>>>>>
>>>>>> Okay. :-/
>>>>>
>>>>> Ah actually I found the .patch files generated at that time, so I
>>>>> re-used them and pushed on my gitlab fork of the projects :
>>>>> https://gitlab.com/daftaupe/libosinfo/tree/dfly
>>>>
>>>> This repo seems to be closed and I can't access it.
>>>>
>>>
>>> Sorry this repo was in private mode, and the other in public mode, I
>>> don't why as I just forked both of them.
>>> Anyway you should have access now.
>>>
>>>>> https://gitlab.com/daftaupe/osinfo-db/tree/dfly/
>>>>
>>>> This one is fine!
>>>>
>>>>>
>>>>> I added release 5.2.2 while at it :)
>>>>>
>>>>> Sorry for the noise.
>>>>>>
>>>>>> I'll go and prepare a release later Today with what we have merged and
>>>>>> this series will be in the next one.
>>>>>> Hopefully it's not a big problem for you.
>>>>>>
>>>
>>> Sorry, I didn't answer to that. It's totally fine.
>>
>> Okay, I've checked your patches.
>>
>> There are 2 changes that *have* *to* be merged into your patches:
>>
>> [fidencio at machado osinfo-db]$ git diff
>> diff --git a/data/os/dragonflybsd.org/dragonflybsd-4.6.1.xml.in
>> b/data/os/dragonflybsd.org/dragonflybsd-4.6.1.xml.in
>> index fdf0972..dac23f3 100644
>> --- a/data/os/dragonflybsd.org/dragonflybsd-4.6.1.xml.in
>> +++ b/data/os/dragonflybsd.org/dragonflybsd-4.6.1.xml.in
>> @@ -1,14 +1,14 @@
>>   <libosinfo version="0.0.1">
>>   <!-- Licensed under the GNU General Public License version 2 or later.
>>        See http://www.gnu.org/licenses/ for a copy of the license text -->
>> -  <os id="http://dragonflybsd.org/dragonflybsd/4.8.0">
>> -    <short-id>dragonflybsd4.8.0</short-id>
>> -    <_name>DragonFlyBSD 4.8.0</_name>
>> -    <version>4.8.0</version>
>> +  <os id="http://dragonflybsd.org/dragonflybsd/4.6.1">
>> +    <short-id>dragonflybsd4.6.1</short-id>
>> +    <_name>DragonFlyBSD 4.6.1</_name>
>> +    <version>4.6.1</version>
>>       <family>dragonflybsd</family>
>>       <distro>dragonflybsd</distro>
>>       <_vendor>DragonFlyBSD Project</_vendor>
>> -    <upgrades id="http://dragonflybsd.org/dragonflybsd/4.6.2"/>
>> +    <upgrades id="http://dragonflybsd.org/dragonflybsd/4.6.0"/>
>>
>>       <release-date>2017-03-27</release-date>
>>     </os>
>> diff --git a/data/os/dragonflybsd.org/dragonflybsd-5.0.0.xml.in
>> b/data/os/dragonflybsd.org/dragonflybsd-5.0.0.xml.in
>> index 07e587f..4a675dc 100644
>> --- a/data/os/dragonflybsd.org/dragonflybsd-5.0.0.xml.in
>> +++ b/data/os/dragonflybsd.org/dragonflybsd-5.0.0.xml.in
>> @@ -17,7 +17,7 @@
>>         <iso>
>>              <system-id>DragonFly</system-id>
>>              <volume-id>DragonFly v5.0.0</volume-id>
>> -           <volume-size>346052608</volume-size>
>> +           <volume-size>789700608</volume-size>
>>         </iso>
>>       </media>
>>     </os>
>>
>>
>> There's also another change that I'd like to do before merging those,
>> if you agree and its related to
>> https://www.redhat.com/archives/libosinfo/2018-July/msg00032.html
>>
>> Basically, all other distros but openbsd are using single quotes for
>> the arch entry.
>>
>> If you agree, I'll merge those changes into your patches before
>> pushing them upstream.
>>
>
> Agreed with all, Fabiano, I've pushed (force so it stays as one commit)
> on the repo accordingly (I've fixed the release date for 4.6.1 as well
> and a few tabs instead of spaces).

Right. I'll do a second round of review.
Thanks!

>
>>>
>>>>>>>
>>>>>>>> Sorry for the long time taken for reviewing those.
>>>>>>>>
>>>>>>>
>>>>>>> No problem.
>>>>>>>
>>>>>>> I'll seend a new one when it's ready.
>>>>>>
>>>>>> Thanks a lot!
>>>>>>
>>>>>>>
>>>>>>>>> [...]
>>>>>>>
>>>>>>>
>>>>>>
>>>>>>
>>>>>>
>>>>>
>>>>>
>>>>
>>>>
>>>>
>>>
>>>
>>
>>
>>
>
>



-- 
Fabiano Fidêncio