diff options
Diffstat (limited to 'poky/meta/recipes-extended/cpio')
| -rw-r--r-- | poky/meta/recipes-extended/cpio/cpio-2.13/0002-src-global.c-Remove-superfluous-declaration-of-progr.patch | 2 | ||||
| -rw-r--r-- | poky/meta/recipes-extended/cpio/cpio_2.13.bb | 6 |
2 files changed, 5 insertions, 3 deletions
diff --git a/poky/meta/recipes-extended/cpio/cpio-2.13/0002-src-global.c-Remove-superfluous-declaration-of-progr.patch b/poky/meta/recipes-extended/cpio/cpio-2.13/0002-src-global.c-Remove-superfluous-declaration-of-progr.patch index d48a3b0d1..478324c1c 100644 --- a/poky/meta/recipes-extended/cpio/cpio-2.13/0002-src-global.c-Remove-superfluous-declaration-of-progr.patch +++ b/poky/meta/recipes-extended/cpio/cpio-2.13/0002-src-global.c-Remove-superfluous-declaration-of-progr.patch @@ -3,7 +3,7 @@ From: Sergey Poznyakoff <gray@gnu.org> Date: Mon, 20 Jan 2020 07:45:39 +0200 Subject: [PATCH] src/global.c: Remove superfluous declaration of program_name -Upstream-Status: Accepted (commit 641d3f4) +Upstream-Status: Backport (commit 641d3f4) Signed-off-by: Richard Leitner <richard.leitner@skidata.com> --- src/global.c | 3 --- diff --git a/poky/meta/recipes-extended/cpio/cpio_2.13.bb b/poky/meta/recipes-extended/cpio/cpio_2.13.bb index 9e35a80f8..94d86100c 100644 --- a/poky/meta/recipes-extended/cpio/cpio_2.13.bb +++ b/poky/meta/recipes-extended/cpio/cpio_2.13.bb @@ -23,7 +23,9 @@ do_install () { if [ "${base_bindir}" != "${bindir}" ]; then install -d ${D}${base_bindir}/ mv "${D}${bindir}/cpio" "${D}${base_bindir}/cpio" - rmdir ${D}${bindir}/ + if [ "${sbindir}" != "${bindir}" ]; then + rmdir ${D}${bindir}/ + fi fi # Avoid conflicts with the version from tar @@ -46,4 +48,4 @@ ALTERNATIVE_LINK_NAME[cpio] = "${base_bindir}/cpio" ALTERNATIVE_PRIORITY[rmt] = "50" ALTERNATIVE_LINK_NAME[rmt] = "${sbindir}/rmt" -BBCLASSEXTEND = "native" +BBCLASSEXTEND = "native nativesdk" |