diff options
| author | Waldemar Brodkorb <wbx@openadk.org> | 2014-01-16 12:30:38 +0100 |
|---|---|---|
| committer | Waldemar Brodkorb <wbx@openadk.org> | 2014-01-16 12:30:38 +0100 |
| commit | 1e5620307b6ad5ce451c72f90e83f8f263c2d05f (patch) | |
| tree | a708ca6142683b35ab1b69bdf9a0797cd38cc169 | |
| parent | ca2a76f692c0c7021a1bceaf38a40a5920b91edd (diff) | |
| parent | 0f80f2fdff5aa23a630dd0161e91c1ce0a6d9bea (diff) | |
Merge branch 'master' of git+ssh://openadk.org/git/openadk
| -rw-r--r-- | package/busybox/Makefile | 2 | ||||
| -rw-r--r-- | package/busybox/patches/017-remove-alloca.patch | 22 |
2 files changed, 23 insertions, 1 deletions
diff --git a/package/busybox/Makefile b/package/busybox/Makefile index 7941fff37..0cde4bca5 100644 --- a/package/busybox/Makefile +++ b/package/busybox/Makefile @@ -5,7 +5,7 @@ include $(TOPDIR)/rules.mk PKG_NAME:= busybox PKG_VERSION:= 1.21.1 -PKG_RELEASE:= 1 +PKG_RELEASE:= 2 PKG_MD5SUM:= 795394f83903b5eec6567d51eebb417e PKG_DESCR:= core utilities for embedded systems PKG_SECTION:= base diff --git a/package/busybox/patches/017-remove-alloca.patch b/package/busybox/patches/017-remove-alloca.patch new file mode 100644 index 000000000..ca27f8fb7 --- /dev/null +++ b/package/busybox/patches/017-remove-alloca.patch @@ -0,0 +1,22 @@ +diff -Nur busybox-1.21.1.orig/scripts/basic/docproc.c busybox-1.21.1/scripts/basic/docproc.c +--- busybox-1.21.1.orig/scripts/basic/docproc.c Sat May 11 17:30:44 2013 ++++ busybox-1.21.1/scripts/basic/docproc.c Thu Jan 16 03:00:39 2014 +@@ -39,7 +39,6 @@ + #include <limits.h> + #include <sys/types.h> + #include <sys/wait.h> +-#include <alloca.h> + + /* exitstatus is used to keep track of any failing calls to kernel-doc, + * but execution continues. */ +diff -Nur busybox-1.21.1.orig/scripts/basic/fixdep.c busybox-1.21.1/scripts/basic/fixdep.c +--- busybox-1.21.1.orig/scripts/basic/fixdep.c Sat May 11 17:30:44 2013 ++++ busybox-1.21.1/scripts/basic/fixdep.c Thu Jan 16 03:00:33 2014 +@@ -113,7 +113,6 @@ + #include <limits.h> + #include <ctype.h> + #include <arpa/inet.h> +-#include <alloca.h> + + /* bbox: not needed + #define INT_CONF ntohl(0x434f4e46) |