Compare commits

...

29 Commits
thud ... green

Author SHA1 Message Date
Joshua Lock
afd0958d27 Green 3.3.1 Release
Signed-off-by: Joshua Lock <josh@linux.intel.com>
2010-07-08 12:14:07 +01:00
Richard Purdie
2b9dbe57a4 package_*.bbclass: Only set pkg in overrides. These are the only values we're interested in expanding and this makes sure we obtain the expected data
Signed-off-by: Richard Purdie <rpurdie@linux.intel.com>
2010-07-07 12:56:25 +01:00
Richard Purdie
d538d8e171 Revert "classes/package_ipk|_deb|_rpm.bbclass: Fix setting of OVERRIDES when packaging"
This reverts commit 3abe7a0624 which was incorrect
in some assumptions about OVERRIDE handling order.
2010-07-07 12:24:49 +01:00
Joshua Lock
d42f0b9153 classes/package_ipk|_deb|_rpm.bbclass: Fix setting of OVERRIDES when packaging
The OVERRIDES variable was being incorrectly set with the end result of the
runtime dependencies of the package not being encoded in it's package metadata.

This broke opkg-native in meta-toolchain.

Signed-off-by: Joshua Lock <josh@linux.intel.com>
2010-07-03 13:35:22 +01:00
Richard Purdie
f5003084d5 encodings: Specify encodingsdir as the default was being detected incorrectly resulting in an empty package
Signed-off-by: Richard Purdie <rpurdie@linux.intel.com>
2010-06-30 15:08:42 +01:00
Enric Balletbo i Serra
763b11d0fd busybox: fix unexpected "done" in /etc/udhcpc.d/50default script.
Run udhcpc results in

 udhcpc (v1.15.3) started
 /etc/udhcpc.d/50default: line 37: syntax error: unexpected "done" (expecting "fi")
 run-parts: /etc/udhcpc.d/50default exited with code 2

Signed-off-by: Enric Balletbo i Serra <eballetbo@gmail.com>
Signed-off-by: Richard Purdie <rpurdie@linux.intel.com>
2010-06-29 13:36:16 +01:00
Kevin Tian
7d292468e7 qemux86/xorg.conf: no DefaultDepth for VMware SVGA driver
VMware SVGA driver needs to have same depth between the host and the guest. Or put in
other word, the depth read by the guest is the value read from host. The guest is not
allowed to change virtual depth to other value. With DefaultDepth option xorg.conf,
vmware driver rejects to work with suggestion "Please do not specify a depth on the
command line or via the config file".

Signed-off-by Kevin Tian <kevin.tian@intel.com>
2010-06-29 13:36:07 +01:00
Kevin Tian
f51bb81248 qemu: fix VMware VGA depth calculation error
VMware SVGA presents to the guest with the depth of the host surface it renders
to, and rejects to work if the two sides are mismatched. One problem is that
current VMware VGA may calculate a wrong host depth, and then memcpy from virtual
framebuffer to host surface may trigger segmentation fault. For example, when
launching Qemu in a VNC connection, VMware SVGA thinks depth as '32', however the
actual depth of VNC is '16'. The fault also happens when the host depth is not
32 bit.

Qemu <4b5db3749c5fdba93e1ac0e8748c9a9a1064319f> tempts to fix a similar issue, by
changing from hard-coded 24bit depth to instead query the surface allocator
(e.g. sdl). However it doesn't really work, because the point where query
is invoked is earlier than the point where sdl is initialized. At query time,
qemu uses a default surface allocator which, again, provides another hard-coded
depth value - 32bit. So it happens to make VMware SVGA working on some hosts,
but still fails in others.

To solve this issue, this commit introduces a postcall interface to display
surface, which is walked after surface allocators are actually initialized.
At that point it's then safe to query host depth and present to the guest.

Signed-off-by Kevin Tian <kevin.tian@intel.com>
2010-06-29 13:35:59 +01:00
Richard Purdie
d3b8687ea6 gcc: Add patch to allow disabling of libstdc++ linkage and hence fix gcc-runtime which was having broken configure tests due to the linker failures and assuming maths primitives were not in libm
Signed-off-by: Richard Purdie <rpurdie@linux.intel.com>
2010-06-29 13:35:50 +01:00
Richard Purdie
93f7d74492 qemu: Enable ppc system emulation and fix ppc build
Signed-off-by: Richard Purdie <rpurdie@linux.intel.com>
2010-06-29 13:35:30 +01:00
Joshua Lock
e2c567f51e pkgconfig: add patch to disable legacy scripts such as glib-config
On an F13 host with glib-config installed pkgconfig-native can get into a
horrible state with recursive calls between pkg-config and glib-config.
The patch adds a configure time option to disable legacy script support in
pkgconfig and makes use of the option for Poky.

Signed-off-by: Joshua Lock <josh@linux.intel.com>
2010-06-25 14:58:43 +01:00
Joshua Lock
7646f333e1 cross-canadian: ensure package dependencies are generated correctly
cross-canadian packages need to look for their SOLIBS in the nativesdk
sysroot so that dependencies are correctly picked up and meta-toolchains are
correctly built.

Signed-off-by: Joshua Lock <josh@linux.intel.com>
2010-06-25 14:58:34 +01:00
Joshua Lock
b318d8f87b gdb-cross-canadian: build with the host-triplet prefix
Our cross-canadian tools our built with the host-triplet prefix, gdb should do
similar.

Signed-off-by: Joshua Lock <josh@linux.intel.com>
2010-06-23 18:44:59 +01:00
Scott Garman
0128976cb0 kernel.bbclass: Remove additional binaries from staging
* Remove additonal binaries known to cause "strip command failed"
  errors during do_package on cross platforms.

Signed-off-by: Scott Garman <scott.a.garman@intel.com>
2010-06-23 18:44:59 +01:00
Joshua Lock
5a4342cb2e qemu: fix sloppy merge
Signed-off-by: Joshua Lock <josh@linux.intel.com>
2010-06-23 18:02:45 +01:00
Jeff Dike
6e4579b32b qemu: Work around the crash seen on Ubuntu.
Due to different stack contents in sdl_display_init on Ubuntu vs other distros,
an uninitialized structure is causing a crash.  Zeroing the structure makes the
behavior uniform across distros, avoiding the Ubuntu crash, but doesn't fix the
underlying bugs, notably:
the return value of SDL_GetWMInfo needs to be checked, as it's currently
failing silently
the underlying reason for the failure of SDL_GetWMInfo needs to be found -
there is a GetWMINfo method in the internal SDL structure which is NULL, and
the reason for this needs to be found.

