From patchwork Fri Jul 11 16:11:01 2014 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Trevor Woerner X-Patchwork-Id: 33504 Return-Path: X-Original-To: linaro@patches.linaro.org Delivered-To: linaro@patches.linaro.org Received: from mail-qa0-f71.google.com (mail-qa0-f71.google.com [209.85.216.71]) by ip-10-151-82-157.ec2.internal (Postfix) with ESMTPS id CD23F20672 for ; Fri, 11 Jul 2014 16:11:06 +0000 (UTC) Received: by mail-qa0-f71.google.com with SMTP id m5sf4146777qaj.10 for ; Fri, 11 Jul 2014 09:11:06 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20130820; h=x-gm-message-state:mime-version:delivered-to:from:to:cc:subject :date:message-id:x-original-sender:x-original-authentication-results :precedence:mailing-list:list-id:list-post:list-help:list-archive :list-unsubscribe; bh=qPeAstq03I1gnbehJbaKujJLgzOEl4cIYJmXj6B0zuc=; b=W28ucGWrMQZOD8+KDMuUvZKjhJyXCE/TPIcG0D7MFsQbr+U8Jfk6VK+/w+at3vyF/l hAPZzAUtW4jm/THCafsjyh3ZvHddsZij2nW7URk0Ntr7GewwjDr3lz4ooIEIXKhFRllh xHT/lKVWEHIaqXK/WNUvRk4vEpv/Rw01X+ZjlEIJ9sjbu1m4N//AdwA5qoz2uFvVo32g bylJymMcUSi1kuKxBGsjjZMV2qb2dVIvMrK4TWHV1qcwZhetpKMLVNdFc+FxYsrCfKUz ClHq+ONwWSX/hMzJ7JCzojgrJGO7+H2+j4F+0/DvNYbFQdJYou3fSSUDVHt9/JfxO6Fg CjIg== X-Gm-Message-State: ALoCoQkwLKiXO7Hv/70DoF1nkT1qNrV9WDZYzjdk6tu7DnUWiSkN2bFbc4LCfyeC14IgBoJI5sLi X-Received: by 10.58.151.201 with SMTP id us9mr25497091veb.23.1405095066576; Fri, 11 Jul 2014 09:11:06 -0700 (PDT) MIME-Version: 1.0 X-BeenThere: patchwork-forward@linaro.org Received: by 10.140.16.148 with SMTP id 20ls426840qgb.78.gmail; Fri, 11 Jul 2014 09:11:06 -0700 (PDT) X-Received: by 10.58.188.199 with SMTP id gc7mr53170440vec.4.1405095066483; Fri, 11 Jul 2014 09:11:06 -0700 (PDT) Received: from mail-vc0-f174.google.com (mail-vc0-f174.google.com [209.85.220.174]) by mx.google.com with ESMTPS id ne10si1957904veb.55.2014.07.11.09.11.06 for (version=TLSv1 cipher=ECDHE-RSA-RC4-SHA bits=128/128); Fri, 11 Jul 2014 09:11:06 -0700 (PDT) Received-SPF: pass (google.com: domain of patch+caf_=patchwork-forward=linaro.org@linaro.org designates 209.85.220.174 as permitted sender) client-ip=209.85.220.174; Received: by mail-vc0-f174.google.com with SMTP id hy4so2477113vcb.33 for ; Fri, 11 Jul 2014 09:11:06 -0700 (PDT) X-Received: by 10.58.112.65 with SMTP id io1mr1848506veb.61.1405095066144; Fri, 11 Jul 2014 09:11:06 -0700 (PDT) X-Forwarded-To: patchwork-forward@linaro.org X-Forwarded-For: patch@linaro.org patchwork-forward@linaro.org Delivered-To: patches@linaro.org Received: by 10.221.37.5 with SMTP id tc5csp47897vcb; Fri, 11 Jul 2014 09:11:05 -0700 (PDT) X-Received: by 10.50.80.45 with SMTP id o13mr5795294igx.7.1405095065590; Fri, 11 Jul 2014 09:11:05 -0700 (PDT) Received: from mail-ig0-f182.google.com (mail-ig0-f182.google.com [209.85.213.182]) by mx.google.com with ESMTPS id k17si4293475igt.38.2014.07.11.09.11.05 for (version=TLSv1 cipher=ECDHE-RSA-RC4-SHA bits=128/128); Fri, 11 Jul 2014 09:11:05 -0700 (PDT) Received-SPF: pass (google.com: domain of trevor.woerner@linaro.org designates 209.85.213.182 as permitted sender) client-ip=209.85.213.182; Received: by mail-ig0-f182.google.com with SMTP id c1so1151876igq.9 for ; Fri, 11 Jul 2014 09:11:05 -0700 (PDT) X-Received: by 10.50.141.170 with SMTP id rp10mr5777493igb.6.1405095065136; Fri, 11 Jul 2014 09:11:05 -0700 (PDT) Received: from openSUSE-i7.site (69-165-220-158.dsl.teksavvy.com. [69.165.220.158]) by mx.google.com with ESMTPSA id aw9sm7142923igc.9.2014.07.11.09.11.03 for (version=TLSv1.2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Fri, 11 Jul 2014 09:11:04 -0700 (PDT) From: Trevor Woerner To: openembedded-core@lists.openembedded.org Cc: patches@linaro.org, Saul Wold , Robert Yang , Koen Kooi , Roy Li Subject: [PATCH] grub_git: bump version, remove patch Date: Fri, 11 Jul 2014 12:11:01 -0400 Message-Id: <1405095061-29714-1-git-send-email-trevor.woerner@linaro.org> X-Mailer: git-send-email 2.0.1.563.g66f467c X-Removed-Original-Auth: Dkim didn't pass. X-Original-Sender: trevor.woerner@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.220.174 as permitted sender) smtp.mail=patch+caf_=patchwork-forward=linaro.org@linaro.org Precedence: list Mailing-list: list patchwork-forward@linaro.org; contact patchwork-forward+owners@linaro.org List-ID: X-Google-Group-Id: 836684582541 List-Post: , List-Help: , List-Archive: List-Unsubscribe: , A previously upstreamed patch has been applied. Bump the version to incorporate this upstream update. Signed-off-by: Trevor Woerner --- .../grub/grub/asciih-fix-build-warning-error.patch | 34 ---------------------- meta/recipes-bsp/grub/grub_git.bb | 3 +- 2 files changed, 1 insertion(+), 36 deletions(-) delete mode 100644 meta/recipes-bsp/grub/grub/asciih-fix-build-warning-error.patch diff --git a/meta/recipes-bsp/grub/grub/asciih-fix-build-warning-error.patch b/meta/recipes-bsp/grub/grub/asciih-fix-build-warning-error.patch deleted file mode 100644 index 48ace56..0000000 --- a/meta/recipes-bsp/grub/grub/asciih-fix-build-warning-error.patch +++ /dev/null @@ -1,34 +0,0 @@ -util/grub-gen-asciih.c: fix build warning->error - -A potential problem is flagged by the compiler and generates a warning. This -warning is promoted to an error via -Werror. This patch fixes the original -issue, avoids the warning, and therefore avoids the build error. - -Upstream-Status: Pending - -Index: git/util/grub-gen-asciih.c -=================================================================== ---- git.orig/util/grub-gen-asciih.c -+++ git/util/grub-gen-asciih.c -@@ -131,6 +131,8 @@ write_font_ascii_bitmap (FILE *file, FT_ - struct grub_glyph_info glyph; - int char_code; - -+ memset (&glyph, 0, sizeof(glyph)); -+ - fprintf (file, "/* THIS CHUNK OF BYTES IS AUTOMATICALLY GENERATED */\n"); - fprintf (file, "unsigned char ascii_bitmaps[] =\n"); - fprintf (file, "{\n"); -@@ -144,6 +146,12 @@ write_font_ascii_bitmap (FILE *file, FT_ - return; - add_glyph (glyph_idx, face, char_code, &glyph); - -+ if (glyph.bitmap == 0) -+ { -+ fprintf (stderr, "grub-gen-asciih: add_glyph not successful"); -+ exit (1); -+ } -+ - if (glyph.width == 8 && glyph.height == 16 - && glyph.x_ofs == 0 && glyph.y_ofs == 0) - { diff --git a/meta/recipes-bsp/grub/grub_git.bb b/meta/recipes-bsp/grub/grub_git.bb index 7f89739..f74bae8 100644 --- a/meta/recipes-bsp/grub/grub_git.bb +++ b/meta/recipes-bsp/grub/grub_git.bb @@ -17,11 +17,10 @@ DEFAULT_PREFERENCE = "-1" DEFAULT_PREFERENCE_arm = "1" PV = "2.00+${SRCPV}" -SRCREV = "4b8b9135f1676924a8458da528d264bbc7bbb301" +SRCREV = "87de66d9d83446ecddb29cfbdf7369102c8e209e" SRC_URI = "git://git.savannah.gnu.org/grub.git \ file://autogen.sh-exclude-pc.patch \ file://grub-2.00-add-oe-kernel.patch \ - file://asciih-fix-build-warning-error.patch \ " S = "${WORKDIR}/git"