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

16 files changed, 28 insertions, 7 deletions

diff --git a/mk/kernel-build.mk b/mk/kernel-build.mk
index 65c83c420..94749de5a 100644
--- a/mk/kernel-build.mk
+++ b/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
diff --git a/package/xf86-input-evdev/Makefile b/package/xf86-input-evdev/Makefile
index 2dddafd46..d2e5c3db3 100644
--- a/package/xf86-input-evdev/Makefile
+++ b/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
diff --git a/target/arm/uclibc.config.big b/target/arm/uclibc.config.big
index 51293a19b..6dacd4833 100644
--- a/target/arm/uclibc.config.big
+++ b/target/arm/uclibc.config.big
@@ -210,7 +210,7 @@ UCLIBC_HAS_FNMATCH=y
 UCLIBC_HAS_WORDEXP=y
 UCLIBC_HAS_NFTW=y
 UCLIBC_HAS_FTW=y
-# UCLIBC_HAS_FTS is not set
+UCLIBC_HAS_FTS=y
 UCLIBC_HAS_GLOB=y
 UCLIBC_HAS_GNU_GLOB=y
 # UCLIBC_HAS_UTMPX is not set
diff --git a/target/arm/uclibc.config.little b/target/arm/uclibc.config.little
index c388f5696..851ac0c06 100644
--- a/target/arm/uclibc.config.little
+++ b/target/arm/uclibc.config.little
@@ -210,7 +210,7 @@ UCLIBC_HAS_FNMATCH=y
 UCLIBC_HAS_WORDEXP=y
 UCLIBC_HAS_NFTW=y
 UCLIBC_HAS_FTW=y
-# UCLIBC_HAS_FTS is not set
+UCLIBC_HAS_FTS=y
 UCLIBC_HAS_GLOB=y
 UCLIBC_HAS_GNU_GLOB=y
 # UCLIBC_HAS_UTMPX is not set
diff --git a/target/config/Config.in b/target/config/Config.in
index bf7f3db97..d6cfaafd0 100644
--- a/target/config/Config.in
+++ b/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
diff --git a/target/x86/sys-available/ibm-x40 b/target/x86/sys-available/ibm-x40
index a517b5698..1327fb922 100644
--- a/target/x86/sys-available/ibm-x40
+++ b/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
diff --git a/target/x86/sys-available/intel-atom b/target/x86/sys-available/intel-atom
index 392a74d64..86bc85cd1 100644
--- a/target/x86/sys-available/intel-atom
+++ b/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
diff --git a/target/x86/sys-available/pcengines-alix1c b/target/x86/sys-available/pcengines-alix1c
index 4024ecb90..b14dd98a4 100644
--- a/target/x86/sys-available/pcengines-alix1c
+++ b/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. 
 
diff --git a/target/x86/sys-available/pcengines-alix2d13 b/target/x86/sys-available/pcengines-alix2d13
index b17184405..ee74dd18c 100644
--- a/target/x86/sys-available/pcengines-alix2d13
+++ b/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.
 
diff --git a/target/x86/sys-available/pcengines-alix2d2 b/target/x86/sys-available/pcengines-alix2d2
index c7611d898..84a63f9f6 100644
--- a/target/x86/sys-available/pcengines-alix2d2
+++ b/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.
 
diff --git a/target/x86/sys-available/pcengines-wrap b/target/x86/sys-available/pcengines-wrap
index d670b402a..5de5e3214 100644
--- a/target/x86/sys-available/pcengines-wrap
+++ b/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.
 
diff --git a/target/x86/sys-available/qemu-i686 b/target/x86/sys-available/qemu-i686
index e78d6579b..5de8554fa 100644
--- a/target/x86/sys-available/qemu-i686
+++ b/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).
 
diff --git a/target/x86/sys-available/vbox-i686 b/target/x86/sys-available/vbox-i686
index 88b5ec63c..97be46ec5 100644
--- a/target/x86/sys-available/vbox-i686
+++ b/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).
 
diff --git a/target/x86_64/sys-available/qemu-x86_64 b/target/x86_64/sys-available/qemu-x86_64
index abffcaae9..14e835daf 100644
--- a/target/x86_64/sys-available/qemu-x86_64
+++ b/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.
 
diff --git a/target/x86_64/sys-available/shuttle-sa76 b/target/x86_64/sys-available/shuttle-sa76
index 59e0054bb..557cc77cd 100644
--- a/target/x86_64/sys-available/shuttle-sa76
+++ b/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
diff --git a/target/x86_64/sys-available/tarox-pc b/target/x86_64/sys-available/tarox-pc
index 9c0c13c08..d6b068e06 100644
--- a/target/x86_64/sys-available/tarox-pc
+++ b/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