From patchwork Thu May 29 04:05:54 2014 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Trevor Woerner X-Patchwork-Id: 31078 Return-Path: X-Original-To: linaro@patches.linaro.org Delivered-To: linaro@patches.linaro.org Received: from mail-yk0-f199.google.com (mail-yk0-f199.google.com [209.85.160.199]) by ip-10-151-82-157.ec2.internal (Postfix) with ESMTPS id 6BB5E201F1 for ; Thu, 29 May 2014 04:06:10 +0000 (UTC) Received: by mail-yk0-f199.google.com with SMTP id 200sf28984236ykr.2 for ; Wed, 28 May 2014 21:06:09 -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=5c/PLpgf0Lkl/OpSNTMYA0i1pBcklKbfRJtumd9NV7Q=; b=gNh12Rb3sXoFgDCB0pxpnyKqrDUW7EyJeLlMcDEic+PaFLHJDlb0k4U+g2Rm9glnYF zG3EWiNa9RR8PmADjWdlStKAbWdxucpSwL0WCCzdYSaORdomrxcULP5ulRWr3sG7DP92 rSjSXaN+igikPLDLPjwEcjNwA3y/A7i66pvwich8QwSggSPKtbBh5ayo1WhSd8oTZOtd 55EXerUHC2TKQhR+CSOVhTvm+wWUMLNiurCVtjnZcE5z3HUXjO/yqmYOXVea2JULhFYS RoRMAf9mbetc5Qp/YUwPpauQtzMVGi2yzhKMkKOLFV27nFvJ4NdPpO8BevMM55+Fa1gj QzVw== X-Gm-Message-State: ALoCoQlm5qgPJj8+ZUBIkGcFczg0M5LC6F+blo1WanZdcnmqjBQ33NDPIw4WiKu4NUA6Xi2Go7vV X-Received: by 10.58.25.99 with SMTP id b3mr2073445veg.28.1401336369927; Wed, 28 May 2014 21:06:09 -0700 (PDT) MIME-Version: 1.0 X-BeenThere: patchwork-forward@linaro.org Received: by 10.140.44.36 with SMTP id f33ls448160qga.19.gmail; Wed, 28 May 2014 21:06:09 -0700 (PDT) X-Received: by 10.58.182.129 with SMTP id ee1mr4359098vec.14.1401336369823; Wed, 28 May 2014 21:06:09 -0700 (PDT) Received: from mail-ve0-f181.google.com (mail-ve0-f181.google.com [209.85.128.181]) by mx.google.com with ESMTPS id ye3si12383456vec.104.2014.05.28.21.06.09 for (version=TLSv1 cipher=ECDHE-RSA-RC4-SHA bits=128/128); Wed, 28 May 2014 21:06:09 -0700 (PDT) Received-SPF: pass (google.com: domain of patch+caf_=patchwork-forward=linaro.org@linaro.org designates 209.85.128.181 as permitted sender) client-ip=209.85.128.181; Received: by mail-ve0-f181.google.com with SMTP id pa12so13679471veb.12 for ; Wed, 28 May 2014 21:06:09 -0700 (PDT) X-Received: by 10.220.12.66 with SMTP id w2mr4099434vcw.15.1401336369691; Wed, 28 May 2014 21:06:09 -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.220.221.72 with SMTP id ib8csp255782vcb; Wed, 28 May 2014 21:06:09 -0700 (PDT) X-Received: by 10.43.114.70 with SMTP id ez6mr4499432icc.26.1401336369128; Wed, 28 May 2014 21:06:09 -0700 (PDT) Received: from mail-ig0-f177.google.com (mail-ig0-f177.google.com [209.85.213.177]) by mx.google.com with ESMTPS id y3si21992988icx.27.2014.05.28.21.06.08 for (version=TLSv1 cipher=ECDHE-RSA-RC4-SHA bits=128/128); Wed, 28 May 2014 21:06:09 -0700 (PDT) Received-SPF: pass (google.com: domain of trevor.woerner@linaro.org designates 209.85.213.177 as permitted sender) client-ip=209.85.213.177; Received: by mail-ig0-f177.google.com with SMTP id l13so3370790iga.16 for ; Wed, 28 May 2014 21:06:08 -0700 (PDT) X-Received: by 10.50.18.80 with SMTP id u16mr6864431igd.30.1401336368794; Wed, 28 May 2014 21:06:08 -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 ql7sm20911956igc.19.2014.05.28.21.06.07 for (version=TLSv1.2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Wed, 28 May 2014 21:06:08 -0700 (PDT) From: Trevor Woerner To: openembedded-core@lists.openembedded.org Cc: patches@linaro.org Subject: [PATCH v2] grub_git: fix build warning->error Date: Thu, 29 May 2014 00:05:54 -0400 Message-Id: <1401336354-19745-1-git-send-email-trevor.woerner@linaro.org> X-Mailer: git-send-email 1.9.0 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.128.181 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: , This patch fixes a build warning which is promoted to an error via -Werror. changes from v1: * put "Upstream-Status" in patch itself, not in OE patch header * fix commit wording Signed-off-by: Trevor Woerner --- .../grub/grub/asciih-fix-build-warning-error.patch | 34 ++++++++++++++++++++++ meta/recipes-bsp/grub/grub_git.bb | 1 + 2 files changed, 35 insertions(+) create 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 new file mode 100644 index 0000000..48ace56 --- /dev/null +++ b/meta/recipes-bsp/grub/grub/asciih-fix-build-warning-error.patch @@ -0,0 +1,34 @@ +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 1b9497c..3edc20a 100644 --- a/meta/recipes-bsp/grub/grub_git.bb +++ b/meta/recipes-bsp/grub/grub_git.bb @@ -22,6 +22,7 @@ SRC_URI = "git://git.savannah.gnu.org/grub.git \ file://40_custom \ file://autogen.sh-exclude-pc.patch \ file://grub-2.00-add-oe-kernel.patch \ + file://asciih-fix-build-warning-error.patch \ " S = "${WORKDIR}/git"