From b1493d762cd757b376653eb65e78add28e3e94c6 Mon Sep 17 00:00:00 2001
From: Waldemar Brodkorb <wbx@openadk.org>
Date: Mon, 7 Apr 2014 13:21:45 +0200
Subject: enable static globally

---
 mk/vars.mk            | 6 ++++++
 package/mksh/Makefile | 5 -----
 2 files changed, 6 insertions(+), 5 deletions(-)

diff --git a/mk/vars.mk b/mk/vars.mk
index e804ad5e6..49eb3e7e3 100644
--- a/mk/vars.mk
+++ b/mk/vars.mk
@@ -111,6 +111,12 @@ TARGET_LDFLAGS+=	-Wl,--secure-plt
 endif
 endif
 
+ifeq ($(ADK_STATIC),y)
+TARGET_CFLAGS+=		-static
+TARGET_CXXFLAGS+=	-static
+TARGET_LDFLAGS+=	-static
+endif
+
 ifneq ($(ADK_TOOLCHAIN_GCC_USE_SSP),)
 TARGET_CFLAGS+=		-fstack-protector
 TARGET_CXXFLAGS+=	-fstack-protector
diff --git a/package/mksh/Makefile b/package/mksh/Makefile
index 4f65a97f7..76f15499e 100644
--- a/package/mksh/Makefile
+++ b/package/mksh/Makefile
@@ -23,11 +23,6 @@ include ${TOPDIR}/mk/package.mk
 $(eval $(call HOST_template,MKSH,mksh,${PKG_VERSION}-${PKG_RELEASE}))
 $(eval $(call PKG_template,MKSH,mksh,${PKG_VERSION}-${PKG_RELEASE},,${PKG_DESCR},${PKG_SECTION}))
 
-ifeq ($(ADK_STATIC),y)
-TARGET_CFLAGS+=		-static
-TARGET_LDFLAGS+=	-static
-endif
-
 TARGET_CPPFLAGS+=	-DMKSH_SMALL=1
 TARGET_LDFLAGS+=	-static-libgcc
 
-- 
cgit v1.2.3


From c84401914937ecf8a49ec3e8a5ede12221b96d14 Mon Sep 17 00:00:00 2001
From: Waldemar Brodkorb <wbx@openadk.org>
Date: Mon, 7 Apr 2014 13:22:01 +0200
Subject: fix build when tar is disabled

---
 package/busybox/patches/001-ipkg.patch | 163 +++++++++++++++++----------------
 1 file changed, 84 insertions(+), 79 deletions(-)

diff --git a/package/busybox/patches/001-ipkg.patch b/package/busybox/patches/001-ipkg.patch
index 5f392d06b..1b65a5c90 100644
--- a/package/busybox/patches/001-ipkg.patch
+++ b/package/busybox/patches/001-ipkg.patch
@@ -1,6 +1,6 @@
 diff -Nur busybox-1.21.1.orig/archival/Config.src busybox-1.21.1/archival/Config.src
 --- busybox-1.21.1.orig/archival/Config.src	2013-05-12 01:30:43.000000000 +0200
-+++ busybox-1.21.1/archival/Config.src	2014-02-17 14:25:39.802534016 +0100
++++ busybox-1.21.1/archival/Config.src	2014-04-07 12:36:32.391575261 +0200
 @@ -214,6 +214,12 @@
  	  are actually slower than gzip at equivalent compression ratios
  	  and take up 3.2K of code.
@@ -16,7 +16,7 @@ diff -Nur busybox-1.21.1.orig/archival/Config.src busybox-1.21.1/archival/Config
  	default y
 diff -Nur busybox-1.21.1.orig/archival/ipkg.c busybox-1.21.1/archival/ipkg.c
 --- busybox-1.21.1.orig/archival/ipkg.c	1970-01-01 01:00:00.000000000 +0100
-+++ busybox-1.21.1/archival/ipkg.c	2014-02-17 14:25:39.802534016 +0100
++++ busybox-1.21.1/archival/ipkg.c	2014-04-07 12:36:32.391575261 +0200
 @@ -0,0 +1,28 @@
 +/* ipkg.c - the itsy package management system
 +
@@ -48,7 +48,7 @@ diff -Nur busybox-1.21.1.orig/archival/ipkg.c busybox-1.21.1/archival/ipkg.c
 +}
 diff -Nur busybox-1.21.1.orig/archival/Kbuild.src busybox-1.21.1/archival/Kbuild.src
 --- busybox-1.21.1.orig/archival/Kbuild.src	2013-05-12 01:30:43.000000000 +0200
-+++ busybox-1.21.1/archival/Kbuild.src	2014-02-17 14:25:39.802534016 +0100
++++ busybox-1.21.1/archival/Kbuild.src	2014-04-07 12:36:32.391575261 +0200
 @@ -22,6 +22,7 @@
  lib-$(CONFIG_LZOP)		+= lzop.o bbunzip.o
  lib-$(CONFIG_GZIP)		+= gzip.o bbunzip.o
@@ -59,7 +59,7 @@ diff -Nur busybox-1.21.1.orig/archival/Kbuild.src busybox-1.21.1/archival/Kbuild
  lib-$(CONFIG_UNLZMA)		+= bbunzip.o
 diff -Nur busybox-1.21.1.orig/archival/libarchive/Kbuild.src busybox-1.21.1/archival/libarchive/Kbuild.src
 --- busybox-1.21.1.orig/archival/libarchive/Kbuild.src	2013-06-29 16:58:06.000000000 +0200
-+++ busybox-1.21.1/archival/libarchive/Kbuild.src	2014-02-17 14:25:39.802534016 +0100
++++ busybox-1.21.1/archival/libarchive/Kbuild.src	2014-04-07 12:36:32.391575261 +0200
 @@ -25,14 +25,14 @@
  \
  	data_align.o \
@@ -79,7 +79,7 @@ diff -Nur busybox-1.21.1.orig/archival/libarchive/Kbuild.src busybox-1.21.1/arch
  
 diff -Nur busybox-1.21.1.orig/archival/libipkg/args.c busybox-1.21.1/archival/libipkg/args.c
 --- busybox-1.21.1.orig/archival/libipkg/args.c	1970-01-01 01:00:00.000000000 +0100
-+++ busybox-1.21.1/archival/libipkg/args.c	2014-02-17 14:25:39.826534090 +0100
++++ busybox-1.21.1/archival/libipkg/args.c	2014-04-07 12:36:32.391575261 +0200
 @@ -0,0 +1,242 @@
 +/* args.c - parse command-line args
 + 
@@ -325,7 +325,7 @@ diff -Nur busybox-1.21.1.orig/archival/libipkg/args.c busybox-1.21.1/archival/li
 +}
 diff -Nur busybox-1.21.1.orig/archival/libipkg/args.h busybox-1.21.1/archival/libipkg/args.h
 --- busybox-1.21.1.orig/archival/libipkg/args.h	1970-01-01 01:00:00.000000000 +0100
-+++ busybox-1.21.1/archival/libipkg/args.h	2014-02-17 14:25:39.826534090 +0100
++++ busybox-1.21.1/archival/libipkg/args.h	2014-04-07 12:36:32.391575261 +0200
 @@ -0,0 +1,72 @@
 +/* args.h - parse command-line args
 +
@@ -401,7 +401,7 @@ diff -Nur busybox-1.21.1.orig/archival/libipkg/args.h busybox-1.21.1/archival/li
 +#endif
 diff -Nur busybox-1.21.1.orig/archival/libipkg/conffile.c busybox-1.21.1/archival/libipkg/conffile.c
 --- busybox-1.21.1.orig/archival/libipkg/conffile.c	1970-01-01 01:00:00.000000000 +0100
-+++ busybox-1.21.1/archival/libipkg/conffile.c	2014-02-17 14:25:39.826534090 +0100
++++ busybox-1.21.1/archival/libipkg/conffile.c	2014-04-07 12:36:32.391575261 +0200
 @@ -0,0 +1,65 @@
 +/* conffile.c - the itsy package management system
 +
@@ -470,7 +470,7 @@ diff -Nur busybox-1.21.1.orig/archival/libipkg/conffile.c busybox-1.21.1/archiva
 +}
 diff -Nur busybox-1.21.1.orig/archival/libipkg/conffile.h busybox-1.21.1/archival/libipkg/conffile.h
 --- busybox-1.21.1.orig/archival/libipkg/conffile.h	1970-01-01 01:00:00.000000000 +0100
-+++ busybox-1.21.1/archival/libipkg/conffile.h	2014-02-17 14:25:39.826534090 +0100
++++ busybox-1.21.1/archival/libipkg/conffile.h	2014-04-07 12:36:32.391575261 +0200
 @@ -0,0 +1,30 @@
 +/* conffile.h - the itsy package management system
 +
@@ -504,7 +504,7 @@ diff -Nur busybox-1.21.1.orig/archival/libipkg/conffile.h busybox-1.21.1/archiva
 +
 diff -Nur busybox-1.21.1.orig/archival/libipkg/conffile_list.c busybox-1.21.1/archival/libipkg/conffile_list.c
 --- busybox-1.21.1.orig/archival/libipkg/conffile_list.c	1970-01-01 01:00:00.000000000 +0100
-+++ busybox-1.21.1/archival/libipkg/conffile_list.c	2014-02-17 14:25:39.850534164 +0100
++++ busybox-1.21.1/archival/libipkg/conffile_list.c	2014-04-07 12:36:32.391575261 +0200
 @@ -0,0 +1,47 @@
 +/* conffile_list.c - the itsy package management system
 +
@@ -555,7 +555,7 @@ diff -Nur busybox-1.21.1.orig/archival/libipkg/conffile_list.c busybox-1.21.1/ar
 +
 diff -Nur busybox-1.21.1.orig/archival/libipkg/conffile_list.h busybox-1.21.1/archival/libipkg/conffile_list.h
 --- busybox-1.21.1.orig/archival/libipkg/conffile_list.h	1970-01-01 01:00:00.000000000 +0100
-+++ busybox-1.21.1/archival/libipkg/conffile_list.h	2014-02-17 14:25:39.850534164 +0100
++++ busybox-1.21.1/archival/libipkg/conffile_list.h	2014-04-07 12:36:32.391575261 +0200
 @@ -0,0 +1,36 @@
 +/* conffile_list.h - the itsy package management system
 +
@@ -595,7 +595,7 @@ diff -Nur busybox-1.21.1.orig/archival/libipkg/conffile_list.h busybox-1.21.1/ar
 +
 diff -Nur busybox-1.21.1.orig/archival/libipkg/file_util.c busybox-1.21.1/archival/libipkg/file_util.c
 --- busybox-1.21.1.orig/archival/libipkg/file_util.c	1970-01-01 01:00:00.000000000 +0100
-+++ busybox-1.21.1/archival/libipkg/file_util.c	2014-02-17 14:25:39.850534164 +0100
++++ busybox-1.21.1/archival/libipkg/file_util.c	2014-04-07 12:36:32.391575261 +0200
 @@ -0,0 +1,186 @@
 +/* file_util.c - convenience routines for common stat operations
 +
@@ -785,7 +785,7 @@ diff -Nur busybox-1.21.1.orig/archival/libipkg/file_util.c busybox-1.21.1/archiv
 +
 diff -Nur busybox-1.21.1.orig/archival/libipkg/file_util.h busybox-1.21.1/archival/libipkg/file_util.h
 --- busybox-1.21.1.orig/archival/libipkg/file_util.h	1970-01-01 01:00:00.000000000 +0100
-+++ busybox-1.21.1/archival/libipkg/file_util.h	2014-02-17 14:25:39.850534164 +0100
++++ busybox-1.21.1/archival/libipkg/file_util.h	2014-04-07 12:36:32.391575261 +0200
 @@ -0,0 +1,29 @@
 +/* file_util.h - convenience routines for common file operations
 +
@@ -818,7 +818,7 @@ diff -Nur busybox-1.21.1.orig/archival/libipkg/file_util.h busybox-1.21.1/archiv
 +#endif
 diff -Nur busybox-1.21.1.orig/archival/libipkg/hash_table.c busybox-1.21.1/archival/libipkg/hash_table.c
 --- busybox-1.21.1.orig/archival/libipkg/hash_table.c	1970-01-01 01:00:00.000000000 +0100
-+++ busybox-1.21.1/archival/libipkg/hash_table.c	2014-02-17 14:25:39.850534164 +0100
++++ busybox-1.21.1/archival/libipkg/hash_table.c	2014-04-07 12:36:32.391575261 +0200
 @@ -0,0 +1,155 @@
 +/* hash.c - hash tables for ipkg
 +
@@ -977,7 +977,7 @@ diff -Nur busybox-1.21.1.orig/archival/libipkg/hash_table.c busybox-1.21.1/archi
 +
 diff -Nur busybox-1.21.1.orig/archival/libipkg/hash_table.h busybox-1.21.1/archival/libipkg/hash_table.h
 --- busybox-1.21.1.orig/archival/libipkg/hash_table.h	1970-01-01 01:00:00.000000000 +0100
-+++ busybox-1.21.1/archival/libipkg/hash_table.h	2014-02-17 14:25:39.854534176 +0100
++++ busybox-1.21.1/archival/libipkg/hash_table.h	2014-04-07 12:36:32.391575261 +0200
 @@ -0,0 +1,44 @@
 +/* hash.h - hash tables for ipkg
 +
@@ -1025,7 +1025,7 @@ diff -Nur busybox-1.21.1.orig/archival/libipkg/hash_table.h busybox-1.21.1/archi
 +#endif /* _HASH_TABLE_H_ */
 diff -Nur busybox-1.21.1.orig/archival/libipkg/ipkg_cmd.c busybox-1.21.1/archival/libipkg/ipkg_cmd.c
 --- busybox-1.21.1.orig/archival/libipkg/ipkg_cmd.c	1970-01-01 01:00:00.000000000 +0100
