diff options
| -rw-r--r-- | package/busybox/Makefile | 6 | ||||
| -rw-r--r-- | package/busybox/config/coreutils/Config.in | 2 | ||||
| -rw-r--r-- | package/busybox/patches/005-bsd-compat.patch | 93 |
3 files changed, 4 insertions, 97 deletions
diff --git a/package/busybox/Makefile b/package/busybox/Makefile index efae99f2a..8d6ff4f9f 100644 --- a/package/busybox/Makefile +++ b/package/busybox/Makefile @@ -4,9 +4,9 @@ include $(TOPDIR)/rules.mk PKG_NAME:= busybox -PKG_VERSION:= 1.17.1 -PKG_RELEASE:= 2 -PKG_MD5SUM:= c7fe7533b7fc4018b0b49a05ee0ee601 +PKG_VERSION:= 1.17.2 +PKG_RELEASE:= 1 +PKG_MD5SUM:= 7360b7138b899ee7fc885791c740c3c3 PKG_DESCR:= Core utilities for embedded systems PKG_SECTION:= base PKG_URL:= http://www.busybox.net/ diff --git a/package/busybox/config/coreutils/Config.in b/package/busybox/config/coreutils/Config.in index 75130fcad..edccc86d0 100644 --- a/package/busybox/config/coreutils/Config.in +++ b/package/busybox/config/coreutils/Config.in @@ -279,7 +279,7 @@ config BUSYBOX_EXPR_MATH_SUPPORT_64 config BUSYBOX_FALSE bool "false" - default n + default y help false returns an exit code of FALSE (1). diff --git a/package/busybox/patches/005-bsd-compat.patch b/package/busybox/patches/005-bsd-compat.patch deleted file mode 100644 index fc7317d20..000000000 --- a/package/busybox/patches/005-bsd-compat.patch +++ /dev/null @@ -1,93 +0,0 @@ -diff -Nur busybox-1.17.1.orig/include/libbb.h busybox-1.17.1/include/libbb.h ---- busybox-1.17.1.orig/include/libbb.h Sun Jul 25 00:12:43 2010 -+++ busybox-1.17.1/include/libbb.h Thu Jul 29 20:27:07 2010 -@@ -40,6 +40,7 @@ - /* Try to pull in PATH_MAX */ - #include <limits.h> - #include <sys/param.h> -+#if !(defined __APPLE__ || defined BSD ) - #ifdef HAVE_MNTENT_H - #include <mntent.h> - #endif -@@ -51,6 +52,7 @@ - #include <selinux/context.h> - #include <selinux/flask.h> - #include <selinux/av_permissions.h> -+#endif - #endif - #if ENABLE_LOCALE_SUPPORT - # include <locale.h> -diff -Nur busybox-1.17.1.orig/include/platform.h busybox-1.17.1/include/platform.h ---- busybox-1.17.1.orig/include/platform.h Tue Jul 6 04:25:54 2010 -+++ busybox-1.17.1/include/platform.h Thu Jul 29 20:28:50 2010 -@@ -150,18 +150,19 @@ - - /* ---- Endian Detection ------------------------------------ */ - -+# include <sys/param.h> - #if defined(__digital__) && defined(__unix__) - # include <sex.h> - # define __BIG_ENDIAN__ (BYTE_ORDER == BIG_ENDIAN) - # define __BYTE_ORDER BYTE_ORDER --#elif defined __FreeBSD__ -+#elif defined __FreeBSD__ || defined __APPLE__ - # include <sys/resource.h> /* rlimit */ - # include <machine/endian.h> - # define bswap_64 __bswap64 - # define bswap_32 __bswap32 - # define bswap_16 __bswap16 - # define __BIG_ENDIAN__ (_BYTE_ORDER == _BIG_ENDIAN) --#elif !defined __APPLE__ -+#elif !defined BSD - # include <byteswap.h> - # include <endian.h> - #endif -@@ -172,9 +173,15 @@ - #elif defined(__BYTE_ORDER) && __BYTE_ORDER == __BIG_ENDIAN - # define BB_BIG_ENDIAN 1 - # define BB_LITTLE_ENDIAN 0 -+#elif defined(_BYTE_ORDER) && _BYTE_ORDER == _BIG_ENDIAN -+# define BB_BIG_ENDIAN 1 -+# define BB_LITTLE_ENDIAN 0 - #elif (defined(__BYTE_ORDER) && __BYTE_ORDER == __LITTLE_ENDIAN) || defined(__386__) - # define BB_BIG_ENDIAN 0 - # define BB_LITTLE_ENDIAN 1 -+#elif (defined(_BYTE_ORDER) && _BYTE_ORDER == _LITTLE_ENDIAN) || defined(__386__) -+# define BB_BIG_ENDIAN 0 -+# define BB_LITTLE_ENDIAN 1 - #else - # error "Can't determine endianness" - #endif -@@ -230,12 +237,19 @@ - /* ---- Compiler dependent settings ------------------------- */ - - #if (defined __digital__ && defined __unix__) \ -- || defined __APPLE__ || defined __FreeBSD__ -+ || defined __APPLE__ || defined __FreeBSD__ || defined BSD - # undef HAVE_MNTENT_H - # undef HAVE_SYS_STATFS_H - #else - # define HAVE_MNTENT_H 1 - # define HAVE_SYS_STATFS_H 1 -+#endif -+ -+/* ---- Networking ------------------------------------------ */ -+ -+#if defined __OpenBSD__ -+#include <netinet/in.h> -+#include <arpa/inet.h> - #endif - - /*----- Kernel versioning ------------------------------------*/ -diff -Nur busybox-1.17.1.orig/scripts/gen_build_files.sh busybox-1.17.1/scripts/gen_build_files.sh ---- busybox-1.17.1.orig/scripts/gen_build_files.sh Sun Jul 25 00:12:56 2010 -+++ busybox-1.17.1/scripts/gen_build_files.sh Thu Jul 29 20:27:07 2010 -@@ -48,7 +48,7 @@ - fi - - # (Re)generate */Kbuild and */Config.in --{ cd -- "$srctree" && find -type d; } | while read -r d; do -+{ cd -- "$srctree" && find . -type d; } | while read -r d; do - d="${d#./}" - - src="$srctree/$d/Kbuild.src" |