cpio: Fix unpackaged files warnings

WARNING: For recipe cpio, the following files/directories were installed but not shipped in any package:
WARNING:   /usr/bin

(From OE-Core rev: da88ac4b30a367641451167868bd8fc48010f646)

Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>

2 files changed, 2 insertions, 1 deletions

diff --git a/meta/recipes-extended/cpio/cpio_2.11.bb b/meta/recipes-extended/cpio/cpio_2.11.bb
index 7e82ec0912..78da20e3d4 100644
--- a/meta/recipes-extended/cpio/cpio_2.11.bb
+++ b/meta/recipes-extended/cpio/cpio_2.11.bb
@@ -3,7 +3,7 @@ include cpio_v2.inc
 LICENSE = "GPLv3"
 LIC_FILES_CHKSUM = "file://COPYING;md5=f27defe1e96c2e1ecd4e0c9be8967949"
 
-PR = "r0"
+PR = "r1"
 
 SRC_URI[md5sum] = "1112bb6c45863468b5496ba128792f6c"
 SRC_URI[sha256sum] = "601b1d774cd6e4cd39416203c91ec59dbd65dd27d79d75e1a9b89497ea643978"
diff --git a/meta/recipes-extended/cpio/cpio_v2.inc b/meta/recipes-extended/cpio/cpio_v2.inc
index 3d024af84f..066e9374a2 100644
--- a/meta/recipes-extended/cpio/cpio_v2.inc
+++ b/meta/recipes-extended/cpio/cpio_v2.inc
@@ -18,6 +18,7 @@ do_install () {
     autotools_do_install
     install -d ${D}${base_bindir}/
     mv "${D}${bindir}/cpio" "${D}${base_bindir}/cpio.${PN}"
+    rmdir ${D}${bindir}/
     case ${TARGET_OS} in
         *-uclibc*) ;;
         *) mv "${D}${libexecdir}/rmt" "${D}${libexecdir}/rmt.${PN}" ;;