-+++ busybox-1.21.1/archival/libipkg/ipkg_cmd.c	2014-02-17 14:25:39.858534188 +0100
++++ busybox-1.21.1/archival/libipkg/ipkg_cmd.c	2014-04-07 12:36:32.411575387 +0200
 @@ -0,0 +1,1367 @@
 +/* ipkg_cmd.c - the itsy package management system
 +
@@ -2396,7 +2396,7 @@ diff -Nur busybox-1.21.1.orig/archival/libipkg/ipkg_cmd.c busybox-1.21.1/archiva
 +
 diff -Nur busybox-1.21.1.orig/archival/libipkg/ipkg_cmd.h busybox-1.21.1/archival/libipkg/ipkg_cmd.h
 --- busybox-1.21.1.orig/archival/libipkg/ipkg_cmd.h	1970-01-01 01:00:00.000000000 +0100
-+++ busybox-1.21.1/archival/libipkg/ipkg_cmd.h	2014-02-17 14:25:39.858534188 +0100
++++ busybox-1.21.1/archival/libipkg/ipkg_cmd.h	2014-04-07 12:36:32.411575387 +0200
 @@ -0,0 +1,41 @@
 +/* ipkg_cmd.h - the itsy package management system
 +
@@ -2441,7 +2441,7 @@ diff -Nur busybox-1.21.1.orig/archival/libipkg/ipkg_cmd.h busybox-1.21.1/archiva
 +#endif
 diff -Nur busybox-1.21.1.orig/archival/libipkg/ipkg_conf.c busybox-1.21.1/archival/libipkg/ipkg_conf.c
 --- busybox-1.21.1.orig/archival/libipkg/ipkg_conf.c	1970-01-01 01:00:00.000000000 +0100
-+++ busybox-1.21.1/archival/libipkg/ipkg_conf.c	2014-02-17 19:29:30.303924578 +0100
++++ busybox-1.21.1/archival/libipkg/ipkg_conf.c	2014-04-07 12:36:32.411575387 +0200
 @@ -0,0 +1,739 @@
 +/* ipkg_conf.c - the itsy package management system
 +
@@ -3184,7 +3184,7 @@ diff -Nur busybox-1.21.1.orig/archival/libipkg/ipkg_conf.c busybox-1.21.1/archiv
 +}
 diff -Nur busybox-1.21.1.orig/archival/libipkg/ipkg_conf.h busybox-1.21.1/archival/libipkg/ipkg_conf.h
 --- busybox-1.21.1.orig/archival/libipkg/ipkg_conf.h	1970-01-01 01:00:00.000000000 +0100
-+++ busybox-1.21.1/archival/libipkg/ipkg_conf.h	2014-02-17 14:25:39.858534188 +0100
++++ busybox-1.21.1/archival/libipkg/ipkg_conf.h	2014-04-07 12:36:32.411575387 +0200
 @@ -0,0 +1,107 @@
 +/* ipkg_conf.h - the itsy package management system
 +
@@ -3295,7 +3295,7 @@ diff -Nur busybox-1.21.1.orig/archival/libipkg/ipkg_conf.h busybox-1.21.1/archiv
 +#endif
 diff -Nur busybox-1.21.1.orig/archival/libipkg/ipkg_configure.c busybox-1.21.1/archival/libipkg/ipkg_configure.c
 --- busybox-1.21.1.orig/archival/libipkg/ipkg_configure.c	1970-01-01 01:00:00.000000000 +0100
-+++ busybox-1.21.1/archival/libipkg/ipkg_configure.c	2014-02-17 14:25:39.858534188 +0100
++++ busybox-1.21.1/archival/libipkg/ipkg_configure.c	2014-04-07 12:36:32.411575387 +0200
 @@ -0,0 +1,40 @@
 +/* ipkg_configure.c - the itsy package management system
 +
@@ -3339,7 +3339,7 @@ diff -Nur busybox-1.21.1.orig/archival/libipkg/ipkg_configure.c busybox-1.21.1/a
 +
 diff -Nur busybox-1.21.1.orig/archival/libipkg/ipkg_configure.h busybox-1.21.1/archival/libipkg/ipkg_configure.h
 --- busybox-1.21.1.orig/archival/libipkg/ipkg_configure.h	1970-01-01 01:00:00.000000000 +0100
-+++ busybox-1.21.1/archival/libipkg/ipkg_configure.h	2014-02-17 14:25:39.858534188 +0100
++++ busybox-1.21.1/archival/libipkg/ipkg_configure.h	2014-04-07 12:36:32.411575387 +0200
 @@ -0,0 +1,25 @@
 +/* ipkg_configure.h - the itsy package management system
 +
@@ -3368,7 +3368,7 @@ diff -Nur busybox-1.21.1.orig/archival/libipkg/ipkg_configure.h busybox-1.21.1/a
 +#endif
 diff -Nur busybox-1.21.1.orig/archival/libipkg/ipkg_download.c busybox-1.21.1/archival/libipkg/ipkg_download.c
 --- busybox-1.21.1.orig/archival/libipkg/ipkg_download.c	1970-01-01 01:00:00.000000000 +0100
-+++ busybox-1.21.1/archival/libipkg/ipkg_download.c	2014-02-17 14:25:39.858534188 +0100
++++ busybox-1.21.1/archival/libipkg/ipkg_download.c	2014-04-07 12:36:32.411575387 +0200
 @@ -0,0 +1,195 @@
 +/* ipkg_download.c - the itsy package management system
 +
@@ -3567,7 +3567,7 @@ diff -Nur busybox-1.21.1.orig/archival/libipkg/ipkg_download.c busybox-1.21.1/ar
 +}
 diff -Nur busybox-1.21.1.orig/archival/libipkg/ipkg_download.h busybox-1.21.1/archival/libipkg/ipkg_download.h
 --- busybox-1.21.1.orig/archival/libipkg/ipkg_download.h	1970-01-01 01:00:00.000000000 +0100
-+++ busybox-1.21.1/archival/libipkg/ipkg_download.h	2014-02-17 14:25:39.858534188 +0100
++++ busybox-1.21.1/archival/libipkg/ipkg_download.h	2014-04-07 12:36:32.411575387 +0200
 @@ -0,0 +1,30 @@
 +/* ipkg_download.h - the itsy package management system
 +
@@ -3601,7 +3601,7 @@ diff -Nur busybox-1.21.1.orig/archival/libipkg/ipkg_download.h busybox-1.21.1/ar
 +#endif
 diff -Nur busybox-1.21.1.orig/archival/libipkg/ipkg.h busybox-1.21.1/archival/libipkg/ipkg.h
 --- busybox-1.21.1.orig/archival/libipkg/ipkg.h	1970-01-01 01:00:00.000000000 +0100
-+++ busybox-1.21.1/archival/libipkg/ipkg.h	2014-02-17 14:25:39.858534188 +0100
++++ busybox-1.21.1/archival/libipkg/ipkg.h	2014-04-07 12:36:32.411575387 +0200
 @@ -0,0 +1,68 @@
 +/* ipkg.h - the itsy package management system
 +
@@ -3673,7 +3673,7 @@ diff -Nur busybox-1.21.1.orig/archival/libipkg/ipkg.h busybox-1.21.1/archival/li
 +#endif
 diff -Nur busybox-1.21.1.orig/archival/libipkg/ipkg_includes.h busybox-1.21.1/archival/libipkg/ipkg_includes.h
 --- busybox-1.21.1.orig/archival/libipkg/ipkg_includes.h	1970-01-01 01:00:00.000000000 +0100
-+++ busybox-1.21.1/archival/libipkg/ipkg_includes.h	2014-02-17 14:25:39.858534188 +0100
++++ busybox-1.21.1/archival/libipkg/ipkg_includes.h	2014-04-07 12:36:32.411575387 +0200
 @@ -0,0 +1,82 @@
 +#ifndef IPKG_INCLUDES_H
 +#define IPKG_INCLUDES_H
@@ -3759,7 +3759,7 @@ diff -Nur busybox-1.21.1.orig/archival/libipkg/ipkg_includes.h busybox-1.21.1/ar
 +#endif /* IPKG_INCLUDES_H */
 diff -Nur busybox-1.21.1.orig/archival/libipkg/ipkg_install.c busybox-1.21.1/archival/libipkg/ipkg_install.c
 --- busybox-1.21.1.orig/archival/libipkg/ipkg_install.c	1970-01-01 01:00:00.000000000 +0100
-+++ busybox-1.21.1/archival/libipkg/ipkg_install.c	2014-02-17 14:25:39.858534188 +0100
++++ busybox-1.21.1/archival/libipkg/ipkg_install.c	2014-04-07 12:36:32.415575413 +0200
 @@ -0,0 +1,1982 @@
 +/* ipkg_install.c - the itsy package management system
 +
@@ -5745,7 +5745,7 @@ diff -Nur busybox-1.21.1.orig/archival/libipkg/ipkg_install.c busybox-1.21.1/arc
 +#endif
 diff -Nur busybox-1.21.1.orig/archival/libipkg/ipkg_install.h busybox-1.21.1/archival/libipkg/ipkg_install.h
 --- busybox-1.21.1.orig/archival/libipkg/ipkg_install.h	1970-01-01 01:00:00.000000000 +0100
-+++ busybox-1.21.1/archival/libipkg/ipkg_install.h	2014-02-17 14:25:39.858534188 +0100
++++ busybox-1.21.1/archival/libipkg/ipkg_install.h	2014-04-07 12:36:32.415575413 +0200
 @@ -0,0 +1,35 @@
 +/* ipkg_install.h - the itsy package management system
 +
@@ -5784,7 +5784,7 @@ diff -Nur busybox-1.21.1.orig/archival/libipkg/ipkg_install.h busybox-1.21.1/arc
 +#endif
 diff -Nur busybox-1.21.1.orig/archival/libipkg/ipkg_message.c busybox-1.21.1/archival/libipkg/ipkg_message.c
 --- busybox-1.21.1.orig/archival/libipkg/ipkg_message.c	1970-01-01 01:00:00.000000000 +0100
-+++ busybox-1.21.1/archival/libipkg/ipkg_message.c	2014-02-17 14:25:39.858534188 +0100
++++ busybox-1.21.1/archival/libipkg/ipkg_message.c	2014-04-07 12:36:32.415575413 +0200
 @@ -0,0 +1,35 @@
 +/* ipkg_message.c - the itsy package management system
 +
@@ -5823,7 +5823,7 @@ diff -Nur busybox-1.21.1.orig/archival/libipkg/ipkg_message.c busybox-1.21.1/arc
 +}
 diff -Nur busybox-1.21.1.orig/archival/libipkg/ipkg_message.h busybox-1.21.1/archival/libipkg/ipkg_message.h
 --- busybox-1.21.1.orig/archival/libipkg/ipkg_message.h	1970-01-01 01:00:00.000000000 +0100
-+++ busybox-1.21.1/archival/libipkg/ipkg_message.h	2014-02-17 14:25:39.858534188 +0100
++++ busybox-1.21.1/archival/libipkg/ipkg_message.h	2014-04-07 12:36:32.415575413 +0200
 @@ -0,0 +1,32 @@
 +/* ipkg_message.h - the itsy package management system
 +
@@ -5859,7 +5859,7 @@ diff -Nur busybox-1.21.1.orig/archival/libipkg/ipkg_message.h busybox-1.21.1/arc
 +#endif /* _IPKG_MESSAGE_H_ */
 diff -Nur busybox-1.21.1.orig/archival/libipkg/ipkg_remove.c busybox-1.21.1/archival/libipkg/ipkg_remove.c
 --- busybox-1.21.1.orig/archival/libipkg/ipkg_remove.c	1970-01-01 01:00:00.000000000 +0100
