mirror of
https://git.yoctoproject.org/poky
synced 2026-01-30 05:18:43 +01:00
Compare commits
31 Commits
uninative-
...
yocto-1.2
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
d20a24310e | ||
|
|
8e04664ffd | ||
|
|
3ab5d73f0c | ||
|
|
33f048240d | ||
|
|
0bf04aa4ad | ||
|
|
612555e6fe | ||
|
|
35196ff703 | ||
|
|
0a48c697d7 | ||
|
|
7e56770a60 | ||
|
|
9a548f0ee4 | ||
|
|
946c650a47 | ||
|
|
f99c947c32 | ||
|
|
9ffbd2ef22 | ||
|
|
66625417b4 | ||
|
|
e95ce40abd | ||
|
|
4a83ebbee0 | ||
|
|
90705b36ad | ||
|
|
be5a5c7e7b | ||
|
|
64471e9340 | ||
|
|
4becd60e65 | ||
|
|
9fcfda78b9 | ||
|
|
8558c3e1f4 | ||
|
|
0bfb42dbb6 | ||
|
|
37b069ea5d | ||
|
|
6d7260e8f6 | ||
|
|
236bda9ed6 | ||
|
|
375835092c | ||
|
|
2c3d4f5bee | ||
|
|
45114a9df0 | ||
|
|
08290c6003 | ||
|
|
729e7f774c |
@@ -517,3 +517,13 @@ class PackageInfo(Event):
|
||||
def __init__(self, pkginfolist):
|
||||
Event.__init__(self)
|
||||
self._pkginfolist = pkginfolist
|
||||
|
||||
class SanityCheck(Event):
|
||||
"""
|
||||
Event to issue sanity check
|
||||
"""
|
||||
|
||||
class SanityCheckPassed(Event):
|
||||
"""
|
||||
Event to indicate sanity check is passed
|
||||
"""
|
||||
|
||||
@@ -405,6 +405,9 @@ class Builder(gtk.Window):
|
||||
self.set_user_config()
|
||||
self.handler.generate_configuration()
|
||||
|
||||
def sanity_check(self):
|
||||
self.handler.trigger_sanity_check()
|
||||
|
||||
def populate_recipe_package_info_async(self):
|
||||
self.switch_page(self.RCPPKGINFO_POPULATING)
|
||||
# Parse recipes
|
||||
@@ -618,6 +621,8 @@ class Builder(gtk.Window):
|
||||
def handler_command_succeeded_cb(self, handler, initcmd):
|
||||
if initcmd == self.handler.GENERATE_CONFIGURATION:
|
||||
self.update_configuration_parameters(self.get_parameters_sync())
|
||||
self.sanity_check()
|
||||
elif initcmd == self.handler.SANITY_CHECK:
|
||||
self.image_configuration_page.switch_machine_combo()
|
||||
elif initcmd in [self.handler.GENERATE_RECIPES,
|
||||
self.handler.GENERATE_PACKAGES,
|
||||
|
||||
@@ -356,6 +356,15 @@ class AdvancedSettingDialog (CrumbsDialog):
|
||||
data += ("SDK_MACHINE: " + self._get_sorted_value(self.configuration.curr_sdk_machine))
|
||||
data += ("TOOLCHAIN_BUILD: " + self._get_sorted_value(self.configuration.toolchain_build))
|
||||
data += ("IMAGE_FSTYPES: " + self._get_sorted_value(self.configuration.image_fstypes))
|
||||
if self.enable_proxy:
|
||||
data += ("ALL_PROXY: " + self._get_sorted_value(self.configuration.all_proxy))
|
||||
data += ("HTTP_PROXY: " + self._get_sorted_value(self.configuration.http_proxy))
|
||||
data += ("HTTPS_PROXY: " + self._get_sorted_value(self.configuration.https_proxy))
|
||||
data += ("FTP_PROXY: " + self._get_sorted_value(self.configuration.ftp_proxy))
|
||||
data += ("GIT_PROXY_HOST: " + self._get_sorted_value(self.configuration.git_proxy_host))
|
||||
data += ("GIT_PROXY_PORT: " + self._get_sorted_value(self.configuration.git_proxy_port))
|
||||
data += ("CVS_PROXY_HOST: " + self._get_sorted_value(self.configuration.cvs_proxy_host))
|
||||
data += ("CVS_PROXY_PORT: " + self._get_sorted_value(self.configuration.cvs_proxy_port))
|
||||
for key in self.configuration.extra_setting.keys():
|
||||
data += (key + ": " + self._get_sorted_value(self.configuration.extra_setting[key]))
|
||||
return hashlib.md5(data).hexdigest()
|
||||
|
||||
@@ -59,8 +59,8 @@ class HobHandler(gobject.GObject):
|
||||
(gobject.TYPE_PYOBJECT,)),
|
||||
}
|
||||
|
||||
(GENERATE_CONFIGURATION, GENERATE_RECIPES, GENERATE_PACKAGES, GENERATE_IMAGE, POPULATE_PACKAGEINFO) = range(5)
|
||||
(SUB_PATH_LAYERS, SUB_FILES_DISTRO, SUB_FILES_MACH, SUB_FILES_SDKMACH, SUB_MATCH_CLASS, SUB_PARSE_CONFIG, SUB_GNERATE_TGTS, SUB_GENERATE_PKGINFO, SUB_BUILD_RECIPES, SUB_BUILD_IMAGE) = range(10)
|
||||
(GENERATE_CONFIGURATION, GENERATE_RECIPES, GENERATE_PACKAGES, GENERATE_IMAGE, POPULATE_PACKAGEINFO, SANITY_CHECK) = range(6)
|
||||
(SUB_PATH_LAYERS, SUB_FILES_DISTRO, SUB_FILES_MACH, SUB_FILES_SDKMACH, SUB_MATCH_CLASS, SUB_PARSE_CONFIG, SUB_SANITY_CHECK, SUB_GNERATE_TGTS, SUB_GENERATE_PKGINFO, SUB_BUILD_RECIPES, SUB_BUILD_IMAGE) = range(11)
|
||||
|
||||
def __init__(self, server, recipe_model, package_model):
|
||||
super(HobHandler, self).__init__()
|
||||
@@ -129,6 +129,8 @@ class HobHandler(gobject.GObject):
|
||||
self.runCommand(["generateTargetsTree", "classes/image.bbclass", []])
|
||||
elif next_command == self.SUB_GENERATE_PKGINFO:
|
||||
self.runCommand(["triggerEvent", "bb.event.RequestPackageInfo()"])
|
||||
elif next_command == self.SUB_SANITY_CHECK:
|
||||
self.runCommand(["triggerEvent", "bb.event.SanityCheck()"])
|
||||
elif next_command == self.SUB_BUILD_RECIPES:
|
||||
self.clear_busy()
|
||||
self.building = True
|
||||
@@ -158,6 +160,9 @@ class HobHandler(gobject.GObject):
|
||||
self.package_model.populate(event._pkginfolist)
|
||||
self.run_next_command()
|
||||
|
||||
elif isinstance(event, bb.event.SanityCheckPassed):
|
||||
self.run_next_command()
|
||||
|
||||
elif isinstance(event, logging.LogRecord):
|
||||
if event.levelno >= logging.ERROR:
|
||||
self.error_msg += event.msg + '\n'
|
||||
@@ -312,6 +317,10 @@ class HobHandler(gobject.GObject):
|
||||
self.commands_async.append(self.SUB_GENERATE_PKGINFO)
|
||||
self.run_next_command(self.POPULATE_PACKAGEINFO)
|
||||
|
||||
def trigger_sanity_check(self):
|
||||
self.commands_async.append(self.SUB_SANITY_CHECK)
|
||||
self.run_next_command(self.SANITY_CHECK)
|
||||
|
||||
def generate_configuration(self):
|
||||
self.commands_async.append(self.SUB_PARSE_CONFIG)
|
||||
self.commands_async.append(self.SUB_PATH_LAYERS)
|
||||
|
||||
@@ -324,7 +324,7 @@
|
||||
</para></listitem>
|
||||
<listitem><para><emphasis>Point to the Toolchain:</emphasis>
|
||||
If you are using a stand-alone pre-built toolchain, you should be pointing to the
|
||||
<filename>/opt/poky/1.1</filename> directory.
|
||||
<filename>&YOCTO_ADTPATH_DIR;</filename> directory.
|
||||
This is the location for toolchains installed by the ADT Installer or by hand.
|
||||
Sections "<link linkend='configuring-and-running-the-adt-installer-script'>Configuring
|
||||
and Running the ADT Installer Script</link>" and
|
||||
|
||||
@@ -46,8 +46,8 @@
|
||||
</revision>
|
||||
<revision>
|
||||
<revnumber>1.2</revnumber>
|
||||
<date>TBD 2012</date>
|
||||
<revremark>Work in progress for the Yocto Project 1.2 Release.</revremark>
|
||||
<date>April 2012</date>
|
||||
<revremark>Released with the Yocto Project 1.2 Release.</revremark>
|
||||
</revision>
|
||||
</revhistory>
|
||||
|
||||
|
||||
@@ -58,8 +58,8 @@
|
||||
</revision>
|
||||
<revision>
|
||||
<revnumber>1.2</revnumber>
|
||||
<date>TBD 2012</date>
|
||||
<revremark>Work in progress for the Yocto Project 1.2 Release.</revremark>
|
||||
<date>April 2012</date>
|
||||
<revremark>Released with the Yocto Project 1.2 Release.</revremark>
|
||||
</revision>
|
||||
</revhistory>
|
||||
|
||||
|
||||
@@ -919,7 +919,7 @@
|
||||
...
|
||||
|
||||
NOTE: Once created, you should add your new layer to your
|
||||
bblayers.conf file in order for it to be subsquently seen and
|
||||
bblayers.conf file in order for it to be subsequently seen and
|
||||
modified by the yocto-kernel tool.
|
||||
|
||||
NOTE for x86- and x86_64-based BSPs: The generated BSP assumes the
|
||||
|
||||
@@ -43,7 +43,7 @@
|
||||
$ git clone git://git.yoctoproject.org/poky
|
||||
$ cd poky
|
||||
</literallayout>
|
||||
Alternatively, you can start with the downloaded Poky "edison" tarball.
|
||||
Alternatively, you can start with the downloaded Poky "&DISTRO_NAME;" tarball.
|
||||
These commands unpack the tarball into a Yocto Project File directory structure.
|
||||
By default, the top-level directory of the file structure is named
|
||||
<filename>poky-&YOCTO_POKY;</filename>:
|
||||
@@ -54,7 +54,7 @@
|
||||
<note><para>If you're using the tarball method, you can ignore all the following steps that
|
||||
ask you to carry out Git operations.
|
||||
You already have the results of those operations
|
||||
in the form of the edison release tarballs.
|
||||
in the form of the &DISTRO_NAME; release tarballs.
|
||||
Consequently, there is nothing left to do other than extract those tarballs into the
|
||||
proper locations.</para>
|
||||
|
||||
@@ -160,7 +160,7 @@
|
||||
$ cd meta-intel
|
||||
</literallayout>
|
||||
Alternatively, you can start with the downloaded Crown Bay tarball.
|
||||
You can download the edison version of the BSP tarball from the
|
||||
You can download the &DISTRO_NAME; version of the BSP tarball from the
|
||||
<ulink url='&YOCTO_HOME_URL;/download'>Download</ulink> page of the
|
||||
Yocto Project website.
|
||||
Here is the specific link for the tarball needed for this example:
|
||||
@@ -177,7 +177,7 @@
|
||||
The <filename>meta-intel</filename> directory contains all the metadata
|
||||
that supports BSP creation.
|
||||
If you're using the Git method, the following
|
||||
step will switch to the edison metadata.
|
||||
step will switch to the &DISTRO_NAME; metadata.
|
||||
If you're using the tarball method, you already have the correct metadata and can
|
||||
skip to the next step.
|
||||
Because <filename>meta-intel</filename> is its own Git repository, you will want
|
||||
@@ -445,11 +445,11 @@
|
||||
and insert the commit identifiers to identify the kernel in which we
|
||||
are interested, which will be based on the <filename>atom-pc-standard</filename>
|
||||
kernel.
|
||||
In this case, because we're working with the edison branch of everything, we
|
||||
In this case, because we're working with the &DISTRO_NAME; branch of everything, we
|
||||
need to use the <filename>SRCREV</filename> values for the atom-pc branch
|
||||
that are associated with the edison release.
|
||||
that are associated with the &DISTRO_NAME; release.
|
||||
To find those values, we need to find the <filename>SRCREV</filename>
|
||||
values that edison uses for the atom-pc branch, which we find in the
|
||||
values that &DISTRO_NAME; uses for the atom-pc branch, which we find in the
|
||||
<filename>poky/meta-yocto/recipes-kernel/linux/linux-yocto_3.0.bbappend</filename>
|
||||
file.
|
||||
</para>
|
||||
@@ -474,8 +474,8 @@
|
||||
|
||||
<para>
|
||||
In this example, we're using the <filename>SRCREV</filename> values we
|
||||
found already captured in the edison release because we're creating a BSP based on
|
||||
edison.
|
||||
found already captured in the &DISTRO_NAME; release because we're creating a BSP based on
|
||||
&DISTRO_NAME;.
|
||||
If, instead, we had based our BSP on the master branches, we would want to use
|
||||
the most recent <filename>SRCREV</filename> values taken directly from the kernel repo.
|
||||
We will not be doing that for this example.
|
||||
@@ -682,7 +682,7 @@
|
||||
</para>
|
||||
|
||||
<para>
|
||||
For reference, the sato image produced by the previous steps for edison
|
||||
For reference, the sato image produced by the previous steps for &DISTRO_NAME;
|
||||
should look like the following in terms of size.
|
||||
If your sato image is much different from this,
|
||||
you probably made a mistake in one of the above steps:
|
||||
|
||||
@@ -248,8 +248,8 @@
|
||||
|
||||
<para>
|
||||
Append files files must have the same name as the underlying recipe.
|
||||
For example, the append file <filename>someapp_1.1.bbappend</filename> must
|
||||
apply to <filename>someapp_1.1.bb</filename>.
|
||||
For example, the append file <filename>someapp_&DISTRO;.bbappend</filename> must
|
||||
apply to <filename>someapp_&DISTRO;.bb</filename>.
|
||||
This means the original recipe and append file names are version number specific.
|
||||
If the underlying recipe is renamed to update to a newer version, the
|
||||
corresponding <filename>.bbappend</filename> file must be renamed as well.
|
||||
@@ -1082,7 +1082,7 @@ so that there are some definite steps on how to do this. I need more detail her
|
||||
<listitem><para><filename><ulink url='&YOCTO_DOCS_REF_URL;#var-PREFERRED_PROVIDER'>
|
||||
PREFERRED_PROVIDER</ulink></filename>_virtual/kernel (see below)</para></listitem>
|
||||
<listitem><para><filename><ulink url='&YOCTO_DOCS_REF_URL;#var-MACHINE_FEATURES'>
|
||||
MACHINE_FEATURES</ulink></filename> (e.g. "kernel26 apm screen wifi")</para></listitem>
|
||||
MACHINE_FEATURES</ulink></filename> (e.g. "apm screen wifi")</para></listitem>
|
||||
</itemizedlist>
|
||||
</para>
|
||||
|
||||
|
||||
@@ -155,13 +155,13 @@
|
||||
$ git branch -a
|
||||
$ git tag -l
|
||||
</literallayout>
|
||||
This example uses the Yocto Project 1.1 Release code named "edison",
|
||||
which maps to the <filename>edison</filename> branch in the repository.
|
||||
The following commands create and checkout the local <filename>edison</filename>
|
||||
This example uses the Yocto Project &DISTRO; Release code named "&DISTRO_NAME;",
|
||||
which maps to the <filename>&DISTRO_NAME;</filename> branch in the repository.
|
||||
The following commands create and checkout the local <filename>&DISTRO_NAME;</filename>
|
||||
branch:
|
||||
<literallayout class='monospaced'>
|
||||
$ git checkout -b &DISTRO_NAME; origin/&DISTRO_NAME;
|
||||
Branch edison set up to track remote branch &DISTRO_NAME; from origin.
|
||||
Branch &DISTRO_NAME; set up to track remote branch &DISTRO_NAME; from origin.
|
||||
Switched to a new branch '&DISTRO_NAME;'
|
||||
</literallayout>
|
||||
</para>
|
||||
@@ -184,7 +184,7 @@
|
||||
<title>Setting Up the Bare Clone and its Copy</title>
|
||||
|
||||
<para>
|
||||
This example modifies the <filename>linux-yocto-3.0-1.1.x</filename> kernel.
|
||||
This example modifies the <filename>linux-yocto-3.2</filename> kernel.
|
||||
Thus, you need to create a bare clone of that kernel and then make a copy of the
|
||||
bare clone.
|
||||
See the bulleted item
|
||||
@@ -196,12 +196,12 @@
|
||||
The bare clone exists for the kernel build tools and simply as the receiving end
|
||||
of <filename>git push</filename>
|
||||
commands after you make edits and commits inside the copy of the clone.
|
||||
The copy (<filename>my-linux-yocto-3.0-1.1.x-work</filename> in this example) has to have
|
||||
The copy (<filename>my-linux-yocto-3.2-work</filename> in this example) has to have
|
||||
a local branch created and checked out for your work.
|
||||
This example uses <filename>common-pc-base</filename> as the local branch.
|
||||
The following commands create and checkout the branch:
|
||||
<literallayout class='monospaced'>
|
||||
$ cd ~/my-linux-yocto-3.0-1.1.x-work
|
||||
$ cd ~/my-linux-yocto-3.2-work
|
||||
$ git checkout -b common-pc-base origin/yocto/standard/common-pc/base
|
||||
Branch common-pc-base set up to track remote branch
|
||||
yocto/standard/common-pc/base from origin.
|
||||
@@ -296,7 +296,7 @@
|
||||
|
||||
<para>
|
||||
The file you change in this example is named <filename>calibrate.c</filename>
|
||||
and is located in the <filename>my-linux-yocto-3.0-1.1.x-work</filename> Git repository
|
||||
and is located in the <filename>my-linux-yocto-3.2-work</filename> Git repository
|
||||
(the copy of the bare clone) in <filename>init</filename>.
|
||||
This example simply inserts several <filename>printk</filename> statements
|
||||
at the beginning of the <filename>calibrate_delay</filename> function.
|
||||
@@ -420,13 +420,13 @@
|
||||
<filename>poky-extras/meta-kernel-dev/recipes-kernel/linux</filename>
|
||||
directory, you need to identify the location of the
|
||||
local source code, which in this example is the bare clone named
|
||||
<filename>linux-yocto-3.0-1.1.x.git</filename>.
|
||||
<filename>linux-yocto-3.2.git</filename>.
|
||||
To do this, set the <filename>KSRC_linux_yocto</filename> variable to point to your
|
||||
local <filename>linux-yocto-3.0-1.1.x.git</filename> Git repository by adding the
|
||||
local <filename>linux-yocto-3.2.git</filename> Git repository by adding the
|
||||
following statement.
|
||||
Be sure to substitute your user information in the statement:
|
||||
<literallayout class='monospaced'>
|
||||
KSRC_linux_yocto ?= /home/scottrif/linux-yocto-3.0-1.1.x.git
|
||||
KSRC_linux_yocto ?= /home/scottrif/linux-yocto-3.2.git
|
||||
</literallayout></para></listitem>
|
||||
<listitem><para><emphasis>Specify the Kernel Machine:</emphasis> Also in the
|
||||
<filename>linux-yocto_3.0.bbappend</filename> file, you need to specify
|
||||
@@ -545,13 +545,13 @@
|
||||
$ git branch -a
|
||||
$ git tag -l
|
||||
</literallayout>
|
||||
This example uses the Yocto Project 1.1.1 Release code named "&DISTRO_NAME;",
|
||||
This example uses the Yocto Project &DISTRO; Release code named "&DISTRO_NAME;",
|
||||
which maps to the <filename>&DISTRO_NAME;</filename> branch in the repository.
|
||||
The following commands create and checkout the local <filename>&DISTRO_NAME;</filename>
|
||||
branch:
|
||||
<literallayout class='monospaced'>
|
||||
$ git checkout -b &DISTRO_NAME; origin/&DISTRO_NAME;
|
||||
Branch edison set up to track remote branch &DISTRO_NAME; from origin.
|
||||
Branch &DISTRO_NAME; set up to track remote branch &DISTRO_NAME; from origin.
|
||||
Switched to a new branch '&DISTRO_NAME;'
|
||||
</literallayout>
|
||||
</para>
|
||||
@@ -654,7 +654,7 @@
|
||||
<para>
|
||||
After setting up the environment to run <filename>menuconfig</filename>, you are ready
|
||||
to use the tool to interactively change the kernel configuration.
|
||||
In this example, we are basing our changes on the <filename>linux-yocto-3.0-1.1.x</filename>
|
||||
In this example, we are basing our changes on the <filename>linux-yocto-3.2</filename>
|
||||
kernel.
|
||||
The Yocto Project build environment recognizes this kernel as
|
||||
<filename>linux-yocto</filename>.
|
||||
|
||||
@@ -247,6 +247,9 @@
|
||||
<listitem><para><emphasis><filename>linux-yocto-3.0-1.1.x</filename></emphasis> - The
|
||||
stable Linux Yocto kernel to use with the Yocto Project Release 1.1.x. This kernel
|
||||
is based on the Linux 3.0 release</para></listitem>
|
||||
<listitem><para><emphasis><filename>linux-yocto-3.2</filename></emphasis> - The
|
||||
stable Linux Yocto kernel to use with the Yocto Project Release 1.2. This kernel
|
||||
is based on the Linux 3.2 release</para></listitem>
|
||||
<listitem><para><emphasis><filename>linux-yocto-dev</filename></emphasis> - A development
|
||||
kernel based on the latest upstream release candidate available.</para></listitem>
|
||||
</itemizedlist>
|
||||
|
||||
@@ -494,7 +494,8 @@
|
||||
Git uses "branches" to organize different development efforts.
|
||||
For example, the <filename>poky</filename> repository has
|
||||
<filename>laverne</filename>, <filename>bernard</filename>,
|
||||
<filename>edison</filename>, and <filename>master</filename> branches among
|
||||
<filename>edison</filename>, <filename>denzil</filename> and
|
||||
<filename>master</filename> branches among
|
||||
others.
|
||||
You can see all the branches by going to
|
||||
<ulink url='&YOCTO_GIT_URL;/cgit.cgi/poky/'></ulink> and
|
||||
|
||||
@@ -132,18 +132,18 @@
|
||||
For simplicity, it is recommended that you create these structures outside of the
|
||||
Yocto Project Files Git repository.</para>
|
||||
<para>As an example, the following transcript shows how to create the bare clone
|
||||
of the <filename>linux-yocto-3.0-1.1.x</filename> kernel and then create a copy of
|
||||
of the <filename>linux-yocto-3.2</filename> kernel and then create a copy of
|
||||
that clone.
|
||||
<note>When you have a local Linux Yocto kernel Git repository, you can
|
||||
reference that repository rather than the upstream Git repository as
|
||||
part of the <filename>clone</filename> command.
|
||||
Doing so can speed up the process.</note></para>
|
||||
<para>In the following example, the bare clone is named
|
||||
<filename>linux-yocto-3.0-1.1.x.git</filename>, while the
|
||||
copy is named <filename>my-linux-yocto-3.0-1.1.x-work</filename>:
|
||||
<filename>linux-yocto-3.2.git</filename>, while the
|
||||
copy is named <filename>my-linux-yocto-3.2-work</filename>:
|
||||
<literallayout class='monospaced'>
|
||||
$ git clone --bare git://git.yoctoproject.org/linux-yocto-3.0-1.1.x linux-yocto-3.0-1.1.x.git
|
||||
Initialized empty Git repository in /home/scottrif/linux-yocto-3.0-1.1.x.git/
|
||||
$ git clone --bare git://git.yoctoproject.org/linux-yocto-3.2 linux-yocto-3.2.git
|
||||
Initialized empty Git repository in /home/scottrif/linux-yocto-3.2.git/
|
||||
remote: Counting objects: 2259181, done.
|
||||
remote: Compressing objects: 100% (373259/373259), done.
|
||||
remote: Total 2259181 (delta 1892638), reused 2231556 (delta 1865300)
|
||||
@@ -152,8 +152,8 @@
|
||||
</literallayout></para>
|
||||
<para>Now create a clone of the bare clone just created:
|
||||
<literallayout class='monospaced'>
|
||||
$ git clone linux-yocto-3.0-1.1.x.git my-linux-yocto-3.0-1.1.x-work
|
||||
Initialized empty Git repository in /home/scottrif/my-linux-yocto-3.0-1.1.x/.git/
|
||||
$ git clone linux-yocto-3.2.git my-linux-yocto-3.2-work
|
||||
Initialized empty Git repository in /home/scottrif/my-linux-yocto-3.2/.git/
|
||||
Checking out files: 100% (36898/36898), done.
|
||||
</literallayout></para></listitem>
|
||||
<listitem id='poky-extras-repo'><para><emphasis>
|
||||
|
||||
@@ -36,8 +36,8 @@
|
||||
</revision>
|
||||
<revision>
|
||||
<revnumber>1.2</revnumber>
|
||||
<date>TBD 2012</date>
|
||||
<revremark>Work in progress for the Yocto Project 1.2 Release.</revremark>
|
||||
<date>April 2012</date>
|
||||
<revremark>Released with the Yocto Project 1.2 Release.</revremark>
|
||||
</revision>
|
||||
</revhistory>
|
||||
|
||||
|
||||
@@ -51,8 +51,8 @@
|
||||
</revision>
|
||||
<revision>
|
||||
<revnumber>1.2</revnumber>
|
||||
<date>TBD 2012</date>
|
||||
<revremark>Work in progress for the Yocto Project 1.2 Release.</revremark>
|
||||
<date>April 2012</date>
|
||||
<revremark>Released with the Yocto Project 1.2 Release.</revremark>
|
||||
</revision>
|
||||
</revhistory>
|
||||
|
||||
|
||||
@@ -65,8 +65,8 @@
|
||||
</revision>
|
||||
<revision>
|
||||
<revnumber>1.2</revnumber>
|
||||
<date>TBD 2012</date>
|
||||
<revremark>Work in progress for the Yocto Project 1.2 Release.</revremark>
|
||||
<date>April 2012</date>
|
||||
<revremark>Released with the Yocto Project 1.2 Release.</revremark>
|
||||
</revision>
|
||||
</revhistory>
|
||||
|
||||
|
||||
@@ -106,6 +106,14 @@
|
||||
instead of X11.
|
||||
In order to build, this image requires specific distro configuration that enables
|
||||
<filename>gtk</filename> over <filename>directfb</filename>.</para></listitem>
|
||||
<listitem><para><emphasis><filename>self-hosted-image</filename>:</emphasis>
|
||||
An image you can run using the Yocto Project Build Appliance.
|
||||
The image is suitable to load and boot from either
|
||||
<ulink url='http://www.vmware.com/products/player/overview.html'>VMware Player</ulink>
|
||||
or <ulink url='http://www.vmware.com/products/workstation/overview.html'>VMWare Workstation</ulink>.
|
||||
For more information on the Build Appliance, see the
|
||||
<ulink url='&YOCTO_HOME_URL;/documentation/build-appliance'>Build Appliance</ulink> page on
|
||||
the Yocto Project website.</para></listitem>
|
||||
</itemizedlist>
|
||||
|
||||
<tip>
|
||||
|
||||
@@ -21,15 +21,23 @@
|
||||
</para>
|
||||
|
||||
<para>
|
||||
If you know all about open-source development, Linux development environments, Git source
|
||||
repositories and the like and you just want some quick information that lets you try out
|
||||
the Yocto Project, skip right to the "<link linkend='super-user'>Super User</link>" section at
|
||||
the end of this quick start.
|
||||
Otherwise, keep reading...
|
||||
If you don't have a system that runs Linux and you want to give the Yocto Project a test run,
|
||||
you might consider using the Yocto Project Build Appliance.
|
||||
The Build Appliance allows you to build and boot a custom embedded Linux image with the Yocto
|
||||
Project using a non-Linux development system.
|
||||
See the <ulink url='http://www.yoctoproject.org/documentation/build-appliance'>Yocto
|
||||
Project Build Appliance</ulink> for more information.
|
||||
</para>
|
||||
|
||||
<para>
|
||||
This short document will give you some basic information about the environment and
|
||||
On the other hand, if you know all about open-source development, Linux development environments,
|
||||
Git source repositories and the like and you just want some quick information that lets you try out
|
||||
the Yocto Project on your Linux system, skip right to the
|
||||
"<link linkend='super-user'>Super User</link>" section at the end of this quick start.
|
||||
</para>
|
||||
|
||||
<para>
|
||||
For the rest of you, this short document will give you some basic information about the environment and
|
||||
let you experience it in its simplest form.
|
||||
After reading this document, you will have a basic understanding of what the Yocto Project is
|
||||
and how to use some of its core components.
|
||||
|
||||
@@ -64,16 +64,6 @@ ASSUME_PROVIDED += "pkgconfig$"
|
||||
# Comment out any of the lines below to disable them in the build
|
||||
DISTRO_FEATURES_LIBC_TINY = "libc-libm libc-crypt"
|
||||
|
||||
# Building meta-toolchain currently imposes some additional requirements:
|
||||
# If you do not plan to build meta-toolchain, you can save ~461KB by
|
||||
# commenting out the DISTRO_FEATURES_LIBC_TOOLCHAIN assignment
|
||||
# gettext needs wchar, m4 needs spawn and locale, elfutils needs ftraverse
|
||||
DISTRO_FEATURES_LIBC_TOOLCHAIN = "libc-posix-clang-wchar \
|
||||
libc-spawn libc-locale-code \
|
||||
libc-ftraverse libc-libm-big \
|
||||
libc-posix-regexp-glibc \
|
||||
"
|
||||
|
||||
# Required for "who"
|
||||
DISTRO_FEATURES_LIBC_MINIMAL = "libc-utmp libc-getlogin"
|
||||
DISTRO_FEATURES_LIBC_REGEX = "libc-posix-regexp"
|
||||
@@ -83,7 +73,6 @@ DISTRO_FEATURES_LIBC = "${DISTRO_FEATURES_LIBC_TINY} \
|
||||
${DISTRO_FEATURES_LIBC_MINIMAL} \
|
||||
${DISTRO_FEATURES_LIBC_REGEX} \
|
||||
${DISTRO_FEATURES_LIBC_NET} \
|
||||
${DISTRO_FEATURES_LIBC_TOOLCHAIN} \
|
||||
"
|
||||
|
||||
# Comment out any of the lines below to disable them in the build
|
||||
|
||||
@@ -1,8 +1,8 @@
|
||||
DISTRO = "poky"
|
||||
DISTRO_NAME = "Yocto (Built by Poky 6.0)"
|
||||
DISTRO_VERSION = "1.1+snapshot-${DATE}"
|
||||
DISTRO_NAME = "Yocto (Built by Poky 7.0)"
|
||||
DISTRO_VERSION = "1.2"
|
||||
SDK_VENDOR = "-pokysdk"
|
||||
SDK_VERSION := "${@'${DISTRO_VERSION}'.replace('snapshot-${DATE}','snapshot')}"
|
||||
SDK_VERSION := "${DISTRO_VERSION}"
|
||||
|
||||
MAINTAINER = "Poky <poky@yoctoproject.org>"
|
||||
|
||||
|
||||
@@ -15,7 +15,7 @@ def gettext_oeconf(d):
|
||||
return '--disable-nls'
|
||||
return "--enable-nls"
|
||||
|
||||
DEPENDS_GETTEXT = "virtual/gettext gettext-native"
|
||||
DEPENDS_GETTEXT ??= "virtual/gettext gettext-native"
|
||||
|
||||
BASEDEPENDS =+ "${@gettext_dependencies(d)}"
|
||||
EXTRA_OECONF_append = " ${@gettext_oeconf(d)}"
|
||||
|
||||
@@ -870,6 +870,14 @@ python split_and_strip_files () {
|
||||
elf_file = int(file_list[file][5:])
|
||||
#bb.note("Strip %s" % file)
|
||||
runstrip(file, elf_file, d)
|
||||
|
||||
|
||||
if (d.getVar('INHIBIT_PACKAGE_STRIP', True) != '1'):
|
||||
for root, dirs, files in os.walk(dvar):
|
||||
for f in files:
|
||||
if not f.endswith(".ko"):
|
||||
continue
|
||||
runstrip(os.path.join(root, f), None, d)
|
||||
#
|
||||
# End of strip
|
||||
#
|
||||
|
||||
@@ -453,8 +453,11 @@ def check_sanity(e):
|
||||
|
||||
addhandler check_sanity_eventhandler
|
||||
python check_sanity_eventhandler() {
|
||||
if bb.event.getName(e) == "ConfigParsed" and e.data.getVar("BB_WORKERCONTEXT", True) != "1":
|
||||
if bb.event.getName(e) == "ConfigParsed" and e.data.getVar("BB_WORKERCONTEXT", True) != "1" and e.data.getVar("DISABLE_SANITY_CHECKS", True) != "1":
|
||||
check_sanity(e)
|
||||
elif bb.event.getName(e) == "SanityCheck":
|
||||
check_sanity(e)
|
||||
bb.event.fire(bb.event.SanityCheckPassed(), e.data)
|
||||
|
||||
return
|
||||
}
|
||||
|
||||
@@ -340,6 +340,7 @@ STAGING_DATADIR_NATIVE = "${STAGING_DIR_NATIVE}${datadir_native}"
|
||||
STAGING_DIR_HOST = "${STAGING_DIR}/${MACHINE}"
|
||||
STAGING_BINDIR = "${STAGING_DIR_HOST}${bindir}"
|
||||
STAGING_LIBDIR = "${STAGING_DIR_HOST}${libdir}"
|
||||
STAGING_BASELIBDIR = "${STAGING_DIR_HOST}${base_libdir}"
|
||||
STAGING_INCDIR = "${STAGING_DIR_HOST}${includedir}"
|
||||
STAGING_DATADIR = "${STAGING_DIR_HOST}${datadir}"
|
||||
STAGING_EXECPREFIXDIR = "${STAGING_DIR_HOST}${exec_prefix}"
|
||||
|
||||
@@ -5,7 +5,7 @@ LICENSE = "MIT"
|
||||
LIC_FILES_CHKSUM = "file://${COREBASE}/LICENSE;md5=3f40d7994397109285ec7b81fdeb3b58 \
|
||||
file://${COREBASE}/meta/COPYING.MIT;md5=3da9cfbcb788c80a0384361b4de20420"
|
||||
|
||||
PR = "r12"
|
||||
PR = "r15"
|
||||
|
||||
IMAGE_FEATURES += "x11-mini package-management"
|
||||
|
||||
@@ -19,7 +19,7 @@ IMAGE_FSTYPES = "vmdk"
|
||||
|
||||
inherit core-image
|
||||
|
||||
SRCREV = "20ff9db92165e6d16897671d2b1d370661962712"
|
||||
SRCREV = "3ab5d73f0c49df9fefa2a46031d33436bbd7d7d8"
|
||||
SRC_URI = "git://git.yoctoproject.org/poky;protocol=git"
|
||||
|
||||
IMAGE_CMD_ext3_append () {
|
||||
|
||||
@@ -5,12 +5,13 @@ RDEPENDS = "udev"
|
||||
DEPENDS = "virtual/kernel"
|
||||
SRC_URI = "file://init-live.sh"
|
||||
|
||||
PR = "r9"
|
||||
PR = "r10"
|
||||
|
||||
do_compile() {
|
||||
if grep -q "CONFIG_UNION_FS=y" ${STAGING_KERNEL_DIR}/.config; then
|
||||
sed -i 's/UNIONFS="no"/UNIONFS="yes"/g' ${WORKDIR}/init-live.sh
|
||||
fi
|
||||
#if grep -q "CONFIG_UNION_FS=y" ${STAGING_KERNEL_DIR}/.config; then
|
||||
# sed -i 's/UNIONFS="no"/UNIONFS="yes"/g' ${WORKDIR}/init-live.sh
|
||||
#fi
|
||||
:
|
||||
}
|
||||
|
||||
do_install() {
|
||||
|
||||
26
meta/recipes-devtools/pseudo/files/symver.patch
Normal file
26
meta/recipes-devtools/pseudo/files/symver.patch
Normal file
@@ -0,0 +1,26 @@
|
||||
When running as pseudo-nativesdk, we might need to run host binaries
|
||||
linked against the host libc. Having a 2.14 libc dependency from memcpy is
|
||||
problematic so instruct the linker to use older symbols.
|
||||
|
||||
Upstream-Status: Pending
|
||||
|
||||
RP 2012/4/22
|
||||
|
||||
Index: pseudo-1.3/pseudo.h
|
||||
===================================================================
|
||||
--- pseudo-1.3.orig/pseudo.h 2012-04-22 12:17:59.078909060 +0000
|
||||
+++ pseudo-1.3/pseudo.h 2012-04-22 12:32:42.954888587 +0000
|
||||
@@ -29,6 +29,13 @@
|
||||
int pseudo_set_value(const char *key, const char *value);
|
||||
char *pseudo_get_value(const char *key);
|
||||
|
||||
+#ifdef __amd64__
|
||||
+#define GLIBC_COMPAT_SYMBOL(SYM) __asm__(".symver " #SYM "," #SYM "@GLIBC_2.2.5")
|
||||
+#else
|
||||
+#define GLIBC_COMPAT_SYMBOL(SYM) __asm__(".symver " #SYM "," #SYM "@GLIBC_2.0")
|
||||
+#endif
|
||||
+GLIBC_COMPAT_SYMBOL(memcpy);
|
||||
+
|
||||
#include "pseudo_tables.h"
|
||||
|
||||
extern void pseudo_debug_verbose(void);
|
||||
@@ -9,6 +9,8 @@ SECTION = "base"
|
||||
LICENSE = "LGPL2.1"
|
||||
DEPENDS = "sqlite3"
|
||||
|
||||
SRC_URI_append_virtclass-nativesdk = " file://symver.patch"
|
||||
|
||||
FILES_${PN} = "${libdir}/pseudo/lib*/libpseudo.so ${bindir}/* ${localstatedir}/pseudo ${prefix}/var/pseudo"
|
||||
FILES_${PN}-dbg += "${libdir}/pseudo/lib*/.debug"
|
||||
PROVIDES += "virtual/fakeroot"
|
||||
@@ -25,7 +27,7 @@ NO32LIBS ??= "1"
|
||||
|
||||
# Compile for the local machine arch...
|
||||
do_compile () {
|
||||
if [ "${SITEINFO_BITS}" == "64" ]; then
|
||||
if [ "${SITEINFO_BITS}" = "64" ]; then
|
||||
${S}/configure --prefix=${prefix} --libdir=${prefix}/lib/pseudo/lib${SITEINFO_BITS} --with-sqlite=${STAGING_DIR_TARGET}${exec_prefix} --bits=${SITEINFO_BITS} --enable-static-sqlite --without-rpath
|
||||
else
|
||||
${S}/configure --prefix=${prefix} --libdir=${prefix}/lib/pseudo/lib --with-sqlite=${STAGING_DIR_TARGET}${exec_prefix} --bits=${SITEINFO_BITS} --enable-static-sqlite --without-rpath
|
||||
@@ -37,7 +39,7 @@ do_compile () {
|
||||
# If necessary compile for the alternative machine arch. This is only
|
||||
# necessary in a native build.
|
||||
do_compile_prepend_virtclass-native () {
|
||||
if [ "${SITEINFO_BITS}" == "64" -a -e "/usr/include/gnu/stubs-32.h" -a "${PN}" == "pseudo-native" -a "${NO32LIBS}" != "1" ]; then
|
||||
if [ "${SITEINFO_BITS}" = "64" -a -e "/usr/include/gnu/stubs-32.h" -a "${PN}" = "pseudo-native" -a "${NO32LIBS}" != "1" ]; then
|
||||
# We need the 32-bit libpseudo on a 64-bit machine...
|
||||
./configure --prefix=${prefix} --libdir=${prefix}/lib/pseudo/lib --with-sqlite=${STAGING_DIR_TARGET}${exec_prefix} --bits=32 --without-rpath
|
||||
oe_runmake ${MAKEOPTS} libpseudo
|
||||
@@ -47,7 +49,7 @@ do_compile_prepend_virtclass-native () {
|
||||
}
|
||||
|
||||
do_compile_prepend_virtclass-nativesdk () {
|
||||
if [ "${SITEINFO_BITS}" == "64" -a -e "/usr/include/gnu/stubs-32.h" -a "${PN}" == "pseudo-native" -a "${NO32LIBS}" != "1" ]; then
|
||||
if [ "${SITEINFO_BITS}" = "64" -a -e "/usr/include/gnu/stubs-32.h" -a "${PN}" = "pseudo-native" -a "${NO32LIBS}" != "1" ]; then
|
||||
# We need the 32-bit libpseudo on a 64-bit machine...
|
||||
./configure --prefix=${prefix} --libdir=${prefix}/lib/pseudo/lib --with-sqlite=${STAGING_DIR_TARGET}${exec_prefix} --bits=32 --without-rpath
|
||||
oe_runmake ${MAKEOPTS} libpseudo
|
||||
@@ -64,19 +66,17 @@ do_install () {
|
||||
# If necessary install for the alternative machine arch. This is only
|
||||
# necessary in a native build.
|
||||
do_install_append_virtclass-native () {
|
||||
if [ "${SITEINFO_BITS}" == "64" -a -e "/usr/include/gnu/stubs-32.h" -a "${PN}" == "pseudo-native" -a "${NO32LIBS}" != "1" ]; then
|
||||
if [ "${SITEINFO_BITS}" = "64" -a -e "/usr/include/gnu/stubs-32.h" -a "${PN}" = "pseudo-native" -a "${NO32LIBS}" != "1" ]; then
|
||||
mkdir -p ${D}${prefix}/lib/pseudo/lib
|
||||
cp lib/pseudo/lib/libpseudo.so ${D}${prefix}/lib/pseudo/lib/.
|
||||
fi
|
||||
}
|
||||
|
||||
do_install_append_virtclass-nativesdk () {
|
||||
if [ "${SITEINFO_BITS}" == "64" -a -e "/usr/include/gnu/stubs-32.h" -a "${PN}" == "pseudo-native" -a "${NO32LIBS}" != "1" ]; then
|
||||
if [ "${SITEINFO_BITS}" = "64" -a -e "/usr/include/gnu/stubs-32.h" -a "${PN}" = "pseudo-native" -a "${NO32LIBS}" != "1" ]; then
|
||||
mkdir -p ${D}${prefix}/lib/pseudo/lib
|
||||
cp lib/pseudo/lib/libpseudo.so ${D}${prefix}/lib/pseudo/lib/.
|
||||
fi
|
||||
|
||||
create_wrapper ${D}${bindir}/pseudo LD_LIBRARY_PATH=${base_libdir}:${libdir}
|
||||
}
|
||||
|
||||
BBCLASSEXTEND = "native nativesdk"
|
||||
|
||||
@@ -1,6 +1,6 @@
|
||||
require pseudo.inc
|
||||
|
||||
PR = "r9"
|
||||
PR = "r10"
|
||||
|
||||
SRC_URI = "http://www.yoctoproject.org/downloads/${BPN}/${BPN}-${PV}.tar.bz2"
|
||||
|
||||
|
||||
@@ -2,7 +2,7 @@ require pseudo.inc
|
||||
|
||||
SRCREV = "f0375c9aaefbccfd41aebbf6d332bb4d9e8f980c"
|
||||
PV = "1.3+git${SRCPV}"
|
||||
PR = "r24"
|
||||
PR = "r25"
|
||||
|
||||
DEFAULT_PREFERENCE = "-1"
|
||||
|
||||
|
||||
@@ -119,8 +119,8 @@ Index: Python-2.7.2/setup.py
|
||||
|
||||
# XXX Omitted modules: gl, pure, dl, SGI-specific modules
|
||||
|
||||
+ lib_dirs = [ os.getenv( "STAGING_LIBDIR" ) ]
|
||||
+ inc_dirs = [ os.getenv( "STAGING_INCDIR" ) ]
|
||||
+ lib_dirs = [ os.getenv("STAGING_LIBDIR"), os.getenv("STAGING_BASELIBDIR") ]
|
||||
+ inc_dirs = [ os.getenv("STAGING_INCDIR") ]
|
||||
+
|
||||
#
|
||||
# The following modules are all pretty straightforward, and compile
|
||||
|
||||
57
meta/recipes-devtools/python/python/setuptweaks.patch
Normal file
57
meta/recipes-devtools/python/python/setuptweaks.patch
Normal file
@@ -0,0 +1,57 @@
|
||||
This patch removes various ways native system options can pass into the python
|
||||
compilation and somehow break C modules.
|
||||
|
||||
Upstream-Status: Configuration [OE Specific]
|
||||
|
||||
RP 2012/04/23
|
||||
|
||||
Index: Python-2.7.2/setup.py
|
||||
===================================================================
|
||||
--- Python-2.7.2.orig/setup.py 2012-04-23 20:03:47.295582553 +0000
|
||||
+++ Python-2.7.2/setup.py 2012-04-23 20:03:15.000000000 +0000
|
||||
@@ -231,7 +231,13 @@
|
||||
# compilers
|
||||
if compiler is not None:
|
||||
(ccshared,cflags) = sysconfig.get_config_vars('CCSHARED','CFLAGS')
|
||||
- args['compiler_so'] = compiler + ' ' + ccshared + ' ' + cflags
|
||||
+ # Need to filter out -isysroot from the flags. Ideally should
|
||||
+ # figure out target flags here.
|
||||
+ flags = []
|
||||
+ for f in cflags.split():
|
||||
+ if not f.startswith("-isystem"):
|
||||
+ flags.append(f)
|
||||
+ args['compiler_so'] = compiler + ' ' + ccshared + ' ' + ' '.join(flags)
|
||||
self.compiler.set_executables(**args)
|
||||
|
||||
build_ext.build_extensions(self)
|
||||
@@ -393,7 +399,6 @@
|
||||
# into configure and stored in the Makefile (issue found on OS X 10.3).
|
||||
for env_var, arg_name, dir_list in (
|
||||
('LDFLAGS', '-R', self.compiler.runtime_library_dirs),
|
||||
- ('LDFLAGS', '-L', self.compiler.library_dirs),
|
||||
('CPPFLAGS', '-I', self.compiler.include_dirs)):
|
||||
env_val = sysconfig.get_config_var(env_var)
|
||||
if env_val:
|
||||
@@ -419,16 +424,16 @@
|
||||
for directory in reversed(options.dirs):
|
||||
add_dir_to_list(dir_list, directory)
|
||||
|
||||
- if os.path.normpath(sys.prefix) != '/usr' \
|
||||
- and not sysconfig.get_config_var('PYTHONFRAMEWORK'):
|
||||
+# if os.path.normpath(sys.prefix) != '/usr' \
|
||||
+# and not sysconfig.get_config_var('PYTHONFRAMEWORK'):
|
||||
# OSX note: Don't add LIBDIR and INCLUDEDIR to building a framework
|
||||
# (PYTHONFRAMEWORK is set) to avoid # linking problems when
|
||||
# building a framework with different architectures than
|
||||
# the one that is currently installed (issue #7473)
|
||||
- add_dir_to_list(self.compiler.library_dirs,
|
||||
- sysconfig.get_config_var("LIBDIR"))
|
||||
- add_dir_to_list(self.compiler.include_dirs,
|
||||
- sysconfig.get_config_var("INCLUDEDIR"))
|
||||
+# add_dir_to_list(self.compiler.library_dirs,
|
||||
+# sysconfig.get_config_var("LIBDIR"))
|
||||
+# add_dir_to_list(self.compiler.include_dirs,
|
||||
+# sysconfig.get_config_var("INCLUDEDIR"))
|
||||
|
||||
try:
|
||||
have_unicode = unicode
|
||||
@@ -1,6 +1,6 @@
|
||||
require python.inc
|
||||
DEPENDS = "python-native bzip2 db gdbm openssl readline sqlite3 zlib"
|
||||
PR = "${INC_PR}.12"
|
||||
PR = "${INC_PR}.14"
|
||||
|
||||
DISTRO_SRC_URI ?= "file://sitecustomize.py"
|
||||
DISTRO_SRC_URI_linuxstdbase = ""
|
||||
@@ -21,6 +21,7 @@ SRC_URI += "\
|
||||
file://host_include_contamination.patch \
|
||||
file://sys_platform_is_now_always_linux2.patch \
|
||||
file://fix_for_using_different_libdir.patch \
|
||||
file://setuptweaks.patch \
|
||||
"
|
||||
|
||||
S = "${WORKDIR}/Python-${PV}"
|
||||
@@ -33,6 +34,7 @@ TARGET_CC_ARCH_append_armv6 = " -D__SOFTFP__"
|
||||
TARGET_CC_ARCH_append_armv7a = " -D__SOFTFP__"
|
||||
|
||||
do_configure_prepend() {
|
||||
rm -f ${S}/Makefile.orig
|
||||
autoreconf -Wcross --verbose --install --force --exclude=autopoint Modules/_ctypes/libffi || bbnote "_ctypes failed to autoreconf"
|
||||
}
|
||||
|
||||
@@ -65,10 +67,17 @@ do_compile() {
|
||||
# remove any bogus LD_LIBRARY_PATH
|
||||
sed -i -e s,RUNSHARED=.*,RUNSHARED=, Makefile
|
||||
|
||||
install -m 0644 Makefile Makefile.orig
|
||||
sed -i -e 's,${includedir},${STAGING_INCDIR},' Makefile
|
||||
sed -i -e 's,${libdir},${STAGING_LIBDIR},' Makefile
|
||||
sed -i -e 's,LDFLAGS=,LDFLAGS=-L. -L${STAGING_LIBDIR},' Makefile
|
||||
if [ ! -f Makefile.orig ]; then
|
||||
install -m 0644 Makefile Makefile.orig
|
||||
fi
|
||||
sed -i -e 's,^LDFLAGS=.*,LDFLAGS=-L. -L${STAGING_LIBDIR},g' \
|
||||
-e 's,libdir=${libdir},libdir=${STAGING_LIBDIR},g' \
|
||||
-e 's,libexecdir=${libexecdir},libexecdir=${STAGING_DIR_HOST}${libexecdir},g' \
|
||||
-e 's,^LIBDIR=.*,LIBDIR=${STAGING_LIBDIR},g' \
|
||||
-e 's,includedir=${includedir},includedir=${STAGING_INCDIR},g' \
|
||||
-e 's,^INCLUDEDIR=.*,INCLUDE=${STAGING_INCDIR},g' \
|
||||
-e 's,^CONFINCLUDEDIR=.*,CONFINCLUDE=${STAGING_INCDIR},g' \
|
||||
Makefile
|
||||
install -m 0644 Makefile ${STAGING_LIBDIR}/python${PYTHON_MAJMIN}/config/
|
||||
# save copy of it now, because if we do it in do_install and
|
||||
# then call do_install twice we get Makefile.orig == Makefile.sysroot
|
||||
@@ -79,6 +88,7 @@ do_compile() {
|
||||
oe_runmake HOSTPGEN=${STAGING_BINDIR_NATIVE}/pgen \
|
||||
HOSTPYTHON=${STAGING_BINDIR_NATIVE}/python \
|
||||
STAGING_LIBDIR=${STAGING_LIBDIR} \
|
||||
STAGING_BASELIBDIR=${STAGING_BASELIBDIR} \
|
||||
STAGING_INCDIR=${STAGING_INCDIR} \
|
||||
BUILD_SYS=${BUILD_SYS} HOST_SYS=${HOST_SYS} \
|
||||
OPT="${CFLAGS}" libpython${PYTHON_MAJMIN}.so
|
||||
@@ -89,6 +99,7 @@ do_compile() {
|
||||
HOSTPYTHON=${STAGING_BINDIR_NATIVE}/python \
|
||||
STAGING_LIBDIR=${STAGING_LIBDIR} \
|
||||
STAGING_INCDIR=${STAGING_INCDIR} \
|
||||
STAGING_BASELIBDIR=${STAGING_BASELIBDIR} \
|
||||
BUILD_SYS=${BUILD_SYS} HOST_SYS=${HOST_SYS} \
|
||||
OPT="${CFLAGS}"
|
||||
}
|
||||
@@ -105,6 +116,7 @@ do_install() {
|
||||
CROSSPYTHONPATH=${STAGING_LIBDIR_NATIVE}/python${PYTHON_MAJMIN}/lib-dynload/ \
|
||||
STAGING_LIBDIR=${STAGING_LIBDIR} \
|
||||
STAGING_INCDIR=${STAGING_INCDIR} \
|
||||
STAGING_BASELIBDIR=${STAGING_BASELIBDIR} \
|
||||
BUILD_SYS=${BUILD_SYS} HOST_SYS=${HOST_SYS} \
|
||||
DESTDIR=${D} LIBDIR=${libdir} install
|
||||
|
||||
|
||||
@@ -0,0 +1,66 @@
|
||||
From a4d1f142542935b90d2eb30f3aead4edcf455fe6 Mon Sep 17 00:00:00 2001
|
||||
From: Aurelien Jarno <aurelien@aurel32.net>
|
||||
Date: Sat, 7 Jan 2012 15:20:11 +0100
|
||||
Subject: [PATCH 1/1] target-i386: fix {min,max}{pd,ps,sd,ss} SSE2 instructions
|
||||
|
||||
minpd, minps, minsd, minss and maxpd, maxps, maxsd, maxss SSE2
|
||||
instructions have been broken when switching target-i386 to softfloat.
|
||||
It's not possible to use comparison instructions on float types anymore
|
||||
to softfloat, so use the floatXX_lt function instead, as the
|
||||
float_XX_min and float_XX_max functions can't be used due to the Intel
|
||||
specific behaviour.
|
||||
|
||||
As it implements the correct NaNs behaviour, let's remove the
|
||||
corresponding entry from the TODO.
|
||||
|
||||
It fixes GDM screen display on Debian Lenny.
|
||||
|
||||
Thanks to Peter Maydell and Jason Wessel for their analysis of the
|
||||
problem.
|
||||
|
||||
Signed-off-by: Aurelien Jarno <aurelien@aurel32.net>
|
||||
---
|
||||
target-i386/TODO | 1 -
|
||||
target-i386/ops_sse.h | 9 +++++++--
|
||||
2 files changed, 7 insertions(+), 3 deletions(-)
|
||||
|
||||
This fixes scrollbar issues in matchbox-terminal/vte on qemux86-64 and
|
||||
files not appearing in pcmanfm, as well as glib/gobject errors to do with gdoubles
|
||||
on the console [YOCTO #1906]
|
||||
|
||||
Upstream-Status: Backport
|
||||
|
||||
Index: qemu-0.15.1/target-i386/TODO
|
||||
===================================================================
|
||||
--- qemu-0.15.1.orig/target-i386/TODO 2011-10-12 16:41:43.000000000 +0000
|
||||
+++ qemu-0.15.1/target-i386/TODO 2012-04-19 07:30:38.704073075 +0000
|
||||
@@ -15,7 +15,6 @@
|
||||
- DRx register support
|
||||
- CR0.AC emulation
|
||||
- SSE alignment checks
|
||||
-- fix SSE min/max with nans
|
||||
|
||||
Optimizations/Features:
|
||||
|
||||
Index: qemu-0.15.1/target-i386/ops_sse.h
|
||||
===================================================================
|
||||
--- qemu-0.15.1.orig/target-i386/ops_sse.h 2011-10-12 16:41:43.000000000 +0000
|
||||
+++ qemu-0.15.1/target-i386/ops_sse.h 2012-04-19 07:30:38.712073076 +0000
|
||||
@@ -584,10 +584,15 @@
|
||||
#define FPU_SUB(size, a, b) float ## size ## _sub(a, b, &env->sse_status)
|
||||
#define FPU_MUL(size, a, b) float ## size ## _mul(a, b, &env->sse_status)
|
||||
#define FPU_DIV(size, a, b) float ## size ## _div(a, b, &env->sse_status)
|
||||
-#define FPU_MIN(size, a, b) (a) < (b) ? (a) : (b)
|
||||
-#define FPU_MAX(size, a, b) (a) > (b) ? (a) : (b)
|
||||
#define FPU_SQRT(size, a, b) float ## size ## _sqrt(b, &env->sse_status)
|
||||
|
||||
+/* Note that the choice of comparison op here is important to get the
|
||||
+ * special cases right: for min and max Intel specifies that (-0,0),
|
||||
+ * (NaN, anything) and (anything, NaN) return the second argument.
|
||||
+ */
|
||||
+#define FPU_MIN(size, a, b) float ## size ## _lt(a, b, &env->sse_status) ? (a) : (b)
|
||||
+#define FPU_MAX(size, a, b) float ## size ## _lt(b, a, &env->sse_status) ? (a) : (b)
|
||||
+
|
||||
SSE_HELPER_S(add, FPU_ADD)
|
||||
SSE_HELPER_S(sub, FPU_SUB)
|
||||
SSE_HELPER_S(mul, FPU_MUL)
|
||||
@@ -3,7 +3,7 @@ require qemu.inc
|
||||
LIC_FILES_CHKSUM = "file://COPYING;md5=441c28d2cf86e15a37fa47e15a72fbac \
|
||||
file://COPYING.LIB;endline=24;md5=c04def7ae38850e7d3ef548588159913"
|
||||
|
||||
PR = "r5"
|
||||
PR = "r6"
|
||||
|
||||
FILESPATH = "${FILE_DIRNAME}/qemu-${PV}"
|
||||
FILESDIR = "${WORKDIR}"
|
||||
@@ -18,6 +18,7 @@ SRC_URI = "\
|
||||
file://fallback-to-safe-mmap_min_addr.patch \
|
||||
file://larger_default_ram_size.patch \
|
||||
file://arm-bgr.patch \
|
||||
file://a4d1f142542935b90d2eb30f3aead4edcf455fe6.patch \
|
||||
"
|
||||
|
||||
# Only use the GL passthrough patches for native/nativesdk versions
|
||||
|
||||
@@ -1,5 +1,6 @@
|
||||
#!/usr/bin/env bash
|
||||
bitbake -u hob
|
||||
export BB_ENV_EXTRAWHITE="DISABLE_SANITY_CHECKS $BB_ENV_EXTRAWHITE"
|
||||
DISABLE_SANITY_CHECKS=1 bitbake -u hob
|
||||
|
||||
ret=$?
|
||||
exit $ret
|
||||
|
||||
Reference in New Issue
Block a user