Upgrade qemu to 1.2 and eglibc with kconfig

new file mode 100644
index 0000000..6243926
@@ -0,0 +1,1007 @@
+Pulled from
+http://www.eglibc.org/archives/patches/msg01042.html
+
+Upstream-Status: Pending
+Signed-off-by: Khem
+
+Hi,
+
+This patch adds 'make menuconfig' support to EGLIBC.
+
+
+EGLIBC can re-use the Linux kernel kconfig host tools ('conf' and 'mconf') unmodified, by passing appropriate environment variables and with some pre- and post-processing on the input/output config files.
+
+There are three new make targets supported, which all are defined in the new libc/options-config/Makefile, which is included by the top-level libc/Makefile:
+
+- 'make defconfig'. This passes 'libc/option-groups.defaults' to 'conf' as a default config, and outputs 'option-groups.config' to the top-level build directory, which will be the same as the default config.
+
+- 'make config'. This is the same line-oriented interface as in the Linux kernel. Input and output is 'option-groups.config' in the top-level build directory.
+
+- 'make menuconfig'. This is the same menu-based interface as in the Linux kernel. Input and output is 'option-groups.config' in the top-level build directory.
+
+
+Pre-Processing:
+
+
+The Linux kernel kconfig tools expect a prefix of "CONFIG_" on all config option names, but EGLIBC expects a prefix of "OPTION_". The pre-processing script, libc/options-config/config-preproc.pl, simply replaces "CONFIG_ with "OPTION_" in the given config file. The libc/options-config/Makefile passes the script output to a temporary config file, which is then passed to 'conf' or 'mconf'.
+
+Post-Processing (libc/options-config/config-postproc.pl):
+
+
+- Disabled options are output as a comment line of the form "# CONFIG_FOO is not set". This needs to be changed to an explicit "CONFIG_FOO=n" in order to be compatible with 'option-groups.awk' which generates the option-groups.h header.
+
+- "CONFIG_" prefix is changed back to "OPTION_".
+
+
+- The kconfig tools will not output anything for options that depend on a parent option, when the parent option is disabled. This implicit disable must be converted to an explicit "CONFIG_FOO=n" in order to be compatible with the way EGLIBC overrides the default option settings in 'libc/option-groups.defaults' with those in 'option-groups.config'.
+
+
+A new configure option, '--with-kconfig=<PATH>', tells EGLIBC where to find the pre-built 'conf' and 'mconf' host tools from Linux kernel builds.
+
+libc/EGLIBC.cross-building is updated to include instructions for using '--with-kconfig' for the final EGLIBC build, and shows how and when to run 'make *config'.
+
+libc/EGLIBC.option-groups is updated to include new information on the menuconfig support.
+
+Thanks,
+
+attached is the updated patch to address above issues.
+
+Steve
+
+--
+Steve Longerbeam | Senior Embedded Engineer, ESD Services
+Mentor Embedded(tm) | 46871 Bayside Parkway, Fremont, CA 94538
+P 510.354.5838 | M 408.410.2735
+Nucleus(r) | Linux(r) | Android(tm) | Services | UI | Multi-OS
+
+
+Index: libc/EGLIBC.cross-building
+===================================================================
+--- libc.orig/EGLIBC.cross-building	2012-08-21 22:25:49.000000000 -0700
++++ libc/EGLIBC.cross-building	2012-09-05 21:44:09.749577576 -0700
+@@ -243,9 +243,29 @@
+     > $src/libc/configure \
+     >     --prefix=/usr \
+     >     --with-headers=$sysroot/usr/include \
++    >     --with-kconfig=$obj/linux/scripts/kconfig \
+     >     --build=$build \
+     >     --host=$target \
+     >     --disable-profile --without-gd --without-cvs --enable-add-ons
++
++Note the additional '--with-kconfig' option. This tells EGLIBC where to
++find the host config tools used by the kernel 'make config' and 'make
++menuconfig'.  These tools can be re-used by EGLIBC for its own 'make
++*config' support, which will create 'option-groups.config' for you.
++But first make sure those tools have been built by running some
++dummy 'make *config' calls in the kernel directory:
++
++    $ cd $obj/linux
++    $ PATH=$tools/bin:$PATH make config \
++    >      ARCH=$linux_arch CROSS_COMPILE=$target- \
++    $ PATH=$tools/bin:$PATH make menuconfig \
++    >      ARCH=$linux_arch CROSS_COMPILE=$target- \
++
++Now we can configure and build the full EGLIBC:
++
++    $ cd $obj/eglibc
++    $ PATH=$tools/bin:$PATH make defconfig
++    $ PATH=$tools/bin:$PATH make menuconfig
+     $ PATH=$tools/bin:$PATH make
+     $ PATH=$tools/bin:$PATH make install install_root=$sysroot
+ 
+Index: libc/configure.in
+===================================================================
+--- libc.orig/configure.in	2012-09-05 21:40:19.000000000 -0700
++++ libc/configure.in	2012-09-05 21:44:09.769577577 -0700
+@@ -96,6 +96,16 @@
+ 	    [sysheaders=$withval],
+ 	    [sysheaders=''])
+ 
++AC_ARG_WITH([kconfig],
++	    AC_HELP_STRING([--with-kconfig=PATH],
++			   [location of kconfig tools to use (from Linux
++			    kernel builds) to re-use for configuring EGLIBC
++			    option groups]),
++	    [KCONFIG_TOOLS=$withval],
++	    [KCONFIG_TOOLS=''])
++AC_SUBST(KCONFIG_TOOLS)
++
++
+ AC_SUBST(use_default_link)
+ AC_ARG_WITH([default-link],
+ 	    AC_HELP_STRING([--with-default-link],
+Index: libc/config.make.in
+===================================================================
+--- libc.orig/config.make.in	2012-08-21 22:25:55.000000000 -0700
++++ libc/config.make.in	2012-09-05 21:45:16.253579810 -0700
+@@ -48,6 +48,8 @@
+ c++-sysincludes = @CXX_SYSINCLUDES@
+ all-warnings = @all_warnings@
+ 
++kconfig_tools = @KCONFIG_TOOLS@
++
+ have-z-combreloc = @libc_cv_z_combreloc@
+ have-z-execstack = @libc_cv_z_execstack@
+ have-Bgroup = @libc_cv_Bgroup@
+Index: libc/options-config/config-postproc.pl
+===================================================================
+--- /dev/null	1970-01-01 00:00:00.000000000 +0000
++++ libc/options-config/config-postproc.pl	2012-09-05 21:44:09.769577577 -0700
+@@ -0,0 +1,54 @@
++#!/usr/bin/perl
++
++$usage = "usage: $0 <default config file> <config file>\n";
++
++die "$usage" unless @ARGV;
++$defaults = shift @ARGV;
++die "$usage" unless @ARGV;
++die "Could not open $ARGV[0]" unless -T $ARGV[0];
++
++sub yank {
++    @option = grep($_ ne $_[0], @option);
++}
++
++open(DEFAULTS, $defaults) || die "Could not open $defaults\n";
++
++# get the full list of available options using the default config file
++$i = 0;
++while (<DEFAULTS>) {
++    if (/^\s*OPTION_(\w+)\s*=/) {
++	$option[$i++] = $1;
++    }
++}
++
++# now go through the config file, making the necessary changes
++while (<>) {
++    if (/Linux Kernel Configuration/) {
++	# change title
++	s/Linux Kernel/Option Groups/;
++	print;
++    } elsif (/^\s*CONFIG_(\w+)\s*=/) {
++	# this is an explicit option set line, change CONFIG_ to OPTION_
++	# before printing and remove this option from option list
++	$opt = $1;
++	yank($opt);
++	s/CONFIG_/OPTION_/g;
++	print;
++    } elsif (/^\s*#\s+CONFIG_(\w+) is not set/) {
++	# this is a comment line, change CONFIG_ to OPTION_, remove this
++	# option from option list, and convert to explicit OPTION_FOO=n
++	$opt = $1;
++	yank($opt);
++	s/CONFIG_/OPTION_/g;
++	print "OPTION_$opt=n\n";
++    } else {
++	print;
++    }
++}
++
++# any options left in @options, are options that were not mentioned in
++# the config file, and implicitly that means the option must be set =n,
++# so do that here.
++foreach $opt (@option) {
++    print "OPTION_$opt=n\n";
++}
+Index: libc/options-config/config-preproc.pl
+===================================================================
+--- /dev/null	1970-01-01 00:00:00.000000000 +0000
++++ libc/options-config/config-preproc.pl	2012-09-05 21:44:09.769577577 -0700
+@@ -0,0 +1,8 @@
++#!/usr/bin/perl
++
++if (@ARGV) {
++    while (<>) {
++	s/OPTION_/CONFIG_/g;
++	print;
++    }
++}
+Index: libc/options-config/Makefile
+===================================================================
+--- /dev/null	1970-01-01 00:00:00.000000000 +0000
++++ libc/options-config/Makefile	2012-09-05 21:44:09.769577577 -0700
+@@ -0,0 +1,55 @@
++# ===========================================================================
++# EGLIBC option-groups configuration targets
++# These targets are included from top-level makefile
++
++ifneq ($(kconfig_tools),)
++ifneq (no,$(PERL))
++
++ocdir := options-config
++
++OconfigDefaults     := option-groups.defaults
++OconfigDefaults_tmp := $(common-objpfx).tmp.defconfig
++OconfigDef          := option-groups.def
++Oconfig             := $(common-objpfx)option-groups.config
++Oconfig_tmp         := $(common-objpfx).tmp.config
++
++conf  := $(kconfig_tools)/conf
++mconf := $(kconfig_tools)/mconf
++
++preproc  := $(PERL) $(ocdir)/config-preproc.pl
++postproc := $(PERL) $(ocdir)/config-postproc.pl
++
++PHONY += defconfig config menuconfig
++
++defconfig: $(conf) $(OconfigDefaults) $(OconfigDef)
++	rm -f $(OconfigDefaults_tmp)
++	rm -f $(Oconfig_tmp)
++	$(preproc) $(OconfigDefaults) > $(OconfigDefaults_tmp)
++	KCONFIG_CONFIG=$(Oconfig_tmp) $< --defconfig=$(OconfigDefaults_tmp) \
++				$(OconfigDef)
++	$(postproc) $(OconfigDefaults) $(Oconfig_tmp) > $(Oconfig)
++	rm $(Oconfig_tmp)
++	rm $(OconfigDefaults_tmp)
++
++config: $(conf) $(OconfigDefaults) $(OconfigDef)
++	rm -f $(Oconfig_tmp)
++	$(preproc) $(wildcard $(Oconfig)) > $(Oconfig_tmp)
++	KCONFIG_CONFIG=$(Oconfig_tmp) $< --oldaskconfig $(OconfigDef)
++	$(postproc) $(OconfigDefaults) $(Oconfig_tmp) > $(Oconfig)
++	rm $(Oconfig_tmp)
++
++menuconfig: $(mconf) $(OconfigDefaults) $(OconfigDef)
++	rm -f $(Oconfig_tmp)
++	$(preproc) $(wildcard $(Oconfig)) > $(Oconfig_tmp)
++	KCONFIG_CONFIG=$(Oconfig_tmp) $< $(OconfigDef)
++	$(postproc) $(OconfigDefaults) $(Oconfig_tmp) > $(Oconfig)
++	rm $(Oconfig_tmp)
++
++# Help text used by make help
++help:
++	@echo  '  defconfig	  - New config with default from default config'
++	@echo  '  config	  - Update current config utilising a line-oriented program'
++	@echo  '  menuconfig	  - Update current config utilising a menu based program'
++
++endif
++endif
+Index: libc/option-groups.defaults
+===================================================================
+--- libc.orig/option-groups.defaults	2012-08-21 22:26:18.000000000 -0700
++++ libc/option-groups.defaults	2012-09-05 21:44:09.769577577 -0700
+@@ -8,41 +8,41 @@
+ # are to be changed.
+ #
+ # By default, all option groups are enabled.
+-OPTION_EGLIBC_ADVANCED_INET6 = y
+-OPTION_EGLIBC_BACKTRACE = y
+-OPTION_EGLIBC_BIG_MACROS = y
+-OPTION_EGLIBC_BSD = y
+-OPTION_EGLIBC_CXX_TESTS = y
+-OPTION_EGLIBC_CATGETS = y
+-OPTION_EGLIBC_CHARSETS = y
+-OPTION_EGLIBC_CRYPT = y
+-OPTION_EGLIBC_CRYPT_UFC = y
+-OPTION_EGLIBC_DB_ALIASES = y
+-OPTION_EGLIBC_ENVZ = y
+-OPTION_EGLIBC_FCVT = y
+-OPTION_EGLIBC_FMTMSG = y
+-OPTION_EGLIBC_FSTAB = y
+-OPTION_EGLIBC_FTRAVERSE = y
+-OPTION_EGLIBC_GETLOGIN = y
+-OPTION_EGLIBC_IDN = y
+-OPTION_EGLIBC_INET = y
+-OPTION_EGLIBC_INET_ANL = y
+-OPTION_EGLIBC_LIBM = y
+-OPTION_EGLIBC_LIBM_BIG = y
+-OPTION_EGLIBC_LOCALES = y
+-OPTION_EGLIBC_LOCALE_CODE = y
+-OPTION_EGLIBC_MEMUSAGE = y
+-OPTION_EGLIBC_NIS = y
+-OPTION_EGLIBC_NSSWITCH = y
+-OPTION_EGLIBC_RCMD = y
+-OPTION_EGLIBC_RTLD_DEBUG = y
+-OPTION_EGLIBC_SPAWN = y
+-OPTION_EGLIBC_STREAMS = y
+-OPTION_EGLIBC_SUNRPC = y
+-OPTION_EGLIBC_UTMP = y
+-OPTION_EGLIBC_UTMPX = y
+-OPTION_EGLIBC_WORDEXP = y
+-OPTION_POSIX_C_LANG_WIDE_CHAR = y
+-OPTION_POSIX_REGEXP = y
+-OPTION_POSIX_REGEXP_GLIBC = y
+-OPTION_POSIX_WIDE_CHAR_DEVICE_IO = y
++OPTION_EGLIBC_ADVANCED_INET6=y
++OPTION_EGLIBC_BACKTRACE=y
++OPTION_EGLIBC_BIG_MACROS=y
++OPTION_EGLIBC_BSD=y
++OPTION_EGLIBC_CXX_TESTS=y
++OPTION_EGLIBC_CATGETS=y
++OPTION_EGLIBC_CHARSETS=y
++OPTION_EGLIBC_CRYPT=y
++OPTION_EGLIBC_CRYPT_UFC=y
++OPTION_EGLIBC_DB_ALIASES=y
++OPTION_EGLIBC_ENVZ=y
++OPTION_EGLIBC_FCVT=y
++OPTION_EGLIBC_FMTMSG=y
++OPTION_EGLIBC_FSTAB=y
++OPTION_EGLIBC_FTRAVERSE=y
++OPTION_EGLIBC_GETLOGIN=y
++OPTION_EGLIBC_IDN=y
++OPTION_EGLIBC_INET=y
++OPTION_EGLIBC_INET_ANL=y
++OPTION_EGLIBC_LIBM=y
++OPTION_EGLIBC_LIBM_BIG=y
++OPTION_EGLIBC_LOCALES=y
++OPTION_EGLIBC_LOCALE_CODE=y
++OPTION_EGLIBC_MEMUSAGE=y
++OPTION_EGLIBC_NIS=y
++OPTION_EGLIBC_NSSWITCH=y
++OPTION_EGLIBC_RCMD=y
++OPTION_EGLIBC_RTLD_DEBUG=y
++OPTION_EGLIBC_SPAWN=y
++OPTION_EGLIBC_STREAMS=y
++OPTION_EGLIBC_SUNRPC=y
++OPTION_EGLIBC_UTMP=y
++OPTION_EGLIBC_UTMPX=y
++OPTION_EGLIBC_WORDEXP=y
++OPTION_POSIX_C_LANG_WIDE_CHAR=y
++OPTION_POSIX_REGEXP=y
++OPTION_POSIX_REGEXP_GLIBC=y
++OPTION_POSIX_WIDE_CHAR_DEVICE_IO=y
+Index: libc/option-groups.def
+===================================================================
+--- libc.orig/option-groups.def	2012-08-21 22:25:45.000000000 -0700
++++ libc/option-groups.def	2012-09-05 21:44:09.773577578 -0700
+@@ -4,19 +4,19 @@
+ #
+ # An entry of the form:
+ #
+-#   config OPTION_GROUP_NAME
++#   config GROUP_NAME
+ #       bool "one-line explanation of what this option group controls"
+ #       help
+ #           Multi-line help explaining the option group's meaning in
+ #           some detail, terminated by indentation level.
+ #
+-# defines an option group whose variable is OPTION_GROUP_NAME, with
++# defines an option group whose variable is GROUP_NAME, with
+ # meaningful values 'y' (enabled) and 'n' (disabled).  The
+ # documentation is formatted to be consumed by some sort of
+ # interactive configuration interface, but EGLIBC doesn't have such an
+ # interface yet.
+ #
+-# An option may have a 'depends' line, indicating which other options
++# An option may have a 'depends on' line, indicating which other options
+ # must also be enabled if this option is.  At present, EGLIBC doesn't
+ # check that these dependencies are satisfied.
+ # 
+@@ -41,9 +41,9 @@
+ # although this simply reestablishes the value already set by
+ # 'option-groups.defaults'.
+ 
+-config OPTION_EGLIBC_ADVANCED_INET6
++config EGLIBC_ADVANCED_INET6
+    bool "IPv6 Advanced Sockets API support (RFC3542)"
+-   depends OPTION_EGLIBC_INET
++   depends on EGLIBC_INET
+    help
+        This option group includes the functions specified by RFC 3542,
+        "Advanced Sockets Application Program Interface (API) for
+@@ -71,7 +71,7 @@
+          inet6_rth_segments
+          inet6_rth_space
+ 
+-config OPTION_EGLIBC_BACKTRACE
++config EGLIBC_BACKTRACE
+    bool "Functions for producing backtraces"
+    help
+        This option group includes functions for producing a list of
+@@ -85,7 +85,7 @@
+          backtrace_symbols
+          backtrace_symbols_fd
+ 
+-config OPTION_EGLIBC_BIG_MACROS
++config EGLIBC_BIG_MACROS
+    bool "Use extensive inline code"
+    help
+        This option group specifies whether certain pieces of code
+@@ -93,7 +93,7 @@
+        group is not selected, function calls will be used instead,
+        hence reducing the library footprint.
+ 
+-config OPTION_EGLIBC_BSD
++config EGLIBC_BSD
+    bool "BSD-specific functions, and their compatibility stubs"
+    help
+        This option group includes functions specific to BSD kernels.
+@@ -109,10 +109,9 @@
+          revoke
+          setlogin
+ 
+-config OPTION_EGLIBC_CXX_TESTS
++config EGLIBC_CXX_TESTS
+    bool "Tests that link against the standard C++ library."
+-   depends OPTION_POSIX_WIDE_CHAR_DEVICE_IO
+-   depends OPTION_EGLIBC_LIBM
++   depends on POSIX_WIDE_CHAR_DEVICE_IO && EGLIBC_LIBM
+    help
+        This option group does not include any C library functions;
+        instead, it controls which EGLIBC tests an ordinary 'make
+@@ -121,23 +120,22 @@
+        run.
+ 
+        The standard C++ library depends on the math library 'libm' and
+-       the wide character I/O functions included in EGLIBC.  If those
+-       option groups are disabled, this test must also be disabled.
++       the wide character I/O functions included in EGLIBC.  So those
++       option groups must be enabled if this test is enabled.
+ 
+-config OPTION_EGLIBC_CATGETS
++config EGLIBC_CATGETS
+    bool "Functions for accessing message catalogs"
+-   depends OPTION_EGLIBC_LOCALE_CODE
++   depends on EGLIBC_LOCALE_CODE
+    help
+        This option group includes functions for accessing message
+        catalogs: catopen, catclose, and catgets.
+ 
+-       This option group depends on the OPTION_EGLIBC_LOCALE_CODE
+-       option group; if you disable that, you must also disable this.
++       This option group depends on the EGLIBC_LOCALE_CODE
++       option group.
+ 
+-config OPTION_EGLIBC_CHARSETS
++config EGLIBC_CHARSETS
+    bool "iconv/gconv character set conversion libraries"
+    help
+-
+        This option group includes support for character sets other
+        than ASCII (ANSI_X3.4-1968) and Unicode and ISO-10646 in their
+        various encodings.  This affects both the character sets
+@@ -198,16 +196,16 @@
+           WCHAR_T           - EGLIBC's internal form (target-endian,
+                               32-bit ISO 10646)
+ 
+-config OPTION_EGLIBC_CRYPT
++config EGLIBC_CRYPT
+    bool "Encryption library"
+    help
+        This option group includes the `libcrypt' library which
+        provides functions for one-way encryption.  Supported
+        encryption algorithms include MD5, SHA-256, SHA-512 and DES.
+ 
+-config OPTION_EGLIBC_CRYPT_UFC
++config EGLIBC_CRYPT_UFC
+    bool "Ultra fast `crypt' implementation"
+-   depends OPTION_EGLIBC_CRYPT
++   depends on EGLIBC_CRYPT
+    help
+        This option group provides ultra fast DES-based implementation of
+        the `crypt' function.  When this option group is disabled,
+@@ -216,7 +214,7 @@
+        errno to ENOSYS if /salt/ passed does not correspond to either MD5,
+        SHA-256 or SHA-512 algorithm.
+ 
+-config OPTION_EGLIBC_DB_ALIASES
++config EGLIBC_DB_ALIASES
+    bool "Functions for accessing the mail aliases database"
+    help
+        This option group includues functions for looking up mail
+@@ -233,7 +231,7 @@
+        When this option group is disabled, the NSS service libraries
+        also lack support for querying their mail alias tables.
+ 
+-config OPTION_EGLIBC_ENVZ
++config EGLIBC_ENVZ
+    bool "Functions for handling envz-style environment vectors."
+    help
+        This option group contains functions for creating and operating
+@@ -248,7 +246,7 @@
+         envz_entry      envz_remove
+         envz_get        envz_strip 
+ 
+-config OPTION_EGLIBC_FCVT
++config EGLIBC_FCVT
+    bool "Functions for converting floating-point numbers to strings"
+    help
+        This option group includes functions for converting
+@@ -262,14 +260,14 @@
+ 	 fcvt_r		qfcvt_r
+          gcvt		qgcvt
+ 
+-config OPTION_EGLIBC_FMTMSG
++config EGLIBC_FMTMSG
+    bool "Functions for formatting messages"
+    help
+        This option group includes the following functions:
+ 
+          addseverity    fmtmsg
+ 
+-config OPTION_EGLIBC_FSTAB
++config EGLIBC_FSTAB
+    bool "Access functions for 'fstab'"
+    help
+        This option group includes functions for reading the mount
+@@ -283,7 +281,7 @@
+          getfsent       setfsent
+          getfsfile
+ 
+-config OPTION_EGLIBC_FTRAVERSE
++config EGLIBC_FTRAVERSE
+    bool "Functions for traversing file hierarchies"
+    help
+        This option group includes functions for traversing file
+@@ -297,9 +295,9 @@
+ 	 fts_set	nftw64
+          fts_close
+ 
+-config OPTION_EGLIBC_GETLOGIN
++config EGLIBC_GETLOGIN
+    bool "The getlogin function"
+-   depends OPTION_EGLIBC_UTMP
++   depends on EGLIBC_UTMP
+    help
+        This function group includes the 'getlogin' and 'getlogin_r'
+        functions, which return the user name associated by the login
+@@ -309,17 +307,17 @@
+        fall back on 'getlogin' to find the user's login name for tilde
+        expansion when the 'HOME' environment variable is not set.
+ 
+-config OPTION_EGLIBC_IDN
++config EGLIBC_IDN
+    bool "International domain names support"
+    help
+        This option group includes the `libcidn' library which
+        provides support for international domain names.
+ 
+-config OPTION_EGLIBC_INET
++config EGLIBC_INET
+    bool "Networking support"
+    help
+        This option group includes networking-specific functions and
+-       data.  With OPTION_EGLIBC_INET disabled, the EGLIBC
++       data.  With EGLIBC_INET disabled, the EGLIBC
+        installation and API changes as follows:
+ 
+        - The following libraries are not installed:
+@@ -439,14 +437,14 @@
+        use Unix-domain sockets to communicate with the syslog daemon;
+        syslog is valuable in non-networked contexts.
+ 
+-config OPTION_EGLIBC_INET_ANL
++config EGLIBC_INET_ANL
+    bool "Asynchronous name lookup"
+-   depends OPTION_EGLIBC_INET
++   depends on EGLIBC_INET
+    help
+        This option group includes the `libanl' library which
+        provides support for asynchronous name lookup.
+ 
+-config OPTION_EGLIBC_LIBM
++config EGLIBC_LIBM
+    bool "libm (math library)"
+    help
+        This option group includes the 'libm' library, containing
+@@ -464,8 +462,9 @@
+        group, you will not be able to build 'libstdc++' against the
+        resulting EGLIBC installation.
+ 
+-config OPTION_EGLIBC_LIBM_BIG
++config EGLIBC_LIBM_BIG
+    bool "Math library size"
++   depends on EGLIBC_LIBM
+    help
+        This option group enables default configuration of the math library.
+        Not selecting this option group removes most of the extended and
+@@ -477,7 +476,7 @@
+        This option group is useful for systems that do not rely on precise
+        floating point math.
+ 
+-config OPTION_EGLIBC_LOCALES
++config EGLIBC_LOCALES
+    bool "Locale definitions"
+    help
+        This option group includes all locale definitions other than
+@@ -485,17 +484,17 @@
+        only the "C" locale is supported.
+ 
+ 
+-config OPTION_EGLIBC_LOCALE_CODE
++config EGLIBC_LOCALE_CODE
+    bool "Locale functions"
+-   depends OPTION_POSIX_C_LANG_WIDE_CHAR
++   depends on POSIX_C_LANG_WIDE_CHAR
+    help
+        This option group includes locale support functions, programs,
+-       and libraries.  With OPTION_EGLIBC_LOCALE_FUNCTIONS disabled,
++       and libraries.  With EGLIBC_LOCALE_CODE disabled,
+        EGLIBC supports only the 'C' locale (also known as 'POSIX'),
+        and ignores the settings of the 'LANG' and 'LC_*' environment
+        variables.
+ 
+-       With OPTION_EGLIBC_LOCALE_CODE disabled, the following
++       With EGLIBC_LOCALE_CODE disabled, the following
+        functions are omitted from libc:
+ 
+          duplocale   localeconv  nl_langinfo    rpmatch  strfmon_l
+@@ -504,46 +503,43 @@
+        Furthermore, only the LC_CTYPE and LC_TIME categories of the
+        standard "C" locale are available.
+ 
+-       The OPTION_EGLIBC_CATGETS option group depends on this option
+-       group; if you disable OPTION_EGLIBC_LOCALE_CODE, you must also
+-       disable OPTION_EGLIBC_CATGETS.
++       The EGLIBC_CATGETS option group depends on this option group.
++
+ 
+-config OPTION_EGLIBC_MEMUSAGE
++config EGLIBC_MEMUSAGE
+    bool "Memory profiling library"
+    help
+        This option group includes the `libmemusage' library and
+        the `memusage' and `memusagestat' utilities.
+        These components provide memory profiling functions.
+ 
+-     OPTION_EGLIBC_MEMUSAGE_DEFAULT_BUFFER_SIZE
++       EGLIBC_MEMUSAGE_DEFAULT_BUFFER_SIZE
+ 
+        Libmemusage library buffers the profiling data in memory
+        before writing it out to disk.  By default, the library
+        allocates 1.5M buffer, which can be substantial for some
+-       systems.  OPTION_EGLIBC_MEMUSAGE_DEFAULT_BUFFER_SIZE option
++       systems.  EGLIBC_MEMUSAGE_DEFAULT_BUFFER_SIZE option
+        allows to change the default buffer size.  It specifies
+        the number of entries the buffer should have.
+        On most architectures one buffer entry amounts to 48 bytes,
+        so setting this option to the value of 512 will reduce the size of
+        the memory buffer to 24K.
+ 
+-config OPTION_EGLIBC_NIS
++config EGLIBC_NIS
+    bool "Support for NIS, NIS+, and the special 'compat' services."
+-   depends OPTION_EGLIBC_INET
+-   depends OPTION_EGLIBC_SUNRPC
++   depends on EGLIBC_INET && EGLIBC_SUNRPC
+    help
+        This option group includes the NIS, NIS+, and 'compat' Name
+        Service Switch service libraries.  When it is disabled, those
+        services libraries are not installed; you should remove any
+        references to them from your 'nsswitch.conf' file.
+ 
+-       This option group depends on the OPTION_EGLIBC_INET option
++       This option group depends on the EGLIBC_INET option
+        group; you must enable that to enable this option group.
+ 
+-config OPTION_EGLIBC_NSSWITCH
++config EGLIBC_NSSWITCH
+    bool "Name service switch (nsswitch) support"
+    help
+-
+        This option group includes support for the 'nsswitch' facility.
+        With this option group enabled, all EGLIBC functions for
+        accessing various system databases (passwords and groups;
+@@ -557,12 +553,12 @@
+        'option-groups.config' file must set the following two
+        variables:
+ 
+-       OPTION_EGLIBC_NSSWITCH_FIXED_CONFIG
++       EGLIBC_NSSWITCH_FIXED_CONFIG
+ 
+           Set this to the name of a file whose contents observe the
+           same syntax as an ordinary '/etc/nsswitch.conf' file.  The
+           EGLIBC build process parses this file just as EGLIBC would
+-          at run time if OPTION_EGLIBC_NSSWITCH were enabled, and
++          at run time if EGLIBC_NSSWITCH were enabled, and
+           produces a C library that uses the nsswitch service
+           libraries to search for database entries as this file
+           specifies, instead of consulting '/etc/nsswitch.conf' at run
+@@ -580,7 +576,7 @@
+           you will probably want to delete references to databases not
+           needed on your system.
+ 
+-       OPTION_EGLIBC_NSSWITCH_FIXED_FUNCTIONS
++       EGLIBC_NSSWITCH_FIXED_FUNCTIONS
+ 
+           The EGLIBC build process uses this file to decide which
+           functions to make available from which service libraries.
+@@ -598,28 +594,28 @@
+           Be sure to mention each function in each service you wish to
+           use.  If you do not mention a service's function here, the
+           EGLIBC database access functions will not find it, even if
+-          it is listed in the OPTION_EGLIBC_NSSWITCH_FIXED_CONFIG
++          it is listed in the EGLIBC_NSSWITCH_FIXED_CONFIG
+           file.
+ 
+-       In this arrangement, EGLIBC will not use the 'dlopen' and
+-       'dlsym' functions to find database access functions.  Instead,
+-       libc hard-codes references to the service libraries' database
+-       access functions.  You must explicitly link your program
+-       against the name service libraries (those whose names start
+-       with 'libnss_', in the sysroot's '/lib' directory) whose
+-       functions you intend to use.  This arrangement helps
+-       system-wide static analysis tools decide which functions a
+-       system actually uses.
+-
+-       Note that some nsswitch service libraries require other option
+-       groups to be enabled; for example, the OPTION_EGLIBC_INET
+-       option group must be enabled to use the 'libnss_dns.so.2'
+-       service library, which uses the Domain Name System network
+-       protocol to answer queries.
++          In this arrangement, EGLIBC will not use the 'dlopen' and
++          'dlsym' functions to find database access functions.  Instead,
++          libc hard-codes references to the service libraries' database
++          access functions.  You must explicitly link your program
++          against the name service libraries (those whose names start
++          with 'libnss_', in the sysroot's '/lib' directory) whose
++          functions you intend to use.  This arrangement helps
++          system-wide static analysis tools decide which functions a
++          system actually uses.
++
++          Note that some nsswitch service libraries require other option
++          groups to be enabled; for example, the EGLIBC_INET
++          option group must be enabled to use the 'libnss_dns.so.2'
++          service library, which uses the Domain Name System network
++          protocol to answer queries.
+ 
+-config OPTION_EGLIBC_RCMD
++config EGLIBC_RCMD
+    bool "Support for 'rcmd' and related library functions"
+-   depends OPTION_EGLIBC_INET
++   depends on EGLIBC_INET
+    help
+       This option group includes functions for running commands on
+       remote machines via the 'rsh' protocol, and doing authentication
+@@ -635,7 +631,7 @@
+         rresvport       ruserpass
+         rresvport_af
+         
+-config OPTION_EGLIBC_RTLD_DEBUG
++config EGLIBC_RTLD_DEBUG
+    bool "Runtime linker debug print outs"
+    help
+       This option group enables debug output of the runtime linker
+@@ -646,7 +642,7 @@
+       the `ldd' utility which may also be used by the prelinker.
+       In particular, the `--unused' ldd option will not work correctly.
+ 
+-config OPTION_EGLIBC_SPAWN
++config EGLIBC_SPAWN
+    bool "Support for POSIX posix_spawn functions"
+    help
+       This option group includes the POSIX functions for executing
+@@ -682,7 +678,7 @@
+       disabled, those programs will only operate on uncompressed
+       charmap files.
+ 
+-config OPTION_EGLIBC_STREAMS
++config EGLIBC_STREAMS
+    bool "Support for accessing STREAMS."
+    help
+       This option group includes functions for reading and writing
+@@ -698,14 +694,14 @@
+         isastream       fdetach
+         putmsg
+ 
+-config OPTION_EGLIBC_SUNRPC
++config EGLIBC_SUNRPC
+    bool "Support for the Sun 'RPC' protocol."
+-   depends OPTION_EGLIBC_INET
++   depends on EGLIBC_INET
+    help
+       This option group includes support for the Sun RPC protocols,
+       including the 'rpcgen' and 'rpcinfo' programs.
+ 
+-config OPTION_EGLIBC_UTMP
++config EGLIBC_UTMP
+     bool "Older access functions for 'utmp' login records"
+     help
+        This option group includes the older 'utent' family of
+@@ -732,9 +728,9 @@
+ 
+          libutil.so (and libutil.a)
+ 
+-config OPTION_EGLIBC_UTMPX
++config EGLIBC_UTMPX
+     bool "POSIX access functions for 'utmp' login records"
+-    depends OPTION_EGLIBC_UTMP    
++    depends on EGLIBC_UTMP
+     help
+        This option group includes the POSIX functions for reading and
+        writing user login records in the 'utmp' file (usually
+@@ -755,21 +751,21 @@
+          updwtmpx
+          utmpxname
+ 
+-config OPTION_EGLIBC_WORDEXP
++config EGLIBC_WORDEXP
+     bool "Shell-style word expansion"
+     help
+         This option group includes the 'wordexp' function for
+         performing word expansion in the manner of the shell, and the
+         accompanying 'wordfree' function.
+ 
+-config OPTION_POSIX_C_LANG_WIDE_CHAR
++config POSIX_C_LANG_WIDE_CHAR
+     bool "ISO C library wide character functions, excluding I/O"
+     help
+         This option group includes the functions defined by the ISO C
+         standard for working with wide and multibyte characters in
+         memory.  Functions for reading and writing wide and multibyte
+         characters from and to files call in the
+-        OPTION_POSIX_WIDE_CHAR_DEVICE_IO option group.
++        POSIX_WIDE_CHAR_DEVICE_IO option group.
+ 
+         This option group includes the following functions:
+ 
+@@ -791,14 +787,14 @@
+           mbrlen        wcscoll       wcstol
+           mbrtowc       wcscpy        wcstold
+ 
+-config OPTION_POSIX_REGEXP
++config POSIX_REGEXP
+     bool "Regular expressions"
+     help
+         This option group includes the POSIX regular expression
+         functions, and the associated non-POSIX extensions and
+         compatibility functions.
+ 
+-        With OPTION_POSIX_REGEXP disabled, the following functions are
++        With POSIX_REGEXP disabled, the following functions are
+         omitted from libc:
+ 
+           re_comp                 re_max_failures         regcomp
+@@ -812,9 +808,9 @@
+         <regexp.h> header file, 'compile', 'step', and 'advance', is
+         omitted.
+ 
+-config OPTION_POSIX_REGEXP_GLIBC
++config POSIX_REGEXP_GLIBC
+     bool "Regular expressions from GLIBC"
+-    depends OPTION_POSIX_REGEXP
++    depends on POSIX_REGEXP
+     help
+ 	This option group specifies which regular expression
+         library to use.  The choice is between regex
+@@ -823,9 +819,9 @@
+         optimized for speed; regex from libiberty is more than twice
+         as small while still is enough for most practical purposes.
+ 
+-config OPTION_POSIX_WIDE_CHAR_DEVICE_IO
++config POSIX_WIDE_CHAR_DEVICE_IO
+     bool "Input and output functions for wide characters"
+-    depends OPTION_POSIX_C_LANG_WIDE_CHAR
++    depends on POSIX_C_LANG_WIDE_CHAR
+     help
+         This option group includes functions for reading and writing
+         wide characters to and from <stdio.h> streams.
+Index: libc/Makefile
+===================================================================
+--- libc.orig/Makefile	2012-08-21 22:25:54.000000000 -0700
++++ libc/Makefile	2012-09-05 21:44:09.773577578 -0700
+@@ -24,6 +24,7 @@
+ 
+ include Makeconfig
+ 
++include options-config/Makefile
+ 
+ # This is the default target; it makes everything except the tests.
+ .PHONY: all
+Index: libc/configure
+===================================================================
+--- libc.orig/configure	2012-09-05 21:40:19.000000000 -0700
++++ libc/configure	2012-09-05 21:44:09.777577578 -0700
+@@ -628,6 +628,7 @@
+ libc_cv_have_bash2
+ BASH_SHELL
+ libc_cv_gcc_static_libgcc
++KCONFIG_TOOLS
+ CXX_SYSINCLUDES
+ SYSINCLUDES
+ AUTOCONF
+@@ -735,6 +736,7 @@
+ with_binutils
+ with_selinux
+ with_headers
++with_kconfig
+ with_default_link
+ enable_sanity_checks
+ enable_shared
+@@ -1425,6 +1427,9 @@
+   --with-selinux          if building with SELinux support
+   --with-headers=PATH     location of system headers to use (for example
+                           /usr/src/linux/include) [default=compiler default]
++  --with-kconfig=PATH     location of kconfig tools to use (from Linux kernel
++                          builds) to re-use for configuring EGLIBC option
++                          groups
+   --with-default-link     do not use explicit linker scripts
+   --with-pkgversion=PKG   Use PKG in the version string in place of "EGLIBC"
+   --with-bugurl=URL       Direct users to URL to report a bug
+@@ -3485,6 +3490,14 @@
+ 
+ 
+ 
++# Check whether --with-kconfig was given.
++if test "${with_kconfig+set}" = set; then
++  withval=$with_kconfig; KCONFIG_TOOLS=$withval
++else
++  KCONFIG_TOOLS=''
++fi
++
++
+ 
+ # Check whether --with-default-link was given.
+ if test "${with_default_link+set}" = set; then :
+Index: libc/EGLIBC.option-groups
+===================================================================
+--- libc.orig/EGLIBC.option-groups	2012-08-21 22:26:20.000000000 -0700
++++ libc/EGLIBC.option-groups	2012-09-05 21:44:09.777577578 -0700
+@@ -56,33 +56,9 @@
+ 
+ The Option Groups
+ 
+-EGLIBC currently implements the following option groups, also
+-documented in the file 'option-groups.def':
+-
+-OPTION_EGLIBC_CATGETS
+-       This option group includes functions for accessing message
+-       catalogs: catopen, catclose, and catgets.
+-
+-OPTION_EGLIBC_LOCALES
+-       This option group includes all locale definitions other than
+-       those for the "C" locale.  If this option group is omitted, then
+-       only the "C" locale is supported.
+-
+-OPTION_EGLIBC_LIBM
+-       This option group includes the 'libm' library, containing
+-       mathematical functions.  If this option group is omitted, then
+-       an EGLIBC installation does not include shared or unshared versions
+-       of the math library.
+-
+-       Note that this does not remove all floating-point related
+-       functionality from EGLIBC; for example, 'printf' and 'scanf'
+-       can still print and read floating-point values with this option
+-       group disabled.
+-
+-       Note that the ISO Standard C++ library 'libstdc++' depends on
+-       EGLIBC's math library 'libm'.  If you disable this option
+-       group, you will not be able to build 'libstdc++' against the
+-       resulting EGLIBC installation.
++To see the current full list of implemented option groups, refer to the
++file 'option-groups.def' at the top of the source tree, or run
++'make menuconfig' from the top-level build directory.
+ 
+ The POSIX.1-2001 specification includes a suggested partition of all
+ the functions in the POSIX C API into option groups: math functions
+@@ -110,6 +86,18 @@
+    OPTION_EGLIBC_LOCALES = n
+    OPTION_EGLIBC_LIBM = y
+ 
++Like the Linux kernel, EGLIBC supports a similar set of '*config' make
++targets to make it easier to create 'option-groups.config', with all
++dependencies between option groups automatically satisfied.  Run
++'make help' to see the list of supported make config targets.  For
++example, 'make menuconfig' will update the current config utilising a
++menu based program.
++
++The option group names and their type (boolean, int, hex, string), help
++description, and dependencies with other option groups, are described by
++'option-groups.def' at the top of the source tree, analogous to the
++'Kconfig' files in the Linux kernel.
++
+ In general, each option group variable controls whether a given set of
+ object files in EGLIBC is compiled and included in the final
+ libraries, or omitted from the build.
+@@ -132,22 +120,3 @@
+ 
+ We have used the system to subset some portions of EGLIBC's
+ functionality.  It needs to be extended to cover more of the library.
+-
+-At the moment, EGLIBC performs no sanity checks on the contents of
+-'option-groups.config'; if an option group's name is mistyped, the
+-option group is silently included in the build.  EGLIBC should check
+-that all variables set in 'option-groups.config' are proper option
+-group names, and that their values are appropriate.
+-
+-Some portions of EGLIBC depend on others; for example, the Sun Remote
+-Procedure Call functions in 'sunrpc' depend on the networking
+-functions in 'inet'.  The sanity checking described above should check
+-that the selection configuration satisfies dependencies within EGLIBC,
+-and produce a legible error message if it does not.  At the moment,
+-inconsistent configurations produce link errors late in the build
+-process.
+-
+-The Linux kernel's configuration system provides interactive
+-interfaces for creating and modifying configuration files (which also
+-perform the sanity checking and dependency tracking described above).
+-EGLIBC should provide similar interfaces.

169 lines not on this page · raw message

176 lines not on this page · raw message

index c4bc18c..5a10387 100644
@@ -3,7 +3,7 @@ require eglibc.inc
 SRCREV = "20393"
 
 DEPENDS += "gperf-native"
-PR = "r7"
+PR = "r8"
 PR_append = "+svnr${SRCPV}"
 
 EGLIBC_BRANCH="eglibc-2_16"

@@ -26,6 +26,9 @@ SRC_URI = "svn://www.eglibc.org/svn/branches/;module=${EGLIBC_BRANCH};protocol=h
            file://add_resource_h_to_wait_h.patch \
            file://0001-Avoid-use-of-libgcc_s-and-libgcc_eh-when-building-gl.patch \
            file://0001-Add-ARM-specific-static-stubs.c.patch \
+           file://0001-eglibc-menuconfig-support.patch \
+           file://0002-eglibc-menuconfig-hex-string-options.patch \
+           file://0003-eglibc-menuconfig-build-instructions.patch \
           "
 LIC_FILES_CHKSUM = "file://LICENSES;md5=98a1128c4b58120182cbea3b1752d8b9 \
       file://COPYING;md5=393a5ca445f6965873eca0259a17f833 \

index 3b99ac2..f44db0c 100644
@@ -19,6 +19,7 @@ do_configure () {
 		--prefix=/usr \
 		--without-cvs --disable-sanity-checks \
 		--with-headers=${STAGING_DIR_TARGET}${includedir} \
+		--with-kconfig=${STAGING_BINDIR_NATIVE} \
 		--enable-hacker-mode --enable-addons
 }
 

index 6009278..8a8b364 100644
@@ -2,10 +2,10 @@ def eglibc_cfg(feature, features, tokens, cnf):
     if type(tokens) == type(""):
         tokens = [tokens]
     if type(features) == type([]) and feature in features:
-        cnf.extend([token + ' = y' for token in tokens])
+        cnf.extend([token + '=y' for token in tokens])
     else:
         for token in tokens:
-            cnf.extend([token + ' = n'])
+            cnf.extend([token + '=n'])
             if token == 'OPTION_EGLIBC_NSSWITCH':
                 cnf.extend(["OPTION_EGLIBC_NSSWITCH_FIXED_CONFIG = ${S}/nss/nsswitch.conf"])
                 cnf.extend(["OPTION_EGLIBC_NSSWITCH_FIXED_FUNCTIONS = ${S}/nss/fixed-nsswitch.functions"])

index 02f3c7a..29e303f 100644
@@ -56,6 +56,10 @@ do_configure_prepend() {
 	echo '${OE_FEATURES}' > ${B}/option-groups.config
 }
 
+do_configure_append() {
+	oe_runmake config
+}
+
 GLIBC_ADDONS ?= "ports,nptl,libidn"
 SDK_GLIBC_ADDONS ?= "ports,nptl,libidn"
 GLIBC_ADDONS_virtclass-nativesdk = "${SDK_GLIBC_ADDONS}"

index 5a10387..030b235 100644
@@ -2,7 +2,7 @@ require eglibc.inc
 
 SRCREV = "20393"
 
-DEPENDS += "gperf-native"
+DEPENDS += "gperf-native kconfig-frontends-native"
 PR = "r8"
 PR_append = "+svnr${SRCPV}"
 

@@ -79,6 +79,7 @@ EXTRA_OECONF = "--enable-kernel=${OLDEST_KERNEL} \
                 --with-headers=${STAGING_INCDIR} \
                 --without-selinux \
                 --enable-obsolete-rpc \
+                --with-kconfig=${STAGING_BINDIR_NATIVE} \
                 ${GLIBC_EXTRA_OECONF}"
 
 EXTRA_OECONF += "${@get_libc_fpu_setting(bb, d)}"

index 277de03..96899b8 100644
@@ -11,7 +11,7 @@ LICENSE = "GPL-2.0"
 LIC_FILES_CHKSUM = "file://COPYING;md5=9b8cf60ff39767ff04b671fca8302408"
 SECTION = "devel"
 DEPENDS += "ncurses flex bison gperf"
-PR = "r0"
+PR = "r1"
 PV = "3.5.0"
 SPIN = "0"
 SRC_URI = "http://ymorin.is-a-geek.org/download/${BPN}/${BPN}-${PV}-${SPIN}.tar.xz"

@@ -24,6 +24,12 @@ inherit autotools
 do_configure_prepend () {
 	mkdir -p scripts/.autostuff/m4
 }
+
+do_install_append() {
+	ln -s kconfig-conf ${D}${bindir}/conf
+	ln -s kconfig-mconf ${D}${bindir}/mconf
+}
+
 EXTRA_OECONF += "--disable-gconf --disable-qconf"
 
 # Some packages have the version preceeding the .so instead properly

new file mode 100644
index 0000000000000000000000000000000000000000..c4044296c51529878f5d2a46230949d09ef1d4e2
GIT binary patch

index e75f240..15cd008 100644
@@ -1,25 +1,20 @@
 require qemu.inc
 
-SRCREV = "56a60dd6d619877e9957ba06b92d2f276e3c229d"
+SRCREV = "6e4c0d1f03d6ab407509c32fab7cb4b8230f57ff"
 
 LIC_FILES_CHKSUM = "file://COPYING;md5=441c28d2cf86e15a37fa47e15a72fbac \
                     file://COPYING.LIB;endline=24;md5=c04def7ae38850e7d3ef548588159913"
 
-PV = "0.14.0"
-PR = "r4"
+PV = "1.2+git"
+PR = "r0"
 
 FILESPATH = "${FILE_DIRNAME}/qemu-${PV}/:${FILE_DIRNAME}/qemu-git/"
 FILESDIR = "${WORKDIR}"
 
 SRC_URI = "\
     git://git.qemu.org/qemu.git;protocol=git \
-    file://no-strip.patch \
-    file://linker-flags.patch \
-    file://qemu-vmware-vga-depth.patch \
-    file://enable-i386-linux-user.patch"
-
+    file://powerpc_rom.bin \
+    "
 S = "${WORKDIR}/git"
 
 DEFAULT_PREFERENCE = "-1"
-
-

deleted file mode 100644
index d64d76f..0000000
@@ -1,46 +0,0 @@
-Upstream-Status: Backport
-
-From 7c0a3409627604c111d5c5e1ce4e0224c2b56315 Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?Andreas=20F=C3=A4rber?= <[email protected]>
-Date: Tue, 4 Oct 2011 05:14:52 +0000
-Subject: [PATCH] ppc64: Fix linker script
-MIME-Version: 1.0
-Content-Type: text/plain; charset=UTF-8
-Content-Transfer-Encoding: 8bit
-
-Since commit 8733f609 (Fix linker scripts) linking on Linux/ppc64 fails:
-
-  LINK  ppc64-linux-user/qemu-ppc64
-/usr/lib64/gcc/powerpc64-suse-linux/4.3/../../../../powerpc64-suse-linux/bin/ld:/home/afaerber/qemu/ppc64.ld:84: syntax error
-collect2: ld gab 1 als Ende-Status zurück
-make[1]: *** [qemu-ppc64] Fehler 1
-make: *** [subdir-ppc64-linux-user] Fehler 2
-
-Fix by removing a leftover line in the ppc64 linker script.
-
-Cc: Gerd Hoffmann <[email protected]>
-Cc: Blue Swirl <[email protected]>
-Signed-off-by: Andreas Färber <[email protected]>
-Signed-off-by: Alexander Graf <[email protected]>
----
- ppc64.ld |    4 ++--
- 1 file changed, 2 insertions(+), 2 deletions(-)
-
-diff --git a/ppc64.ld b/ppc64.ld
-index 0059ee5..0a7c0dd 100644
---- a/ppc64.ld
-+++ b/ppc64.ld
-@@ -81,8 +81,8 @@ SECTIONS
-   .sdata2         : { *(.sdata2 .sdata2.* .gnu.linkonce.s2.*) }
-   .sbss2          : { *(.sbss2 .sbss2.* .gnu.linkonce.sb2.*) }
-   .eh_frame_hdr : { *(.eh_frame_hdr) }
--*(.gcc_except_table.*) } /* Adjust the address for the data segment.  We want to
--adjust up to +     the same address within the page on the next page up.  */
-+  /* Adjust the address for the data segment.  We want to adjust up to
-+     the same address within the page on the next page up.  */
-   . = ALIGN (0x10000) - ((0x10000 - .) & (0x10000 - 1)); . = DATA_SEGMENT_ALIGN
- (0x10000, 0x1000);   /* Exception handling  */
-   .eh_frame       : { KEEP (*(.eh_frame)) }
--- 
-1.7.10
-

66 lines not on this page · raw message

41 lines not on this page · raw message

610 lines not on this page · raw message

similarity index 75%
rename from meta/recipes-devtools/qemu/qemu-0.15.1/arm-bgr.patch
rename to meta/recipes-devtools/qemu/qemu-1.2.0/arm-bgr.patch
index a8fe65a..f3ebde6 100644
@@ -11,20 +11,20 @@ RP 16/9/2011
 
 Upstream-Status: Pending
 
-Index: qemu-0.14.0/hw/pl110.c
+Index: qemu-1.2.0/hw/pl110.c
 ===================================================================
---- qemu-0.14.0.orig/hw/pl110.c	2011-09-16 14:45:34.228668514 +0100
-+++ qemu-0.14.0/hw/pl110.c	2011-09-16 15:17:22.458671206 +0100
-@@ -141,7 +141,11 @@
+--- qemu-1.2.0.orig/hw/pl110.c	2012-09-06 14:07:27.619821133 -0700
++++ qemu-1.2.0/hw/pl110.c	2012-09-06 14:12:07.699829648 -0700
+@@ -168,7 +168,11 @@
          fprintf(stderr, "pl110: Bad color depth\n");
          exit(1);
      }
 -    if (s->cr & PL110_CR_BGR)
 +
-+    if (s->versatile && s->bpp == BPP_16)
++    if (s->version && s->bpp == BPP_16)
 +        /* Code assumes BPP_16 == 565 and BGR is never set on the versatile in 565 mode */
 +        bpp_offset = 0;
 +    else if (s->cr & PL110_CR_BGR)
          bpp_offset = 0;
      else
-         bpp_offset = 18;
+         bpp_offset = 24;

similarity index 100%
rename from meta/recipes-devtools/qemu/qemu-0.15.1/enable-i386-linux-user.patch
rename to meta/recipes-devtools/qemu/qemu-1.2.0/enable-i386-linux-user.patch

similarity index 100%
rename from meta/recipes-devtools/qemu/qemu-0.15.1/fallback-to-safe-mmap_min_addr.patch
rename to meta/recipes-devtools/qemu/qemu-1.2.0/fallback-to-safe-mmap_min_addr.patch

similarity index 59%
rename from meta/recipes-devtools/qemu/qemu-0.15.1/fix-configure-checks.patch
rename to meta/recipes-devtools/qemu/qemu-1.2.0/fix-configure-checks.patch
index 96881bb..ef77c92 100644
@@ -8,15 +8,15 @@ Patch from Paul Eggleton, Comments by RP 28/11/10
 
 Upstream-Status: Inappropriate [embedded specific]
 
-Index: qemu-0.14.0/configure
+Index: qemu-1.2.0/configure
 ===================================================================
---- qemu-0.14.0.orig/configure
-+++ qemu-0.14.0/configure
-@@ -229,6 +229,7 @@ QEMU_CFLAGS="-Wstrict-prototypes -Wredun
+--- qemu-1.2.0.orig/configure	2012-09-05 07:03:06.000000000 -0700
++++ qemu-1.2.0/configure	2012-09-06 13:55:07.007793823 -0700
+@@ -281,6 +281,7 @@
+ QEMU_CFLAGS="-Wstrict-prototypes -Wredundant-decls $QEMU_CFLAGS"
  QEMU_CFLAGS="-D_GNU_SOURCE -D_FILE_OFFSET_BITS=64 -D_LARGEFILE_SOURCE $QEMU_CFLAGS"
- QEMU_CFLAGS="-D_FORTIFY_SOURCE=2 $QEMU_CFLAGS"
- QEMU_INCLUDES="-I. -I\$(SRC_PATH)"
+ QEMU_INCLUDES="-I. -I\$(SRC_PATH) -I\$(SRC_PATH)/fpu"
 +QEMU_CFLAGS="$QEMU_CFLAGS $CFLAGS"
- LDFLAGS="-g $LDFLAGS"
- 
- # make source path absolute
+ if test "$debug_info" = "yes"; then
+     CFLAGS="-g $CFLAGS"
+     LDFLAGS="-g $LDFLAGS"

similarity index 100%
rename from meta/recipes-devtools/qemu/qemu-0.15.1/init-info.patch
rename to meta/recipes-devtools/qemu/qemu-1.2.0/init-info.patch

similarity index 100%
rename from meta/recipes-devtools/qemu/qemu-0.15.1/larger_default_ram_size.patch
rename to meta/recipes-devtools/qemu/qemu-1.2.0/larger_default_ram_size.patch

similarity index 64%
rename from meta/recipes-devtools/qemu/qemu-0.15.1/linker-flags.patch
rename to meta/recipes-devtools/qemu/qemu-1.2.0/linker-flags.patch
index c0d1e55..0106ae2 100644
@@ -10,14 +10,14 @@ JL - 15/06/10
 
 Upstream-Status: Inappropriate [configuration]
 
-Index: qemu-0.14.0/Makefile.target
+Index: qemu-1.2.0/Makefile.target
 ===================================================================
---- qemu-0.14.0.orig/Makefile.target
-+++ qemu-0.14.0/Makefile.target
-@@ -218,7 +218,7 @@ obj-$(CONFIG_REALLY_VIRTFS) += virtio-9p
- obj-y += rwhandler.o
- obj-$(CONFIG_KVM) += kvm.o kvm-all.o
- obj-$(CONFIG_NO_KVM) += kvm-stub.o
+--- qemu-1.2.0.orig/Makefile.target	2012-09-05 07:03:06.000000000 -0700
++++ qemu-1.2.0/Makefile.target	2012-09-06 13:42:24.819764288 -0700
+@@ -130,7 +130,7 @@
+ obj-$(CONFIG_HAVE_CORE_DUMP) += dump.o
+ obj-$(CONFIG_NO_GET_MEMORY_MAPPING) += memory_mapping-stub.o
+ obj-$(CONFIG_NO_CORE_DUMP) += dump-stub.o
 -LIBS+=-lz
 +LIBS+=-lz -lX11 -ldl
  

similarity index 100%
rename from meta/recipes-devtools/qemu/qemu-0.15.1/no-strip.patch
rename to meta/recipes-devtools/qemu/qemu-1.2.0/no-strip.patch

similarity index 100%
rename from meta/recipes-devtools/qemu/qemu-0.15.1/powerpc_rom.bin
rename to meta/recipes-devtools/qemu/qemu-1.2.0/powerpc_rom.bin

120 lines not on this page · raw message

similarity index 57%
rename from meta/recipes-devtools/qemu/qemu_0.15.1.bb
rename to meta/recipes-devtools/qemu/qemu_1.2.0.bb
index f4c86f0..55ac532 100644
@@ -3,13 +3,8 @@ require qemu.inc
 LIC_FILES_CHKSUM = "file://COPYING;md5=441c28d2cf86e15a37fa47e15a72fbac \
                     file://COPYING.LIB;endline=24;md5=c04def7ae38850e7d3ef548588159913"
 
-PR = "r11"
-
-FILESPATH = "${FILE_DIRNAME}/qemu-${PV}"
-FILESDIR = "${WORKDIR}"
-
 SRC_URI = "\
-    http://wiki.qemu.org/download/qemu-${PV}.tar.gz \
+    http://wiki.qemu.org/download/qemu-${PV}.tar.bz2 \
     file://powerpc_rom.bin \
     file://no-strip.patch \
     file://linker-flags.patch \

@@ -18,16 +13,9 @@ SRC_URI = "\
     file://fallback-to-safe-mmap_min_addr.patch \
     file://larger_default_ram_size.patch \
     file://arm-bgr.patch \
-    file://a4d1f142542935b90d2eb30f3aead4edcf455fe6.patch \
-    file://0001-ppc64-Fix-linker-script.patch \
-    file://ppc-s500-set-invalid-mask.patch \
-    file://hw-pl031-Actually-raise-interrupt-on-timer-expiry.patch \
     "
-
-SRC_URI[md5sum] = "34f17737baaf1b3495c89cd6d4a607ed"
-SRC_URI[sha256sum] = "7705b14d9b8e4df4a0b1790980e618084261e8daef0672a1aa7a830a0f3db5ba"
-
-S = "${WORKDIR}/qemu-${PV}"
+SRC_URI[md5sum] = "78eb1e984f4532aa9f2bdd3c127b5b61"
+SRC_URI[sha256sum] = "c8b84420d9f4869397f84cad2dabd9a475b7723d619a924a873740353e9df936"
 
 do_configure_prepend_virtclass-nativesdk() {
 	if [ "${@base_contains('DISTRO_FEATURES', 'x11', 'x11', '', d)}" = "" ] ; then

index af583ae..78d4458 100644
@@ -18,11 +18,6 @@ KERNEL_IMAGETYPE ?= "bzImage"
 SERIAL_CONSOLE ?= "115200 ttyS0"
 
 #
-# glibc-related variables
-#
-GLIBC_ADDONS ?= "nptl"
-
-#
 # kernel-related variables
 #
 PREFERRED_PROVIDER_virtual/kernel ??= "linux-yocto"

index 285054a..8d4bd6f 100644
@@ -26,7 +26,4 @@ require conf/machine/include/qemu.inc
 
 MACHINE_FEATURES += "x86"
 
-GLIBC_ADDONS = "nptl"
-GLIBC_EXTRA_OECONF = "--with-tls"
-
 MACHINE_ESSENTIAL_EXTRA_RDEPENDS += "v86d"

index c81afe5..6edf386 100644
@@ -26,8 +26,4 @@ require conf/machine/include/qemu.inc
 
 MACHINE_FEATURES += "x86"
 
-GLIBC_ADDONS = "nptl"
-GLIBC_EXTRA_OECONF = "--with-tls"
-
 MACHINE_ESSENTIAL_EXTRA_RDEPENDS += "v86d"
-