Merge branch 'master' of git+ssh://openadk.org/git/openadk

mk/image.mk

@@ -95,6 +95,7 @@ ifeq ($(ADK_TARGET_ABI_N64),y)
 	mv ${TARGET_DIR}/lib/* ${TARGET_DIR}/${ADK_TARGET_LIBC_PATH}
 	rm -rf ${TARGET_DIR}/lib/
 	ln -sf /${ADK_TARGET_LIBC_PATH} ${TARGET_DIR}/lib
+	-mkdir ${TARGET_DIR}/usr/${ADK_TARGET_LIBC_PATH} 2>/dev/null
 	mv ${TARGET_DIR}/usr/lib/* ${TARGET_DIR}/usr/${ADK_TARGET_LIBC_PATH}
 	rm -rf ${TARGET_DIR}/usr/lib/
 	(cd ${TARGET_DIR}/usr ; ln -sf ${ADK_TARGET_LIBC_PATH} lib)

mk/kernel-build.mk

@@ -5,7 +5,12 @@ include $(TOPDIR)/rules.mk
 include $(TOPDIR)/mk/linux.mk
 include ${TOPDIR}/mk/kernel-vars.mk
 
+KERNEL_FILE:=$(ADK_TARGET_KERNEL)
 KERNEL_TARGET:=$(ADK_TARGET_KERNEL)
+ifeq ($(ADK_TARGET_KERNEL_BZIMAGE),y)
+KERNEL_FILE:=vmlinux
+KERNEL_TARGET:=all
+endif
 
 $(TOOLCHAIN_BUILD_DIR)/w-$(PKG_NAME)-$(PKG_VERSION)-$(PKG_RELEASE)/linux-$(KERNEL_VERSION)/.patched:
 	$(TRACE) target/kernel-patch
@@ -27,7 +32,7 @@ $(LINUX_DIR)/.config: $(LINUX_DIR)/.prepared $(BUILD_DIR)/.kernelconfig $(TOPDIR
 	${KERNEL_MAKE_ENV} $(MAKE) ${KERNEL_MAKE_OPTS} prepare scripts $(MAKE_TRACE)
 	touch -c $(LINUX_DIR)/.config
 
-$(LINUX_DIR)/$(KERNEL_TARGET): $(LINUX_DIR)/.config
+$(LINUX_DIR)/$(KERNEL_FILE): $(LINUX_DIR)/.config
 	-rm $(LINUX_DIR)/$(KERNEL_TARGET) 2>/dev/null
 	$(TRACE) target/$(ADK_TARGET_ARCH)-kernel-compile
 	${KERNEL_MAKE_ENV} $(MAKE) V=1 ${KERNEL_MAKE_OPTS} -j${ADK_MAKE_JOBS} LOCALVERSION="" $(KERNEL_TARGET) $(MAKE_TRACE)
@@ -41,10 +46,10 @@ $(LINUX_DIR)/$(KERNEL_TARGET): $(LINUX_DIR)/.config
 ifneq ($(strip $(TARGETS)),)
 	$(MAKE) $(TARGETS)
 endif
-	touch -c $(LINUX_DIR)/$(KERNEL_TARGET)
+	touch -c $(LINUX_DIR)/$(KERNEL_FILE)
 
 prepare:
-compile: $(LINUX_DIR)/$(KERNEL_TARGET)
+compile: $(LINUX_DIR)/$(KERNEL_FILE)
 install: compile
 ifneq ($(strip $(INSTALL_TARGETS)),)
 	$(TRACE) target/${ADK_TARGET_ARCH}-modules-install

package/flex/Makefile

@@ -9,6 +9,7 @@ PKG_RELEASE:=		1
 PKG_MD5SUM:=		201d3f38758d95436cbc64903386de0b
 PKG_DESCR:=		fast lexical analyzer
 PKG_SECTION:=		lang
+PKG_BUILDDEP:=		m4-host
 PKG_URL:=		http://flex.sourceforge.net/
 PKG_SITES:=		${MASTER_SITE_SOURCEFORGE:=${PKG_NAME}/}
 PKG_OPTS:=		dev

package/vsftpd/Makefile

@@ -4,13 +4,15 @@
 include ${TOPDIR}/rules.mk
 
 PKG_NAME:=		vsftpd
-PKG_VERSION:=		2.3.4
+PKG_VERSION:=		3.0.2
 PKG_RELEASE:=		1
-PKG_MD5SUM:=		2ea5d19978710527bb7444d93b67767a
+PKG_MD5SUM:=		8b00c749719089401315bd3c44dddbb2
 PKG_DESCR:=		a fast and secure FTP server
 PKG_SECTION:=		www
+PKG_DEPENDS:=		libcap
+PKG_BUILDDEP:=		libcap
 PKG_URL:=		http://vsftpd.beasts.org/
-PKG_SITES:=		http://security.appspot.com/downloads/
+PKG_SITES:=		https://security.appspot.com/downloads/
 
 include ${TOPDIR}/mk/package.mk
 

package/vsftpd/patches/patch-Makefile

@@ -1,34 +1,28 @@
-$Id: update-patches 24 2008-08-31 14:56:13Z wbx $
---- vsftpd-2.3.4.orig/Makefile	2009-05-22 21:44:52.000000000 +0200
-+++ vsftpd-2.3.4/Makefile	2011-10-13 21:01:57.600352003 +0200
-@@ -1,12 +1,12 @@
+--- vsftpd-3.0.2.orig/Makefile	2012-09-16 09:27:35.000000000 +0200
++++ vsftpd-3.0.2/Makefile	2013-11-09 11:38:47.000000000 +0100
+@@ -1,16 +1,16 @@
  # Makefile for systems with GNU tools
 -CC 	=	gcc
 +CC 	?=	gcc
  INSTALL	=	install
  IFLAGS  = -idirafter dummyinc
  #CFLAGS = -g
--CFLAGS	=	-O2 -Wall -W -Wshadow #-pedantic -Werror -Wconversion
-+CFLAGS	?=	-O2 -Wall -W -Wshadow #-pedantic -Werror -Wconversion
+-CFLAGS	=	-O2 -fPIE -fstack-protector --param=ssp-buffer-size=4 \
++CFLAGS	?=	-O2 -fPIE -fstack-protector --param=ssp-buffer-size=4 \
+ 	-Wall -W -Wshadow -Werror -Wformat-security \
+ 	-D_FORTIFY_SOURCE=2 \
+ 	#-pedantic -Wconversion
  
 -LIBS	=	`./vsf_findlibs.sh`
--LINK	=	-Wl,-s
-+LIBS	=	-lcrypt
-+LINK	=
++LIBS	=	-lcap -lcrypt
+ LINK	=	-Wl,-s
+-LDFLAGS	=	-fPIE -pie -Wl,-z,relro -Wl,-z,now
++LDFLAGS	?=	-fPIE -pie -Wl,-z,relro -Wl,-z,now
  
  OBJS	=	main.o utility.o prelogin.o ftpcmdio.o postlogin.o privsock.o \
  		tunables.o ftpdataio.o secbuf.o ls.o \
-@@ -17,6 +17,8 @@ OBJS	=	main.o utility.o prelogin.o ftpcm
-     ssl.o sslslave.o ptracesandbox.o ftppolicy.o sysutil.o sysdeputil.o
- 
- 
-+DESTDIR =
-+
- .c.o:
- 	$(CC) -c $*.c $(CFLAGS) $(IFLAGS)
- 
-@@ -24,21 +26,20 @@ vsftpd: $(OBJS)
- 	$(CC) -o vsftpd $(OBJS) $(LINK) $(LIBS) $(LDFLAGS)
+@@ -29,21 +29,8 @@ vsftpd: $(OBJS) 
+ 	$(CC) -o vsftpd $(OBJS) $(LINK) $(LDFLAGS) $(LIBS)
  
  install:
 -	if [ -x /usr/local/sbin ]; then \
@@ -47,19 +41,7 @@ $Id: update-patches 24 2008-08-31 14:56:13Z wbx $
 -	if [ -x /etc/xinetd.d ]; then \
 -		$(INSTALL) -m 644 xinetd.d/vsftpd /etc/xinetd.d/vsftpd; fi
 +	mkdir -p $(DESTDIR)/usr/sbin
-+	$(INSTALL) -m 755 vsftpd $(DESTDIR)/usr/sbin/
-+	mkdir -p $(DESTDIR)/usr/share/man/man8
-+	$(INSTALL) -m 644 vsftpd.8 $(DESTDIR)/usr/share/man/man8/
-+	mkdir -p $(DESTDIR)/usr/share/man/man5
-+	$(INSTALL) -m 644 vsftpd.conf.5 $(DESTDIR)/usr/share/man/man5/
-+	mkdir -p $(DESTDIR)/etc/xinetd.d
-+	$(INSTALL) -m 644 xinetd.d/vsftpd $(DESTDIR)/etc/xinetd.d/
-+
-+uninstall:
-+	rm -f $(DESTDIR)/usr/sbin/vsftpd
-+	rm -f $(DESTDIR)/usr/share/man/man8/vsftpd.8
-+	rm -f $(DESTDIR)/usr/share/man/man5/vsftpd.conf.5
-+	rm -f $(DESTDIR)/etc/xinetd.d/vsftpd
++	$(INSTALL) -m 755 vsftpd $(DESTDIR)/usr/sbin/vsftpd
  
  clean:
  	rm -f *.o *.swp vsftpd

package/vsftpd/patches/patch-builddefs_h

@@ -1,11 +1,14 @@
---- vsftpd-2.3.4.orig/builddefs.h	2010-08-06 02:50:31.000000000 +0200
-+++ vsftpd-2.3.4/builddefs.h	2011-10-13 21:06:37.080352120 +0200
-@@ -2,7 +2,7 @@
+--- vsftpd-3.0.2.orig/builddefs.h	2012-04-05 05:24:56.000000000 +0200
++++ vsftpd-3.0.2/builddefs.h	2013-11-09 11:31:34.000000000 +0100
+@@ -2,8 +2,10 @@
  #define VSF_BUILDDEFS_H
  
  #undef VSF_BUILD_TCPWRAPPERS
 -#define VSF_BUILD_PAM
 +#undef VSF_BUILD_PAM
  #undef VSF_BUILD_SSL
++#undef VSF_SYSDEP_HAVE_LIBCAP
++#undef VSF_SYSDEP_HAVE_CAPABILITIES
  
  #endif /* VSF_BUILDDEFS_H */
