summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--BUGS2
-rw-r--r--TODO2
-rw-r--r--mk/kernel-build.mk4
-rw-r--r--mk/package.mk9
-rw-r--r--package/cyrus-sasl/Makefile17
-rw-r--r--package/gdb/patches/patch-gdb_amd64-linux-nat_c12
-rw-r--r--package/gdb/src/gdb/debugreg.h48
-rw-r--r--package/ncurses/Makefile5
-rw-r--r--package/ncurses/patches/patch-misc_terminfo_src174
-rw-r--r--package/ruby-ldap/Makefile16
-rw-r--r--package/ruby-ldap/patches/patch-rbldap_h23
-rw-r--r--package/ruby/patches/patch-io_c20
-rw-r--r--target/config/Config.in.adk6
-rw-r--r--target/sparc/kernel.config670
-rw-r--r--target/sparc64/kernel.config212
-rw-r--r--toolchain/eglibc/Makefile12
-rw-r--r--toolchain/eglibc/patches/sparc-libm.patch84
-rw-r--r--toolchain/glibc/patches/sparc-fpu-workaround.patch84
18 files changed, 1001 insertions, 399 deletions
diff --git a/BUGS b/BUGS
index b0ef10684..20f48acdc 100644
--- a/BUGS
+++ b/BUGS
@@ -1,4 +1,4 @@
-- qemu-sparc with glibc/eglibc does not compile
+- qemu-sparc with eglibc does not compile
- qemu-ppc64 does not boot
- cris foxboard-lx is broken, binutils failure
- uclibc on lemote mips64 target does not work (only uclibc-trunk with patches)
diff --git a/TODO b/TODO
index 4c328d1c1..931047f23 100644
--- a/TODO
+++ b/TODO
@@ -1,3 +1,5 @@
+- automatically add -dbg package via objcopy magic
+- evaluate libguestfs for image creation
- add PKG_AUTOTOOL logic for packages, which need patches to
the autotool infrastructure
- add grsec kernel patch
diff --git a/mk/kernel-build.mk b/mk/kernel-build.mk
index b7385c272..e746f4a1d 100644
--- a/mk/kernel-build.mk
+++ b/mk/kernel-build.mk
@@ -19,14 +19,14 @@ $(LINUX_DIR)/.prepared: $(TOOLCHAIN_BUILD_DIR)/w-$(PKG_NAME)-$(PKG_VERSION)-$(PK
$(LINUX_DIR)/.config: $(LINUX_DIR)/.prepared $(BUILD_DIR)/.kernelconfig $(TOPDIR)/mk/modules.mk
$(TRACE) target/$(ADK_TARGET_ARCH)-kernel-configure
- for f in $(TARGETS);do if [ -f $$f ];then rm $$f;fi;done $(MAKE_TRACE)
+ -for f in $(TARGETS);do if [ -f $$f ];then rm $$f;fi;done
$(CP) $(BUILD_DIR)/.kernelconfig $(LINUX_DIR)/.config
echo N | ${KERNEL_MAKE_ENV} $(MAKE) ${KERNEL_MAKE_OPTS} oldconfig $(MAKE_TRACE)
${KERNEL_MAKE_ENV} $(MAKE) ${KERNEL_MAKE_OPTS} prepare scripts $(MAKE_TRACE)
touch -c $(LINUX_DIR)/.config
$(LINUX_DIR)/vmlinux: $(LINUX_DIR)/.config
- -rm $(LINUX_DIR)/vmlinux $(MAKE_TRACE)
+ -rm $(LINUX_DIR)/vmlinux 2>/dev/null
$(TRACE) target/$(ADK_TARGET_ARCH)-kernel-compile
${KERNEL_MAKE_ENV} $(MAKE) V=1 ${KERNEL_MAKE_OPTS} -j${ADK_MAKE_JOBS} LOCALVERSION="" $(MAKE_TRACE)
$(TRACE) target/$(ADK_TARGET_ARCH)-kernel-modules-install
diff --git a/mk/package.mk b/mk/package.mk
index 964763f44..b74e8ec5b 100644
--- a/mk/package.mk
+++ b/mk/package.mk
@@ -263,8 +263,17 @@ endif
$$(INFO_$(1)): $$(IPKG_$(1))
$(PKG_INSTALL) $$(IPKG_$(1))
+ifneq ($(1),UCLIBC)
+ifneq ($(1),EGLIBC)
+ifneq ($(1),GLIBC)
+ifneq ($(1),MUSL)
$$(INFO_$(1)_DEV): $$(IPKG_$(1)_DEV)
$(PKG_INSTALL) $$(IPKG_$(1)_DEV)
+endif
+endif
+endif
+endif
+
endef
install-targets:
diff --git a/package/cyrus-sasl/Makefile b/package/cyrus-sasl/Makefile
index 65169cf89..b3e1794b0 100644
--- a/package/cyrus-sasl/Makefile
+++ b/package/cyrus-sasl/Makefile
@@ -4,15 +4,15 @@
include ${TOPDIR}/rules.mk
PKG_NAME:= cyrus-sasl
-PKG_VERSION:= 2.1.23
-PKG_RELEASE:= 2
-PKG_MD5SUM:= 2eb0e48106f0e9cd8001e654f267ecbc
+PKG_VERSION:= 2.1.26
+PKG_RELEASE:= 1
+PKG_MD5SUM:= a7f4e5e559a0e37b3ffc438c9456e425
PKG_DESCR:= a general purpose authentication library
PKG_SECTION:= libs
PKG_BUILDDEP:= openssl
PKG_DEPENDS:= libopenssl
-PKG_URL:= http://asg.web.cmu.edu/sasl/
-PKG_SITES:= http://ftp.andrew.cmu.edu/pub/cyrus-mail/
+PKG_URL:= http://cyrusimap.org/
+PKG_SITES:= ftp://ftp.cyrusimap.org/cyrus-sasl/
PKG_NOPARALLEL:= 1
PKG_LIBNAME:= libsasl2
PKG_OPTS:= dev
@@ -22,10 +22,12 @@ include ${TOPDIR}/mk/package.mk
$(eval $(call PKG_template,LIBSASL2,libsasl2,${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION},${PKG_OPTS}))
CONFIGURE_ARGS+= --enable-staticdlopen \
- --enable-cram \
--enable-plain \
--enable-anon \
- --enable-digest \
+ --enable-login \
+ --disable-cram \
+ --disable-digest \
+ --disable-scram \
--with-ipctype=unix \
--with-devrandom="/dev/urandom" \
--with-openssl="${STAGING_TARGET_DIR}/usr" \
@@ -39,7 +41,6 @@ CONFIGURE_ARGS+= --enable-staticdlopen \
--disable-krb4 \
--disable-gssapi \
--disable-gss_mutexes \
- --disable-login \
--disable-ntlm \
--disable-sql \
--disable-static \
diff --git a/package/gdb/patches/patch-gdb_amd64-linux-nat_c b/package/gdb/patches/patch-gdb_amd64-linux-nat_c
index ac612d711..c50f1adf1 100644
--- a/package/gdb/patches/patch-gdb_amd64-linux-nat_c
+++ b/package/gdb/patches/patch-gdb_amd64-linux-nat_c
@@ -1,6 +1,6 @@
--- gdb-7.6.orig/gdb/amd64-linux-nat.c 2013-03-11 09:25:57.000000000 +0100
-+++ gdb-7.6/gdb/amd64-linux-nat.c 2013-09-04 13:29:05.000000000 +0200
-@@ -25,8 +25,6 @@
++++ gdb-7.6/gdb/amd64-linux-nat.c 2013-10-26 22:30:11.000000000 +0200
+@@ -25,15 +25,13 @@
#include "regset.h"
#include "linux-nat.h"
#include "amd64-linux-tdep.h"
@@ -9,6 +9,14 @@
#include "gdb_assert.h"
#include "gdb_string.h"
+ #include "elf/common.h"
+ #include <sys/uio.h>
+ #include <sys/ptrace.h>
+-#include <sys/debugreg.h>
++#include "debugreg.h"
+ #include <sys/syscall.h>
+ #include <sys/procfs.h>
+ #include <sys/user.h>
@@ -1121,47 +1119,6 @@ amd64_linux_read_description (struct tar
}
}
diff --git a/package/gdb/src/gdb/debugreg.h b/package/gdb/src/gdb/debugreg.h
new file mode 100644
index 000000000..e4883c804
--- /dev/null
+++ b/package/gdb/src/gdb/debugreg.h
@@ -0,0 +1,48 @@
+#ifndef SYS_DEBUGREG_H
+#define SYS_DEBUGREG_H
+
+#include <stdint.h>
+
+#define DR_FIRSTADDR 0
+#define DR_LASTADDR 3
+
+#define DR_STATUS 6
+#define DR_CONTROL 7
+
+#define DR_TRAP0 (0x1)
+#define DR_TRAP1 (0x2)
+#define DR_TRAP2 (0x4)
+#define DR_TRAP3 (0x8)
+
+#define DR_STEP (0x4000)
+#define DR_SWITCH (0x8000)
+
+#define DR_CONTROL_SHIFT 16
+#define DR_CONTROL_SIZE 4
+
+#define DR_RW_EXECUTE (0x0)
+#define DR_RW_WRITE (0x1)
+#define DR_RW_READ (0x3)
+
+#define DR_LEN_1 (0x0)
+#define DR_LEN_2 (0x4)
+#define DR_LEN_4 (0xC)
+#define DR_LEN_8 (0x8)
+
+#define DR_LOCAL_ENABLE_SHIFT 0
+#define DR_GLOBAL_ENABLE_SHIFT 1
+#define DR_ENABLE_SIZE 2
+
+#define DR_LOCAL_ENABLE_MASK (0x55)
+#define DR_GLOBAL_ENABLE_MASK (0xAA)
+
+
+#if SIZE_MAX > 4294967295
+# define DR_CONTROL_RESERVED (0xFFFFFFFF0000FC00UL)
+#else
+# define DR_CONTROL_RESERVED (0x00FC00U)
+#endif
+#define DR_LOCAL_SLOWDOWN (0x100)
+#define DR_GLOBAL_SLOWDOWN (0x200)
+
+#endif
diff --git a/package/ncurses/Makefile b/package/ncurses/Makefile
index b923e8fa3..ba7be4d04 100644
--- a/package/ncurses/Makefile
+++ b/package/ncurses/Makefile
@@ -5,7 +5,7 @@ include ${TOPDIR}/rules.mk
PKG_NAME:= ncurses
PKG_VERSION:= 5.9
-PKG_RELEASE:= 1
+PKG_RELEASE:= 2
PKG_MD5SUM:= 8cb9c412e5f2d96bc6f459aa8c6282a1
PKG_DESCR:= a terminal handling library
PKG_SECTION:= libs
@@ -71,6 +71,7 @@ libncurses-hostinstall:
${CP} ${HOST_WRKINST}/usr/bin/* ${STAGING_HOST_DIR}/usr/bin
libncurses-install:
+ rm -rf ${WRKINST}/usr/lib/terminfo
# this is installed as libncurses - make libcurses a "link"
rm -f ${WRKINST}/usr/lib/libcurses.so*
echo 'GROUP(-lncurses)' >${WRKINST}/usr/lib/libcurses.so
@@ -84,7 +85,7 @@ ifeq (${ADK_PACKAGE_LIBNCURSES_FULL_TERMINFO},y)
else
${INSTALL_DIR} ${IDIR_LIBNCURSES}/usr/share/terminfo/
for f in ansi dumb linux screen vt100 vt102 \
- rxvt-unicode vt220 xterm xterm-color xterm-xfree86; do \
+ rxvt vt220 xterm xterm-color xterm-xfree86; do \
${INSTALL_DIR} ${IDIR_LIBNCURSES}/usr/share/terminfo/$${f:0:1}; \
${INSTALL_DATA} ${WRKINST}/usr/share/terminfo/*/$$f \
${IDIR_LIBNCURSES}/usr/share/terminfo/$${f:0:1}/$$f; \
diff --git a/package/ncurses/patches/patch-misc_terminfo_src b/package/ncurses/patches/patch-misc_terminfo_src
deleted file mode 100644
index 865759cb2..000000000
--- a/package/ncurses/patches/patch-misc_terminfo_src
+++ /dev/null
@@ -1,174 +0,0 @@
---- ncurses-5.9.orig/misc/terminfo.src 2011-02-20 21:46:53.000000000 +0100
-+++ ncurses-5.9/misc/terminfo.src 2013-10-23 20:00:07.000000000 +0200
-@@ -4208,6 +4208,175 @@ rxvt-cygwin-native|rxvt terminal emulato
- rxvt-16color|xterm with 16 colors like aixterm,
- ncv#32, use=ibm+16color, use=rxvt,
-
-+# From: Thomas Dickey <dickey@clark.net> 04 Oct 1997
-+# Updated: Özgür Kesim <kesim@math.fu-berlin.de> 02 Nov 1997
-+# Updated: Marc Lehmann <pcg@goof.com>, 17 Feb 2005
-+# Updated: Marc Lehmann <schmorp@schmorp.de>, 04 Nov 2008: change init/reset sequences
-+rxvt-unicode|rxvt-unicode terminal (X Window System),
-+ am,
-+ bce,
-+ eo,
-+ km,
-+ msgr,
-+ xenl,
-+ hs,
-+ cols#80,
-+ it#8,
-+ lines#24,
-+ acsc=``aaffggjjkkllmmnnooppqqrrssttuuvvwwxxyyzz{{||}}~~-A.B+C\,D0EhFiG,
-+ bel=^G,
-+ blink=\E[5m,
-+ bold=\E[1m,
-+ civis=\E[?25l,
-+ clear=\E[H\E[2J,
-+ cnorm=\E[?25h,
-+ cr=^M,
-+ csr=\E[%i%p1%d;%p2%dr,
-+ cub=\E[%p1%dD,
-+ cub1=^H,
-+ cud=\E[%p1%dB,
-+ cud1=^J,
-+ cuf=\E[%p1%dC,
-+ cuf1=\E[C,
-+ cup=\E[%i%p1%d;%p2%dH,
-+ cuu=\E[%p1%dA,
-+ cuu1=\E[A,
-+ cvvis=\E[?25h,
-+ dch=\E[%p1%dP,
-+ dch1=\E[P,
-+ dl=\E[%p1%dM,
-+ dl1=\E[M,
-+ ed=\E[J,
-+ el=\E[K,
-+ el1=\E[1K,
-+ flash=\E[?5h$<20/>\E[?5l,
-+ home=\E[H,
-+ hpa=\E[%i%p1%dG,
-+ ht=^I,
-+ hts=\EH,
-+ ich=\E[%p1%d@,
-+ ich1=\E[@,
-+ il=\E[%p1%dL,
-+ il1=\E[L,
-+ ind=^J,
-+ is1=\E[\041p,
-+ is2=\E[r\E[m\E[2J\E[?7;25h\E[?1;3;4;5;6;9;66;1000;1001;1049l\E[4l,
-+ kDC=\E[3$,
-+ kIC=\E2$,
-+ kEND=\E[8$,
-+ kHOM=\E[7$,
-+ kLFT=\E[d,
-+ kNXT=\E[6$,
-+ kPRV=\E[5$,
-+ kRIT=\E[c,
-+ kbs=\177,
-+ ka1=\EOw,
-+ ka3=\EOy,
-+ kb2=\EOu,
-+ kc1=\EOq,
-+ kc3=\EOs,
-+ kcbt=\E[Z,
-+ kcub1=\E[D,
-+ kcud1=\E[B,
-+ kcuf1=\E[C,
-+ kcuu1=\E[A,
-+ kdch1=\E[3~,
-+ kel=\E[8\^,
-+ kend=\E[8~,
-+ kent=\EOM,
-+ kf1=\E[11~,
-+ kf10=\E[21~,
-+ kf11=\E[23~,
-+ kf12=\E[24~,
-+ kf13=\E[25~,
-+ kf14=\E[26~,
-+ kf15=\E[28~,
-+ kf16=\E[29~,
-+ kf17=\E[31~,
-+ kf18=\E[32~,
-+ kf19=\E[33~,
-+ kf2=\E[12~,
-+ kf20=\E[34~,
-+ kf3=\E[13~,
-+ kf4=\E[14~,
-+ kf5=\E[15~,
-+ kf6=\E[17~,
-+ kf7=\E[18~,
-+ kf8=\E[19~,
-+ kf9=\E[20~,
-+ kfnd=\E[1~,
-+ khome=\E[7~,
-+ kich1=\E[2~,
-+ kmous=\E[M,
-+ knp=\E[6~,
-+ kpp=\E[5~,
-+ kslt=\E[4~,
-+ rc=\E8,
-+ rev=\E[7m,
-+ ri=\EM,
-+ rmso=\E[27m,
-+ rmul=\E[24m,
-+ rs1=\Ec,
-+ rs2=\E[r\E[m\E[?7;25h\E[?1;3;4;5;6;9;66;1000;1001;1049l\E[4l,
-+ sgr0=\E[m\017,
-+ enacs=,
-+ smacs=\E(0,
-+ rmacs=\E(B,
-+ smso=\E[7m,
-+ smul=\E[4m,
-+ tbc=\E[3g,
-+ vpa=\E[%i%p1%dd,
-+ colors#88,
-+ pairs#256,
-+ btns#5,
-+ lm#0,
-+ ccc,
-+ npc,
-+ mc5i,
-+ ncv#0,
-+ mir,
-+ xon,
-+ bw,
-+ ech=\E[%p1%dX,
-+ mc0=\E[i,
-+ mc4=\E[4i,
-+ mc5=\E[5i,
-+ sitm=\E[3m,
-+ ritm=\E[23m,
-+ smam=\E[?7h,
-+ rmam=\E[?7l,
-+ smir=\E[4h,
-+ rmir=\E[4l,
-+ smcup=\E[?1049h,
-+ rmcup=\E[r\E[?1049l,
-+ smkx=\E=,
-+ rmkx=\E>,
-+ indn=\E[%p1%dS,
-+ rin=\E[%p1%dT,
-+ sgr=\E[0%?%p6%t;1%;%?%p2%t;4%;%?%p1%p3%|%t;7%;%?%p4%t;5%;%?%p7%t;8%;m%?%p9%t\E(0%e\E(B%;,
-+ op=\E[39;49m,
-+ setaf=\E[38;5;%p1%dm,
-+ setab=\E[48;5;%p1%dm,
-+ setf=%?%p1%{7}%>%t\E[38;5;%p1%dm%e\E[3%?%p1%{1}%=%t4%e%p1%{3}%=%t6%e%p1%{4}%=%t1%e%p1%{6}%=%t3%e%p1%d%;m%;,
-+ setb=%?%p1%{7}%>%t\E[48;5;%p1%dm%e\E[4%?%p1%{1}%=%t4%e%p1%{3}%=%t6%e%p1%{4}%=%t1%e%p1%{6}%=%t3%e%p1%d%;m%;,
-+ initc=\E]4;%p1%d;rgb\:%p2%{65535}%*%{1000}%/%4.4X/%p3%{65535}%*%{1000}%/%4.4X/%p4%{65535}%*%{1000}%/%4.4X\E\\,
-+ sc=\E7,
-+ s0ds=\E(B,
-+ s1ds=\E(0,
-+ s2ds=\E*B,
-+ s3ds=\E+B,
-+ u6=\E[%i%d;%dR,
-+ u7=\E[6n,
-+ u8=\E[?1;2c,
-+ u9=\E[c,
-+ tsl=\E]2;,
-+ fsl=\007,
-+ dsl=\E]2;\007,
-+
- # mrxvt 0.5.4
- #
- # mrxvt is based on rxvt 2.7.11, but has by default XTERM_FKEYS defined, which
diff --git a/package/ruby-ldap/Makefile b/package/ruby-ldap/Makefile
index 8f26ca0ef..6289c1cb8 100644
--- a/package/ruby-ldap/Makefile
+++ b/package/ruby-ldap/Makefile
@@ -24,17 +24,19 @@ CONFIG_STYLE:= manual
FAKE_FLAGS+= DESTDIR="/"
do-configure:
- (cd $(WRKBUILD) && $(STAGING_DIR)/bin/ruby -I$(STAGING_DIR)/usr/lib/ruby/1.9.1/$(CPU_ARCH)-linux/ extconf.rb \
+ (cd $(WRKBUILD) && $(STAGING_HOST_DIR)/usr/bin/ruby -I$(STAGING_DIR)/usr/lib/ruby/2.0.0/$(CPU_ARCH)-linux/ extconf.rb \
--with-openldap2 \
+ --without-libnsl \
+ --with-ldap-dir=$(STAGING_DIR)/usr \
--with-ldap-lib=$(STAGING_DIR)/usr/lib \
--with-ldap-include=$(STAGING_DIR)/usr/include)
ruby-ldap-install:
- $(INSTALL_DIR) $(IDIR_RUBY_LDAP)/usr/lib/ruby/site_ruby/1.9.1/$(CPU_ARCH)-linux
- $(INSTALL_DIR) $(IDIR_RUBY_LDAP)/usr/lib/ruby/site_ruby/1.9.1/ldap
- $(CP) $(STAGING_DIR)/usr/lib/ruby/site_ruby/1.9.1/$(CPU_ARCH)-linux/ldap.so \
- $(IDIR_RUBY_LDAP)/usr/lib/ruby/site_ruby/1.9.1/$(CPU_ARCH)-linux
- $(CP) $(STAGING_DIR)//usr/lib/ruby/site_ruby/1.9.1/ldap/*.rb \
- $(IDIR_RUBY_LDAP)/usr/lib/ruby/site_ruby/1.9.1/ldap
+ $(INSTALL_DIR) $(IDIR_RUBY_LDAP)/usr/lib/ruby/site_ruby/2.0.0/$(CPU_ARCH)-linux
+ $(INSTALL_DIR) $(IDIR_RUBY_LDAP)/usr/lib/ruby/site_ruby/2.0.0/ldap
+ $(CP) $(STAGING_DIR)/usr/lib/ruby/site_ruby/2.0.0/$(CPU_ARCH)-linux/ldap.so \
+ $(IDIR_RUBY_LDAP)/usr/lib/ruby/site_ruby/2.0.0/$(CPU_ARCH)-linux
+ $(CP) $(STAGING_DIR)//usr/lib/ruby/site_ruby/2.0.0/ldap/*.rb \
+ $(IDIR_RUBY_LDAP)/usr/lib/ruby/site_ruby/2.0.0/ldap
include ${TOPDIR}/mk/pkg-bottom.mk
diff --git a/package/ruby-ldap/patches/patch-rbldap_h b/package/ruby-ldap/patches/patch-rbldap_h
new file mode 100644
index 000000000..6e4e68dd7
--- /dev/null
+++ b/package/ruby-ldap/patches/patch-rbldap_h
@@ -0,0 +1,23 @@
+--- ruby-ldap-0.9.8.orig/rbldap.h 2009-03-25 10:25:27.000000000 +0100
++++ ruby-ldap-0.9.8/rbldap.h 2013-10-26 23:33:03.000000000 +0200
+@@ -162,16 +162,18 @@ VALUE rb_ldap_mod_vals (VALUE);
+ RB_LDAPENTRY_DATA *ptr; \
+ Data_Get_Struct(obj, struct rb_ldapmsg_data, ptr); \
+ if( ! ptr->msg ){ \
++ VALUE value = rb_inspect(obj); \
+ rb_raise(rb_eLDAP_InvalidEntryError, "%s is not a valid entry", \
+- STR2CSTR(rb_inspect(obj))); \
++ StringValuePtr(value)); \
+ }; \
+ }
+
+ #define GET_LDAPENTRY_DATA(obj,ptr) { \
+ Data_Get_Struct(obj, struct rb_ldapentry_data, ptr); \
+ if( ! ptr->msg ){ \
++ VALUE value = rb_inspect(obj); \
+ rb_raise(rb_eLDAP_InvalidEntryError, "%s is not a valid entry", \
+- STR2CSTR(rb_inspect(obj))); \
++ StringValuePtr(value)); \
+ }; \
+ }
+
diff --git a/package/ruby/patches/patch-io_c b/package/ruby/patches/patch-io_c
new file mode 100644
index 000000000..dea7f46fd
--- /dev/null
+++ b/package/ruby/patches/patch-io_c
@@ -0,0 +1,20 @@
+--- ruby-2.0.0-p247.orig/io.c 2013-06-12 16:23:39.000000000 +0200
++++ ruby-2.0.0-p247/io.c 2013-10-26 23:02:53.000000000 +0200
+@@ -8483,7 +8483,7 @@ do_ioctl(int fd, ioctl_req_t cmd, long n
+
+ #define DEFULT_IOCTL_NARG_LEN (256)
+
+-#ifdef __linux__
++#if defined(__GLIBC__) && defined(__linux__)
+ static long
+ linux_iocparm_len(ioctl_req_t cmd)
+ {
+@@ -8516,7 +8516,7 @@ ioctl_narg_len(ioctl_req_t cmd)
+ #endif
+ #ifdef IOCPARM_LEN
+ len = IOCPARM_LEN(cmd); /* on BSDish systems we're safe */
+-#elif defined(__linux__)
++#elif defined(__GLIBC__) && defined(__linux__)
+ len = linux_iocparm_len(cmd);
+ #else
+ /* otherwise guess at what's safe */
diff --git a/target/config/Config.in.adk b/target/config/Config.in.adk
index 1dea618ef..341adbd48 100644
--- a/target/config/Config.in.adk
+++ b/target/config/Config.in.adk
@@ -105,10 +105,4 @@ config ADK_HOST_CYGWIN
endchoice
-config ADK_64BIT_KERNEL
- prompt "Build a 64bit Kernel"
- boolean
- default n
- depends on ADK_TARGET_KERNEL_MAY_64BIT
-
endmenu
diff --git a/target/sparc/kernel.config b/target/sparc/kernel.config
index 7f48a15da..161439e53 100644
--- a/target/sparc/kernel.config
+++ b/target/sparc/kernel.config
@@ -1,16 +1,12 @@
#
-# Automatically generated make config: don't edit
-# Linux/sparc 2.6.39 Kernel Configuration
-# Wed Aug 24 05:35:52 2011
+# Automatically generated file; DO NOT EDIT.
+# Linux/sparc 3.11.5 Kernel Configuration
#
# CONFIG_64BIT is not set
CONFIG_SPARC=y
CONFIG_SPARC32=y
# CONFIG_SPARC64 is not set
CONFIG_ARCH_DEFCONFIG="arch/sparc/configs/sparc32_defconfig"
-CONFIG_BITS=32
-CONFIG_ARCH_USES_GETTIMEOFFSET=y
-CONFIG_GENERIC_CMOS_UPDATE=y
CONFIG_AUDIT_ARCH=y
CONFIG_MMU=y
CONFIG_HIGHMEM=y
@@ -18,42 +14,67 @@ CONFIG_ZONE_DMA=y
CONFIG_NEED_DMA_MAP_STATE=y
CONFIG_NEED_SG_DMA_LENGTH=y
CONFIG_GENERIC_ISA_DMA=y
-CONFIG_ARCH_NO_VIRT_TO_BUS=y
CONFIG_DEFCONFIG_LIST="/lib/modules/$UNAME_RELEASE/.config"
-CONFIG_CONSTRUCTORS=y
-CONFIG_HAVE_IRQ_WORK=y
+CONFIG_IRQ_WORK=y
#
# General setup
#
-CONFIG_EXPERIMENTAL=y
CONFIG_BROKEN_ON_SMP=y
CONFIG_INIT_ENV_ARG_LIMIT=32
CONFIG_CROSS_COMPILE=""
+# CONFIG_COMPILE_TEST is not set
CONFIG_LOCALVERSION=""
# CONFIG_LOCALVERSION_AUTO is not set
+CONFIG_DEFAULT_HOSTNAME="openadk"
# CONFIG_SWAP is not set
CONFIG_SYSVIPC=y
CONFIG_SYSVIPC_SYSCTL=y
CONFIG_POSIX_MQUEUE=y
CONFIG_POSIX_MQUEUE_SYSCTL=y
-# CONFIG_BSD_PROCESS_ACCT is not set
# CONFIG_FHANDLE is not set
-# CONFIG_TASKSTATS is not set
# CONFIG_AUDIT is not set
+CONFIG_HAVE_GENERIC_HARDIRQS=y
+
+#
+# IRQ subsystem
+#
+CONFIG_GENERIC_HARDIRQS=y
+CONFIG_GENERIC_IRQ_SHOW=y
+CONFIG_GENERIC_CLOCKEVENTS=y
+CONFIG_GENERIC_CLOCKEVENTS_BUILD=y
+CONFIG_GENERIC_CMOS_UPDATE=y
+
+#
+# Timers subsystem
+#
+CONFIG_HZ_PERIODIC=y
+# CONFIG_NO_HZ_IDLE is not set
+# CONFIG_NO_HZ is not set
+# CONFIG_HIGH_RES_TIMERS is not set
+
+#
+# CPU/Task time and stats accounting
+#
+CONFIG_TICK_CPU_ACCOUNTING=y
+# CONFIG_BSD_PROCESS_ACCT is not set
+# CONFIG_TASKSTATS is not set
#
# RCU Subsystem
#
CONFIG_TINY_RCU=y
# CONFIG_PREEMPT_RCU is not set
-# CONFIG_RCU_TRACE is not set
+# CONFIG_RCU_STALL_COMMON is not set
# CONFIG_TREE_RCU_TRACE is not set
CONFIG_IKCONFIG=y
CONFIG_IKCONFIG_PROC=y
CONFIG_LOG_BUF_SHIFT=15
# CONFIG_CGROUPS is not set
+# CONFIG_CHECKPOINT_RESTORE is not set
# CONFIG_NAMESPACES is not set
+CONFIG_UIDGID_CONVERTED=y
+# CONFIG_UIDGID_STRICT_TYPE_CHECKS is not set
# CONFIG_SCHED_AUTOGROUP is not set
# CONFIG_SYSFS_DEPRECATED is not set
# CONFIG_RELAY is not set
@@ -61,14 +82,14 @@ CONFIG_LOG_BUF_SHIFT=15
CONFIG_CC_OPTIMIZE_FOR_SIZE=y
CONFIG_SYSCTL=y
CONFIG_ANON_INODES=y
+CONFIG_HAVE_UID16=y
+CONFIG_SYSCTL_EXCEPTION_TRACE=y
CONFIG_EXPERT=y
CONFIG_UID16=y
CONFIG_SYSCTL_SYSCALL=y
# CONFIG_KALLSYMS is not set
-CONFIG_HOTPLUG=y
CONFIG_PRINTK=y
CONFIG_BUG=y
-# CONFIG_ELF_CORE is not set
# CONFIG_BASE_FULL is not set
CONFIG_FUTEX=y
CONFIG_EPOLL=y
@@ -77,13 +98,13 @@ CONFIG_TIMERFD=y
CONFIG_EVENTFD=y
CONFIG_SHMEM=y
CONFIG_AIO=y
+# CONFIG_PCI_QUIRKS is not set
CONFIG_EMBEDDED=y
#
# Kernel Performance Events And Counters
#
# CONFIG_VM_EVENT_COUNTERS is not set
-# CONFIG_PCI_QUIRKS is not set
# CONFIG_COMPAT_BRK is not set
CONFIG_SLAB=y
# CONFIG_SLUB is not set
@@ -91,10 +112,17 @@ CONFIG_SLAB=y
# CONFIG_PROFILING is not set
CONFIG_HAVE_OPROFILE=y
# CONFIG_JUMP_LABEL is not set
+# CONFIG_HAVE_64BIT_ALIGNED_ACCESS is not set
CONFIG_HAVE_ARCH_TRACEHOOK=y
CONFIG_HAVE_DMA_ATTRS=y
+CONFIG_GENERIC_SMP_IDLE_THREAD=y
CONFIG_HAVE_DMA_API_DEBUG=y
CONFIG_HAVE_ARCH_JUMP_LABEL=y
+CONFIG_ARCH_WANT_IPC_PARSE_VERSION=y
+CONFIG_MODULES_USE_ELF_RELA=y
+CONFIG_ODD_RT_SIGACTION=y
+CONFIG_OLD_SIGSUSPEND=y
+CONFIG_OLD_SIGACTION=y
#
# GCOV-based kernel profiling
@@ -109,49 +137,35 @@ CONFIG_MODULE_UNLOAD=y
CONFIG_MODULE_FORCE_UNLOAD=y
# CONFIG_MODVERSIONS is not set
# CONFIG_MODULE_SRCVERSION_ALL is not set
+# CONFIG_MODULE_SIG is not set
CONFIG_BLOCK=y
# CONFIG_LBDAF is not set
# CONFIG_BLK_DEV_BSG is not set
+# CONFIG_BLK_DEV_BSGLIB is not set
# CONFIG_BLK_DEV_INTEGRITY is not set
#
+# Partition Types
+#
+# CONFIG_PARTITION_ADVANCED is not set
+CONFIG_MSDOS_PARTITION=y
+CONFIG_SUN_PARTITION=y
+CONFIG_EFI_PARTITION=y
+
+#
# IO Schedulers
#
CONFIG_IOSCHED_NOOP=y
# CONFIG_IOSCHED_DEADLINE is not set
-CONFIG_IOSCHED_CFQ=y
-CONFIG_DEFAULT_CFQ=y
-# CONFIG_DEFAULT_NOOP is not set
-CONFIG_DEFAULT_IOSCHED="cfq"
-# CONFIG_INLINE_SPIN_TRYLOCK is not set
-# CONFIG_INLINE_SPIN_TRYLOCK_BH is not set
-# CONFIG_INLINE_SPIN_LOCK is not set
-# CONFIG_INLINE_SPIN_LOCK_BH is not set
-# CONFIG_INLINE_SPIN_LOCK_IRQ is not set
-# CONFIG_INLINE_SPIN_LOCK_IRQSAVE is not set
-CONFIG_INLINE_SPIN_UNLOCK=y
-# CONFIG_INLINE_SPIN_UNLOCK_BH is not set
+# CONFIG_IOSCHED_CFQ is not set
+# CONFIG_DEFAULT_CFQ is not set
+CONFIG_DEFAULT_NOOP=y
+CONFIG_DEFAULT_IOSCHED="noop"
CONFIG_INLINE_SPIN_UNLOCK_IRQ=y
-# CONFIG_INLINE_SPIN_UNLOCK_IRQRESTORE is not set
-# CONFIG_INLINE_READ_TRYLOCK is not set
-# CONFIG_INLINE_READ_LOCK is not set
-# CONFIG_INLINE_READ_LOCK_BH is not set
-# CONFIG_INLINE_READ_LOCK_IRQ is not set
-# CONFIG_INLINE_READ_LOCK_IRQSAVE is not set
CONFIG_INLINE_READ_UNLOCK=y
-# CONFIG_INLINE_READ_UNLOCK_BH is not set
CONFIG_INLINE_READ_UNLOCK_IRQ=y
-# CONFIG_INLINE_READ_UNLOCK_IRQRESTORE is not set
-# CONFIG_INLINE_WRITE_TRYLOCK is not set
-# CONFIG_INLINE_WRITE_LOCK is not set
-# CONFIG_INLINE_WRITE_LOCK_BH is not set
-# CONFIG_INLINE_WRITE_LOCK_IRQ is not set
-# CONFIG_INLINE_WRITE_LOCK_IRQSAVE is not set
CONFIG_INLINE_WRITE_UNLOCK=y
-# CONFIG_INLINE_WRITE_UNLOCK_BH is not set
CONFIG_INLINE_WRITE_UNLOCK_IRQ=y
-# CONFIG_INLINE_WRITE_UNLOCK_IRQRESTORE is not set
-# CONFIG_MUTEX_SPIN_ON_OWNER is not set
# CONFIG_FREEZER is not set
#
@@ -165,25 +179,28 @@ CONFIG_HZ_250=y
CONFIG_HZ=250
# CONFIG_SCHED_HRTICK is not set
CONFIG_RWSEM_GENERIC_SPINLOCK=y
-CONFIG_GENERIC_FIND_NEXT_BIT=y
-CONFIG_GENERIC_FIND_BIT_LE=y
CONFIG_GENERIC_HWEIGHT=y
CONFIG_GENERIC_CALIBRATE_DELAY=y
CONFIG_ARCH_MAY_HAVE_PC_FDC=y
CONFIG_EMULATED_CMPXCHG=y
-CONFIG_SELECT_MEMORY_MODEL=y
-CONFIG_FLATMEM_MANUAL=y
CONFIG_FLATMEM=y
CONFIG_FLAT_NODE_MEM_MAP=y
+# CONFIG_HAVE_BOOTMEM_INFO_NODE is not set
CONFIG_PAGEFLAGS_EXTENDED=y
CONFIG_SPLIT_PTLOCK_CPUS=4
# CONFIG_COMPACTION is not set
# CONFIG_PHYS_ADDR_T_64BIT is not set
CONFIG_ZONE_DMA_FLAG=1
-CONFIG_BOUNCE=y
+# CONFIG_BOUNCE is not set
# CONFIG_KSM is not set
CONFIG_DEFAULT_MMAP_MIN_ADDR=4096
+# CONFIG_CROSS_MEMORY_ATTACH is not set
CONFIG_NEED_PER_CPU_KM=y
+# CONFIG_CLEANCACHE is not set
+# CONFIG_ZBUD is not set
+CONFIG_PREEMPT_NONE=y
+# CONFIG_PREEMPT_VOLUNTARY is not set
+# CONFIG_PREEMPT is not set
CONFIG_SUN_PM=y
# CONFIG_SPARC_LED is not set
CONFIG_SERIAL_CONSOLE=y
@@ -196,26 +213,38 @@ CONFIG_SBUS=y
CONFIG_SBUSCHAR=y
CONFIG_PCI=y
CONFIG_PCI_SYSCALL=y
-# CONFIG_ARCH_SUPPORTS_MSI is not set
+CONFIG_PCIC_PCI=y
+# CONFIG_PCI_DEBUG is not set
+# CONFIG_PCI_REALLOC_ENABLE_AUTO is not set
# CONFIG_PCI_STUB is not set
# CONFIG_PCI_IOV is not set
+# CONFIG_PCI_PRI is not set
+# CONFIG_PCI_PASID is not set
+
+#
+# PCI host controller drivers
+#
# CONFIG_PCCARD is not set
# CONFIG_SUN_OPENPROMFS is not set
-CONFIG_SPARC32_PCI=y
#
# Executable file formats
#
CONFIG_BINFMT_ELF=y
+CONFIG_BINFMT_SCRIPT=y
# CONFIG_HAVE_AOUT is not set
# CONFIG_BINFMT_MISC is not set
+# CONFIG_COREDUMP is not set
CONFIG_NET=y
#
# Networking options
#
CONFIG_PACKET=y
+# CONFIG_PACKET_DIAG is not set
CONFIG_UNIX=y
+# CONFIG_UNIX_DIAG is not set
+# CONFIG_XFRM_USER is not set
# CONFIG_NET_KEY is not set
CONFIG_INET=y
# CONFIG_IP_MULTICAST is not set
@@ -223,6 +252,7 @@ CONFIG_INET=y
# CONFIG_IP_PNP is not set
# CONFIG_NET_IPIP is not set
# CONFIG_NET_IPGRE_DEMUX is not set
+# CONFIG_NET_IP_TUNNEL is not set
# CONFIG_ARPD is not set
# CONFIG_SYN_COOKIES is not set
# CONFIG_INET_AH is not set
@@ -250,7 +280,7 @@ CONFIG_DEFAULT_TCP_CONG="cubic"
# CONFIG_ATM is not set
# CONFIG_L2TP is not set
# CONFIG_BRIDGE is not set
-# CONFIG_NET_DSA is not set
+CONFIG_HAVE_NET_DSA=y
# CONFIG_VLAN_8021Q is not set
# CONFIG_DECNET is not set
# CONFIG_LLC2 is not set
@@ -258,13 +288,19 @@ CONFIG_DEFAULT_TCP_CONG="cubic"
# CONFIG_ATALK is not set
# CONFIG_X25 is not set
# CONFIG_LAPB is not set
-# CONFIG_ECONET is not set
-# CONFIG_WAN_ROUTER is not set
# CONFIG_PHONET is not set
# CONFIG_IEEE802154 is not set
# CONFIG_NET_SCHED is not set
# CONFIG_DCB is not set
# CONFIG_BATMAN_ADV is not set
+# CONFIG_OPENVSWITCH is not set
+# CONFIG_VSOCKETS is not set
+# CONFIG_NETLINK_MMAP is not set
+# CONFIG_NETLINK_DIAG is not set
+# CONFIG_NET_MPLS_GSO is not set
+CONFIG_NET_RX_BUSY_POLL=y
+CONFIG_BQL=y
+# CONFIG_BPF_JIT is not set
#
# Network testing
@@ -281,6 +317,8 @@ CONFIG_DEFAULT_TCP_CONG="cubic"
# CONFIG_NET_9P is not set
# CONFIG_CAIF is not set
# CONFIG_CEPH_LIB is not set
+# CONFIG_NFC is not set
+CONFIG_HAVE_BPF_JIT=y
#
# Device Drivers
@@ -295,7 +333,15 @@ CONFIG_DEVTMPFS_MOUNT=y
# CONFIG_STANDALONE is not set
# CONFIG_PREVENT_FIRMWARE_BUILD is not set
# CONFIG_FW_LOADER is not set
+# CONFIG_DEBUG_DRIVER is not set
+# CONFIG_DEBUG_DEVRES is not set
# CONFIG_SYS_HYPERVISOR is not set
+# CONFIG_GENERIC_CPU_DEVICES is not set
+# CONFIG_DMA_SHARED_BUFFER is not set
+
+#
+# Bus devices
+#
# CONFIG_CONNECTOR is not set
# CONFIG_MTD is not set
CONFIG_OF=y
@@ -303,13 +349,41 @@ CONFIG_OF=y
#
# Device Tree and Open Firmware support
#
+# CONFIG_OF_SELFTEST is not set
CONFIG_OF_PROMTREE=y
-CONFIG_OF_DEVICE=y
CONFIG_OF_NET=y
+CONFIG_OF_PCI=y
# CONFIG_PARPORT is not set
# CONFIG_BLK_DEV is not set
+
+#
+# Misc devices
+#
# CONFIG_SENSORS_LIS3LV02D is not set
-# CONFIG_MISC_DEVICES is not set
+# CONFIG_DUMMY_IRQ is not set
+# CONFIG_PHANTOM is not set
+# CONFIG_SGI_IOC4 is not set
+# CONFIG_TIFM_CORE is not set
+# CONFIG_ATMEL_SSC is not set
+# CONFIG_ENCLOSURE_SERVICES is not set
+# CONFIG_HP_ILO is not set
+# CONFIG_PCH_PHUB is not set
+# CONFIG_SRAM is not set
+# CONFIG_C2PORT is not set
+
+#
+# EEPROM support
+#
+# CONFIG_EEPROM_93CX6 is not set
+# CONFIG_CB710_CORE is not set
+
+#
+# Texas Instruments shared transport line discipline
+#
+
+#
+# Altera FPGA firmware download module
+#
CONFIG_HAVE_IDE=y
# CONFIG_IDE is not set
@@ -337,7 +411,6 @@ CONFIG_SCSI_DMA=y
# CONFIG_SCSI_CONSTANTS is not set
# CONFIG_SCSI_LOGGING is not set
# CONFIG_SCSI_SCAN_ASYNC is not set
-CONFIG_SCSI_WAIT_SCAN=m
#
# SCSI Transports
@@ -367,11 +440,14 @@ CONFIG_SCSI_LOWLEVEL=y
# CONFIG_SCSI_AIC79XX is not set
# CONFIG_SCSI_AIC94XX is not set
# CONFIG_SCSI_MVSAS is not set
+# CONFIG_SCSI_MVUMI is not set
# CONFIG_SCSI_ARCMSR is not set
# CONFIG_MEGARAID_NEWGEN is not set
# CONFIG_MEGARAID_LEGACY is not set
# CONFIG_MEGARAID_SAS is not set
# CONFIG_SCSI_MPT2SAS is not set
+# CONFIG_SCSI_MPT3SAS is not set
+# CONFIG_SCSI_UFSHCD is not set
# CONFIG_SCSI_HPTIOP is not set
# CONFIG_LIBFC is not set
# CONFIG_LIBFCOE is not set
@@ -397,6 +473,7 @@ CONFIG_SCSI_SUNESP=y
# CONFIG_SCSI_PM8001 is not set
# CONFIG_SCSI_SRP is not set
# CONFIG_SCSI_BFA_FC is not set
+# CONFIG_SCSI_CHELSIO_FCOE is not set
# CONFIG_SCSI_DH is not set
# CONFIG_SCSI_OSD_INITIATOR is not set
# CONFIG_ATA is not set
@@ -411,63 +488,174 @@ CONFIG_SCSI_SUNESP=y
# CONFIG_FIREWIRE_NOSY is not set
# CONFIG_I2O is not set
CONFIG_NETDEVICES=y
-# CONFIG_DUMMY is not set
+CONFIG_NET_CORE=y
# CONFIG_BONDING is not set
-# CONFIG_MACVLAN is not set
+# CONFIG_DUMMY is not set
# CONFIG_EQUALIZER is not set
+# CONFIG_NET_FC is not set
+# CONFIG_NET_TEAM is not set
+# CONFIG_MACVLAN is not set
+# CONFIG_VXLAN is not set
+# CONFIG_NETCONSOLE is not set
+# CONFIG_NETPOLL is not set
+# CONFIG_NET_POLL_CONTROLLER is not set
# CONFIG_TUN is not set
# CONFIG_VETH is not set
+# CONFIG_NLMON is not set
# CONFIG_ARCNET is not set
-# CONFIG_MII is not set
-# CONFIG_PHYLIB is not set
-CONFIG_NET_ETHERNET=y
-CONFIG_SUNLANCE=y
-# CONFIG_HAPPYMEAL is not set
-# CONFIG_SUNBMAC is not set
-# CONFIG_SUNQE is not set
-# CONFIG_SUNGEM is not set
-# CONFIG_CASSINI is not set
+
+#
+# CAIF transport drivers
+#
+
+#
+# Distributed Switch Architecture drivers
+#
+# CONFIG_NET_DSA_MV88E6XXX is not set
+# CONFIG_NET_DSA_MV88E6060 is not set
+# CONFIG_NET_DSA_MV88E6XXX_NEED_PPU is not set
+# CONFIG_NET_DSA_MV88E6131 is not set
+# CONFIG_NET_DSA_MV88E6123_61_65 is not set
+CONFIG_ETHERNET=y
# CONFIG_NET_VENDOR_3COM is not set
-# CONFIG_ETHOC is not set
+CONFIG_NET_VENDOR_ADAPTEC=y
+# CONFIG_ADAPTEC_STARFIRE is not set
# CONFIG_GRETH is not set
+CONFIG_NET_VENDOR_ALTEON=y
+# CONFIG_ACENIC is not set
+CONFIG_NET_VENDOR_AMD=y
+# CONFIG_AMD8111_ETH is not set
+# CONFIG_PCNET32 is not set
+CONFIG_SUNLANCE=y
+CONFIG_NET_VENDOR_ARC=y
+CONFIG_NET_VENDOR_ATHEROS=y
+# CONFIG_ATL2 is not set
+# CONFIG_ATL1 is not set
+# CONFIG_ATL1E is not set
+# CONFIG_ATL1C is not set
+# CONFIG_ALX is not set
+CONFIG_NET_CADENCE=y
+# CONFIG_ARM_AT91_ETHER is not set
+# CONFIG_MACB is not set
+CONFIG_NET_VENDOR_BROADCOM=y
+# CONFIG_B44 is not set
+# CONFIG_BNX2 is not set
+# CONFIG_CNIC is not set
+# CONFIG_TIGON3 is not set
+# CONFIG_BNX2X is not set
+CONFIG_NET_VENDOR_BROCADE=y
+# CONFIG_BNA is not set
+# CONFIG_NET_CALXEDA_XGMAC is not set
+CONFIG_NET_VENDOR_CHELSIO=y
+# CONFIG_CHELSIO_T1 is not set
+# CONFIG_CHELSIO_T3 is not set
+# CONFIG_CHELSIO_T4 is not set
+# CONFIG_CHELSIO_T4VF is not set
+CONFIG_NET_VENDOR_CISCO=y
+# CONFIG_ENIC is not set