-+++ busybox-1.21.1/archival/libipkg/ipkg_remove.c	2014-02-17 14:25:39.858534188 +0100
++++ busybox-1.21.1/archival/libipkg/ipkg_remove.c	2014-04-07 12:36:32.415575413 +0200
 @@ -0,0 +1,385 @@
 +/* ipkg_remove.c - the itsy package management system
 +
@@ -6248,7 +6248,7 @@ diff -Nur busybox-1.21.1.orig/archival/libipkg/ipkg_remove.c busybox-1.21.1/arch
 +}
 diff -Nur busybox-1.21.1.orig/archival/libipkg/ipkg_remove.h busybox-1.21.1/archival/libipkg/ipkg_remove.h
 --- busybox-1.21.1.orig/archival/libipkg/ipkg_remove.h	1970-01-01 01:00:00.000000000 +0100
-+++ busybox-1.21.1/archival/libipkg/ipkg_remove.h	2014-02-17 14:25:39.858534188 +0100
++++ busybox-1.21.1/archival/libipkg/ipkg_remove.h	2014-04-07 12:36:32.415575413 +0200
 @@ -0,0 +1,33 @@
 +/* ipkg_remove.h - the itsy package management system
 +
@@ -6285,7 +6285,7 @@ diff -Nur busybox-1.21.1.orig/archival/libipkg/ipkg_remove.h busybox-1.21.1/arch
 +#endif
 diff -Nur busybox-1.21.1.orig/archival/libipkg/ipkg_upgrade.c busybox-1.21.1/archival/libipkg/ipkg_upgrade.c
 --- busybox-1.21.1.orig/archival/libipkg/ipkg_upgrade.c	1970-01-01 01:00:00.000000000 +0100
-+++ busybox-1.21.1/archival/libipkg/ipkg_upgrade.c	2014-02-17 14:25:39.858534188 +0100
++++ busybox-1.21.1/archival/libipkg/ipkg_upgrade.c	2014-04-07 12:36:32.415575413 +0200
 @@ -0,0 +1,79 @@
 +/* ipkg_upgrade.c - the itsy package management system
 +
@@ -6368,7 +6368,7 @@ diff -Nur busybox-1.21.1.orig/archival/libipkg/ipkg_upgrade.c busybox-1.21.1/arc
 +}
 diff -Nur busybox-1.21.1.orig/archival/libipkg/ipkg_upgrade.h busybox-1.21.1/archival/libipkg/ipkg_upgrade.h
 --- busybox-1.21.1.orig/archival/libipkg/ipkg_upgrade.h	1970-01-01 01:00:00.000000000 +0100
-+++ busybox-1.21.1/archival/libipkg/ipkg_upgrade.h	2014-02-17 14:25:39.862534201 +0100
++++ busybox-1.21.1/archival/libipkg/ipkg_upgrade.h	2014-04-07 12:36:32.415575413 +0200
 @@ -0,0 +1,18 @@
 +/* ipkg_upgrade.c - the itsy package management system
 +
@@ -6390,7 +6390,7 @@ diff -Nur busybox-1.21.1.orig/archival/libipkg/ipkg_upgrade.h busybox-1.21.1/arc
 +int ipkg_upgrade_pkg(ipkg_conf_t *conf, pkg_t *old);
 diff -Nur busybox-1.21.1.orig/archival/libipkg/ipkg_utils.c busybox-1.21.1/archival/libipkg/ipkg_utils.c
 --- busybox-1.21.1.orig/archival/libipkg/ipkg_utils.c	1970-01-01 01:00:00.000000000 +0100
-+++ busybox-1.21.1/archival/libipkg/ipkg_utils.c	2014-02-17 14:25:39.862534201 +0100
++++ busybox-1.21.1/archival/libipkg/ipkg_utils.c	2014-04-07 12:36:32.415575413 +0200
 @@ -0,0 +1,185 @@
 +/* ipkg_utils.c - the itsy package management system
 +
@@ -6579,7 +6579,7 @@ diff -Nur busybox-1.21.1.orig/archival/libipkg/ipkg_utils.c busybox-1.21.1/archi
 +       
 diff -Nur busybox-1.21.1.orig/archival/libipkg/ipkg_utils.h busybox-1.21.1/archival/libipkg/ipkg_utils.h
 --- busybox-1.21.1.orig/archival/libipkg/ipkg_utils.h	1970-01-01 01:00:00.000000000 +0100
-+++ busybox-1.21.1/archival/libipkg/ipkg_utils.h	2014-02-17 14:25:39.862534201 +0100
++++ busybox-1.21.1/archival/libipkg/ipkg_utils.h	2014-04-07 12:36:32.415575413 +0200
 @@ -0,0 +1,29 @@
 +/* ipkg_utils.h - the itsy package management system
 +
@@ -6612,7 +6612,7 @@ diff -Nur busybox-1.21.1.orig/archival/libipkg/ipkg_utils.h busybox-1.21.1/archi
 +#endif
 diff -Nur busybox-1.21.1.orig/archival/libipkg/Kbuild busybox-1.21.1/archival/libipkg/Kbuild
 --- busybox-1.21.1.orig/archival/libipkg/Kbuild	1970-01-01 01:00:00.000000000 +0100
-+++ busybox-1.21.1/archival/libipkg/Kbuild	2014-02-17 14:25:39.862534201 +0100
++++ busybox-1.21.1/archival/libipkg/Kbuild	2014-04-07 12:36:32.415575413 +0200
 @@ -0,0 +1,60 @@
 +# Makefile for busybox
 +#
@@ -6676,7 +6676,7 @@ diff -Nur busybox-1.21.1.orig/archival/libipkg/Kbuild busybox-1.21.1/archival/li
 +CFLAGS += -DIPKGLIBDIR="\"/usr/lib\"" -DHOST_CPU_STR="\"$(IPKG_ARCH)\""
 diff -Nur busybox-1.21.1.orig/archival/libipkg/libipkg.c busybox-1.21.1/archival/libipkg/libipkg.c
 --- busybox-1.21.1.orig/archival/libipkg/libipkg.c	1970-01-01 01:00:00.000000000 +0100
-+++ busybox-1.21.1/archival/libipkg/libipkg.c	2014-02-17 14:25:39.862534201 +0100
++++ busybox-1.21.1/archival/libipkg/libipkg.c	2014-04-07 12:36:32.415575413 +0200
 @@ -0,0 +1,583 @@
 +/* ipkglib.c - the itsy package management system
 +
@@ -7263,7 +7263,7 @@ diff -Nur busybox-1.21.1.orig/archival/libipkg/libipkg.c busybox-1.21.1/archival
 +}
 diff -Nur busybox-1.21.1.orig/archival/libipkg/libipkg.h busybox-1.21.1/archival/libipkg/libipkg.h
 --- busybox-1.21.1.orig/archival/libipkg/libipkg.h	1970-01-01 01:00:00.000000000 +0100
-+++ busybox-1.21.1/archival/libipkg/libipkg.h	2014-02-17 14:25:39.862534201 +0100
++++ busybox-1.21.1/archival/libipkg/libipkg.h	2014-04-07 12:36:32.415575413 +0200
 @@ -0,0 +1,78 @@
 +/* ipkglib.h - the itsy package management system
 +
@@ -7345,7 +7345,7 @@ diff -Nur busybox-1.21.1.orig/archival/libipkg/libipkg.h busybox-1.21.1/archival
 +#endif
 diff -Nur busybox-1.21.1.orig/archival/libipkg/nv_pair.c busybox-1.21.1/archival/libipkg/nv_pair.c
 --- busybox-1.21.1.orig/archival/libipkg/nv_pair.c	1970-01-01 01:00:00.000000000 +0100
-+++ busybox-1.21.1/archival/libipkg/nv_pair.c	2014-02-17 14:25:39.862534201 +0100
++++ busybox-1.21.1/archival/libipkg/nv_pair.c	2014-04-07 12:36:32.415575413 +0200
 @@ -0,0 +1,40 @@
 +/* nv_pair.c - the itsy package management system
 +
@@ -7389,7 +7389,7 @@ diff -Nur busybox-1.21.1.orig/archival/libipkg/nv_pair.c busybox-1.21.1/archival
 +
 diff -Nur busybox-1.21.1.orig/archival/libipkg/nv_pair.h busybox-1.21.1/archival/libipkg/nv_pair.h
 --- busybox-1.21.1.orig/archival/libipkg/nv_pair.h	1970-01-01 01:00:00.000000000 +0100
-+++ busybox-1.21.1/archival/libipkg/nv_pair.h	2014-02-17 14:25:39.862534201 +0100
++++ busybox-1.21.1/archival/libipkg/nv_pair.h	2014-04-07 12:36:32.415575413 +0200
 @@ -0,0 +1,32 @@
 +/* nv_pair.h - the itsy package management system
 +
@@ -7425,7 +7425,7 @@ diff -Nur busybox-1.21.1.orig/archival/libipkg/nv_pair.h busybox-1.21.1/archival
 +
 diff -Nur busybox-1.21.1.orig/archival/libipkg/nv_pair_list.c busybox-1.21.1/archival/libipkg/nv_pair_list.c
 --- busybox-1.21.1.orig/archival/libipkg/nv_pair_list.c	1970-01-01 01:00:00.000000000 +0100
-+++ busybox-1.21.1/archival/libipkg/nv_pair_list.c	2014-02-17 14:25:39.862534201 +0100
++++ busybox-1.21.1/archival/libipkg/nv_pair_list.c	2014-04-07 12:36:32.415575413 +0200
 @@ -0,0 +1,98 @@
 +/* nv_pair_list.c - the itsy package management system
 +
@@ -7527,7 +7527,7 @@ diff -Nur busybox-1.21.1.orig/archival/libipkg/nv_pair_list.c busybox-1.21.1/arc
 +}
 diff -Nur busybox-1.21.1.orig/archival/libipkg/nv_pair_list.h busybox-1.21.1/archival/libipkg/nv_pair_list.h
 --- busybox-1.21.1.orig/archival/libipkg/nv_pair_list.h	1970-01-01 01:00:00.000000000 +0100
-+++ busybox-1.21.1/archival/libipkg/nv_pair_list.h	2014-02-17 14:25:39.862534201 +0100
++++ busybox-1.21.1/archival/libipkg/nv_pair_list.h	2014-04-07 12:36:32.415575413 +0200
 @@ -0,0 +1,60 @@
 +/* nv_pair_list.h - the itsy package management system
 +
@@ -7591,7 +7591,7 @@ diff -Nur busybox-1.21.1.orig/archival/libipkg/nv_pair_list.h busybox-1.21.1/arc
 +
 diff -Nur busybox-1.21.1.orig/archival/libipkg/pkg.c busybox-1.21.1/archival/libipkg/pkg.c
 --- busybox-1.21.1.orig/archival/libipkg/pkg.c	1970-01-01 01:00:00.000000000 +0100
-+++ busybox-1.21.1/archival/libipkg/pkg.c	2014-02-17 14:25:39.862534201 +0100
++++ busybox-1.21.1/archival/libipkg/pkg.c	2014-04-07 12:36:32.415575413 +0200
 @@ -0,0 +1,1757 @@
 +/* pkg.c - the itsy package management system
 +
@@ -9352,7 +9352,7 @@ diff -Nur busybox-1.21.1.orig/archival/libipkg/pkg.c busybox-1.21.1/archival/lib
 +}
 diff -Nur busybox-1.21.1.orig/archival/libipkg/pkg_depends.c busybox-1.21.1/archival/libipkg/pkg_depends.c
 --- busybox-1.21.1.orig/archival/libipkg/pkg_depends.c	1970-01-01 01:00:00.000000000 +0100
-+++ busybox-1.21.1/archival/libipkg/pkg_depends.c	2014-02-17 14:25:39.862534201 +0100
++++ busybox-1.21.1/archival/libipkg/pkg_depends.c	2014-04-07 12:36:32.415575413 +0200
 @@ -0,0 +1,1032 @@
 +/* pkg_depends.c - the itsy package management system
 +
@@ -10388,7 +10388,7 @@ diff -Nur busybox-1.21.1.orig/archival/libipkg/pkg_depends.c busybox-1.21.1/arch
 +}
 diff -Nur busybox-1.21.1.orig/archival/libipkg/pkg_depends.h busybox-1.21.1/archival/libipkg/pkg_depends.h
 --- busybox-1.21.1.orig/archival/libipkg/pkg_depends.h	1970-01-01 01:00:00.000000000 +0100
-+++ busybox-1.21.1/archival/libipkg/pkg_depends.h	2014-02-17 14:25:39.862534201 +0100
++++ busybox-1.21.1/archival/libipkg/pkg_depends.h	2014-04-07 12:36:32.415575413 +0200
 @@ -0,0 +1,105 @@
 +/* pkg_depends.h - the itsy package management system
 +
@@ -10497,7 +10497,7 @@ diff -Nur busybox-1.21.1.orig/archival/libipkg/pkg_depends.h busybox-1.21.1/arch
 +#endif
 diff -Nur busybox-1.21.1.orig/archival/libipkg/pkg_dest.c busybox-1.21.1/archival/libipkg/pkg_dest.c
 --- busybox-1.21.1.orig/archival/libipkg/pkg_dest.c	1970-01-01 01:00:00.000000000 +0100
-+++ busybox-1.21.1/archival/libipkg/pkg_dest.c	2014-02-17 14:25:39.862534201 +0100
++++ busybox-1.21.1/archival/libipkg/pkg_dest.c	2014-04-07 12:36:32.419575442 +0200
 @@ -0,0 +1,92 @@
 +/* pkg_dest.c - the itsy package management system
 +
@@ -10593,7 +10593,7 @@ diff -Nur busybox-1.21.1.orig/archival/libipkg/pkg_dest.c busybox-1.21.1/archiva
 +}
 diff -Nur busybox-1.21.1.orig/archival/libipkg/pkg_dest.h busybox-1.21.1/archival/libipkg/pkg_dest.h
 --- busybox-1.21.1.orig/archival/libipkg/pkg_dest.h	1970-01-01 01:00:00.000000000 +0100
-+++ busybox-1.21.1/archival/libipkg/pkg_dest.h	2014-02-17 14:25:39.862534201 +0100
++++ busybox-1.21.1/archival/libipkg/pkg_dest.h	2014-04-07 12:36:32.419575442 +0200
 @@ -0,0 +1,38 @@
 +/* pkg_dest.h - the itsy package management system
 +
@@ -10635,7 +10635,7 @@ diff -Nur busybox-1.21.1.orig/archival/libipkg/pkg_dest.h busybox-1.21.1/archiva
 +
 diff -Nur busybox-1.21.1.orig/archival/libipkg/pkg_dest_list.c busybox-1.21.1/archival/libipkg/pkg_dest_list.c
 --- busybox-1.21.1.orig/archival/libipkg/pkg_dest_list.c	1970-01-01 01:00:00.000000000 +0100
-+++ busybox-1.21.1/archival/libipkg/pkg_dest_list.c	2014-02-17 14:25:39.862534201 +0100
++++ busybox-1.21.1/archival/libipkg/pkg_dest_list.c	2014-04-07 12:36:32.419575442 +0200
 @@ -0,0 +1,85 @@
 +/* pkg_dest_list.c - the itsy package management system
 +
@@ -10724,7 +10724,7 @@ diff -Nur busybox-1.21.1.orig/archival/libipkg/pkg_dest_list.c busybox-1.21.1/ar
 +}
 diff -Nur busybox-1.21.1.orig/archival/libipkg/pkg_dest_list.h busybox-1.21.1/archival/libipkg/pkg_dest_list.h
 --- busybox-1.21.1.orig/archival/libipkg/pkg_dest_list.h	1970-01-01 01:00:00.000000000 +0100
-+++ busybox-1.21.1/archival/libipkg/pkg_dest_list.h	2014-02-17 14:25:39.862534201 +0100
++++ busybox-1.21.1/archival/libipkg/pkg_dest_list.h	2014-04-07 12:36:32.419575442 +0200
 @@ -0,0 +1,50 @@
 +/* pkg_dest_list.h - the itsy package management system
 +
@@ -10778,7 +10778,7 @@ diff -Nur busybox-1.21.1.orig/archival/libipkg/pkg_dest_list.h busybox-1.21.1/ar
 +
 diff -Nur busybox-1.21.1.orig/archival/libipkg/pkg_extract.c busybox-1.21.1/archival/libipkg/pkg_extract.c
 --- busybox-1.21.1.orig/archival/libipkg/pkg_extract.c	1970-01-01 01:00:00.000000000 +0100
-+++ busybox-1.21.1/archival/libipkg/pkg_extract.c	2014-02-17 14:25:39.862534201 +0100
++++ busybox-1.21.1/archival/libipkg/pkg_extract.c	2014-04-07 12:36:32.419575442 +0200
 @@ -0,0 +1,255 @@
 +/* pkg_extract.c - the itsy package management system
 +
@@ -11037,7 +11037,7 @@ diff -Nur busybox-1.21.1.orig/archival/libipkg/pkg_extract.c busybox-1.21.1/arch
 +}
 diff -Nur busybox-1.21.1.orig/archival/libipkg/pkg_extract.h busybox-1.21.1/archival/libipkg/pkg_extract.h
 --- busybox-1.21.1.orig/archival/libipkg/pkg_extract.h	1970-01-01 01:00:00.000000000 +0100
-+++ busybox-1.21.1/archival/libipkg/pkg_extract.h	2014-02-17 14:25:39.862534201 +0100
++++ busybox-1.21.1/archival/libipkg/pkg_extract.h	2014-04-07 12:36:32.419575442 +0200
 @@ -0,0 +1,32 @@
 +/* pkg_extract.c - the itsy package management system
 +
@@ -11073,7 +11073,7 @@ diff -Nur busybox-1.21.1.orig/archival/libipkg/pkg_extract.h busybox-1.21.1/arch
 +#endif
 diff -Nur busybox-1.21.1.orig/archival/libipkg/pkg.h busybox-1.21.1/archival/libipkg/pkg.h
 --- busybox-1.21.1.orig/archival/libipkg/pkg.h	1970-01-01 01:00:00.000000000 +0100
-+++ busybox-1.21.1/archival/libipkg/pkg.h	2014-02-17 14:25:39.862534201 +0100
++++ busybox-1.21.1/archival/libipkg/pkg.h	2014-04-07 12:36:32.419575442 +0200
 @@ -0,0 +1,229 @@
 +/* pkg.h - the itsy package management system
 +
@@ -11306,7 +11306,7 @@ diff -Nur busybox-1.21.1.orig/archival/libipkg/pkg.h busybox-1.21.1/archival/lib
 +#endif
 diff -Nur busybox-1.21.1.orig/archival/libipkg/pkg_hash.c busybox-1.21.1/archival/libipkg/pkg_hash.c
 --- busybox-1.21.1.orig/archival/libipkg/pkg_hash.c	1970-01-01 01:00:00.000000000 +0100
-+++ busybox-1.21.1/archival/libipkg/pkg_hash.c	2014-02-17 14:25:39.862534201 +0100
++++ busybox-1.21.1/archival/libipkg/pkg_hash.c	2014-04-07 12:36:32.419575442 +0200
 @@ -0,0 +1,623 @@
 +/* ipkg_hash.c - the itsy package management system
 +
@@ -11933,7 +11933,7 @@ diff -Nur busybox-1.21.1.orig/archival/libipkg/pkg_hash.c busybox-1.21.1/archiva
 +
 diff -Nur busybox-1.21.1.orig/archival/libipkg/pkg_hash.h busybox-1.21.1/archival/libipkg/pkg_hash.h
 --- busybox-1.21.1.orig/archival/libipkg/pkg_hash.h	1970-01-01 01:00:00.000000000 +0100
-+++ busybox-1.21.1/archival/libipkg/pkg_hash.h	2014-02-17 14:25:39.862534201 +0100
++++ busybox-1.21.1/archival/libipkg/pkg_hash.h	2014-04-07 12:36:32.419575442 +0200
 @@ -0,0 +1,61 @@
 +/* pkg_hash.h - the itsy package management system
 +
@@ -11998,7 +11998,7 @@ diff -Nur busybox-1.21.1.orig/archival/libipkg/pkg_hash.h busybox-1.21.1/archiva
 +
 diff -Nur busybox-1.21.1.orig/archival/libipkg/pkg_parse.c busybox-1.21.1/archival/libipkg/pkg_parse.c
 --- busybox-1.21.1.orig/archival/libipkg/pkg_parse.c	1970-01-01 01:00:00.000000000 +0100
-+++ busybox-1.21.1/archival/libipkg/pkg_parse.c	2014-02-17 14:25:39.866534213 +0100
++++ busybox-1.21.1/archival/libipkg/pkg_parse.c	2014-04-07 12:36:32.419575442 +0200
 @@ -0,0 +1,368 @@
 +/* pkg_parse.c - the itsy package management system
 +
@@ -12370,7 +12370,7 @@ diff -Nur busybox-1.21.1.orig/archival/libipkg/pkg_parse.c busybox-1.21.1/archiv
 +}
 diff -Nur busybox-1.21.1.orig/archival/libipkg/pkg_parse.h busybox-1.21.1/archival/libipkg/pkg_parse.h
 --- busybox-1.21.1.orig/archival/libipkg/pkg_parse.h	1970-01-01 01:00:00.000000000 +0100
-+++ busybox-1.21.1/archival/libipkg/pkg_parse.h	2014-02-17 14:25:39.866534213 +0100
++++ busybox-1.21.1/archival/libipkg/pkg_parse.h	2014-04-07 12:36:32.419575442 +0200
 @@ -0,0 +1,31 @@
 +/* pkg_parse.h - the itsy package management system
 +
@@ -12405,7 +12405,7 @@ diff -Nur busybox-1.21.1.orig/archival/libipkg/pkg_parse.h busybox-1.21.1/archiv
 +#endif
 diff -Nur busybox-1.21.1.orig/archival/libipkg/pkg_src.c busybox-1.21.1/archival/libipkg/pkg_src.c
 --- busybox-1.21.1.orig/archival/libipkg/pkg_src.c	1970-01-01 01:00:00.000000000 +0100
-+++ busybox-1.21.1/archival/libipkg/pkg_src.c	2014-02-17 14:25:39.866534213 +0100
++++ busybox-1.21.1/archival/libipkg/pkg_src.c	2014-04-07 12:36:32.419575442 +0200
 @@ -0,0 +1,43 @@
 +/* pkg_src.c - the itsy package management system
 +
@@ -12452,7 +12452,7 @@ diff -Nur busybox-1.21.1.orig/archival/libipkg/pkg_src.c busybox-1.21.1/archival
 +
 diff -Nur busybox-1.21.1.orig/archival/libipkg/pkg_src.h busybox-1.21.1/archival/libipkg/pkg_src.h
 --- busybox-1.21.1.orig/archival/libipkg/pkg_src.h	1970-01-01 01:00:00.000000000 +0100
-+++ busybox-1.21.1/archival/libipkg/pkg_src.h	2014-02-17 14:25:39.866534213 +0100
++++ busybox-1.21.1/archival/libipkg/pkg_src.h	2014-04-07 12:36:32.419575442 +0200
 @@ -0,0 +1,34 @@
 +/* pkg_src.h - the itsy package management system
 +
@@ -12490,7 +12490,7 @@ diff -Nur busybox-1.21.1.orig/archival/libipkg/pkg_src.h busybox-1.21.1/archival
 +#endif
 diff -Nur busybox-1.21.1.orig/archival/libipkg/pkg_src_list.c busybox-1.21.1/archival/libipkg/pkg_src_list.c
 --- busybox-1.21.1.orig/archival/libipkg/pkg_src_list.c	1970-01-01 01:00:00.000000000 +0100
-+++ busybox-1.21.1/archival/libipkg/pkg_src_list.c	2014-02-17 14:25:39.866534213 +0100
++++ busybox-1.21.1/archival/libipkg/pkg_src_list.c	2014-04-07 12:36:32.419575442 +0200
 @@ -0,0 +1,75 @@
 +/* pkg_src_list.c - the itsy package management system
 +
@@ -12569,7 +12569,7 @@ diff -Nur busybox-1.21.1.orig/archival/libipkg/pkg_src_list.c busybox-1.21.1/arc
 +}
 diff -Nur busybox-1.21.1.orig/archival/libipkg/pkg_src_list.h busybox-1.21.1/archival/libipkg/pkg_src_list.h
 --- busybox-1.21.1.orig/archival/libipkg/pkg_src_list.h	1970-01-01 01:00:00.000000000 +0100
-+++ busybox-1.21.1/archival/libipkg/pkg_src_list.h	2014-02-17 14:25:39.866534213 +0100
++++ busybox-1.21.1/archival/libipkg/pkg_src_list.h	2014-04-07 12:36:32.419575442 +0200
 @@ -0,0 +1,57 @@
 +/* pkg_src_list.h - the itsy package management system
 +
@@ -12630,7 +12630,7 @@ diff -Nur busybox-1.21.1.orig/archival/libipkg/pkg_src_list.h busybox-1.21.1/arc
 +
 diff -Nur busybox-1.21.1.orig/archival/libipkg/pkg_vec.c busybox-1.21.1/archival/libipkg/pkg_vec.c
 --- busybox-1.21.1.orig/archival/libipkg/pkg_vec.c	1970-01-01 01:00:00.000000000 +0100
-+++ busybox-1.21.1/archival/libipkg/pkg_vec.c	2014-02-17 14:25:39.866534213 +0100
++++ busybox-1.21.1/archival/libipkg/pkg_vec.c	2014-04-07 12:36:32.419575442 +0200
 @@ -0,0 +1,231 @@
 +/* pkg_vec.c - the itsy package management system
 +
@@ -12865,7 +12865,7 @@ diff -Nur busybox-1.21.1.orig/archival/libipkg/pkg_vec.c busybox-1.21.1/archival
 +
 diff -Nur busybox-1.21.1.orig/archival/libipkg/pkg_vec.h busybox-1.21.1/archival/libipkg/pkg_vec.h
 --- busybox-1.21.1.orig/archival/libipkg/pkg_vec.h	1970-01-01 01:00:00.000000000 +0100
-+++ busybox-1.21.1/archival/libipkg/pkg_vec.h	2014-02-17 14:25:39.866534213 +0100
++++ busybox-1.21.1/archival/libipkg/pkg_vec.h	2014-04-07 12:36:32.419575442 +0200
 @@ -0,0 +1,62 @@
 +/* pkg_vec.h - the itsy package management system
 +
@@ -12931,7 +12931,7 @@ diff -Nur busybox-1.21.1.orig/archival/libipkg/pkg_vec.h busybox-1.21.1/archival
 +
 diff -Nur busybox-1.21.1.orig/archival/libipkg/sprintf_alloc.h busybox-1.21.1/archival/libipkg/sprintf_alloc.h
 --- busybox-1.21.1.orig/archival/libipkg/sprintf_alloc.h	1970-01-01 01:00:00.000000000 +0100
-+++ busybox-1.21.1/archival/libipkg/sprintf_alloc.h	2014-02-17 14:25:39.866534213 +0100
++++ busybox-1.21.1/archival/libipkg/sprintf_alloc.h	2014-04-07 12:36:32.419575442 +0200
 @@ -0,0 +1,25 @@
 +/* sprintf_alloca.c -- like sprintf with memory allocation
 +
@@ -12960,7 +12960,7 @@ diff -Nur busybox-1.21.1.orig/archival/libipkg/sprintf_alloc.h busybox-1.21.1/ar
 +#endif
 diff -Nur busybox-1.21.1.orig/archival/libipkg/str_list.c busybox-1.21.1/archival/libipkg/str_list.c
 --- busybox-1.21.1.orig/archival/libipkg/str_list.c	1970-01-01 01:00:00.000000000 +0100
-+++ busybox-1.21.1/archival/libipkg/str_list.c	2014-02-17 14:25:39.866534213 +0100
++++ busybox-1.21.1/archival/libipkg/str_list.c	2014-04-07 12:36:32.419575442 +0200
 @@ -0,0 +1,76 @@
 +/* str_list.c - the itsy package management system
 +
@@ -13040,7 +13040,7 @@ diff -Nur busybox-1.21.1.orig/archival/libipkg/str_list.c busybox-1.21.1/archiva
 +}
 diff -Nur busybox-1.21.1.orig/archival/libipkg/str_list.h busybox-1.21.1/archival/libipkg/str_list.h
 --- busybox-1.21.1.orig/archival/libipkg/str_list.h	1970-01-01 01:00:00.000000000 +0100
-+++ busybox-1.21.1/archival/libipkg/str_list.h	2014-02-17 14:25:39.866534213 +0100
++++ busybox-1.21.1/archival/libipkg/str_list.h	2014-04-07 12:36:32.419575442 +0200
 @@ -0,0 +1,51 @@
 +/* str_list.h - the itsy package management system
 +
@@ -13095,7 +13095,7 @@ diff -Nur busybox-1.21.1.orig/archival/libipkg/str_list.h busybox-1.21.1/archiva
 +#endif
 diff -Nur busybox-1.21.1.orig/archival/libipkg/str_util.c busybox-1.21.1/archival/libipkg/str_util.c
 --- busybox-1.21.1.orig/archival/libipkg/str_util.c	1970-01-01 01:00:00.000000000 +0100
-+++ busybox-1.21.1/archival/libipkg/str_util.c	2014-02-17 14:25:39.866534213 +0100
++++ busybox-1.21.1/archival/libipkg/str_util.c	2014-04-07 12:36:32.419575442 +0200
 @@ -0,0 +1,69 @@
 +/* str_utils.c - the itsy package management system
 +
@@ -13168,7 +13168,7 @@ diff -Nur busybox-1.21.1.orig/archival/libipkg/str_util.c busybox-1.21.1/archiva
 +
 diff -Nur busybox-1.21.1.orig/archival/libipkg/str_util.h busybox-1.21.1/archival/libipkg/str_util.h
 --- busybox-1.21.1.orig/archival/libipkg/str_util.h	1970-01-01 01:00:00.000000000 +0100
-+++ busybox-1.21.1/archival/libipkg/str_util.h	2014-02-17 14:25:39.866534213 +0100
++++ busybox-1.21.1/archival/libipkg/str_util.h	2014-04-07 12:36:32.419575442 +0200
 @@ -0,0 +1,27 @@
 +/* str_utils.h - the itsy package management system
 +
@@ -13199,7 +13199,7 @@ diff -Nur busybox-1.21.1.orig/archival/libipkg/str_util.h busybox-1.21.1/archiva
 +#endif
 diff -Nur busybox-1.21.1.orig/archival/libipkg/user.c busybox-1.21.1/archival/libipkg/user.c
 --- busybox-1.21.1.orig/archival/libipkg/user.c	1970-01-01 01:00:00.000000000 +0100
-+++ busybox-1.21.1/archival/libipkg/user.c	2014-02-17 14:25:39.866534213 +0100
++++ busybox-1.21.1/archival/libipkg/user.c	2014-04-07 12:36:32.419575442 +0200
 @@ -0,0 +1,49 @@
 +/* user.c - the itsy package management system
 +
@@ -13252,7 +13252,7 @@ diff -Nur busybox-1.21.1.orig/archival/libipkg/user.c busybox-1.21.1/archival/li
 +}
 diff -Nur busybox-1.21.1.orig/archival/libipkg/user.h busybox-1.21.1/archival/libipkg/user.h
 --- busybox-1.21.1.orig/archival/libipkg/user.h	1970-01-01 01:00:00.000000000 +0100
-+++ busybox-1.21.1/archival/libipkg/user.h	2014-02-17 14:25:39.866534213 +0100
++++ busybox-1.21.1/archival/libipkg/user.h	2014-04-07 12:36:32.419575442 +0200
 @@ -0,0 +1,23 @@
 +/* user.c - the itsy package management system
 +
@@ -13279,7 +13279,7 @@ diff -Nur busybox-1.21.1.orig/archival/libipkg/user.h busybox-1.21.1/archival/li
 +
 diff -Nur busybox-1.21.1.orig/archival/libipkg/void_list.c busybox-1.21.1/archival/libipkg/void_list.c
 --- busybox-1.21.1.orig/archival/libipkg/void_list.c	1970-01-01 01:00:00.000000000 +0100
-+++ busybox-1.21.1/archival/libipkg/void_list.c	2014-02-17 14:25:39.886534275 +0100
++++ busybox-1.21.1/archival/libipkg/void_list.c	2014-04-07 12:36:32.423575470 +0200
 @@ -0,0 +1,194 @@
 +/* void_list.c - the itsy package management system
 +
@@ -13477,7 +13477,7 @@ diff -Nur busybox-1.21.1.orig/archival/libipkg/void_list.c busybox-1.21.1/archiv
 +}
 diff -Nur busybox-1.21.1.orig/archival/libipkg/void_list.h busybox-1.21.1/archival/libipkg/void_list.h
 --- busybox-1.21.1.orig/archival/libipkg/void_list.h	1970-01-01 01:00:00.000000000 +0100
-+++ busybox-1.21.1/archival/libipkg/void_list.h	2014-02-17 14:25:39.886534275 +0100
++++ busybox-1.21.1/archival/libipkg/void_list.h	2014-04-07 12:36:32.423575470 +0200
 @@ -0,0 +1,59 @@
 +/* void_list.h - the itsy package management system
 +
@@ -13540,7 +13540,7 @@ diff -Nur busybox-1.21.1.orig/archival/libipkg/void_list.h busybox-1.21.1/archiv
 +#endif
 diff -Nur busybox-1.21.1.orig/archival/libipkg/xsystem.c busybox-1.21.1/archival/libipkg/xsystem.c
 --- busybox-1.21.1.orig/archival/libipkg/xsystem.c	1970-01-01 01:00:00.000000000 +0100
-+++ busybox-1.21.1/archival/libipkg/xsystem.c	2014-02-17 14:25:39.886534275 +0100
++++ busybox-1.21.1/archival/libipkg/xsystem.c	2014-04-07 12:36:32.423575470 +0200
 @@ -0,0 +1,64 @@
 +/* xsystem.c - system(3) with error messages
 +
@@ -13608,7 +13608,7 @@ diff -Nur busybox-1.21.1.orig/archival/libipkg/xsystem.c busybox-1.21.1/archival
 +	 
 diff -Nur busybox-1.21.1.orig/archival/libipkg/xsystem.h busybox-1.21.1/archival/libipkg/xsystem.h
 --- busybox-1.21.1.orig/archival/libipkg/xsystem.h	1970-01-01 01:00:00.000000000 +0100
-+++ busybox-1.21.1/archival/libipkg/xsystem.h	2014-02-17 14:25:39.890534287 +0100
++++ busybox-1.21.1/archival/libipkg/xsystem.h	2014-04-07 12:36:32.423575470 +0200
 @@ -0,0 +1,34 @@
 +/* xsystem.h - system(3) with error messages
 +
@@ -13646,7 +13646,7 @@ diff -Nur busybox-1.21.1.orig/archival/libipkg/xsystem.h busybox-1.21.1/archival
 +	 
 diff -Nur busybox-1.21.1.orig/include/applets.src.h busybox-1.21.1/include/applets.src.h
 --- busybox-1.21.1.orig/include/applets.src.h	2013-06-29 16:58:06.000000000 +0200
-+++ busybox-1.21.1/include/applets.src.h	2014-02-17 14:25:39.890534287 +0100
++++ busybox-1.21.1/include/applets.src.h	2014-04-07 12:36:32.423575470 +0200
 @@ -199,6 +199,7 @@
  IF_IPCALC(APPLET(ipcalc, BB_DIR_BIN, BB_SUID_DROP))
  IF_IPCRM(APPLET(ipcrm, BB_DIR_USR_BIN, BB_SUID_DROP))
@@ -13657,17 +13657,22 @@ diff -Nur busybox-1.21.1.orig/include/applets.src.h busybox-1.21.1/include/apple
  IF_IPRULE(APPLET(iprule, BB_DIR_SBIN, BB_SUID_DROP))
 diff -Nur busybox-1.21.1.orig/include/bb_archive.h busybox-1.21.1/include/bb_archive.h
 --- busybox-1.21.1.orig/include/bb_archive.h	2013-06-29 16:58:06.000000000 +0200
-+++ busybox-1.21.1/include/bb_archive.h	2014-02-17 14:25:39.890534287 +0100
-@@ -79,7 +79,7 @@
++++ busybox-1.21.1/include/bb_archive.h	2014-04-07 12:37:05.279788781 +0200
+@@ -79,7 +79,6 @@
  	/* Archiver specific. Can make it a union if it ever gets big */
  #define PAX_NEXT_FILE 0
  #define PAX_GLOBAL    1
 -#if ENABLE_TAR || ENABLE_DPKG || ENABLE_DPKG_DEB
