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

README

@@ -23,7 +23,6 @@ Before you can start you need to install some tools:
 - ncurses5 headers
 - zlib headers
 - perl
-- bc
 - xargs
 
 There is a check for the required versions of these tools in advance, though.

package/glibc/files/libc.so.sparc

@@ -0,0 +1,5 @@
+/* GNU ld script
+   Use the shared library, but some functions are only in
+   the static library, so try that secondarily.  */
+OUTPUT_FORMAT(elf32-sparc)
+GROUP ( /lib/libc.so.6 /usr/lib/libc_nonshared.a  AS_NEEDED ( /lib/ld-linux.so.2 ) )

package/libXt/patches/patch-util_Makefile_in

@@ -1,20 +0,0 @@
---- libXt-1.1.3.orig/util/Makefile.in	2012-03-16 06:52:18.000000000 +0100
-+++ libXt-1.1.3/util/Makefile.in	2013-04-30 13:38:32.000000000 +0200
-@@ -106,7 +106,7 @@ CFLAGS = @CFLAGS_FOR_BUILD@
- CFLAGS_FOR_BUILD = @CFLAGS_FOR_BUILD@
- CHANGELOG_CMD = @CHANGELOG_CMD@
- CPP = @CPP@
--CPPFLAGS = @CPPFLAGS@
-+CPPFLAGS = @CPPFLAGS_FOR_BUILD@
- CWARNFLAGS = @CWARNFLAGS@
- CYGPATH_W = @CYGPATH_W@
- DEFS = @DEFS@
-@@ -246,7 +246,7 @@ top_build_prefix = @top_build_prefix@
- top_builddir = @top_builddir@
- top_srcdir = @top_srcdir@
- EXTRA_DIST = Shell.ht StrDefs.ct StrDefs.ht string.list $(appman_PRE)
--AM_CFLAGS = $(XT_CFLAGS)
-+AM_CFLAGS = 
- makestrs_SOURCES = makestrs.c
- 
- # Man page

package/perl/Makefile

@@ -24,6 +24,9 @@ CONFIG_STYLE:=          manual
 BUILD_STYLE:=		manual
 INSTALL_STYLE:=		manual
 
+# ld memory exhausted problem
+TARGET_CFLAGS:=		$(subst g3,g,$(TARGET_CFLAGS))
+
 host-configure:
 	(cd ${WRKBUILD}; ./Configure -der -Uusedl)
 
@@ -46,7 +49,7 @@ do-configure:
 		-e 's!%%CPPFLAGS%%!$(TARGET_CPPFLAGS)!g' \
 		-e 's!%%LIBDIRS%%!$(STAGING_TARGET_DIR)/lib $(STAGING_TARGET_DIR)/usr/lib!g' \
 		-e 's!%%INCDIRS%%!$(STAGING_TARGET_DIR)/include $(STAGING_TARGET_DIR)/usr/include!g' \
-		./files/config.sh.$(CPU_ARCH) > ${WRKBUILD}/config.sh
+		./files/config.sh.$(CPU_ARCH).$(ADK_TARGET_LIBC) > ${WRKBUILD}/config.sh
 	(cd ${WRKBUILD}; ./Configure -S)
 
 do-build:

target/config/Config.in

@@ -160,6 +160,8 @@ config ADK_TARGET_KERNEL_MINICONFIG
 	default "qemu-mips64el" if ADK_TARGET_SYSTEM_QEMU_MIPS64EL
 	default "qemu-ppc" if ADK_TARGET_SYSTEM_QEMU_PPC
 	default "qemu-ppc64" if ADK_TARGET_SYSTEM_QEMU_PPC64
+	default "qemu-sparc" if ADK_TARGET_SYSTEM_QEMU_SPARC
+	default "qemu-i686" if ADK_TARGET_SYSTEM_QEMU_I686
 
 choice
 prompt "Qemu MICROBLAZE Emulation"

target/sparc/kernel/qemu-sparc

@@ -0,0 +1,22 @@
+CONFIG_SPARC=y
+CONFIG_SPARC32=y
+CONFIG_SERIAL_CONSOLE=y
+CONFIG_SBUS=y
+CONFIG_SBUSCHAR=y
+CONFIG_PCI=y
+CONFIG_PCI_SYSCALL=y
+CONFIG_PCIC_PCI=y
+CONFIG_OF=y
+CONFIG_SCSI=y
+CONFIG_SCSI_DMA=y
+CONFIG_BLK_DEV_SD=y
+CONFIG_SCSI_LOWLEVEL=y
+CONFIG_SCSI_SUNESP=y
+CONFIG_NETDEVICES=y
+CONFIG_NET_CORE=y
+CONFIG_ETHERNET=y
+CONFIG_NET_VENDOR_AMD=y
+CONFIG_SUNLANCE=y
+CONFIG_SERIAL_SUNCORE=y
+CONFIG_SERIAL_SUNZILOG=y
+CONFIG_SERIAL_SUNZILOG_CONSOLE=y

