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

package/xkbcomp/Makefile

@@ -5,10 +5,12 @@ include $(TOPDIR)/rules.mk
 
 PKG_NAME:=		xkbcomp
 PKG_VERSION:=		1.0.5
-PKG_RELEASE:=		1
+PKG_RELEASE:=		2
 PKG_MD5SUM:=		10e6661a35aa994a9aa73ded0cf70259
 PKG_DESCR:=		x11 keyboard compiler
 PKG_SECTION:=		x11/libs
+PKG_BUILDDEP:=		libxkbfile libX11
+PKG_DEPENDS:=		libxkbfile libx11
 PKG_SITES:=		http://xorg.freedesktop.org/releases/X11R7.4/src/everything/
 
 include $(TOPDIR)/mk/package.mk

target/arm/Makefile

@@ -51,7 +51,11 @@ imageinstall: kernel-install $(BIN_DIR)/$(ROOTFSTARBALL)
 	@echo "If you just want to update, use adkupdate."
 endif
 ifeq ($(ADK_TARGET_FS),archive)
+ifeq ($(ADK_TARGET_SYSTEM_ACMESYSTEMS_FOXG20),y)
+imageinstall: kernel-install $(BIN_DIR)/$(ROOTFSTARBALL)
+else
 imageinstall: $(BIN_DIR)/$(ROOTFSTARBALL)
+endif
 	@echo "The RootFS tarball is: $(BIN_DIR)/$(ROOTFSTARBALL)"
 ifeq ($(ADK_TARGET_SYSTEM_RASPBERRY_PI),y)
 	@echo "Use following command to install it on SD card:"

toolchain/uClibc/patches/0.9.33.2/avr32_atomic_fix.patch

@@ -0,0 +1,10 @@
+--- a/libc/sysdeps/linux/avr32/bits/atomic.h
++++ b/libc/sysdeps/linux/avr32/bits/atomic.h
+@@ -28,6 +28,7 @@ typedef uintmax_t uatomic_max_t;
+ 
+ #define __arch_compare_and_exchange_val_32_acq(mem, newval, oldval)	\
+ 	({								\
++		__uint32_t __result;					\
+ 		__typeof__(*(mem)) __prev;				\
+ 		__asm__ __volatile__(					\
+ 			"/* __arch_compare_and_exchange_val_32_acq */\n" \