-+#if ENABLE_TAR || ENABLE_DPKG || ENABLE_DPKG_DEB || ENABLE_IPKG
  	smallint tar__end;
  # if ENABLE_FEATURE_TAR_GNU_EXTENSIONS
  	char* tar__longname;
-@@ -98,7 +98,7 @@
+@@ -92,13 +91,12 @@
+ # if ENABLE_FEATURE_TAR_SELINUX
+ 	char* tar__sctx[2];
+ # endif
+-#endif
+ #if ENABLE_CPIO || ENABLE_RPM2CPIO || ENABLE_RPM
+ 	uoff_t cpio__blocks;
  	struct hardlinks_t *cpio__hardlinks_to_create;
  	struct hardlinks_t *cpio__created_hardlinks;
  #endif
@@ -13678,7 +13683,7 @@ diff -Nur busybox-1.21.1.orig/include/bb_archive.h busybox-1.21.1/include/bb_arc
  	/* How to process any sub archive, e.g. get_header_tar_gz */
 diff -Nur busybox-1.21.1.orig/include/usage.src.h busybox-1.21.1/include/usage.src.h
 --- busybox-1.21.1.orig/include/usage.src.h	2013-05-12 01:30:43.000000000 +0200
-+++ busybox-1.21.1/include/usage.src.h	2014-02-17 14:25:39.890534287 +0100
++++ busybox-1.21.1/include/usage.src.h	2014-04-07 12:36:32.423575470 +0200
 @@ -19,4 +19,80 @@
  #define busybox_notes_usage \
         "Hello world!\n"
