From patchwork Fri Jan 14 13:22:13 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Peter Kjellerstedt X-Patchwork-Id: 2452 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 1D894C433EF for ; Fri, 14 Jan 2022 13:22:21 +0000 (UTC) Received: from smtp1.axis.com (smtp1.axis.com [195.60.68.17]) by mx.groups.io with SMTP id smtpd.web10.6831.1642166539445286407 for ; Fri, 14 Jan 2022 05:22:20 -0800 Authentication-Results: mx.groups.io; dkim=pass header.i=@axis.com header.s=axis-central1 header.b=Pij/VyuH; spf=pass (domain: axis.com, ip: 195.60.68.17, mailfrom: peter.kjellerstedt@axis.com) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=axis.com; q=dns/txt; s=axis-central1; t=1642166540; x=1673702540; h=from:to:subject:date:message-id:mime-version: content-transfer-encoding; bh=1MNODiZATf6kp8BR0JOCisTgA3+TBxyQMUXOmYQgAAA=; b=Pij/VyuHe+Uh+UJBHQDIlabT3++M/Q+oS/wNN16Pyh/GC2TNPnc/RXiS T1jSelPKZPE3v8oSt7JUZekFT23IU6Cg2PfOwMYDLFGyjYkECCMStOzfJ VVsFj4BM6clHRqdj733V4c9IhE010uyLoH2zOB2FOd/UMg4RxxwEHaMRE H41nKKRJwO/Gkb0i8neGm8I6r3D+CQ06VXMbKmLUS1cxAdEFcz55Gjz+w ZAZcKbxhiNotSzXF+Liy5sQVi7OljC1yjW8fl7CfR+hcIzOZQZagWQXJa tbk0JYGEJ7Gtn81IeP/7Mp8mFfHDStykioGetDOyg81Kn94+VxZKVR6WK w==; From: Peter Kjellerstedt To: Subject: [meta-oe][PATCH 1/3] nodejs: Drop workaround for a Python 2 dependency Date: Fri, 14 Jan 2022 14:22:13 +0100 Message-ID: <20220114132215.31442-1-pkj@axis.com> X-Mailer: git-send-email 2.21.3 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 ; Fri, 14 Jan 2022 13:22:21 -0000 X-Groupsio-URL: https://lists.openembedded.org/g/openembedded-devel/message/94830 The gyp samples directory was removed in version 15.0.0. Signed-off-by: Peter Kjellerstedt --- meta-oe/recipes-devtools/nodejs/nodejs_16.11.1.bb | 4 ---- 1 file changed, 4 deletions(-) diff --git a/meta-oe/recipes-devtools/nodejs/nodejs_16.11.1.bb b/meta-oe/recipes-devtools/nodejs/nodejs_16.11.1.bb index c8d942538..f31648082 100644 --- a/meta-oe/recipes-devtools/nodejs/nodejs_16.11.1.bb +++ b/meta-oe/recipes-devtools/nodejs/nodejs_16.11.1.bb @@ -157,10 +157,6 @@ do_compile () { do_install () { oe_runmake install DESTDIR=${D} - - # wasn't updated since 2009 and is the only thing requiring python2 in runtime - # ERROR: nodejs-12.14.1-r0 do_package_qa: QA Issue: /usr/lib/node_modules/npm/node_modules/node-gyp/gyp/samples/samples contained in package nodejs-npm requires /usr/bin/python, but no providers found in RDEPENDS:nodejs-npm? [file-rdeps] - rm -f ${D}${exec_prefix}/lib/node_modules/npm/node_modules/node-gyp/gyp/samples/samples } do_install:append:class-native() { From patchwork Fri Jan 14 13:22:14 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Peter Kjellerstedt X-Patchwork-Id: 2453 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 0769EC433F5 for ; Fri, 14 Jan 2022 13:22:22 +0000 (UTC) Received: from smtp1.axis.com (smtp1.axis.com [195.60.68.17]) by mx.groups.io with SMTP id smtpd.web10.6831.1642166539445286407 for ; Fri, 14 Jan 2022 05:22:21 -0800 Authentication-Results: mx.groups.io; dkim=pass header.i=@axis.com header.s=axis-central1 header.b=ELErBJVH; spf=pass (domain: axis.com, ip: 195.60.68.17, mailfrom: peter.kjellerstedt@axis.com) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=axis.com; q=dns/txt; s=axis-central1; t=1642166541; x=1673702541; h=from:to:subject:date:message-id:in-reply-to:references: mime-version:content-transfer-encoding; bh=G2Iz3TFJQs5aDNhhX98VLSoqL7rxG4RYeaVp4GqKwtE=; b=ELErBJVHPyBrlSCqu5v1xgjYbvDmCZAZeQnWr98OlG0j0X96oYrKV2fk FOFdg2rCG1IRHd5nhhSc9x9F0pQRoqsxW4klcz7n7SyqImoXJdh9LteMf 26IaK9/yM2lEpMNabcM2Kv9ZzdUiey6NfUybORfiE96G/Y34Z2UsDKM/H orXw2zPy68ap8PHDhXsvz04j61Tfa4+9nTgO9yqW2w+/vYauJFvFAUnn7 fknVZ1t6vPB0hIm6+7HTX+UOnuU4HYClCeWX2wueM9HnTuLdSf2KoiuAt mkO2emk64XHoWDcp0sPhPdtqhD8q6B5p+iNeu30AqrITXdi9qD80r9H/r g==; From: Peter Kjellerstedt To: Subject: [meta-oe][PATCH 2/3] nodejs: Drop workaround for an absolute path in the npm shebang Date: Fri, 14 Jan 2022 14:22:14 +0100 Message-ID: <20220114132215.31442-2-pkj@axis.com> X-Mailer: git-send-email 2.21.3 In-Reply-To: <20220114132215.31442-1-pkj@axis.com> References: <20220114132215.31442-1-pkj@axis.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 ; Fri, 14 Jan 2022 13:22:22 -0000 X-Groupsio-URL: https://lists.openembedded.org/g/openembedded-devel/message/94831 The rewrite of the npm shebang to use an absolute path was removed in version 7.0.0. Signed-off-by: Peter Kjellerstedt --- .../recipes-devtools/nodejs/nodejs_16.11.1.bb | 20 ------------------- 1 file changed, 20 deletions(-) diff --git a/meta-oe/recipes-devtools/nodejs/nodejs_16.11.1.bb b/meta-oe/recipes-devtools/nodejs/nodejs_16.11.1.bb index f31648082..318cb961f 100644 --- a/meta-oe/recipes-devtools/nodejs/nodejs_16.11.1.bb +++ b/meta-oe/recipes-devtools/nodejs/nodejs_16.11.1.bb @@ -160,20 +160,6 @@ do_install () { } do_install:append:class-native() { - # use node from PATH instead of absolute path to sysroot - # node-v0.10.25/tools/install.py is using: - # shebang = os.path.join(node_prefix, 'bin/node') - # update_shebang(link_path, shebang) - # and node_prefix can be very long path to bindir in native sysroot and - # when it exceeds 128 character shebang limit it's stripped to incorrect path - # and npm fails to execute like in this case with 133 characters show in log.do_install: - # updating shebang of /home/jenkins/workspace/build-webos-nightly/device/qemux86/label/open-webos-builder/BUILD-qemux86/work/x86_64-linux/nodejs-native/0.10.15-r0/image/home/jenkins/workspace/build-webos-nightly/device/qemux86/label/open-webos-builder/BUILD-qemux86/sysroots/x86_64-linux/usr/bin/npm to /home/jenkins/workspace/build-webos-nightly/device/qemux86/label/open-webos-builder/BUILD-qemux86/sysroots/x86_64-linux/usr/bin/node - # /usr/bin/npm is symlink to /usr/lib/node_modules/npm/bin/npm-cli.js - # use sed on npm-cli.js because otherwise symlink is replaced with normal file and - # npm-cli.js continues to use old shebang - if [[ -f "${D}${exec_prefix}/lib/node_modules/npm/bin/npm-cli.js" ]]; then - sed "1s^.*^#\!/usr/bin/env node^g" -i ${D}${exec_prefix}/lib/node_modules/npm/bin/npm-cli.js - fi # Install the native binaries to provide it within sysroot for the target compilation install -d ${D}${bindir} install -m 0755 ${S}/out/Release/torque ${D}${bindir}/torque @@ -185,12 +171,6 @@ do_install:append:class-native() { install -m 0755 ${S}/out/Release/node_mksnapshot ${D}${bindir}/node_mksnapshot } -do_install:append:class-target() { - if [[ -f "${D}${exec_prefix}/lib/node_modules/npm/bin/npm-cli.js" ]]; then - sed "1s^.*^#\!${bindir}/env node^g" -i ${D}${exec_prefix}/lib/node_modules/npm/bin/npm-cli.js - fi -} - PACKAGES =+ "${PN}-npm" FILES:${PN}-npm = "${exec_prefix}/lib/node_modules ${bindir}/npm ${bindir}/npx" RDEPENDS:${PN}-npm = "bash python3-core python3-shell python3-datetime \ From patchwork Fri Jan 14 13:22:15 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Peter Kjellerstedt X-Patchwork-Id: 2454 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 06E14C4332F for ; Fri, 14 Jan 2022 13:22:25 +0000 (UTC) Received: from smtp1.axis.com (smtp1.axis.com [195.60.68.17]) by mx.groups.io with SMTP id smtpd.web09.6964.1642166543001444590 for ; Fri, 14 Jan 2022 05:22:23 -0800 Authentication-Results: mx.groups.io; dkim=pass header.i=@axis.com header.s=axis-central1 header.b=FTbeoYZJ; spf=pass (domain: axis.com, ip: 195.60.68.17, mailfrom: peter.kjellerstedt@axis.com) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=axis.com; q=dns/txt; s=axis-central1; t=1642166543; x=1673702543; h=from:to:subject:date:message-id:in-reply-to:references: mime-version:content-transfer-encoding; bh=vGHP/bjVJD909gP3aoYXPZgetCCJOf50HYxzqWSGkMM=; b=FTbeoYZJrHNu2XvizfCVuftRuDdFSxBU4MLqQm5apr1nsP0fZbe2WgYv ezQqO+jm79hkrV+DaW0wkF32Pdm8w2hivPAfE2RUN+DqhVBF7k+Ch+pSm TjfEITpS6dE7cEy+xZDA61hR5fVQJ057OMDot+dUlEnTg7ztol/0JIuS0 /uvTVugzmVK8htLpMoio/ExRj0jMax0Wr/dP0SMMlmw5HpFN5G8bkHdOA DFylXJZTfxxFzTiJ+42eFM/lS2o94wYM1tlm2jWak7SK/185uQKvTvxUB LudB7Mhb58ZRZqBWbf/BVGK3q52+kUUTOlOsK3e2cWGCjSyzwmFagNhS1 g==; From: Peter Kjellerstedt To: Subject: [meta-oe][PATCH 3/3] nodejs: A little clean up Date: Fri, 14 Jan 2022 14:22:15 +0100 Message-ID: <20220114132215.31442-3-pkj@axis.com> X-Mailer: git-send-email 2.21.3 In-Reply-To: <20220114132215.31442-1-pkj@axis.com> References: <20220114132215.31442-1-pkj@axis.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 ; Fri, 14 Jan 2022 13:22:25 -0000 X-Groupsio-URL: https://lists.openembedded.org/g/openembedded-devel/message/94832 * The destination file name does not need to be specified to install if it matches the source file name (and -D is not used). * Mode 0755 does not need to be specified to install as it is the default. Signed-off-by: Peter Kjellerstedt --- .../recipes-devtools/nodejs/nodejs_16.11.1.bb | 20 ++++++++++--------- 1 file changed, 11 insertions(+), 9 deletions(-) diff --git a/meta-oe/recipes-devtools/nodejs/nodejs_16.11.1.bb b/meta-oe/recipes-devtools/nodejs/nodejs_16.11.1.bb index 318cb961f..72fbecb8f 100644 --- a/meta-oe/recipes-devtools/nodejs/nodejs_16.11.1.bb +++ b/meta-oe/recipes-devtools/nodejs/nodejs_16.11.1.bb @@ -151,7 +151,7 @@ do_configure () { do_compile () { export LD="${CXX}" - install -Dm 0755 ${B}/v8-qemu-wrapper.sh ${B}/out/Release/v8-qemu-wrapper.sh + install -D ${B}/v8-qemu-wrapper.sh ${B}/out/Release/v8-qemu-wrapper.sh oe_runmake BUILDTYPE=Release } @@ -159,20 +159,22 @@ do_install () { oe_runmake install DESTDIR=${D} } +BINARIES = " \ + bytecode_builtins_list_generator \ + ${@bb.utils.contains('PACKAGECONFIG', 'icu', 'gen-regexp-special-case', '', d)} \ + mkcodecache \ + node_mksnapshot \ + torque \ +" + do_install:append:class-native() { # Install the native binaries to provide it within sysroot for the target compilation install -d ${D}${bindir} - install -m 0755 ${S}/out/Release/torque ${D}${bindir}/torque - install -m 0755 ${S}/out/Release/bytecode_builtins_list_generator ${D}${bindir}/bytecode_builtins_list_generator - if ${@bb.utils.contains('PACKAGECONFIG','icu','true','false',d)}; then - install -m 0755 ${S}/out/Release/gen-regexp-special-case ${D}${bindir}/gen-regexp-special-case - fi - install -m 0755 ${S}/out/Release/mkcodecache ${D}${bindir}/mkcodecache - install -m 0755 ${S}/out/Release/node_mksnapshot ${D}${bindir}/node_mksnapshot + (cd ${S}/out/Release && install ${BINARIES} ${D}${bindir}) } PACKAGES =+ "${PN}-npm" -FILES:${PN}-npm = "${exec_prefix}/lib/node_modules ${bindir}/npm ${bindir}/npx" +FILES:${PN}-npm = "${nonarch_libdir}/node_modules ${bindir}/npm ${bindir}/npx" RDEPENDS:${PN}-npm = "bash python3-core python3-shell python3-datetime \ python3-misc python3-multiprocessing"