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

mk/kernel-vars.mk

@@ -18,4 +18,4 @@ ADK_KCPPFLAGS+=		-DBCM47XX_OVERRIDE_FLASHSIZE=0x800000 \
 			-DBCM47XX_OVERRIDE_CFESIZE=0x40000
 endif
 
-KERNEL_MAKE_ENV+=	KCPPFLAGS='${ADK_KCPPFLAGS}'
+KERNEL_MAKE_ENV+=	KCPPFLAGS='${ADK_KCPPFLAGS}' PATH="$$PATH:${TOOLS_DIR}"

package/base-files/src/etc/rc.shutdown

@@ -1,5 +1,6 @@
 #!/bin/sh
+cd /
+sync
 for i in $(grep -v ^# /etc/fstab 2>/dev/null|awk '{ print $2 }');do
-	printf Unmounting $i
-	umount $i
+	umount $i 2>/dev/null
 done

package/glib/Makefile

@@ -6,7 +6,7 @@ include ${TOPDIR}/rules.mk
 PKG_NAME:=		glib
 PKG_VERSION:=		2.28.1
 PKG_EXTRAVER:=		2.28
-PKG_RELEASE:=		1
+PKG_RELEASE:=		2
 PKG_MD5SUM:=		9f6e85e1e38490c3956f4415bcd33e6e
 PKG_DESCR:=		low-level core library that forms the basis of GTK+
 PKG_SECTION:=		libs
@@ -42,19 +42,6 @@ CONFIGURE_ENV+=		glib_cv_long_long_format=ll \
 			ac_cv_func_posix_getpwuid_r=yes \
 			ac_cv_func_posix_getgrgid_r=yes
 
-pre-configure:
-ifneq ($(OStype),FreeBSD)
-	(cd ${WRKBUILD}; rm -rf config.{cache,status}; \
-		CFLAGS="-L/usr/local/lib" ./configure --prefix=$(STAGING_HOST_DIR) \
-			--with-libiconv=gnu \
-	)
-	${MAKE} -C ${WRKBUILD} V=1
-	$(CP) ${WRKBUILD}/gio/.libs/glib-compile-schemas ${STAGING_HOST_DIR}/bin
-	$(CP) ${WRKBUILD}/gobject/.libs/glib-genmarshal ${STAGING_HOST_DIR}/bin
-	$(CP) ${WRKBUILD}/gobject/glib-mkenums ${STAGING_HOST_DIR}/bin
-	${MAKE} -C ${WRKBUILD} clean
-endif
-
 glib-install:
 	${INSTALL_DIR} ${IDIR_GLIB}/usr/lib
 	${CP} ${WRKINST}/usr/lib/libgio*.so* ${IDIR_GLIB}/usr/lib

package/libgcc/Makefile

@@ -11,7 +11,7 @@ PKG_DFLT_LIBGCC:=	y if !ADK_TOOLCHAIN_ONLY
 
 NO_DISTFILES:=		1
 
-PKG_ARCH_DEPENDS:=	!sh
+PKG_ARCH_DEPENDS:=	!sh !avr32
 
 include ${TOPDIR}/mk/package.mk
 

scripts/tar

@@ -3,7 +3,11 @@
 # material, please see the LICENCE file in the top-level directory.
 
 if [ -z "$(which gtar 2>/dev/null)" ];then
-	/bin/tar "$@"
+	if [ -x /bin/tar ];then
+		/bin/tar "$@"
+	else
+		/usr/bin/tar "$@"
+	fi
 else
 	gtar "$@"
 fi

target/tools/uboot-mkimage/Makefile

@@ -1,4 +0,0 @@
-include $(TOPDIR)/rules.mk
-
-all: mkimage.c crc32.c
-	$(CC_FOR_BUILD) ${FLAGS_FOR_BUILD} -o ${STAGING_HOST_DIR}/bin/mkimage mkimage.c crc32.c

toolchain/Config.in

@@ -7,7 +7,7 @@ menu "Toolchain settings"
 config ADK_TOOLCHAIN_GDB
 	prompt "Enable building of the GNU debugger"
 	boolean
-	default y
+	default y if !ADK_TARGET_SYSTEM_ATMEL_NGW100
 
 config ADK_TOOLCHAIN_GCC_CXX
 	prompt "Enable building of G++ (C++ language support in GCC)"

toolchain/binutils/Makefile

@@ -25,8 +25,6 @@ $(WRKBUILD)/.configured:
 	(cd $(WRKBUILD); \
 		$(WRKBUILD)/configure \
 		--prefix=$(STAGING_HOST_DIR) \
-		--build=$(GNU_HOST_NAME) \
-		--host=$(GNU_HOST_NAME) \
 		--target=$(REAL_GNU_TARGET_NAME) \
 		--with-sysroot=$(STAGING_TARGET_DIR) \
 		--disable-multilib \

toolchain/eglibc/Makefile

@@ -64,6 +64,7 @@ $(WRKBUILD)/.headers: $(WRKBUILD)/.headers_configure
 		$(MAKE) install-headers install-bootstrap-headers=yes \
 	);
 	touch $(STAGING_TARGET_DIR)/usr/include/gnu/stubs.h
+	touch $(STAGING_TARGET_DIR)/usr/include/gnu/stubs-64.h
 	touch $@
 
 ifeq ($(ADK_TOOLCHAIN_GCC_USE_SSP),y)

toolchain/gmp/Makefile

@@ -12,7 +12,9 @@ endif
 
 $(WRKBUILD)/.headers:
 $(WRKBUILD)/.configured:
+ifneq ($(OStype),Darwin)
 	(cd $(WRKBUILD); cp configfsf.guess config.guess)
+endif
 	(cd $(WRKBUILD); \
 		./configure \
 		--prefix=$(STAGING_HOST_DIR) \

tools/Makefile

@@ -3,7 +3,7 @@
 
 include $(TOPDIR)/rules.mk
 
-TARGETS:=adk mkcrypt cpio
+TARGETS:=adk mkcrypt cpio mkimage
 
 TARGETS_INSTALL:=$(patsubst %,%-install,$(TARGETS))
 TARGETS_CLEAN:=$(patsubst %,%-clean,$(TARGETS))

tools/mkimage/Makefile

@@ -0,0 +1,11 @@
+# This file is part of the OpenADK project. OpenADK is copyrighted
+# material, please see the LICENCE file in the top-level directory.
+
+include $(TOPDIR)/rules.mk
+
+install: ${TOOLS_DIR}/mkimage
+
+${TOOLS_DIR}/mkimage: mkimage.c crc32.c
+	$(CC_FOR_BUILD) ${FLAGS_FOR_BUILD} -o $@ mkimage.c crc32.c
+
+include $(TOPDIR)/mk/tools.mk