From patchwork Tue Aug 6 06:45:45 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Khem Raj X-Patchwork-Id: 170633 Delivered-To: patch@linaro.org Received: by 2002:a92:512:0:0:0:0:0 with SMTP id q18csp5275926ile; Mon, 5 Aug 2019 23:46:05 -0700 (PDT) X-Google-Smtp-Source: APXvYqwGyep5CWo8o8psyiN4OGbdRgArr1oQiEUqKETqUYJBOBrYiPQIYDWnEzDbWiFatS+21QeE X-Received: by 2002:a17:902:102c:: with SMTP id b41mr1623473pla.204.1565073965549; Mon, 05 Aug 2019 23:46:05 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1565073965; cv=none; d=google.com; s=arc-20160816; b=CaPO6cN08fm4ZA+DQGp1xSvJk5SuIBUVN9sXvFZvGV3nfo/PtMdo5Nv+GCjuwbBHj2 v3Ow7lI8pvoASNE9FGS2tDSRKF48OF+qlhe4MYHTzciF7SCKbYk/8BthfFf+EgiEAAXp XCe37vCRKkxQAIO7aNy9hATnZVRtQnW3rJ5hdbjysk8k7U5NTUiqBlnUdmZV78p9jWma ERaHJmt6maGGFlaYI27hIF5BGnkIWiS9NOTLmOh2yDTFRhWMZiZ90Dek7J9wXaE2oG9F VxwbKCtmm2+NUDpBdcB6TLpphgi05PdAqpVgmpeN6SKYy5KYi5tU40iEfe2fNlYyRI5x wkmw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=errors-to:sender:content-transfer-encoding:list-subscribe:list-help :list-post:list-archive:list-unsubscribe:list-id:precedence:subject :mime-version:message-id:date:to:from:dkim-signature:delivered-to; bh=NlviVnOfu8HFdbRphzDKZRdLbt3AmKw1yJlG87xB24s=; b=tC8U+Is6zIo4H6f6A1r91eKeML2GXBwousfQZqQKP+jDd6hew3afg17J4EgpqwteM6 unc1Fa9kZpRSbGv8+WxqTl1lCASLENW2Tlkzfg5dgUIE9ttgJAUDPC9HoAsy3hUPWasU g0RVSs0MivWbiw0VTICslQwltU+n1uJO0NZndDkm4fx4PZkMj9HAydXoc5H6IOEO/hIc 4ZDWokdevG3L3YP7uGucx4wKJrKtT2OzqyYYG1p6qWYzhb6BZ4RUqyM1GXb/602oOYVs Exe0IzuWCCIUGz5/SgxxPE+8UUVutymS/QRXg7JFuo0KZiOA/9UnxXPErNu0oZ+wAMPW gTyA== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@gmail.com header.s=20161025 header.b=ScXdwS9P; spf=pass (google.com: best guess record for domain of openembedded-core-bounces@lists.openembedded.org designates 140.211.169.62 as permitted sender) smtp.mailfrom=openembedded-core-bounces@lists.openembedded.org; dmarc=fail (p=NONE sp=QUARANTINE dis=NONE) header.from=gmail.com Return-Path: Received: from mail.openembedded.org (mail.openembedded.org. [140.211.169.62]) by mx.google.com with ESMTP id r1si14691393pjp.80.2019.08.05.23.46.05; Mon, 05 Aug 2019 23:46:05 -0700 (PDT) Received-SPF: pass (google.com: best guess record for domain of openembedded-core-bounces@lists.openembedded.org designates 140.211.169.62 as permitted sender) client-ip=140.211.169.62; Authentication-Results: mx.google.com; dkim=neutral (body hash did not verify) header.i=@gmail.com header.s=20161025 header.b=ScXdwS9P; spf=pass (google.com: best guess record for domain of openembedded-core-bounces@lists.openembedded.org designates 140.211.169.62 as permitted sender) smtp.mailfrom=openembedded-core-bounces@lists.openembedded.org; dmarc=fail (p=NONE sp=QUARANTINE dis=NONE) header.from=gmail.com Received: from ec2-34-214-78-129.us-west-2.compute.amazonaws.com (localhost [127.0.0.1]) by mail.openembedded.org (Postfix) with ESMTP id AC55B7F316; Tue, 6 Aug 2019 06:46:02 +0000 (UTC) X-Original-To: openembedded-core@lists.openembedded.org Delivered-To: openembedded-core@lists.openembedded.org Received: from mail-pl1-f177.google.com (mail-pl1-f177.google.com [209.85.214.177]) by mail.openembedded.org (Postfix) with ESMTP id 8B97C7F2F8 for ; Tue, 6 Aug 2019 06:46:01 +0000 (UTC) Received: by mail-pl1-f177.google.com with SMTP id y8so37463832plr.12 for ; Mon, 05 Aug 2019 23:46:02 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id:mime-version :content-transfer-encoding; bh=wd19fIZlwMFVvj3yh236vizLA8ANlaLewEREeJft6R0=; b=ScXdwS9PHMGmfwE1jq5H/kW+KOMmYPdvkNHn2PPdpql78a/NaPuD6UmDVdBMLdnXd6 tPGApgtvxdgQKH5SU5NQIKQngWEHc5OtgNnY4H4jIj55GmScCEu0/O7/InSCzctuU3fQ lMNuohdVtYO5450aDTDUuCGxVZNs0RokHp0rE2Yslb0jffxemK7vC/pUGh53s9/9xUEq R1kXTubxyIksoRdjrTTI1HU5GqMSePHM27kARhXhzjEB7yBwg6N0av6hIfheyV7GAAU/ X4FUfYNlL6VAvJo3UDISixrG+q+1JgxAD8CN+zYW/uKJlKM1bnBtrOXxPQ06+dYYtbY7 C2rQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:mime-version :content-transfer-encoding; bh=wd19fIZlwMFVvj3yh236vizLA8ANlaLewEREeJft6R0=; b=gj5TCqYS6Zo5PGWr1BVWgRw4vdCfI8nv79tnZ8ELq/hdos432mnLkZVeyrTQ6i74kF z9KIA7UBKb9DtxlzIaW+Qd4GeYcD4CAigs1nILcD2SS2G9tI8OQkLQ2v8UEvQ/nnQw/z KW+VY+4IR0ipsYh4hd6qthakyqPDOLcSdfCGVezfIAZJzb0N2oBQIVW+Vl3AiYEFZ497 4pxZRZTxTH2zi9mAASP0/f/PXU1wABY1rb55lckkIPXvZtzqRsDFwHimUjLxKW82sUp2 jk9pg3ZYB+YGA/1BR/Hk2HOrEb73FuwMhVsRNbv0VEdmM9F/LUw/b2q7KA0Y/bkHEAzJ N13Q== X-Gm-Message-State: APjAAAWT5FeQxDViCR0xMUf+SKpsTSod0Y2dZTEss7OjtyhftxgXHE9k JGF1Fm6hLnemUvEJvrX8GZcKbWxOJ8o= X-Received: by 2002:a17:902:8696:: with SMTP id g22mr1578323plo.249.1565073961839; Mon, 05 Aug 2019 23:46:01 -0700 (PDT) Received: from apollo.hsd1.ca.comcast.net (c-73-71-176-3.hsd1.ca.comcast.net. [73.71.176.3]) by smtp.gmail.com with ESMTPSA id x1sm17957104pjo.4.2019.08.05.23.46.01 (version=TLS1_3 cipher=AEAD-AES256-GCM-SHA384 bits=256/256); Mon, 05 Aug 2019 23:46:01 -0700 (PDT) From: Khem Raj To: openembedded-core@lists.openembedded.org Date: Mon, 5 Aug 2019 23:45:45 -0700 Message-Id: <20190806064547.32044-1-raj.khem@gmail.com> X-Mailer: git-send-email 2.22.0 MIME-Version: 1.0 Subject: [OE-core] [PATCH 1/3] virglrender: Fix endianness check on musl 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: , Sender: openembedded-core-bounces@lists.openembedded.org Errors-To: openembedded-core-bounces@lists.openembedded.org Seen to fail on musl/mips, this fixes the check to be linux specific which means it can detect the endianness for musl correctly Signed-off-by: Khem Raj --- ...d-libc-check-to-be-platform-OS-check.patch | 36 +++++++++++++++++++ .../virglrenderer/virglrenderer_0.7.0.bb | 1 + 2 files changed, 37 insertions(+) create mode 100644 meta/recipes-graphics/virglrenderer/virglrenderer/0001-gallium-Expand-libc-check-to-be-platform-OS-check.patch -- 2.22.0 -- _______________________________________________ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-core diff --git a/meta/recipes-graphics/virglrenderer/virglrenderer/0001-gallium-Expand-libc-check-to-be-platform-OS-check.patch b/meta/recipes-graphics/virglrenderer/virglrenderer/0001-gallium-Expand-libc-check-to-be-platform-OS-check.patch new file mode 100644 index 0000000000..a0ac3aefdd --- /dev/null +++ b/meta/recipes-graphics/virglrenderer/virglrenderer/0001-gallium-Expand-libc-check-to-be-platform-OS-check.patch @@ -0,0 +1,36 @@ +From 3d30df8d8ccb919733b5339b2a82474305b83998 Mon Sep 17 00:00:00 2001 +From: Khem Raj +Date: Tue, 6 Aug 2019 01:19:48 +0000 +Subject: [PATCH] gallium: Expand libc check to be platform OS check + +endianness on musl based systems can also be detected in same way as +glibc, therefore check for __linux__ define instead of __GLIBC__ + +Fixes build on musl/mips + +| ../../../../git/src/gallium/include/pipe/p_config.h:171:2: error: #error Unknown Endianness +| #error Unknown Endianness +| ^~~~~ + +Upstream-Status: Pending +Signed-off-by: Khem Raj +--- + src/gallium/include/pipe/p_config.h | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/src/gallium/include/pipe/p_config.h b/src/gallium/include/pipe/p_config.h +index d603681..71cdf49 100644 +--- a/src/gallium/include/pipe/p_config.h ++++ b/src/gallium/include/pipe/p_config.h +@@ -130,7 +130,7 @@ + * Endian detection. + */ + +-#ifdef __GLIBC__ ++#ifdef __linux__ + #include + + #if __BYTE_ORDER == __LITTLE_ENDIAN +-- +2.17.1 + diff --git a/meta/recipes-graphics/virglrenderer/virglrenderer_0.7.0.bb b/meta/recipes-graphics/virglrenderer/virglrenderer_0.7.0.bb index 225a0b8b0c..818d5b6307 100644 --- a/meta/recipes-graphics/virglrenderer/virglrenderer_0.7.0.bb +++ b/meta/recipes-graphics/virglrenderer/virglrenderer_0.7.0.bb @@ -9,6 +9,7 @@ SRCREV = "402c228861c9893f64cffbbcb4cb23044b8c721c" SRC_URI = "git://anongit.freedesktop.org/virglrenderer \ file://0001-vtest-add-missing-includes.patch \ file://0001-Makefile.am-explicitly-link-with-libdrm.patch \ + file://0001-gallium-Expand-libc-check-to-be-platform-OS-check.patch \ " S = "${WORKDIR}/git" From patchwork Tue Aug 6 06:45:46 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Khem Raj X-Patchwork-Id: 170634 Delivered-To: patch@linaro.org Received: by 2002:a92:512:0:0:0:0:0 with SMTP id q18csp5276107ile; Mon, 5 Aug 2019 23:46:13 -0700 (PDT) X-Google-Smtp-Source: APXvYqxAEmOXgCWISHlMrcmf8dKv54DBo5AdL9F0lrs9awKnRUpPKX+7Zk0ZzaHaN16ymQ39R/1J X-Received: by 2002:a17:90a:ba94:: with SMTP id t20mr1636830pjr.8.1565073973765; Mon, 05 Aug 2019 23:46:13 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1565073973; cv=none; d=google.com; s=arc-20160816; b=BAE6CdsoRhtCFDQ3o01rqZBqF/P7I74nC6TNgWnrcT3Xnlec0sNTB5ijuO11Mki1q/ k/qq7kBMXJQl3+cppebpx+G2ALEh+5/lOQxTtlaFMFEQweJdhYt0pc6+OEp2j+LAXCwv Nsie/RkVP1Y3/59Mf/tUf+fOMZaY2XKCiq+APMs7CcPTk6NAwnIwPSWG4K9Lzhinhmql p189yFf4537oZOFJV6z/NPNMKsDBjzVVB1niNu8zXZ4CDczneqOToFfIda6mYJJsSLk2 oFTDA9hFlUhb6Be9YltWDr95pYg1zqOR7EpCy6yCzZf+D2i5gLe+leP41LwZ9kH+7/Zc YwEg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=errors-to:sender:content-transfer-encoding:list-subscribe:list-help :list-post:list-archive:list-unsubscribe:list-id:precedence:subject :mime-version:references:in-reply-to:message-id:date:to:from :dkim-signature:delivered-to; bh=G24gVRSpxqq84v0cTcdthPdWltEiBfbadtM8NwPuvgk=; b=xXMjakZeAMuBhb01+4GT3P2F1LNR/D1vKojLC6BLEzIUyCvPeM/DAr67wy8w6YrNsl DMNFSPvB3TofpCEUL6Uy+zn0tMTzihks/nfiYXxX8P8OvQUg+RYp2jNkuXc0I/mSPca4 /A5DHcjzbMONEu1/f3VoUtkN5LyxBjjbRIbnkVhp9DqpTXh4gxFCgElNuT7INM71tLY0 T89uAuwDb+R+2eVoJ8Z4ZeGaDp9Ma4Oi60mbLY6cZoMXvMr0KR7tkaunkBHWGwQzR0Aw w9+H+QMFrWgCk9BEjwu8qlKS7UH/V357sR1D0dCgmRWahcwbFevdoU2iZx+SGv0qpBTB YO+Q== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@gmail.com header.s=20161025 header.b=A+V5uE5q; spf=pass (google.com: best guess record for domain of openembedded-core-bounces@lists.openembedded.org designates 140.211.169.62 as permitted sender) smtp.mailfrom=openembedded-core-bounces@lists.openembedded.org; dmarc=fail (p=NONE sp=QUARANTINE dis=NONE) header.from=gmail.com Return-Path: Received: from mail.openembedded.org (mail.openembedded.org. [140.211.169.62]) by mx.google.com with ESMTP id s6si43509332plp.229.2019.08.05.23.46.13; Mon, 05 Aug 2019 23:46:13 -0700 (PDT) Received-SPF: pass (google.com: best guess record for domain of openembedded-core-bounces@lists.openembedded.org designates 140.211.169.62 as permitted sender) client-ip=140.211.169.62; Authentication-Results: mx.google.com; dkim=neutral (body hash did not verify) header.i=@gmail.com header.s=20161025 header.b=A+V5uE5q; spf=pass (google.com: best guess record for domain of openembedded-core-bounces@lists.openembedded.org designates 140.211.169.62 as permitted sender) smtp.mailfrom=openembedded-core-bounces@lists.openembedded.org; dmarc=fail (p=NONE sp=QUARANTINE dis=NONE) header.from=gmail.com Received: from ec2-34-214-78-129.us-west-2.compute.amazonaws.com (localhost [127.0.0.1]) by mail.openembedded.org (Postfix) with ESMTP id AC26C7F33E; Tue, 6 Aug 2019 06:46:11 +0000 (UTC) X-Original-To: openembedded-core@lists.openembedded.org Delivered-To: openembedded-core@lists.openembedded.org Received: from mail-pf1-f193.google.com (mail-pf1-f193.google.com [209.85.210.193]) by mail.openembedded.org (Postfix) with ESMTP id 0CBDA7F316 for ; Tue, 6 Aug 2019 06:46:01 +0000 (UTC) Received: by mail-pf1-f193.google.com with SMTP id r1so40940045pfq.12 for ; Mon, 05 Aug 2019 23:46:03 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=Sc2/ksdBuoIblH+L2STAAhISsf7de73F9r0elY3icDc=; b=A+V5uE5qaoKU8cn4QqrteLU4vsj5d10G8KqK+g+UQwQgmvrqMtKl+e6ZjikO4wbv90 gI88jz/cLuQ8BSrEGfQNaeuUpRAq+fPUQ3Jni6R5MCSgiowwAbIWnjFJ7wY/h49rmH/a de0dAehKGG0W7Wn7ulrJc5k47uOhUn5P/yJtqSjYlIHI5tlaTzZkWOb2L5e4hVetr8KU CTaObQkHZudT7JCZU+zl5xPqPy6eoUrDwdDY57k1GVW0Xp7AZ17jW4L3qua7ABQ1c8p7 7Ij4dgu8ziVcyq2GYd4LzmOv1eaJ1KZsXw1u0gVa8F3I+6p/JtSDj3PwllCrMynyP/Ib QUJA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=Sc2/ksdBuoIblH+L2STAAhISsf7de73F9r0elY3icDc=; b=bN0D7T83jl09GrYENPSbHTmL4t9gk8nQ7iIGWpwD3qV8vPMmWbxKnAWfaliZ6C8ct+ kvUyB/uPbWK1PxZFcuAxDAs4RVMCHD3xYqT+pY9ZfSzKSOZLnZUn2en1Ym3x64lw+fE2 +K03LcKp5wklVB1toOVMmReTyKxrr6S/holYnw1eaKBF3rum2JWHZV9Vmz8BsF7KCDHP ymK4kw/CVtqNDT+X9h+o9cxnYmUJl4j599TI8LjFLMujn4RIKeyAX75ZI392tZQQ3lFn 40hNhX3hRZCqiQo7S4g4D2S5QjoR+cniCTQw/xM97Dwv6pHHQ9y6FCMLwq/BEaDCnkwk /yNQ== X-Gm-Message-State: APjAAAUGp/coHHQGwn5JOZbxzAIVy9pa/yBfsbsXewOWL9ORMy6WcR6t X/Edch0xb9Wd4pQmdP07O6XcLpTLeII= X-Received: by 2002:a17:90a:3542:: with SMTP id q60mr2186452pjb.0.1565073962547; Mon, 05 Aug 2019 23:46:02 -0700 (PDT) Received: from apollo.hsd1.ca.comcast.net (c-73-71-176-3.hsd1.ca.comcast.net. [73.71.176.3]) by smtp.gmail.com with ESMTPSA id x1sm17957104pjo.4.2019.08.05.23.46.01 (version=TLS1_3 cipher=AEAD-AES256-GCM-SHA384 bits=256/256); Mon, 05 Aug 2019 23:46:02 -0700 (PDT) From: Khem Raj To: openembedded-core@lists.openembedded.org Date: Mon, 5 Aug 2019 23:45:46 -0700 Message-Id: <20190806064547.32044-2-raj.khem@gmail.com> X-Mailer: git-send-email 2.22.0 In-Reply-To: <20190806064547.32044-1-raj.khem@gmail.com> References: <20190806064547.32044-1-raj.khem@gmail.com> MIME-Version: 1.0 Subject: [OE-core] [PATCH 2/3] syslinux: Override hardcoded toolnames in Makefile 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: , Sender: openembedded-core-bounces@lists.openembedded.org Errors-To: openembedded-core-bounces@lists.openembedded.org makefile assumes native toolnames e.g. ar, as, nm etc. which causes build fails on non-x86 build hosts objcopy: Unable to recognise the format of the input file `libcom32.elf' Signed-off-by: Khem Raj --- .../syslinux/syslinux_6.04-pre2.bb | 19 +++++++++++++++++-- 1 file changed, 17 insertions(+), 2 deletions(-) -- 2.22.0 -- _______________________________________________ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-core diff --git a/meta/recipes-devtools/syslinux/syslinux_6.04-pre2.bb b/meta/recipes-devtools/syslinux/syslinux_6.04-pre2.bb index 67e5d57d48..e9dbefb930 100644 --- a/meta/recipes-devtools/syslinux/syslinux_6.04-pre2.bb +++ b/meta/recipes-devtools/syslinux/syslinux_6.04-pre2.bb @@ -59,11 +59,26 @@ do_compile() { # Rebuild only the installer; keep precompiled bootloaders # as per author's request (doc/distrib.txt) - oe_runmake CC="${CC} ${CFLAGS}" LD="${LD}" LDFLAGS="${LDFLAGS}" firmware="bios" installer + oe_runmake CC="${CC} ${CFLAGS}" \ + LD="${LD}" LDFLAGS="${LDFLAGS}" \ + OBJDUMP="${OBJDUMP}" \ + OBJCOPY="${OBJCOPY}" \ + AR="${AR}" \ + STRIP="${STRIP}" \ + NM="${NM}" \ + RANLIB="${RANLIB}" \ + firmware="bios" installer } do_install() { - oe_runmake CC="${CC} ${CFLAGS}" LD="${LD}" firmware="bios" install INSTALLROOT="${D}" + oe_runmake CC="${CC} ${CFLAGS}" LD="${LD}" \ + OBJDUMP="${OBJDUMP}" \ + OBJCOPY="${OBJCOPY}" \ + AR="${AR}" \ + STRIP="${STRIP}" \ + NM="${NM}" \ + RANLIB="${RANLIB}" \ + firmware="bios" install INSTALLROOT="${D}" install -d ${D}${datadir}/syslinux/ install -m 644 ${S}/bios/core/ldlinux.sys ${D}${datadir}/syslinux/ From patchwork Tue Aug 6 06:45:47 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Khem Raj X-Patchwork-Id: 170635 Delivered-To: patch@linaro.org Received: by 2002:a92:512:0:0:0:0:0 with SMTP id q18csp5276188ile; Mon, 5 Aug 2019 23:46:19 -0700 (PDT) X-Google-Smtp-Source: APXvYqzEpo1/xcagnzsPAvC2BbMRHqf8t6Jh7Wu8tsw/6NbkIMZMAiFW/J3QPbttztVlFMJ8/qO+ X-Received: by 2002:a17:90a:338b:: with SMTP id n11mr1575294pjb.21.1565073979295; Mon, 05 Aug 2019 23:46:19 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1565073979; cv=none; d=google.com; s=arc-20160816; b=XbX5Ijio1TU75xwVrX8JMvIp8Ymx0MB6kLjmbL5NPJ9DVxBl9PLCmPDPUwoEXWLhm7 AmcOv2etI4+MeNn4E/xiXJfCrRm+jTXasCvYq56JkOt3Epb4b6PXk+iQZPWsD0tDlZAX ve90CHZErXkLLFda7T3+pjtYicEjE1PL+G4VAWkuGcME3PxC7QjJLqXkrdcYHX60KXel FsyA5djmlF1g0E5TnDTfXTOvPHKYYIFtxpZQZ1RAMRAMHsWsysKDHscoYf5OefCts0Js 8v/eJPPHcE/kRwjXSHn7DCfn1ulj3xqWbwgXtZ4Rq5sVbE31ly+z54dfJiRsdZ4Zsr5W E23A== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=errors-to:sender:content-transfer-encoding:list-subscribe:list-help :list-post:list-archive:list-unsubscribe:list-id:precedence:subject :mime-version:references:in-reply-to:message-id:date:to:from :dkim-signature:delivered-to; bh=xqleO5KvcH75QsgC6NcyDsKyC8ls9jkYUWvmUgYjhag=; b=KHaSuaTyPOlPRPZeadA4LaoCgVU47XA8ikRnSLUncNw5DdDc078+rnmZy9laGUZNie /lBy1o3x5l53A7UN4P6DrN0PlVmQ/7VU5fKTOHr1n8/ct0zeHQQjHbty0h1iK7gKCVwS XWPB6KJWPQHMLAWtM+x2rOF5m5bQBtaht2HEwZvANuJPGEHO3Um1cPLE1FLdO3xSpENN MpBZRN33A2Gk+Wmo4XxSKeyo5CqIydTMZ/plZi6DqCngH2IKFXH4iC2y9t64mipmSZ8x nYvnODKMym0wpyoTfFhd0jg+3fpySi+EFow0HMht4urtnUx98MkCeeIFunE0KS6cCKYY 1o7w== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@gmail.com header.s=20161025 header.b=LvAX6s0q; spf=pass (google.com: best guess record for domain of openembedded-core-bounces@lists.openembedded.org designates 140.211.169.62 as permitted sender) smtp.mailfrom=openembedded-core-bounces@lists.openembedded.org; dmarc=fail (p=NONE sp=QUARANTINE dis=NONE) header.from=gmail.com Return-Path: Received: from mail.openembedded.org (mail.openembedded.org. [140.211.169.62]) by mx.google.com with ESMTP id v27si47118044pgn.14.2019.08.05.23.46.19; Mon, 05 Aug 2019 23:46:19 -0700 (PDT) Received-SPF: pass (google.com: best guess record for domain of openembedded-core-bounces@lists.openembedded.org designates 140.211.169.62 as permitted sender) client-ip=140.211.169.62; Authentication-Results: mx.google.com; dkim=neutral (body hash did not verify) header.i=@gmail.com header.s=20161025 header.b=LvAX6s0q; spf=pass (google.com: best guess record for domain of openembedded-core-bounces@lists.openembedded.org designates 140.211.169.62 as permitted sender) smtp.mailfrom=openembedded-core-bounces@lists.openembedded.org; dmarc=fail (p=NONE sp=QUARANTINE dis=NONE) header.from=gmail.com Received: from ec2-34-214-78-129.us-west-2.compute.amazonaws.com (localhost [127.0.0.1]) by mail.openembedded.org (Postfix) with ESMTP id 036F37F366; Tue, 6 Aug 2019 06:46:13 +0000 (UTC) X-Original-To: openembedded-core@lists.openembedded.org Delivered-To: openembedded-core@lists.openembedded.org Received: from mail-pf1-f181.google.com (mail-pf1-f181.google.com [209.85.210.181]) by mail.openembedded.org (Postfix) with ESMTP id C23BE7F349 for ; Tue, 6 Aug 2019 06:46:02 +0000 (UTC) Received: by mail-pf1-f181.google.com with SMTP id r1so40940065pfq.12 for ; Mon, 05 Aug 2019 23:46:04 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=QAD13wft68CdLW8qltHSw57qWrwX2MwvVJyqgTTWTls=; b=LvAX6s0qyaZfFJ9m489NHUVz12iENu0Ixj5NCzHHF1VrbDTKZBmaPvnW0VZ9LvZ2w6 CdlJecjJZHZpKrit06UfP8g2cHOD5fCnIMObTzR5b39PV9tYHLVk8kvxaVGaCEM8FaAL TsoXkEPaodkPA/X4n6cLLRF0OdwO5qJldLjLqpMhnTjXgRjbVuKYkKfK/NLJle13t+/g pIl5ZKz1SmBaLqEv4jeu0ovsdUo0yKMP8jKadG2YcGBVPLAtLLb0t0FtOYPbmWuFL8PB UnKYQ2UlzIjViSfAl84VzAne+WtPXiwa0AfHGNXKeTYuwLHPq5oLG99hrnfIPsHWft5V B2fA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=QAD13wft68CdLW8qltHSw57qWrwX2MwvVJyqgTTWTls=; b=c3ycZPgelmTz5P4tndb7/LHmmP7UnHTkYhB7TueffqQTikmhoerAcZZGr47fQZieRu /CdMUtUCicIB5NBfZTCshNI+o0tad/41PeNV+2UteuPd4R8Li+xWnbsea76oI2sY7L0E kT/LPQxdvYf0LNn86f/5HPgJLOTHOw2C0ZkCx3awk7uj1mPbNyhzTXQciMKGZUgV4cu/ OFBb9iHH12h4H0AzM6SBYbC03Q3gtMjHBhneNSxHNehzmMltH1ayzjRq2FM2/bghauBn Eihp9j4Slr32RWjmWNuf//uKOpP0ObFaZ+hRaa777bWtm+gC9/uxLeE8QyY7VdiDZp1y Qdxg== X-Gm-Message-State: APjAAAXDUX3XVyoDKWgneZm4cx7cFuB2kQYcj78s+CqwpUEEmrIvPPf4 jIW3NOrFw83BfgNkyKmpTQ2TbZ2+GfU= X-Received: by 2002:a63:c203:: with SMTP id b3mr1660905pgd.450.1565073963317; Mon, 05 Aug 2019 23:46:03 -0700 (PDT) Received: from apollo.hsd1.ca.comcast.net (c-73-71-176-3.hsd1.ca.comcast.net. [73.71.176.3]) by smtp.gmail.com with ESMTPSA id x1sm17957104pjo.4.2019.08.05.23.46.02 (version=TLS1_3 cipher=AEAD-AES256-GCM-SHA384 bits=256/256); Mon, 05 Aug 2019 23:46:02 -0700 (PDT) From: Khem Raj To: openembedded-core@lists.openembedded.org Date: Mon, 5 Aug 2019 23:45:47 -0700 Message-Id: <20190806064547.32044-3-raj.khem@gmail.com> X-Mailer: git-send-email 2.22.0 In-Reply-To: <20190806064547.32044-1-raj.khem@gmail.com> References: <20190806064547.32044-1-raj.khem@gmail.com> MIME-Version: 1.0 Subject: [OE-core] [PATCH 3/3] systemd-boot: Add option to specify cross objcopy and use it 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: , Sender: openembedded-core-bounces@lists.openembedded.org Errors-To: openembedded-core-bounces@lists.openembedded.org This is needed when build host != x86 box Signed-off-by: Khem Raj --- meta/recipes-core/systemd/systemd-boot_242.bb | 2 + ...fi-objcopy-option-to-specify-objcopy.patch | 48 +++++++++++++++++++ 2 files changed, 50 insertions(+) create mode 100644 meta/recipes-core/systemd/systemd/0001-meson-Add-Defi-objcopy-option-to-specify-objcopy.patch -- 2.22.0 -- _______________________________________________ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-core diff --git a/meta/recipes-core/systemd/systemd-boot_242.bb b/meta/recipes-core/systemd/systemd-boot_242.bb index 56e68a3d49..56a25c35ba 100644 --- a/meta/recipes-core/systemd/systemd-boot_242.bb +++ b/meta/recipes-core/systemd/systemd-boot_242.bb @@ -8,6 +8,7 @@ DEPENDS = "intltool-native libcap util-linux gnu-efi gperf-native" SRC_URI += "file://0001-Revert-meson-use-an-array-option-for-efi-cc.patch \ file://0001-Revert-meson-print-EFI-CC-configuration-nicely.patch \ file://0001-Fix-to-run-efi_cc-and-efi_ld-correctly-when-cross-co.patch \ + file://0001-meson-Add-Defi-objcopy-option-to-specify-objcopy.patch \ " inherit meson pkgconfig gettext @@ -22,6 +23,7 @@ EXTRA_OEMESON += "-Defi=true \ -Dman=false \ -Defi-cc='${EFI_CC}' \ -Defi-ld='${LD}' \ + -Defi-objcopy='${OBJCOPY}' \ " # install to the image as boot*.efi if its the EFI_PROVIDER, diff --git a/meta/recipes-core/systemd/systemd/0001-meson-Add-Defi-objcopy-option-to-specify-objcopy.patch b/meta/recipes-core/systemd/systemd/0001-meson-Add-Defi-objcopy-option-to-specify-objcopy.patch new file mode 100644 index 0000000000..7d764b4115 --- /dev/null +++ b/meta/recipes-core/systemd/systemd/0001-meson-Add-Defi-objcopy-option-to-specify-objcopy.patch @@ -0,0 +1,48 @@ +From 3f37ad5e083dcad51c21c1050b2829b70d240b52 Mon Sep 17 00:00:00 2001 +From: Khem Raj +Date: Tue, 6 Aug 2019 03:10:20 +0000 +Subject: [PATCH] meson: Add -Defi-objcopy option to specify objcopy + +This helps in cross compiling for x86 target on a aarch64 host e.g. +Fixes +TOPDIR/build/tmp/hosttools/objcopy:src/boot/efi/systemd_boot.so: Invalid bfd target + +Upstream-Status: Pending +Signed-off-by: Khem Raj +--- + meson_options.txt | 2 ++ + src/boot/efi/meson.build | 5 ++++- + 2 files changed, 6 insertions(+), 1 deletion(-) + +diff --git a/meson_options.txt b/meson_options.txt +index d4ec37dda2..dc1c96e112 100644 +--- a/meson_options.txt ++++ b/meson_options.txt +@@ -296,6 +296,8 @@ option('efi-cc', type : 'array', + description : 'the compiler to use for EFI modules') + option('efi-ld', type : 'string', + description : 'the linker to use for EFI modules') ++option('efi-objcopy', type : 'string', ++ description : 'the objcopy to use for EFI') + option('efi-libdir', type : 'string', + description : 'path to the EFI lib directory') + option('efi-ldsdir', type : 'string', +diff --git a/src/boot/efi/meson.build b/src/boot/efi/meson.build +index 0ae3191635..5a7137bc84 100644 +--- a/src/boot/efi/meson.build ++++ b/src/boot/efi/meson.build +@@ -88,7 +88,10 @@ if have_gnu_efi + output : 'efi_config.h', + configuration : efi_conf) + +- objcopy = find_program('objcopy') ++ objcopy = get_option('efi-objcopy') ++ if objcopy == '' ++ objcopy = find_program('objcopy', required: true) ++ endif + + efi_ldsdir = get_option('efi-ldsdir') + arch_lds = 'elf_@0@_efi.lds'.format(gnu_efi_path_arch) +-- +2.17.1 +