@@ -13762,7 +13767,7 @@ diff -Nur busybox-1.21.1.orig/include/usage.src.h busybox-1.21.1/include/usage.s
  #endif
 diff -Nur busybox-1.21.1.orig/Makefile busybox-1.21.1/Makefile
 --- busybox-1.21.1.orig/Makefile	2013-06-29 17:00:18.000000000 +0200
-+++ busybox-1.21.1/Makefile	2014-02-17 14:25:39.890534287 +0100
++++ busybox-1.21.1/Makefile	2014-04-07 12:36:32.423575470 +0200
 @@ -466,6 +466,7 @@
  libs-y		:= \
  		archival/ \
-- 
cgit v1.2.3


From d63d9df8e5c245214fbd94856773eba4b0c731cf Mon Sep 17 00:00:00 2001
From: Waldemar Brodkorb <wbx@openadk.org>
Date: Mon, 7 Apr 2014 14:37:00 +0200
Subject: add gold support

---
 mk/build.mk                   |  5 +++--
 mk/vars.mk                    |  4 ++--
 package/avahi/Makefile        |  2 +-
 package/dansguardian/Makefile |  2 +-
 package/dmidecode/Makefile    |  2 +-
 package/fltk/Makefile         |  2 +-
 package/gcc/Makefile          |  7 -------
 package/id3lib/Makefile       |  2 +-
 package/iperf/Makefile        |  2 +-
 package/mrd6/Makefile         |  2 +-
 package/net-tools/Makefile    |  2 +-
 package/nmap/Makefile         |  2 +-
 package/openssh/Makefile      |  2 +-
 package/sudo/Makefile         |  2 +-
 toolchain/Config.in           | 27 +++++++++++++++++++--------
 toolchain/binutils/Makefile   | 14 +++++++++++++-
 toolchain/gcc/Makefile        |  9 ++++++++-
 17 files changed, 56 insertions(+), 32 deletions(-)

