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

11 files changed, 35 insertions, 77 deletions

diff --git a/BUGS b/BUGS
index 528b590cf..70759ad05 100644
--- a/BUGS
+++ b/BUGS
@@ -1,3 +1,5 @@
-- arm: thumb mode with glibc does not boot
-- sparc64: ide driver not working, only virtio (but unstable)
-- microblaze big endian: network card emulation fails
+- qemu-sparc: startup kernel with gcc 4.8.2 broken
+- qemu-sh4: usb keyboard is broken
+- qemu-arm: thumb mode with glibc does not boot
+- qemu-sparc64: ide driver not working, only virtio (but unstable)
+- qemu-microblaze: network card emulation fails, little endian works
diff --git a/package/gettext-tiny/Makefile b/package/gettext-tiny/Makefile
index b483b838c..a09dc3be5 100644
--- a/package/gettext-tiny/Makefile
+++ b/package/gettext-tiny/Makefile
@@ -4,9 +4,9 @@
 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=		gettext-tiny
-PKG_VERSION:=		0.0.3
+PKG_VERSION:=		0.0.4
 PKG_RELEASE:=		1
-PKG_MD5SUM:=		3af6fd8a9042603b61f634b1c6f49e7e
+PKG_MD5SUM:=		09f6a74945df5961080234f7851f352c
 PKG_DESCR:=		Gettext stub and replacement
 PKG_SECTION:=		libs
 PKG_BUILDDEP:=		gettext-tiny-host
diff --git a/package/ruby-ldap/Makefile b/package/ruby-ldap/Makefile
index 6289c1cb8..4a332b32e 100644
--- a/package/ruby-ldap/Makefile
+++ b/package/ruby-ldap/Makefile
@@ -14,6 +14,8 @@ PKG_BUILDDEP:=		ruby openldap
 PKG_URL:=		http://ruby-ldap.sourceforge.net/
 PKG_SITES:=		${MASTER_SITE_SOURCEFORGE:=ruby-ldap/0.9.8/}
 
+PKG_CFLINE_RUBY_LDAP:=	depends on ADK_BROKEN
+
 DISTFILES:=             ${PKG_NAME}-${PKG_VERSION}.tar.bz2
 
 include $(TOPDIR)/mk/package.mk
