[oe] [meta-oe][PATCH] nano: Upgrade 2.9.7 -> 2.9.8

[Leon Anavi]

Hi Khem,


On 6.06.2018 04:05, Khem Raj wrote:
> On Mon, Jun 4, 2018 at 9:29 AM, Leon Anavi <leon.anavi at konsulko.com> wrote:
>> Upgrade nano to 2.9.8, the latest version as of 2 June 2018:
>> https://www.nano-editor.org/dist/v2.9/ChangeLog
>>
>> Signed-off-by: Leon Anavi <leon.anavi at konsulko.com>
>> ---
>>  meta-oe/recipes-support/nano/nano_2.9.7.bb | 8 --------
>>  meta-oe/recipes-support/nano/nano_2.9.8.bb | 8 ++++++++
>>  2 files changed, 8 insertions(+), 8 deletions(-)
>>  delete mode 100644 meta-oe/recipes-support/nano/nano_2.9.7.bb
>>  create mode 100644 meta-oe/recipes-support/nano/nano_2.9.8.bb
>>
>> diff --git a/meta-oe/recipes-support/nano/nano_2.9.7.bb b/meta-oe/recipes-support/nano/nano_2.9.7.bb
>> deleted file mode 100644
>> index 419e5406b..000000000
>> --- a/meta-oe/recipes-support/nano/nano_2.9.7.bb
>> +++ /dev/null
>> @@ -1,8 +0,0 @@
>> -include nano.inc
>> -
>> -do_install_append_libc-musl () {
>> -       rm -rf ${D}${libdir}/charset.alias
>> -       rmdir ${D}${libdir}
> This is failing on musl like below
>
> | make[1]: Leaving directory
> '/mnt/a/oe/build/tmp/work/core2-64-bec-linux-musl/nano/2.9.8-r0/build'
> | rmdir: failed to remove
> '/mnt/a/oe/build/tmp/work/core2-64-bec-linux-musl/nano/2.9.8-r0/image/usr/lib':
> No such file or directory
> | WARNING: /mnt/a/oe/build/tmp/work/core2-64-bec-linux-musl/nano/2.9.8-r0/temp/run.do_install.40342:1
> exit 1 from 'rmdir
> /mnt/a/oe/build/tmp/work/core2-64-bec-linux-musl/nano/2.9.8-r0/image/usr/lib'
>
>
> I think you might need --ignore-fail-on-non-empty
> option with rmdir

Thank you for the feedback. I reproduced the issue with musl. The
directory that rmdir tries to remove doesn't exist at all so I think the
whole do_install_append_libc-musl is redundant. I did a few tests to
confirm this and I will send a new version of the patch shortly.

Thanks,
Leon

>
>> -}
>> -SRC_URI[md5sum] = "e0c6d76c93932f6c41c40842952495f7"
>> -SRC_URI[sha256sum] = "b64ab017305b1777e97b5b9b07b31db8aeebfc3e8719f61e8da1cf3866d344bd"
>> diff --git a/meta-oe/recipes-support/nano/nano_2.9.8.bb b/meta-oe/recipes-support/nano/nano_2.9.8.bb
>> new file mode 100644
>> index 000000000..ac5f0622b
>> --- /dev/null
>> +++ b/meta-oe/recipes-support/nano/nano_2.9.8.bb
>> @@ -0,0 +1,8 @@
>> +include nano.inc
>> +
>> +do_install_append_libc-musl () {
>> +       rm -rf ${D}${libdir}/charset.alias
>> +       rmdir ${D}${libdir}
>> +}
>> +SRC_URI[md5sum] = "31714360342f9baa344e2fa574c144db"
>> +SRC_URI[sha256sum] = "c2deac31ba4d3fd27a42fafcc47ccf499296cc69a422bbecab63f2933ea85488"
>> --
>> 2.14.1
>>
>> --
>> _______________________________________________
>> Openembedded-devel mailing list
>> Openembedded-devel at lists.openembedded.org
>> http://lists.openembedded.org/mailman/listinfo/openembedded-devel

-- 
Leon Anavi
Software Engineer
konsulko.com