10 files changed, 12 insertions, 5 deletions

diff --git a/meta/recipes-core/busybox/busybox-1.16.2/B921600.patch b/meta/recipes-core/busybox/busybox-1.17.3/B921600.patch
index 803dc411d8..803dc411d8 100644
--- a/meta/recipes-core/busybox/busybox-1.16.2/B921600.patch
+++ b/meta/recipes-core/busybox/busybox-1.17.3/B921600.patch
diff --git a/meta/recipes-core/busybox/busybox-1.16.2/busybox-appletlib-dependency.patch b/meta/recipes-core/busybox/busybox-1.17.3/busybox-appletlib-dependency.patch
index 041aa6c54c..041aa6c54c 100644
--- a/meta/recipes-core/busybox/busybox-1.16.2/busybox-appletlib-dependency.patch
+++ b/meta/recipes-core/busybox/busybox-1.17.3/busybox-appletlib-dependency.patch
diff --git a/meta/recipes-core/busybox/busybox-1.16.2/defconfig b/meta/recipes-core/busybox/busybox-1.17.3/defconfig
index 87e62445f0..87e62445f0 100644
--- a/meta/recipes-core/busybox/busybox-1.16.2/defconfig
+++ b/meta/recipes-core/busybox/busybox-1.17.3/defconfig
diff --git a/meta/recipes-core/busybox/busybox-1.16.2/get_header_tar.patch b/meta/recipes-core/busybox/busybox-1.17.3/get_header_tar.patch
index bc9b427ea9..bc9b427ea9 100644
--- a/meta/recipes-core/busybox/busybox-1.16.2/get_header_tar.patch
+++ b/meta/recipes-core/busybox/busybox-1.17.3/get_header_tar.patch
diff --git a/meta/recipes-core/busybox/busybox-1.16.2/make-382-fix.patch b/meta/recipes-core/busybox/busybox-1.17.3/make-382-fix.patch
index 4ef125d6c0..4ef125d6c0 100644
--- a/meta/recipes-core/busybox/busybox-1.16.2/make-382-fix.patch
+++ b/meta/recipes-core/busybox/busybox-1.17.3/make-382-fix.patch
diff --git a/meta/recipes-core/busybox/busybox-1.16.2/run-parts.in.usr-bin.patch b/meta/recipes-core/busybox/busybox-1.17.3/run-parts.in.usr-bin.patch
index bedb974432..e01fdc7ad1 100644
--- a/meta/recipes-core/busybox/busybox-1.16.2/run-parts.in.usr-bin.patch
+++ b/meta/recipes-core/busybox/busybox-1.17.3/run-parts.in.usr-bin.patch
@@ -13,9 +13,9 @@
 # Poky doesn't have debianutils, but let's keep it for safety
 # above comment added by Kevin Tian <kevin.tian@intel.com>, 2010-07-06
 
-diff -uNr busybox-1.15.3.orig//include/applets.h busybox-1.15.3/include/applets.h
---- busybox-1.15.3.orig//include/applets.h      2009-12-12 22:13:28.000000000 +0100
-+++ busybox-1.15.3/include/applets.h    2010-04-30 15:35:40.000000000 +0200
+diff -uNr busybox-1.15.3.orig//include/applets.src.h busybox-1.15.3/include/applets.src.h
+--- busybox-1.15.3.orig//include/applets.src.h  2009-12-12 22:13:28.000000000 +0100
++++ busybox-1.15.3/include/applets.src.h        2010-04-30 15:35:40.000000000 +0200
 @@ -323,7 +323,7 @@
  IF_RPM(APPLET(rpm, _BB_DIR_BIN, _BB_SUID_DROP))
  IF_RPM2CPIO(APPLET(rpm2cpio, _BB_DIR_USR_BIN, _BB_SUID_DROP))
diff --git a/meta/recipes-core/busybox/busybox-1.16.2/udhcpc-fix-nfsroot.patch b/meta/recipes-core/busybox/busybox-1.17.3/udhcpc-fix-nfsroot.patch
index 89eeb425ad..89eeb425ad 100644
--- a/meta/recipes-core/busybox/busybox-1.16.2/udhcpc-fix-nfsroot.patch
+++ b/meta/recipes-core/busybox/busybox-1.17.3/udhcpc-fix-nfsroot.patch
diff --git a/meta/recipes-core/busybox/busybox-1.16.2/udhcpscript.patch b/meta/recipes-core/busybox/busybox-1.17.3/udhcpscript.patch
index 81bca634af..81bca634af 100644
--- a/meta/recipes-core/busybox/busybox-1.16.2/udhcpscript.patch
+++ b/meta/recipes-core/busybox/busybox-1.17.3/udhcpscript.patch
diff --git a/meta/recipes-core/busybox/busybox.inc b/meta/recipes-core/busybox/busybox.inc
index 24f9120a22..142c72f4e5 100644
--- a/meta/recipes-core/busybox/busybox.inc
+++ b/meta/recipes-core/busybox/busybox.inc
@@ -2,8 +2,12 @@ SUMMARY = "Tiny versions of many common UNIX utilities in a single small executa
 DESCRIPTION = "BusyBox combines tiny versions of many common UNIX utilities into a single small executable. It provides minimalist replacements for most of the utilities you usually find in GNU fileutils, shellutils, etc. The utilities in BusyBox generally have fewer options than their full-featured GNU cousins; however, the options that are included provide the expected functionality and behave very much like their GNU counterparts. BusyBox provides a fairly complete POSIX environment for any small or embedded system."
 HOMEPAGE = "http://www.busybox.net"
 BUGTRACKER = "https://bugs.busybox.net/"
+
 # bzip2 applet in busybox is based on lightly-modified bzip2 source
-LICENSE = "GPLv2+ & bzip2"
+# the GPL is version 2 only
+LICENSE = "GPLv2 & bzip2"
+LIC_FILES_CHKSUM = "file://LICENSE;md5=de10de48642ab74318e893a61105afbb"
+
 SECTION = "base"
 PRIORITY = "required"
 
@@ -96,6 +100,9 @@ do_install () {
         fi
 
         install -m 0644 ${S}/busybox.links ${D}${sysconfdir}
+
+        # remove the temp dir to suppress warning, we are done with it
+        rm -rf ${D}/busybox
 }
 
 pkg_postinst_${PN} () {
diff --git a/meta/recipes-core/busybox/busybox_1.16.2.bb b/meta/recipes-core/busybox/busybox_1.17.3.bb
index 6e535027f1..473eabfe15 100644
--- a/meta/recipes-core/busybox/busybox_1.16.2.bb
+++ b/meta/recipes-core/busybox/busybox_1.17.3.bb
@@ -1,5 +1,5 @@
 require busybox.inc
-PR = "r3"
+PR = "r0"
 
 SRC_URI = "http://www.busybox.net/downloads/busybox-${PV}.tar.bz2;name=tarball \
            file://udhcpscript.patch \