From patchwork Wed Sep 27 10:49:15 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Martin Jansa X-Patchwork-Id: 31240 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 5064BE810C2 for ; Wed, 27 Sep 2023 10:49:30 +0000 (UTC) Received: from mail-ed1-f43.google.com (mail-ed1-f43.google.com [209.85.208.43]) by mx.groups.io with SMTP id smtpd.web11.14598.1695811767635777634 for ; Wed, 27 Sep 2023 03:49:27 -0700 Authentication-Results: mx.groups.io; dkim=pass header.i=@gmail.com header.s=20230601 header.b=K2Nv7WJk; spf=pass (domain: gmail.com, ip: 209.85.208.43, mailfrom: martin.jansa@gmail.com) Received: by mail-ed1-f43.google.com with SMTP id 4fb4d7f45d1cf-52fe27898e9so13214125a12.0 for ; Wed, 27 Sep 2023 03:49:27 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1695811766; x=1696416566; darn=lists.openembedded.org; h=content-transfer-encoding:mime-version:message-id:date:subject:cc :to:from:from:to:cc:subject:date:message-id:reply-to; bh=lmFWiPXR34E4dBm/XfngapKdOD6CaG8imPRodUIBuXI=; b=K2Nv7WJkOeXQaPjCTxrwO9aQNgv8gwbD3amg39yYOIAnEv/DqBKwBZH2xZ8LJazNss jlxlXuS3klzlwivgVHVNnM3WowefCZ7/gGLc+Gvvpzjqt4TGKrDmC/z+moaWYTm1J26Q 3Zxx0MENzXrK368SOC/PhLcN2pHsBf4rok+Fz8oPzn/9Lhw/M5Lruo8d3G6bIbv6t97E xGy0VzqvvL6NXUf3LFccQ0d818qSFAinxm8s77D+gfccFiqFSVyHs3Rfh16PLkIuwvVs aJAhGZaLWHABhuJjcz95kkOM2ANIUNAvz8iIfbi2QVPmeOG1T97g13AzvobFAHwNjuYv XZrg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1695811766; x=1696416566; h=content-transfer-encoding:mime-version:message-id:date:subject:cc :to:from:x-gm-message-state:from:to:cc:subject:date:message-id :reply-to; bh=lmFWiPXR34E4dBm/XfngapKdOD6CaG8imPRodUIBuXI=; b=Cfx9G57Jn8IuPYAfcRCFJy4f+PT7O/HpB6XRYc5Co6rQrBWkowA7RfgbYxGDLLpv8I XrMgFGijypD4X2qOvYIlZ7dAjYnsKkumk7A6Y6m6ZPW3UqG4CO9IQdMyDjQhmQN1OCRy AWp2KHdutLcFRaUcQwPTIgRy0F9v2cKGqX6Siheo3tYiH5/laqMKl0BrM/5Z9wNR+Cmw JMhAVAUhzmE5e/AgjQUbCfH/G4d6Pe3m/F62TOPpqg1FLPczmJneQOObwxxA7D4FROdi wmavsf3ydyY10VCZGyyyd2DMc7RnyX/LwtxYO4QZWN4WY97vDvlsR1uHLyB8whzXuWiP eDdw== X-Gm-Message-State: AOJu0YyGm08c4MCuJT/im+Hk08WAeAymELbPh8n+Qqm3wsghlwCCxNm6 Q0DU6pmVcZpNp7MNPVJvrC5TkjZB6SA= X-Google-Smtp-Source: AGHT+IFUppEe6bbdsyJ1nmQDfHoiirGE6Gsph9QRivU0gGKnnHPLW48NFAPFiOTgj+eb3l/RCE65MQ== X-Received: by 2002:aa7:cd51:0:b0:52a:66c0:1e9b with SMTP id v17-20020aa7cd51000000b0052a66c01e9bmr1709428edw.30.1695811765723; Wed, 27 Sep 2023 03:49:25 -0700 (PDT) Received: from localhost (ip-109-238-218-228.aim-net.cz. [109.238.218.228]) by smtp.gmail.com with ESMTPSA id j6-20020aa7ca46000000b0052889d090bfsm8028064edt.79.2023.09.27.03.49.25 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 27 Sep 2023 03:49:25 -0700 (PDT) From: Martin Jansa To: openembedded-devel@lists.openembedded.org Cc: Martin Jansa Subject: [meta-oe][PATCH 1/4] gnome-tweaks, networkmanager-fortisslvpn, libesmtp, json-schema-validator, python3-pybluez, python3-pynetlinux, apache2: Fix Malformed Upstream-Status Date: Wed, 27 Sep 2023 12:49:15 +0200 Message-ID: <20230927104920.2052173-1-martin.jansa@gmail.com> X-Mailer: git-send-email 2.42.0 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 ; Wed, 27 Sep 2023 10:49:30 -0000 X-Groupsio-URL: https://lists.openembedded.org/g/openembedded-devel/message/105186 * Accepted was replaced with Backport in gatesgarth: https://docs.yoctoproject.org/migration-guides/migration-3.2.html#miscellaneous-changes * as detected with oe-core/scripts/contrib/patchreview.py: meta-openembedded $ grep -A 3 Malformed *qa-patches meta-gnome.qa-patches:Malformed Upstream-Status 'Malformed Upstream-Status in patch meta-gnome.qa-patches-/OE/layers/meta-openembedded/meta-gnome/recipes-gnome/gnome-tweaks/gnome-tweaks/0002-meson-fix-invalid-positional-argument.patch meta-gnome.qa-patches-Please correct according to https://docs.yoctoproject.org/contributor-guide/recipe-style-guide.html#patch-upstream-status : meta-gnome.qa-patches-Upstream-Status: Accepted [https://gitlab.gnome.org/GNOME/gnome-tweaks/-/commit/dc9701e18775c01d0b69fabaa350147f70096da8]' (/OE/layers/meta-openembedded/meta-gnome/recipes-gnome/gnome-tweaks/gnome-tweaks/0002-meson-fix-invalid-positional-argument.patch) --- meta-networking.qa-patches:Malformed Upstream-Status 'Malformed Upstream-Status in patch meta-networking.qa-patches-/OE/layers/meta-openembedded/meta-networking/recipes-connectivity/networkmanager/networkmanager-fortisslvpn/0001-fix-ppp-2.5.0-build.patch meta-networking.qa-patches-Please correct according to https://docs.yoctoproject.org/contributor-guide/recipe-style-guide.html#patch-upstream-status : meta-networking.qa-patches-Upstream-Status: Accepted' (/OE/layers/meta-openembedded/meta-networking/recipes-connectivity/networkmanager/networkmanager-fortisslvpn/0001-fix-ppp-2.5.0-build.patch) meta-networking.qa-patches:Malformed Upstream-Status 'Malformed Upstream-Status in patch meta-networking.qa-patches-/OE/layers/meta-openembedded/meta-networking/recipes-connectivity/networkmanager/networkmanager-fortisslvpn/0002-fix-ppp-2.5.0-build.patch meta-networking.qa-patches-Please correct according to https://docs.yoctoproject.org/contributor-guide/recipe-style-guide.html#patch-upstream-status : meta-networking.qa-patches-Upstream-Status: Accepted' (/OE/layers/meta-openembedded/meta-networking/recipes-connectivity/networkmanager/networkmanager-fortisslvpn/0002-fix-ppp-2.5.0-build.patch) -- meta-networking.qa-patches:Malformed Upstream-Status 'Malformed Upstream-Status in patch meta-networking.qa-patches-/OE/layers/meta-openembedded/meta-networking/recipes-support/libesmtp/libesmtp/0001-Add-build-option-for-NTLM-support.patch meta-networking.qa-patches-Please correct according to https://docs.yoctoproject.org/contributor-guide/recipe-style-guide.html#patch-upstream-status : meta-networking.qa-patches-Upstream-Status: Accepted [https://github.com/libesmtp/libESMTP/commit/1c304e7886a08fb56485e41614ff3f8685afb59d]' (/OE/layers/meta-openembedded/meta-networking/recipes-support/libesmtp/libesmtp/0001-Add-build-option-for-NTLM-support.patch) -- meta-oe.qa-patches:Malformed Upstream-Status 'Malformed Upstream-Status in patch meta-oe.qa-patches-/OE/layers/meta-openembedded/meta-oe/recipes-devtools/json-schema-validator/json-schema-validator/0002-Fix-assumed-signed-char.patch meta-oe.qa-patches-Please correct according to https://docs.yoctoproject.org/contributor-guide/recipe-style-guide.html#patch-upstream-status : meta-oe.qa-patches-Upstream-Status: Accepted [https://github.com/pboettch/json-schema-validator/commit/491ac44026e08f31790f5cacffa62e168bb35e32]' (/OE/layers/meta-openembedded/meta-oe/recipes-devtools/json-schema-validator/json-schema-validator/0002-Fix-assumed-signed-char.patch) meta-oe.qa-patches:Malformed Upstream-Status 'Malformed Upstream-Status in patch meta-oe.qa-patches-/OE/layers/meta-openembedded/meta-oe/recipes-devtools/json-schema-validator/json-schema-validator/0003-For-root-value-use-empty-pointer.patch meta-oe.qa-patches-Please correct according to https://docs.yoctoproject.org/contributor-guide/recipe-style-guide.html#patch-upstream-status : meta-oe.qa-patches-Upstream-Status: Accepted [https://github.com/pboettch/json-schema-validator/commit/59c9d6200bf3cd54b4fc717ec1660c91eddb4d1a]' (/OE/layers/meta-openembedded/meta-oe/recipes-devtools/json-schema-validator/json-schema-validator/0003-For-root-value-use-empty-pointer.patch) -- meta-python.qa-patches:Malformed Upstream-Status 'Malformed Upstream-Status in patch meta-python.qa-patches-/OE/layers/meta-openembedded/meta-python/recipes-devtools/python/python3-pybluez/0001-Use-Py_ssize_t-when-parsing-buffer-length-fix-426-42.patch meta-python.qa-patches-Please correct according to https://docs.yoctoproject.org/contributor-guide/recipe-style-guide.html#patch-upstream-status : meta-python.qa-patches-Upstream-Status: Accepted' (/OE/layers/meta-openembedded/meta-python/recipes-devtools/python/python3-pybluez/0001-Use-Py_ssize_t-when-parsing-buffer-length-fix-426-42.patch) meta-python.qa-patches:Malformed Upstream-Status 'Malformed Upstream-Status in patch meta-python.qa-patches-/OE/layers/meta-openembedded/meta-python/recipes-devtools/python/python3-pynetlinux/0002-Fixed-relative-imports.patch meta-python.qa-patches-Please correct according to https://docs.yoctoproject.org/contributor-guide/recipe-style-guide.html#patch-upstream-status : meta-python.qa-patches-Upstream-Status: Accepted' (/OE/layers/meta-openembedded/meta-python/recipes-devtools/python/python3-pynetlinux/0002-Fixed-relative-imports.patch) -- meta-webserver.qa-patches:Malformed Upstream-Status 'Malformed Upstream-Status in patch meta-webserver.qa-patches-/OE/layers/meta-openembedded/meta-webserver/recipes-httpd/apache2/apache2/0011-modules-mappers-config9.m4-Add-server-directory-to-i.patch meta-webserver.qa-patches-Please correct according to https://docs.yoctoproject.org/contributor-guide/recipe-style-guide.html#patch-upstream-status : meta-webserver.qa-patches-Upstream-Status: Accepted [https://svn.apache.org/viewvc?view=revision&revision=1909241]' (/OE/layers/meta-openembedded/meta-webserver/recipes-httpd/apache2/apache2/0011-modules-mappers-config9.m4-Add-server-directory-to-i.patch) Signed-off-by: Martin Jansa --- .../0002-meson-fix-invalid-positional-argument.patch | 2 +- .../networkmanager-fortisslvpn/0001-fix-ppp-2.5.0-build.patch | 2 +- .../networkmanager-fortisslvpn/0002-fix-ppp-2.5.0-build.patch | 2 +- .../libesmtp/0001-Add-build-option-for-NTLM-support.patch | 2 +- .../json-schema-validator/0002-Fix-assumed-signed-char.patch | 2 +- .../0003-For-root-value-use-empty-pointer.patch | 2 +- ...1-Use-Py_ssize_t-when-parsing-buffer-length-fix-426-42.patch | 2 +- .../python/python3-pynetlinux/0002-Fixed-relative-imports.patch | 2 +- ...1-modules-mappers-config9.m4-Add-server-directory-to-i.patch | 2 +- 9 files changed, 9 insertions(+), 9 deletions(-) diff --git a/meta-gnome/recipes-gnome/gnome-tweaks/gnome-tweaks/0002-meson-fix-invalid-positional-argument.patch b/meta-gnome/recipes-gnome/gnome-tweaks/gnome-tweaks/0002-meson-fix-invalid-positional-argument.patch index bd7e76f208..d921ff3308 100644 --- a/meta-gnome/recipes-gnome/gnome-tweaks/gnome-tweaks/0002-meson-fix-invalid-positional-argument.patch +++ b/meta-gnome/recipes-gnome/gnome-tweaks/gnome-tweaks/0002-meson-fix-invalid-positional-argument.patch @@ -3,7 +3,7 @@ From: Mae Dartmann Date: Wed, 16 Feb 2022 06:08:41 +0000 Subject: [PATCH] meson: fix invalid positional argument -Upstream-Status: Accepted [https://gitlab.gnome.org/GNOME/gnome-tweaks/-/commit/dc9701e18775c01d0b69fabaa350147f70096da8] +Upstream-Status: Backport [https://gitlab.gnome.org/GNOME/gnome-tweaks/-/commit/dc9701e18775c01d0b69fabaa350147f70096da8] --- data/meson.build | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/meta-networking/recipes-connectivity/networkmanager/networkmanager-fortisslvpn/0001-fix-ppp-2.5.0-build.patch b/meta-networking/recipes-connectivity/networkmanager/networkmanager-fortisslvpn/0001-fix-ppp-2.5.0-build.patch index 0a568fa23c..2e84a334f0 100644 --- a/meta-networking/recipes-connectivity/networkmanager/networkmanager-fortisslvpn/0001-fix-ppp-2.5.0-build.patch +++ b/meta-networking/recipes-connectivity/networkmanager/networkmanager-fortisslvpn/0001-fix-ppp-2.5.0-build.patch @@ -7,7 +7,7 @@ MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit -Upstream-Status: Accepted +Upstream-Status: Backport Signed-off-by: Eivind Næss --- Makefile.am | 5 +- diff --git a/meta-networking/recipes-connectivity/networkmanager/networkmanager-fortisslvpn/0002-fix-ppp-2.5.0-build.patch b/meta-networking/recipes-connectivity/networkmanager/networkmanager-fortisslvpn/0002-fix-ppp-2.5.0-build.patch index 798a57b0da..6ac8f2b643 100644 --- a/meta-networking/recipes-connectivity/networkmanager/networkmanager-fortisslvpn/0002-fix-ppp-2.5.0-build.patch +++ b/meta-networking/recipes-connectivity/networkmanager/networkmanager-fortisslvpn/0002-fix-ppp-2.5.0-build.patch @@ -6,7 +6,7 @@ MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit -Upstream-Status: Accepted +Upstream-Status: Backport Signed-off-by: Eivind Næss --- configure.ac | 6 +----- diff --git a/meta-networking/recipes-support/libesmtp/libesmtp/0001-Add-build-option-for-NTLM-support.patch b/meta-networking/recipes-support/libesmtp/libesmtp/0001-Add-build-option-for-NTLM-support.patch index 64938a4820..dbdd644830 100644 --- a/meta-networking/recipes-support/libesmtp/libesmtp/0001-Add-build-option-for-NTLM-support.patch +++ b/meta-networking/recipes-support/libesmtp/libesmtp/0001-Add-build-option-for-NTLM-support.patch @@ -11,7 +11,7 @@ disabled by default. Like 1.0.6, it will check openssl MD4 algorithm support as MD4 is insecure and modern systems may drop MD4 support. -Upstream-Status: Accepted [https://github.com/libesmtp/libESMTP/commit/1c304e7886a08fb56485e41614ff3f8685afb59d] +Upstream-Status: Backport [https://github.com/libesmtp/libESMTP/commit/1c304e7886a08fb56485e41614ff3f8685afb59d] Signed-off-by: Jiaqing Zhao --- meson.build | 13 ++++++++++--- diff --git a/meta-oe/recipes-devtools/json-schema-validator/json-schema-validator/0002-Fix-assumed-signed-char.patch b/meta-oe/recipes-devtools/json-schema-validator/json-schema-validator/0002-Fix-assumed-signed-char.patch index 2ee0a39126..1c4b871bb6 100644 --- a/meta-oe/recipes-devtools/json-schema-validator/json-schema-validator/0002-Fix-assumed-signed-char.patch +++ b/meta-oe/recipes-devtools/json-schema-validator/json-schema-validator/0002-Fix-assumed-signed-char.patch @@ -11,7 +11,7 @@ GCC treats char as unsigned resulting in compile errors: Fix this by specifying signed char. -Upstream-Status: Accepted [https://github.com/pboettch/json-schema-validator/commit/491ac44026e08f31790f5cacffa62e168bb35e32] +Upstream-Status: Backport [https://github.com/pboettch/json-schema-validator/commit/491ac44026e08f31790f5cacffa62e168bb35e32] Signed-off-by: Parian Golchin --- diff --git a/meta-oe/recipes-devtools/json-schema-validator/json-schema-validator/0003-For-root-value-use-empty-pointer.patch b/meta-oe/recipes-devtools/json-schema-validator/json-schema-validator/0003-For-root-value-use-empty-pointer.patch index e0d0cf8ce9..eac997ae58 100644 --- a/meta-oe/recipes-devtools/json-schema-validator/json-schema-validator/0003-For-root-value-use-empty-pointer.patch +++ b/meta-oe/recipes-devtools/json-schema-validator/json-schema-validator/0003-For-root-value-use-empty-pointer.patch @@ -3,7 +3,7 @@ From: Sven Fink Date: Fri, 13 Jan 2023 09:15:42 +0100 Subject: [PATCH 3/3] For root value, use empty pointer -Upstream-Status: Accepted [https://github.com/pboettch/json-schema-validator/commit/59c9d6200bf3cd54b4fc717ec1660c91eddb4d1a] +Upstream-Status: Backport [https://github.com/pboettch/json-schema-validator/commit/59c9d6200bf3cd54b4fc717ec1660c91eddb4d1a] Signed-off-by: Parian Golchin --- diff --git a/meta-python/recipes-devtools/python/python3-pybluez/0001-Use-Py_ssize_t-when-parsing-buffer-length-fix-426-42.patch b/meta-python/recipes-devtools/python/python3-pybluez/0001-Use-Py_ssize_t-when-parsing-buffer-length-fix-426-42.patch index 9126aba8d3..4d54a2e943 100644 --- a/meta-python/recipes-devtools/python/python3-pybluez/0001-Use-Py_ssize_t-when-parsing-buffer-length-fix-426-42.patch +++ b/meta-python/recipes-devtools/python/python3-pybluez/0001-Use-Py_ssize_t-when-parsing-buffer-length-fix-426-42.patch @@ -20,7 +20,7 @@ From python 3.8 changes: Fixes https://github.com/pybluez/pybluez/issues/426 --- -Upstream-Status: Accepted +Upstream-Status: Backport bluez/btmodule.c | 23 ++++++++++++++--------- msbt/_msbt.c | 6 ++++-- diff --git a/meta-python/recipes-devtools/python/python3-pynetlinux/0002-Fixed-relative-imports.patch b/meta-python/recipes-devtools/python/python3-pynetlinux/0002-Fixed-relative-imports.patch index 9b5d9d6364..ee7cea8108 100644 --- a/meta-python/recipes-devtools/python/python3-pynetlinux/0002-Fixed-relative-imports.patch +++ b/meta-python/recipes-devtools/python/python3-pynetlinux/0002-Fixed-relative-imports.patch @@ -6,7 +6,7 @@ Subject: [PATCH] Fixed relative imports Signed-off-by: Bartosz Golaszewski --- -Upstream-Status: Accepted +Upstream-Status: Backport pynetlinux/__init__.py | 8 ++++---- pynetlinux/brctl.py | 2 +- diff --git a/meta-webserver/recipes-httpd/apache2/apache2/0011-modules-mappers-config9.m4-Add-server-directory-to-i.patch b/meta-webserver/recipes-httpd/apache2/apache2/0011-modules-mappers-config9.m4-Add-server-directory-to-i.patch index 996eabf586..9accbf18a1 100644 --- a/meta-webserver/recipes-httpd/apache2/apache2/0011-modules-mappers-config9.m4-Add-server-directory-to-i.patch +++ b/meta-webserver/recipes-httpd/apache2/apache2/0011-modules-mappers-config9.m4-Add-server-directory-to-i.patch @@ -4,7 +4,7 @@ Date: Tue, 18 Apr 2023 15:38:53 +0200 Subject: [PATCH] * modules/mappers/config9.m4: Add 'server' directory to include path if mod_rewrite is enabled. -Upstream-Status: Accepted [https://svn.apache.org/viewvc?view=revision&revision=1909241] +Upstream-Status: Backport [https://svn.apache.org/viewvc?view=revision&revision=1909241] --- modules/mappers/config9.m4 | 5 +++++ From patchwork Wed Sep 27 10:49:16 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Martin Jansa X-Patchwork-Id: 31239 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 498F6E810C6 for ; Wed, 27 Sep 2023 10:49:30 +0000 (UTC) Received: from mail-lf1-f53.google.com (mail-lf1-f53.google.com [209.85.167.53]) by mx.groups.io with SMTP id smtpd.web11.14599.1695811768661154996 for ; Wed, 27 Sep 2023 03:49:29 -0700 Authentication-Results: mx.groups.io; dkim=pass header.i=@gmail.com header.s=20230601 header.b=Ae3/N7JA; spf=pass (domain: gmail.com, ip: 209.85.167.53, mailfrom: martin.jansa@gmail.com) Received: by mail-lf1-f53.google.com with SMTP id 2adb3069b0e04-5041cc983f9so17432446e87.3 for ; Wed, 27 Sep 2023 03:49:28 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1695811767; x=1696416567; darn=lists.openembedded.org; 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=uwL75gD2WDijNS4bevubDhn4myinkDmMRrRknPTDRC0=; b=Ae3/N7JAZqa3md7fPOvKu16Je2VuOJdNgpj6RqShQGH+YX+cpF8ZtZmJHn7mD+qabV 0z6QmuYB84gLLzLPRRWwxyb1pNcfyv4W7Sp5K8FJrbYTY8aZRnlS8HQ55f1QPw7PfwKs KwEzPDWnI9IOZzEN+zOnqYV+KbHANLCutkXI3tkF+yvKw8JlpRQWgHrib8GjZ5AB+EO1 cPcjSdFFeNBkI+kI+8vvaYIbOQbBsKvOqtkYbxva7mrsTLyUxvPIBH6BIcjmYKjqvipp qSQ4PrW/Of9OsvGuE+uceLBq6uZwJitKhA+ZCngx/2wREcWyEZ4G6ksAzmVuFAUyF7pr BMuQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1695811767; x=1696416567; 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=uwL75gD2WDijNS4bevubDhn4myinkDmMRrRknPTDRC0=; b=Rqx1Pna+nPEuqcpEHdwWLH+NYaOHWvGDw9n4QisbnvBxl07B3IbQu4uzM7/EXkKU3i QQ/BXNsYz9PtWaIfQ/ujB9mlH6rDdqv+qu0IRnoUMTRhkrmImO32Z7uVZZPR1sYWcUuE wLz5XVHH05MFoqRCJmTNblO01o3PHIkGNtetHEUrqErEciJW5OCLPNRnZg+DR+OMh757 vTI1PyRR023WhDVoLSLXnJtmWM6CJF7TZwpZqz3K7R0P3buQ7+MXYIOxjZ7yLmouvyZA 54SiANdZxuO3vXbNUlK4ExrKp1qisNfr1+TYS7xGX334S3ei/hzDPNQ5oJ2CkOmg79pL Z/5g== X-Gm-Message-State: AOJu0YzovrBtTPcvKTy7cm4fK6DpspycBKdF2jeggog7KqS9IUgPyNAb 3u9A69DziOYIkpct2+LVBf147z9sG4M= X-Google-Smtp-Source: AGHT+IFlyZBrnMtPcHNhuyVDrjd8Cep+4sKas1HuTeIQxkfOqbyLxi4QpTIBnmM6zTAxKKDwkzbdRg== X-Received: by 2002:a05:6512:3b06:b0:503:364d:b93d with SMTP id f6-20020a0565123b0600b00503364db93dmr1597889lfv.20.1695811766485; Wed, 27 Sep 2023 03:49:26 -0700 (PDT) Received: from localhost (ip-109-238-218-228.aim-net.cz. [109.238.218.228]) by smtp.gmail.com with ESMTPSA id a25-20020aa7d759000000b0051dd19d6d6esm8048264eds.73.2023.09.27.03.49.26 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 27 Sep 2023 03:49:26 -0700 (PDT) From: Martin Jansa To: openembedded-devel@lists.openembedded.org Cc: Martin Jansa Subject: [meta-oe][PATCH 2/4] minifi-cpp, mozjs-115, redis-7.2.1, pv: add missing Upstream-Status Date: Wed, 27 Sep 2023 12:49:16 +0200 Message-ID: <20230927104920.2052173-2-martin.jansa@gmail.com> X-Mailer: git-send-email 2.42.0 In-Reply-To: <20230927104920.2052173-1-martin.jansa@gmail.com> References: <20230927104920.2052173-1-martin.jansa@gmail.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 ; Wed, 27 Sep 2023 10:49:30 -0000 X-Groupsio-URL: https://lists.openembedded.org/g/openembedded-devel/message/105187 Signed-off-by: Martin Jansa --- .../0001-BundledOSSPUUID.cmake-Pass-CFLAGS-to-compiler.patch | 2 ++ ...1-Fix-the-constness-issues-around-autovector-iterator_.patch | 2 ++ meta-oe/recipes-extended/mozjs/mozjs-115/fix-musl-build.patch | 2 ++ .../redis/redis-7.2.1/hiredis-use-default-CC-if-it-is-set.patch | 2 ++ .../recipes-extended/redis/redis-7.2.1/oe-use-libc-malloc.patch | 2 ++ ...1-pv-display-handle-error-of-tcgetpgrp-in-pv_in_foregr.patch | 2 ++ 6 files changed, 12 insertions(+) diff --git a/meta-oe/recipes-extended/minifi-cpp/files/0001-BundledOSSPUUID.cmake-Pass-CFLAGS-to-compiler.patch b/meta-oe/recipes-extended/minifi-cpp/files/0001-BundledOSSPUUID.cmake-Pass-CFLAGS-to-compiler.patch index a0265eaa32..ceb8ec34b1 100644 --- a/meta-oe/recipes-extended/minifi-cpp/files/0001-BundledOSSPUUID.cmake-Pass-CFLAGS-to-compiler.patch +++ b/meta-oe/recipes-extended/minifi-cpp/files/0001-BundledOSSPUUID.cmake-Pass-CFLAGS-to-compiler.patch @@ -12,6 +12,8 @@ Upsteam-Status: Pending Signed-off-by: Mingli Yu --- +Upstream-Status: Pending + cmake/BundledOSSPUUID.cmake | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/meta-oe/recipes-extended/minifi-cpp/files/0001-Fix-the-constness-issues-around-autovector-iterator_.patch b/meta-oe/recipes-extended/minifi-cpp/files/0001-Fix-the-constness-issues-around-autovector-iterator_.patch index acb96f40d5..cd837d8de4 100644 --- a/meta-oe/recipes-extended/minifi-cpp/files/0001-Fix-the-constness-issues-around-autovector-iterator_.patch +++ b/meta-oe/recipes-extended/minifi-cpp/files/0001-Fix-the-constness-issues-around-autovector-iterator_.patch @@ -19,6 +19,8 @@ Pulled By: ltamasi fbshipit-source-id: 04e82d73bc0c67fb0ded018383af8dfc332050cc --- +Upstream-Status: Pending + thirdparty/rocksdb/util/autovector.h | 15 ++++----------- 1 file changed, 4 insertions(+), 11 deletions(-) diff --git a/meta-oe/recipes-extended/mozjs/mozjs-115/fix-musl-build.patch b/meta-oe/recipes-extended/mozjs/mozjs-115/fix-musl-build.patch index d2b87e8033..22f31e05f8 100644 --- a/meta-oe/recipes-extended/mozjs/mozjs-115/fix-musl-build.patch +++ b/meta-oe/recipes-extended/mozjs/mozjs-115/fix-musl-build.patch @@ -8,6 +8,8 @@ Reason: mozjs60 miscompiles on musl if built with HAVE_THREAD_TLS_KEYWORD: https://github.com/void-linux/void-packages/issues/2598 --- +Upstream-Status: Pending + js/src/old-configure.in | 3 +++ 1 file changed, 3 insertions(+) diff --git a/meta-oe/recipes-extended/redis/redis-7.2.1/hiredis-use-default-CC-if-it-is-set.patch b/meta-oe/recipes-extended/redis/redis-7.2.1/hiredis-use-default-CC-if-it-is-set.patch index 5b9b71ea69..7785acca5c 100644 --- a/meta-oe/recipes-extended/redis/redis-7.2.1/hiredis-use-default-CC-if-it-is-set.patch +++ b/meta-oe/recipes-extended/redis/redis-7.2.1/hiredis-use-default-CC-if-it-is-set.patch @@ -18,6 +18,8 @@ Reworked for 6.0.4 Signed-off-by: Andreas Müller --- +Upstream-Status: Pending + deps/hiredis/Makefile | 2 -- 1 file changed, 2 deletions(-) diff --git a/meta-oe/recipes-extended/redis/redis-7.2.1/oe-use-libc-malloc.patch b/meta-oe/recipes-extended/redis/redis-7.2.1/oe-use-libc-malloc.patch index be186b57da..7b601e02a9 100644 --- a/meta-oe/recipes-extended/redis/redis-7.2.1/oe-use-libc-malloc.patch +++ b/meta-oe/recipes-extended/redis/redis-7.2.1/oe-use-libc-malloc.patch @@ -15,6 +15,8 @@ Update to work with 4.0.8 Signed-off-by: Alistair Francis --- +Upstream-Status: Pending + src/Makefile | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/meta-oe/recipes-support/pv/pv/0001-pv-display-handle-error-of-tcgetpgrp-in-pv_in_foregr.patch b/meta-oe/recipes-support/pv/pv/0001-pv-display-handle-error-of-tcgetpgrp-in-pv_in_foregr.patch index 3c364dcc4e..c51fb1cfdb 100644 --- a/meta-oe/recipes-support/pv/pv/0001-pv-display-handle-error-of-tcgetpgrp-in-pv_in_foregr.patch +++ b/meta-oe/recipes-support/pv/pv/0001-pv-display-handle-error-of-tcgetpgrp-in-pv_in_foregr.patch @@ -15,6 +15,8 @@ correctly and pv_in_foreground() returns also true in that case. Signed-off-by: Michael Weiß --- +Upstream-Status: Pending + src/pv/display.c | 4 ++++ 1 file changed, 4 insertions(+) From patchwork Wed Sep 27 10:49:17 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Martin Jansa X-Patchwork-Id: 31241 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 55E77E810CA for ; Wed, 27 Sep 2023 10:49:30 +0000 (UTC) Received: from mail-ej1-f53.google.com (mail-ej1-f53.google.com [209.85.218.53]) by mx.groups.io with SMTP id smtpd.web10.14327.1695811768901789023 for ; Wed, 27 Sep 2023 03:49:29 -0700 Authentication-Results: mx.groups.io; dkim=pass header.i=@gmail.com header.s=20230601 header.b=N9g/cNI0; spf=pass (domain: gmail.com, ip: 209.85.218.53, mailfrom: martin.jansa@gmail.com) Received: by mail-ej1-f53.google.com with SMTP id a640c23a62f3a-9b0168a9e05so1109366566b.3 for ; Wed, 27 Sep 2023 03:49:28 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1695811767; x=1696416567; darn=lists.openembedded.org; 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=YoqnTNVhxsZdnqyt2QoopHP5P46He74CVPfdV4Yesug=; b=N9g/cNI0wJhiHukybZASC7OyirHUL06QdClY3/4sDC3Cb/H9a2c/YFpek+FBby3nEI i0N4/UeiQDP0pvisAOGzZTgcFiBpPEHCfpxEwj8f4VnVldhhaCi4Dg7OCQh5DduHTYwo 2xP+5XkBVOspTsVr99vSsNHa+/1Z1yFAKm7laDOflNn6tFkayXNZxSkpRNeWK+w0F1Q4 wA2j5nONCbca7dfiDTKd6o+s/OLAFzQ+uOaFSG1TtsS+hrKgnwNFUHB7fVbagfVbCMrQ zqKc6bjSGM+XN4hr5B1pXEXolHN1cNwoJaIfLqHOpaG7mdHe+51XTf0R3LAL0jKTwiYj j1mA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1695811767; x=1696416567; 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=YoqnTNVhxsZdnqyt2QoopHP5P46He74CVPfdV4Yesug=; b=pLu/PmSfyAP01bQP1v2zwkXnqgtjFyLYSdo8NMtIEd7ygzqdtX2U7m/N7reS/P+AXj PPgVdZB6o4S3EKObANx4lZrWcncWlrxxVayHIlgcUr+We+iq1qENVL+rWy5XE9gBOuI9 88EWIbxKaGTuxXEV4hTtpdwas0wKbNTGnL6wBxVrcXDS5mhLTj01fzqAEVEBV1hATXHH Sqt+2USJ0uUN1BWmZ7QYY6OhBv446Lr1hDtuq88H3+r0X4g92c8q/bgGSpRYowA4K/HN uOxIPCxAaDEaDa2dWJtr5jqjyvOCRosbNNfJyL3aq3THP6rENBZ6BZPYadVzn478hfVV 06IA== X-Gm-Message-State: AOJu0Yz+b68mM+vkeowsGwqnjDp7QmrKwl3cSzlr+h4cG5zhghIipJUz 7xKuPPYQfIEK8cEHcOk3IEN74D6Rs/c= X-Google-Smtp-Source: AGHT+IGX21oRYSckYyDciUWroSUkzTb/0tIcBPU4rxwLWZgPrzRjE839d4cOJsLV1WsbEWzxOzxvDA== X-Received: by 2002:a17:906:53:b0:9a1:c991:a521 with SMTP id 19-20020a170906005300b009a1c991a521mr1364236ejg.4.1695811767249; Wed, 27 Sep 2023 03:49:27 -0700 (PDT) Received: from localhost (ip-109-238-218-228.aim-net.cz. [109.238.218.228]) by smtp.gmail.com with ESMTPSA id cb25-20020a170906a45900b009ad778a68c5sm9174290ejb.60.2023.09.27.03.49.26 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 27 Sep 2023 03:49:26 -0700 (PDT) From: Martin Jansa To: openembedded-devel@lists.openembedded.org Cc: Martin Jansa Subject: [meta-oe][PATCH 3/4] mozjs: fix filename in MULTILIB_SCRIPTS Date: Wed, 27 Sep 2023 12:49:17 +0200 Message-ID: <20230927104920.2052173-3-martin.jansa@gmail.com> X-Mailer: git-send-email 2.42.0 In-Reply-To: <20230927104920.2052173-1-martin.jansa@gmail.com> References: <20230927104920.2052173-1-martin.jansa@gmail.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 ; Wed, 27 Sep 2023 10:49:30 -0000 X-Groupsio-URL: https://lists.openembedded.org/g/openembedded-devel/message/105188 * fixes: DEBUG: Executing shell function multilibscript_rename mv: cannot stat 'lib32-mozjs-115/115.2.0/package/usr/bin/js102-config': No such file or directory WARNING: exit code 1 from a shell command. * cannot use PV here just yet, see the next commit Signed-off-by: Martin Jansa --- meta-oe/recipes-extended/mozjs/mozjs-115_115.2.0.bb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/meta-oe/recipes-extended/mozjs/mozjs-115_115.2.0.bb b/meta-oe/recipes-extended/mozjs/mozjs-115_115.2.0.bb index babe39822a..b029c5f4ec 100644 --- a/meta-oe/recipes-extended/mozjs/mozjs-115_115.2.0.bb +++ b/meta-oe/recipes-extended/mozjs/mozjs-115_115.2.0.bb @@ -66,7 +66,7 @@ do_install() { inherit multilib_script multilib_header -MULTILIB_SCRIPTS += " ${PN}-dev:${bindir}/js102-config" +MULTILIB_SCRIPTS += " ${PN}-dev:${bindir}/js115-config" do_install:append() { oe_multilib_header mozjs-115/js-config.h From patchwork Wed Sep 27 10:49:18 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Martin Jansa X-Patchwork-Id: 31242 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 60F67E810CC for ; Wed, 27 Sep 2023 10:49:30 +0000 (UTC) Received: from mail-ed1-f41.google.com (mail-ed1-f41.google.com [209.85.208.41]) by mx.groups.io with SMTP id smtpd.web11.14601.1695811769525238583 for ; Wed, 27 Sep 2023 03:49:29 -0700 Authentication-Results: mx.groups.io; dkim=pass header.i=@gmail.com header.s=20230601 header.b=YR3J8Vyz; spf=pass (domain: gmail.com, ip: 209.85.208.41, mailfrom: martin.jansa@gmail.com) Received: by mail-ed1-f41.google.com with SMTP id 4fb4d7f45d1cf-532c66a105bso12591616a12.3 for ; Wed, 27 Sep 2023 03:49:29 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1695811768; x=1696416568; darn=lists.openembedded.org; 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=fieIPinNJZQSiqvm3cw4Ja5xd+V6i0RiuSnHwXmYlEk=; b=YR3J8VyzzLx+Am3RMM/eemjnRHwb4gS6ExZ1D2dtVaC+kD1/EVvTaQD+XiDOh+JVZv HRkHXyoRQryd3Y2iWk4LDprJwlGQZeScf/kKB6G5AXOmjxDFoaaGsvwVrn1eY2yz3qYr NTD9mrtn7WvOiFDEx8faOFHV0V0dIM0AOQCkfhLbMRg9Y6xdlwxPBMysNkUHA8y0GbBN c+T6rIr6/L9A72JjPhDXfSGo5xxTdzycFmS5EHmGO0wIX6emLdKC2in4MggA/tb0sxNH laJqXskAh5TJ+8AdIqLcMdI8ymmtS6Tovm1uWqIEj7qVHP63HtDw3fThQyaERKa5fk9c Z7Zg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1695811768; x=1696416568; 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=fieIPinNJZQSiqvm3cw4Ja5xd+V6i0RiuSnHwXmYlEk=; b=AIhTu27YwkKZ8QH7dteP6/2CF/q6J6VteSXCpdbM0LkewCRjOGswlHRHG34uf++0xD vRH1Zb8/lfdC7kLlH+b7q6tXVNiXwUyElOxQOvmKas/ceR5KOydJVetDynsdOmMlwTte +TaLRbF/sfx62WZVP8Nlu2QS7xxjKVeVLUYNEBuEAGpP6qJLaBcFrXCJtogFqAsKr6OT NVTYlI9mtJxDTd/SkFxJKYdTfnH/NIc8RVenq+uHK3STUa5NcrKBvgAiSWf0QlVFVrwl Bi2oe4iYgn0ojoo37LvKv5vfNJ+QKburXqvwNdlAaEs/3pL1RXEVd3EFV14bCGcGxWdg 6kRA== X-Gm-Message-State: AOJu0YyZ4HW/PRDc2sv/sLZBOQycFc60TAq7xejP7ryd+46D2E8treIv nohliZDhaBxTsNGWiiMVvABFLx04NPs= X-Google-Smtp-Source: AGHT+IF5mdrEu1wuJKauI0n9xqAVhabJK5RLUIbyy0XIK+P+NOuHty/fhHUuRfz6fZiVYrZU6TARBw== X-Received: by 2002:aa7:c709:0:b0:533:520:a5a8 with SMTP id i9-20020aa7c709000000b005330520a5a8mr1794390edq.29.1695811767963; Wed, 27 Sep 2023 03:49:27 -0700 (PDT) Received: from localhost (ip-109-238-218-228.aim-net.cz. [109.238.218.228]) by smtp.gmail.com with ESMTPSA id cm15-20020a0564020c8f00b0053537ad3936sm442591edb.21.2023.09.27.03.49.27 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 27 Sep 2023 03:49:27 -0700 (PDT) From: Martin Jansa To: openembedded-devel@lists.openembedded.org Cc: Martin Jansa Subject: [meta-oe][PATCH 4/4] mozjs: use PV in MULTILIB_SCRIPTS Date: Wed, 27 Sep 2023 12:49:18 +0200 Message-ID: <20230927104920.2052173-4-martin.jansa@gmail.com> X-Mailer: git-send-email 2.42.0 In-Reply-To: <20230927104920.2052173-1-martin.jansa@gmail.com> References: <20230927104920.2052173-1-martin.jansa@gmail.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 ; Wed, 27 Sep 2023 10:49:30 -0000 X-Groupsio-URL: https://lists.openembedded.org/g/openembedded-devel/message/105189 * to avoid possible issue next time new mozjs version recipe is introduced (as multilib isn't as well tested as other build configs) * this depends on oe-core change to expand script name in MULTILIB_SCRIPTS: https://lists.openembedded.org/g/openembedded-core/message/188301 Signed-off-by: Martin Jansa --- meta-oe/recipes-extended/mozjs/mozjs-102_102.15.0.bb | 7 ++++--- meta-oe/recipes-extended/mozjs/mozjs-115_115.2.0.bb | 7 ++++--- 2 files changed, 8 insertions(+), 6 deletions(-) diff --git a/meta-oe/recipes-extended/mozjs/mozjs-102_102.15.0.bb b/meta-oe/recipes-extended/mozjs/mozjs-102_102.15.0.bb index 08cfededa7..f2781d7096 100644 --- a/meta-oe/recipes-extended/mozjs/mozjs-102_102.15.0.bb +++ b/meta-oe/recipes-extended/mozjs/mozjs-102_102.15.0.bb @@ -66,12 +66,13 @@ do_install() { inherit multilib_script multilib_header -MULTILIB_SCRIPTS += " ${PN}-dev:${bindir}/js102-config" +MAJ_VER = "${@oe.utils.trim_version("${PV}", 1)}" +MULTILIB_SCRIPTS += "${PN}-dev:${bindir}/js${MAJ_VER}-config" do_install:append() { - oe_multilib_header mozjs-102/js-config.h + oe_multilib_header mozjs-${MAJ_VER}/js-config.h sed -e 's@${STAGING_DIR_HOST}@@g' \ - -i ${D}${bindir}/js102-config + -i ${D}${bindir}/js${MAJ_VER}-config rm -f ${D}${libdir}/libjs_static.ajs } diff --git a/meta-oe/recipes-extended/mozjs/mozjs-115_115.2.0.bb b/meta-oe/recipes-extended/mozjs/mozjs-115_115.2.0.bb index b029c5f4ec..fcdf64c932 100644 --- a/meta-oe/recipes-extended/mozjs/mozjs-115_115.2.0.bb +++ b/meta-oe/recipes-extended/mozjs/mozjs-115_115.2.0.bb @@ -66,12 +66,13 @@ do_install() { inherit multilib_script multilib_header -MULTILIB_SCRIPTS += " ${PN}-dev:${bindir}/js115-config" +MAJ_VER = "${@oe.utils.trim_version("${PV}", 1)}" +MULTILIB_SCRIPTS += "${PN}-dev:${bindir}/js${MAJ_VER}-config" do_install:append() { - oe_multilib_header mozjs-115/js-config.h + oe_multilib_header mozjs-${MAJ_VER}/js-config.h sed -e 's@${STAGING_DIR_HOST}@@g' \ - -i ${D}${bindir}/js115-config + -i ${D}${bindir}/js${MAJ_VER}-config rm -f ${D}${libdir}/libjs_static.ajs }