diff --git a/mk/build.mk b/mk/build.mk
index af1313206..2573027e7 100644
--- a/mk/build.mk
+++ b/mk/build.mk
@@ -41,8 +41,9 @@ DEFCONFIG=		ADK_DEBUG=n \
 			ADK_PKG_TEST=n \
 			ADK_PKG_MPDBOX=n \
 			ADK_PKG_DEVELOPMENT=n \
-			ADK_TOOLCHAIN_GCC_USE_SSP=n \
-			ADK_TOOLCHAIN_GCC_USE_LTO=n \
+			ADK_TOOLCHAIN_USE_SSP=n \
+			ADK_TOOLCHAIN_USE_LTO=n \
+			ADK_TOOLCHAIN_USE_GOLD=n \
 			BUSYBOX_IFPLUGD=n \
 			BUSYBOX_EXTRA_COMPAT=n \
 			BUSYBOX_FEATURE_IFCONFIG_SLIP=n \
diff --git a/mk/vars.mk b/mk/vars.mk
index 49eb3e7e3..2f2ecc134 100644
--- a/mk/vars.mk
+++ b/mk/vars.mk
@@ -117,13 +117,13 @@ TARGET_CXXFLAGS+=	-static
 TARGET_LDFLAGS+=	-static
 endif
 
-ifneq ($(ADK_TOOLCHAIN_GCC_USE_SSP),)
+ifneq ($(ADK_TOOLCHAIN_USE_SSP),)
 TARGET_CFLAGS+=		-fstack-protector
 TARGET_CXXFLAGS+=	-fstack-protector
 TARGET_LDFLAGS+=	-fstack-protector
 endif
 
-ifneq ($(ADK_TOOLCHAIN_GCC_USE_LTO),)
+ifneq ($(ADK_TOOLCHAIN_USE_LTO),)
 TARGET_CFLAGS+=		-flto
 TARGET_CXXFLAGS+=	-flto
 TARGET_LDFLAGS+=	-flto
diff --git a/package/avahi/Makefile b/package/avahi/Makefile
index bd203e79e..a79afbb20 100644
--- a/package/avahi/Makefile
+++ b/package/avahi/Makefile
@@ -61,7 +61,7 @@ CONFIGURE_ARGS+=	--enable-glib \
 			--with-avahi-user=avahi \
 			--with-avahi-group=avahi
 
-ifeq ($(ADK_TOOLCHAIN_GCC_USE_SSP),y)
+ifeq ($(ADK_TOOLCHAIN_USE_SSP),y)
 CONFIGURE_ARGS+=	--enable-stack-protector
 else
 CONFIGURE_ARGS+=	--disable-stack-protector
diff --git a/package/dansguardian/Makefile b/package/dansguardian/Makefile
index 711bf0edb..fd7142d5f 100644
--- a/package/dansguardian/Makefile
+++ b/package/dansguardian/Makefile
@@ -26,7 +26,7 @@ ifeq ($(ADK_COMPILE_DANSGUARDIAN_WITH_UCLIBCXX),y)
 LIBRARIES:=-nodefaultlibs -luClibc++ -lgcc -lm -lc -lgcc_s
 endif
 
-ifeq ($(ADK_TOOLCHAIN_GCC_USE_SSP),y)
+ifeq ($(ADK_TOOLCHAIN_USE_SSP),y)
 LIBRARIES+=-lssp
 endif
 
