diff options
| -rw-r--r-- | package/busybox/patches/010-rlimit_fsize.patch | 11 | ||||
| -rwxr-xr-x | scripts/create-image-with-grub.sh | 45 | ||||
| -rw-r--r-- | target/config/Config.in | 2 | ||||
| -rw-r--r-- | target/x86/sys-available/vbox-i686 | 14 | ||||
| -rw-r--r-- | toolchain/eglibc/Makefile.inc | 4 | ||||
| -rw-r--r-- | toolchain/eglibc/eglibc.config | 2 | ||||
| -rw-r--r-- | toolchain/eglibc/patches/eglibc-cross.patch | 102 | ||||
| -rw-r--r-- | toolchain/eglibc/patches/make382.patch | 12 |
8 files changed, 82 insertions, 110 deletions
diff --git a/package/busybox/patches/010-rlimit_fsize.patch b/package/busybox/patches/010-rlimit_fsize.patch new file mode 100644 index 000000000..2e577cfc9 --- /dev/null +++ b/package/busybox/patches/010-rlimit_fsize.patch @@ -0,0 +1,11 @@ +diff -Nur busybox-1.19.4.orig/include/libbb.h busybox-1.19.4/include/libbb.h +--- busybox-1.19.4.orig/include/libbb.h 2012-02-04 20:34:24.000000000 +0100 ++++ busybox-1.19.4/include/libbb.h 2012-07-31 10:33:50.000000000 +0200 +@@ -35,6 +35,7 @@ + #include <sys/poll.h> + #include <sys/ioctl.h> + #include <sys/mman.h> ++#include <sys/resource.h> + #include <sys/socket.h> + #include <sys/stat.h> + #include <sys/time.h> diff --git a/scripts/create-image-with-grub.sh b/scripts/create-image-with-grub.sh index dbf073b07..47f37e6da 100755 --- a/scripts/create-image-with-grub.sh +++ b/scripts/create-image-with-grub.sh @@ -67,7 +67,7 @@ type=qemu function usage { cat >&2 <<EOF -Syntax: $me [g] [-c cfgfssize] [-p panictime] [±q] [-s serialspeed] +Syntax: $me [-g] [-c cfgfssize] [-p panictime] [±q] [-s serialspeed] [±t][ -f diskformat ] -n disk.img archive Defaults: -c 1 -p 10 -s 115200 -f qemu; -t = enable serial console EOF @@ -139,35 +139,6 @@ if [[ ! -f $src ]]; then fi (( quiet )) || print "Installing $src on $tgt." -case $ostype { -(DragonFly|*BSD*) - basedev=${tgt%c} - tgt=${basedev}c - part=${basedev}i - match=\'${basedev}\''[a-p]' - function mount_ext2fs { - mount -t ext2fs "$1" "$2" - } - ;; -(Darwin) - basedev=$tgt - part=${basedev}s1 - match=\'${basedev}\''?(s+([0-9]))' - function mount_ext2fs { - fuse-ext2 "$1" "$2" -o rw+ - sleep 3 - } - ;; -(Linux) - basedev=$tgt - part=${basedev}1 - match=\'${basedev}\''+([0-9])' - function mount_ext2fs { - mount -t ext2 "$1" "$2" - } - ;; -} - qemu-img create -f raw $tgt 524288k if stat -qs .>/dev/null 2>&1; then @@ -189,6 +160,7 @@ if ! T=$(mktemp -d /tmp/openadk.XXXXXXXXXX); then print -u2 Error creating temporary directory. exit 1 fi + tar -xOzf "$src" usr/share/grub-bin/core.img >"$T/core.img" integer coreimgsz=$($statcmd "$T/core.img") if (( coreimgsz < 1024 )); then @@ -201,16 +173,11 @@ if (( coreimgsz > 65024 )); then rm -rf "$T" exit 1 fi + (( coreendsec = (coreimgsz + 511) / 512 )) -if [[ $basedev = /dev/svnd+([0-9]) ]]; then - # BSD svnd0 mode: protect sector #1 - corestartsec=2 - (( ++coreendsec )) - corepatchofs=$((0x614)) -else - corestartsec=1 - corepatchofs=$((0x414)) -fi +corestartsec=1 +corepatchofs=$((0x414)) + # partition offset: at least coreendsec+1 but aligned on a multiple of secs (( partofs = ((coreendsec / secs) + 1) * secs )) diff --git a/target/config/Config.in b/target/config/Config.in index 9a296b32b..22640d280 100644 --- a/target/config/Config.in +++ b/target/config/Config.in @@ -403,7 +403,7 @@ config ADK_TARGET_CMDLINE default "console=ttyS0,115200 console=tty0" if ADK_TARGET_SYSTEM_IBM_X40 default "console=ttyS0,115200 console=tty0" if ADK_TARGET_SYSTEM_INTEL_ATOM default "console=ttyS0,115200 console=tty0" if ADK_TARGET_SYSTEM_QEMU_I686 - default "console=ttyS0,115200 console=tty0 vga=791" if ADK_TARGET_SYSTEM_VBOX_I686 + default "console=ttyS0,115200 console=tty0" if ADK_TARGET_SYSTEM_VBOX_I686 default "console=ttyS0,115200 console=tty0" if ADK_TARGET_QEMU_ARM_MODEL_SPITZ default "console=ttyAMA0 console=tty0" if ADK_TARGET_QEMU_ARM_MODEL_VERSATILE default "console=ttyS0,115200 console=tty0 fbcon=rotate:1" if ADK_TARGET_SYSTEM_SHARP_ZAURUS diff --git a/target/x86/sys-available/vbox-i686 b/target/x86/sys-available/vbox-i686 new file mode 100644 index 000000000..88b5ec63c --- /dev/null +++ b/target/x86/sys-available/vbox-i686 @@ -0,0 +1,14 @@ +config ADK_TARGET_SYSTEM_VBOX_I686 + bool "VirtualBox Emulator" + select ADK_x86 + select ADK_vbox_i686 + select ADK_CPU_I686 + select ADK_HARDWARE_VBOX + select ADK_TARGET_WITH_VGA + select ADK_TARGET_WITH_INPUT + select ADK_TARGET_WITH_PCI + select ADK_TARGET_WITH_HDD + select ADK_TARGET_WITH_SATA + help + Support for VirtualBox Emulator (i686). + diff --git a/toolchain/eglibc/Makefile.inc b/toolchain/eglibc/Makefile.inc index 56514d3c6..d826c78cf 100644 --- a/toolchain/eglibc/Makefile.inc +++ b/toolchain/eglibc/Makefile.inc @@ -2,7 +2,7 @@ # material, please see the LICENCE file in the top-level directory. PKG_NAME:= eglibc -PKG_VERSION:= 2.14.1 +PKG_VERSION:= 2.16 PKG_RELEASE:= 1 -PKG_MD5SUM:= d01422d90c2f9ef6919949b7ad38ccd4 +PKG_MD5SUM:= 47d724d78f4b291c90b4a490678316f6 PKG_SITES:= http://openadk.org/distfiles/ diff --git a/toolchain/eglibc/eglibc.config b/toolchain/eglibc/eglibc.config index c8cd3d4cd..51d307d8e 100644 --- a/toolchain/eglibc/eglibc.config +++ b/toolchain/eglibc/eglibc.config @@ -43,5 +43,5 @@ OPTION_EGLIBC_UTMPX = y OPTION_EGLIBC_WORDEXP = y OPTION_POSIX_C_LANG_WIDE_CHAR = y OPTION_POSIX_REGEXP = y -OPTION_POSIX_REGEXP_GLIBC = n +OPTION_POSIX_REGEXP_GLIBC = y OPTION_POSIX_WIDE_CHAR_DEVICE_IO = y diff --git a/toolchain/eglibc/patches/eglibc-cross.patch b/toolchain/eglibc/patches/eglibc-cross.patch index 6a7fb9e51..92d7954d8 100644 --- a/toolchain/eglibc/patches/eglibc-cross.patch +++ b/toolchain/eglibc/patches/eglibc-cross.patch @@ -1,40 +1,47 @@ -* NOTE: This will still use a hardcoded “gcc” instead of HOSTCC - -diff -Nur eglibc-2.12.orig/libc/sunrpc/proto.h eglibc-2.12/libc/sunrpc/proto.h ---- eglibc-2.12.orig/libc/sunrpc/proto.h 2010-09-28 19:14:26.000000000 +0200 -+++ eglibc-2.12/libc/sunrpc/proto.h 2010-09-29 14:05:15.000000000 +0200 -@@ -58,7 +58,9 @@ - - /* Rather then defining _GNU_SOURCE before including $build's <string.h> - we just declare stpcpy here. */ -+#if !defined(__APPLE__) - extern char *stpcpy (char *, const char *); -+#endif - - /* Use $build's i18n support as we can't use $host's. */ - #define _(X) (gettext (X)) -diff -Nur eglibc-2.12.orig/libc/sunrpc/rpc/types.h eglibc-2.12/libc/sunrpc/rpc/types.h ---- eglibc-2.12.orig/libc/sunrpc/rpc/types.h 2010-09-28 19:14:26.000000000 +0200 -+++ eglibc-2.12/libc/sunrpc/rpc/types.h 2010-09-29 12:45:55.000000000 +0200 -@@ -68,6 +68,7 @@ +diff -Nur eglibc-2.16.orig/libc/sunrpc/rpc/types.h eglibc-2.16/libc/sunrpc/rpc/types.h +--- eglibc-2.16.orig/libc/sunrpc/rpc/types.h 2012-07-31 09:00:24.000000000 +0200 ++++ eglibc-2.16/libc/sunrpc/rpc/types.h 2012-07-31 10:08:35.000000000 +0200 +@@ -69,19 +69,25 @@ #include <sys/types.h> #endif -+#if !defined(_CROSS_RPCGEN_) || !defined(__APPLE__) - #ifndef __u_char_defined - typedef __u_char u_char; - typedef __u_short u_short; -@@ -83,6 +84,7 @@ - typedef __caddr_t caddr_t; +-#ifndef __u_char_defined +-typedef __u_char u_char; +-typedef __u_short u_short; +-typedef __u_int u_int; +-typedef __u_long u_long; +-typedef __quad_t quad_t; +-typedef __u_quad_t u_quad_t; +-typedef __fsid_t fsid_t; +-# define __u_char_defined ++typedef unsigned char u_char; ++typedef unsigned short u_short; ++typedef unsigned int u_int; ++typedef unsigned long u_long; ++#if __WORDSIZE == 64 ++typedef long int quad_t; ++typedef unsigned long int u_quad_t; ++#elif defined __GLIBC_HAVE_LONG_LONG ++typedef long long int quad_t; ++typedef unsigned long long int u_quad_t; ++#endif ++#if defined(_CROSS_RPCGEN_) ++typedef u_quad_t fsid_t; + #endif +-#ifndef __daddr_t_defined +-typedef __daddr_t daddr_t; +-typedef __caddr_t caddr_t; ++ ++# define __u_char_defined ++#if !defined(__daddr_t_defined) && defined(linux) ++typedef long int daddr_t; ++typedef char *caddr_t; # define __daddr_t_defined #endif -+#endif - #include <sys/time.h> - #include <sys/param.h> -diff -Nur eglibc-2.12.orig/libc/sunrpc/rpc_clntout.c eglibc-2.12/libc/sunrpc/rpc_clntout.c ---- eglibc-2.12.orig/libc/sunrpc/rpc_clntout.c 2010-09-28 19:14:27.000000000 +0200 -+++ eglibc-2.12/libc/sunrpc/rpc_clntout.c 2010-09-29 12:45:11.000000000 +0200 +diff -Nur eglibc-2.16.orig/libc/sunrpc/rpc_clntout.c eglibc-2.16/libc/sunrpc/rpc_clntout.c +--- eglibc-2.16.orig/libc/sunrpc/rpc_clntout.c 2012-07-31 09:00:24.000000000 +0200 ++++ eglibc-2.16/libc/sunrpc/rpc_clntout.c 2012-07-31 09:22:22.000000000 +0200 @@ -31,7 +31,7 @@ */ #include <stdio.h> @@ -44,10 +51,10 @@ diff -Nur eglibc-2.12.orig/libc/sunrpc/rpc_clntout.c eglibc-2.12/libc/sunrpc/rpc #include "rpc_parse.h" #include "rpc_util.h" #include "proto.h" -diff -Nur eglibc-2.12.orig/libc/sunrpc/rpc_main.c eglibc-2.12/libc/sunrpc/rpc_main.c ---- eglibc-2.12.orig/libc/sunrpc/rpc_main.c 2010-09-28 19:14:27.000000000 +0200 -+++ eglibc-2.12/libc/sunrpc/rpc_main.c 2010-09-29 12:45:11.000000000 +0200 -@@ -37,7 +37,11 @@ +diff -Nur eglibc-2.16.orig/libc/sunrpc/rpc_main.c eglibc-2.16/libc/sunrpc/rpc_main.c +--- eglibc-2.16.orig/libc/sunrpc/rpc_main.c 2012-07-31 09:00:24.000000000 +0200 ++++ eglibc-2.16/libc/sunrpc/rpc_main.c 2012-07-31 09:22:22.000000000 +0200 +@@ -38,7 +38,11 @@ #include <stdio.h> #include <string.h> #include <unistd.h> @@ -59,7 +66,7 @@ diff -Nur eglibc-2.12.orig/libc/sunrpc/rpc_main.c eglibc-2.12/libc/sunrpc/rpc_ma #include <ctype.h> #include <sys/types.h> #include <sys/param.h> -@@ -996,10 +1000,12 @@ +@@ -958,10 +962,12 @@ abort (); temp = rindex (cmd->infile, '.'); cp = stpcpy (mkfilename, "Makefile."); @@ -75,10 +82,10 @@ diff -Nur eglibc-2.12.orig/libc/sunrpc/rpc_main.c eglibc-2.12/libc/sunrpc/rpc_ma } else -diff -Nur eglibc-2.12.orig/libc/sunrpc/rpc_scan.c eglibc-2.12/libc/sunrpc/rpc_scan.c ---- eglibc-2.12.orig/libc/sunrpc/rpc_scan.c 2010-09-28 19:14:27.000000000 +0200 -+++ eglibc-2.12/libc/sunrpc/rpc_scan.c 2010-09-29 12:45:11.000000000 +0200 -@@ -36,7 +36,11 @@ +diff -Nur eglibc-2.16.orig/libc/sunrpc/rpc_scan.c eglibc-2.16/libc/sunrpc/rpc_scan.c +--- eglibc-2.16.orig/libc/sunrpc/rpc_scan.c 2012-07-31 09:00:24.000000000 +0200 ++++ eglibc-2.16/libc/sunrpc/rpc_scan.c 2012-07-31 09:22:22.000000000 +0200 +@@ -37,7 +37,11 @@ #include <stdio.h> #include <ctype.h> #include <string.h> @@ -90,18 +97,3 @@ diff -Nur eglibc-2.12.orig/libc/sunrpc/rpc_scan.c eglibc-2.12/libc/sunrpc/rpc_sc #include "rpc_scan.h" #include "rpc_parse.h" #include "rpc_util.h" -diff -Nur eglibc-2.12.orig/libc/timezone/Makefile eglibc-2.12/libc/timezone/Makefile ---- eglibc-2.12.orig/libc/timezone/Makefile 2010-09-28 19:13:39.000000000 +0200 -+++ eglibc-2.12/libc/timezone/Makefile 2010-09-29 12:45:11.000000000 +0200 -@@ -181,8 +181,9 @@ - $(objpfx)zic: $(addprefix $(objpfx), $(zic-objs)) - - $(addprefix $(objpfx)cross-,$(zic-objs)): $(objpfx)cross-%.o: %.c -- gcc $< -c $(OUTPUT_OPTION) $(CFLAGS-$*.c) $(CPPFLAGS-$*) \ -- -DCROSS_ZIC $(compile-mkdep-flags) -+ gcc $< -c $(OUTPUT_OPTION) \ -+ $(filter-out -DHAVE_GETTEXT,$(CFLAGS-$*.c)) \ -+ $(CPPFLAGS-$*) -DCROSS_ZIC $(compile-mkdep-flags) - - $(objpfx)cross-zic: $(addprefix $(objpfx)cross-,$(zic-objs)) - gcc $(addprefix $(objpfx)cross-,$(zic-objs)) -o $@ diff --git a/toolchain/eglibc/patches/make382.patch b/toolchain/eglibc/patches/make382.patch deleted file mode 100644 index 99ccf2bf8..000000000 --- a/toolchain/eglibc/patches/make382.patch +++ /dev/null @@ -1,12 +0,0 @@ -diff -Nur eglibc-2.12.1.orig/libc/sunrpc/Makefile eglibc-2.12.1/libc/sunrpc/Makefile ---- eglibc-2.12.1.orig/libc/sunrpc/Makefile 2010-09-28 19:14:27.000000000 +0200 -+++ eglibc-2.12.1/libc/sunrpc/Makefile 2010-11-14 21:30:49.000000000 +0100 -@@ -106,7 +106,7 @@ - endif - - ifneq (yes,$(install-bootstrap-headers)) --headers += $(rpcsvc:%.x=rpcsvc/%.h) -+#headers += $(rpcsvc:%.x=rpcsvc/%.h) - extra-libs-$(OPTION_EGLIBC_SUNRPC) += librpcsvc - # Make it in `others' pass, not `lib' pass. - extra-libs-others-y += $(extra-libs-y) |