+ 

package/xf86-input-evdev/Makefile

@@ -9,10 +9,11 @@ PKG_RELEASE:=		1
 PKG_MD5SUM:=		2d3f7111b8284cec81884023c4bb4a11
 PKG_DESCR:=		X11 driver for Event driver
 PKG_SECTION:=		x11/drivers
-PKG_DEPENDS:=		xorg-server kmod-input-evdev
-PKG_BUILDDEP:=		xorg-server
+PKG_DEPENDS:=		xorg-server kmod-input-evdev libudev
+PKG_BUILDDEP:=		xorg-server systemd
 PKG_SITES:=		${MASTER_SITE_XORG}
 
+PKG_LIBC_DEPENDS:=	eglibc glibc musl
 PKG_ARCH_DEPENDS:=	!avr32 !m68k
 
 PKG_CFLINE_XF86_INPUT_EVDEV:= depends on ADK_TARGET_WITH_INPUT

target/config/Config.in

@@ -4,9 +4,13 @@
 config ADK_TARGET_KERNEL_VMLINUZ
 	boolean
 
+config ADK_TARGET_KERNEL_BZIMAGE
+	boolean
+
 config ADK_TARGET_KERNEL
 	string
 	default "vmlinuz" if ADK_TARGET_KERNEL_VMLINUZ
