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

package/Config.in

@@ -15,6 +15,7 @@ source "package/glibc/Config.in"
 source "package/eglibc/Config.in"
 source "package/libc/Config.in"
 source "package/rpm/Config.in"
+source "package/grub-bin/Config.in"
 endmenu
 
 menu "Bluetooth"

package/Makefile

@@ -132,6 +132,7 @@ package-$(ADK_PACKAGE_GPERF) += gperf
 package-$(ADK_PACKAGE_GPG) += gpg
 package-$(ADK_PACKAGE_GPM) += gpm
 package-$(ADK_PACKAGE_GPSD) += gpsd
+package-$(ADK_PACKAGE_GRUB_BIN) += grub-bin
 package-$(ADK_COMPILE_GSM) += gsm
 package-$(ADK_PACKAGE_HASERL) += haserl
 package-$(ADK_PACKAGE_HDPARM) += hdparm

package/busybox/config/coreutils/Config.in

@@ -572,7 +572,7 @@ config BUSYBOX_FEATURE_SPLIT_FANCY
 
 config BUSYBOX_STAT
 	bool "stat"
-	default n
+	default y
 	help
 	  display file or filesystem status.
 

package/grub-bin/Config.in

@@ -0,0 +1,8 @@
+config ADK_PACKAGE_GRUB_BIN
+	prompt "grub-bin............................. GRUB 2 bootloader (binary)"
+	tristate
+	depends on ADK_LINUX_X86_64_SHUTTLE
+	select BUSYBOX_FEATURE_STAT_FORMAT
+	default y if ADK_LINUX_X86_64_SHUTTLE
+	help
+

package/grub-bin/Makefile