Signed-off-by: Jeff Dike <jdike@linux.intel.com>
2010-06-23 17:32:47 +01:00
Dexuan Cui
bd11abb22c linux-omap: fix build failure with gcc-4.3.3
Pull time.h patch from upstream Linux kernel
(commit 38332cb98772f5ea757e6486bed7ed0381cb5f98)

The patch fixes the following build failure:
  LD      .tmp_vmlinux1
kernel/built-in.o: In function `timespec_add_ns':
    undefined reference to `__aeabi_uldivmod'
kernel/built-in.o: In function `do_gettimeofday':
    undefined reference to `__aeabi_uldivmod'
    undefined reference to `__aeabi_uldivmod'
kernel/built-in.o: In function `timespec_add_ns':
    undefined reference to `__aeabi_uldivmod'
    undefined reference to `__aeabi_uldivmod'
kernel/built-in.o: more undefined references to `__aeabi_uldivmod'

Signed-off-by: Dexuan Cui <dexuan.cui@intel.com>
2010-06-23 13:24:52 +01:00
Joshua Lock
e1798f5e39 linux-libc-headers: delete include/scsi/scsi.h, it's not for userspace
include/scsi/scsi.h is not userland parsable and research indicates this is
because the header should not be exposed to userspace. Therefore remove it
in the install.

Research done by Tom Rini <tom_rini@mentor.com> in OE commit
91d3d92a626da89dfe13d63e68a90dbafdbaef1d

This has been the case since kernel 2.6.31

Bump glibc and uclibc PR's so that users have sane <scsi/scsi.h>

Signed-off-by: Joshua Lock <josh@linux.intel.com>
2010-06-18 10:34:06 +01:00
Dike, Jeffrey G
b43a425119 linux-libc-headers: Remove ioctls for deleted driver
2.6.33 removed the Hayes ESP driver.  The presence of these ioctls
makes setserial believe that ESP support should be built in, breaking its
build.

Signed-off-by: Jeff Dike <jdike@linux.intel.com>
2010-06-17 15:08:53 +01:00
Joshua Lock
01a5883616 qemu: Fix linking of the native package on Fedora 13
Fedora 13 switched the default behaviour of the linker to no longer
indirectly link to required libraries (i.e. dependencies of a library
already linked to). Therefore we need to explicitly pass the depended on
libraries into the linker for building to work on Fedora 13.

Signed-off-by: Joshua Lock <josh@linux.intel.com>
2010-06-17 15:08:49 +01:00
Joshua Lock
ed145bbdfe handbook: Fix stylesheet
Some sizes where defined without units (in our case px) causing display of the
header of the handbook to be broken.

Signed-off-by: Joshua Lock <josh@linux.intel.com>
2010-06-14 14:33:51 +01:00
Joshua Lock
dc123ba831 sanity.bbclass: Fix test for i686 SDKMACHINE
The 'is' keyword tests for object identity, returning True if the variables are
both referencing the same object. Changed the test to use the equality
operator, which compares the values of the objects.

Signed-off-by: Joshua Lock <josh@linux.intel.com>
2010-06-14 12:51:34 +01:00
Joshua Lock
887a7768cf handbook: Fix typo in last commit
Managed to mangle the command...

Signed-off-by: Joshua Lock <josh@linux.intel.com>
2010-06-14 12:12:09 +01:00
Joshua Lock
aba90fdf2f handbook: fix extraction command
We ship bzipped tarballs now so we need to pass j to tar, not z

Signed-off-by: Joshua Lock <josh@linux.intel.com>
2010-06-14 12:08:12 +01:00
Joshua Lock
27cff3f045 handbook: Note that this is the documentation for Green
Signed-off-by: Joshua Lock <josh@linux.intel.com>
2010-06-14 12:03:21 +01:00
Joshua Lock
506386d148 handbook: Fix references to the stable release
The handbook was still talking about the purple release, we're green now

Signed-off-by: Joshua Lock <josh@linux.intel.com>
2010-06-14 11:45:30 +01:00
Joshua Lock
f5d24f0574 handbook: Fix generation of HTML handbook
Signed-off-by: Joshua Lock <josh@linux.intel.com>
2010-06-14 11:44:56 +01:00
Joshua Lock
d36f183ade Green 3.3 Release 2010-06-11 14:43:33 +01:00
Joshua Lock
6129f9fc44 packaged-staging.bbclass: fix typo in scan_cmd
it's PSTAGE_TMPDIR_STAGE, not PSTAGE_TMDPDIR_STAGE spotted by Chris Larson
<chris_larson@mentor.com>

Signed-off-by: Joshua Lock <josh@linux.intel.com>
2010-06-11 14:43:33 +01:00
42 changed files with 446 additions and 135 deletions

View File

@@ -9,7 +9,8 @@ pdf:
XSLTOPTS = --stringparam html.stylesheet style.css \
--stringparam chapter.autolabel 1 \
--stringparam appendix.autolabel 1 \
--stringparam section.autolabel 1
--stringparam section.autolabel 1 \
--xinclude
##
# These URI should be rewritten by your distribution's xml catalog to

View File

@@ -177,9 +177,9 @@
<para>
<literallayout class='monospaced'>
$ wget http://pokylinux.org/releases/purple-3.2.1.tar.gz
$ tar zxvf purple-3.2.1.tar.gz
$ cd purple-3.2.1/
$ wget http://pokylinux.org/releases/poky-green-3.3.tar.bz2
$ tar xjvf poky-green-3.3.tar.bz2
$ cd green-3.3/
$ source poky-init-build-env
$ bitbake poky-image-sato
$ runqemu qemux86

View File

@@ -44,9 +44,9 @@
<revhistory>
<revision>
<revnumber>3.2+git</revnumber>
<date>18 March 2010</date>
<revremark>Poky Master Documentation</revremark>
<revnumber>3.3.1</revnumber>
<date>8 July 2010</date>
<revremark>Poky Green Documentation</revremark>
</revision>
</revhistory>

View File

@@ -64,8 +64,8 @@ h1 {
}
h2.subtitle {
margin: 0.10em 0 3.0em 0;
padding: 0 0 0 0;
margin: 0.10em 0em 3.0em 0em;
padding: 0em 0em 0em 0em;
font-size: 1.8em;
padding-left: 20%;
font-weight: normal;
@@ -83,7 +83,7 @@ h3.subtitle {
margin: 0em 0em 1em 0em;
padding: 0em 0em 0em 0em;
font-size: 142.14%;
text-align : right;
text-align: right;
}
h3 {
@@ -117,7 +117,7 @@ h6 {
.authorgroup {
background-color: transparent;
background-repeat: no-repeat;
padding-top: 256;
padding-top: 256px;
background-image: url("poky-beaver.png");
background-position: right top;
float: right;
@@ -129,8 +129,8 @@ h6 {
}
h3.author {
margin: 0 0 0 0;
padding: 0 0 0 0;
margin: 0em 0me 0em 0em;
padding: 0em 0em 0em 0em;
font-weight: normal;
font-size: 100%;
clear: both;
@@ -141,7 +141,7 @@ h3.author {
}
.titlepage hr {
width: 0;
width: 0em;
clear: both;
}
@@ -161,9 +161,9 @@ h3.author {
.list-of-tables p,
.list-of-figures p,
.list-of-examples p {
padding: 0 0 0 0;
padding: 0em 0em 0em 0em;
padding: 0em 0em 0.3em;
margin: 1.5em 0 0 0;
margin: 1.5em 0em 0em 0em;
}
.toc p b,
@@ -178,18 +178,18 @@ h3.author {
.list-of-tables dl,
.list-of-figures dl,
.list-of-examples dl {
margin: 0 0 0.5em 0;
padding: 0 0 0 0;
margin: 0em 0em 0.5em 0em;
padding: 0em 0em 0em 0em;
}
.toc dt {
margin: 0 0 0 0;
padding: 0 0 0 0;
margin: 0em 0em 0em 0em;
padding: 0em 0em 0em 0em;
}
.toc dd {
margin: 0em 0em 0em 2.6em;
padding: 0 0 0 0;
padding: 0em 0em 0em 0em;
}
div.glossary dl,
@@ -222,8 +222,8 @@ div.variablelist dl {
div.calloutlist table td {
padding: 0 0 0 0;
margin: 0 0 0 0;
padding: 0em 0em 0em 0em;
margin: 0em 0em 0em 0em;
}
div.calloutlist table td p {
@@ -236,12 +236,12 @@ div p.copyright {
}
div.legalnotice p.legalnotice-title {
margin-bottom: 0;
margin-bottom: 0em;
}
p {
line-height: 1.5em;
margin-top: 0;
margin-top: 0em;
}
@@ -264,11 +264,11 @@ img {
}
ul {
padding: 0 0 0 1.5em;
padding: 0em 0em 0em 1.5em;
}
ul li {
padding: 0 0 0 0;
padding: 0em 0em 0em 0em;
}
ul li p {
@@ -292,8 +292,8 @@ td {
}
p a[id] {
margin: 0;
padding: 0;
margin: 0px;
padding: 0px;
display: inline;
background-image: none;
}
@@ -304,7 +304,7 @@ a {
}
pre {
overflow : auto;
overflow: auto;
}
a:hover {
@@ -331,8 +331,8 @@ div.informaltable p.title b,
div.figure p.title b,
div.example p.title b,
div.table p.title b{
padding-top: 0;
margin-top: 0;
padding-top: 0em;
margin-top: 0em;
font-size: 100%;
font-weight: normal;
}
@@ -398,7 +398,7 @@ span.application {
.caution table th,
.note table th {
padding: 0.8em 0.0em 0.0em 0.0em;
margin : 0 0 0 0;
margin : 0em 0em 0em 0em;
}
.tip p,
@@ -418,7 +418,7 @@ span.application {
b.keycap,
.keycap {
padding: 0.09em 0.3em;
margin: 0;
margin: 0em;
}
.itemizedlist li {
@@ -433,8 +433,8 @@ b.keycap,
div.navheader, div.heading{
position: absolute;
left: 0;
top: 0;
left: 0em;
top: 0em;
width: 100%;
background-color: #cdf;
width: 100%;
@@ -461,16 +461,16 @@ div.navheader table th {
}
div.navheader table {
border-left: 0;
border-right: 0;
border-top: 0;
border-left: 0em;
border-right: 0em;
border-top: 0em;
width: 100%;
}
div.navfooter table {
border-left: 0;
border-right: 0;
border-bottom: 0;
border-left: 0em;
border-right: 0em;
border-bottom: 0em;
width: 100%;
}
@@ -506,13 +506,13 @@ div.navfooter hr {
.qandaset tr.question td p {
margin: 0 0 1em 0;
padding: 0 0 0 0;
margin: 0em 0em 1em 0em;
padding: 0em 0em 0em 0em;
}
.qandaset tr.answer td p {
margin: 0 0 1em 0;
padding: 0 0 0 0;
margin: 0em 0em 1em 0em;
padding: 0em 0em 0em 0em;
}
.answer td {
padding-bottom: 1.5em;
@@ -572,7 +572,7 @@ div.informalfigure,
div.informaltable,
div.informalexample,
div.example {
border : 1px solid;
border: 1px solid;
}
@@ -581,14 +581,14 @@ div.example {
.warning,
.caution,
.note {
border : 1px solid;
border: 1px solid;
}
.tip table th,
.warning table th,
.caution table th,
.note table th {
border-bottom : 1px solid;
border-bottom: 1px solid;
}
.question td {
@@ -640,7 +640,7 @@ h5,
h6,
h7,
h8 {
background-color : transparent;
background-color: transparent;
}
hr {
@@ -649,7 +649,7 @@ hr {
.tip, .warning, .caution, .note {
border-color : #aaa;
border-color: #aaa;
}
@@ -784,7 +784,7 @@ h1.title {
background-color: transparent;
background-image: url("poky-handbook.png");
background-repeat: no-repeat;
height: 256;
height: 256px;
text-indent: -9000px;
overflow:hidden;
}
@@ -793,7 +793,7 @@ h2.subtitle {
background-color: transparent;
text-indent: -9000px;
overflow:hidden;
width: 0;
width: 0px;
display: none;
}
@@ -864,7 +864,7 @@ body {
/ ****************************************/
/*
div.navfooter, div.footing{
-moz-opacity: 0.8;
-moz-opacity: 0.8em;
}
div.figure,
@@ -896,11 +896,11 @@ hr {
}
table {
border: 0;
border: 0em;
}
.photo {
float:right;
float: right;
margin-left: 1.5em;
margin-bottom: 1.5em;
margin-top: 0em;
@@ -911,7 +911,7 @@ table {
}
.seperator {
padding-top: 2em;
clear :both;
clear: both;
}
#validators {
@@ -939,8 +939,8 @@ table {
.tip h3,
.note h3 {
padding: 0;
margin: 0;
padding: 0em;
margin: 0em;
font-size: 2em;
font-weight: bold;
color: #fff;
@@ -950,4 +950,4 @@ table {
.note a {
color: #fff;
text-decoration: underline;
}
}

View File

@@ -56,3 +56,5 @@ FILES_${PN}-dbg += "${prefix}/.debug \
export PKG_CONFIG_DIR = "${STAGING_DIR_HOST}${layout_libdir}/pkgconfig"
export PKG_CONFIG_SYSROOT_DIR = "${STAGING_DIR_HOST}"
# Cross-canadian packages need to pull in nativesdk so's, sorry for ugliness
SHLIBSDIR = "${STAGING_DIR}/${SDK_ARCH}-nativesdk-pokysdk-${BUILD_OS}/shlibs"

View File

@@ -166,9 +166,15 @@ kernel_do_install() {
# Remove the following binaries which cause strip errors
# during do_package for cross-compiled platforms
for entry in bin2c conmakehash ihex2fw kallsyms pnmtologo basic/docproc basic/fixdep basic/hash genksyms/genksyms kconfig/conf mod/mk_elfconfig mod/modpost; do
rm -f $kerneldir/scripts/$entry
done
bin_files=(arch/powerpc/boot/addnote arch/powerpc/boot/hack-coff
arch/powerpc/boot/mktree scripts/bin2c scripts/conmakehash
scripts/ihex2fw scripts/kallsyms scripts/pnmtologo scripts/basic/docproc
scripts/basic/fixdep scripts/basic/hash scripts/dtc/dtc
scripts/genksyms/genksyms scripts/kconfig/conf scripts/mod/mk_elfconfig
scripts/mod/modpost)
for entry in "${bin_files[@]}"; do
rm -f $kerneldir/$entry
done
}
sysroot_stage_all_append() {

View File

@@ -112,11 +112,7 @@ python do_package_deb () {
pkgname = pkg
bb.data.setVar('PKG', pkgname, localdata)
overrides = bb.data.getVar('OVERRIDES', localdata)
if not overrides:
raise bb.build.FuncFailed('OVERRIDES not defined')
overrides = bb.data.expand(overrides, localdata)
bb.data.setVar('OVERRIDES', overrides + ':' + pkg, localdata)
bb.data.setVar('OVERRIDES', pkg, localdata)
bb.data.update_data(localdata)
basedir = os.path.join(os.path.dirname(root))

View File

@@ -179,10 +179,7 @@ python do_package_ipk () {
pkgname = pkg
bb.data.setVar('PKG', pkgname, localdata)
overrides = bb.data.getVar('OVERRIDES', localdata, True)
if not overrides:
raise bb.build.FuncFailed('OVERRIDES not defined')
bb.data.setVar('OVERRIDES', overrides + ':' + pkg, localdata)
bb.data.setVar('OVERRIDES', pkg, localdata)
bb.data.update_data(localdata)
basedir = os.path.join(os.path.dirname(root))

View File

@@ -188,11 +188,7 @@ python do_package_rpm () {
pkgname = pkg
bb.data.setVar('PKG', pkgname, localdata)
overrides = bb.data.getVar('OVERRIDES', localdata)
if not overrides:
raise bb.build.FuncFailed('OVERRIDES not defined')
overrides = bb.data.expand(overrides, localdata)
bb.data.setVar('OVERRIDES', overrides + ':' + pkg, localdata)
bb.data.setVar('OVERRIDES', pkg, localdata)
bb.data.update_data(localdata)
basedir = os.path.join(os.path.dirname(root))

View File

@@ -42,7 +42,7 @@ python () {
path = bb.data.getVar('PSTAGE_PKGPATH', d, 1)
path = path + bb.data.getVar('TMPDIR', d, 1).replace('/', '-')
bb.data.setVar('PSTAGE_PKGPATH', path, d)
scan_cmd = "grep -Irl ${STAGING_DIR} ${PSTAGE_TMDPDIR_STAGE}"
scan_cmd = "grep -Irl ${STAGING_DIR} ${PSTAGE_TMPDIR_STAGE}"
bb.data.setVar('PSTAGE_SCAN_CMD', scan_cmd, d)
# PSTAGE_NATIVEDEPENDS lists the packages we need before we can use packaged

View File

@@ -140,7 +140,7 @@ def check_sanity(e):
if not oes_bb_conf:
messages = messages + 'You do not include OpenEmbeddeds version of conf/bitbake.conf. This means your environment is misconfigured, in particular check BBPATH.\n'
if data.getVar('SDKMACHINE', e.data, True) is 'i686':
if data.getVar('SDKMACHINE', e.data, True) == 'i686':
messages = messages + '"Please set SDKMACHINE to i586 as its currently set to i686 and this is known to have issues (see local.conf).\n'
#

View File

@@ -3,7 +3,7 @@
DISTRO = "poky"
DISTRO_NAME = "OpenedHand Linux (Poky)"
DISTRO_VERSION = "3.2+snapshot-${DATE}"
DISTRO_VERSION = "3.3.1"
MAINTAINER = "OpenedHand <poky@openedhand.com>"

View File

@@ -1,3 +1,3 @@
require binutils_${PV}.bb
require binutils-cross-canadian.inc
PR = "r0"
PR = "r1"

View File

@@ -1,3 +1,3 @@
require binutils_${PV}.bb
require binutils-cross-canadian.inc
PR = "r0"
PR = "r1"

View File

@@ -1,8 +1,8 @@
Index: busybox-1.15.1/examples/udhcp/simple.script
Index: busybox-1.15.3/examples/udhcp/simple.script
===================================================================
--- busybox-1.15.1.orig/examples/udhcp/simple.script 2009-09-16 22:52:09.000000000 +0200
+++ busybox-1.15.1/examples/udhcp/simple.script 2009-09-16 22:57:11.424608476 +0200
@@ -10,10 +10,17 @@ NETMASK=""
--- busybox-1.15.3.orig/examples/udhcp/simple.script 2010-06-27 12:17:14.116876946 +0200
+++ busybox-1.15.3/examples/udhcp/simple.script 2010-06-27 12:18:38.607868533 +0200
@@ -10,10 +10,17 @@
BROADCAST="broadcast +"
[ -n "$broadcast" ] && BROADCAST="broadcast $broadcast"
@@ -21,7 +21,7 @@ Index: busybox-1.15.1/examples/udhcp/simple.script
;;
renew|bound)
@@ -21,15 +28,18 @@ case "$1" in
@@ -21,15 +28,17 @@
ifconfig $interface $ip $NETMASK $BROADCAST
if [ -n "$router" ] ; then
@@ -34,8 +34,7 @@ Index: busybox-1.15.1/examples/udhcp/simple.script
+ while route del default gw 0.0.0.0 dev $interface 2>/dev/null ; do
+ :
+ done
+ :
+ done
+ fi
metric=0
for i in $router ; do

View File

@@ -1,5 +1,5 @@
require busybox.inc
PR = "4"
PR = "r5"
SRC_URI = "\
http://www.busybox.net/downloads/busybox-${PV}.tar.bz2;name=tarball \

View File

@@ -53,6 +53,7 @@ SRC_URI = "${GNU_MIRROR}/gcc/gcc-${PV}/gcc-${PV}.tar.bz2 \
file://zecke-xgcc-cpp.patch;patch=1 \
file://gcc-flags-for-build.patch;patch=1 \
file://pr35942.patch;patch=1 \
file://optional_libstdc.patch;patch=1 \
"
SRC_URI_append_sh3 = " file://sh3-installfix-fixheaders.patch;patch=1 "

View File

@@ -0,0 +1,23 @@
gcc-runtime builds libstdc++ separately from gcc-cross-*. Its configure tests using g++
will not run correctly since my default the linker will try and link against libstdc++
which shouldn't exist yet. We need an option to disable the automatically added -lstdc++
option whilst leaving -lc, -lgcc and other automatic library dependencies. This patch
adds such an option which only disables the -lstdc++ linkage.
A "standard" gcc build uses xgcc and hence avoids this. We should ask upstream how to
do this officially, the likely answer is don't build libstdc++ separately.
RP 29/6/10
Index: gcc-4.3.3/gcc/cp/g++spec.c
===================================================================
--- gcc-4.3.3.orig/gcc/cp/g++spec.c 2010-06-29 00:06:03.901695025 +0100
+++ gcc-4.3.3/gcc/cp/g++spec.c 2010-06-29 00:06:58.800325439 +0100
@@ -131,6 +131,7 @@
if (argv[i][0] == '-')
{
if (strcmp (argv[i], "-nostdlib") == 0
+ || strcmp (argv[i], "-nostdlib++") == 0
|| strcmp (argv[i], "-nodefaultlibs") == 0)
{
library = -1;

View File

@@ -13,7 +13,7 @@ RUNTIMETARGET = "libssp libstdc++-v3"
# libgfortran
do_configure () {
export CXX="${CXX} -nostdinc++"
export CXX="${CXX} -nostdinc++ -nostdlib++"
for d in ${RUNTIMETARGET}; do
echo "Configuring $d"
mkdir -p ${B}/$d/

View File

@@ -5,7 +5,7 @@ require gcc-cross-canadian.inc
require gcc-configure-sdk.inc
require gcc-package-sdk.inc
PR = "r12"
PR = "r13"
DEPENDS += "gmp-nativesdk mpfr-nativesdk"
RDEPENDS_${PN} += "mpfr-nativesdk"

View File

@@ -1,4 +1,4 @@
PR = "r12"
PR = "r14"
require gcc-${PV}.inc
require gcc-cross4.inc

View File

@@ -1,4 +1,4 @@
PR = "r12"
PR = "r14"
require gcc-${PV}.inc
require gcc-configure-runtime.inc

View File

@@ -4,4 +4,6 @@ DEPENDS = "ncurses-nativesdk expat-nativesdk gettext-nativesdk"
inherit cross-canadian
PR = "r8"
PR = "r10"
GDBPROPREFIX = "--program-prefix='${TARGET_PREFIX}'"

View File

@@ -1,6 +1,6 @@
require glibc.inc
PR = "r13"
PR = "r14"
# the -isystem in bitbake.conf screws up glibc do_stage
BUILD_CPPFLAGS = "-I${STAGING_INCDIR_NATIVE}"

View File

@@ -5,7 +5,7 @@ ARM_INSTRUCTION_SET = "arm"
PACKAGES_DYNAMIC = "libc6*"
RPROVIDES_${PN}-dev = "libc6-dev virtual-libc-dev"
PR = "r1"
PR = "r2"
# the -isystem in bitbake.conf screws up glibc do_stage
BUILD_CPPFLAGS = "-I${STAGING_INCDIR_NATIVE}"

View File

@@ -0,0 +1,25 @@
# 2.6.33 deleted the Hayes esp driver, so the ioctls to get and set its
# configuration are no longer needed, and they break setserial by making it
# believe that it should compile in the code that supports this modem.
Index: linux-2.6.33/include/asm-generic/ioctls.h
===================================================================
--- linux-2.6.33.orig/include/asm-generic/ioctls.h
+++ linux-2.6.33/include/asm-generic/ioctls.h
@@ -86,16 +86,6 @@
#define TIOCMIWAIT 0x545C /* wait for a change on serial input line(s) */
#define TIOCGICOUNT 0x545D /* read serial port inline interrupt counts */
-/*
- * some architectures define FIOQSIZE as 0x545E, which is used for
- * TIOCGHAYESESP on others
- */
-#ifndef FIOQSIZE
-# define TIOCGHAYESESP 0x545E /* Get Hayes ESP configuration */
-# define TIOCSHAYESESP 0x545F /* Set Hayes ESP configuration */
-# define FIOQSIZE 0x5460
-#endif
-
/* Used for packet mode */
#define TIOCPKT_DATA 0
#define TIOCPKT_FLUSHREAD 1

View File

@@ -2,9 +2,10 @@ require linux-libc-headers.inc
INHIBIT_DEFAULT_DEPS = "1"
DEPENDS += "unifdef-native"
PR = "r0"
PR = "r2"
SRC_URI = "${KERNELORG_MIRROR}/pub/linux/kernel/v2.6/linux-${PV}.tar.bz2"
SRC_URI = "${KERNELORG_MIRROR}/pub/linux/kernel/v2.6/linux-${PV}.tar.bz2 \
file://hayes-gone.patch"
S = "${WORKDIR}/linux-${PV}"
@@ -40,6 +41,8 @@ do_compile () {
do_install() {
set_arch
oe_runmake headers_install INSTALL_HDR_PATH=${D}${exec_prefix} ARCH=$ARCH
# Kernel should not be exporting this header
rm -f ${D}${exec_prefix}/include/scsi/scsi.h
}
BBCLASSEXTEND = "nativesdk"

View File

@@ -0,0 +1,29 @@
commit 38332cb98772f5ea757e6486bed7ed0381cb5f98
Author: Segher Boessenkool <segher@kernel.crashing.org>
Date: Tue Mar 4 14:59:54 2008 -0800
time: prevent the loop in timespec_add_ns() from being optimised away
Since some architectures don't support __udivdi3().
Signed-off-by: Segher Boessenkool <segher@kernel.crashing.org>
Cc: john stultz <johnstul@us.ibm.com>
Cc: Ingo Molnar <mingo@elte.hu>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Thomas Gleixner <tglx@linutronix.de>
diff --git a/include/linux/time.h b/include/linux/time.h
index 2091a19..d32ef0a 100644
--- a/include/linux/time.h
+++ b/include/linux/time.h
@@ -174,6 +174,10 @@ static inline void timespec_add_ns(struct timespec *a, u64 ns)
{
ns += a->tv_nsec;
while(unlikely(ns >= NSEC_PER_SEC)) {
+ /* The following asm() prevents the compiler from
+ * optimising this loop into a modulo operation. */
+ asm("" : "+r"(ns));
+
ns -= NSEC_PER_SEC;
a->tv_sec++;
}

View File

@@ -1,6 +1,6 @@
require linux-omap.inc
PR = "r5"
PR = "r6"
COMPATIBLE_MACHINE = "omap-3430ldp|omap-3430sdp"
DEFAULT_PREFERENCE = "1"
@@ -18,6 +18,7 @@ SRC_URI="http://www.kernel.org/pub/linux/kernel/v2.6/linux-2.6.24.tar.bz2 \
file://fixes.patch;patch=1 \
file://fixes2.patch;patch=1 \
file://module_fix.patch;patch=1 \
file://time-prevent-the-loop-in-timespec_add_ns-from-being-optimised-away.patch;patch=1 \
file://defconfig-${MACHINE}"
S = "${WORKDIR}/linux-2.6.24"

View File

@@ -5,19 +5,20 @@ It replaces the ubiquitous *-config scripts you may have \
seen with a single tool."
HOMEPAGE = "http://pkg-config.freedesktop.org/wiki/"
LICENSE = "GPL"
PR = "r7"
PR = "r8"
DEPENDS = "glib-2.0"
DEPENDS_virtclass-native = ""
DEPENDS_virtclass-nativesdk = ""
EXTRA_OECONF = "--with-installed-glib"
EXTRA_OECONF_virtclass-native = ""
EXTRA_OECONF_virtclass-nativesdk = ""
EXTRA_OECONF = "--with-installed-glib --disable-legacy-scripts"
EXTRA_OECONF_virtclass-native = "--disable-legacy-scripts"
EXTRA_OECONF_virtclass-nativesdk = "--disable-legacy-scripts"
SRC_URI = "http://pkgconfig.freedesktop.org/releases/pkg-config-${PV}.tar.gz \
file://autofoo.patch;patch=1 \
file://sysrootfix.patch;patch=1 \
file://glibconfig-sysdefs.h"
file://autofoo.patch \
file://sysrootfix.patch \
file://glibconfig-sysdefs.h \
file://disable-legacy.patch"
S = "${WORKDIR}/pkg-config-${PV}/"

View File

@@ -0,0 +1,42 @@
On an Fedora host with glib-config installed pkgconfig-native can get into a
horrible state with recursive calls between pkg-config and glib-config.
The patch adds a configure time option to disable legacy script support in
pkgconfig with the --disable-legacy-scripts option, to maintain compatibility
the default is to leave the scripts enabled.
JL - 22/06/10
Index: pkg-config-0.23/configure.in
===================================================================
--- pkg-config-0.23.orig/configure.in 2008-01-16 22:48:07.000000000 +0000
+++ pkg-config-0.23/configure.in 2010-06-22 13:05:58.951984140 +0100
@@ -125,6 +125,14 @@
AC_CONFIG_SUBDIRS(glib-1.2.10)
fi # !native_win32
+# legacy *-configure scripts can cause headaches, add option to disable
+AC_ARG_ENABLE(legacy-scripts,
+ [AC_HELP_STRING([--enable-legacy-scripts=@<:@no/yes@:>@],
+ [Whether pkg-config will try and use legacy scripts such as glib-config and gnome-config @<:@default=yes@:>@])],
+ [],
+ [enable_legacy=yes])
+AM_CONDITIONAL([LEGACY_SCRIPTS], [test x$enable_legacy = xyes])
+
AC_FUNC_ALLOCA
AC_CHECK_FUNCS(setresuid setreuid,break)
Index: pkg-config-0.23/parse.c
===================================================================
--- pkg-config-0.23.orig/parse.c 2008-01-16 20:42:49.000000000 +0000
+++ pkg-config-0.23/parse.c 2010-06-22 13:09:10.410129471 +0100
@@ -1195,6 +1195,11 @@
* messages.
*/
return NULL;
+#elif defined(LEGACY_SCRIPTS)
+ /* There are scenarios where we might not want to use these legacy
+ * scripts even if they are available.
+ */
+ return NULL;
#else
Package *pkg;

View File

@@ -1,21 +1,22 @@
Index: qemu/Makefile.target
Index: qemu-0.12.4/Makefile.target
===================================================================
--- qemu.orig/Makefile.target 2010-05-11 16:53:34.545811866 -0400
+++ qemu/Makefile.target 2010-05-11 16:53:37.743809704 -0400
@@ -47,6 +47,9 @@ libobj-$(CONFIG_NOSOFTFLOAT) += fpu/soft
--- qemu-0.12.4.orig/Makefile.target 2010-06-24 07:59:15.669394205 +0100
+++ qemu-0.12.4/Makefile.target 2010-06-24 08:07:38.739399512 +0100
@@ -47,6 +47,10 @@
libobj-y += op_helper.o helper.o
libobj-$(CONFIG_NEED_MMU) += mmu.o
libobj-$(TARGET_I386) += helper_opengl.o opengl_exec.o
+libobj-$(TARGET_X86_64) += helper_opengl.o opengl_exec.o
+libobj-$(TARGET_ARM) += dummygl.o
+libobj-$(TARGET_MIPS) += dummygl.o
+libobj-$(TARGET_PPC) += dummygl.o
libobj-$(TARGET_ARM) += neon_helper.o iwmmxt_helper.o
libobj-$(TARGET_ALPHA) += alpha_palcode.o
Index: qemu/target-arm/dummygl.c
Index: qemu-0.12.4/target-arm/dummygl.c
===================================================================
--- /dev/null 1970-01-01 00:00:00.000000000 +0000
+++ qemu/target-arm/dummygl.c 2010-05-11 16:53:37.743809704 -0400
+++ qemu-0.12.4/target-arm/dummygl.c 2010-06-24 07:59:15.899401748 +0100
@@ -0,0 +1,22 @@
+#include <string.h>
+#include <stdlib.h>
@@ -39,10 +40,37 @@ Index: qemu/target-arm/dummygl.c
+{
+
+}
Index: qemu/target-mips/dummygl.c
Index: qemu-0.12.4/target-mips/dummygl.c
===================================================================
--- /dev/null 1970-01-01 00:00:00.000000000 +0000
+++ qemu/target-mips/dummygl.c 2010-05-11 16:53:37.744811919 -0400
+++ qemu-0.12.4/target-mips/dummygl.c 2010-06-24 07:59:15.899401748 +0100
@@ -0,0 +1,22 @@
+#include <string.h>
+#include <stdlib.h>
+#include <assert.h>
+#include <stdint.h>
+#include <X11/Xlib.h>
+#include <X11/Xutil.h>
+
+void opengl_exec_set_parent_window(Display* _dpy, Window _parent_window)
+{
+
+}
+
+void opengl_process_enable(void)
+{
+
+}
+
+
+void mem_opengl(uint64_t ptr)
+{
+
+}
Index: qemu-0.12.4/target-ppc/dummygl.c
===================================================================
--- /dev/null 1970-01-01 00:00:00.000000000 +0000
+++ qemu-0.12.4/target-ppc/dummygl.c 2010-06-24 08:07:59.070712946 +0100
@@ -0,0 +1,22 @@
+#include <string.h>
+#include <stdlib.h>

View File

@@ -0,0 +1,16 @@
# This is a workaround to the crashes seen on Ubuntu. Setting info to zero
# makes info.info.x11.display zero and avoids the calls to
# opengl_exec_set_parent_window, one of which is crashing.
Index: qemu-0.12.4/sdl.c
===================================================================
--- qemu-0.12.4.orig/sdl.c
+++ qemu-0.12.4/sdl.c
@@ -871,6 +871,7 @@ void sdl_display_init(DisplayState *ds,
vi = SDL_GetVideoInfo();
host_format = *(vi->vfmt);
+ bzero(&info, sizeof(info));
SDL_GetWMInfo(&info);
if (info.subsystem == SDL_SYSWM_X11 && info.info.x11.display)
opengl_exec_set_parent_window(info.info.x11.display,

View File

@@ -0,0 +1,22 @@
Fedora 13 switched the default behaviour of the linker to no longer
indirectly link to required libraries (i.e. dependencies of a library
already linked to). Therefore we need to explicitly pass the depended on
libraries into the linker for building to work on Fedora 13.
More information is available on the Fedora Wiki:
https://fedoraproject.org/wiki/UnderstandingDSOLinkChange
JL - 15/06/10
Index: qemu-0.12.4/Makefile.target
===================================================================
--- qemu-0.12.4.orig/Makefile.target 2010-06-15 11:21:52.000000000 +0100
+++ qemu-0.12.4/Makefile.target 2010-06-15 11:25:27.212852910 +0100
@@ -178,7 +178,7 @@
obj-y += virtio-blk.o virtio-balloon.o virtio-net.o virtio-console.o virtio-pci.o
obj-$(CONFIG_KVM) += kvm.o kvm-all.o
obj-$(CONFIG_ISA_MMIO) += isa_mmio.o
-LIBS+=-lz
+LIBS+=-lz -lX11 -ldl
sound-obj-y =
sound-obj-$(CONFIG_SB16) += sb16.o

View File

@@ -0,0 +1,115 @@
# fix VMware VGA driver depth calculation error, which may cause segmentation fault
#
# ktian1, 06/29/2010
diff --git a/console.h b/console.h
index dfc8ae4..05fbf17 100644
--- a/console.h
+++ b/console.h
@@ -122,6 +122,12 @@ struct DisplayAllocator {
void (*free_displaysurface)(DisplaySurface *surface);
};
+struct DisplayPostCallback {
+ void (*postcall) (void *);
+ void *parm;
+ struct DisplayPostCallback *next;
+};
+
struct DisplayState {
struct DisplaySurface *surface;
void *opaque;
@@ -129,6 +135,7 @@ struct DisplayState {
struct DisplayAllocator* allocator;
struct DisplayChangeListener* listeners;
+ struct DisplayPostCallback* postcalls;
void (*mouse_set)(int x, int y, int on);
void (*cursor_define)(int width, int height, int bpp, int hot_x, int hot_y,
@@ -185,6 +192,12 @@ static inline void register_displaychangelistener(DisplayState *ds, DisplayChang
ds->listeners = dcl;
}
+static inline void register_displaypostcallback(DisplayState *ds, DisplayPostCallback *dpc)
+{
+ dpc->next = ds->postcalls;
+ ds->postcalls = dpc;
+}
+
static inline void dpy_update(DisplayState *s, int x, int y, int w, int h)
{
struct DisplayChangeListener *dcl = s->listeners;
diff --git a/hw/vmware_vga.c b/hw/vmware_vga.c
index 01bb85b..d73cca6 100644
--- a/hw/vmware_vga.c
+++ b/hw/vmware_vga.c
@@ -927,8 +927,9 @@ static void vmsvga_update_display(void *opaque)
}
}
-static void vmsvga_reset(struct vmsvga_state_s *s)
+static void vmsvga_reset(void *parm)
{
+ struct vmsvga_state_s *s = (struct vmsvga_state_s *)parm;
s->index = 0;
s->enable = 0;
s->config = 0;
@@ -1133,6 +1134,8 @@ static const VMStateDescription vmstate_vmware_vga = {
static void vmsvga_init(struct vmsvga_state_s *s, int vga_ram_size)
{
+ DisplayPostCallback *dpc;
+
s->scratch_size = SVGA_SCRATCH_SIZE;
s->scratch = qemu_malloc(s->scratch_size * 4);
@@ -1160,7 +1163,10 @@ static void vmsvga_init(struct vmsvga_state_s *s, int vga_ram_size)
rom_add_vga(VGABIOS_FILENAME);
- vmsvga_reset(s);
+ dpc = qemu_mallocz(sizeof(DisplayPostCallback));
+ dpc->postcall = vmsvga_reset;
+ dpc->parm = s;
+ register_displaypostcallback(s->vga.ds, dpc);
}
static void pci_vmsvga_map_ioport(PCIDevice *pci_dev, int region_num,
diff --git a/qemu-common.h b/qemu-common.h
index a23afbc..19f107a 100644
--- a/qemu-common.h
+++ b/qemu-common.h
@@ -198,6 +198,7 @@ typedef struct DisplayState DisplayState;
typedef struct DisplayChangeListener DisplayChangeListener;
typedef struct DisplaySurface DisplaySurface;
typedef struct DisplayAllocator DisplayAllocator;
+typedef struct DisplayPostCallback DisplayPostCallback;
typedef struct PixelFormat PixelFormat;
typedef struct TextConsole TextConsole;
typedef TextConsole QEMUConsole;
diff --git a/vl.c b/vl.c
index 39182ea..9a3e9fd 100644
--- a/vl.c
+++ b/vl.c
@@ -4863,6 +4863,7 @@ int main(int argc, char **argv, char **envp)
char boot_devices[33] = "cad"; /* default to HD->floppy->CD-ROM */
DisplayState *ds;
DisplayChangeListener *dcl;
+ DisplayPostCallback *dpc;
int cyls, heads, secs, translation;
QemuOpts *hda_opts = NULL, *opts;
int optind;
@@ -6053,6 +6053,13 @@ int main(int argc, char **argv, char **envp)
}
dpy_resize(ds);
+ dpc = ds->postcalls;
+ while (dpc != NULL) {
+ if (dpc->postcall != NULL)
+ dpc->postcall(dpc->parm);
+ dpc = dpc->next;
+ }
+
dcl = ds->listeners;
while (dcl != NULL) {
if (dcl->dpy_refresh != NULL) {

View File

@@ -3,7 +3,7 @@ HOMEPAGE = "http://qemu.org"
LICENSE = "GPL"
DEPENDS = "zlib"
EXTRA_OECONF = "--target-list=arm-linux-user,arm-softmmu,i386-softmmu,x86_64-softmmu,mips-linux-user,mips-softmmu --disable-werror --disable-vnc-tls --extra-ldflags=-ldl"
EXTRA_OECONF = "--target-list=arm-linux-user,arm-softmmu,i386-softmmu,x86_64-softmmu,mips-linux-user,mips-softmmu,ppc-softmmu --disable-werror --disable-vnc-tls"
#EXTRA_OECONF += "--disable-sdl"
inherit autotools
@@ -33,6 +33,6 @@ do_configure() {
SRC_URI_append_virtclass-nativesdk = " file://glflags.patch;patch=1"
DEPENDS_virtclass-nativesdk = "zlib-nativesdk libsdl-nativesdk qemugl-nativesdk"
RDEPENDS_virtclass-nativesdk = "libsdl-nativesdk"
EXTRA_OECONF_virtclass-nativesdk = "--target-list=arm-linux-user,arm-softmmu,i386-softmmu,x86_64-softmmu,mips-linux-user,mips-softmmu --disable-vnc-tls --cross-prefix=${TARGET_PREFIX}"
EXTRA_OECONF_virtclass-nativesdk = "--target-list=arm-linux-user,arm-softmmu,i386-softmmu,x86_64-softmmu,mips-linux-user,mips-softmmu,ppc-softmmu --disable-vnc-tls --cross-prefix=${TARGET_PREFIX}"
BBCLASSEXTEND = "native nativesdk"

View File

@@ -1,17 +1,20 @@
require qemu.inc
PR = "r13"
PR = "r16"
FILESPATH = "${FILE_DIRNAME}/qemu-${PV}"
FILESDIR = "${WORKDIR}"
SRC_URI = "\
http://download.savannah.gnu.org/releases/qemu/qemu-${PV}.tar.gz \
file://workaround_bad_futex_headers.patch;patch=1 \
file://qemu-git-qemugl-host.patch;patch=1 \
file://no-strip.patch;patch=1 \
file://fix-dirent.patch;patch=1 \
file://fix-nogl.patch;patch=1 \
file://qemugl-allow-glxcontext-release.patch;patch=1"
file://workaround_bad_futex_headers.patch \
file://qemu-git-qemugl-host.patch \
file://no-strip.patch \
file://fix-dirent.patch \
file://fix-nogl.patch \
file://qemugl-allow-glxcontext-release.patch \
file://linker-flags.patch \
file://init-info.patch \
file://qemu-vmware-vga-depth.patch"
S = "${WORKDIR}/qemu-${PV}"

View File

@@ -1,19 +1,21 @@
require qemu.inc
PV = "0.12.4"
PR = "r7"
PR = "r9"
FILESPATH = "${FILE_DIRNAME}/qemu-${PV}/:${FILE_DIRNAME}/qemu-git/"
FILESDIR = "${WORKDIR}"
SRC_URI = "\
git://git.sv.gnu.org/qemu.git;protocol=git \
file://workaround_bad_futex_headers.patch;patch=1 \
file://qemu-git-qemugl-host.patch;patch=1 \
file://no-strip.patch;patch=1 \
file://fix-dirent.patch;patch=1 \
file://fix-nogl.patch;patch=1 \
file://qemugl-allow-glxcontext-release.patch;patch=1"
file://workaround_bad_futex_headers.patch \
file://qemu-git-qemugl-host.patch \
file://no-strip.patch \
file://fix-dirent.patch \
file://fix-nogl.patch \
file://qemugl-allow-glxcontext-release.patch \
file://linker-flags.patch \
file://qemu-vmware-vga-depth.patch"
S = "${WORKDIR}/git"

View File

@@ -9,7 +9,7 @@
UCLIBC_BASE ?= "0.9.30.1"
require uclibc.inc
PR = "r0"
PR = "r1"
PROVIDES += "virtual/${TARGET_PREFIX}libc-for-gcc"

View File

@@ -1,5 +1,7 @@
require xorg-font-common.inc
PE = "1"
PR = "${INC_PR}.0"
PR = "${INC_PR}.1"
DEPENDS = "mkfontscale-native font-util-native"
EXTRA_OECONF += "--with-encodingsdir=${datadir}/fonts/X11/encodings"

View File

@@ -53,7 +53,6 @@ Section "Screen"
Identifier "Default Screen"
Device "Graphics Controller"
Monitor "Generic Monitor"
DefaultDepth 24
SubSectionSub "Display"
Modes "640x480"
EndSubSection

View File

@@ -2,7 +2,7 @@ DESCRIPTION = "X.Org X server configuration file"
HOMEPAGE = "http://www.x.org"
SECTION = "x11/base"
LICENSE = "MIT-X"
PR = "r7"
PR = "r8"
SRC_URI = "file://xorg.conf"