From patchwork Tue Aug 22 19:20:07 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Adrian Freihofer X-Patchwork-Id: 29273 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from aws-us-west-2-korg-lkml-1.web.codeaurora.org (localhost.localdomain [127.0.0.1]) by smtp.lore.kernel.org (Postfix) with ESMTP id 0A85DEE49B7 for ; Tue, 22 Aug 2023 19:23:46 +0000 (UTC) Received: from mail-ej1-f45.google.com (mail-ej1-f45.google.com [209.85.218.45]) by mx.groups.io with SMTP id smtpd.web11.5308.1692732217508595769 for ; Tue, 22 Aug 2023 12:23:37 -0700 Authentication-Results: mx.groups.io; dkim=pass header.i=@gmail.com header.s=20221208 header.b=Aqv9/rDJ; spf=pass (domain: gmail.com, ip: 209.85.218.45, mailfrom: adrian.freihofer@gmail.com) Received: by mail-ej1-f45.google.com with SMTP id a640c23a62f3a-991c786369cso646456066b.1 for ; Tue, 22 Aug 2023 12:23:37 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20221208; t=1692732216; x=1693337016; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=LJ2noxyUAermR9/zqZ9nBjZLZgXQzgpUT8BF3Db1Hes=; b=Aqv9/rDJI++yvr8lkjhf6l1ZDHQE1mQMB3FCLoIwP/Rq52d+lIMMTEFtRkhv7yUzdv ZTkXtOTBZmVu5yoAxoeljK17yM8jhgh+RjuXek89Bbf6V2Vof0u+TxaryZZJEfXRYVyj ccPdSxab1lffeonMsR7XX35MBmz2/cJlKwwXHg3+eF29b8fiD2QcePAx3YnUciyVuY4h bOUCoQkh4XqS7BVQ/Uh1bB9zJJAfxMExPzAYGB9Rdzx0GTnHhEhKn+YUX/H1wszSQhi4 8dgnE/6qcdDvKMGHBevBuPu3j6oAZW18Ij84cjrxaAEeggKDQ/RNs0PCl8uRrGvxqp6o XYPQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20221208; t=1692732216; x=1693337016; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=LJ2noxyUAermR9/zqZ9nBjZLZgXQzgpUT8BF3Db1Hes=; b=c4BarWNIoZtjEJ7s+VSuxPDI83KDnRHTf4adNV4ZmuiZbBJAM0/1BX8HQmvOz+96La t5sEEncAqulxUzqAHx/yPP/0oalpu+6FyneAFMDVVhmaWMQWZskpkhSvo9y3SwKwMF/W /wlG2ixB/b0+cuC78eNo1i7gqGOLQGYUAW1/3dou2rOVnu9rzeb2jrr5El7qcEIgZuMF MziUl403Iz8H4yjU29eUkLCel1cVcujbjhRFUc5ue4/WJ3FzW13ssEeyMa0G3BNr1fJb wHsjLQ4/oTmYIq6eDnghiTwguhHZB1UUipW28YfaB9/80FUVyEIfQoGN6C56fosoGFs8 ivfA== X-Gm-Message-State: AOJu0YzwMWEVBMV2YUHSn9rBCSmkTFQc5qPiloW/HXMos4vpK6r+zgAx SXhbz/R4gZPyL8bXarSCjsy2iFaizVE= X-Google-Smtp-Source: AGHT+IFOjPCPJLvQj79P2E78EMA0tNvjRy8oTCk6+1/9XIEHuYUiC7N5DYEl19DqYCj2IHyyg9jl6Q== X-Received: by 2002:a17:906:2099:b0:99b:64d0:f6c8 with SMTP id 25-20020a170906209900b0099b64d0f6c8mr9492541ejq.50.1692732215512; Tue, 22 Aug 2023 12:23:35 -0700 (PDT) Received: from t14s-af.fritz.box ([2a02:169:59a6:0:dcf2:2f65:9442:83f]) by smtp.gmail.com with ESMTPSA id g24-20020a1709063b1800b0098f99048053sm8744041ejf.148.2023.08.22.12.23.34 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 22 Aug 2023 12:23:35 -0700 (PDT) From: Adrian Freihofer X-Google-Original-From: Adrian Freihofer To: openembedded-core@lists.openembedded.org Cc: Adrian Freihofer Subject: [PATCH v2 01/13] vscode: add minimal configuration Date: Tue, 22 Aug 2023 21:20:07 +0200 Message-ID: <20230822192300.3235896-2-adrian.freihofer@siemens.com> X-Mailer: git-send-email 2.41.0 In-Reply-To: <20230822192300.3235896-1-adrian.freihofer@siemens.com> References: <20230822192300.3235896-1-adrian.freihofer@siemens.com> MIME-Version: 1.0 List-Id: X-Webhook-Received: from li982-79.members.linode.com [45.33.32.79] by aws-us-west-2-korg-lkml-1.web.codeaurora.org with HTTPS for ; Tue, 22 Aug 2023 19:23:46 -0000 X-Groupsio-URL: https://lists.openembedded.org/g/openembedded-core/message/186524 It is essential to configure VSCode indexer plugins to ignore the build folder of bitbake. Otherwise, the indexer plugins run with 100% CPU load until an OOM exception occurs. In practice, this makes VSCode more or less unusable for working with Yocto until a file like the one added by this commit is deployed before VSCode starts. From the user's point of view, it is not obvious why the system runs at 100% CPU load and eventually crashes. It is even more misleading that VSCode starts the indexers immediately, but does not stop or reconfigure them when the ignore list is updated. In practice, this means that every time the ignore list is changed, VSCode immediately starts indexing the build folder until the OOM exception stops it. Depending on the system's OOM handler, the entire build machine may crash. Particularly annoying is the Python plugin that ignores the general ignore list and requires an extra ignore section. Signed-off-by: Adrian Freihofer --- .gitignore | 2 ++ .vscode/settings.json | 29 +++++++++++++++++++++++++++++ 2 files changed, 31 insertions(+) create mode 100644 .vscode/settings.json diff --git a/.gitignore b/.gitignore index 8f48d452dab..f6ce090b5fc 100644 --- a/.gitignore +++ b/.gitignore @@ -36,3 +36,5 @@ _toaster_clones/ downloads/ sstate-cache/ toaster.sqlite +.vscode/ +vscode-bitbake-build/ diff --git a/.vscode/settings.json b/.vscode/settings.json new file mode 100644 index 00000000000..4c941d47444 --- /dev/null +++ b/.vscode/settings.json @@ -0,0 +1,29 @@ +{ + "files.watcherExclude": { + "**/.git/**": true, + "**/cache/**": true, + "**/tmp*/**": true, + "**/downloads/**": true, + "**/sstate-cache/**": true, + "**/vscode-bitbake-build/**": true, + "**/workspace/sources/**": true + }, + "files.exclude": { + "**/.git/**": true, + "**/cache/**": true, + "**/tmp*/**": true, + "**/downloads/**": true, + "**/sstate-cache/**": true, + "**/vscode-bitbake-build/**": true, + "**/workspace/sources/**": true + }, + "python.analysis.exclude": [ + "**/.git/**", + "**/cache/**", + "**/tmp*/**", + "**/downloads/**", + "**/sstate-cache/**", + "**/vscode-bitbake-build/**", + "**/workspace/sources/**" + ] +} From patchwork Tue Aug 22 19:20:08 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Adrian Freihofer X-Patchwork-Id: 29274 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from aws-us-west-2-korg-lkml-1.web.codeaurora.org (localhost.localdomain [127.0.0.1]) by smtp.lore.kernel.org (Postfix) with ESMTP id 0A569EE49B5 for ; Tue, 22 Aug 2023 19:23:46 +0000 (UTC) Received: from mail-ed1-f45.google.com (mail-ed1-f45.google.com [209.85.208.45]) by mx.groups.io with SMTP id smtpd.web10.5232.1692732218730238926 for ; Tue, 22 Aug 2023 12:23:39 -0700 Authentication-Results: mx.groups.io; dkim=pass header.i=@gmail.com header.s=20221208 header.b=qeRGDyUU; spf=pass (domain: gmail.com, ip: 209.85.208.45, mailfrom: adrian.freihofer@gmail.com) Received: by mail-ed1-f45.google.com with SMTP id 4fb4d7f45d1cf-52a06f5f556so3454984a12.2 for ; Tue, 22 Aug 2023 12:23:38 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20221208; t=1692732216; x=1693337016; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=XmUX6U4agbW3t1fGqkeP7lfXrBnRaDzuSONNIii4H+Q=; b=qeRGDyUUqb056HJ59+Pt6tXD1kOxIs/ukraOVUvBVndNqwfnRztzLtTw6H/+45sOZM yymQtB+ZvsBFOz9BqWA8z6alaD3axDTkhmWlscGGuoW6ngFEKTLVVMlX8K5kFqzGOrpi BCw1rh8PvRJtbuBSaTsD4nDmu7NmMvhHIe+W0b+/vT8M0lXGueYC833VFIwL++N75oNr vBZpidCz1J3ljeztycbsSRKY/MLFXp5ocrXTLCHV3D3EqWGK6Un54KDY6WvwFzr9WdcP ZSpMHsKDa1f8MyGD6imKEeXrmoWAsyjCoQ/d3xxW2u1HBtkxUI0d+cpJj6J3D67VLG2q 8lBQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20221208; t=1692732216; x=1693337016; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=XmUX6U4agbW3t1fGqkeP7lfXrBnRaDzuSONNIii4H+Q=; b=XYzs41jpshxuYyZhYzoIwE3mUgtKLdKDS8aKlLiPXLIN9CAL10Sy9e590MAciEEtrl 5NVUx72rE8bd25U6+qN/gM4Sdkp+d0j9zLR3BrZy827z1xrItHLBju9dsL8QPshS3nXl r46nG4mvuGoTSdJw4d+TgxvUlHP6ra/KHQt8kT0teru11xnyBat7o6gO34L8axvfE5xq sLLtD/pNb/wLMIyvfOp/z7LarjNaFmBLvicAzxBnpQ7s89sQv3IgCFiJmGkPW0g30vrM IiWgZ1IWyDmdU2Mpue/1QZ0uSIr2XLJEgCshP9htVF5Y2svCR5jyj5k9BnMVzHowgvIo a2rQ== X-Gm-Message-State: AOJu0Ywto0emU321QfHtbQPqM+8tg1wG0tnwSvefvgv2f8XQlSW75od+ +9TOZWtK1aq13g/dyCrbMGwPf+Bh5WU= X-Google-Smtp-Source: AGHT+IEsgHZZ4Hbw4tBHQP81jw0WF6NewsprCtwqXsv2cEW9zOjxleFj32qd4w+ciZhgvicG112mlg== X-Received: by 2002:a17:906:8477:b0:991:c566:979 with SMTP id hx23-20020a170906847700b00991c5660979mr8649657ejc.36.1692732216477; Tue, 22 Aug 2023 12:23:36 -0700 (PDT) Received: from t14s-af.fritz.box ([2a02:169:59a6:0:dcf2:2f65:9442:83f]) by smtp.gmail.com with ESMTPSA id g24-20020a1709063b1800b0098f99048053sm8744041ejf.148.2023.08.22.12.23.35 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 22 Aug 2023 12:23:36 -0700 (PDT) From: Adrian Freihofer X-Google-Original-From: Adrian Freihofer To: openembedded-core@lists.openembedded.org Cc: Adrian Freihofer Subject: [PATCH v2 02/13] cmake.bbclass: refactor cmake args Date: Tue, 22 Aug 2023 21:20:08 +0200 Message-ID: <20230822192300.3235896-3-adrian.freihofer@siemens.com> X-Mailer: git-send-email 2.41.0 In-Reply-To: <20230822192300.3235896-1-adrian.freihofer@siemens.com> References: <20230822192300.3235896-1-adrian.freihofer@siemens.com> MIME-Version: 1.0 List-Id: X-Webhook-Received: from li982-79.members.linode.com [45.33.32.79] by aws-us-west-2-korg-lkml-1.web.codeaurora.org with HTTPS for ; Tue, 22 Aug 2023 19:23:46 -0000 X-Groupsio-URL: https://lists.openembedded.org/g/openembedded-core/message/186525 Make the details of the cmake configure arguments available to d.getVar(). This allows to share them with devtool via tinfoil. Signed-off-by: Adrian Freihofer --- meta/classes-recipe/cmake.bbclass | 43 +++++++++++++++++-------------- 1 file changed, 24 insertions(+), 19 deletions(-) diff --git a/meta/classes-recipe/cmake.bbclass b/meta/classes-recipe/cmake.bbclass index 0dda104a695..7c40df4cdbf 100644 --- a/meta/classes-recipe/cmake.bbclass +++ b/meta/classes-recipe/cmake.bbclass @@ -158,6 +158,29 @@ CONFIGURE_FILES = "CMakeLists.txt" do_configure[cleandirs] = "${@d.getVar('B') if d.getVar('S') != d.getVar('B') else ''}" +OECMAKE_ARGS = "\ + -DCMAKE_INSTALL_PREFIX:PATH=${prefix} \ + -DCMAKE_INSTALL_BINDIR:PATH=${@os.path.relpath(d.getVar('bindir'), d.getVar('prefix') + '/')} \ + -DCMAKE_INSTALL_SBINDIR:PATH=${@os.path.relpath(d.getVar('sbindir'), d.getVar('prefix') + '/')} \ + -DCMAKE_INSTALL_LIBEXECDIR:PATH=${@os.path.relpath(d.getVar('libexecdir'), d.getVar('prefix') + '/')} \ + -DCMAKE_INSTALL_SYSCONFDIR:PATH=${sysconfdir} \ + -DCMAKE_INSTALL_SHAREDSTATEDIR:PATH=${@os.path.relpath(d.getVar('sharedstatedir'), d. getVar('prefix') + '/')} \ + -DCMAKE_INSTALL_LOCALSTATEDIR:PATH=${localstatedir} \ + -DCMAKE_INSTALL_LIBDIR:PATH=${@os.path.relpath(d.getVar('libdir'), d.getVar('prefix') + '/')} \ + -DCMAKE_INSTALL_INCLUDEDIR:PATH=${@os.path.relpath(d.getVar('includedir'), d.getVar('prefix') + '/')} \ + -DCMAKE_INSTALL_DATAROOTDIR:PATH=${@os.path.relpath(d.getVar('datadir'), d.getVar('prefix') + '/')} \ + -DPYTHON_EXECUTABLE:PATH=${PYTHON} \ + -DPython_EXECUTABLE:PATH=${PYTHON} \ + -DPython3_EXECUTABLE:PATH=${PYTHON} \ + -DLIB_SUFFIX=${@d.getVar('baselib').replace('lib', '')} \ + -DCMAKE_INSTALL_SO_NO_EXE=0 \ + -DCMAKE_TOOLCHAIN_FILE:FILEPATH=${WORKDIR}/toolchain.cmake \ + -DCMAKE_NO_SYSTEM_FROM_IMPORTED=1 \ + -DCMAKE_EXPORT_NO_PACKAGE_REGISTRY=ON \ + -DFETCHCONTENT_FULLY_DISCONNECTED=ON \ + -DCMAKE_EXPORT_COMPILE_COMMANDS:BOOL=ON \ +" + cmake_do_configure() { if [ "${OECMAKE_BUILDPATH}" ]; then bbnote "cmake.bbclass no longer uses OECMAKE_BUILDPATH. The default behaviour is now out-of-tree builds with B=WORKDIR/build." @@ -178,25 +201,7 @@ cmake_do_configure() { ${OECMAKE_GENERATOR_ARGS} \ $oecmake_sitefile \ ${OECMAKE_SOURCEPATH} \ - -DCMAKE_INSTALL_PREFIX:PATH=${prefix} \ - -DCMAKE_INSTALL_BINDIR:PATH=${@os.path.relpath(d.getVar('bindir'), d.getVar('prefix') + '/')} \ - -DCMAKE_INSTALL_SBINDIR:PATH=${@os.path.relpath(d.getVar('sbindir'), d.getVar('prefix') + '/')} \ - -DCMAKE_INSTALL_LIBEXECDIR:PATH=${@os.path.relpath(d.getVar('libexecdir'), d.getVar('prefix') + '/')} \ - -DCMAKE_INSTALL_SYSCONFDIR:PATH=${sysconfdir} \ - -DCMAKE_INSTALL_SHAREDSTATEDIR:PATH=${@os.path.relpath(d.getVar('sharedstatedir'), d. getVar('prefix') + '/')} \ - -DCMAKE_INSTALL_LOCALSTATEDIR:PATH=${localstatedir} \ - -DCMAKE_INSTALL_LIBDIR:PATH=${@os.path.relpath(d.getVar('libdir'), d.getVar('prefix') + '/')} \ - -DCMAKE_INSTALL_INCLUDEDIR:PATH=${@os.path.relpath(d.getVar('includedir'), d.getVar('prefix') + '/')} \ - -DCMAKE_INSTALL_DATAROOTDIR:PATH=${@os.path.relpath(d.getVar('datadir'), d.getVar('prefix') + '/')} \ - -DPYTHON_EXECUTABLE:PATH=${PYTHON} \ - -DPython_EXECUTABLE:PATH=${PYTHON} \ - -DPython3_EXECUTABLE:PATH=${PYTHON} \ - -DLIB_SUFFIX=${@d.getVar('baselib').replace('lib', '')} \ - -DCMAKE_INSTALL_SO_NO_EXE=0 \ - -DCMAKE_TOOLCHAIN_FILE=${WORKDIR}/toolchain.cmake \ - -DCMAKE_NO_SYSTEM_FROM_IMPORTED=1 \ - -DCMAKE_EXPORT_NO_PACKAGE_REGISTRY=ON \ - -DFETCHCONTENT_FULLY_DISCONNECTED=ON \ + ${OECMAKE_ARGS} \ ${EXTRA_OECMAKE} \ -Wno-dev } From patchwork Tue Aug 22 19:20:09 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Adrian Freihofer X-Patchwork-Id: 29272 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from aws-us-west-2-korg-lkml-1.web.codeaurora.org (localhost.localdomain [127.0.0.1]) by smtp.lore.kernel.org (Postfix) with ESMTP id F0BFEEE49B4 for ; Tue, 22 Aug 2023 19:23:45 +0000 (UTC) Received: from mail-ej1-f54.google.com (mail-ej1-f54.google.com [209.85.218.54]) by mx.groups.io with SMTP id smtpd.web10.5233.1692732219261034422 for ; Tue, 22 Aug 2023 12:23:39 -0700 Authentication-Results: mx.groups.io; dkim=pass header.i=@gmail.com header.s=20221208 header.b=Ssxy4KAS; spf=pass (domain: gmail.com, ip: 209.85.218.54, mailfrom: adrian.freihofer@gmail.com) Received: by mail-ej1-f54.google.com with SMTP id a640c23a62f3a-991c786369cso646458866b.1 for ; Tue, 22 Aug 2023 12:23:39 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20221208; t=1692732217; x=1693337017; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=yi4WNTZvdI78aiIZIn+4I6MOZzcT6449uApeCStXHmA=; b=Ssxy4KASBa/NlKhwPIecVTgjD6nyh8p6ZCr3oXQ3VWTPXmWbez5XL/dxEV9d5TPqMp Cn0s8zFXcZ1lFP9XiVuVgpRLSN92IBEbkR5eZXgf7O3xqu3I8vf/gPrMIt7dYSeUYeJA BwGn8Af2kdrrdXRCOlQ7+8UUnN9ClYieiGcpiK4G1XiPYppZLAYE+5tU3hSP8iz+Cdtg 1GSyr8STwWAjKEWTyLiVURwNfKyrzkCJW5axUD+Y9E13bDq+YFeqzYmconAkdNcE/L9I vP6Aygkspipo/a6etW2px2xoioVLsp3fmfjxw0uue2dJK3sEz63x06cw+TQowz+UBmD2 cqHA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20221208; t=1692732217; x=1693337017; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=yi4WNTZvdI78aiIZIn+4I6MOZzcT6449uApeCStXHmA=; b=D6Oey2y06TlK+VOLPwsc9NJopdYBZNZ5l6OHmCRW8ozd32ReI50cdYhhsc0rMxpC7y tUOpRT3L7LPNSnbtlWA4yLECu5B2zjqDGvpDCpyvaDmOL+MF5neOtWwDSB7uBaFs2XA2 K/dvBlwQyhfKKLOhQmsdf5AnZbP8gpA+HnpaePY3aa2PDx/cDEIh1vWo19kx+EAPKG2q TE+NzC6SoL3zwk9Bdi4eaBXYCIVS53I+RMWhROSFBvcO6/8xmSCqweYWVYH2viaFZZpw +90WNys03RX4ZwePVQ1kYq46THZYyuLY5Ouh3VdkCTxQS9+k0sNgLDXgkLUXF/og4J74 SVBw== X-Gm-Message-State: AOJu0YyFzfHWFBITN4Kl3h/nXkt5m2bO9UE7t18wE43wPqHkOQinq56f lTdaxELEPjoOpwP3S7R/lH0Z+ZffE10= X-Google-Smtp-Source: AGHT+IGP3GcFFi3+JSLZWkTPdZItnbf4YXiU62nbBZyDD9L00DboqiFyAil5cvM3DqEcQwcB/t+UTQ== X-Received: by 2002:a17:906:2099:b0:99b:64d0:f6c8 with SMTP id 25-20020a170906209900b0099b64d0f6c8mr9492594ejq.50.1692732217538; Tue, 22 Aug 2023 12:23:37 -0700 (PDT) Received: from t14s-af.fritz.box ([2a02:169:59a6:0:dcf2:2f65:9442:83f]) by smtp.gmail.com with ESMTPSA id g24-20020a1709063b1800b0098f99048053sm8744041ejf.148.2023.08.22.12.23.36 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 22 Aug 2023 12:23:37 -0700 (PDT) From: Adrian Freihofer X-Google-Original-From: Adrian Freihofer To: openembedded-core@lists.openembedded.org Cc: Adrian Freihofer Subject: [PATCH v2 03/13] cmake.bbclass: cleanup spaces and tabs Date: Tue, 22 Aug 2023 21:20:09 +0200 Message-ID: <20230822192300.3235896-4-adrian.freihofer@siemens.com> X-Mailer: git-send-email 2.41.0 In-Reply-To: <20230822192300.3235896-1-adrian.freihofer@siemens.com> References: <20230822192300.3235896-1-adrian.freihofer@siemens.com> MIME-Version: 1.0 List-Id: X-Webhook-Received: from li982-79.members.linode.com [45.33.32.79] by aws-us-west-2-korg-lkml-1.web.codeaurora.org with HTTPS for ; Tue, 22 Aug 2023 19:23:45 -0000 X-Groupsio-URL: https://lists.openembedded.org/g/openembedded-core/message/186526 Signed-off-by: Adrian Freihofer --- meta/classes-recipe/cmake.bbclass | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/meta/classes-recipe/cmake.bbclass b/meta/classes-recipe/cmake.bbclass index 7c40df4cdbf..c63b0a80b18 100644 --- a/meta/classes-recipe/cmake.bbclass +++ b/meta/classes-recipe/cmake.bbclass @@ -90,12 +90,14 @@ def map_host_arch_to_uname_arch(host_arch): return "ppc64" return host_arch + cmake_do_generate_toolchain_file() { if [ "${BUILD_SYS}" = "${HOST_SYS}" ]; then cmake_crosscompiling="set( CMAKE_CROSSCOMPILING FALSE )" - else - cmake_sysroot="set( CMAKE_SYSROOT \"${RECIPE_SYSROOT}\" )" + else + cmake_sysroot="set( CMAKE_SYSROOT \"${RECIPE_SYSROOT}\" )" fi + cat > ${WORKDIR}/toolchain.cmake < X-Patchwork-Id: 29270 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from aws-us-west-2-korg-lkml-1.web.codeaurora.org (localhost.localdomain [127.0.0.1]) by smtp.lore.kernel.org (Postfix) with ESMTP id EFFCDEE49B2 for ; Tue, 22 Aug 2023 19:23:45 +0000 (UTC) Received: from mail-lj1-f178.google.com (mail-lj1-f178.google.com [209.85.208.178]) by mx.groups.io with SMTP id smtpd.web10.5235.1692732220908345092 for ; Tue, 22 Aug 2023 12:23:41 -0700 Authentication-Results: mx.groups.io; dkim=pass header.i=@gmail.com header.s=20221208 header.b=iHpimXJZ; spf=pass (domain: gmail.com, ip: 209.85.208.178, mailfrom: adrian.freihofer@gmail.com) Received: by mail-lj1-f178.google.com with SMTP id 38308e7fff4ca-2bbac8ec902so75741671fa.1 for ; Tue, 22 Aug 2023 12:23:40 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20221208; t=1692732219; x=1693337019; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=EpKqPHwYxKAzegLAS3aWmgTgfZUPe4SjRDBu36GJbTs=; b=iHpimXJZuLZGksF8qcmAO9ZWaeqOPQC+u35ieT3vwFSx0/da6R5/7z3yHbYI+m/8/v pxxVEexTki37mjMeMgTZHESjSGFl3K97OTgwvV7tFHyokJqbccGHW8m4g1sOBoRj/Lk5 +c1tjSUvXROLUaYXg0SDDqwgAlqkQwewn+HR3qqhrnnV363fRGq7wXR+E/KwyaODyBMZ IYPw2R0HurPOAYw0nd4mIQW7PjsBT2HlkYD+FEypOliGRogZimPsI8PLeRtiJfQUmpOH n82Hg/itBRRV8VbK7V9KdtGgWNa2VG35b+toT7J0gFGxhd1E1AnSLEl/utrXUiSMWDvv qSUQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20221208; t=1692732219; x=1693337019; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=EpKqPHwYxKAzegLAS3aWmgTgfZUPe4SjRDBu36GJbTs=; b=L8uZf2WC8zSUYITyT9ufwg3oJyxSY28lSElqNsjy5FL9vrn6r3/cC23K+C7OyLwWPS VKkACX/uMsNT4wXhmcL4x+cmHVUo2SOnQoPAlWizMJWM7Isc7tWe73csdNQRR0DbnLlu v8BN51n6rtCAE5Tub0q26kDXvXmvNpTQqJ2jFoXe9vzt0LFo+vAJBAKeSAgP8Z4AZBb4 HA4Iy1ikKAWxDmaxYCC9l95BXV2WYu9v+yHl/JEjeKmxjROQyx/Zdq6gTDkzfWj2ncAy mSr3JzWIoqGUHTZWvqNMOyX22vBy62ckgJ6OqLFcAEGdNg3spiDMeLoqFWhtTwZu7Nft WxjQ== X-Gm-Message-State: AOJu0Yy0loFsz7BOi/r+W17uWNJlXjF3rpjurwHmAVPvLurmdcFAtDID ZrlIYGklIlFIV9zLnj+sVRHBriQpq2M= X-Google-Smtp-Source: AGHT+IGI9umM2n4fiivQTZqDQlVllxzwvVoOmelJXSA70QriQh+vE3eax5tJ12YbRQ3nmoBSNmXrEA== X-Received: by 2002:a2e:6e0c:0:b0:2b6:eb5a:6504 with SMTP id j12-20020a2e6e0c000000b002b6eb5a6504mr7945252ljc.18.1692732218463; Tue, 22 Aug 2023 12:23:38 -0700 (PDT) Received: from t14s-af.fritz.box ([2a02:169:59a6:0:dcf2:2f65:9442:83f]) by smtp.gmail.com with ESMTPSA id g24-20020a1709063b1800b0098f99048053sm8744041ejf.148.2023.08.22.12.23.37 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 22 Aug 2023 12:23:38 -0700 (PDT) From: Adrian Freihofer X-Google-Original-From: Adrian Freihofer To: openembedded-core@lists.openembedded.org Cc: Adrian Freihofer Subject: [PATCH v2 04/13] cmake.bbclass: support qemu Date: Tue, 22 Aug 2023 21:20:10 +0200 Message-ID: <20230822192300.3235896-5-adrian.freihofer@siemens.com> X-Mailer: git-send-email 2.41.0 In-Reply-To: <20230822192300.3235896-1-adrian.freihofer@siemens.com> References: <20230822192300.3235896-1-adrian.freihofer@siemens.com> MIME-Version: 1.0 List-Id: X-Webhook-Received: from li982-79.members.linode.com [45.33.32.79] by aws-us-west-2-korg-lkml-1.web.codeaurora.org with HTTPS for ; Tue, 22 Aug 2023 19:23:45 -0000 X-Groupsio-URL: https://lists.openembedded.org/g/openembedded-core/message/186527 Define the CMAKE_CROSSCOMPILING_EMULATOR variable similar to what the meson bbclass does. This allows for example to execute cross compilied unit tests on the build machine. CMAKE_CROSSCOMPILING_EMULATOR is a semi colon separated list of paramters which could directly handle the -L and the -E parameters. Creating a wrapper script is not absolutely mandatory. But anyway lets do it similar to what the meson.bbclass does and also disable pseudo. Signed-off-by: Adrian Freihofer --- meta/classes-recipe/cmake.bbclass | 21 +++++++++++++++++++++ 1 file changed, 21 insertions(+) diff --git a/meta/classes-recipe/cmake.bbclass b/meta/classes-recipe/cmake.bbclass index c63b0a80b18..944b0d8fefd 100644 --- a/meta/classes-recipe/cmake.bbclass +++ b/meta/classes-recipe/cmake.bbclass @@ -4,6 +4,13 @@ # SPDX-License-Identifier: MIT # +inherit qemu + +EXEWRAPPER_ENABLED:class-native = "False" +EXEWRAPPER_ENABLED:class-nativesdk = "False" +EXEWRAPPER_ENABLED ?= "${@bb.utils.contains('MACHINE_FEATURES', 'qemu-usermode', 'True', 'False', d)}" +DEPENDS:append = "${@' qemu-native' if d.getVar('EXEWRAPPER_ENABLED') == 'True' else ''}" + # Path to the CMake file to process. OECMAKE_SOURCEPATH ??= "${S}" @@ -156,6 +163,20 @@ EOF addtask generate_toolchain_file after do_patch before do_configure +cmake_do_generate_toolchain_file:append:class-target() { + if [ "${EXEWRAPPER_ENABLED}" = "True" ]; then + # Write out a qemu wrapper that will be used as exe_wrapper so that camake + # can run target helper binaries through that. This also allows to execute ctest. + qemu_binary="${@qemu_wrapper_cmdline(d, '${STAGING_DIR_HOST}', ['${STAGING_DIR_HOST}/${libdir}','${STAGING_DIR_HOST}/${base_libdir}'])}" + echo "#!/bin/sh" > "${WORKDIR}/cmake-qemuwrapper" + echo "$qemu_binary \"\$@\"" >> "${WORKDIR}/cmake-qemuwrapper" + chmod +x "${WORKDIR}/cmake-qemuwrapper" + echo "set( CMAKE_CROSSCOMPILING_EMULATOR ${WORKDIR}/cmake-qemuwrapper)" \ + >> ${WORKDIR}/toolchain.cmake + fi +} + + CONFIGURE_FILES = "CMakeLists.txt" do_configure[cleandirs] = "${@d.getVar('B') if d.getVar('S') != d.getVar('B') else ''}" From patchwork Tue Aug 22 19:20:11 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Adrian Freihofer X-Patchwork-Id: 29275 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from aws-us-west-2-korg-lkml-1.web.codeaurora.org (localhost.localdomain [127.0.0.1]) by smtp.lore.kernel.org (Postfix) with ESMTP id F29B5EE49B3 for ; Tue, 22 Aug 2023 19:23:45 +0000 (UTC) Received: from mail-ej1-f41.google.com (mail-ej1-f41.google.com [209.85.218.41]) by mx.groups.io with SMTP id smtpd.web10.5236.1692732223509665488 for ; Tue, 22 Aug 2023 12:23:44 -0700 Authentication-Results: mx.groups.io; dkim=pass header.i=@gmail.com header.s=20221208 header.b=XJGJ3h6Q; spf=pass (domain: gmail.com, ip: 209.85.218.41, mailfrom: adrian.freihofer@gmail.com) Received: by mail-ej1-f41.google.com with SMTP id a640c23a62f3a-99357737980so639640066b.2 for ; Tue, 22 Aug 2023 12:23:43 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20221208; t=1692732221; x=1693337021; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=WbP3FzRf7OkH8/a1cCRReLeQdZU4BRcOP/pO5az/dPg=; b=XJGJ3h6QHYizObUSjyqN9+FCfzrUg05QCACqdfz5zVfgANSxEJPE9qlC0vwxyYXOrG GDH95NqU752TWiIVp2KaD6aGGHV/6ruIAtovtIZ7Vn3RdzQlWSxzOFpLzgsIH2uv+IRB fMnjSlX68yHzCmmNs+UiYfQ30sA7mFf24kr4m0SOfdwCDaR9sk502xg507HPj0GM1XCP 9O/wgKs5ru4z2ZBQgEDHRPwgkgClGiQx9figrKzPjUiCvVl3eauEt2G60fPz7MllICR/ 85+hA92iid4OPP4XfPShapwLDMiZBVRuchBa6MHMhU9AZu8XA+7CKXaf/52+KLj7C84u hPhA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20221208; t=1692732221; x=1693337021; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=WbP3FzRf7OkH8/a1cCRReLeQdZU4BRcOP/pO5az/dPg=; b=MyrCGGXYDQEQ/FiNNOW5ciYr1Vy1ujAds4hM7Ii4ag8ZICBnewbHftOv/Vnq+BblNX R9LcEey01Ecv1z1TIwvue17dyCmi2lMLoHT19MrFg+/aZ3GFetd8e1LYosvh5YxRJioZ zBGd1Pw/zxtiV87nX6xv+ukXI0DFvEPLslIH1tK3aZpZqEpR3zsH52MeillnLpLPprvN PjMOeNX38ELRnASdbg12e4pPBEfCKs4fUw9Wqsq8LImfhLKY5Dolwvu6q1B5r2/CcEYR m/kBC+M1/iA37TbpH+pYSICgvMImBlLMNOF4fFekdwB6d+KYF3ssJrJ1XSWfAirKKDp+ shvQ== X-Gm-Message-State: AOJu0YwdR1uI+6CQZhHrNLX54vXkS2l+1+LbAEjdVXHPnp4D5DRQ4Fpp 6F++YNz1lmxVLHkMSrUrqWjmbtPh+oI= X-Google-Smtp-Source: AGHT+IHKg8PWsR6D5sOPQOZXB83XPdom1yRZi3gQPKiDN4SGwZ+gfVM8IoJ3ttNenULov5+KigQN7g== X-Received: by 2002:a17:907:2cf7:b0:99d:e872:2189 with SMTP id hz23-20020a1709072cf700b0099de8722189mr8384930ejc.76.1692732221229; Tue, 22 Aug 2023 12:23:41 -0700 (PDT) Received: from t14s-af.fritz.box ([2a02:169:59a6:0:dcf2:2f65:9442:83f]) by smtp.gmail.com with ESMTPSA id g24-20020a1709063b1800b0098f99048053sm8744041ejf.148.2023.08.22.12.23.38 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 22 Aug 2023 12:23:40 -0700 (PDT) From: Adrian Freihofer X-Google-Original-From: Adrian Freihofer To: openembedded-core@lists.openembedded.org Cc: Adrian Freihofer Subject: [PATCH v2 05/13] devtool: new ide plugin Date: Tue, 22 Aug 2023 21:20:11 +0200 Message-ID: <20230822192300.3235896-6-adrian.freihofer@siemens.com> X-Mailer: git-send-email 2.41.0 In-Reply-To: <20230822192300.3235896-1-adrian.freihofer@siemens.com> References: <20230822192300.3235896-1-adrian.freihofer@siemens.com> MIME-Version: 1.0 List-Id: X-Webhook-Received: from li982-79.members.linode.com [45.33.32.79] by aws-us-west-2-korg-lkml-1.web.codeaurora.org with HTTPS for ; Tue, 22 Aug 2023 19:23:45 -0000 X-Groupsio-URL: https://lists.openembedded.org/g/openembedded-core/message/186528 The new devtool ide plugin configures an IDE to work with the eSDK. With this initial implementation VSCode is the default IDE. The plugin works for recipes inheriting the cmake or the meson bbclass. Support for more programming languages and build tools may be added in the future. Using the plugin in recipe modes: $ devtool modify a-recipe $ devtool ide a-recipe a-image $ code "$BUILDDIR/workspace/sources/a-recipe" Work in VSCode, after installing the proposed plugins Using the plugin without a recipe $ devtool ide none a-image vscode where/the/sources/are Use the cross tool-chain which is provided as a cmake-kit. The goal of this implementation is to create a configuration for VSCode (or other IDEs) that allows to work on the code of a recipe completely independent from bitbake. bitbake is only called if the configuration or the whole SDK has to be regenerated. But bitbake should not need to be called while working in the IDE. This has two major advantages over calling devtool build from the IDE: - The IDE provides plugins for integration with cmake, for example. These features are usable, which would not be the case if bitbake or devtool are called from within the IDE. - It is much faster. Signed-off-by: Adrian Freihofer --- scripts/lib/devtool/ide.py | 1190 ++++++++++++++++++++++++++++++++++++ 1 file changed, 1190 insertions(+) create mode 100755 scripts/lib/devtool/ide.py diff --git a/scripts/lib/devtool/ide.py b/scripts/lib/devtool/ide.py new file mode 100755 index 00000000000..7c7040232c4 --- /dev/null +++ b/scripts/lib/devtool/ide.py @@ -0,0 +1,1190 @@ +#! /usr/bin/env python3 +# +# Copyright (C) 2023 Siemens AG +# +# SPDX-License-Identifier: GPL-2.0-only +# + +"""Devtool ide plugin""" + +import os +import stat +import logging +import json +import re +import shutil +from argparse import RawTextHelpFormatter +from enum import IntEnum, auto + +import bb +from devtool import exec_build_env_command, setup_tinfoil, check_workspace_recipe, DevtoolError, parse_recipe +from devtool.standard import get_real_srctree + +SHARED_SYSROOT_RECIPES = ['none', 'meta-ide-support', 'build-sysroots'] +SUPPORTED_IDES = ['code', 'none'] + +logger = logging.getLogger('devtool') + + +class TargetDevice: + """SSH remote login parameters""" + + def __init__(self, args): + self.extraoptions = '' + if args.no_host_check: + self.extraoptions += '-o UserKnownHostsFile=/dev/null -o StrictHostKeyChecking=no' + self.ssh_sshexec = 'ssh' + if args.ssh_exec: + self.ssh_sshexec = args.ssh_exec + self.ssh_port = '' + if args.port: + self.ssh_port = "-p %s" % args.port + if args.key: + self.extraoptions += ' -i %s' % args.key + + self.target = args.target + target_sp = args.target.split('@') + if len(target_sp) == 1: + self.login = "" + self.host = target_sp[0] + elif len(target_sp) == 2: + self.login = target_sp[0] + self.host = target_sp[1] + else: + logger.error("Invalid target argument: %s" % args.target) + + +class RecipeNative: + def __init__(self, name, target_arch=None): + self.name = name + self.target_arch = target_arch + self.bootstrap_tasks = [self.name + ':do_addto_recipe_sysroot'] + self.staging_bindir_native = None + self.target_sys = None + self.__native_bin = None + + def initialize(self, config, workspace, tinfoil): + recipe_d = parse_recipe( + config, tinfoil, self.name, appends=True, filter_workspace=False) + if not recipe_d: + raise DevtoolError("Parsing %s recipe failed" % self.name) + self.staging_bindir_native = os.path.realpath( + recipe_d.getVar('STAGING_BINDIR_NATIVE')) + self.target_sys = recipe_d.getVar('TARGET_SYS') + + @property + def native_bin(self): + if not self.__native_bin: + raise DevtoolError("native binary name is not defined.") + return self.__native_bin + + +class RecipeGdbCross(RecipeNative): + def __init__(self, args, target_arch, target_device, gdbserver_multi=True): + super().__init__('gdb-cross-' + target_arch, target_arch) + self.target_device = target_device + self.gdb = None + self.gdbserver_port_next = int(args.gdbserver_port_start) + self.gdbserver_multi = gdbserver_multi + self.config_db = {} + + def initialize(self, config, workspace, tinfoil): + super().initialize(config, workspace, tinfoil) + gdb_bin = self.target_sys + '-gdb' + gdb_path = os.path.join( + self.staging_bindir_native, self.target_sys, gdb_bin) + self.gdb = gdb_path + + @property + def host(self): + return self.target_device.host + + def __gdbserver_start_cmd(self, binary, port): + if self.gdbserver_multi: + gdbserver_cmd = "/usr/bin/gdbserver --multi :%s" % ( + port) + else: + gdbserver_cmd = "/usr/bin/gdbserver --once :%s %s" % ( + port, binary) + return "%s %s %s %s 'sh -c \"%s\"'" % ( + self.target_device.ssh_sshexec, self.target_device.ssh_port, self.target_device.extraoptions, self.target_device.target, gdbserver_cmd) + + def setup_gdbserver_config(self, binary, script_dir): + if binary in self.config_db: + raise DevtoolError( + "gdbserver config for binary %s is already generated" % binary) + + port = self.gdbserver_port_next + self.gdbserver_port_next += 1 + config_entry = { + "port": port, + } + if script_dir: + cmd_lines = ['#!/bin/sh'] + cmd_lines.append(self.__gdbserver_start_cmd(binary, port)) + binary_name_pretty = binary.replace(os.sep, '-') + start_script_name = 'gdbserver_start_%d_%s' % ( + port, binary_name_pretty) + if self.gdbserver_multi: + start_script_name += "_m" + start_script_file = os.path.join(script_dir, start_script_name) + config_entry['gdbserver_start_script'] = start_script_file + config_entry['pretty_id'] = 'gdbserver start %d %s' % ( + port, binary) + + bb.utils.mkdirhier(script_dir) + with open(start_script_file, 'w') as script_f: + script_f.write(os.linesep.join(cmd_lines)) + script_f.write(os.linesep) + st = os.stat(start_script_file) + os.chmod(start_script_file, st.st_mode | stat.S_IEXEC) + + self.config_db[binary] = config_entry + return config_entry + + def get_gdbserver_start_scripts(self): + for conf in self.config_db.values(): + yield (conf['pretty_id'], conf['gdbserver_start_script']) + + def get_gdbserver_pretty_id(self, binary): + return self.config_db[binary]['pretty_id'] + + def get_gdbserver_port(self, binary): + return self.config_db[binary]['port'] + + def get_gdbserver_start_script(self, binary): + return self.config_db[binary]['gdbserver_start_script'] + + +class RecipeImage: + """Handle some image recipe related properties""" + + def __init__(self, name): + self.combine_dbg_image = False + self.debuginfod = False + self.name = name + self.package_debug_split_style = None + self.rootfs = None + self.__rootfs_dbg = None + self.bootstrap_tasks = [self.name + ':do_build'] + + def initialize(self, config, tinfoil): + image_d = parse_recipe( + config, tinfoil, self.name, appends=True, filter_workspace=False) + if not image_d: + raise DevtoolError( + "Parsing image recipe %s failed" % self.name) + if 'debuginfod' in image_d.getVar('DISTRO_FEATURES').split(): + # image_config.debuginfod = True + logger.warning("Support for debuginfod is not implemented yet.") + + self.package_debug_split_style = image_d.getVar( + 'PACKAGE_DEBUG_SPLIT_STYLE') + + workdir = image_d.getVar('WORKDIR') + self.rootfs = os.path.join(workdir, 'rootfs') + if image_d.getVar('IMAGE_GEN_DEBUGFS') == "1": + self.__rootfs_dbg = os.path.join(workdir, 'rootfs-dbg') + + self.combine_dbg_image = bb.data.inherits_class( + 'image-combined-dbg', image_d) + + @property + def debug_support(self): + return bool(self.debuginfod or self.rootfs_dbg) + + @property + def rootfs_dbg(self): + if self.__rootfs_dbg and os.path.isdir(self.__rootfs_dbg): + return self.__rootfs_dbg + return None + + def solib_search_path_rootfs(self): + """Search for folders with shared libraries in the rootfs and rootfs-dbg + + This is based on the assumption that the PACKAGE_DEBUG_SPLIT_STYLE variable from the image + is the global setting which is used by most packages. Even if this variable does not seem + to make sense in the image context. + """ + rootfs_solib_search_path = [] + rootfs_dbg_solib_search_path = [] + if self.package_debug_split_style in ['debug-with-srcpkg', '.debug']: + if self.combine_dbg_image: + rootfs_dbg_solib_search_path = [ + "/lib", "/lib/.debug", "/usr/lib", "/usr/lib/.debug"] + else: + logger.warn( + 'Adding IMAGE_CLASSES += "image-combined-dbg" offers better remote debugging experience.') + rootfs_solib_search_path = [ + "/lib", "/usr/lib"] + rootfs_dbg_solib_search_path = [ + "/lib/.debug", "/usr/lib/.debug"] + elif self.package_debug_split_style == 'debug-file-directory': + rootfs_dbg_solib_search_path = ["/usr/lib/debug"] + else: + logger.warning( + "Cannot find solib search path for a rootfs built with PACKAGE_DEBUG_SPLIT_STYLE=%s." % self.package_debug_split_style) + + sym_dirs = [] + for dbgdir in rootfs_solib_search_path: + sym_dirs.append(os.path.join( + self.rootfs, dbgdir.lstrip('/'))) + for dbgdir in rootfs_dbg_solib_search_path: + sym_dirs.append(os.path.join( + self.rootfs_dbg, dbgdir.lstrip('/'))) + + return sym_dirs + + +class RecipeMetaIdeSupport: + """Handle some meta-ide-support recipe related properties""" + + def __init__(self): + self.bootstrap_tasks = ['meta-ide-support:do_build'] + self.topdir = None + self.datadir = None + self.deploy_dir_image = None + self.build_sys = None + # From toolchain-scripts + self.real_multimach_target_sys = None + + def initialize(self, config, tinfoil): + meta_ide_support_d = parse_recipe( + config, tinfoil, 'meta-ide-support', appends=True, filter_workspace=False) + if not meta_ide_support_d: + raise DevtoolError("Parsing meta-ide-support recipe failed") + + self.topdir = meta_ide_support_d.getVar('TOPDIR') + self.datadir = meta_ide_support_d.getVar('datadir') + self.deploy_dir_image = meta_ide_support_d.getVar( + 'DEPLOY_DIR_IMAGE') + self.build_sys = meta_ide_support_d.getVar('BUILD_SYS') + self.real_multimach_target_sys = meta_ide_support_d.getVar( + 'REAL_MULTIMACH_TARGET_SYS') + + +class RecipeBuildSysroots: + def __init__(self): + self.standalone_sysroot = None + self.standalone_sysroot_native = None + self.bootstrap_tasks = ['build-sysroots:do_build'] + + def initialize(self, config, tinfoil): + build_sysroots_d = parse_recipe( + config, tinfoil, 'build-sysroots', appends=True, filter_workspace=False) + if not build_sysroots_d: + raise DevtoolError("Parsing build-sysroots recipe failed") + self.standalone_sysroot = build_sysroots_d.getVar( + 'STANDALONE_SYSROOT') + self.standalone_sysroot_native = build_sysroots_d.getVar( + 'STANDALONE_SYSROOT_NATIVE') + + +class SharedSysrootsEnv: + def __init__(self): + self.ide_support = None + self.build_sysroots = None + + def initialize(self, ide_support, build_sysroots): + self.ide_support = ide_support + self.build_sysroots = build_sysroots + + def __vscode_update_kits(self): + """Expose the toolchain of the dSDK""" + datadir = self.ide_support.datadir + deploy_dir_image = self.ide_support.deploy_dir_image + real_multimach_target_sys = self.ide_support.real_multimach_target_sys + standalone_sysroot_native = self.build_sysroots.standalone_sysroot_native + vscode_ws_path = os.path.join( + os.environ['HOME'], '.local', 'share', 'CMakeTools') + cmake_kits_path = os.path.join(vscode_ws_path, 'cmake-tools-kits.json') + oecmake_generator = "Ninja" + env_script = os.path.join( + deploy_dir_image, 'environment-setup-' + real_multimach_target_sys) + + logger.info("updating %s" % cmake_kits_path) + + if not os.path.isdir(vscode_ws_path): + os.makedirs(vscode_ws_path) + cmake_kits_old = [] + if os.path.exists(cmake_kits_path): + with open(cmake_kits_path, 'r', encoding='utf-8') as cmake_kits_file: + cmake_kits_old = json.load(cmake_kits_file) + cmake_kits = cmake_kits_old.copy() + + cmake_kit_new = { + "name": "OE " + real_multimach_target_sys, + "environmentSetupScript": env_script, + "toolchainFile": standalone_sysroot_native + datadir + "/cmake/OEToolchainConfig.cmake", + "preferredGenerator": { + "name": oecmake_generator + } + } + + def merge_kit(cmake_kits, cmake_kit_new): + i = 0 + while i < len(cmake_kits): + if 'environmentSetupScript' in cmake_kits[i] and \ + cmake_kits[i]['environmentSetupScript'] == cmake_kit_new['environmentSetupScript']: + cmake_kits[i] = cmake_kit_new + return + i += 1 + cmake_kits.append(cmake_kit_new) + merge_kit(cmake_kits, cmake_kit_new) + + if cmake_kits != cmake_kits_old: + bb.note("Updating: %s" % cmake_kits_path) + with open(cmake_kits_path, 'w', encoding='utf-8') as cmake_kits_file: + json.dump(cmake_kits, cmake_kits_file, indent=4) + + def setup_ide(self, args): + if args.ide == 'code': + self.__vscode_update_kits() + + +class BuildTool(IntEnum): + UNDEFINED = auto() + CMAKE = auto() + MESON = auto() + + +class RecipeModified: + + def __init__(self, name): + self.name = name + self.bootstrap_tasks = [name + ':do_install'] + # workspace + self.real_srctree = None + self.srctree = None + self.temp_dir = None + self.bbappend = None + # recipe variables from d.getVar + self.b = None + self.bpn = None + self.d = None + self.fakerootcmd = None + self.fakerootenv = None + self.package_arch = None + self.path = None + self.recipe_sysroot = None + self.recipe_sysroot_native = None + self.staging_incdir = None + self.target_arch = None + self.workdir = None + # replicate bitbake build environment + self.__exported_vars = None + self.cmd_compile = None + # main build tool used by this recipe + self.build_tool = BuildTool.UNDEFINED + # build_tool = cmake + self.oecmake_generator = None + self.__cmake_cache_vars = None + # build_tool = meson + self.meson_buildtype = None + self.meson_wrapper = None + self.mesonopts = None + self.extra_oemeson = None + self.meson_cross_file = None + # vscode + self.dot_code_dir = None + # TODO: remove calling devtool + self.bb_env_passthrough_additions = None + self.bbpath = None + self.bitbakepath = None + self.topdir = None + + def initialize(self, config, workspace, tinfoil): + recipe_d = parse_recipe( + config, tinfoil, self.name, appends=True, filter_workspace=False) + if not recipe_d: + raise DevtoolError("Parsing %s recipe failed" % self.name) + + # Verify this recipe is built as externalsrc setup by devtool modify + workspacepn = check_workspace_recipe( + workspace, self.name, bbclassextend=True) + self.srctree = workspace[workspacepn]['srctree'] + # Need to grab this here in case the source is within a subdirectory + self.real_srctree = get_real_srctree( + self.srctree, recipe_d.getVar('S'), recipe_d.getVar('WORKDIR')) + self.bbappend = workspace[workspacepn]['bbappend'] + + self.temp_dir = os.path.join(config.workspace_path, 'temp', self.name) + if os.path.exists(self.temp_dir): + shutil.rmtree(self.temp_dir) + + self.b = recipe_d.getVar('B') + self.bpn = recipe_d.getVar('BPN') + self.d = recipe_d.getVar('D') + self.fakerootcmd = recipe_d.getVar('FAKEROOTCMD') + self.fakerootenv = recipe_d.getVar('FAKEROOTENV') + self.package_arch = recipe_d.getVar('PACKAGE_ARCH') + self.path = recipe_d.getVar('PATH') + self.recipe_sysroot = os.path.realpath( + recipe_d.getVar('RECIPE_SYSROOT')) + self.recipe_sysroot_native = os.path.realpath( + recipe_d.getVar('RECIPE_SYSROOT_NATIVE')) + self.staging_incdir = os.path.realpath( + recipe_d.getVar('STAGING_INCDIR')) + self.target_arch = recipe_d.getVar('TARGET_ARCH') + self.workdir = os.path.realpath(recipe_d.getVar('WORKDIR')) + + self.bb_env_passthrough_additions = recipe_d.getVar( + 'BB_ENV_PASSTHROUGH_ADDITIONS') + self.bbpath = recipe_d.getVar('BBPATH') + self.bitbakepath = recipe_d.getVar('BITBAKEPATH') + self.topdir = recipe_d.getVar('TOPDIR') + + self.__init_exported_variables(recipe_d) + + if bb.data.inherits_class('cmake', recipe_d): + self.oecmake_generator = recipe_d.getVar('OECMAKE_GENERATOR') + self.__init_cmake_preset_cache(recipe_d) + self.build_tool = BuildTool.CMAKE + elif bb.data.inherits_class('meson', recipe_d): + self.meson_buildtype = recipe_d.getVar('MESON_BUILDTYPE') + self.mesonopts = recipe_d.getVar('MESONOPTS') + self.extra_oemeson = recipe_d.getVar('EXTRA_OEMESON') + self.meson_cross_file = recipe_d.getVar('MESON_CROSS_FILE') + self.build_tool = BuildTool.MESON + + self.dot_code_dir = os.path.join(self.srctree, '.vscode') + + def append_to_bbappend(self, append_text): + with open(self.bbappend, 'a') as bbap: + bbap.write(append_text) + + def remove_from_bbappend(self, append_text): + with open(self.bbappend, 'r') as bbap: + text = bbap.read() + new_text = text.replace(append_text, '') + with open(self.bbappend, 'w') as bbap: + bbap.write(new_text) + + def debug_build_config(self, args): + """Explicitely set for example CMAKE_BUILD_TYPE to Debug if not defined otherwise""" + if self.build_tool == BuildTool.CMAKE: + append_text = os.linesep + \ + 'OECMAKE_ARGS:append = " -DCMAKE_BUILD_TYPE:STRING=Debug"' + os.linesep + if args.debug_build_config and not 'CMAKE_BUILD_TYPE' in self.__cmake_cache_vars: + self.__cmake_cache_vars['CMAKE_BUILD_TYPE'] = { + "type": "STRING", + "value": "Debug", + } + self.append_to_bbappend(append_text) + elif 'CMAKE_BUILD_TYPE' in self.__cmake_cache_vars: + del self.__cmake_cache_vars['CMAKE_BUILD_TYPE'] + self.remove_from_bbappend(append_text) + elif self.build_tool == BuildTool.MESON: + append_text = os.linesep + 'MESON_BUILDTYPE = "debug"' + os.linesep + if args.debug_build_config and self.meson_buildtype != "debug": + self.mesonopts.replace( + '--buildtype ' + self.meson_buildtype, '--buildtype debug') + self.append_to_bbappend(append_text) + elif self.meson_buildtype == "debug": + self.mesonopts.replace( + '--buildtype debug', '--buildtype plain') + self.remove_from_bbappend(append_text) + elif args.debug_build_config: + logger.warn( + "--debug-build-config is not implemented for this build tool yet.") + + def solib_search_path_sysroot(self): + return [os.path.join(self.recipe_sysroot, p) for p in ['lib', 'usr/lib']] + + def solib_search_path(self, image): + return image.solib_search_path_rootfs() + self.solib_search_path_sysroot() + + def solib_search_path_str(self, image): + return ':'.join(self.solib_search_path(image)) + + def __init_exported_variables(self, d): + """Find all variables with export flag set.""" + exported_vars = {} + + vars = (key for key in d.keys() if not key.startswith( + "__") and not d.getVarFlag(key, "func", False)) + for var in vars: + func = d.getVarFlag(var, "func", False) + if d.getVarFlag(var, 'python', False) and func: + continue + export = d.getVarFlag(var, "export", False) + unexport = d.getVarFlag(var, "unexport", False) + if not export and not unexport and not func: + continue + if unexport: + continue + + val = d.getVar(var) + if val is None: + continue + if set(var) & set("-.{}+"): + logger.warn( + "Warning: Found invalid character in variable name %s", str(var)) + continue + varExpanded = d.expand(var) + val = str(val) + + if varExpanded.startswith("BASH_FUNC_"): + varExpanded = varExpanded[10:-2] + val = val[3:] # Strip off "() " + logger.warn("Warning: BASH_FUNC_ is not exported to cmake presets (%s() %s)" % ( + varExpanded, val)) + continue + + if func: + code_line = "line: {0}, file: {1}\n".format( + d.getVarFlag(var, "lineno", False), + d.getVarFlag(var, "filename", False)) + val = val.rstrip('\n') + logger.warn("Warning: exported shell function %s() is not exported (%s)" % + (varExpanded, code_line)) + continue + + if export: + exported_vars[varExpanded] = val.strip() + continue + + self.__exported_vars = exported_vars + + def __init_cmake_preset_cache(self, d): + """Replicate the cmake configure arguments with all details to share on build folder between bitbake and SDK.""" + site_file = os.path.join(self.workdir, 'site-file.cmake') + if os.path.exists(site_file): + print("Warning: site-file.cmake is not supported") + + cache_vars = {} + oecmake_args = d.getVar('OECMAKE_ARGS').split() + extra_oecmake = d.getVar('EXTRA_OECMAKE').split() + for param in oecmake_args + extra_oecmake: + d_pref = "-D" + if param.startswith(d_pref): + param = param[len(d_pref):] + else: + print("Error: expected a -D") + param_s = param.split('=', 1) + param_nt = param_s[0].split(':', 1) + + def handle_undefined_variable(var): + if var.startswith('${') and var.endswith('}'): + return '' + else: + return var + # Example: FOO=ON + if len(param_nt) == 1: + cache_vars[param_s[0]] = handle_undefined_variable(param_s[1]) + # Example: FOO:PATH=/tmp + elif len(param_nt) == 2: + cache_vars[param_nt[0]] = { + "type": param_nt[1], + "value": handle_undefined_variable(param_s[1]), + } + else: + print("Error: cannot parse %s" % param) + self.__cmake_cache_vars = cache_vars + + def __cmake_preset(self): + toolchain_file = os.path.join(self.workdir, 'toolchain.cmake') + preset_name = self.bpn + "-" + self.package_arch + preset_display_name = self.bpn + ": " + self.package_arch + cmake_executable = os.path.join( + self.recipe_sysroot_native, 'usr', 'bin', 'cmake') + self.cmd_compile = cmake_executable + " --build --preset " + preset_name + + preset_dict_configure = { + "name": preset_name, + "displayName": preset_display_name, + "description": "Bitbake build environment for the recipe %s compiled for %s" % (self.bpn, self.package_arch), + "binaryDir": self.b, + "generator": self.oecmake_generator, + "toolchainFile": toolchain_file, + "cacheVariables": self.__cmake_cache_vars, + "environment": self.__exported_vars, + "cmakeExecutable": cmake_executable + } + + preset_dict_build = { + "name": preset_name, + "displayName": preset_display_name, + "description": "Bitbake build environment for the recipe %s compiled for %s" % (self.bpn, self.package_arch), + "configurePreset": preset_name, + "inheritConfigureEnvironment": True + } + + preset_dict_test = { + "name": preset_name, + "displayName": preset_display_name, + "description": "Bitbake build environment for the recipe %s compiled for %s" % (self.bpn, self.package_arch), + "configurePreset": preset_name, + "inheritConfigureEnvironment": True + } + + preset_dict = { + "version": 3, # cmake 3.21, backward compatible with kirkstone + "configurePresets": [preset_dict_configure], + "buildPresets": [preset_dict_build], + "testPresets": [preset_dict_test] + } + + logger.info("generating cmake preset for recipe %s" % self.bpn) + preset_file = os.path.join(self.real_srctree, 'CMakeUserPresets.json') + with open(preset_file, 'w') as outfile: + json.dump(preset_dict, outfile, indent=4) + + @staticmethod + def update_json_file(dot_code_dir, json_file, update_dict): + json_path = os.path.join(dot_code_dir, json_file) + logger.info("Updating vscode %s (%s)" % (json_file, json_path)) + if not os.path.exists(dot_code_dir): + os.makedirs(dot_code_dir) + try: + with open(json_path) as f: + orig_dict = json.load(f) + except json.decoder.JSONDecodeError: + logger.info( + "Decoding %s failed. Probably because of comments in the json file" % json_path) + orig_dict = {} + except FileNotFoundError: + orig_dict = {} + orig_dict.update(update_dict) + with open(json_path, 'w') as f: + json.dump(orig_dict, f, indent=4) + + def __vscode_settings_cmake(self, settings_dict): + """Add cmake specific settings to settings.json. + + Note: most settings are passed to the cmake preset. + """ + if self.build_tool != BuildTool.CMAKE: + return + settings_dict["cmake.configureOnOpen"] = False + settings_dict["cmake.sourceDirectory"] = self.real_srctree + + def __gen_meson_wrapper(self): + """Generate a wrapper script to call meson with cross environment""" + bb.utils.mkdirhier(self.temp_dir) + meson_wrapper = os.path.join(self.temp_dir, 'meson') + meson_real = os.path.join( + self.recipe_sysroot_native, 'usr', 'bin', 'meson.real') + with open(meson_wrapper, 'w') as mwrap: + mwrap.write("#!/bin/sh" + os.linesep) + for var, val in self.__exported_vars.items(): + mwrap.write('export %s="%s"' % (var, val) + os.linesep) + mwrap.write("unset CC CXX CPP LD AR NM STRIP" + os.linesep) + private_temp = os.path.join(self.b, "meson-private", "tmp") + mwrap.write('mkdir -p "%s"' % private_temp + os.linesep) + mwrap.write('export TMPDIR="%s"' % private_temp + os.linesep) + mwrap.write('exec "%s" "$@"' % meson_real + os.linesep) + st = os.stat(meson_wrapper) + os.chmod(meson_wrapper, st.st_mode | stat.S_IEXEC) + self.meson_wrapper = meson_wrapper + self.cmd_compile = meson_wrapper + " compile -C " + self.b + + def __vscode_settings_meson(self, settings_dict): + if self.build_tool != BuildTool.MESON: + return + settings_dict["mesonbuild.mesonPath"] = self.meson_wrapper + + confopts = self.mesonopts.split() + confopts += self.meson_cross_file.split() + confopts += self.extra_oemeson.split() + settings_dict["mesonbuild.configureOptions"] = confopts + settings_dict["mesonbuild.buildFolder"] = self.b + + def vscode_settings(self): + files_excludes = { + "**/.git/**": True, + "**/oe-local-files/**": True, + "**/oe-logs/**": True, + "**/oe-workdir/**": True, + "**/source-date-epoch/**": True + } + python_exclude = [ + "**/.git/**", + "**/oe-local-files/**", + "**/oe-logs/**", + "**/oe-workdir/**", + "**/source-date-epoch/**" + ] + settings_dict = { + "files.watcherExclude": files_excludes, + "files.exclude": files_excludes, + "python.analysis.exclude": python_exclude + } + self.__vscode_settings_cmake(settings_dict) + self.__vscode_settings_meson(settings_dict) + + settings_file = 'settings.json' + RecipeModified.update_json_file( + self.dot_code_dir, settings_file, settings_dict) + + def __vscode_extensions_cmake(self, recommendations): + if self.build_tool != BuildTool.CMAKE: + return + recommendations += [ + "twxs.cmake", + "ms-vscode.cmake-tools", + "ms-vscode.cpptools", + "ms-vscode.cpptools-extension-pack", + "ms-vscode.cpptools-themes" + ] + + def __vscode_extensions_meson(self, recommendations): + if self.build_tool != BuildTool.MESON: + return + recommendations += [ + 'mesonbuild.mesonbuild' + ] + + def vscode_extensions(self): + recommendations = [ + "EditorConfig.EditorConfig" + ] + self.__vscode_extensions_cmake(recommendations) + self.__vscode_extensions_meson(recommendations) + extensions_file = 'extensions.json' + RecipeModified.update_json_file( + self.dot_code_dir, extensions_file, {"recommendations": recommendations}) + + def which(self, executable): + bin_path = shutil.which(executable, path=self.path) + if not bin_path: + raise DevtoolError( + 'Cannot find %s. Probably the recipe %s is not built yet.' % (executable, self.bpn)) + return bin_path + + @staticmethod + def vscode_intelli_sense_mode(compiler): + unknown = False + linux = '' + if 'linux' in compiler: + linux = "linux-" + + cxx = 'unknown-' + if 'g++' in compiler: + cxx = 'gcc-' + elif 'clang' in compiler: + cxx = 'clang-' + else: + unknown = True + + arch = 'unknown' + if 'aarch64' in compiler: + arch = 'arm64' + elif 'arm' in compiler: + arch = 'arm' + elif 'x86_64' in compiler: + arch = 'x64' + elif 'i386' in compiler: + arch = 'x86' + else: + unknown = True + + mode = linux + cxx + arch + if unknown: + logger.warn( + "Cannot guess intelliSenseMode for compiler %s (%s)" % (compiler, mode)) + return '${default}' + return mode + + def vscode_c_cpp_properties(self): + properties_dict = { + "name": "Yocto " + self.package_arch, + } + if self.build_tool == BuildTool.CMAKE: + properties_dict["configurationProvider"] = "ms-vscode.cmake-tools" + elif self.build_tool == BuildTool.MESON: + properties_dict["configurationProvider"] = "mesonbuild.mesonbuild" + + properties_dicts = { + "configurations": [ + properties_dict + ], + "version": 4 + } + prop_file = 'c_cpp_properties.json' + dot_code_dir = os.path.join(self.srctree, '.vscode') + RecipeModified.update_json_file( + dot_code_dir, prop_file, properties_dicts) + + def vscode_launch_cppdbg(self, image, gdb_cross, binary): + gdb_cross.setup_gdbserver_config(binary, self.temp_dir) + pretty_id = gdb_cross.get_gdbserver_pretty_id(binary) + gdbserver_port = gdb_cross.get_gdbserver_port(binary) + + launch_config = { + "name": pretty_id, + "type": "cppdbg", + "request": "launch", + "program": os.path.join(self.d, binary.lstrip('/')), + "stopAtEntry": True, + "cwd": "${workspaceFolder}", + "environment": [], + "externalConsole": False, + "MIMode": "gdb", + "preLaunchTask": pretty_id, + "miDebuggerPath": gdb_cross.gdb, + "miDebuggerServerAddress": "%s:%d" % (gdb_cross.host, gdbserver_port) + } + + # Search for header files in recipe-sysroot. + src_file_map = { + "/usr/include": os.path.join(self.recipe_sysroot, "usr", "include") + } + # First of all search for not stripped binaries in the image folder. + # These binaries are copied (and optionally stripped) by deploy-target + setup_commands = [ + { + "description": "sysroot", + "text": "set sysroot " + self.d + } + ] + + if image.rootfs_dbg: + launch_config['additionalSOLibSearchPath'] = self.solib_search_path_str( + image) + src_file_map["/usr/src/debug"] = os.path.join( + image.rootfs_dbg, "usr", "src", "debug") + else: + logger.warning( + "Cannot setup debug symbols configuration for GDB. IMAGE_GEN_DEBUGFS is not enabled.") + + launch_config['sourceFileMap'] = src_file_map + launch_config['setupCommands'] = setup_commands + return launch_config + + @staticmethod + def is_elf_file(file_path): + with open(file_path, "rb") as f: + data = f.read(4) + if data == b'\x7fELF': + return True + return False + + def find_installed_binaries(self): + """find all executable elf files in the image directory""" + binaries = [] + d_len = len(self.d) + re_so = re.compile('.*\.so[.0-9]*$') + for root, _, files in os.walk(self.d, followlinks=False): + for file in files: + if os.path.islink(file): + continue + if re_so.match(file): + continue + abs_name = os.path.join(root, file) + if os.access(abs_name, os.X_OK) and RecipeModified.is_elf_file(abs_name): + binaries.append(abs_name[d_len:]) + return binaries + + def vscode_launch(self, image, gdb_cross): + binaries = self.find_installed_binaries() + configurations = [self.vscode_launch_cppdbg( + image, gdb_cross, binary) for binary in binaries] + launch_dict = { + "version": "0.2.0", + "configurations": configurations + } + launch_file = 'launch.json' + RecipeModified.update_json_file( + self.dot_code_dir, launch_file, launch_dict) + + @staticmethod + def get_unique_gdbinit_name(binary): + return 'gdbinit' + binary.replace(os.sep, '-') + + def none_launch(self, image, gdb_cross): + """generate a gdbinit file per executable""" + binaries = self.find_installed_binaries() + for binary in binaries: + gdb_cross.setup_gdbserver_config(binary, self.temp_dir) + gdbserver_port = str(gdb_cross.get_gdbserver_port(binary)) + if gdb_cross.gdbserver_multi: + target_help = '# gdbserver --multi :' + gdbserver_port + remote_cmd = 'target extended-remote ' + else: + target_help = '# gdbserver :' + gdbserver_port + ' ' + binary + remote_cmd = 'target remote ' + gdbinit_path = os.path.join( + self.real_srctree, RecipeModified.get_unique_gdbinit_name(binary)) + + gdbinit_lines = ['# This file is generated by devtool ide'] + gdbinit_lines.append('# On the remote target:') + gdbinit_lines.append(target_help) + gdbinit_lines.append('# On the build machine:') + gdbinit_lines.append('# cd ' + self.real_srctree) + gdbinit_lines.append( + '# ' + gdb_cross.gdb + ' -ix ' + gdbinit_path) + + gdbinit_lines.append('set sysroot ' + self.d) + gdbinit_lines.append('set substitute-path "/usr/include" "' + + os.path.join(self.recipe_sysroot, 'usr', 'include') + '"') + if image.debuginfod: + gdbinit_lines.append('set debuginfod enabled on') + else: + gdbinit_lines.append('set debuginfod enabled off') + if image.rootfs_dbg: + gdbinit_lines.append( + 'set solib-search-path "' + self.solib_search_path_str(image) + '"') + gdbinit_lines.append('set substitute-path "/usr/src/debug" "' + os.path.join( + image.rootfs_dbg, 'usr', 'src', 'debug') + '"') + gdbinit_lines.append( + remote_cmd + gdb_cross.host + ':' + gdbserver_port) + gdbinit_lines.append('set remote exec-file ' + binary) + gdbinit_lines.append('run ' + os.path.join(self.d, binary)) + + with open(gdbinit_path, 'w') as gdbinit_file: + gdbinit_file.write('\n'.join(gdbinit_lines)) + + def gen_fakeroot_install_script(self): + """Run the run.do_install script from bitbake under pseudo so that it picks up the appropriate file permissions""" + cmd_lines = ['#!/bin/sh'] + # Ensure the do compile step gets always executed without pseuso before do install + if self.cmd_compile: + cmd_compile = "( cd %s && %s)" % ( + self.real_srctree, self.cmd_compile) + cmd_lines.append(cmd_compile) + if not os.access(self.fakerootcmd, os.X_OK): + raise DevtoolError( + "pseudo executable %s could not be found" % self.fakerootcmd) + run_do_install = os.path.join(self.workdir, 'temp', 'run.do_install') + + if not os.access(run_do_install, os.X_OK): + raise DevtoolError( + "run script does not exists: %s" % run_do_install) + + # Set up the appropriate environment + newenv = dict(os.environ) + for varvalue in self.fakerootenv.split(): + if '=' in varvalue: + splitval = varvalue.split('=', 1) + newenv[splitval[0]] = splitval[1] + + # Cleanup TMPDIR before calling do_install independently from bitbake + # This is anyway outdated after do_install has been executed. + # But maybe there should be a cleaner solution here. + rm_in_workdir = ' '.join([os.path.join(self.workdir, d) for d in [ + "package", "packages-split", "pkgdata", "sstate-install-package", "debugsources.list", "*.spec"]]) + install_cmd = '%s /bin/sh -c "rm -rf %s/* %s && %s"' % ( + self.fakerootcmd, self.d, rm_in_workdir, run_do_install) + for var, val in newenv.items(): + cmd_lines.append('export %s="%s"' % (var, val)) + cmd_lines.append(install_cmd) + return self.write_script(cmd_lines, 'bb_run_do_install') + + def write_script(self, cmd_lines, script_name): + bb.utils.mkdirhier(self.temp_dir) + script_file = os.path.join(self.temp_dir, script_name) + with open(script_file, 'w') as script_f: + script_f.write(os.linesep.join(cmd_lines)) + st = os.stat(script_file) + os.chmod(script_file, st.st_mode | stat.S_IEXEC) + return script_file + + def vscode_tasks(self, args, gdb_cross): + run_do_install = self.gen_fakeroot_install_script() + pythonpath_new = os.path.realpath( + os.path.join(self.bitbakepath, '../lib')) + try: + pythonpath = os.environ['PYTONPATH'].split(':') + if pythonpath_new not in pythonpath: + pythonpath = pythonpath_new + ":" + pythonpath + except KeyError: + pythonpath = pythonpath_new + install_label = "do_install %s" % self.bpn + deploy_label = "devtool deploy-target %s" % self.bpn + bb_env = { + # "BBPATH": self.bbpath, + "PYTHONPATH": pythonpath, + "BUILDDIR": self.topdir, + # Use e.g. Python from host, not python-native + "PATH": os.environ['PATH'], + "BB_ENV_PASSTHROUGH_ADDITIONS": self.bb_env_passthrough_additions + } + bb_options = { + "cwd": self.topdir + } + tasks_dict = { + "version": "2.0.0", + "tasks": [ + { + "label": install_label, + "type": "shell", + "command": run_do_install, + "problemMatcher": [] + }, + { + "label": deploy_label, + "type": "shell", + "command": "devtool", # TODO: Generate a self contained script which does what devtool target-deploy does but without connection to the bitbake server + "args": ["--bbpath", self.bbpath, "deploy-target", self.bpn, args.target, "--strip", "--no-host-check"], + "linux": { + "options": { + "env": bb_env + }}, + "options": bb_options, + "problemMatcher": [] + }, + { + "label": "install && deploy-target %s" % self.bpn, + "dependsOrder": "sequence", + "dependsOn": [ + install_label, + deploy_label + ], + "problemMatcher": [], + "group": { + "kind": "build", + "isDefault": True + } + } + ] + } + for pretty_id, start_script in gdb_cross.get_gdbserver_start_scripts(): + tasks_dict['tasks'].append( + { + "label": pretty_id, + "type": "shell", + "isBackground": True, + "command": start_script, + "problemMatcher": [ + { + "pattern": [ + { + "regexp": ".", + "file": 1, + "location": 2, + "message": 3 + } + ], + "background": { + "activeOnStart": True, + "beginsPattern": ".", + "endsPattern": ".", + } + } + ] + }) + tasks_file = 'tasks.json' + RecipeModified.update_json_file( + self.dot_code_dir, tasks_file, tasks_dict) + + def setup_ide(self, args, image, gdb_cross): + if self.build_tool == BuildTool.CMAKE: + self.__cmake_preset() + if self.build_tool == BuildTool.MESON: + self.__gen_meson_wrapper() + + if args.ide == 'code': + self.vscode_settings() + self.vscode_extensions() + self.vscode_c_cpp_properties() + if args.target: + self.vscode_launch(image, gdb_cross) + self.vscode_tasks(args, gdb_cross) + if args.ide == 'none' and self.build_tool == BuildTool.CMAKE: + self.none_launch(image, gdb_cross) + + +def ide_setup(args, config, basepath, workspace): + bootstap_tasks = [] + + tinfoil = setup_tinfoil(config_only=False, basepath=basepath) + try: + # Provide a rootfs and the corresponding debug symbols via rootfs-dbg or debuginfod + image_config = RecipeImage(args.image) + image_config.initialize(config, tinfoil) + bootstap_tasks += image_config.bootstrap_tasks + + target_device = TargetDevice(args) + + sdk_env = None + gdb_cross = None + if args.recipename in SHARED_SYSROOT_RECIPES: + ide_support = RecipeMetaIdeSupport() + ide_support.initialize(config, tinfoil) + bootstap_tasks += ide_support.bootstrap_tasks + + build_sysroots = RecipeBuildSysroots() + build_sysroots.initialize(config, tinfoil) + bootstap_tasks += build_sysroots.bootstrap_tasks + + sdk_env = SharedSysrootsEnv() + sdk_env.initialize(ide_support, build_sysroots) + else: + sdk_env = RecipeModified(args.recipename) + sdk_env.initialize(config, workspace, tinfoil) + bootstap_tasks += sdk_env.bootstrap_tasks + + gdb_multi_mode = not bool(args.ide == 'code') + gdb_cross = RecipeGdbCross( + args, sdk_env.target_arch, target_device, gdb_multi_mode) + gdb_cross.initialize(config, workspace, tinfoil) + bootstap_tasks += gdb_cross.bootstrap_tasks + finally: + tinfoil.shutdown() + + shared_sysroot = bool(args.recipename in SHARED_SYSROOT_RECIPES) + if not shared_sysroot: + sdk_env.debug_build_config(args) + + if not args.skip_bitbake: + bb_cmd = 'bitbake ' + if args.bitbake_k: + bb_cmd += "-k " + bb_cmd += ' '.join(bootstap_tasks) + exec_build_env_command(config.init_path, basepath, bb_cmd, watch=True) + + if shared_sysroot: + sdk_env.setup_ide(args) + else: + sdk_env.setup_ide(args, image_config, gdb_cross) + + +def get_default_ide(): + for an_ide in SUPPORTED_IDES[:-1]: + if shutil.which(an_ide): + return an_ide + return SUPPORTED_IDES[-1:] + + +def register_commands(subparsers, context): + """Register devtool subcommands from this plugin""" + parser_ide = subparsers.add_parser('ide', help='Setup the IDE (VSCode)', + description='Configure the IDE to work with the source code of a recipe.', + group='working', order=50, formatter_class=RawTextHelpFormatter) + parser_ide.add_argument( + 'recipename', help='Generate a IDE configuration in the workspace of the given recipe. ' + 'By default the workspace is configured to use the recipe sysroot prepared by devtool modify. ' + 'For some special recipes the generated configuration referes to the shared sysroots ' + 'provided by meta-ide-setup and build-sysroots recipes. ' + 'The following recipes use a shared sysroot: %s' % SHARED_SYSROOT_RECIPES) + parser_ide.add_argument( + 'image', help='The image running on the target device. This is required for remote debugging.' + 'It is important to deploy the image built by this command to the target device because ' + 'otherwise the debug symbols used on the build machine (rootfs-dbg) are probably out of sync ' + 'with the binaries executed on the target device.') + parser_ide.add_argument( + '-i', '--ide', choices=SUPPORTED_IDES, default=get_default_ide(), + help='Setup the configuration for this IDE') + parser_ide.add_argument( + '-t', '--target', default='root@192.168.7.2', + help='Live target machine running an ssh server: user@hostname.') + parser_ide.add_argument( + '-G', '--gdbserver-port-start', default="1234", help='port where gdbserver is listening.') + parser_ide.add_argument( + '-c', '--no-host-check', help='Disable ssh host key checking', action='store_true') + parser_ide.add_argument( + '-e', '--ssh-exec', help='Executable to use in place of ssh') + parser_ide.add_argument( + '-P', '--port', help='Specify ssh port to use for connection to the target') + parser_ide.add_argument( + '-I', '--key', help='Specify ssh private key for connection to the target') + parser_ide.add_argument( + '--skip-bitbake', help='Generate IDE configuration but skip calling bibtake to update the SDK.', action='store_true') + parser_ide.add_argument( + '-k', '--bitbake-k', help='Pass -k parameter to bitbake', action='store_true') + parser_ide.add_argument( + '--debug-build-config', help='Use debug build flags, for example set CMAKE_BUILD_TYPE=Debug', action='store_true') + parser_ide.set_defaults(func=ide_setup) + + # TODO: Better support for multiple recipes. E.g. a list of recipes with auto-detection for the image recipe or all modified recipes From patchwork Tue Aug 22 19:20:12 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Adrian Freihofer X-Patchwork-Id: 29271 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from aws-us-west-2-korg-lkml-1.web.codeaurora.org (localhost.localdomain [127.0.0.1]) by smtp.lore.kernel.org (Postfix) with ESMTP id DA405EE49B1 for ; Tue, 22 Aug 2023 19:23:45 +0000 (UTC) Received: from mail-ej1-f52.google.com (mail-ej1-f52.google.com [209.85.218.52]) by mx.groups.io with SMTP id smtpd.web11.5310.1692732224027893493 for ; Tue, 22 Aug 2023 12:23:44 -0700 Authentication-Results: mx.groups.io; dkim=pass header.i=@gmail.com header.s=20221208 header.b=XkxG6Q5D; spf=pass (domain: gmail.com, ip: 209.85.218.52, mailfrom: adrian.freihofer@gmail.com) Received: by mail-ej1-f52.google.com with SMTP id a640c23a62f3a-99c93638322so996563166b.1 for ; Tue, 22 Aug 2023 12:23:43 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20221208; t=1692732222; x=1693337022; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=VaWuuIUtmaan9OQ7nZXD7CNTUSo25dmTfn2Y4hW5+Sg=; b=XkxG6Q5DpXDxK+h+X1nChIYuwtwV974Eg8uKtOfkT2uySX/Sn+jzcdrG3ttIhqIO3T KBxuOXRSlpZhEaessPqtnpSHXWS4pYYqOuc5k9aM629w6XHZ3d/YHRpcFymE8kclYyOC qcG6U0+CptdFDZxkfyvahN3h22wIkW3HAeQTiK/Yqg+fAWAgRq0syfE301G/QM1CcqKo 6hXvEF1XPKiXjM9ZBTnXFSyZdzscK9R1sEr8+j6ajaE2AFQdL4VJ76zkxCrKSPLvrzff bCZaRG1jLPmwPjqP75R4ZVWJ7T5W/q8T1lKCyDGOJN51Qau9fRYJnnhCC4FNewus6CfL jnEw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20221208; t=1692732222; x=1693337022; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=VaWuuIUtmaan9OQ7nZXD7CNTUSo25dmTfn2Y4hW5+Sg=; b=DtdSl5C8+uLFxwYoKqjQmqu+uMvTJaVuxetTtilDnG4/TRmYJkNLOzrHbXW1OzgGyH O6022onmOVW0UOC9nSzcOc4daUJE4HcHmgZ7vwbMVWniKmbVgipbU7lr2usgBKNES5ma ghPgQvCy7623mzHESMLSVJoHqOzFYSK9ohHG7zWZmjOfTcAbdlsWZCn88Rk7X2UwIsM9 ydE+M+goXZiPBvbF4Q6EpwsAA43iqzZF9d4i0PsNiRhkIjhFFOgBAYuWpU+auiQBaJ7j qdEKjEXLnhc3Y8yFYW5FwCqJecDaKucRrfasxrFApvNq813moOfrIExO9sX7aQrwgpNr 8CaA== X-Gm-Message-State: AOJu0YyAvjr3xaYJUKprh+rNKJJIax4YTxUyppano5tDYJLYhiGxPEEq iEHaKrU9LiLLwmQHRl7OYcKjYMx2GkE= X-Google-Smtp-Source: AGHT+IFoDi+eskc5K2azEBpPm1pyIB58UHc/aiCXHQqvIFVDizWgBfeq2/Q8gJ0WDOUGXSz9iLjnWQ== X-Received: by 2002:a17:907:86a8:b0:98e:738c:6d39 with SMTP id qa40-20020a17090786a800b0098e738c6d39mr10508033ejc.36.1692732222186; Tue, 22 Aug 2023 12:23:42 -0700 (PDT) Received: from t14s-af.fritz.box ([2a02:169:59a6:0:dcf2:2f65:9442:83f]) by smtp.gmail.com with ESMTPSA id g24-20020a1709063b1800b0098f99048053sm8744041ejf.148.2023.08.22.12.23.41 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 22 Aug 2023 12:23:41 -0700 (PDT) From: Adrian Freihofer X-Google-Original-From: Adrian Freihofer To: openembedded-core@lists.openembedded.org Cc: Adrian Freihofer Subject: [PATCH v2 06/13] tests: add a C++ example recipe Date: Tue, 22 Aug 2023 21:20:12 +0200 Message-ID: <20230822192300.3235896-7-adrian.freihofer@siemens.com> X-Mailer: git-send-email 2.41.0 In-Reply-To: <20230822192300.3235896-1-adrian.freihofer@siemens.com> References: <20230822192300.3235896-1-adrian.freihofer@siemens.com> MIME-Version: 1.0 List-Id: X-Webhook-Received: from li982-79.members.linode.com [45.33.32.79] by aws-us-west-2-korg-lkml-1.web.codeaurora.org with HTTPS for ; Tue, 22 Aug 2023 19:23:45 -0000 X-Groupsio-URL: https://lists.openembedded.org/g/openembedded-core/message/186529 This simple C++ project supports compilation with cmake and with meson. It's supposed to be used with oe-selftest for the devtool ide plugin. Signed-off-by: Adrian Freihofer --- meta-selftest/recipes-test/cpp/.gitignore | 1 + .../recipes-test/cpp/cmake-example.bb | 17 ++++++ .../recipes-test/cpp/cmake-example/run-ptest | 10 ++++ .../recipes-test/cpp/cpp-example.inc | 24 ++++++++ .../recipes-test/cpp/files/CMakeLists.txt | 60 +++++++++++++++++++ .../cpp/files/cpp-example-lib.cpp | 17 ++++++ .../cpp/files/cpp-example-lib.hpp | 16 +++++ .../recipes-test/cpp/files/cpp-example.cpp | 16 +++++ .../recipes-test/cpp/files/meson.build | 34 +++++++++++ .../cpp/files/test-cpp-example.cpp | 19 ++++++ .../recipes-test/cpp/meson-example.bb | 17 ++++++ .../recipes-test/cpp/meson-example/run-ptest | 10 ++++ 12 files changed, 241 insertions(+) create mode 100644 meta-selftest/recipes-test/cpp/.gitignore create mode 100644 meta-selftest/recipes-test/cpp/cmake-example.bb create mode 100644 meta-selftest/recipes-test/cpp/cmake-example/run-ptest create mode 100644 meta-selftest/recipes-test/cpp/cpp-example.inc create mode 100644 meta-selftest/recipes-test/cpp/files/CMakeLists.txt create mode 100644 meta-selftest/recipes-test/cpp/files/cpp-example-lib.cpp create mode 100644 meta-selftest/recipes-test/cpp/files/cpp-example-lib.hpp create mode 100644 meta-selftest/recipes-test/cpp/files/cpp-example.cpp create mode 100644 meta-selftest/recipes-test/cpp/files/meson.build create mode 100644 meta-selftest/recipes-test/cpp/files/test-cpp-example.cpp create mode 100644 meta-selftest/recipes-test/cpp/meson-example.bb create mode 100644 meta-selftest/recipes-test/cpp/meson-example/run-ptest diff --git a/meta-selftest/recipes-test/cpp/.gitignore b/meta-selftest/recipes-test/cpp/.gitignore new file mode 100644 index 00000000000..30d388a12b7 --- /dev/null +++ b/meta-selftest/recipes-test/cpp/.gitignore @@ -0,0 +1 @@ +build* \ No newline at end of file diff --git a/meta-selftest/recipes-test/cpp/cmake-example.bb b/meta-selftest/recipes-test/cpp/cmake-example.bb new file mode 100644 index 00000000000..96d543180b4 --- /dev/null +++ b/meta-selftest/recipes-test/cpp/cmake-example.bb @@ -0,0 +1,17 @@ +# +# Copyright OpenEmbedded Contributors +# +# SPDX-License-Identifier: MIT +# + +SUMMARY = "A C++ example compiled with cmake." + +inherit cmake + +require cpp-example.inc + +SRC_URI += "\ + file://CMakeLists.txt \ +" + +FILES:${PN}-ptest += "${bindir}/test-cmake-example" diff --git a/meta-selftest/recipes-test/cpp/cmake-example/run-ptest b/meta-selftest/recipes-test/cpp/cmake-example/run-ptest new file mode 100644 index 00000000000..94b620a1984 --- /dev/null +++ b/meta-selftest/recipes-test/cpp/cmake-example/run-ptest @@ -0,0 +1,10 @@ +#!/bin/sh +# +# Copyright OpenEmbedded Contributors +# +# SPDX-License-Identifier: MIT +# + +test-cmake-example + +# Note: run-ptests exits with exit value from test-cmake-example diff --git a/meta-selftest/recipes-test/cpp/cpp-example.inc b/meta-selftest/recipes-test/cpp/cpp-example.inc new file mode 100644 index 00000000000..39c61cf4ceb --- /dev/null +++ b/meta-selftest/recipes-test/cpp/cpp-example.inc @@ -0,0 +1,24 @@ +# +# Copyright OpenEmbedded Contributors +# +# SPDX-License-Identifier: MIT +# + +LICENSE = "MIT" +LIC_FILES_CHKSUM = "file://${COMMON_LICENSE_DIR}/MIT;md5=0835ade698e0bcf8506ecda2f7b4f302" + +inherit ptest + +DEPENDS += "json-c" + +PV = "1.0" + +S = "${WORKDIR}" + +SRC_URI = "\ + file://cpp-example.cpp \ + file://cpp-example-lib.hpp \ + file://cpp-example-lib.cpp \ + file://test-cpp-example.cpp \ + file://run-ptest \ +" diff --git a/meta-selftest/recipes-test/cpp/files/CMakeLists.txt b/meta-selftest/recipes-test/cpp/files/CMakeLists.txt new file mode 100644 index 00000000000..839aa59b5e3 --- /dev/null +++ b/meta-selftest/recipes-test/cpp/files/CMakeLists.txt @@ -0,0 +1,60 @@ +# +# Copyright OpenEmbedded Contributors +# +# SPDX-License-Identifier: MIT +# + +cmake_minimum_required(VERSION 3.22) + +project(cmake-example + VERSION 1.0.0 + LANGUAGES CXX +) + +option(BUILD_SHARED_LIBS "Build using shared libraries" ON) + +set(CMAKE_CXX_STANDARD 17) +set(CMAKE_CXX_STANDARD_REQUIRED On) +set(CMAKE_CXX_EXTENSIONS Off) + +include(GNUInstallDirs) + +# Find json-c +# find_package(PkgConfig REQUIRED) +# pkg_check_modules(JSONC REQUIRED json-c) +find_package(json-c) + +# A simple library linking json-c library found by pkgconfig +add_library(cmake-example-lib cpp-example-lib.cpp cpp-example-lib.hpp) +set_target_properties(cmake-example-lib PROPERTIES + VERSION ${PROJECT_VERSION} + SOVERSION ${PROJECT_VERSION_MAJOR} +) +target_link_libraries(cmake-example-lib PRIVATE json-c::json-c) +# target_link_libraries(cmake-example-lib ${JSONC_LIBRARIES}) +# target_include_directories(cmake-example-lib PUBLIC ${JSONC_INCLUDE_DIRS}) +# target_compile_options(cmake-example-lib PUBLIC ${JSONC_CFLAGS_OTHER}) +install(TARGETS cmake-example-lib + INCLUDES DESTINATION ${CMAKE_INSTALL_INCLUDEDIR} + ARCHIVE DESTINATION ${CMAKE_INSTALL_LIBDIR} + LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR} +) + +# A simple executable linking the library +add_executable(cmake-example cpp-example.cpp) +target_link_libraries(cmake-example PRIVATE cmake-example-lib) + +install(TARGETS cmake-example + RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR} +) + +# A simple test executable for testing the library +add_executable(test-cmake-example test-cpp-example.cpp) +target_link_libraries(test-cmake-example PRIVATE cmake-example-lib) + +install(TARGETS test-cmake-example + RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR} +) + +include(CTest) +add_test(NAME test-cmake-example COMMAND test-cmake-example) diff --git a/meta-selftest/recipes-test/cpp/files/cpp-example-lib.cpp b/meta-selftest/recipes-test/cpp/files/cpp-example-lib.cpp new file mode 100644 index 00000000000..29fd10fb7e1 --- /dev/null +++ b/meta-selftest/recipes-test/cpp/files/cpp-example-lib.cpp @@ -0,0 +1,17 @@ +/* +* Copyright OpenEmbedded Contributors +* +* SPDX-License-Identifier: MIT +*/ + +#include +#include +#include "cpp-example-lib.hpp" + +const std::string& CppExample::get_string() { + return test_string; +} + +const char* CppExample::get_json_c_version() { + return json_c_version(); +} diff --git a/meta-selftest/recipes-test/cpp/files/cpp-example-lib.hpp b/meta-selftest/recipes-test/cpp/files/cpp-example-lib.hpp new file mode 100644 index 00000000000..8a87e6b510a --- /dev/null +++ b/meta-selftest/recipes-test/cpp/files/cpp-example-lib.hpp @@ -0,0 +1,16 @@ +/* +* Copyright OpenEmbedded Contributors +* +* SPDX-License-Identifier: MIT +*/ + +#pragma once + +#include + +struct CppExample { + inline static const std::string test_string = "cpp-example-lib Magic: 123456789"; + + const std::string& get_string(); + const char* get_json_c_version(); +}; diff --git a/meta-selftest/recipes-test/cpp/files/cpp-example.cpp b/meta-selftest/recipes-test/cpp/files/cpp-example.cpp new file mode 100644 index 00000000000..de7f2106dec --- /dev/null +++ b/meta-selftest/recipes-test/cpp/files/cpp-example.cpp @@ -0,0 +1,16 @@ +/* +* Copyright OpenEmbedded Contributors +* +* SPDX-License-Identifier: MIT +*/ + +#include "cpp-example-lib.hpp" + +#include + +int main() { + auto cpp_example = CppExample(); + std::cout << "C++ example linking " << cpp_example.get_string() << std::endl; + std::cout << "Linking json-c version " << cpp_example.get_json_c_version() << std::endl; + return 0; +} diff --git a/meta-selftest/recipes-test/cpp/files/meson.build b/meta-selftest/recipes-test/cpp/files/meson.build new file mode 100644 index 00000000000..7753da69721 --- /dev/null +++ b/meta-selftest/recipes-test/cpp/files/meson.build @@ -0,0 +1,34 @@ +# +# Copyright OpenEmbedded Contributors +# +# SPDX-License-Identifier: MIT +# + +project('meson-example', 'cpp', + version: '1.0.0', + default_options: ['cpp_std=c++17'] + ) + + +jsoncdep = dependency('json-c') + +mesonexlib = shared_library('mesonexlib', + 'cpp-example-lib.cpp', 'cpp-example-lib.hpp', + version: meson.project_version(), + soversion: meson.project_version().split('.')[0], + dependencies : jsoncdep, + install : true + ) + +executable('mesonex', + 'cpp-example.cpp', + link_with : mesonexlib, + install : true + ) + +test_mesonex = executable('test-mesonex', + 'test-cpp-example.cpp', + link_with : mesonexlib, + install : true +) +test('meson example test', test_mesonex) diff --git a/meta-selftest/recipes-test/cpp/files/test-cpp-example.cpp b/meta-selftest/recipes-test/cpp/files/test-cpp-example.cpp new file mode 100644 index 00000000000..ca72e11a9c4 --- /dev/null +++ b/meta-selftest/recipes-test/cpp/files/test-cpp-example.cpp @@ -0,0 +1,19 @@ +/* +* Copyright OpenEmbedded Contributors +* +* SPDX-License-Identifier: MIT +*/ + +#include "cpp-example-lib.hpp" + +#include + +int main() { + auto cpp_example = CppExample(); + auto ret_string = cpp_example.get_string(); + if(0 == ret_string.compare(CppExample::test_string)) { + std::cout << "PASS: " << ret_string << " = " << CppExample::test_string << std::endl; + } else { + std::cout << "FAIL: " << ret_string << " != " << CppExample::test_string << std::endl; + } +} diff --git a/meta-selftest/recipes-test/cpp/meson-example.bb b/meta-selftest/recipes-test/cpp/meson-example.bb new file mode 100644 index 00000000000..f15dbb50731 --- /dev/null +++ b/meta-selftest/recipes-test/cpp/meson-example.bb @@ -0,0 +1,17 @@ +# +# Copyright OpenEmbedded Contributors +# +# SPDX-License-Identifier: MIT +# + +SUMMARY = "A C++ example compiled with meson." + +inherit pkgconfig meson + +require cpp-example.inc + +SRC_URI += "\ + file://meson.build \ +" + +FILES:${PN}-ptest += "${bindir}/test-mesonex" diff --git a/meta-selftest/recipes-test/cpp/meson-example/run-ptest b/meta-selftest/recipes-test/cpp/meson-example/run-ptest new file mode 100644 index 00000000000..b1804f00961 --- /dev/null +++ b/meta-selftest/recipes-test/cpp/meson-example/run-ptest @@ -0,0 +1,10 @@ +#!/bin/sh +# +# Copyright OpenEmbedded Contributors +# +# SPDX-License-Identifier: MIT +# + +test-mesonex + +# Note: run-ptests exits with exit value from test-mesonex From patchwork Tue Aug 22 19:20:13 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Adrian Freihofer X-Patchwork-Id: 29269 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from aws-us-west-2-korg-lkml-1.web.codeaurora.org (localhost.localdomain [127.0.0.1]) by smtp.lore.kernel.org (Postfix) with ESMTP id D72C7EE49AF for ; Tue, 22 Aug 2023 19:23:45 +0000 (UTC) Received: from mail-ej1-f49.google.com (mail-ej1-f49.google.com [209.85.218.49]) by mx.groups.io with SMTP id smtpd.web10.5237.1692732225254799920 for ; Tue, 22 Aug 2023 12:23:45 -0700 Authentication-Results: mx.groups.io; dkim=pass header.i=@gmail.com header.s=20221208 header.b=Zi9DIadB; spf=pass (domain: gmail.com, ip: 209.85.218.49, mailfrom: adrian.freihofer@gmail.com) Received: by mail-ej1-f49.google.com with SMTP id a640c23a62f3a-98377c5d53eso614479166b.0 for ; Tue, 22 Aug 2023 12:23:44 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20221208; t=1692732223; x=1693337023; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=r/JU2AOFiMtjJt9nxjy8Xjf4md5X6Dyo8Xa9UuZQhDM=; b=Zi9DIadBEDINUwOo0Wfyhkr7KtPBc9mqBapUmBT3TpjH8sNuIkxz66yyPGav4M+Ga3 DKw7leTG9SINJHOe922MpPbugCn12X0Ui3NhEBC4YzaObEknkXeh/aYLbbwk5YPVkeag OdVv/4LkS97465HWBfWS4ucBfMNQ6GIJBwy9EJR7MmRiwC8IlktAtNNxKA5d/TYlgJm7 BtHhZUjIOk/Oj3yQq3sZO8QtW4ZyT3wVibBaPGRUsdE8DxZKpY0fNcStku7oGWxsq22X zdt2xj+ZVnKQ64AoU7lbDYHwN26IS3ppbQYbvRPcGzo/QYhm96yAjhOAZwg4I1mbc93W CxZg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20221208; t=1692732223; x=1693337023; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=r/JU2AOFiMtjJt9nxjy8Xjf4md5X6Dyo8Xa9UuZQhDM=; b=jDNGrrCUk85+xQwU0hD7efixYXNuQK0Xjb3ZUoCL30h158b5oZLyLgadjcCMobWLJL R2WmwU/DjIlqEEhHrjkriRpuccbHtx6KL40puSoXqkcRve0E2lT6H6Pp7wGBCh39FnVV tX8CbtUFg5wDM5xPfsjK04/EitFFgNFcy4YLblFJUB9tKeb3qUPwAjapGQ3Z2O0nSyh1 jLZk33EPbLgEh3nYbNXMaqoICiaIhzjnI5eSmTSRPyH+xfc44xwOFcNIoXIFVxQs9uB8 JKJih9gjdBjOyN4vSLA3MjKjDm6fpD0iNKGq10T/bHGbEU23PwxedMdslWpifBpIHT83 3CWw== X-Gm-Message-State: AOJu0YwGduuNUaGPZx/UO/qRU/M2gzZxY7I4aUbgtWgJ+YI7w7enTA8B qmX3C3SyEAidsFRUs0bL0i113DB+0AE= X-Google-Smtp-Source: AGHT+IGQzpQGkAza0iLhTD8LfPEeEa7v2ihM3rvtCN3jWPcXrgTZ1Nx5NMqAY1iD1e8eamA0639VCw== X-Received: by 2002:a17:906:5354:b0:99c:5623:a8fb with SMTP id j20-20020a170906535400b0099c5623a8fbmr7698996ejo.18.1692732223463; Tue, 22 Aug 2023 12:23:43 -0700 (PDT) Received: from t14s-af.fritz.box ([2a02:169:59a6:0:dcf2:2f65:9442:83f]) by smtp.gmail.com with ESMTPSA id g24-20020a1709063b1800b0098f99048053sm8744041ejf.148.2023.08.22.12.23.42 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 22 Aug 2023 12:23:43 -0700 (PDT) From: Adrian Freihofer X-Google-Original-From: Adrian Freihofer To: openembedded-core@lists.openembedded.org Cc: Adrian Freihofer Subject: [PATCH v2 07/13] cmake-example: workaround for pseudo breakeage Date: Tue, 22 Aug 2023 21:20:13 +0200 Message-ID: <20230822192300.3235896-8-adrian.freihofer@siemens.com> X-Mailer: git-send-email 2.41.0 In-Reply-To: <20230822192300.3235896-1-adrian.freihofer@siemens.com> References: <20230822192300.3235896-1-adrian.freihofer@siemens.com> MIME-Version: 1.0 List-Id: X-Webhook-Received: from li982-79.members.linode.com [45.33.32.79] by aws-us-west-2-korg-lkml-1.web.codeaurora.org with HTTPS for ; Tue, 22 Aug 2023 19:23:45 -0000 X-Groupsio-URL: https://lists.openembedded.org/g/openembedded-core/message/186530 Signed-off-by: Adrian Freihofer --- meta-selftest/recipes-test/cpp/cmake-example.bb | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/meta-selftest/recipes-test/cpp/cmake-example.bb b/meta-selftest/recipes-test/cpp/cmake-example.bb index 96d543180b4..fbf1f266721 100644 --- a/meta-selftest/recipes-test/cpp/cmake-example.bb +++ b/meta-selftest/recipes-test/cpp/cmake-example.bb @@ -15,3 +15,9 @@ SRC_URI += "\ " FILES:${PN}-ptest += "${bindir}/test-cmake-example" + +# This is a workaround for packages with sources in-tree +# Without this bitbake ... does not work after running the install script. +# newenv['PSEUDO_IGNORE_PATHS'] = newenv['PSEUDO_IGNORE_PATHS'] + "" +# path mismatch [3 links]: ino 37529096 db '/home/adrian/projects/oss/meta-yocto-upstream/projects/poky-oe-glibc-sd/tmp/work/cortexa57-poky-linux/cmake-example/1.0-r0/package/usr/src/debug/cmake-example/1.0-r0/oe-local-files/cmake-example-lib.cpp' req '/home/adrian/projects/oss/meta-yocto-upstream/projects/poky-oe-glibc-sd/workspace/sources/cmake-example/oe-local-files/cmake-example-lib.cpp'. +PACKAGE_DEBUG_SPLIT_STYLE = "debug-without-src" From patchwork Tue Aug 22 19:20:14 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Adrian Freihofer X-Patchwork-Id: 29276 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from aws-us-west-2-korg-lkml-1.web.codeaurora.org (localhost.localdomain [127.0.0.1]) by smtp.lore.kernel.org (Postfix) with ESMTP id EFFC2EE49B3 for ; Tue, 22 Aug 2023 19:23:55 +0000 (UTC) Received: from mail-lj1-f172.google.com (mail-lj1-f172.google.com [209.85.208.172]) by mx.groups.io with SMTP id smtpd.web10.5238.1692732226629626525 for ; Tue, 22 Aug 2023 12:23:46 -0700 Authentication-Results: mx.groups.io; dkim=pass header.i=@gmail.com header.s=20221208 header.b=JlMLVeW/; spf=pass (domain: gmail.com, ip: 209.85.208.172, mailfrom: adrian.freihofer@gmail.com) Received: by mail-lj1-f172.google.com with SMTP id 38308e7fff4ca-2b9a2033978so75508451fa.0 for ; Tue, 22 Aug 2023 12:23:46 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20221208; t=1692732224; x=1693337024; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=19fLgghekqWM22ZBRBUMVm4pfisluZVtZiAq51rVSl8=; b=JlMLVeW/NHVUU8cM0q7Oo8uGZ5a239ZIiXnm4WtpyjOBj1ONJIjGtKZ2CBYoI3u4DV LfsSPJwVmjJYLtcK/k4WIDeSPG1VfoaeQqpZJZN7UXwEGgRfIN+v0j3jFJ1BhuDVwZOw 9+60zm6+8HZYUVss7Dp03amQarCHgS5LLnWhGZCVW+zMWoMzHOdz9xTnwSN23a1AMLX2 KX0r+WWNh1JyjnVny8mz2hAisnffh478rSgJU+bB/GXSp4WgfIUwO2v8TGzjjDfNm6VN ftTh+mQ3QRh6MwelsJ0E9P2GJLJgzmlEESUgIY9UobpZK6twrw4Er+9jcPOJT6EBQAX3 jLeQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20221208; t=1692732224; x=1693337024; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=19fLgghekqWM22ZBRBUMVm4pfisluZVtZiAq51rVSl8=; b=bGGVt9ISWk0owHQ9q19mjxhXmeaCEMr/8Qs0kSuJiC7OPizEkTK2JYytr0oupIk8PA 1EYdo/aBuQah1G51enuoBKJkh0cJ7LSof6tP4E3Iy03Co5RTXBLbnGb8LaatELhfnvXy MR+JGMAfAdBSdu7IfaLL79FJG182HCvn+71DIEZmRS6ks6thi8fFoY2Zm9556Hu4nzMc UvOTMYho37twEy/6mrKA/FLsE41mj3G5NNghISoEPHM1YBcCTpJZBzSNjBF7sVR2UayM Wdh0q6NZ7K4c34G5AyD0jq1mH94pNdyifUZi7GLWD9xc1xaiutLM5jKxPeAitqwAGpGT liNQ== X-Gm-Message-State: AOJu0YzwVmluzSTd97sgezQy+LAx2DKYLHYv6oR6OjC7ZBMi6SSMd24D /owlwBqBepZPKNZbu4gCrr8pB3xMTE8= X-Google-Smtp-Source: AGHT+IHOL0KZGm0dQx39aJS5bzQdZKKTXAYN2OjRGeOR4SERlfHMcqDWrMgNf9JVVbvcLb4j/ELlUw== X-Received: by 2002:a2e:8013:0:b0:2b9:ba75:6620 with SMTP id j19-20020a2e8013000000b002b9ba756620mr7677630ljg.6.1692732224335; Tue, 22 Aug 2023 12:23:44 -0700 (PDT) Received: from t14s-af.fritz.box ([2a02:169:59a6:0:dcf2:2f65:9442:83f]) by smtp.gmail.com with ESMTPSA id g24-20020a1709063b1800b0098f99048053sm8744041ejf.148.2023.08.22.12.23.43 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 22 Aug 2023 12:23:44 -0700 (PDT) From: Adrian Freihofer X-Google-Original-From: Adrian Freihofer To: openembedded-core@lists.openembedded.org Cc: Adrian Freihofer Subject: [PATCH v2 08/13] refactor: make multiprocess_launch callable without d Date: Tue, 22 Aug 2023 21:20:14 +0200 Message-ID: <20230822192300.3235896-9-adrian.freihofer@siemens.com> X-Mailer: git-send-email 2.41.0 In-Reply-To: <20230822192300.3235896-1-adrian.freihofer@siemens.com> References: <20230822192300.3235896-1-adrian.freihofer@siemens.com> MIME-Version: 1.0 List-Id: X-Webhook-Received: from li982-79.members.linode.com [45.33.32.79] by aws-us-west-2-korg-lkml-1.web.codeaurora.org with HTTPS for ; Tue, 22 Aug 2023 19:23:55 -0000 X-Groupsio-URL: https://lists.openembedded.org/g/openembedded-core/message/186531 Signed-off-by: Adrian Freihofer --- meta/lib/oe/package.py | 5 +++-- meta/lib/oe/utils.py | 12 +++++++++--- 2 files changed, 12 insertions(+), 5 deletions(-) diff --git a/meta/lib/oe/package.py b/meta/lib/oe/package.py index 9d70925b9b7..ffca7559ba7 100644 --- a/meta/lib/oe/package.py +++ b/meta/lib/oe/package.py @@ -164,7 +164,8 @@ def strip_execs(pn, dstdir, strip_cmd, libdir, base_libdir, d, qa_already_stripp # ...but is it ELF, and is it already stripped? checkelf.append(file) inodecache[file] = s.st_ino - results = oe.utils.multiprocess_launch(is_elf, checkelf, d) + max_process = int(d.getVar("BB_NUMBER_THREADS") or os.cpu_count() or 1) + results = oe.utils.multiprocess_launch_mp(is_elf, checkelf, max_process) for (file, elf_file) in results: #elf_file = is_elf(file) if elf_file & 1: @@ -192,7 +193,7 @@ def strip_execs(pn, dstdir, strip_cmd, libdir, base_libdir, d, qa_already_stripp elf_file = int(elffiles[file]) sfiles.append((file, elf_file, strip_cmd)) - oe.utils.multiprocess_launch(runstrip, sfiles, d) + oe.utils.multiprocess_launch_mp(runstrip, sfiles, max_process) def file_translate(file): diff --git a/meta/lib/oe/utils.py b/meta/lib/oe/utils.py index 69ca8987f3d..430e874d90a 100644 --- a/meta/lib/oe/utils.py +++ b/meta/lib/oe/utils.py @@ -264,10 +264,17 @@ def execute_pre_post_process(d, cmds): bb.note("Executing %s ..." % cmd) bb.build.exec_func(cmd, d) -# For each item in items, call the function 'target' with item as the first +def multiprocess_launch_max_process(d): + return int(d.getVar("BB_NUMBER_THREADS") or os.cpu_count() or 1) + +def multiprocess_launch(target, items, d, extraargs=None): + max_process = multiprocess_launch_max_process(d) + return multiprocess_launch_mp(target, items, max_process, extraargs) + +# For each item in items, call the function 'target' with item as the first # argument, extraargs as the other arguments and handle any exceptions in the # parent thread -def multiprocess_launch(target, items, d, extraargs=None): +def multiprocess_launch_mp(target, items, max_process, extraargs=None): class ProcessLaunch(multiprocessing.Process): def __init__(self, *args, **kwargs): @@ -302,7 +309,6 @@ def multiprocess_launch(target, items, d, extraargs=None): self.update() return self._result - max_process = int(d.getVar("BB_NUMBER_THREADS") or os.cpu_count() or 1) launched = [] errors = [] results = [] From patchwork Tue Aug 22 19:20:15 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Adrian Freihofer X-Patchwork-Id: 29280 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from aws-us-west-2-korg-lkml-1.web.codeaurora.org (localhost.localdomain [127.0.0.1]) by smtp.lore.kernel.org (Postfix) with ESMTP id 1520DEE49B4 for ; Tue, 22 Aug 2023 19:23:56 +0000 (UTC) Received: from mail-ej1-f54.google.com (mail-ej1-f54.google.com [209.85.218.54]) by mx.groups.io with SMTP id smtpd.web11.5313.1692732226878226821 for ; Tue, 22 Aug 2023 12:23:47 -0700 Authentication-Results: mx.groups.io; dkim=pass header.i=@gmail.com header.s=20221208 header.b=fdRW2+a8; spf=pass (domain: gmail.com, ip: 209.85.218.54, mailfrom: adrian.freihofer@gmail.com) Received: by mail-ej1-f54.google.com with SMTP id a640c23a62f3a-99bdeae1d0aso643619366b.1 for ; Tue, 22 Aug 2023 12:23:46 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20221208; t=1692732225; x=1693337025; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=oh/oWmI5NxCsZhxz9NsVtSOvMlWbflWmbtdhRAaNyO8=; b=fdRW2+a8L2mR9ha4P0/2Htzs5nTP9HSDybCf0WTRdKJGw0fUSdpnsYgRLtbaob9wJQ hJBefwO0XNH2tDAqIb+QpqH0FKVtefqXr7+dPfcLnU0yItxojbq2LenyKUlBc98ZIeY8 wL3Y4cXCspn5tJgcU4weRAr0SeK21MbaxSSP2hr1iDQQUvQ1yDNHga04VV1TCrCF2tjc nsYTuahu9/lOnO48OpHw+hIsLO16VCuKTY5aN9aVTMWBOIytwWI1p/aMhp4bTn1LSb21 O+t/d7Txw6JtO/U/Z1xCA/+KY168yRAex11LDclge933sdKExsG/jDjjFLoufHDVNJsU 04lA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20221208; t=1692732225; x=1693337025; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=oh/oWmI5NxCsZhxz9NsVtSOvMlWbflWmbtdhRAaNyO8=; b=D9BZYacN0nF+mD9RGoQIG0VXH4YelALXkWqDtAFs2DrJcO2m+xm5bkR0+wgGwuzvuz 5r6jUUOsvJHINYDl2SvfNmijyXOwQK4kNX7ohHm88F8spOcOO1lzwqT7UaN2WI1YSiPB NsurR5PSG1yQh047OyQ44oUR8FLqdC1XS7n3g7u7uAQ/LIVG0ecriowcV7pVfja8xBNK Wlet0n3ME4NaIdzAWMSI0Xdxz+7LjRk0W3PSsfkiYzty10Z+XTY2JYN4DJPuhfw30ndd PQpg7f0zABuSJ1WbrJbVcb5IQL9muh2A1lq0yol0h0YPlIe/p2dydnAjHJOQliGDUCEL Yo4w== X-Gm-Message-State: AOJu0YzCZaeiI+6rrz79v10TpZK3gu2dLFzoW0l+DrwN/ixBcgm3H74b 9QFhDXycNXf7VGcapCrf/Mxqc80dw/U= X-Google-Smtp-Source: AGHT+IH7au5mz2l5oYLyYqxMx683FEH2YE7ccUQWHjzvfvzgtH1uRXupd4u6gmAV0q+W0OUTVVa2GQ== X-Received: by 2002:a17:906:3003:b0:99d:f2dc:97e3 with SMTP id 3-20020a170906300300b0099df2dc97e3mr8815766ejz.20.1692732225124; Tue, 22 Aug 2023 12:23:45 -0700 (PDT) Received: from t14s-af.fritz.box ([2a02:169:59a6:0:dcf2:2f65:9442:83f]) by smtp.gmail.com with ESMTPSA id g24-20020a1709063b1800b0098f99048053sm8744041ejf.148.2023.08.22.12.23.44 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 22 Aug 2023 12:23:44 -0700 (PDT) From: Adrian Freihofer X-Google-Original-From: Adrian Freihofer To: openembedded-core@lists.openembedded.org Cc: Adrian Freihofer Subject: [PATCH v2 09/13] refactor: make strip_execs callable without d Date: Tue, 22 Aug 2023 21:20:15 +0200 Message-ID: <20230822192300.3235896-10-adrian.freihofer@siemens.com> X-Mailer: git-send-email 2.41.0 In-Reply-To: <20230822192300.3235896-1-adrian.freihofer@siemens.com> References: <20230822192300.3235896-1-adrian.freihofer@siemens.com> MIME-Version: 1.0 List-Id: X-Webhook-Received: from li982-79.members.linode.com [45.33.32.79] by aws-us-west-2-korg-lkml-1.web.codeaurora.org with HTTPS for ; Tue, 22 Aug 2023 19:23:56 -0000 X-Groupsio-URL: https://lists.openembedded.org/g/openembedded-core/message/186532 Signed-off-by: Adrian Freihofer --- meta/classes-global/staging.bbclass | 3 ++- meta/lib/oe/package.py | 4 ++-- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/meta/classes-global/staging.bbclass b/meta/classes-global/staging.bbclass index 3a300c32e7c..7f4075a5f6e 100644 --- a/meta/classes-global/staging.bbclass +++ b/meta/classes-global/staging.bbclass @@ -92,7 +92,8 @@ python sysroot_strip () { qa_already_stripped = 'already-stripped' in (d.getVar('INSANE_SKIP:' + pn) or "").split() strip_cmd = d.getVar("STRIP") - oe.package.strip_execs(pn, dstdir, strip_cmd, libdir, base_libdir, d, + max_process = oe.utils.multiprocess_launch_max_process(d) + oe.package.strip_execs(pn, dstdir, strip_cmd, libdir, base_libdir, max_process, qa_already_stripped=qa_already_stripped) } diff --git a/meta/lib/oe/package.py b/meta/lib/oe/package.py index ffca7559ba7..1dd20f85ebd 100644 --- a/meta/lib/oe/package.py +++ b/meta/lib/oe/package.py @@ -114,7 +114,7 @@ def is_static_lib(path): return start == magic return False -def strip_execs(pn, dstdir, strip_cmd, libdir, base_libdir, d, qa_already_stripped=False): +def strip_execs(pn, dstdir, strip_cmd, libdir, base_libdir, max_process, qa_already_stripped=False): """ Strip executable code (like executables, shared libraries) _in_place_ - Based on sysroot_strip in staging.bbclass @@ -122,6 +122,7 @@ def strip_execs(pn, dstdir, strip_cmd, libdir, base_libdir, d, qa_already_stripp :param strip_cmd: Strip command (usually ${STRIP}) :param libdir: ${libdir} - strip .so files in this directory :param base_libdir: ${base_libdir} - strip .so files in this directory + :param max_process: number of stripping processes started in parallel :param qa_already_stripped: Set to True if already-stripped' in ${INSANE_SKIP} This is for proper logging and messages only. """ @@ -164,7 +165,6 @@ def strip_execs(pn, dstdir, strip_cmd, libdir, base_libdir, d, qa_already_stripp # ...but is it ELF, and is it already stripped? checkelf.append(file) inodecache[file] = s.st_ino - max_process = int(d.getVar("BB_NUMBER_THREADS") or os.cpu_count() or 1) results = oe.utils.multiprocess_launch_mp(is_elf, checkelf, max_process) for (file, elf_file) in results: #elf_file = is_elf(file) From patchwork Tue Aug 22 19:20:16 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Adrian Freihofer X-Patchwork-Id: 29281 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from aws-us-west-2-korg-lkml-1.web.codeaurora.org (localhost.localdomain [127.0.0.1]) by smtp.lore.kernel.org (Postfix) with ESMTP id 0D02EEE49B2 for ; Tue, 22 Aug 2023 19:23:56 +0000 (UTC) Received: from mail-ej1-f51.google.com (mail-ej1-f51.google.com [209.85.218.51]) by mx.groups.io with SMTP id smtpd.web10.5239.1692732227792273082 for ; Tue, 22 Aug 2023 12:23:48 -0700 Authentication-Results: mx.groups.io; dkim=pass header.i=@gmail.com header.s=20221208 header.b=KldOBI2z; spf=pass (domain: gmail.com, ip: 209.85.218.51, mailfrom: adrian.freihofer@gmail.com) Received: by mail-ej1-f51.google.com with SMTP id a640c23a62f3a-99c1d03e124so613566666b.2 for ; Tue, 22 Aug 2023 12:23:47 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20221208; t=1692732226; x=1693337026; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=Jy8i1/A44FHlgQLN08tx4d2NioWfPZimdixvZe0CbjI=; b=KldOBI2zT+JSfDIQUp/yYSrSh31FputiOLuKkduaQiIyIAeYpvY7DrZ5oqkthtKtYK nMVz0DLNZHT8R/L13taErns2bGSFzFxtWBUcsw+jKzxW3BiWee5z3iV0SiDiizyDMK2Z 1c0QPOCi0tkkHKVygKQUPfDkfP3jZJf8NKuPwiZbZaAJn3eG0K40JAvd7nzS19X76hSz BP0hSTwcGRW9jsUFIb5CYky3Z6TOUUU1s2+qtNeeGJhI7uynckLq2JX+E6bC0uidzt8s LJ95NWvkC8g0OuipfWx0icc4yF48HHuUkhiihH0aq4nJ8jUdlGvkvMM8ufutSCGnzThE pu0A== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20221208; t=1692732226; x=1693337026; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=Jy8i1/A44FHlgQLN08tx4d2NioWfPZimdixvZe0CbjI=; b=X4RMyZ3ZA8OXLCnh1XHOXWF/QlVJbYSA2H3fFDocRvQyQLd79Xkygtxkaw/4sKLivz wzCHZJu8fyeWOqRrDIprEBntjC7GfFZZxHJzqU7VEVTOfZOkJk4KwnEVU6oSPp4Tnqt1 AFpPG0DYeeMDMuds+b9Pf1jvZIuv3tI1cEUC8YqSSfciI69nHqtToPEFiVcn5z0W+2LP V4+j2r6GpTelpadsdm7k2MrwfwBjEg7orMAYPGuPdO22JFdM11oyRFTBJtChfHP1YbUJ khHiR371epY7nJAAl7SLez88SHEtyBuxqujl5JPTdqMpw63Q2U8SEPp/FnarQQh+3dgI 669g== X-Gm-Message-State: AOJu0YydegAhZsomAQ7JBpi7RYPZeT6B7fxLP4Ycby7Q+qyyz8Kju5vz eiMxM3wveZSSNkwqC1ODw5hGWzbBv4I= X-Google-Smtp-Source: AGHT+IEbsLJIkwmO7LsCfCA/PmDG8r0W4U4M+dVCccyq8VeA+b5w0DcV0U1VlD+NbeIZkuvXPK18Xw== X-Received: by 2002:a17:906:59:b0:99e:1050:b72f with SMTP id 25-20020a170906005900b0099e1050b72fmr8384745ejg.51.1692732225865; Tue, 22 Aug 2023 12:23:45 -0700 (PDT) Received: from t14s-af.fritz.box ([2a02:169:59a6:0:dcf2:2f65:9442:83f]) by smtp.gmail.com with ESMTPSA id g24-20020a1709063b1800b0098f99048053sm8744041ejf.148.2023.08.22.12.23.45 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 22 Aug 2023 12:23:45 -0700 (PDT) From: Adrian Freihofer X-Google-Original-From: Adrian Freihofer To: openembedded-core@lists.openembedded.org Cc: Adrian Freihofer Subject: [PATCH v2 10/13] devtool: refactor deploy-target Date: Tue, 22 Aug 2023 21:20:16 +0200 Message-ID: <20230822192300.3235896-11-adrian.freihofer@siemens.com> X-Mailer: git-send-email 2.41.0 In-Reply-To: <20230822192300.3235896-1-adrian.freihofer@siemens.com> References: <20230822192300.3235896-1-adrian.freihofer@siemens.com> MIME-Version: 1.0 List-Id: X-Webhook-Received: from li982-79.members.linode.com [45.33.32.79] by aws-us-west-2-korg-lkml-1.web.codeaurora.org with HTTPS for ; Tue, 22 Aug 2023 19:23:56 -0000 X-Groupsio-URL: https://lists.openembedded.org/g/openembedded-core/message/186533 Signed-off-by: Adrian Freihofer --- scripts/lib/devtool/__init__.py | 5 +- scripts/lib/devtool/deploy.py | 230 +++++++++++++++++--------------- 2 files changed, 124 insertions(+), 111 deletions(-) diff --git a/scripts/lib/devtool/__init__.py b/scripts/lib/devtool/__init__.py index 702db669de3..7d64547616e 100644 --- a/scripts/lib/devtool/__init__.py +++ b/scripts/lib/devtool/__init__.py @@ -78,12 +78,15 @@ def exec_fakeroot(d, cmd, **kwargs): """Run a command under fakeroot (pseudo, in fact) so that it picks up the appropriate file permissions""" # Grab the command and check it actually exists fakerootcmd = d.getVar('FAKEROOTCMD') + fakerootenv = d.getVar('FAKEROOTENV') + exec_fakeroot_no_d(fakerootcmd, fakerootenv, cmd, kwargs) + +def exec_fakeroot_no_d(fakerootcmd, fakerootenv, cmd, **kwargs): if not os.path.exists(fakerootcmd): logger.error('pseudo executable %s could not be found - have you run a build yet? pseudo-native should install this and if you have run any build then that should have been built') return 2 # Set up the appropriate environment newenv = dict(os.environ) - fakerootenv = d.getVar('FAKEROOTENV') for varvalue in fakerootenv.split(): if '=' in varvalue: splitval = varvalue.split('=', 1) diff --git a/scripts/lib/devtool/deploy.py b/scripts/lib/devtool/deploy.py index e14a5874177..ea7e2cb1ae8 100644 --- a/scripts/lib/devtool/deploy.py +++ b/scripts/lib/devtool/deploy.py @@ -16,7 +16,7 @@ import bb.utils import argparse_oe import oe.types -from devtool import exec_fakeroot, setup_tinfoil, check_workspace_recipe, DevtoolError +from devtool import exec_fakeroot_no_d, setup_tinfoil, check_workspace_recipe, DevtoolError logger = logging.getLogger('devtool') @@ -133,16 +133,11 @@ def _prepare_remote_script(deploy, verbose=False, dryrun=False, undeployall=Fals return '\n'.join(lines) - - -def deploy(args, config, basepath, workspace): - """Entry point for the devtool 'deploy' subcommand""" +def deploy_cached(srcdir, workdir, path, strip_cmd, libdir, base_libdir, max_process, fakerootcmd, fakerootenv, args): import math import oe.recipeutils import oe.package - check_workspace_recipe(workspace, args.recipename, checksrc=False) - try: host, destdir = args.target.split(':') except ValueError: @@ -152,116 +147,131 @@ def deploy(args, config, basepath, workspace): if not destdir.endswith('/'): destdir += '/' + recipe_outdir = srcdir + if not os.path.exists(recipe_outdir) or not os.listdir(recipe_outdir): + raise DevtoolError('No files to deploy - have you built the %s ' + 'recipe? If so, the install step has not installed ' + 'any files.' % args.recipename) + + if args.strip and not args.dry_run: + # Fakeroot copy to new destination + srcdir = recipe_outdir + recipe_outdir = os.path.join(workdir, 'devtool-deploy-target-stripped') + if os.path.isdir(recipe_outdir): + exec_fakeroot_no_d(fakerootcmd, fakerootenv, "rm -rf %s" % recipe_outdir, shell=True) + exec_fakeroot_no_d(fakerootcmd, fakerootenv, "cp -af %s %s" % (os.path.join(srcdir, '.'), recipe_outdir), shell=True) + os.environ['PATH'] = ':'.join([os.environ['PATH'], path or '']) + oe.package.strip_execs(args.recipename, recipe_outdir, strip_cmd, libdir, base_libdir, max_process) + + filelist = [] + inodes = set({}) + ftotalsize = 0 + for root, _, files in os.walk(recipe_outdir): + for fn in files: + fstat = os.lstat(os.path.join(root, fn)) + # Get the size in kiB (since we'll be comparing it to the output of du -k) + # MUST use lstat() here not stat() or getfilesize() since we don't want to + # dereference symlinks + if fstat.st_ino in inodes: + fsize = 0 + else: + fsize = int(math.ceil(float(fstat.st_size)/1024)) + inodes.add(fstat.st_ino) + ftotalsize += fsize + # The path as it would appear on the target + fpath = os.path.join(destdir, os.path.relpath(root, recipe_outdir), fn) + filelist.append((fpath, fsize)) + + if args.dry_run: + print('Files to be deployed for %s on target %s:' % (args.recipename, args.target)) + for item, _ in filelist: + print(' %s' % item) + return 0 + + extraoptions = '' + if args.no_host_check: + extraoptions += '-o UserKnownHostsFile=/dev/null -o StrictHostKeyChecking=no' + if not args.show_status: + extraoptions += ' -q' + + scp_sshexec = '' + ssh_sshexec = 'ssh' + if args.ssh_exec: + scp_sshexec = "-S %s" % args.ssh_exec + ssh_sshexec = args.ssh_exec + scp_port = '' + ssh_port = '' + if args.port: + scp_port = "-P %s" % args.port + ssh_port = "-p %s" % args.port + + if args.key: + extraoptions += ' -i %s' % args.key + + # In order to delete previously deployed files and have the manifest file on + # the target, we write out a shell script and then copy it to the target + # so we can then run it (piping tar output to it). + # (We cannot use scp here, because it doesn't preserve symlinks.) + tmpdir = tempfile.mkdtemp(prefix='devtool') + try: + tmpscript = '/tmp/devtool_deploy.sh' + tmpfilelist = os.path.join(os.path.dirname(tmpscript), 'devtool_deploy.list') + shellscript = _prepare_remote_script(deploy=True, + verbose=args.show_status, + nopreserve=args.no_preserve, + nocheckspace=args.no_check_space) + # Write out the script to a file + with open(os.path.join(tmpdir, os.path.basename(tmpscript)), 'w') as f: + f.write(shellscript) + # Write out the file list + with open(os.path.join(tmpdir, os.path.basename(tmpfilelist)), 'w') as f: + f.write('%d\n' % ftotalsize) + for fpath, fsize in filelist: + f.write('%s %d\n' % (fpath, fsize)) + # Copy them to the target + ret = subprocess.call("scp %s %s %s %s/* %s:%s" % (scp_sshexec, scp_port, extraoptions, tmpdir, args.target, os.path.dirname(tmpscript)), shell=True) + if ret != 0: + raise DevtoolError('Failed to copy script to %s - rerun with -s to ' + 'get a complete error message' % args.target) + finally: + shutil.rmtree(tmpdir) + + # Now run the script + ret = exec_fakeroot_no_d(fakerootcmd, fakerootenv, 'tar cf - . | %s %s %s %s \'sh %s %s %s %s\'' % (ssh_sshexec, ssh_port, extraoptions, args.target, tmpscript, args.recipename, destdir, tmpfilelist), cwd=recipe_outdir, shell=True) + if ret != 0: + raise DevtoolError('Deploy failed - rerun with -s to get a complete ' + 'error message') + + logger.info('Successfully deployed %s' % recipe_outdir) + + files_list = [] + for root, _, files in os.walk(recipe_outdir): + for filename in files: + filename = os.path.relpath(os.path.join(root, filename), recipe_outdir) + files_list.append(os.path.join(destdir, filename)) + +def deploy(args, config, basepath, workspace): + """Entry point for the devtool 'deploy' subcommand""" + check_workspace_recipe(workspace, args.recipename, checksrc=False) + tinfoil = setup_tinfoil(basepath=basepath) try: try: rd = tinfoil.parse_recipe(args.recipename) + + srcdir = rd.getVar('D') + workdir = rd.getVar('WORKDIR') + path = rd.getVar('PATH') + strip_cmd = rd.getVar('STRIP') + libdir = rd.getVar('libdir'), + base_libdir = rd.getVar('base_libdir') + max_process = int(rd.getVar("BB_NUMBER_THREADS") or os.cpu_count() or 1) + fakerootcmd = rd.getVar('FAKEROOTCMD') + fakerootenv = rd.getVar('FAKEROOTENV') + deploy_cached(srcdir, workdir, path, strip_cmd, libdir, base_libdir, max_process, fakerootcmd, fakerootenv, args) except Exception as e: raise DevtoolError('Exception parsing recipe %s: %s' % (args.recipename, e)) - recipe_outdir = rd.getVar('D') - if not os.path.exists(recipe_outdir) or not os.listdir(recipe_outdir): - raise DevtoolError('No files to deploy - have you built the %s ' - 'recipe? If so, the install step has not installed ' - 'any files.' % args.recipename) - - if args.strip and not args.dry_run: - # Fakeroot copy to new destination - srcdir = recipe_outdir - recipe_outdir = os.path.join(rd.getVar('WORKDIR'), 'devtool-deploy-target-stripped') - if os.path.isdir(recipe_outdir): - exec_fakeroot(rd, "rm -rf %s" % recipe_outdir, shell=True) - exec_fakeroot(rd, "cp -af %s %s" % (os.path.join(srcdir, '.'), recipe_outdir), shell=True) - os.environ['PATH'] = ':'.join([os.environ['PATH'], rd.getVar('PATH') or '']) - oe.package.strip_execs(args.recipename, recipe_outdir, rd.getVar('STRIP'), rd.getVar('libdir'), - rd.getVar('base_libdir'), rd) - - filelist = [] - inodes = set({}) - ftotalsize = 0 - for root, _, files in os.walk(recipe_outdir): - for fn in files: - fstat = os.lstat(os.path.join(root, fn)) - # Get the size in kiB (since we'll be comparing it to the output of du -k) - # MUST use lstat() here not stat() or getfilesize() since we don't want to - # dereference symlinks - if fstat.st_ino in inodes: - fsize = 0 - else: - fsize = int(math.ceil(float(fstat.st_size)/1024)) - inodes.add(fstat.st_ino) - ftotalsize += fsize - # The path as it would appear on the target - fpath = os.path.join(destdir, os.path.relpath(root, recipe_outdir), fn) - filelist.append((fpath, fsize)) - - if args.dry_run: - print('Files to be deployed for %s on target %s:' % (args.recipename, args.target)) - for item, _ in filelist: - print(' %s' % item) - return 0 - - extraoptions = '' - if args.no_host_check: - extraoptions += '-o UserKnownHostsFile=/dev/null -o StrictHostKeyChecking=no' - if not args.show_status: - extraoptions += ' -q' - - scp_sshexec = '' - ssh_sshexec = 'ssh' - if args.ssh_exec: - scp_sshexec = "-S %s" % args.ssh_exec - ssh_sshexec = args.ssh_exec - scp_port = '' - ssh_port = '' - if args.port: - scp_port = "-P %s" % args.port - ssh_port = "-p %s" % args.port - - if args.key: - extraoptions += ' -i %s' % args.key - - # In order to delete previously deployed files and have the manifest file on - # the target, we write out a shell script and then copy it to the target - # so we can then run it (piping tar output to it). - # (We cannot use scp here, because it doesn't preserve symlinks.) - tmpdir = tempfile.mkdtemp(prefix='devtool') - try: - tmpscript = '/tmp/devtool_deploy.sh' - tmpfilelist = os.path.join(os.path.dirname(tmpscript), 'devtool_deploy.list') - shellscript = _prepare_remote_script(deploy=True, - verbose=args.show_status, - nopreserve=args.no_preserve, - nocheckspace=args.no_check_space) - # Write out the script to a file - with open(os.path.join(tmpdir, os.path.basename(tmpscript)), 'w') as f: - f.write(shellscript) - # Write out the file list - with open(os.path.join(tmpdir, os.path.basename(tmpfilelist)), 'w') as f: - f.write('%d\n' % ftotalsize) - for fpath, fsize in filelist: - f.write('%s %d\n' % (fpath, fsize)) - # Copy them to the target - ret = subprocess.call("scp %s %s %s %s/* %s:%s" % (scp_sshexec, scp_port, extraoptions, tmpdir, args.target, os.path.dirname(tmpscript)), shell=True) - if ret != 0: - raise DevtoolError('Failed to copy script to %s - rerun with -s to ' - 'get a complete error message' % args.target) - finally: - shutil.rmtree(tmpdir) - - # Now run the script - ret = exec_fakeroot(rd, 'tar cf - . | %s %s %s %s \'sh %s %s %s %s\'' % (ssh_sshexec, ssh_port, extraoptions, args.target, tmpscript, args.recipename, destdir, tmpfilelist), cwd=recipe_outdir, shell=True) - if ret != 0: - raise DevtoolError('Deploy failed - rerun with -s to get a complete ' - 'error message') - - logger.info('Successfully deployed %s' % recipe_outdir) - - files_list = [] - for root, _, files in os.walk(recipe_outdir): - for filename in files: - filename = os.path.relpath(os.path.join(root, filename), recipe_outdir) - files_list.append(os.path.join(destdir, filename)) finally: tinfoil.shutdown() From patchwork Tue Aug 22 19:20:17 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Adrian Freihofer X-Patchwork-Id: 29279 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from aws-us-west-2-korg-lkml-1.web.codeaurora.org (localhost.localdomain [127.0.0.1]) by smtp.lore.kernel.org (Postfix) with ESMTP id 0D726EE49B5 for ; Tue, 22 Aug 2023 19:23:56 +0000 (UTC) Received: from mail-ej1-f49.google.com (mail-ej1-f49.google.com [209.85.218.49]) by mx.groups.io with SMTP id smtpd.web10.5240.1692732228514222542 for ; Tue, 22 Aug 2023 12:23:48 -0700 Authentication-Results: mx.groups.io; dkim=pass header.i=@gmail.com header.s=20221208 header.b=dFWA6LJy; spf=pass (domain: gmail.com, ip: 209.85.218.49, mailfrom: adrian.freihofer@gmail.com) Received: by mail-ej1-f49.google.com with SMTP id a640c23a62f3a-99df431d4bfso626968166b.1 for ; Tue, 22 Aug 2023 12:23:48 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20221208; t=1692732227; x=1693337027; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=P1SnTuAhFxDpsGGX8wM7sKL+0XZkEv7Dw30w3L3RU5E=; b=dFWA6LJyRh1Swe13UqpenlzqCGRAEHmP11wW+HeOjzihvhANR4hnQsvlsPW42BawOH hHLYPltQ1Knf4wiYgyrowTiPqhEiEyDFwzea+cnpowyNYFOYzsKBA2zdko2MOTm1DUh5 EJ2I/KsH/pn2YHBhHQby6ZCtCOcGn8otnCs1Y/jw2XR0ABBO4Oslw8p2XMyh+S58o3na 1Wql4zo4nY9NjjVETZSc8C+fOmoTKQj7ezj7s9KyTWAIH9rCQRCKER14D3R741aK+bXv G6i+DvNtXZQx0sxCguQRcCWCHwkWAcQI/95tQ9AOmDZiiRxBdlX410uSr+e4FSuw6Qgy W+MA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20221208; t=1692732227; x=1693337027; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=P1SnTuAhFxDpsGGX8wM7sKL+0XZkEv7Dw30w3L3RU5E=; b=csHY4OSZHihLZh1e5WoSrcLtiVHXWz1AaOvaFgZzZ6n6wFQsIgWmQCwECPhhCU//7X fS2LLcr9TC4/z2npdRI5JXcPwL6Z4v8hTslprrvJ0gRQMGNs+mZMXwJfHKmPJrrQymb/ yOqMhL1XagXf3vnarUDkLV9kQ7UgjHOfDsOJYLlzyIsVc59P6xYAUl7GgIMA3S6WDGgq x7mGiX4Y8W13817Hm+Ysw/RscsS4R3E7mmTDCpXzJjpcMq15NoBkDmMtcdnji62+lLCd 6VaJxXUoA3drthi64zWFMGvNDGQfzhTNJ+6nS1UWvby2Zj84oG4x17EfnktQXJ9d+373 WckQ== X-Gm-Message-State: AOJu0Yyq1UXZRhMuK2D0vbgUFj3sBE6iEsjKI/F+9gbZ/pAPWJkuyo2I BQI0znkZd5X0Wx3fNcY4oN7y9pCL8iQ= X-Google-Smtp-Source: AGHT+IHgCKe/RLJRqvgiHyJifex9I9AjbLZRDxqfusaOQD6ViMHn+ikP86/WAXfcr4Fu2LibSyrGeA== X-Received: by 2002:a17:906:295:b0:993:e809:b9ff with SMTP id 21-20020a170906029500b00993e809b9ffmr8717608ejf.21.1692732226654; Tue, 22 Aug 2023 12:23:46 -0700 (PDT) Received: from t14s-af.fritz.box ([2a02:169:59a6:0:dcf2:2f65:9442:83f]) by smtp.gmail.com with ESMTPSA id g24-20020a1709063b1800b0098f99048053sm8744041ejf.148.2023.08.22.12.23.45 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 22 Aug 2023 12:23:46 -0700 (PDT) From: Adrian Freihofer X-Google-Original-From: Adrian Freihofer To: openembedded-core@lists.openembedded.org Cc: Adrian Freihofer Subject: [PATCH v2 11/13] devtool: ide make deploy-target quicker Date: Tue, 22 Aug 2023 21:20:17 +0200 Message-ID: <20230822192300.3235896-12-adrian.freihofer@siemens.com> X-Mailer: git-send-email 2.41.0 In-Reply-To: <20230822192300.3235896-1-adrian.freihofer@siemens.com> References: <20230822192300.3235896-1-adrian.freihofer@siemens.com> MIME-Version: 1.0 List-Id: X-Webhook-Received: from li982-79.members.linode.com [45.33.32.79] by aws-us-west-2-korg-lkml-1.web.codeaurora.org with HTTPS for ; Tue, 22 Aug 2023 19:23:56 -0000 X-Groupsio-URL: https://lists.openembedded.org/g/openembedded-core/message/186534 Instead of calling devtool deploy-target which starts a bitbake server to get some variables the previous refactoring allows to generate a simple script which does no longer depend on variables from bitbake. This is much faster. --- scripts/lib/devtool/ide.py | 115 ++++++++++++++++++------------------- 1 file changed, 55 insertions(+), 60 deletions(-) diff --git a/scripts/lib/devtool/ide.py b/scripts/lib/devtool/ide.py index 7c7040232c4..9c724509d48 100755 --- a/scripts/lib/devtool/ide.py +++ b/scripts/lib/devtool/ide.py @@ -9,6 +9,7 @@ import os import stat +import sys import logging import json import re @@ -360,15 +361,19 @@ class RecipeModified: self.bbappend = None # recipe variables from d.getVar self.b = None + self.base_libdir = None self.bpn = None self.d = None self.fakerootcmd = None self.fakerootenv = None + self.libdir = None + self.max_process = None self.package_arch = None self.path = None self.recipe_sysroot = None self.recipe_sysroot_native = None self.staging_incdir = None + self.strip_cmd = None self.target_arch = None self.workdir = None # replicate bitbake build environment @@ -387,11 +392,6 @@ class RecipeModified: self.meson_cross_file = None # vscode self.dot_code_dir = None - # TODO: remove calling devtool - self.bb_env_passthrough_additions = None - self.bbpath = None - self.bitbakepath = None - self.topdir = None def initialize(self, config, workspace, tinfoil): recipe_d = parse_recipe( @@ -413,10 +413,14 @@ class RecipeModified: shutil.rmtree(self.temp_dir) self.b = recipe_d.getVar('B') + self.base_libdir = recipe_d.getVar('base_libdir') self.bpn = recipe_d.getVar('BPN') self.d = recipe_d.getVar('D') self.fakerootcmd = recipe_d.getVar('FAKEROOTCMD') self.fakerootenv = recipe_d.getVar('FAKEROOTENV') + self.libdir = recipe_d.getVar('libdir'), + self.max_process = int(recipe_d.getVar( + "BB_NUMBER_THREADS") or os.cpu_count() or 1) self.package_arch = recipe_d.getVar('PACKAGE_ARCH') self.path = recipe_d.getVar('PATH') self.recipe_sysroot = os.path.realpath( @@ -425,15 +429,10 @@ class RecipeModified: recipe_d.getVar('RECIPE_SYSROOT_NATIVE')) self.staging_incdir = os.path.realpath( recipe_d.getVar('STAGING_INCDIR')) + self.strip_cmd = recipe_d.getVar('STRIP') self.target_arch = recipe_d.getVar('TARGET_ARCH') self.workdir = os.path.realpath(recipe_d.getVar('WORKDIR')) - self.bb_env_passthrough_additions = recipe_d.getVar( - 'BB_ENV_PASSTHROUGH_ADDITIONS') - self.bbpath = recipe_d.getVar('BBPATH') - self.bitbakepath = recipe_d.getVar('BITBAKEPATH') - self.topdir = recipe_d.getVar('TOPDIR') - self.__init_exported_variables(recipe_d) if bb.data.inherits_class('cmake', recipe_d): @@ -971,6 +970,38 @@ class RecipeModified: cmd_lines.append(install_cmd) return self.write_script(cmd_lines, 'bb_run_do_install') + def gen_deploy_target_script(self, args): + """Generate a quicker (works without tinfoil) variant of devtool target-deploy""" + cmd_lines = ['#!/usr/bin/env python3'] + cmd_lines.append('import sys') + cmd_lines.append('devtool_sys_path = %s' % str(sys.path)) + cmd_lines.append('devtool_sys_path.reverse()') + cmd_lines.append('for p in devtool_sys_path:') + cmd_lines.append(' if p not in sys.path:') + cmd_lines.append(' sys.path.insert(0, p)') + cmd_lines.append('from devtool.deploy import deploy_cached') + args_filter = ['debug', 'dry_run', 'key', 'no_check_space', 'no_host_check', + 'no_preserve', 'port', 'recipename', 'show_status', 'ssh_exec', 'strip', 'target'] + filtered_args_dict = {key: value for key, value in vars( + args).items() if key in args_filter} + cmd_lines.append('filtered_args_dict = %s' % str(filtered_args_dict)) + cmd_lines.append('class Dict2Class(object):') + cmd_lines.append(' def __init__(self, my_dict):') + cmd_lines.append(' for key in my_dict:') + cmd_lines.append(' setattr(self, key, my_dict[key])') + cmd_lines.append('filtered_args = Dict2Class(filtered_args_dict)') + cmd_lines.append('deploy_cached("%s", "%s", "%s", "%s", "%s", "%s", %d, "%s", "%s", filtered_args)' % + (self.d, self.workdir, self.path, self.strip_cmd, + self.libdir, self.base_libdir, self.max_process, + self.fakerootcmd, self.fakerootenv)) + return self.write_script(cmd_lines, 'deploy_target') + + def gen_install_deploy_script(self, args): + cmd_lines = ['#!/bin/sh'] + cmd_lines.append(self.gen_fakeroot_install_script()) + cmd_lines.append(self.gen_deploy_target_script(args)) + return self.write_script(cmd_lines, 'install_and_deploy') + def write_script(self, cmd_lines, script_name): bb.utils.mkdirhier(self.temp_dir) script_file = os.path.join(self.temp_dir, script_name) @@ -981,61 +1012,15 @@ class RecipeModified: return script_file def vscode_tasks(self, args, gdb_cross): - run_do_install = self.gen_fakeroot_install_script() - pythonpath_new = os.path.realpath( - os.path.join(self.bitbakepath, '../lib')) - try: - pythonpath = os.environ['PYTONPATH'].split(':') - if pythonpath_new not in pythonpath: - pythonpath = pythonpath_new + ":" + pythonpath - except KeyError: - pythonpath = pythonpath_new - install_label = "do_install %s" % self.bpn - deploy_label = "devtool deploy-target %s" % self.bpn - bb_env = { - # "BBPATH": self.bbpath, - "PYTHONPATH": pythonpath, - "BUILDDIR": self.topdir, - # Use e.g. Python from host, not python-native - "PATH": os.environ['PATH'], - "BB_ENV_PASSTHROUGH_ADDITIONS": self.bb_env_passthrough_additions - } - bb_options = { - "cwd": self.topdir - } + run_install_deploy = self.gen_install_deploy_script(args) tasks_dict = { "version": "2.0.0", "tasks": [ { - "label": install_label, - "type": "shell", - "command": run_do_install, - "problemMatcher": [] - }, - { - "label": deploy_label, + "label": "install && deploy-target %s" % self.bpn, "type": "shell", - "command": "devtool", # TODO: Generate a self contained script which does what devtool target-deploy does but without connection to the bitbake server - "args": ["--bbpath", self.bbpath, "deploy-target", self.bpn, args.target, "--strip", "--no-host-check"], - "linux": { - "options": { - "env": bb_env - }}, - "options": bb_options, + "command": run_install_deploy, "problemMatcher": [] - }, - { - "label": "install && deploy-target %s" % self.bpn, - "dependsOrder": "sequence", - "dependsOn": [ - install_label, - deploy_label - ], - "problemMatcher": [], - "group": { - "kind": "build", - "isDefault": True - } } ] } @@ -1183,6 +1168,16 @@ def register_commands(subparsers, context): '--skip-bitbake', help='Generate IDE configuration but skip calling bibtake to update the SDK.', action='store_true') parser_ide.add_argument( '-k', '--bitbake-k', help='Pass -k parameter to bitbake', action='store_true') + parser_ide.add_argument( + '--no-strip', help='Do not strip executables prior to deploy', dest='strip', action='store_false') + parser_ide.add_argument( + '-n', '--dry-run', help='List files to be undeployed only', action='store_true') + parser_ide.add_argument( + '-s', '--show-status', help='Show progress/status output', action='store_true') + parser_ide.add_argument( + '-p', '--no-preserve', help='Do not preserve existing files', action='store_true') + parser_ide.add_argument( + '--no-check-space', help='Do not check for available space before deploying', action='store_true') parser_ide.add_argument( '--debug-build-config', help='Use debug build flags, for example set CMAKE_BUILD_TYPE=Debug', action='store_true') parser_ide.set_defaults(func=ide_setup) From patchwork Tue Aug 22 19:20:18 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Adrian Freihofer X-Patchwork-Id: 29278 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from aws-us-west-2-korg-lkml-1.web.codeaurora.org (localhost.localdomain [127.0.0.1]) by smtp.lore.kernel.org (Postfix) with ESMTP id EFF90EE49B1 for ; Tue, 22 Aug 2023 19:23:55 +0000 (UTC) Received: from mail-lf1-f52.google.com (mail-lf1-f52.google.com [209.85.167.52]) by mx.groups.io with SMTP id smtpd.web10.5241.1692732229721154450 for ; Tue, 22 Aug 2023 12:23:50 -0700 Authentication-Results: mx.groups.io; dkim=pass header.i=@gmail.com header.s=20221208 header.b=dWLuHk06; spf=pass (domain: gmail.com, ip: 209.85.167.52, mailfrom: adrian.freihofer@gmail.com) Received: by mail-lf1-f52.google.com with SMTP id 2adb3069b0e04-4ff933f9ca8so7467026e87.1 for ; Tue, 22 Aug 2023 12:23:49 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20221208; t=1692732228; x=1693337028; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=l4lyq43eF+4jjlYBVgBi6SbESThlcXAZT+y0qQ1cgyE=; b=dWLuHk06qV3CcMDWf8aH3zBvZWdx0LTotrETKgiIyFHWMxiDl/C9HpO9HiblEt8aUP m54Ni+h/iGy9LKGDv8j9OuDkZwPgS2A8wWtMz8ZcEm7beqWBPyxHT8/r0+AxDX3roYWk KwDytBRwsDbCJS1+5CGMpaaEOrbVch4dSsuCL9WaPwiX/jsliivMDJP5fcIAiqWqhHpY aHBfOhLYXPqDp4yATsVXxcNxg1q+ae4VZgrklFkKLHfFV9GHnxtssVH4qbVKWG4NGTlj 5povlj1wUERkoEuYf8tmUHGKnMJLpLqRfJvswgWHXwZfsqTfQsBOUggT96jbCVfovPoK aLYA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20221208; t=1692732228; x=1693337028; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=l4lyq43eF+4jjlYBVgBi6SbESThlcXAZT+y0qQ1cgyE=; b=S65h32uNmeb9WW2Mnvi/18d64u/NoV6j6mlvwS4zJkD2gzKPWhQw5bFb2ehZgyY9or HGhDvlrhe2W/3DENOELENIWjTHSsfwwsJKz+AXLbqCvA1RufUPvsljxifHa9lPgfYQAE W+kdfIaNj30PKGjqk0ekX4UEuiD4efENr6XbIMb30LYzOInuzX0keJogI1uwVzQvBJks GbOYepYDqi+qGAUrKud+PCSjMzO0Q5oKBLg+zF90l3IuUpVPSqokHKw1xqwxWWIRYald KNg2ov4JhDWKMnbOfqjCY0UPUq/PfK8PBVZsCAvGzISkqPmgRuVIHpqUZdY+mbusRX3U BjXw== X-Gm-Message-State: AOJu0YxY0mWbcNeLY93OloublhGyy7tCrstgDbGr2cXrQyzAp9Bapqqz DmZYOeOaJLdnzI2f1ef5whOByH/jKJ0= X-Google-Smtp-Source: AGHT+IGsWR1UajW8AqPWOLpw3NKhe+8lwAT+EOJ9FnNj1TaAxOiyMiNRiVxtO6ZvEIHvceiUMxnRMw== X-Received: by 2002:a05:6512:12cb:b0:500:8443:744a with SMTP id p11-20020a05651212cb00b005008443744amr5768606lfg.7.1692732227613; Tue, 22 Aug 2023 12:23:47 -0700 (PDT) Received: from t14s-af.fritz.box ([2a02:169:59a6:0:dcf2:2f65:9442:83f]) by smtp.gmail.com with ESMTPSA id g24-20020a1709063b1800b0098f99048053sm8744041ejf.148.2023.08.22.12.23.46 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 22 Aug 2023 12:23:47 -0700 (PDT) From: Adrian Freihofer X-Google-Original-From: Adrian Freihofer To: openembedded-core@lists.openembedded.org Cc: Adrian Freihofer Subject: [PATCH v2 12/13] oe-selftest devtool: ide tests Date: Tue, 22 Aug 2023 21:20:18 +0200 Message-ID: <20230822192300.3235896-13-adrian.freihofer@siemens.com> X-Mailer: git-send-email 2.41.0 In-Reply-To: <20230822192300.3235896-1-adrian.freihofer@siemens.com> References: <20230822192300.3235896-1-adrian.freihofer@siemens.com> MIME-Version: 1.0 List-Id: X-Webhook-Received: from li982-79.members.linode.com [45.33.32.79] by aws-us-west-2-korg-lkml-1.web.codeaurora.org with HTTPS for ; Tue, 22 Aug 2023 19:23:55 -0000 X-Groupsio-URL: https://lists.openembedded.org/g/openembedded-core/message/186535 Signed-off-by: Adrian Freihofer --- meta/lib/oeqa/selftest/cases/devtool.py | 133 ++++++++++++++++++++++++ 1 file changed, 133 insertions(+) diff --git a/meta/lib/oeqa/selftest/cases/devtool.py b/meta/lib/oeqa/selftest/cases/devtool.py index 14a80d5ff4c..083ecd4acfb 100644 --- a/meta/lib/oeqa/selftest/cases/devtool.py +++ b/meta/lib/oeqa/selftest/cases/devtool.py @@ -11,6 +11,7 @@ import tempfile import glob import fnmatch import unittest +import json from oeqa.selftest.case import OESelftestTestCase from oeqa.utils.commands import runCmd, bitbake, get_bb_var, create_temp_layer @@ -2192,3 +2193,135 @@ class DevtoolUpgradeTests(DevtoolBase): #Step 4.5 runCmd("grep %s %s" % (modconfopt, codeconfigfile)) + + +class DevtoolIdeTests(DevtoolBase): + + def __devtool_ide_recipe(self): + tempdir = tempfile.mkdtemp(prefix='devtoolqa') + self.track_for_cleanup(tempdir) + self.track_for_cleanup(self.workspacedir) + self.add_command_to_tearDown('bitbake -c clean %s' % self.recipe_name) + self.add_command_to_tearDown('bitbake-layers remove-layer */workspace') + + conf_lines = [ + 'IMAGE_FEATURES += "ssh-server-openssh"', + 'IMAGE_CLASSES += "image-combined-dbg"', + 'IMAGE_GEN_DEBUGFS = "1"', + 'IMAGE_INSTALL += "gdbserver %s-ptest"' % self.recipe_name + ] + self.write_config("\n".join(conf_lines)) + + result = runCmd('devtool modify %s -x %s' % (self.recipe_name, tempdir)) + self.assertExists(os.path.join(tempdir, self.build_file), + 'Extracted source could not be found') + self.assertExists(os.path.join(self.workspacedir, 'conf', + 'layer.conf'), 'Workspace directory not created') + matches = glob.glob(os.path.join(self.workspacedir, + 'appends', self.recipe_name + '.bbappend')) + self.assertTrue(matches, 'bbappend not created %s' % result.output) + + # Test devtool status + result = runCmd('devtool status') + self.assertIn(self.recipe_name, result.output) + self.assertIn(tempdir, result.output) + self._check_src_repo(tempdir) + + result = runCmd('devtool ide %s core-image-minimal -c' % self.recipe_name) + return tempdir + + def __devtool_ide_qemu(self): + # Verify do_install works + with open(os.path.join(self.tempdir, '.vscode', 'tasks.json')) as tasks_j: + tasks_d = json.load(tasks_j) + tasks = tasks_d["tasks"] + task_install = next((task for task in tasks if task["label"] == "install && deploy-target %s" % self.recipe_name), None) + self.assertIsNot(task_install, None) + install_deploy_cmd = task_install["command"] + # execute only the bb_run_do_install script since the deploy would require e.g. Qemu running. + install_cmd = install_deploy_cmd.replace("install_and_deploy", "bb_run_do_install") + runCmd(install_cmd, cwd=self.tempdir) + + # Verify if re-building the SDK still works and the deploy and install script gets generated + runCmd('devtool ide %s core-image-minimal -c' % self.recipe_name) + self.assertExists(install_deploy_cmd, 'install_and_deploy script not found') + + # Verify deployment to Qemu works + with runqemu("core-image-minimal", runqemuparams = "nographic") as qemu: + MAGIC_STRING_ORIG = "Magic: 123456789" + MAGIC_STRING_NEW = "Magic: 987654321" + + # Verify the unmodified example prints the magic string + status, output = qemu.run(self.example_exe) + self.assertEqual(status, 0) + self.assertIn(MAGIC_STRING_ORIG, output) + + # Verify the unmodified ptests work + status, output = qemu.run("ptest-runner " + self.recipe_name) + self.assertEqual(status, 0, msg=output) + self.assertIn("PASS: cpp-example-lib", output) + + # Replace the Magic String in the code, compile and deploy to Qemu + cpp_example_lib_hpp = os.path.join(self.tempdir, 'cpp-example-lib.hpp') + with open(cpp_example_lib_hpp, 'r') as file: + cpp_code = file.read() + cpp_code = cpp_code.replace(MAGIC_STRING_ORIG, MAGIC_STRING_NEW) + with open(cpp_example_lib_hpp, 'w') as file: + file.write(cpp_code) + runCmd(install_deploy_cmd, cwd=self.tempdir) + + # Verify the modified example prints the modified magic string + status, output = qemu.run(self.example_exe) + self.assertEqual(status, 0) + self.assertNotIn(MAGIC_STRING_ORIG, output) + self.assertIn(MAGIC_STRING_NEW, output) + + # Verify the modified example ptests work + status, output = qemu.run("ptest-runner " + self.recipe_name) + self.assertEqual(status, 0, msg=output) + self.assertIn("PASS: cpp-example-lib", output) + + def test_devtool_ide_recipe_cmake(self): + self.recipe_name = "cmake-example" + self.example_exe = "cmake-example" + self.build_file = "CMakeLists.txt" + self.tempdir = self.__devtool_ide_recipe() + + with open(os.path.join(self.tempdir, 'CMakeUserPresets.json')) as cmake_preset_j: + cmake_preset_d = json.load(cmake_preset_j) + config_presets = cmake_preset_d["configurePresets"] + self.assertEqual(len(config_presets), 1) + cmake_exe = config_presets[0]["cmakeExecutable"] + preset_name = config_presets[0]["name"] + + # Verify the cmake preset generated by devtool ide is available + result = runCmd('%s --list-presets' % cmake_exe, cwd=self.tempdir) + self.assertIn(preset_name, result.output) + + # Verify cmake re-uses the o files compiled by bitbake + result = runCmd('%s --build --preset %s' % (cmake_exe, preset_name), cwd=self.tempdir) + self.assertIn("ninja: no work to do.", result.output) + + # Verify the unit tests work (in Qemu) + result = runCmd('%s --build --preset %s --target test' % (cmake_exe, preset_name), cwd=self.tempdir) + self.assertIn("100% tests passed", result.output) + + # Verify re-building and testing works again + result = runCmd('%s --build --preset %s --target clean' % (cmake_exe, preset_name), cwd=self.tempdir) + self.assertIn("Cleaning all built files...", result.output) + result = runCmd('%s --build --preset %s' % (cmake_exe, preset_name), cwd=self.tempdir) + self.assertIn("Building", result.output) + self.assertIn("Linking", result.output) + result = runCmd('%s --build --preset %s --target test' % (cmake_exe, preset_name), cwd=self.tempdir) + self.assertIn("Running tests...", result.output) + self.assertIn("100% tests passed", result.output) + + self.__devtool_ide_qemu() + + def test_devtool_ide_recipe_meson(self): + self.recipe_name = "meson-example" + self.example_exe = "mesonex" + self.build_file = "meson.build" + self.tempdir = self.__devtool_ide_recipe() + + self.__devtool_ide_qemu() From patchwork Tue Aug 22 19:20:19 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Adrian Freihofer X-Patchwork-Id: 29277 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from aws-us-west-2-korg-lkml-1.web.codeaurora.org (localhost.localdomain [127.0.0.1]) by smtp.lore.kernel.org (Postfix) with ESMTP id 02853EE49AE for ; Tue, 22 Aug 2023 19:23:56 +0000 (UTC) Received: from mail-ej1-f45.google.com (mail-ej1-f45.google.com [209.85.218.45]) by mx.groups.io with SMTP id smtpd.web10.5243.1692732230526100067 for ; Tue, 22 Aug 2023 12:23:50 -0700 Authentication-Results: mx.groups.io; dkim=pass header.i=@gmail.com header.s=20221208 header.b=eipQl4fb; spf=pass (domain: gmail.com, ip: 209.85.218.45, mailfrom: adrian.freihofer@gmail.com) Received: by mail-ej1-f45.google.com with SMTP id a640c23a62f3a-99c3c8adb27so628403966b.1 for ; Tue, 22 Aug 2023 12:23:50 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20221208; t=1692732229; x=1693337029; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=AoenDSfxEhrJSXJzwNF0qUZi4ZdzROlnUR735GqJdd4=; b=eipQl4fbEUApdw2WQSWhdsNoS+pHHxGYc4k1yF/Xzj9gZnc46lnvySl96cmVG6a2Sm i1gVrQcjg7M0/JWwe3YWDVCMpOXXDwtv8Emd002uGyWgthmWlcxCuvBXJv9Bz9+rkimR Uv46dNqavdYf8XnMxMosVqu7qxC+tV2J0umTZkYA4tFwUmkyudN95wvNaZzk32OXbjGV w+ClEO86PBaDIlnruujGe9CdMTN1WhoHLlSclvqbzDyJqI7LT4b9tsEdnbBiVKFrIfCz rpbku2soXVSBRIoGddPC8ipUDo3HNlv4wXG42wBNBZbAwROu7otJwxQ6j0RWOU09pY4j X5TQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20221208; t=1692732229; x=1693337029; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=AoenDSfxEhrJSXJzwNF0qUZi4ZdzROlnUR735GqJdd4=; b=B+ip0z3S6U3FvOBbos6lYSzLFxeCab/WUR9/pm1wlMLaqbslonUuQoYyqrajPs865S gPjIzR0FmxjiDHwbdafnDFJ5aLZFSrJH2Nr+kWusMgxU0iBaZO3h0OkbFKBWF0znDz65 /QbEWQ75Rbu903ic1siu1+0jXzcVI64LDADolrU/5LLccC7aLG+zdxB29d8wp00Vuno3 BpCVBkuiELAoO4jKmt8Uf/CKKFJBGV25zrHjoSvY/XhaUZAOWgMI6zB5wYJgcb7WWUOV +B8wJbG3eESNRzCoaoGFaF3B1+lf7YYJGNf9MfSd9AdHuvMRfK3mCGtbfdhBW7pNTUJH weFw== X-Gm-Message-State: AOJu0YxpQi+KWZ68em0zU6lg9pXRf1bHbxxcHHHkGxKUyLphHE7XC2Wr AR2CcyjYdaHRckGBJ0KO482veBJUJW8= X-Google-Smtp-Source: AGHT+IFOfumCFlVWBJQNRdsAQ2Q5zk62m7OiKCnyRlsSh4GdOYeb20ftPl4SKuR4mA3N7Jbf1Q9jrQ== X-Received: by 2002:a17:906:291:b0:9a1:c357:c743 with SMTP id 17-20020a170906029100b009a1c357c743mr1229578ejf.52.1692732228478; Tue, 22 Aug 2023 12:23:48 -0700 (PDT) Received: from t14s-af.fritz.box ([2a02:169:59a6:0:dcf2:2f65:9442:83f]) by smtp.gmail.com with ESMTPSA id g24-20020a1709063b1800b0098f99048053sm8744041ejf.148.2023.08.22.12.23.47 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 22 Aug 2023 12:23:48 -0700 (PDT) From: Adrian Freihofer X-Google-Original-From: Adrian Freihofer To: openembedded-core@lists.openembedded.org Cc: Adrian Freihofer Subject: [PATCH v2 13/13] docs: cover devtool ide Date: Tue, 22 Aug 2023 21:20:19 +0200 Message-ID: <20230822192300.3235896-14-adrian.freihofer@siemens.com> X-Mailer: git-send-email 2.41.0 In-Reply-To: <20230822192300.3235896-1-adrian.freihofer@siemens.com> References: <20230822192300.3235896-1-adrian.freihofer@siemens.com> MIME-Version: 1.0 List-Id: X-Webhook-Received: from li982-79.members.linode.com [45.33.32.79] by aws-us-west-2-korg-lkml-1.web.codeaurora.org with HTTPS for ; Tue, 22 Aug 2023 19:23:56 -0000 X-Groupsio-URL: https://lists.openembedded.org/g/openembedded-core/message/186536 Signed-off-by: Adrian Freihofer --- documentation/sdk-manual/extensible.rst | 97 ++++++++++++++++++++++++- 1 file changed, 96 insertions(+), 1 deletion(-) diff --git a/documentation/sdk-manual/extensible.rst b/documentation/sdk-manual/extensible.rst index 9e08e57a4e7..d05d4e36aa7 100644 --- a/documentation/sdk-manual/extensible.rst +++ b/documentation/sdk-manual/extensible.rst @@ -237,7 +237,7 @@ all the commands. devtool quick reference. -Three ``devtool`` subcommands provide entry-points into +Four ``devtool`` subcommands provide entry-points into development: - *devtool add*: Assists in adding new software to be built. @@ -245,6 +245,8 @@ development: - *devtool modify*: Sets up an environment to enable you to modify the source of an existing component. +- *devtool ide*: Generates a configuration for an IDE. + - *devtool upgrade*: Updates an existing recipe so that you can build it for an updated set of source files. @@ -632,6 +634,99 @@ command: proceed with your work. If you do use this command, realize that the source tree is preserved. +Use ``devtool ide`` to generate an configuration for the IDE +------------------------------------------------------------ + +``devtool ide`` automatically configures the IDE for cross-compiling and remote debugging. +The IDE is configured to call for example cmake directly. This has several advantages. +First of all it is much faster than using e.g. ``devtool build``. But it also allows to +use the very good integration of build tools like cmake or gdb with VSCode directly. + +Two different use cases are supported: + +- Generate the IDE configuration for a workspace created by ``devtool modify``. + +- Generate the IDE configuration for using a cross-toolchain as provided by + ``bitbake meta-ide-support build-sysroots``. + +Assuming the development environment is set up correctly and a workspace has been created +for the recipe using ``devtool modify recipe``, the following command can create the +configuration for VSCode in the recipe workspace: + + $ devtool ide recipe core-image-minimal --target root@192.168.7.2 + +What this command does exactly depends on the recipe or the build tool used by the recipe. +Currently, only CMake and Meson are supported natively. + +For a recipe which inherits cmake it does: + +- Prepare the SDK by calling bitbake core-image-minimal, gdb-cross, qemu-native... + +- Generate a cmake-preset with configures cmake to use exactly the same environent and + the same cmake-cache configuration as used by ``bitbake recipe``. The cmake-preset referres + to the per-recipe-sysroot of the recipe. + + Currently Configure, Build and Test presets are supported. Test presets execute the test + binaries with Qemu. + +- Generates a helper script to handle the do_install with pseudo + +- Generates some helper scripts to start the gdbserver on the target device + +- Generates the ``.vscode`` folder containing the following files: + + - c_ccp_properties.json: configure the code navigation + + - extensions.json: Recommend the extensions which are used. + + - launch.json: Provide a configuration for remote debugging with gdb-cross and gdbserver. + The debug-symbols are searched in the build-folder, the per-recipe-sysroot and the rootfs-dbg + folder which is provided by the image. + + - settings.json: confgure the indexer to ignore the build folders + + - tasks.json: Provide some helpers for running + + - do_install and ``devtool deploy-target`` + + - start the gdbserver via ssh + +For a recipe which inherits meson a similar configuration is generated. +Because there is nothing like a meson-preset a wrapper script for meson is generated. + +For some special recipes and use cases a per-recipe-sysroot based SDK is not suitable. +Therefore devtool ide also supports setting up the shared sysroots environment and generating +a IDE configurations referring to the shared sysroots. Recipes leading to a shared sysroot +are for example meta-ide-support or shared-sysroots. Also passing none as a recipe name leads +to a shared sysroot SDK. + + $ devtool ide none core-image-minimal + +In case of a shared sysroot SDK the configuration which gets generated for VSCode exposes the +cross-tool-chain as a cmake-kit. If a cmake project is loaded into VSCode the cross-toolchain +can be selected for compiling. + +The default IDE is VSCode. Some hints about using VSCode: + +- To work with cmake press ``Ctrl + Shift + p``, type cmake. + This will show some possible commands like selecting a cmake preset, compiling or running ctest. + A cmake kit might be activated by ``Ctrl + Shift + p``, type cmake quick start, + if not preset file is in the wokspace. + +- To work with meson press ``Ctrl + Shift + p``, type meson. + This will show some possible commands like compiling or executing the unit tests. + +- For the deployment to the target device, just press ``Ctrl + Shift + p``, type task. + Select the install & deploy task. + +- For remote debugging, switch to the debugging view by pressing the play button with the bug on the left side. + This will provide a green play button with a drop-down list where a debug configuration can be selected. + After selecting one of the generated configurations, press the play button. + +Additionally ``--ide=none`` is supported. +With the none IDE some generic configurations files like .gdbinit files and some helper scripts +are generated. + Use ``devtool upgrade`` to Create a Version of the Recipe that Supports a Newer Version of the Software -------------------------------------------------------------------------------------------------------