diff options
| author | Waldemar Brodkorb <wbx@openadk.org> | 2014-04-11 19:11:27 +0200 |
|---|---|---|
| committer | Waldemar Brodkorb <wbx@openadk.org> | 2014-04-11 19:11:27 +0200 |
| commit | 923fce05a0243d71655449f07efc1c348f791b6d (patch) | |
| tree | 5e6a32e564b9c00dd22d6cec1a66e5cf65aeaaea | |
| parent | 277e6a5f99c96b7c718a96b913148a990334f332 (diff) | |
create core.img on the fly via qemu user emulation
| -rw-r--r-- | package/grub/Makefile | 12 | ||||
| -rw-r--r-- | package/grub/files/core.img.i386-pc | bin | 26238 -> 0 bytes |
2 files changed, 6 insertions, 6 deletions
diff --git a/package/grub/Makefile b/package/grub/Makefile index f634e07df..2f2deba4a 100644 --- a/package/grub/Makefile +++ b/package/grub/Makefile @@ -5,7 +5,7 @@ include $(TOPDIR)/rules.mk PKG_NAME:= grub PKG_VERSION:= 2.00 -PKG_RELEASE:= 3 +PKG_RELEASE:= 4 PKG_MD5SUM:= e927540b6eda8b024fb0391eeaa4091c PKG_DESCR:= GRUB2 bootloader (source package) PKG_SECTION:= boot @@ -24,6 +24,8 @@ include $(TOPDIR)/mk/package.mk $(eval $(call PKG_template,GRUB,grub,$(PKG_VERSION)-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION})) +GRUB_MODULES:= ext2 part_msdos biosdisk + ifeq ($(ADK_PACKAGE_GRUB_PC),y) GRUB_ARCH:= i386-pc CONFIGURE_ARGS+= --with-platform=pc @@ -33,11 +35,8 @@ GRUB_ARCH:= x86_64-efi CONFIGURE_ARGS+= --with-platform=efi endif -ifeq ($(ADK_STATIC),y) TARGET_CFLAGS+= -static TARGET_LDFLAGS+= -static -endif - CONFIGURE_ARGS+= --disable-grub-mkfont \ --enable-efiemu=no \ --enable-liblzma=no \ @@ -50,7 +49,8 @@ grub-install: ${INSTALL_DIR} $(IDIR_GRUB)/boot/grub/${GRUB_ARCH} ${CP} ${WRKINST}/usr/lib/grub/${GRUB_ARCH}/*{mod,lst,img} \ $(IDIR_GRUB)/boot/grub/${GRUB_ARCH}/ - ${CP} ./files/core.img.${GRUB_ARCH} \ - $(IDIR_GRUB)/boot/grub/core.img + PATH='${HOST_PATH}' qemu-i386 ${WRKBUILD}/grub-mkimage \ + -o $(IDIR_GRUB)/boot/grub/core.img -O ${GRUB_ARCH} \ + -c ./files/embed.cfg ${GRUB_MODULES} include ${TOPDIR}/mk/pkg-bottom.mk diff --git a/package/grub/files/core.img.i386-pc b/package/grub/files/core.img.i386-pc Binary files differdeleted file mode 100644 index fbfb875ee..000000000 --- a/package/grub/files/core.img.i386-pc +++ /dev/null |