@@ -0,0 +1,23 @@
+# 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
+
+PKG_NAME:=		grub-bin
+PKG_VERSION:=		1.97
+PKG_RELEASE:=		1
+PKG_MD5SUM:=		0b975ea2f0c0cbad6a130d4614fbf399
+PKG_DESCR:=		GRUB bootloader
+PKG_SECTION:=		sys
+PKG_SITES:=		http://openadk.org/distfiles/
+
+include ${TOPDIR}/mk/package.mk
+
+$(eval $(call PKG_template,GRUB_BIN,${PKG_NAME},${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION}))
+
+INSTALL_STYLE=		manual
+
+do-install:
+	${CP} ${WRKBUILD}/* ${IDIR_GRUB_BIN}/
+
+include ${TOPDIR}/mk/pkg-bottom.mk

package/rpm/Config.in

@@ -1,5 +1,5 @@
 config ADK_PACKAGE_RPM
-	prompt "rpm............................... Red Hat package manager"
+	prompt "rpm.................................. Red Hat package manager"
 	tristate
 	depends on ADK_CXX
 	select ADK_PACKAGE_NSS

target/Config.in

@@ -203,21 +203,25 @@ config ADK_LINUX_QEMU
 
 config ADK_LINUX_X86_64_SHUTTLE
 	bool "Shuttle PC"
+	select ADK_shuttle
 	select ADK_KERNEL_INPUT_KEYBOARD
 	select ADK_KERNEL_NETDEVICES
 	select ADK_KERNEL_NET_PCI
 	select ADK_KERNEL_NET_ETHERNET
-	select ADK_shuttle
+	select ADK_KERNEL_SATA_AHCI if ADK_TARGET_ROOTFS_ARCHIVE
-	select ADK_KPACKAGE_KMOD_SKY2
+	select ADK_KERNEL_BLK_DEV_MD if ADK_TARGET_ROOTFS_ARCHIVE
-	select ADK_KPACKAGE_KMOD_SATA_AHCI
+	select ADK_KERNEL_MD_RAID0 if ADK_TARGET_ROOTFS_ARCHIVE
-	select ADK_KPACKAGE_KMOD_XFS_FS
+	select ADK_KERNEL_MD_RAID1 if ADK_TARGET_ROOTFS_ARCHIVE
-	select ADK_KPACKAGE_KMOD_BLK_DEV_MD
+	select ADK_KERNEL_XFS_FS if ADK_TARGET_ROOTFS_ARCHIVE
-	select ADK_KPACKAGE_KMOD_MD_RAID0
+	select ADK_KPACKAGE_KMOD_SKY2 if ADK_TARGET_ROOTFS_INITRAMFS_PIGGYBACK
-	select ADK_KPACKAGE_KMOD_MD_RAID1
+	select ADK_KPACKAGE_KMOD_SATA_AHCI if ADK_TARGET_ROOTFS_INITRAMFS_PIGGYBACK
+	select ADK_KPACKAGE_KMOD_XFS_FS if ADK_TARGET_ROOTFS_INITRAMFS_PIGGYBACK
+	select ADK_KPACKAGE_KMOD_BLK_DEV_MD if ADK_TARGET_ROOTFS_INITRAMFS_PIGGYBACK
+	select ADK_KPACKAGE_KMOD_MD_RAID0 if ADK_TARGET_ROOTFS_INITRAMFS_PIGGYBACK
+	select ADK_KPACKAGE_KMOD_MD_RAID1 if ADK_TARGET_ROOTFS_INITRAMFS_PIGGYBACK
 	help
 	  Support for a nice and fast shuttle xpc with AMD quad-core CPU.
 	  Known as OpenADK multi operating system buildserver.
-	  System is on RAID1, kvm guests are on RAID1.
 
 endchoice
 
@@ -436,6 +440,7 @@ config ADK_TARGET_ROOTFS_INITRAMFS_PIGGYBACK
 		ADK_LINUX_MIPSEL_QEMU || \
 		ADK_LINUX_MIPS64_QEMU || \
 		ADK_LINUX_MIPS64EL_QEMU || \
+		ADK_LINUX_X86_64_SHUTTLE || \
 		ADK_LINUX_NATIVE || \
 		ADK_LINUX_RESCUE
 	help

target/linux/config/Config.in.block

@@ -53,12 +53,20 @@ config ADK_KERNEL_ATA
 	boolean
 	default n
 
+config ADK_KERNEL_SATA_AHCI
+	tristate
+	select ADK_KERNEL_BLOCK
+	select ADK_KERNEL_ATA
+	select ADK_KERNEL_BLK_DEV_SD
+	default n	
+
 config ADK_KPACKAGE_KMOD_SATA_AHCI
 	prompt "kmod-sata-ahci.................... AHCI SATA driver"
 	tristate
 	select ADK_KERNEL_BLOCK
 	select ADK_KERNEL_ATA
 	select ADK_KPACKAGE_KMOD_BLK_DEV_SD
+	depends on !ADK_KERNEL_SATA_AHCI
 	default n
 	help
 	  Enables support for AHCI Serial ATA.
@@ -202,18 +210,34 @@ config ADK_KPACKAGE_KMOD_BLK_DEV_SR
 	  <http://www.tldp.org/docs.html#howto>. Also make sure to say
 	  Y or M to "ISO 9660 CD-ROM file system support" later.
 
+config ADK_KERNEL_BLK_DEV_MD
+	tristate
+	select ADK_KERNEL_MD
+	default n
+
 config ADK_KPACKAGE_KMOD_BLK_DEV_MD
 	prompt "kmod-md........................... RAID support"
 	tristate
+	depends on !ADK_KERNEL_BLK_DEV_MD
 	select ADK_KERNEL_MD
 	help
 
+config ADK_KERNEL_MD_RAID0
+	tristate
+	depends on ADK_KERNEL_BLK_DEV_MD
+	help
+
 config ADK_KPACKAGE_KMOD_MD_RAID0
 	prompt "kmod-md-raid0..................... RAID0 support"
 	tristate
 	depends on ADK_KPACKAGE_KMOD_BLK_DEV_MD
 	help
 
+config ADK_KERNEL_MD_RAID1
+	tristate
+	depends on ADK_KERNEL_BLK_DEV_MD
+	help
+
 config ADK_KPACKAGE_KMOD_MD_RAID1
 	prompt "kmod-md-raid1..................... RAID1 support"
 	tristate