From: Gary Thomas <gary@mlbassoc.com>
To: openembedded-devel@lists.openembedded.org
Subject: Re: [meta-browser][RFT][PATCH] chromium: Upgrade 29 -> 35
Date: Wed, 12 Mar 2014 18:42:45 -0600 [thread overview]
Message-ID: <5320FF05.1050007@mlbassoc.com> (raw)
In-Reply-To: <CAMKF1somffWCEn-AKfdEbd+ddvTghW8PD2Es5N+ysmyNjXSNwQ@mail.gmail.com>
On 2014-03-12 18:02, Khem Raj wrote:
> On Wed, Mar 12, 2014 at 4:57 PM, Gary Thomas <gary@mlbassoc.com> wrote:
>> On 2014-03-11 22:46, Khem Raj wrote:
>>> Removed already applied patches
>>>
>>> License year changed thats why there is change in checksum
>>>
>>> -// Copyright 2014 The Chromium Authors. All rights reserved.
>>> +// Copyright (c) 2013 The Chromium Authors. All rights reserved.
>>>
>>> we see
>>>
>>> rpm/bin/debugedit: canonicalization unexpectedly shrank by one character
>>>
>>> so we add PACKAGE_DEBUG_SPLIT_STYLE = "debug-without-src"
>>>
>>> Signed-off-by: Khem Raj <raj.khem@gmail.com>
>>> ---
>>> ..._focus_tracker_notify_deprecated_since_ATK_2_9_4.patch | 0
>>> .../{chromium-29.0.1518.2 => chromium}/armv6/include.gypi | 0
>>> .../armv6/oe-defaults.gypi | 0
>>> .../armv7a/include.gypi | 0
>>> .../armv7a/oe-defaults.gypi | 0
>>> .../{chromium-29.0.1518.2 => chromium}/google-chrome | 0
>>> .../google-chrome.desktop | 0
>>> .../{chromium-29.0.1518.2 => chromium}/i586/include.gypi | 0
>>> .../i586/oe-defaults.gypi | 0
>>> .../secitem_array.patch | 0
>>> .../uninitialised-warning.patch | 6 +++---
>>> .../{chromium-29.0.1518.2 => chromium}/unistd-2.patch | 0
>>> .../x86-64/include.gypi | 0
>>> .../x86-64/oe-defaults.gypi | 0
>>> .../{chromium_29.0.1518.2.bb => chromium_35.0.1883.0.bb} | 15 ++++++++-------
>>> 15 files changed, 11 insertions(+), 10 deletions(-)
>>> rename recipes-browser/chromium/{chromium-29.0.1518.2 => chromium}/001-atk_focus_tracker_notify_deprecated_since_ATK_2_9_4.patch (100%)
>>> rename recipes-browser/chromium/{chromium-29.0.1518.2 => chromium}/armv6/include.gypi (100%)
>>> rename recipes-browser/chromium/{chromium-29.0.1518.2 => chromium}/armv6/oe-defaults.gypi (100%)
>>> rename recipes-browser/chromium/{chromium-29.0.1518.2 => chromium}/armv7a/include.gypi (100%)
>>> rename recipes-browser/chromium/{chromium-29.0.1518.2 => chromium}/armv7a/oe-defaults.gypi (100%)
>>> rename recipes-browser/chromium/{chromium-29.0.1518.2 => chromium}/google-chrome (100%)
>>> rename recipes-browser/chromium/{chromium-29.0.1518.2 => chromium}/google-chrome.desktop (100%)
>>> rename recipes-browser/chromium/{chromium-29.0.1518.2 => chromium}/i586/include.gypi (100%)
>>> rename recipes-browser/chromium/{chromium-29.0.1518.2 => chromium}/i586/oe-defaults.gypi (100%)
>>> rename recipes-browser/chromium/{chromium-29.0.1518.2 => chromium}/secitem_array.patch (100%)
>>> rename recipes-browser/chromium/{chromium-29.0.1518.2 => chromium}/uninitialised-warning.patch (96%)
>>> rename recipes-browser/chromium/{chromium-29.0.1518.2 => chromium}/unistd-2.patch (100%)
>>> rename recipes-browser/chromium/{chromium-29.0.1518.2 => chromium}/x86-64/include.gypi (100%)
>>> rename recipes-browser/chromium/{chromium-29.0.1518.2 => chromium}/x86-64/oe-defaults.gypi (100%)
>>> rename recipes-browser/chromium/{chromium_29.0.1518.2.bb => chromium_35.0.1883.0.bb} (84%)
>>>
>>> diff --git a/recipes-browser/chromium/chromium-29.0.1518.2/001-atk_focus_tracker_notify_deprecated_since_ATK_2_9_4.patch b/recipes-browser/chromium/chromium/001-atk_focus_tracker_notify_deprecated_since_ATK_2_9_4.patch
>>> similarity index 100%
>>> rename from recipes-browser/chromium/chromium-29.0.1518.2/001-atk_focus_tracker_notify_deprecated_since_ATK_2_9_4.patch
>>> rename to recipes-browser/chromium/chromium/001-atk_focus_tracker_notify_deprecated_since_ATK_2_9_4.patch
>>> diff --git a/recipes-browser/chromium/chromium-29.0.1518.2/armv6/include.gypi b/recipes-browser/chromium/chromium/armv6/include.gypi
>>> similarity index 100%
>>> rename from recipes-browser/chromium/chromium-29.0.1518.2/armv6/include.gypi
>>> rename to recipes-browser/chromium/chromium/armv6/include.gypi
>>> diff --git a/recipes-browser/chromium/chromium-29.0.1518.2/armv6/oe-defaults.gypi b/recipes-browser/chromium/chromium/armv6/oe-defaults.gypi
>>> similarity index 100%
>>> rename from recipes-browser/chromium/chromium-29.0.1518.2/armv6/oe-defaults.gypi
>>> rename to recipes-browser/chromium/chromium/armv6/oe-defaults.gypi
>>> diff --git a/recipes-browser/chromium/chromium-29.0.1518.2/armv7a/include.gypi b/recipes-browser/chromium/chromium/armv7a/include.gypi
>>> similarity index 100%
>>> rename from recipes-browser/chromium/chromium-29.0.1518.2/armv7a/include.gypi
>>> rename to recipes-browser/chromium/chromium/armv7a/include.gypi
>>> diff --git a/recipes-browser/chromium/chromium-29.0.1518.2/armv7a/oe-defaults.gypi b/recipes-browser/chromium/chromium/armv7a/oe-defaults.gypi
>>> similarity index 100%
>>> rename from recipes-browser/chromium/chromium-29.0.1518.2/armv7a/oe-defaults.gypi
>>> rename to recipes-browser/chromium/chromium/armv7a/oe-defaults.gypi
>>> diff --git a/recipes-browser/chromium/chromium-29.0.1518.2/google-chrome b/recipes-browser/chromium/chromium/google-chrome
>>> similarity index 100%
>>> rename from recipes-browser/chromium/chromium-29.0.1518.2/google-chrome
>>> rename to recipes-browser/chromium/chromium/google-chrome
>>> diff --git a/recipes-browser/chromium/chromium-29.0.1518.2/google-chrome.desktop b/recipes-browser/chromium/chromium/google-chrome.desktop
>>> similarity index 100%
>>> rename from recipes-browser/chromium/chromium-29.0.1518.2/google-chrome.desktop
>>> rename to recipes-browser/chromium/chromium/google-chrome.desktop
>>> diff --git a/recipes-browser/chromium/chromium-29.0.1518.2/i586/include.gypi b/recipes-browser/chromium/chromium/i586/include.gypi
>>> similarity index 100%
>>> rename from recipes-browser/chromium/chromium-29.0.1518.2/i586/include.gypi
>>> rename to recipes-browser/chromium/chromium/i586/include.gypi
>>> diff --git a/recipes-browser/chromium/chromium-29.0.1518.2/i586/oe-defaults.gypi b/recipes-browser/chromium/chromium/i586/oe-defaults.gypi
>>> similarity index 100%
>>> rename from recipes-browser/chromium/chromium-29.0.1518.2/i586/oe-defaults.gypi
>>> rename to recipes-browser/chromium/chromium/i586/oe-defaults.gypi
>>> diff --git a/recipes-browser/chromium/chromium-29.0.1518.2/secitem_array.patch b/recipes-browser/chromium/chromium/secitem_array.patch
>>> similarity index 100%
>>> rename from recipes-browser/chromium/chromium-29.0.1518.2/secitem_array.patch
>>> rename to recipes-browser/chromium/chromium/secitem_array.patch
>>> diff --git a/recipes-browser/chromium/chromium-29.0.1518.2/uninitialised-warning.patch b/recipes-browser/chromium/chromium/uninitialised-warning.patch
>>> similarity index 96%
>>> rename from recipes-browser/chromium/chromium-29.0.1518.2/uninitialised-warning.patch
>>> rename to recipes-browser/chromium/chromium/uninitialised-warning.patch
>>> index fac12bb..afdd784 100644
>>> --- a/recipes-browser/chromium/chromium-29.0.1518.2/uninitialised-warning.patch
>>> +++ b/recipes-browser/chromium/chromium/uninitialised-warning.patch
>>> @@ -30,10 +30,10 @@ Make gcc 4.8 happy. It complains about uninitialized symbols
>>> Signed-off-by: Khem Raj <raj.khem@gmail.com>
>>>
>>> Upstream-Status: Unknown
>>> -Index: chromium-29.0.1518.2/webkit/glue/webclipboard_impl.cc
>>> +Index: chromium-29.0.1518.2/content/renderer/webclipboard_impl.cc
>>> ===================================================================
>>> ---- chromium-29.0.1518.2.orig/webkit/glue/webclipboard_impl.cc
>>> -+++ chromium-29.0.1518.2/webkit/glue/webclipboard_impl.cc
>>> +--- chromium-29.0.1518.2.orig/content/renderer/webclipboard_impl.cc
>>> ++++ chromium-29.0.1518.2/content/renderer/webclipboard_impl.cc
>>> @@ -73,7 +73,7 @@ uint64 WebClipboardImpl::getSequenceNumb
>>> }
>>>
>>> diff --git a/recipes-browser/chromium/chromium-29.0.1518.2/unistd-2.patch b/recipes-browser/chromium/chromium/unistd-2.patch
>>> similarity index 100%
>>> rename from recipes-browser/chromium/chromium-29.0.1518.2/unistd-2.patch
>>> rename to recipes-browser/chromium/chromium/unistd-2.patch
>>> diff --git a/recipes-browser/chromium/chromium-29.0.1518.2/x86-64/include.gypi b/recipes-browser/chromium/chromium/x86-64/include.gypi
>>> similarity index 100%
>>> rename from recipes-browser/chromium/chromium-29.0.1518.2/x86-64/include.gypi
>>> rename to recipes-browser/chromium/chromium/x86-64/include.gypi
>>> diff --git a/recipes-browser/chromium/chromium-29.0.1518.2/x86-64/oe-defaults.gypi b/recipes-browser/chromium/chromium/x86-64/oe-defaults.gypi
>>> similarity index 100%
>>> rename from recipes-browser/chromium/chromium-29.0.1518.2/x86-64/oe-defaults.gypi
>>> rename to recipes-browser/chromium/chromium/x86-64/oe-defaults.gypi
>>> diff --git a/recipes-browser/chromium/chromium_29.0.1518.2.bb b/recipes-browser/chromium/chromium_35.0.1883.0.bb
>>> similarity index 84%
>>> rename from recipes-browser/chromium/chromium_29.0.1518.2.bb
>>> rename to recipes-browser/chromium/chromium_35.0.1883.0.bb
>>> index 1c62f1e..6a03d6b 100644
>>> --- a/recipes-browser/chromium/chromium_29.0.1518.2.bb
>>> +++ b/recipes-browser/chromium/chromium_35.0.1883.0.bb
>>> @@ -1,6 +1,6 @@
>>> DESCRIPTION = "Chromium browser"
>>> LICENSE = "BSD"
>>> -LIC_FILES_CHKSUM = "file://LICENSE;md5=d2d164565cc10f298390174d9cb6d18d"
>>> +LIC_FILES_CHKSUM = "file://LICENSE;md5=537e0b52077bf0a616d0a0c8a79bc9d5"
>>> DEPENDS = "xz-native pciutils pulseaudio xextproto cairo nss gtk+ zlib-native libav libxi libgnome-keyring libxss cups ninja-native gconf"
>>> SRC_URI = "\
>>> http://gsdview.appspot.com/chromium-browser-official/${P}.tar.xz \
>>> @@ -9,12 +9,9 @@ SRC_URI = "\
>>> file://unistd-2.patch \
>>> file://google-chrome \
>>> file://google-chrome.desktop \
>>> - file://uninitialised-warning.patch \
>>> - file://001-atk_focus_tracker_notify_deprecated_since_ATK_2_9_4.patch \
>>> - file://secitem_array.patch;striplevel=2 \
>>> "
>>> -SRC_URI[md5sum] = "2480c3fd109ef000575629acb8a906ca"
>>> -SRC_URI[sha256sum] = "7f08624f7d9bd120de0043da7ee09985ae6b6990d22d8c1b1f7c66fd4ed681a1"
>>> +SRC_URI[md5sum] = "c0659bc3c6b540e106e043fd27f54358"
>>> +SRC_URI[sha256sum] = "666d5948c6508072f9f5d6acff82290fa5939e1da1b94b042a1e05daf3357b61"
>>>
>>> # include.gypi exists only for armv6 and armv7a and there isn't something like COMPATIBLE_ARCH afaik
>>> COMPATIBLE_MACHINE = "(-)"
>>> @@ -60,8 +57,9 @@ do_install() {
>>>
>>> install -d ${D}${bindir}/chrome/
>>> install -m 0755 ${S}/out/Release/chrome ${D}${bindir}/chrome/chrome
>>> - install -m 0644 ${S}/out/Release/chrome.pak ${D}${bindir}/chrome/
>>> install -m 0644 ${S}/out/Release/resources.pak ${D}${bindir}/chrome/
>>> + install -m 0644 ${S}/out/Release/content_resources.pak ${D}${bindir}/chrome/
>>> + install -m 0644 ${S}/out/Release/keyboard_resources.pak ${D}${bindir}/chrome/
>>> install -m 0644 ${S}/out/Release/chrome_100_percent.pak ${D}${bindir}/chrome/
>>> install -m 0644 ${S}/out/Release/product_logo_48.png ${D}${bindir}/chrome/
>>> install -m 0755 ${S}/out/Release/libffmpegsumo.so ${D}${bindir}/chrome/
>>> @@ -72,3 +70,6 @@ do_install() {
>>>
>>> FILES_${PN} = "${bindir}/chrome/ ${bindir}/google-chrome ${datadir}/applications"
>>> FILES_${PN}-dbg = "${bindir}/chrome/.debug/"
>>> +
>>> +PACKAGE_DEBUG_SPLIT_STYLE = "debug-without-src"
>>> +
>>>
>>
>> I'm trying to build this on a RAM-challenged machine and it keeps
>> blowing up in the linker by running out of memory. My machine has
>> only 3GB (plus 5GB swap) and was easily able to build the previous
>> version. I've tried both the standard linker and ld-is-gold.
>>
>> Is there any way around this?
>>
>
> is it a 32bit machine ? Mine has 8G it worked out to be ok for me.
Yes, the failing machine is 32bit. 'ulimit -m' shows unlimited, so my
3G of RAM + 5G of swap _should_ be the same.
My 64bit + 6GB machine is still building.
>> n.b. I'm trying it on a beefier machine to see if that helps, but I'm
>> really concerned about passing this on to my customers...
--
------------------------------------------------------------
Gary Thomas | Consulting for the
MLB Associates | Embedded world
------------------------------------------------------------
next prev parent reply other threads:[~2014-03-13 0:42 UTC|newest]
Thread overview: 12+ messages / expand[flat|nested] mbox.gz Atom feed top
2014-03-12 4:46 [meta-browser][RFT][PATCH] chromium: Upgrade 29 -> 35 Khem Raj
2014-03-12 23:57 ` Gary Thomas
2014-03-13 0:02 ` Khem Raj
2014-03-13 0:42 ` Gary Thomas [this message]
2014-03-13 1:08 ` Martin Jansa
2014-03-13 11:14 ` Gary Thomas
2014-03-13 1:21 ` Khem Raj
2014-03-13 11:12 ` Gary Thomas
2014-03-14 16:57 ` Gary Thomas
2014-03-14 16:59 ` Khem Raj
2014-03-14 20:52 ` Otavio Salvador
2014-03-14 20:57 ` Gary Thomas
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=5320FF05.1050007@mlbassoc.com \
--to=gary@mlbassoc.com \
--cc=openembedded-devel@lists.openembedded.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.