]> code.ossystems Code Review - openembedded-core.git/commitdiff
busybox: upgrade to version 1.17.3
authorQing He <qing.he@intel.com>
Wed, 17 Nov 2010 02:51:45 +0000 (10:51 +0800)
committerSaul Wold <Saul.Wold@intel.com>
Thu, 18 Nov 2010 21:30:26 +0000 (13:30 -0800)
from 1.16.2
update license info: add checksum and change gplv2+ to gplv2

Signed-off-by: Qing He <qing.he@intel.com>
meta/recipes-core/busybox/busybox-1.17.3/B921600.patch [moved from meta/recipes-core/busybox/busybox-1.16.2/B921600.patch with 100% similarity]
meta/recipes-core/busybox/busybox-1.17.3/busybox-appletlib-dependency.patch [moved from meta/recipes-core/busybox/busybox-1.16.2/busybox-appletlib-dependency.patch with 100% similarity]
meta/recipes-core/busybox/busybox-1.17.3/defconfig [moved from meta/recipes-core/busybox/busybox-1.16.2/defconfig with 100% similarity]
meta/recipes-core/busybox/busybox-1.17.3/get_header_tar.patch [moved from meta/recipes-core/busybox/busybox-1.16.2/get_header_tar.patch with 100% similarity]
meta/recipes-core/busybox/busybox-1.17.3/make-382-fix.patch [moved from meta/recipes-core/busybox/busybox-1.16.2/make-382-fix.patch with 100% similarity]
meta/recipes-core/busybox/busybox-1.17.3/run-parts.in.usr-bin.patch [moved from meta/recipes-core/busybox/busybox-1.16.2/run-parts.in.usr-bin.patch with 82% similarity]
meta/recipes-core/busybox/busybox-1.17.3/udhcpc-fix-nfsroot.patch [moved from meta/recipes-core/busybox/busybox-1.16.2/udhcpc-fix-nfsroot.patch with 100% similarity]
meta/recipes-core/busybox/busybox-1.17.3/udhcpscript.patch [moved from meta/recipes-core/busybox/busybox-1.16.2/udhcpscript.patch with 100% similarity]
meta/recipes-core/busybox/busybox.inc
meta/recipes-core/busybox/busybox_1.17.3.bb [moved from meta/recipes-core/busybox/busybox_1.16.2.bb with 98% similarity]

similarity index 82%
rename from meta/recipes-core/busybox/busybox-1.16.2/run-parts.in.usr-bin.patch
rename to meta/recipes-core/busybox/busybox-1.17.3/run-parts.in.usr-bin.patch
index bedb974432a2eaa48a8b272529a62b0729f3d3c8..e01fdc7ad12c4de36a3564ef7ce739ab4a7fda48 100644 (file)
@@ -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))
index 24f9120a221bbc45f35f5d07c6dbe93f711b7c04..142c72f4e5d062d4ca47bd533d6885abf60eecb0 100644 (file)
@@ -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} () {
similarity index 98%
rename from meta/recipes-core/busybox/busybox_1.16.2.bb
rename to meta/recipes-core/busybox/busybox_1.17.3.bb
index 6e535027f1c8ecfb08b1a22c485f25f472190b49..473eabfe159eca51d1e3c4256b695b38ce90a17f 100644 (file)
@@ -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 \