diff --git a/package/dmidecode/Makefile b/package/dmidecode/Makefile
index 8829c91b2..4eb004dc7 100644
--- a/package/dmidecode/Makefile
+++ b/package/dmidecode/Makefile
@@ -18,7 +18,7 @@ $(eval $(call PKG_template,DMIDECODE,dmidecode,$(PKG_VERSION)-${PKG_RELEASE},${P
 
 CONFIG_STYLE:=		manual
 
-ifeq ($(ADK_TOOLCHAIN_GCC_USE_SSP),y)
+ifeq ($(ADK_TOOLCHAIN_USE_SSP),y)
 TARGET_LDFLAGS+=        -lssp
 endif
 
diff --git a/package/fltk/Makefile b/package/fltk/Makefile
index 00795d0b6..d294570b2 100644
--- a/package/fltk/Makefile
+++ b/package/fltk/Makefile
@@ -30,7 +30,7 @@ ifeq ($(ADK_COMPILE_LIBFLTK_WITH_UCLIBCXX),y)
 LIBRARIES:=-nodefaultlibs -luClibc++ -lgcc -lgcc_s -lm -lc
 endif
 
-ifeq ($(ADK_TOOLCHAIN_GCC_USE_SSP),y)
+ifeq ($(ADK_TOOLCHAIN_USE_SSP),y)
 LIBRARIES+=-lssp -lssp_nonshared
 endif
 
diff --git a/package/gcc/Makefile b/package/gcc/Makefile
index 76e58d954..24571fb3e 100644
--- a/package/gcc/Makefile
+++ b/package/gcc/Makefile
@@ -39,12 +39,6 @@ ifeq ($(ADK_TARGET_SYSTEM_QEMU_MIPS64EL),y)
 CONFIGURE_ARGS+=       --with-abi=$(ADK_TARGET_MIPS_ABI)
 endif
 
-ifeq ($(ADK_TOOLCHAIN_GCC_SJLJ),y)
-CONFIGURE_ARGS+=	--enable-sjlj-exceptions
-else
-CONFIGURE_ARGS+=	--disable-sjlj-exceptions
-endif
-
 ifneq ($(ADK_PACKAGE_GXX),)
 CONFIGURE_ARGS+=	--enable-languages=c,c++
 else
@@ -57,7 +51,6 @@ else
 CONFIGURE_ARGS+=	--enable-target-optspace
 endif
 
-
 CONFIGURE_ENV+=		have_sys_sdt_h=no
 CONFIGURE_ARGS+=	--host=$(GNU_TARGET_NAME) \
 			--target=$(GNU_TARGET_NAME) \
diff --git a/package/id3lib/Makefile b/package/id3lib/Makefile
index 19d678a7a..82f23f375 100644
--- a/package/id3lib/Makefile
+++ b/package/id3lib/Makefile
@@ -28,7 +28,7 @@ ifeq ($(ADK_COMPILE_ID3LIB_WITH_UCLIBCXX),y)
 LIBRARIES:=-nodefaultlibs -luClibc++ -lz -lm -lc -lgcc
 endif
 
-ifeq ($(ADK_TOOLCHAIN_GCC_USE_SSP),y)
+ifeq ($(ADK_TOOLCHAIN_USE_SSP),y)
 LIBRARIES+=-lssp -fstack-protector
 endif
 
diff --git a/package/iperf/Makefile b/package/iperf/Makefile
index d867dd210..da2c5f156 100644
--- a/package/iperf/Makefile
+++ b/package/iperf/Makefile
@@ -22,7 +22,7 @@ $(eval $(call PKG_template,IPERF,iperf,${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPEN
 TARGET_CFLAGS:=         $(filter-out -flto,$(TARGET_CFLAGS))
 TARGET_CXXFLAGS:=	$(filter-out -flto,$(TARGET_CXXFLAGS))
 
-ifeq ($(ADK_TOOLCHAIN_GCC_USE_SSP),y)
+ifeq ($(ADK_TOOLCHAIN_USE_SSP),y)
 TARGET_LDFLAGS+=	-lssp
 endif
 
diff --git a/package/mrd6/Makefile b/package/mrd6/Makefile
index 46f7595c5..235fb0809 100644
--- a/package/mrd6/Makefile
+++ b/package/mrd6/Makefile
@@ -26,7 +26,7 @@ ifeq (${ADK_COMPILE_MRD6_WITH_UCLIBCXX},y)
 LIBRARIES:=-nodefaultlibs -luClibc++
 endif
 
-ifeq ($(ADK_TOOLCHAIN_GCC_USE_SSP),y)
+ifeq ($(ADK_TOOLCHAIN_USE_SSP),y)
 LIBRARIES+=-lssp -lssp_nonshared
 endif
 
diff --git a/package/net-tools/Makefile b/package/net-tools/Makefile
index e550059a4..a83c0a6e0 100644
--- a/package/net-tools/Makefile
+++ b/package/net-tools/Makefile
@@ -23,7 +23,7 @@ $(eval $(call PKG_template,ARP,arp,$(PKG_VERSION)-${PKG_RELEASE},${PKG_DEPENDS},
 
 CONFIG_STYLE:=		manual
 INSTALL_STYLE:=		manual
-ifeq ($(ADK_TOOLCHAIN_GCC_USE_SSP),y)
+ifeq ($(ADK_TOOLCHAIN_USE_SSP),y)
 TARGET_LDFLAGS+=	-lssp
 endif
 
diff --git a/package/nmap/Makefile b/package/nmap/Makefile
index 09035c248..cd2e690d7 100644
--- a/package/nmap/Makefile
+++ b/package/nmap/Makefile
@@ -21,7 +21,7 @@ include ${TOPDIR}/mk/package.mk
 
 $(eval $(call PKG_template,NMAP,nmap,${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION}))
 
-ifeq ($(ADK_TOOLCHAIN_GCC_USE_SSP),y)
+ifeq ($(ADK_TOOLCHAIN_USE_SSP),y)
 LIBRARIES+=-lssp -lssp_nonshared
 endif
 
diff --git a/package/openssh/Makefile b/package/openssh/Makefile
index 4d0c4e9da..7d80662e2 100644
--- a/package/openssh/Makefile
+++ b/package/openssh/Makefile
@@ -50,7 +50,7 @@ CONFIGURE_ARGS+=	--with-kerberos5="${STAGING_TARGET_DIR}/usr"
 TARGET_LDFLAGS+=	-L$(STAGING_TARGET_DIR)/usr/lib/heimdal -Wl,-rpath -Wl,/usr/lib/heimdal
 endif
 
-ifeq ($(ADK_TOOLCHAIN_GCC_USE_SSP),y)
+ifeq ($(ADK_TOOLCHAIN_USE_SSP),y)
 CONFIGURE_ARGS+=	--with-stackprotect
 else
 CONFIGURE_ARGS+=	--without-stackprotect
diff --git a/package/sudo/Makefile b/package/sudo/Makefile
index 0c3d9562f..ea4bb908c 100644
--- a/package/sudo/Makefile
+++ b/package/sudo/Makefile
@@ -21,7 +21,7 @@ CONFIGURE_ARGS+=	--without-pam \
 			--without-sendmail \
 			--with-env-editor
 
-ifeq ($(ADK_TOOLCHAIN_GCC_USE_SSP),y)
+ifeq ($(ADK_TOOLCHAIN_USE_SSP),y)
 CONFIGURE_ARGS+=	--enable-hardening
 else
 CONFIGURE_ARGS+=	--disable-hardening
diff --git a/toolchain/Config.in b/toolchain/Config.in
index 54016212a..7eb9cdda7 100644
--- a/toolchain/Config.in
+++ b/toolchain/Config.in
@@ -10,26 +10,37 @@ config ADK_TOOLCHAIN_GCC_CXX
 	boolean
 	default y
 
-config ADK_TOOLCHAIN_GCC_SSP
-	prompt "Enable Stack Smashing Protection in GCC"
+config ADK_TOOLCHAIN_SSP
+	prompt "Enable Stack Smashing Protection"
 	boolean
 	default y
 
-config ADK_TOOLCHAIN_GCC_USE_SSP
+config ADK_TOOLCHAIN_USE_SSP
 	prompt "Use SSP for all packages"
  	boolean	
-	depends on ADK_TOOLCHAIN_GCC_SSP
+	depends on ADK_TOOLCHAIN_SSP
 	default n
 
-config ADK_TOOLCHAIN_GCC_LTO
-	prompt "Enable Link Time Optimization in GCC"
+config ADK_TOOLCHAIN_LTO
+	prompt "Enable Link Time Optimization"
 	boolean
 	default y
 
-config ADK_TOOLCHAIN_GCC_USE_LTO
+config ADK_TOOLCHAIN_USE_LTO
 	prompt "Use Link Time Optimization for all packages"
 	boolean
-	depends on ADK_TOOLCHAIN_GCC_LTO
+	depends on ADK_TOOLCHAIN_LTO
+	default n
+
+config ADK_TOOLCHAIN_GOLD
+	prompt "Enable GOLD as linker"
+	boolean
+	default y
+
+config ADK_TOOLCHAIN_USE_GOLD
+	prompt "Use GOLD as linker for all packages"
+	boolean
+	depends on ADK_TOOLCHAIN_GOLD
 	default n
 
 endmenu
diff --git a/toolchain/binutils/Makefile b/toolchain/binutils/Makefile
index 4d34e3566..87cea2987 100644
--- a/toolchain/binutils/Makefile
+++ b/toolchain/binutils/Makefile
@@ -6,12 +6,24 @@ include Makefile.inc
 include ../rules.mk
 include ${TOPDIR}/mk/buildhlp.mk
 
-ifeq ($(ADK_TOOLCHAIN_GCC_SSP),y)
+ifeq ($(ADK_TOOLCHAIN_SSP),y)
 CONFOPTS+=		--enable-libssp
 else
 CONFOPTS+=		--disable-libssp
 endif
 
+ifeq ($(ADK_TOOLCHAIN_LTO),y)
+CONFOPTS+=		--enable-lto
+else
+CONFOPTS+=		--disable-lto
+endif
+
+ifeq ($(ADK_TOOLCHAIN_GOLD),y)
+CONFOPTS+=		--enable-gold
+else
+CONFOPTS+=		--disable-gold
+endif
+
 ifeq ($(ADK_TARGET_SYSTEM_RASPBERRY_PI),y)
 CONFOPTS+=          	--with-arch=armv6
 endif
diff --git a/toolchain/gcc/Makefile b/toolchain/gcc/Makefile
index 611de97bf..eee524ba3 100644
--- a/toolchain/gcc/Makefile
+++ b/toolchain/gcc/Makefile
@@ -202,11 +202,18 @@ $(WRKBUILD)/.installed: $(WRKBUILD)/.compiled
 	# remove duplicate tools, convert hardlinks to symlinks
 	set -e; \
 	cd $(TOOLCHAIN_DIR)/usr/$(GNU_TARGET_NAME)/bin; \
-		for app in ar as c++ g++ gcc ld ld.bfd nm objcopy objdump ranlib strip; do \
+		for app in ar as c++ g++ gcc ld ld.gold ld.bfd nm objcopy objdump ranlib strip; do \
 			ln -sf ../../bin/$(GNU_TARGET_NAME)-$${app} $${app}; \
 		done;
 	(cd $(TOOLCHAIN_DIR)/usr/bin && \
 		ln -sf $(GNU_TARGET_NAME)-gcc $(GNU_TARGET_NAME)-gcc-${PKG_VERSION})
+ifeq ($(ADK_TOOLCHAIN_USE_GOLD),y)
+	(cd $(TOOLCHAIN_DIR)/usr/bin && \
+		ln -sf $(GNU_TARGET_NAME)-ld.gold $(GNU_TARGET_NAME)-ld)
+else
+	(cd $(TOOLCHAIN_DIR)/usr/bin && \
+		ln -sf $(GNU_TARGET_NAME)-ld.bfd $(GNU_TARGET_NAME)-ld)
+endif
 	cd $(STAGING_TARGET_DIR)/lib && \
 		ln -sf libstdc++.so.6.0.18 libstdc++.so && \
 		ln -sf libstdc++.so.6.0.18 libstdc++.so.6
-- 
cgit v1.2.3


From 3a00a860d7d26282b5645992559fdb52f3c58fbf Mon Sep 17 00:00:00 2001
From: Waldemar Brodkorb <wbx@openadk.org>
Date: Mon, 7 Apr 2014 15:47:54 +0200
Subject: update to latest upstream version

---
 package/ffmpeg/Makefile                  |  7 +++----
 package/omxplayer/Makefile               |  6 +++---
 package/omxplayer/patches/patch-Makefile | 14 ++++++++++----
 3 files changed, 16 insertions(+), 11 deletions(-)

diff --git a/package/ffmpeg/Makefile b/package/ffmpeg/Makefile
index d82f9d643..6a3f60fdd 100644
--- a/package/ffmpeg/Makefile
+++ b/package/ffmpeg/Makefile
@@ -4,9 +4,9 @@
 include ${TOPDIR}/rules.mk
 
 PKG_NAME:=		ffmpeg
-PKG_VERSION:=		2.1.1
+PKG_VERSION:=		2.2
 PKG_RELEASE:=		1
-PKG_MD5SUM:=		2719ab2b3311ac3775b9cdeb66c54849
+PKG_MD5SUM:=		744febca199548c9393b1f1ed05ccdd8
 PKG_DESCR:=		record, convert and stream audio & video
 PKG_SECTION:=		libs
 PKG_FDEPENDS:=		libpthread
@@ -100,9 +100,8 @@ $(eval $(call PKG_template,FFSERVER,ffserver,${PKG_VERSION}-${PKG_RELEASE},${PKG
 $(eval $(call PKG_template,FFPROBE,ffprobe,${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKGSD_FFPROBE},${PKGSC_FFPROBE}))
 #$(eval $(call PKG_template,FFPLAY,ffplay,${PKG_VERSION}-${PKG_RELEASE},${PKGSS_FFPLAY},${PKGSD_FFPLAY},${PKGSC_FFPLAY}))
 
-TARGET_CFLAGS:=         $(filter-out -flto,$(TARGET_CFLAGS))
 TARGET_CFLAGS:=		$(subst Os,O2,$(TARGET_CFLAGS))
-TARGET_CPPFLAGS+=	-D_POSIX_SOURCE=1 -D_GNU_SOURCE=1
+TARGET_CPPFLAGS+=	-D_POSIX_SOURCE -D_GNU_SOURCE
 
 ifeq ($(ADK_TARGET_CPU_WITH_MMX),y)
 CONFIGURE_CPU_OPTS:=	--enable-mmx
diff --git a/package/omxplayer/Makefile b/package/omxplayer/Makefile
index 696f8901b..e230622e4 100644
--- a/package/omxplayer/Makefile
+++ b/package/omxplayer/Makefile
@@ -4,10 +4,10 @@
 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=		omxplayer
-# actually d1a4a0e1030249e40e2e9bb04518f1b786b18488 from 7.01.2014
-PKG_VERSION:=		0.3
+# actually 1ca2f7adaa7f6a92410d9664e76c395537659dba from 07.04.2014
+PKG_VERSION:=		0.4
 PKG_RELEASE:=		1
-PKG_MD5SUM:=		1882cac6032baa59291068af30df1702
+PKG_MD5SUM:=		d4efff32305bd16315e6fa4f80ea2a98
 PKG_DESCR:=		video player for raspberry pi
 PKG_SECTION:=		multimedia
 PKG_DEPENDS:=		libffmpeg boost bcm2835-vc libfreetype libpcre
diff --git a/package/omxplayer/patches/patch-Makefile b/package/omxplayer/patches/patch-Makefile
index f7caae300..1da9b8ba2 100644
--- a/package/omxplayer/patches/patch-Makefile
+++ b/package/omxplayer/patches/patch-Makefile
@@ -1,14 +1,20 @@
---- omxplayer-0.2.orig/Makefile	2013-10-11 15:17:41.000000000 +0200
-+++ omxplayer-0.2/Makefile	2013-10-11 15:30:49.000000000 +0200
+--- omxplayer-0.4.orig/Makefile	2014-04-07 13:50:34.000000000 +0200
++++ omxplayer-0.4/Makefile	2014-04-07 15:39:22.000000000 +0200
 @@ -2,9 +2,9 @@ include Makefile.include
  
  CFLAGS+=-std=c++0x -D__STDC_CONSTANT_MACROS -D__STDC_LIMIT_MACROS -DTARGET_POSIX -DTARGET_LINUX -fPIC -DPIC -D_REENTRANT -D_LARGEFILE64_SOURCE -D_FILE_OFFSET_BITS=64 -DHAVE_CMAKE_CONFIG -D__VIDEOCORE4__ -U_FORTIFY_SOURCE -Wall -DHAVE_OMXLIB -DUSE_EXTERNAL_FFMPEG  -DHAVE_LIBAVCODEC_AVCODEC_H -DHAVE_LIBAVUTIL_OPT_H -DHAVE_LIBAVUTIL_MEM_H -DHAVE_LIBAVUTIL_AVUTIL_H -DHAVE_LIBAVFORMAT_AVFORMAT_H -DHAVE_LIBAVFILTER_AVFILTER_H -DHAVE_LIBSWRESAMPLE_SWRESAMPLE_H -DOMX -DOMX_SKIP64BIT -ftree-vectorize -DUSE_EXTERNAL_OMX -DTARGET_RASPBERRY_PI -DUSE_EXTERNAL_LIBBCM_HOST
  
--LDFLAGS+=-L./ -ldbus-1 -lc -lWFC -lGLESv2 -lEGL -lbcm_host -lopenmaxil -lfreetype -lz -Lffmpeg_compiled/usr/local/lib/
-+LDFLAGS+=-L./ -ldbus-1 -lc -lWFC -lGLESv2 -lEGL -lbcm_host -lopenmaxil -lfreetype -lz -lkhrn_static
+-LDFLAGS+=-L./ -Lffmpeg_compiled/usr/local/lib/ -lc -lWFC -lGLESv2 -lEGL -lbcm_host -lopenmaxil -lfreetype -lz
++LDFLAGS+=-L./ -lc -lWFC -lGLESv2 -lEGL -lbcm_host -lopenmaxil -lfreetype -lz
  
 -INCLUDES+=-I./ -Ilinux -Iffmpeg_compiled/usr/local/include/
 +INCLUDES+=-I./ -Ilinux
  
  DIST ?= omxplayer-dist
  
+@@ -71,5 +71,4 @@ dist: omxplayer.bin
+ 	cp omxplayer omxplayer.bin $(DIST)/usr/bin
+ 	cp COPYING $(DIST)/usr/share/doc/
+ 	cp README.md $(DIST)/usr/share/doc/README
+-	cp -a ffmpeg_compiled/usr/local/lib/*.so* $(DIST)/usr/lib/omxplayer/
+ 	cd $(DIST); tar -czf ../$(DIST).tgz *
-- 
cgit v1.2.3


From f3cc98651b738ac7f2dc56ea772afa9f874b9d3b Mon Sep 17 00:00:00 2001
From: Waldemar Brodkorb <wbx@openadk.org>
Date: Mon, 7 Apr 2014 17:23:11 +0200
Subject: allow to enable daemons on startup via menuconfig

---
 .gitignore                                         |   1 +
 Config.in                                          |  10 +-
 adk/tools/pkgmaker.c                               |  66 +++++++++++-
 mk/package.mk                                      |   3 +
 package/busybox/Makefile                           |   6 +-
 package/busybox/config/miscutils/Config.in         |   6 +-
 package/busybox/config/networking/Config.in        |   2 +-
 package/busybox/config/networking/udhcp/Config.in  |   2 +-
 package/busybox/files/busybox.postinst             |   3 +-
 package/busybox/files/network                      |  27 +++++
 package/busybox/files/network.init                 |  27 -----
 package/busybox/files/syslog.init                  |  33 ------
 package/busybox/files/udhcpd.init                  |   2 +-
 package/dropbear/Makefile                          |   3 -
 package/dropbear/files/dropbear.postinst           |   4 +-
 package/iptables/Makefile                          |  20 ++--
 package/iptables/files/firewall6.init              |   2 +-
 package/osiris/Makefile                            |  39 -------
 package/osiris/files/osirisd.init                  |  28 -----
 package/osiris/files/osirisd.postinst              |   3 -
 package/osiris/patches/patch-configure             | 113 ---------------------
 .../patches/patch-src_db-4_2_52_dist_configure     |  12 ---
 .../patches/patch-src_db-4_2_52_dist_ltmain_sh     |  11 --
 .../osiris/patches/patch-src_libosiris_Makefile_in |  41 --------
 .../patches/patch-src_libosiris_configuration_c    |  27 -----
 .../patches/patch-src_libosiris_configuration_h    |  13 ---
 .../osiris/patches/patch-src_libosiris_filter_c    |  35 -------
 .../osiris/patches/patch-src_libosiris_filter_h    |  23 -----
 .../patches/patch-src_libosiris_osi_common_h       |  10 --
 .../patches/patch-src_libosiris_ssl_utilities_c    |  30 ------
 .../patches/patch-src_libosiris_ssl_utilities_h    |  14 ---
 .../osiris/patches/patch-src_libosiris_utilities_c |  13 ---
 .../patches/patch-src_osirisd_modules_Makefile_am  |  11 --
 .../patches/patch-src_osirisd_modules_Makefile_in  |  11 --
 package/osiris/patches/patch-src_osirisd_scanner_c |  33 ------
 .../osiris/patches/patch-src_osirismd_md_control_c |  16 ---
 target/config/Config.in                            |   2 +-
 target/config/Config.in.runtime                    |   8 ++
 target/packages/pkg-available/console              |   1 +
 target/packages/pkg-available/mpdbox               |   2 +
 target/x86/kernel/generic-pc                       |   4 +
 41 files changed, 144 insertions(+), 573 deletions(-)
 create mode 100644 package/busybox/files/network
 delete mode 100644 package/busybox/files/network.init
 delete mode 100644 package/busybox/files/syslog.init
 delete mode 100644 package/osiris/Makefile
 delete mode 100644 package/osiris/files/osirisd.init
 delete mode 100644 package/osiris/files/osirisd.postinst
 delete mode 100644 package/osiris/patches/patch-configure
 delete mode 100644 package/osiris/patches/patch-src_db-4_2_52_dist_configure
 delete mode 100644 package/osiris/patches/patch-src_db-4_2_52_dist_ltmain_sh
 delete mode 100644 package/osiris/patches/patch-src_libosiris_Makefile_in
 delete mode 100644 package/osiris/patches/patch-src_libosiris_configuration_c
 delete mode 100644 package/osiris/patches/patch-src_libosiris_configuration_h
 delete mode 100644 package/osiris/patches/patch-src_libosiris_filter_c
 delete mode 100644 package/osiris/patches/patch-src_libosiris_filter_h
 delete mode 100644 package/osiris/patches/patch-src_libosiris_osi_common_h
 delete mode 100644 package/osiris/patches/patch-src_libosiris_ssl_utilities_c
 delete mode 100644 package/osiris/patches/patch-src_libosiris_ssl_utilities_h
 delete mode 100644 package/osiris/patches/patch-src_libosiris_utilities_c
 delete mode 100644 package/osiris/patches/patch-src_osirisd_modules_Makefile_am
 delete mode 100644 package/osiris/patches/patch-src_osirisd_modules_Makefile_in
 delete mode 100644 package/osiris/patches/patch-src_osirisd_scanner_c
 delete mode 100644 package/osiris/patches/patch-src_osirismd_md_control_c

diff --git a/.gitignore b/.gitignore
index 3ac956900..68214f10b 100644
--- a/.gitignore
+++ b/.gitignore
@@ -56,6 +56,7 @@
 /target/packages/Config.in
 /target/config/Config.in.system.default
 /target/config/Config.in.system
+/target/config/Config.in.scripts
 /target/config/Config.in.native
 /target/config/Config.in.arch
 /target/config/Config.in.prereq
diff --git a/Config.in b/Config.in
index 9fddb78f3..01e64ae07 100644
--- a/Config.in
+++ b/Config.in
@@ -32,11 +32,6 @@ config ADK_CHOOSE_TARGET_SYSTEM
 
 source "target/config/Config.in"
 
-menu "Runtime configuration"
-depends on !ADK_CHOOSE_TARGET_ARCH && !ADK_CHOOSE_TARGET_SYSTEM
-source "target/config/Config.in.runtime"
-endmenu
-
 menu "Package collection"
 depends on !ADK_CHOOSE_TARGET_ARCH && !ADK_CHOOSE_TARGET_SYSTEM
 source "target/packages/Config.in"
@@ -89,6 +84,11 @@ source "package/Config.in.auto.global"
 source "package/Config.in.auto"
 endmenu
 
+menu "Runtime configuration"
+depends on !ADK_CHOOSE_TARGET_ARCH && !ADK_CHOOSE_TARGET_SYSTEM
+source "target/config/Config.in.runtime"
+endmenu
+
 choice
 prompt "Kernel Version"
 depends on ADK_TOOLCHAIN_ONLY
diff --git a/adk/tools/pkgmaker.c b/adk/tools/pkgmaker.c
index 51d31aa70..6997f3def 100644
--- a/adk/tools/pkgmaker.c
+++ b/adk/tools/pkgmaker.c
@@ -304,13 +304,18 @@ static char *toupperstr(char *string) {
 
 int main() {
 
-	DIR *pkgdir, *pkglistdir;
+	DIR *pkgdir, *pkglistdir, *scriptdir;
 	struct dirent *pkgdirp;
-	FILE *pkg, *cfg, *menuglobal, *section;
+	struct dirent *scriptdirp;
+	size_t len;
+	FILE *pkg, *cfg, *menuglobal, *section, *initscript, *icfg;
 	char hvalue[MAXVALUE];
 	char buf[MAXPATH];
+	char ibuf[MAXPATH];
 	char tbuf[MAXPATH];
 	char path[MAXPATH];
+	char script[MAXPATH];
+	char script2[MAXPATH];
 	char spath[MAXPATH];
 	char dir[MAXPATH];
 	char variable[2*MAXVAR];
@@ -320,9 +325,10 @@ int main() {
 	char *pkg_need_cxx, *pkg_need_java, *pkgname, *sysname, *pkg_debug;
 	char *pkg_libc_depends, *pkg_host_depends, *pkg_system_depends, *pkg_arch_depends, *pkg_flavours, *pkg_flavours_string, *pkg_choices, *pseudo_name;
 	char *packages, *pkg_name_u, *pkgs, *pkg_opts, *pkg_libname;
-	char *saveptr, *p_ptr, *s_ptr, *pkg_helper;
+	char *saveptr, *p_ptr, *s_ptr, *pkg_helper, *sname, *sname2;
 	int result;
 	StrMap *pkgmap, *sectionmap;
+	const char runtime[] = "target/config/Config.in.scripts";
 
 	pkg_name