+	default "bzImage" if ADK_TARGET_KERNEL_BZIMAGE
 	default "vmlinux"
 
 config ADK_big
@@ -729,6 +733,7 @@ config ADK_TARGET_ROOTFS_MMC
 
 config ADK_TARGET_ROOTFS_ARCHIVE
 	bool "Archive usable for different filesystems"
+	select ADK_KERNEL_EXT2_FS if ADK_HARDWARE_QEMU
 	help
 	  Use this option if your root filesystem is ext2/ext3/ext4/xfs.
 

target/x86/sys-available/ibm-x40

@@ -1,5 +1,6 @@
 config ADK_TARGET_SYSTEM_IBM_X40
 	bool "IBM X40 laptop"
+	depends on ADK_BROKEN
 	select ADK_x86
 	select ADK_ibm_x40
 	select ADK_CPU_PENTIUM_M

target/x86/sys-available/intel-atom

@@ -1,5 +1,6 @@
 config ADK_TARGET_SYSTEM_INTEL_ATOM
 	bool "Intel Atom (NM10)"
+	depends on ADK_BROKEN
 	select ADK_x86
 	select ADK_intel_atom
 	select ADK_CPU_ATOM

target/x86/sys-available/pcengines-alix1c

@@ -20,6 +20,7 @@ config ADK_TARGET_SYSTEM_PCENGINES_ALIX1C
 	select ADK_TARGET_WITH_CF
 	select ADK_TARGET_WITH_WATCHDOG
 	select ADK_TARGET_WITH_USB_BOOT
