diff options
| author | Waldemar Brodkorb <mail@waldemar-brodkorb.de> | 2012-02-26 11:07:58 +0100 |
|---|---|---|
| committer | Waldemar Brodkorb <mail@waldemar-brodkorb.de> | 2012-02-26 11:07:58 +0100 |
| commit | a47db8cad0b2bf1046c8130d490c4597938e12fe (patch) | |
| tree | 3ebe139659407fa07fd2b87437c1307c75f1da68 | |
| parent | cab382e31f44695989857b4b84455ea4a13d9ed7 (diff) | |
| parent | 2d57a9a86f13576b1830aacfc82b0e416233decb (diff) | |
Merge branch 'master' of git+ssh://openadk.org/git/openadk
| -rw-r--r-- | Config.in | 2 | ||||
| -rw-r--r-- | mk/image.mk | 4 | ||||
| -rw-r--r-- | package/grub/Makefile | 7 | ||||
| -rw-r--r-- | package/grub/patches/patch-conf_common_mk | 4 |
4 files changed, 13 insertions, 4 deletions
@@ -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 diff --git a/mk/image.mk b/mk/image.mk index 7ff4f5677..4e1ab94dc 100644 --- a/mk/image.mk +++ b/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} diff --git a/package/grub/Makefile b/package/grub/Makefile index 38c3c326e..706bf626e 100644 --- a/package/grub/Makefile +++ b/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 diff --git a/package/grub/patches/patch-conf_common_mk b/package/grub/patches/patch-conf_common_mk index ea4ffc0df..fec7cd1dd 100644 --- a/package/grub/patches/patch-conf_common_mk +++ b/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 |