From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from ni.com (skprod2.natinst.com [130.164.80.23]) by mail.openembedded.org (Postfix) with ESMTP id 58F0871998 for ; Wed, 4 Jan 2017 18:37:04 +0000 (UTC) Received: from us-aus-exhub2.ni.corp.natinst.com (us-aus-exhub2.ni.corp.natinst.com [130.164.68.32]) by us-aus-skprod2.natinst.com (8.15.0.59/8.15.0.59) with ESMTPS id v04Ib3x0006921 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-SHA384 bits=256 verify=NOT) for ; Wed, 4 Jan 2017 12:37:04 -0600 Received: from us-aus-exch7.ni.corp.natinst.com (130.164.68.17) by us-aus-exhub2.ni.corp.natinst.com (130.164.68.32) with Microsoft SMTP Server (TLS) id 15.0.1156.6; Wed, 4 Jan 2017 12:37:02 -0600 Received: from us-aus-exhub1.ni.corp.natinst.com (130.164.68.41) by us-aus-exch7.ni.corp.natinst.com (130.164.68.17) with Microsoft SMTP Server (TLS) id 15.0.1156.6; Wed, 4 Jan 2017 12:37:03 -0600 Received: from adi-pc-linux.natinst.com (130.164.49.7) by us-aus-exhub1.ni.corp.natinst.com (130.164.68.41) with Microsoft SMTP Server id 15.0.1156.6 via Frontend Transport; Wed, 4 Jan 2017 12:37:02 -0600 From: Ioan-Adrian Ratiu To: Date: Wed, 4 Jan 2017 20:34:58 +0200 Message-ID: <20170104183458.2518-1-adrian.ratiu@ni.com> X-Mailer: git-send-email 2.11.0 MIME-Version: 1.0 X-Proofpoint-Virus-Version: vendor=fsecure engine=2.50.10432:, , definitions=2017-01-04_15:, , signatures=0 X-Proofpoint-Spam-Details: rule=notspam policy=default score=0 spamscore=0 suspectscore=6 malwarescore=0 phishscore=0 adultscore=0 bulkscore=0 classifier=spam adjust=0 reason=mlx scancount=1 engine=8.0.1-1612050000 definitions=main-1701040280 Cc: ken.sharp@ni.com Subject: [PATCH] wic/isoimage-isohybrid: check for grub-mkimage X-BeenThere: openembedded-core@lists.openembedded.org X-Mailman-Version: 2.1.12 Precedence: list List-Id: Patches and discussions about the oe-core layer List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 04 Jan 2017 18:37:06 -0000 Content-Type: text/plain The isohybrid plugin uses grub-mkimage but doesn't make sure it gets built. Add a check to avoid the following error: Error: A native program grub-mkimage required to build the image was not found (see details above). Wic failed to find a recipe to build native grub-mkimage. Please file a bug against wic. Signed-off-by: Ioan-Adrian Ratiu --- scripts/lib/wic/plugins/source/isoimage-isohybrid.py | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/scripts/lib/wic/plugins/source/isoimage-isohybrid.py b/scripts/lib/wic/plugins/source/isoimage-isohybrid.py index 3858fd439b..9c408d046f 100644 --- a/scripts/lib/wic/plugins/source/isoimage-isohybrid.py +++ b/scripts/lib/wic/plugins/source/isoimage-isohybrid.py @@ -242,6 +242,11 @@ class IsoImagePlugin(SourcePlugin): msger.info("Building mtools-native...\n") exec_cmd("bitbake mtools-native") + # Make sure grub-mkconfig is available in native sysroot + if not os.path.isfile("%s/usr/bin/grub-mkimage" % native_sysroot): + msger.info("Building grub-native...\n") + exec_cmd("bitbake grub-native") + @classmethod def do_configure_partition(cls, part, source_params, creator, cr_workdir, oe_builddir, bootimg_dir, kernel_dir, -- 2.11.0