+	select ADK_TARGET_KERNEL_BZIMAGE
 	help
          System profile for PCEngines ALIX1C. 
 

target/x86/sys-available/pcengines-alix2d13

@@ -14,6 +14,7 @@ config ADK_TARGET_SYSTEM_PCENGINES_ALIX2D13
 	select ADK_TARGET_WITH_LEDS
 	select ADK_TARGET_WITH_WATCHDOG
 	select ADK_TARGET_WITH_CF
+	select ADK_TARGET_KERNEL_BZIMAGE
 	help
          System profile for PCEngines ALIX2D13.
 

target/x86/sys-available/pcengines-alix2d2

@@ -13,6 +13,7 @@ config ADK_TARGET_SYSTEM_PCENGINES_ALIX2D2
 	select ADK_TARGET_WITH_LEDS
 	select ADK_TARGET_WITH_WATCHDOG
 	select ADK_TARGET_WITH_CF
+	select ADK_TARGET_KERNEL_BZIMAGE
 	help
          System profile for PCEngines ALIX2D2.
 

target/x86/sys-available/pcengines-wrap

@@ -7,6 +7,7 @@ config ADK_TARGET_SYSTEM_PCENGINES_WRAP
 	select ADK_TARGET_WITH_CF
 	select ADK_TARGET_WITH_MINIPCI
 	select ADK_TARGET_WITH_WATCHDOG
+	select ADK_TARGET_KERNEL_BZIMAGE
 	help
          System profile for PCEngines WRAP board.
 

target/x86/sys-available/qemu-i686

@@ -9,6 +9,7 @@ config ADK_TARGET_SYSTEM_QEMU_I686
 	select ADK_TARGET_WITH_PCI
 	select ADK_TARGET_WITH_HDD
 	select ADK_TARGET_WITH_USB
+	select ADK_TARGET_KERNEL_BZIMAGE
 	help
 	 Support for Qemu Emulator (i686).
 

target/x86/sys-available/vbox-i686

@@ -9,6 +9,7 @@ config ADK_TARGET_SYSTEM_VBOX_I686
 	select ADK_TARGET_WITH_PCI
 	select ADK_TARGET_WITH_HDD
 	select ADK_TARGET_WITH_SATA
+	select ADK_TARGET_KERNEL_BZIMAGE
 	help
 	 Support for VirtualBox Emulator (i686).
 

target/x86_64/sys-available/qemu-x86_64

@@ -11,6 +11,7 @@ config ADK_TARGET_SYSTEM_QEMU_X86_64
 	select ADK_TARGET_WITH_HDD
 	select ADK_TARGET_WITH_USB
 	select ADK_TARGET_KERNEL_MAY_64BIT
+	select ADK_TARGET_KERNEL_BZIMAGE
 	help
 	 Support for Qemu Emulator.
 

target/x86_64/sys-available/shuttle-sa76

@@ -1,5 +1,6 @@
 config ADK_TARGET_SYSTEM_SHUTTLE_SA76
 	bool "Shuttle SA76"
+	depends on ADK_BROKEN
 	select ADK_x86_64
 	select ADK_shuttle_sa76
 	select ADK_CPU_AMDFAM10

target/x86_64/sys-available/tarox-pc

@@ -1,5 +1,6 @@
 config ADK_TARGET_SYSTEM_TAROX_PC
 	bool "Tarox PC"
+	depends on ADK_BROKEN
 	select ADK_x86_64
 	select ADK_tarox_pc
 	select ADK_LINUX_64

toolchain/kernel-headers/patches/3.11.5/sgidefs.patch

@@ -0,0 +1,18 @@
+diff -Nur linux-3.11.5.orig/arch/mips/include/uapi/asm/sgidefs.h linux-3.11.5/arch/mips/include/uapi/asm/sgidefs.h
+--- linux-3.11.5.orig/arch/mips/include/uapi/asm/sgidefs.h	2013-10-14 03:14:45.000000000 +0200
++++ linux-3.11.5/arch/mips/include/uapi/asm/sgidefs.h	2013-11-08 22:01:28.000000000 +0100
+@@ -11,14 +11,6 @@
+ #define __ASM_SGIDEFS_H
+ 
+ /*
+- * Using a Linux compiler for building Linux seems logic but not to
+- * everybody.
+- */
+-#ifndef __linux__
+-#error Use a Linux compiler or give up.
+-#endif
+-
+-/*
+  * Definitions for the ISA levels
+  *
+  * With the introduction of MIPS32 / MIPS64 instruction sets definitions