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

Config.in

@@ -91,6 +91,8 @@ endmenu
 
 choice
 prompt "Kernel Version"
+depends on ADK_TOOLCHAIN_ONLY
+
 config ADK_KERNEL_VERSION_TOOLCHAIN
 	prompt "2.6.39.4"
 	boolean

mk/image.mk

@@ -90,7 +90,7 @@ ${BIN_DIR}/${ROOTFSUSERTARBALL}: ${TARGET_DIR}
 		${TOOLS_DIR}/cpio -o -Hustar -P | gzip -n9 >$@
 
 ${BIN_DIR}/${INITRAMFS}_list: ${TARGET_DIR}
-	sh ${LINUX_DIR}/scripts/gen_initramfs_list.sh -u squash -g squash \
+	bash ${LINUX_DIR}/scripts/gen_initramfs_list.sh -u squash -g squash \
 		${TARGET_DIR}/ >$@
 	( \
 		echo "nod /dev/console 0644 0 0 c 5 1"; \
@@ -104,7 +104,7 @@ ${BIN_DIR}/${INITRAMFS}_list: ${TARGET_DIR}
 	) >>$@
 
 ${BIN_DIR}/${INITRAMFS}: ${BIN_DIR}/${INITRAMFS}_list
-	sh ${LINUX_DIR}/usr/gen_init_cpio ${BIN_DIR}/${INITRAMFS}_list | \
+	bash ${LINUX_DIR}/usr/gen_init_cpio ${BIN_DIR}/${INITRAMFS}_list | \
 		${ADK_COMPRESSION_TOOL} -c >$@
 
 ${BUILD_DIR}/root.squashfs: ${TARGET_DIR}

package/grub/Makefile

@@ -14,11 +14,18 @@ PKG_SITES:=		ftp://alpha.gnu.org/gnu/grub/
 
 PKG_HOST_DEPENDS:=	linux
 PKG_ARCH_DEPENDS:=	x86 x86_64
+PKG_NOPARALLEL:=	1
 
 include $(TOPDIR)/mk/package.mk
 
 $(eval $(call PKG_template,GRUB,${PKG_NAME},$(PKG_VERSION)-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION}))
 
+ifeq ($(ADK_STATIC),y)
+TARGET_CFLAGS+=         -static
+TARGET_LDFLAGS+=        -static
+endif
+
+XAKE_FLAGS+=		GCC_HONOUR_COPTS=s  CPPFLAGS_FOR_BUILD="-I./include"
 CONFIGURE_ARGS+=	--disable-efiemu \
 			--disable-grub-mkfont \
 			--disable-grub-fstest

package/grub/patches/patch-conf_common_mk

@@ -1,11 +1,11 @@
 --- grub-1.98.orig/conf/common.mk	2010-03-06 21:52:26.000000000 +0100
-+++ grub-1.98/conf/common.mk	2010-06-26 18:20:29.307157138 +0200
++++ grub-1.98/conf/common.mk	2012-02-22 13:20:42.022360300 +0100
 @@ -11159,7 +11159,7 @@ trigtables.c: gentrigtables
  	./gentrigtables > $@
  DISTCLEANFILES += trigtables.c
  gentrigtables: gentrigtables.c
 -	$(CC) -o $@ $^ $(CPPFLAGS) -lm
-+	$(HOSTCC) -o $@ $^ $(CPPFLAGS) -lm
++	$(CC_FOR_BUILD) -o $@ $^ $(CPPFLAGS_FOR_BUILD) -lm
  DISTCLEANFILES += gentrigtables
  
  pkglib_MODULES += setjmp.mod