diff --git a/package/upower/Makefile b/package/upower/Makefile
deleted file mode 100644
index 99c721879..000000000
--- a/package/upower/Makefile
+++ /dev/null
@@ -1,43 +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
-
-PKG_NAME:=		upower
-PKG_VERSION:=		0.99.0
-PKG_RELEASE:=		2
-PKG_MD5SUM:=		14f43bc13353e23e7280863f33ac50d2
-PKG_DESCR:=		powermanagement
-PKG_SECTION:=		misc
-PKG_BUILDDEP:=		glib dbus-glib polkit eudev
-PKG_DEPENDS:=		glib dbus-glib polkit libgudev
-PKG_URL:=		http://upower.freedesktop.org/
-PKG_SITES:=		http://upower.freedesktop.org/releases/
-
-DISTFILES:=             ${PKG_NAME}-${PKG_VERSION}.tar.xz
-
-include $(TOPDIR)/mk/package.mk
-
-$(eval $(call PKG_template,UPOWER,upower,$(PKG_VERSION)-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION}))
-
-CONFIGURE_ARGS+=	--without-systemdutildir \
-			--disable-rpath
-
-upower-install:
-	$(INSTALL_DIR) $(IDIR_UPOWER)/etc
-	$(CP) $(WRKINST)/etc/* \
-		$(IDIR_UPOWER)/etc
-	$(INSTALL_DIR) $(IDIR_UPOWER)/usr/lib
-	$(CP) $(WRKINST)/usr/lib/libupower*.so* \
-		$(IDIR_UPOWER)/usr/lib
-	$(INSTALL_DIR) $(IDIR_UPOWER)/usr/sbin
-	$(INSTALL_BIN) $(WRKINST)/usr/libexec/upowerd \
-		$(IDIR_UPOWER)/usr/sbin
-	$(INSTALL_DIR) $(IDIR_UPOWER)/usr/bin
-	$(INSTALL_BIN) $(WRKINST)/usr/bin/upower \
-		$(IDIR_UPOWER)/usr/bin
-	$(INSTALL_DIR) $(IDIR_UPOWER)/usr/share/dbus-1
-	$(CP) $(WRKINST)/usr/share/dbus-1/* \
-		$(IDIR_UPOWER)/usr/share/dbus-1
-
-include ${TOPDIR}/mk/pkg-bottom.mk
diff --git a/package/upower/patches/patch-Makefile_in b/package/upower/patches/patch-Makefile_in
deleted file mode 100644
index 7709ee096..000000000
--- a/package/upower/patches/patch-Makefile_in
+++ /dev/null
@@ -1,20 +0,0 @@
---- upower-0.99.0.orig/Makefile.in	2013-10-29 11:39:06.000000000 +0100
-+++ upower-0.99.0/Makefile.in	2014-01-10 17:09:06.000000000 +0100
-@@ -199,7 +199,7 @@ am__define_uniq_tagged_files = \
- ETAGS = etags
- CTAGS = ctags
- CSCOPE = cscope
--DIST_SUBDIRS = etc libupower-glib src doc tools po rules
-+DIST_SUBDIRS = etc libupower-glib src tools po rules
- DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
- distdir = $(PACKAGE)-$(VERSION)
- top_distdir = $(distdir)
-@@ -439,7 +439,7 @@ top_builddir = @top_builddir@
- top_srcdir = @top_srcdir@
- udevrulesdir = @udevrulesdir@
- ACLOCAL_AMFLAGS = -I m4 ${ACLOCAL_FLAGS}
--SUBDIRS = etc libupower-glib src doc tools po $(am__append_1)
-+SUBDIRS = etc libupower-glib src tools po $(am__append_1)
- EXTRA_DIST = \
- 	HACKING 			\
- 	ChangeLog
diff --git a/scripts/scan-tools.sh b/scripts/scan-tools.sh
index a7883cb24..c16aff609 100644
--- a/scripts/scan-tools.sh
+++ b/scripts/scan-tools.sh
@@ -37,8 +37,9 @@ if [[ -e foo ]]; then
 		Darwin*)
 			echo "Building OpenADK on $os needs a case-sensitive disk partition."
 			echo "For Snow Leopard and above you can use diskutil to resize your existing disk."
-			echo "For older versions you might consider to use a disk image."
 			echo "Example: sudo diskutil resizeVolume disk0s2 90G 1 jhfsx adk 30G"
+			echo "For older versions you might consider to use a disk image:"
+			echo "hdiutil create -type SPARSE -fs 'Case-sensitive Journaled HFS+' -size 30g ~/openadk.dmg"
 			;;
 	esac
 	exit 1
diff --git a/target/config/Config.in b/target/config/Config.in
index d6e795712..c50fbd289 100644
--- a/target/config/Config.in
+++ b/target/config/Config.in
@@ -241,6 +241,7 @@ config ADK_TARGET_QEMU_WITH_GRAPHIC
 	select ADK_KERNEL_KEYBOARD_ATKBD if ADK_TARGET_SYSTEM_QEMU_I686 || ADK_TARGET_SYSTEM_QEMU_X86_64
 	select ADK_KERNEL_INPUT_MOUSE
 	select ADK_KERNEL_INPUT_MOUSEDEV
+	select ADK_KERNEL_USB_HID if ADK_TARGET_SYSTEM_QEMU_SH4 || ADK_TARGET_SYSTEM_QEMU_SH4EB
 
 endchoice
 
diff --git a/target/linux/config/Config.in.input b/target/linux/config/Config.in.input
index 17c23b65c..5a01ee1e1 100644
--- a/target/linux/config/Config.in.input
+++ b/target/linux/config/Config.in.input
@@ -9,6 +9,10 @@ config ADK_KERNEL_INPUT
 	default y if ADK_TARGET_SYSTEM_RASPBERRY_PI
 	default n
 
+config ADK_KERNEL_USB_HID
+	boolean
+	default n
+
 config ADK_KERNEL_HID_LOGITECH
 	boolean
 	default n
@@ -113,6 +117,7 @@ depends on ADK_TARGET_WITH_USB || ADK_TARGET_WITH_INPUT || ADK_TARGET_WITH_TOUCH
 config ADK_KPACKAGE_KMOD_USB_HID
 	prompt "kmod-usb-hid..................... USB keyboard/mouse support"
 	tristate
+	depends on !ADK_KERNEL_USB_HID
 	select ADK_KERNEL_INPUT
 	select ADK_KERNEL_HID
 	select ADK_KERNEL_HID_GENERIC
@@ -122,8 +127,6 @@ config ADK_KPACKAGE_KMOD_USB_HID
 	depends on ADK_PACKAGE_KMOD_USB_CONTROLLER
 	depends on ADK_TARGET_WITH_USB
 	default y if ADK_TARGET_SYSTEM_RASPBERRY_PI
-	default y if ADK_TARGET_SYSTEM_QEMU_SH4 && ADK_TARGET_QEMU_WITH_GRAPHIC
-	default y if ADK_TARGET_SYSTEM_QEMU_SH4EB && ADK_TARGET_QEMU_WITH_GRAPHIC
 	default n
 
 config ADK_KERNEL_LOGITECH_DINOVO
diff --git a/target/linux/config/Config.in.usb b/target/linux/config/Config.in.usb
index b2c750673..f6fd22339 100644
--- a/target/linux/config/Config.in.usb
+++ b/target/linux/config/Config.in.usb
@@ -1,11 +1,23 @@
 menu "USB support"
-depends on ADK_TARGET_WITH_USB
+depends on ADK_TARGET_WITH_USB || ADK_HARDWARE_QEMU
 
 config ADK_KERNEL_USB_SUPPORT
 	boolean
 
 config ADK_KERNEL_USB
 	select ADK_KERNEL_USB_SUPPORT
+	default y if ADK_TARGET_SYSTEM_QEMU_SH4
+	default y if ADK_TARGET_SYSTEM_QEMU_SH4EB
+	boolean
+
+config ADK_KERNEL_USB_OHCI_HCD
+	default y if ADK_TARGET_SYSTEM_QEMU_SH4
+	default y if ADK_TARGET_SYSTEM_QEMU_SH4EB
+	boolean
+
+config ADK_KERNEL_USB_OHCI_HCD_PLATFORM
+	default y if ADK_TARGET_SYSTEM_QEMU_SH4
+	default y if ADK_TARGET_SYSTEM_QEMU_SH4EB
 	boolean
 
 config ADK_KERNEL_USB_LIBUSUAL
@@ -36,7 +48,6 @@ config ADK_KPACKAGE_KMOD_USB
 	select ADK_KERNEL_USB_SUPPORT
 	depends on !ADK_KERNEL_USB
 	default y if ADK_TARGET_SYSTEM_QEMU_I686
-	default y if ADK_TARGET_SYSTEM_QEMU_SH4
 	default y if ADK_TARGET_SYSTEM_QEMU_X86_64
 	default y if ADK_TARGET_SYSTEM_PCENGINES_ALIX1C
 	default y if ADK_TARGET_SYSTEM_PCENGINES_ALIX2D2
@@ -108,6 +119,7 @@ config ADK_KPACKAGE_KMOD_USB_OHCI_HCD
 	default y if ADK_TARGET_SYSTEM_ACMESYSTEMS_FOXG20
 	default y if ADK_TARGET_SYSTEM_LEMOTE_YEELONG
 	default y if ADK_TARGET_SYSTEM_QEMU_SH4
+	default y if ADK_TARGET_SYSTEM_QEMU_SH4EB
 	default n
 	help
 	  The Open Host Controller Interface (OHCI) is a standard for accessing
diff --git a/target/sh/Makefile b/target/sh/Makefile
index da733acac..3cf65f614 100644
--- a/target/sh/Makefile
+++ b/target/sh/Makefile
@@ -8,6 +8,7 @@ include $(TOPDIR)/mk/kernel-build.mk
 include $(TOPDIR)/mk/image.mk
 
 KERNEL:=$(LINUX_DIR)/arch/sh/boot/zImage
+QEMU_ARGS:=${ADK_QEMU_ARGS} -monitor null -serial null -serial stdio
 
 ifeq ($(ADK_TARGET_FS),archive)
 imageinstall: $(FW_DIR)/$(ROOTFSTARBALL)
@@ -18,7 +19,7 @@ ifneq ($(ADK_HARDWARE_QEMU),)
 	@echo "Use following command to create a QEMU Image:"
 	@echo "./scripts/create.sh +g qemu-${CPU_ARCH}.img $(FW_DIR)/$(ROOTFSTARBALL)"
 	@echo "Start qemu with following options:"
-	@echo 'qemu-system-${CPU_ARCH} ${ADK_QEMU_ARGS} -M r2d -kernel $(FW_DIR)/$(TARGET_KERNEL) qemu-${CPU_ARCH}.img'
+	@echo 'qemu-system-${CPU_ARCH} ${QEMU_ARGS} -M r2d -kernel $(FW_DIR)/$(TARGET_KERNEL) qemu-${CPU_ARCH}.img'
 endif
 endif
 ifeq ($(ADK_TARGET_FS),initramfs)
@@ -28,7 +29,7 @@ imageinstall: $(FW_DIR)/$(INITRAMFS)
 	@echo 'The initramfs image is: ${FW_DIR}/${INITRAMFS}'
 ifeq ($(ADK_HARDWARE_QEMU),y)
 	@echo "Start qemu with following command line:"
-	@echo 'qemu-system-${CPU_ARCH} ${ADK_QEMU_ARGS} -M r2d -kernel $(FW_DIR)/$(TARGET_KERNEL) -initrd ${FW_DIR}/${INITRAMFS}'
+	@echo 'qemu-system-${CPU_ARCH} ${QEMU_ARGS} -M r2d -kernel $(FW_DIR)/$(TARGET_KERNEL) -initrd ${FW_DIR}/${INITRAMFS}'
 endif
 endif
 ifeq ($(ADK_TARGET_FS),initramfs-piggyback)
@@ -37,6 +38,6 @@ imageinstall: createinitramfs
 	@echo 'The kernel+initramfs file is: $(FW_DIR)/${TARGET_KERNEL}'
 ifeq ($(ADK_HARDWARE_QEMU),y)
 	@echo "Start qemu with following command line:"
-	@echo 'qemu-system-${CPU_ARCH} ${ADK_QEMU_ARGS} -M r2d -kernel $(FW_DIR)/$(TARGET_KERNEL)'
+	@echo 'qemu-system-${CPU_ARCH} ${QEMU_ARGS} -M r2d -kernel $(FW_DIR)/$(TARGET_KERNEL)'
 endif
 endif
diff --git a/tools/mksh/Makefile b/tools/mksh/Makefile
index a6ee57906..2c912e52b 100644
--- a/tools/mksh/Makefile
+++ b/tools/mksh/Makefile
@@ -18,7 +18,6 @@ install: ${STAGING_HOST_DIR}/usr/bin/mksh
 
 $(WRKBUILD)/.compiled: ${WRKDIST}/.prepared
 	cd ${WRKBUILD} && CC='${CC_FOR_BUILD}' CFLAGS='${CFLAGS_FOR_BUILD}' \
-	    CPPFLAGS='${CPPFLAGS_FOR_BUILD}' LDFLAGS='${LDFLAGS_FOR_BUILD}' \
 	    HAVE_CAN_FSTACKPROTECTORALL=0 \
 	    TARGET_OS=Linux ${BASH} ${WRKSRC}/Build.sh -Q -r -c lto
 	touch $@