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

6 files changed, 30 insertions, 45 deletions

diff --git a/package/busybox/files/busybox.postinst b/package/busybox/files/busybox.postinst
index d403ff481..ed264244f 100644
--- a/package/busybox/files/busybox.postinst
+++ b/package/busybox/files/busybox.postinst
@@ -5,7 +5,7 @@ add_rcconf network network YES
 add_rcconf crond crond NO
 add_rcconf watchdog watchdog NO
 add_rcconf watchdog_flags watchdog_flags '-t 10 -T 20'
-add_rcconf syslogd NO
+add_rcconf syslogd syslogd NO
 add_rcconf 'use "-C32" normally' syslogd_flags '-C32'
 add_rcconf inetd inetd NO
 add_rcconf ntpd ntpd NO
diff --git a/package/grub-bin/Makefile b/package/grub-bin/Makefile
deleted file mode 100644
index 352c2b572..000000000
--- a/package/grub-bin/Makefile
+++ /dev/null
@@ -1,33 +0,0 @@
-# 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
-
-# compiled with i486 toolchain, statically linked with uClibc
-# cross-compiling is difficult, so provide a binary package
-PKG_NAME:=		grub-bin
-PKG_VERSION:=		1.98
-PKG_RELEASE:=		2
-PKG_MD5SUM:=		50dbe739776f904c318be05faf1d7ce5
-PKG_DESCR:=		GRUB2 bootloader (binary package)
-PKG_SECTION:=		boot
-PKG_SITES:=		http://openadk.org/distfiles/
-PKG_URL:=		http://www.gnu.org/software/grub
-
-PKG_ARCH_DEPENDS:=	x86 x86_64
-
-PKG_CFLINE_GRUB_BIN:=	select BUSYBOX_FEATURE_STAT_FORMAT@
-PKG_CFLINE_GRUB_BIN+=	depends on !ADK_TARGET_ROOTFS_INITRAMFS_PIGGYBACK && !ADK_TARGET_ROOTFS_INITRAMFS
-
-include ${TOPDIR}/mk/package.mk
-
-$(eval $(call PKG_template,GRUB_BIN,grub-bin,${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION}))
-
-CONFIG_STYLE:=		manual
-BUILD_STYLE:=		manual
-INSTALL_STYLE:=		manual
-
-do-install:
-	${CP} ${WRKBUILD}/* ${IDIR_GRUB_BIN}/
-
-include ${TOPDIR}/mk/pkg-bottom.mk
diff --git a/package/grub/Makefile b/package/grub/Makefile
index 2f2deba4a..9e43242aa 100644
--- a/package/grub/Makefile
+++ b/package/grub/Makefile
@@ -5,9 +5,9 @@ include $(TOPDIR)/rules.mk
 
 PKG_NAME:=		grub
 PKG_VERSION:=		2.00
-PKG_RELEASE:=		4
+PKG_RELEASE:=		5
 PKG_MD5SUM:=		e927540b6eda8b024fb0391eeaa4091c
-PKG_DESCR:=		GRUB2 bootloader (source package)
+PKG_DESCR:=		GRUB2 bootloader
 PKG_SECTION:=		boot
 PKG_BUILDDEP:=		bison-host qemu-host
 PKG_URL:=		http://www.gnu.org/software/grub
@@ -16,6 +16,9 @@ PKG_SITES:=		ftp://ftp.gnu.org/gnu/grub/
 PKG_ARCH_DEPENDS:=	x86 x86_64 mips
 PKG_NOPARALLEL:=	1
 
+PKG_SUBPKGS:=		GRUB GRUB_TOOLS
+PKGSD_GRUB_TOOLS:=	GRUB2 tools
+
 PKG_CHOICES_GRUB:=	PC EFI
 PKGCD_PC:=		build for PC BIOS
 PKGCD_EFI:=		build for EFI
@@ -23,7 +26,10 @@ PKGCD_EFI:=		build for EFI
 include $(TOPDIR)/mk/package.mk
 
 $(eval $(call PKG_template,GRUB,grub,$(PKG_VERSION)-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION}))
+$(eval $(call PKG_template,GRUB_TOOLS,grub-tools,$(PKG_VERSION)-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION}))
 
+# core.img is generated via
+# grub-mkimage -O ${GRUB_ARCH} -o core.img -c embed.cfg ${GRUB_MODULES}
 GRUB_MODULES:=		ext2 part_msdos biosdisk
 
 ifeq ($(ADK_PACKAGE_GRUB_PC),y)
@@ -35,11 +41,8 @@ GRUB_ARCH:=		x86_64-efi
 CONFIGURE_ARGS+=	--with-platform=efi
 endif
 
-TARGET_CFLAGS+=         -static
-TARGET_LDFLAGS+=        -static
 CONFIGURE_ARGS+=	--disable-grub-mkfont \
 			--enable-efiemu=no \
-			--enable-liblzma=no \
 			--enable-device-mapper=no \
 			--enable-libzfs=no \
 			--disable-werror
@@ -49,8 +52,16 @@ 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}/
-	PATH='${HOST_PATH}' qemu-i386 ${WRKBUILD}/grub-mkimage \
-		-o $(IDIR_GRUB)/boot/grub/core.img -O ${GRUB_ARCH} \
-		-c ./files/embed.cfg ${GRUB_MODULES}
+	${CP} ./files/core.img.${GRUB_ARCH} \
+		$(IDIR_GRUB)/boot/grub/core.img
+
+grub-tools-install:
+	${INSTALL_DIR} $(IDIR_GRUB_TOOLS)/usr/{sbin,bin}
+	${INSTALL_BIN} ${WRKINST}/usr/sbin/grub-install \
+		$(IDIR_GRUB_TOOLS)/usr/sbin
+	${INSTALL_BIN} ${WRKINST}/usr/sbin/grub-bios-setup \
+		$(IDIR_GRUB_TOOLS)/usr/sbin
+	${INSTALL_BIN} ${WRKINST}/usr/bin/grub-mkimage \
+		$(IDIR_GRUB_TOOLS)/usr/bin
 
 include ${TOPDIR}/mk/pkg-bottom.mk
diff --git a/package/grub/files/core.img.i386-pc b/package/grub/files/core.img.i386-pc
new file mode 100644
index 000000000..bd6fbac6f
--- /dev/null
+++ b/package/grub/files/core.img.i386-pc
diff --git a/package/grub/files/embed.cfg b/package/grub/files/embed.cfg
new file mode 100644
index 000000000..01eb1d453
--- /dev/null
+++ b/package/grub/files/embed.cfg
@@ -0,0 +1,2 @@
+set root=(hd0,1)
+set prefix=($root)/boot/grub
diff --git a/package/patch/Makefile b/package/patch/Makefile
index 0d80e53ec..0d1e23448 100644
--- a/package/patch/Makefile
+++ b/package/patch/Makefile
@@ -4,20 +4,25 @@
 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=		patch
-PKG_VERSION:=		2.5.9
+PKG_VERSION:=		2.7.1
 PKG_RELEASE:=		1
-PKG_MD5SUM:=		dacfb618082f8d3a2194601193cf8716
-PKG_DESCR:=		GNU patch
+PKG_MD5SUM:=		95dd8d7e41dcbcecdd5cd88ef915378d
+PKG_DESCR:=		GNU patch utility
 PKG_SECTION:=		utils
 PKG_URL:=		http://www.gnu.org/software/patch/
 PKG_SITES:=		${MASTER_SITE_GNU:=patch/}
 
+include $(TOPDIR)/mk/host.mk
 include $(TOPDIR)/mk/package.mk
 
+$(eval $(call HOST_template,PATCH,patch,$(PKG_VERSION)-${PKG_RELEASE}))
 $(eval $(call PKG_template,PATCH,patch,$(PKG_VERSION)-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION}))
 
+HOST_STYLE:=		auto
+
 patch-install:
 	$(INSTALL_DIR) $(IDIR_PATCH)/usr/bin
 	$(INSTALL_BIN) $(WRKINST)/usr/bin/patch $(IDIR_PATCH)/usr/bin
 
+include ${TOPDIR}/mk/host-bottom.mk
 include ${TOPDIR}/mk/pkg-bottom.mk