From patchwork Wed May 27 17:35:24 2015 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Zoltan Kuscsik X-Patchwork-Id: 49019 Return-Path: X-Original-To: linaro@patches.linaro.org Delivered-To: linaro@patches.linaro.org Received: from mail-la0-f70.google.com (mail-la0-f70.google.com [209.85.215.70]) by ip-10-151-82-157.ec2.internal (Postfix) with ESMTPS id 5B46420BF2 for ; Wed, 27 May 2015 17:36:28 +0000 (UTC) Received: by lalw1 with SMTP id w1sf4733672lal.0 for ; Wed, 27 May 2015 10:36:27 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20130820; h=x-gm-message-state:delivered-to:delivered-to:mime-version:from:date :message-id:to:subject:precedence:reply-to:list-id:list-unsubscribe :list-archive:list-post:list-help:list-subscribe:content-type :content-transfer-encoding:sender:errors-to:x-original-sender :x-original-authentication-results:mailing-list; bh=8py3GJXaOo0hdxCEaGwgBtriotHEw8GoCj2UJmcodwY=; b=QsMVjuAR0yt6BGN6krRNZIjrzsaMvrDd8wYw6yFa6igIp5ridKNpsy7Mew+gTnZZZm nwE74860JPH1wDuqmttbZMc0h3hvZRPZFsjl/EqvL32HX0xOTbU4J1SVP/T5um0fmvjk Vh3B7qqPkAJGN60USc262NrFE5ypK3vlzQCwo82RmQ5Q6prNtEI7LBVml34lQha3uI8G 47dgnmJ4dyaX/zhoknqNgj3qpsJT818f7+Ji0GieLidSbr/igS/e8fyttvw9P5lXc1TK 1IxPVVr02c6hZPFyZibfccydNB3EGn1XSaTXrh2ROaY84+F0rd8QgW0vnb9F++uTr8je RVKg== X-Gm-Message-State: ALoCoQlu71FDjpSUXd2xEAXSiQtySFKZqODuVwPAKLG6H4dqwhB0pfqFrNlGsPP7BHOCDdE1L369 X-Received: by 10.112.162.228 with SMTP id yd4mr33045174lbb.8.1432748187318; Wed, 27 May 2015 10:36:27 -0700 (PDT) X-BeenThere: patchwork-forward@linaro.org Received: by 10.152.36.65 with SMTP id o1ls87586laj.108.gmail; Wed, 27 May 2015 10:36:27 -0700 (PDT) X-Received: by 10.112.72.104 with SMTP id c8mr8031940lbv.77.1432748187076; Wed, 27 May 2015 10:36:27 -0700 (PDT) Received: from mail-lb0-f180.google.com (mail-lb0-f180.google.com. [209.85.217.180]) by mx.google.com with ESMTPS id xi9si14173846lbb.4.2015.05.27.10.36.27 for (version=TLSv1.2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Wed, 27 May 2015 10:36:27 -0700 (PDT) Received-SPF: pass (google.com: domain of patch+caf_=patchwork-forward=linaro.org@linaro.org designates 209.85.217.180 as permitted sender) client-ip=209.85.217.180; Received: by lbbuc2 with SMTP id uc2so12411648lbb.2 for ; Wed, 27 May 2015 10:36:27 -0700 (PDT) X-Received: by 10.152.6.69 with SMTP id y5mr28615203lay.72.1432748186917; Wed, 27 May 2015 10:36:26 -0700 (PDT) X-Forwarded-To: patchwork-forward@linaro.org X-Forwarded-For: patch@linaro.org patchwork-forward@linaro.org Delivered-To: patch@linaro.org Received: by 10.112.108.230 with SMTP id hn6csp534963lbb; Wed, 27 May 2015 10:36:25 -0700 (PDT) X-Received: by 10.70.129.172 with SMTP id nx12mr50801822pdb.157.1432748184791; Wed, 27 May 2015 10:36:24 -0700 (PDT) Received: from mail.openembedded.org (mail.openembedded.org. [140.211.169.62]) by mx.google.com with ESMTP id z16si26843541pbt.136.2015.05.27.10.36.23; Wed, 27 May 2015 10:36:24 -0700 (PDT) Received-SPF: pass (google.com: domain of openembedded-devel-bounces@lists.openembedded.org designates 140.211.169.62 as permitted sender) client-ip=140.211.169.62; Received: from mail.openembedded.org (localhost [127.0.0.1]) by mail.openembedded.org (Postfix) with ESMTP id 96ACF7569D; Wed, 27 May 2015 17:35:49 +0000 (UTC) X-Original-To: openembedded-devel@lists.openembedded.org Delivered-To: openembedded-devel@lists.openembedded.org Received: from mail-ig0-f171.google.com (mail-ig0-f171.google.com [209.85.213.171]) by mail.openembedded.org (Postfix) with ESMTP id 53AC672D64 for ; Wed, 27 May 2015 17:35:43 +0000 (UTC) Received: by igbsb11 with SMTP id sb11so19769370igb.0 for ; Wed, 27 May 2015 10:35:44 -0700 (PDT) X-Received: by 10.107.6.136 with SMTP id f8mr34378803ioi.61.1432748144365; Wed, 27 May 2015 10:35:44 -0700 (PDT) MIME-Version: 1.0 Received: by 10.79.20.5 with HTTP; Wed, 27 May 2015 10:35:24 -0700 (PDT) From: Zoltan Kuscsik Date: Wed, 27 May 2015 19:35:24 +0200 Message-ID: To: openembedded-devel X-Content-Filtered-By: Mailman/MimeDel 2.1.12 Subject: [oe] [meta-browser] [PATCH 2/2] chromium, cef: fetch chromium source from git X-BeenThere: openembedded-devel@lists.openembedded.org X-Mailman-Version: 2.1.12 Precedence: list Reply-To: openembedded-devel@lists.openembedded.org List-Id: List-Unsubscribe: , List-Archive: List-Post: , List-Help: , List-Subscribe: , Sender: openembedded-devel-bounces@lists.openembedded.org Errors-To: openembedded-devel-bounces@lists.openembedded.org X-Removed-Original-Auth: Dkim didn't pass. X-Original-Sender: zoltan.kuscsik@linaro.org X-Original-Authentication-Results: mx.google.com; spf=pass (google.com: domain of patch+caf_=patchwork-forward=linaro.org@linaro.org designates 209.85.217.180 as permitted sender) smtp.mail=patch+caf_=patchwork-forward=linaro.org@linaro.org Mailing-list: list patchwork-forward@linaro.org; contact patchwork-forward+owners@linaro.org X-Google-Group-Id: 836684582541 Updated recipe to fetch Chromium from git. LASTCHANGE file is now created using the proper gclient hook. Change-Id: Ie1790abec002a0dd39c8d0aae3d03f5ebe6f46aa Signed-off-by: Zoltan Kuscsik --- .../cef3/01_get_svn_version_from_LASTCHANGE.patch | 32 ------------ recipes-browser/chromium/cef3_280796.bb | 57 ++++++++++++++++------ 2 files changed, 43 insertions(+), 46 deletions(-) delete mode 100644 recipes-browser/chromium/cef3/01_get_svn_version_from_LASTCHANGE.patch + git:// github.com/kuscsik/ozone-egl.git;protocol=https;destsuffix=${S}/src/ui/ozone/platform/egl;branch=master;name=egl\ + file://cef-simple\ + " -S = "${WORKDIR}/chromium_rev_${PV}" +export CHROMIUM_SRC_GIT_URL="https://chromium.googlesource.com/chromium/src " +export CHROMIUM_SRC_GIT_COMMIT="e800fe7470fa87dc1ca5b148a7c2c41f603fdcbd" -do_fetch[vardeps] += "SRCREV_FORMAT SRCREV_cef SRCREV_egl SRCREV_tools" +S = "${WORKDIR}/chromium_rev_${PV}/" + +B = "${S}/src/" + +do_fetch[vardeps] += "SRCREV_FORMAT SRCREV_cef SRCREV_egl" GYP_ARCH_DEFINES_armv7a = " target_arch=arm arm_float_abi=hard" GYP_ARCH_DEFINES_i586 = " target_arch=ia32" @@ -30,14 +31,41 @@ export GYP_GENERATORS="ninja" export BUILD_TARGET_ARCH="${TARGET_ARCH}" export GYP_DEFINES="${GYP_ARCH_DEFINES} release_extra_cflags='-Wno-error=unused-local-typedefs' sysroot=''" +do_fetch_chromium_source_from_git() { + cd ${S} + export PATH=${WORKDIR}/depot_tools:"$PATH" + + # Note: --deps-file needs to set to .DEPS.git for syncing to old + # chromium versions + gclient config ${CHROMIUM_SRC_GIT_URL} --deps-file=".DEPS.git" + + # Runhooks is disabled. Running the hooks will trigger the + # gyp_chromium command replaced with cef_create_projects.sh by + # cef3. + + gclient sync -f --nohooks --revision src@${CHROMIUM_SRC_GIT_COMMIT} + + # We need the lastchange hook to generate the LASTCHANGE revision info + # file. + + python src/build/util/lastchange.py -o src/build/util/LASTCHANGE +} + +addtask fetch_chromium_source_from_git after do_patch before do_configure + do_configure_append() { export PATH=${WORKDIR}/depot_tools:"$PATH" # End of LD Workaround #----------------------- # Configure cef #------------------------ - cd cef - ./cef_create_projects.sh -I ${BUILD_TARGET_ARCH}_ozone.gypi --depth ../ + cd ${S}/src/cef + + # Fatal linker warnings need to be disalbed to avoid linker issu + # with GCC 4.9: + # http://lists.openembedded.org/pipermail/openembedded-core/2014-August/095947.html + + ./cef_create_projects.sh -I ${BUILD_TARGET_ARCH}_ozone.gypi --depth ../ -Ddisable_fatal_linker_warnings= cd - } @@ -47,5 +75,6 @@ do_qa_configure() { } do_compile() { + cd ${S}/src ninja -C out/${CHROMIUM_BUILD_TYPE} cefsimple } -- 1.9.1 diff --git a/recipes-browser/chromium/cef3/01_get_svn_version_from_LASTCHANGE.patch b/recipes-browser/chromium/cef3/01_get_svn_version_from_LASTCHANGE.patch deleted file mode 100644 index 9b14429..0000000 --- a/recipes-browser/chromium/cef3/01_get_svn_version_from_LASTCHANGE.patch +++ /dev/null @@ -1,32 +0,0 @@ -Fetch the revision from LASTCHANGE file programmatically - -Upstream-Status: Pending - -Signed-off-by: Zoltan Kuscsik -Signed-off-by: Khem Raj - -diff --git a/cef/tools/make_version_header.py b/cef/tools/make_version_header.py -index 84d49f5..395c2cf 100644 ---- a/cef/tools/make_version_header.py -+++ b/cef/tools/make_version_header.py -@@ -64,6 +64,8 @@ def write_svn_header(header, chrome_version, cef_version, cpp_header_dir): - revision = svn.get_revision() - elif git.is_checkout('.'): - revision = git.get_svn_revision() -+ elif os.path.isfile("../build/util/LASTCHANGE"): -+ revision = open("../build/util/LASTCHANGE").read().split("=")[1].strip() - else: - raise Exception('Not a valid checkout') - -diff --git a/cef/tools/revision.py b/cef/tools/revision.py -index 1d94602..eb89e3b 100644 ---- a/cef/tools/revision.py -+++ b/cef/tools/revision.py -@@ -16,6 +16,8 @@ if os.path.exists(os.path.join('.', '.svn')): - sys.stdout.write(svn.get_revision()) - elif os.path.exists(os.path.join('.', '.git')): - sys.stdout.write(git.get_svn_revision()) -+elif os.path.isfile("../build/util/LASTCHANGE"): -+ revision = open("../build/util/LASTCHANGE").read().split("=")[1].strip() - else: - raise Exception('Not a valid checkout') diff --git a/recipes-browser/chromium/cef3_280796.bb b/recipes-browser/chromium/cef3_280796.bb index 9a9efe5..806a4ac 100644 --- a/recipes-browser/chromium/cef3_280796.bb +++ b/recipes-browser/chromium/cef3_280796.bb @@ -7,21 +7,22 @@ RDEPENDS_${PN} += "pango cairo fontconfig pciutils pulseaudio freetype fontconfi SRCREV_tools = "99bcb0e676eb396bcf8e1af3903aa4b578aeeee0" SRCREV_cef = "bbad53dfca9f98dddcb31a590410fece0a4f0234" SRCREV_egl = "a5b81b7617ba6757802b9b5f8c950034d5f961ec" -SRCREV_FORMAT = "cef_egl_tools" +SRCREV_FORMAT = "cef_egl" -SRC_URI = " http://people.linaro.org/~zoltan.kuscsik/chromium-browser/chromium_rev_${PV}.tar.xz \ - git:// github.com/kuscsik/chromiumembedded.git;protocol=https;destsuffix=src/cef;branch=aura;name=cef \ - git:// github.com/kuscsik/ozone-egl.git;protocol=https;destsuffix=src/ui/ozone/platform/egl;branch=master;name=egl \ - git:// chromium.googlesource.com/chromium/tools/depot_tools.git;protocol=https;destsuffix=depot_tools;branch=master;name=tools \ - file://01_get_svn_version_from_LASTCHANGE.patch \ - file://cef-simple \ - " -SRC_URI[md5sum] = "9efbb50283b731042e62b9bd5e312b2f" -SRC_URI[sha256sum] = "f608e97dadf6ea4d885b24fd876896d46840fa39bf743ea2025075aee9fb348d" +SRC_URI = "git:// chromium.googlesource.com/chromium/tools/depot_tools.git;protocol=https;destsuffix=depot_tools;branch=master;name=tools \ + git:// github.com/kuscsik/chromiumembedded.git;protocol=https;destsuffix=${S}/src/cef;branch=aura;name=cef \