target/sparc/sys-available/qemu-sparc

@@ -6,8 +6,8 @@ config ADK_TARGET_SYSTEM_QEMU_SPARC
 	select ADK_HARDWARE_QEMU
 	select ADK_TARGET_WITH_VGA
 	select ADK_TARGET_WITH_INPUT
-	select ADK_TARGET_WITH_PCI
-	select ADK_TARGET_WITH_HDD
+	select ADK_TARGET_KERNEL_ZIMAGE
+	select ADK_USE_KERNEL_MINICONFIG
 	help
 	 Support for Qemu Emulator (SPARC).
 

target/sparc64/sys-available/qemu-sparc64

@@ -6,8 +6,7 @@ config ADK_TARGET_SYSTEM_QEMU_SPARC64
 	select ADK_HARDWARE_QEMU
 	select ADK_TARGET_WITH_VGA
 	select ADK_TARGET_WITH_INPUT
-	select ADK_TARGET_WITH_PCI
-	select ADK_TARGET_WITH_HDD
+	select ADK_TARGET_KERNEL_ZIMAGE
 	help
 	 Support for Qemu Emulator (SPARC64).
 

target/x86/kernel/qemu-i686

@@ -0,0 +1,23 @@
+CONFIG_X86_32=y
+CONFIG_X86=y
+CONFIG_BLOCK=y
+CONFIG_PCI=y
+CONFIG_PCI_GOANY=y
+CONFIG_PCI_BIOS=y
+CONFIG_PCI_DIRECT=y
+CONFIG_PCI_DOMAINS=y
+CONFIG_SCSI=y
+CONFIG_SCSI_DMA=y
+CONFIG_BLK_DEV_SD=y
+CONFIG_ATA=y
+CONFIG_ATA_PIIX=y
+CONFIG_NETDEVICES=y
+CONFIG_NET_CORE=y
+CONFIG_ETHERNET=y
+CONFIG_NET_VENDOR_INTEL=y
+CONFIG_E1000=y
+CONFIG_SERIAL_8250=y
+CONFIG_SERIAL_8250_CONSOLE=y
+CONFIG_FIX_EARLYCON_MEM=y
+CONFIG_SERIAL_8250_NR_UARTS=4
+CONFIG_SERIAL_8250_RUNTIME_UARTS=4

target/x86/sys-available/qemu-i686

@@ -6,10 +6,8 @@ config ADK_TARGET_SYSTEM_QEMU_I686
 	select ADK_HARDWARE_QEMU
 	select ADK_TARGET_WITH_VGA
 	select ADK_TARGET_WITH_INPUT
-	select ADK_TARGET_WITH_PCI
-	select ADK_TARGET_WITH_HDD
-	select ADK_TARGET_WITH_USB
 	select ADK_TARGET_KERNEL_BZIMAGE
+	select ADK_USE_KERNEL_MINICONFIG
 	help
 	 Support for Qemu Emulator (i686).
 

tools/Makefile

@@ -3,7 +3,7 @@
 
 include $(TOPDIR)/rules.mk
 
-TARGETS:=adk mkcrypt cpio mkimage genext2fs
+TARGETS:=adk mkcrypt cpio mkimage genext2fs bc
 ifeq ($(ADK_TARGET_ROOTFS_ISO),y)
 TARGETS+=cdrtools syslinux
 endif

tools/bc/Makefile

@@ -0,0 +1,25 @@
+# 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:=		bc
+PKG_VERSION:=		1.06
+PKG_RELEASE:=		1
+PKG_MD5SUM:=		d44b5dddebd8a7a7309aea6c36fda117
+PKG_SITES:=		http://ftp.gnu.org/pub/gnu/bc/
+
+include ../rules.mk
+
+install: ${TOOLS_DIR}/bc
+
+$(WRKBUILD)/.compiled: ${WRKDIST}/.prepared
+	(cd ${WRKBUILD}; ./configure)
+	${MAKE} -C ${WRKBUILD} CC='${CC_FOR_BUILD}'
+	touch $@
+
+${TOOLS_DIR}/bc: $(WRKBUILD)/.compiled
+	$(INSTALL_BIN) $(WRKBUILD)/bc/bc \
+		${TOOLS_DIR}
+
+include $(TOPDIR)/mk/tools.mk