[PATCH v2 1/3] npm.bbclass: Fix file permissions before opening it for writing

[PATCH v2 1/3] npm.bbclass: Fix file permissions before opening it for writing

[Zoltan Boszormenyi]

From: Zoltán Böszörményi <zboszor@gmail.com>

Some node module archives in npmjs.org contain wrong permissions.
I found a case with package.json in the archive being r-xr-xr-x
for which open(..., "w") fails. Modify the manifest file permissions
to add the write bit for the owner.

Signed-off-by: Zoltán Böszörményi <zboszor@gmail.com>
---
 meta/classes/npm.bbclass | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/meta/classes/npm.bbclass b/meta/classes/npm.bbclass
index ba50fcac20..86ee0f665a 100644
--- a/meta/classes/npm.bbclass
+++ b/meta/classes/npm.bbclass
@@ -81,6 +81,7 @@ python npm_do_configure() {
     import json
     import re
     import shlex
+    import stat
     import tempfile
     from bb.fetch2.npm import NpmEnvironment
     from bb.fetch2.npm import npm_unpack
@@ -202,6 +203,7 @@ python npm_do_configure() {
         if has_shrinkwrap_file:
             _update_manifest("devDependencies")
 
+    os.chmod(cached_manifest_file, os.stat(cached_manifest_file).st_mode | stat.S_IWUSR)
     with open(cached_manifest_file, "w") as f:
         json.dump(cached_manifest, f, indent=2)
 
-- 
2.36.1

[PATCH v2 2/3] npm.bbclass: Don't create /usr/lib/node symlink

[Zoltan Boszormenyi]

From: Zoltán Böszörményi <zboszor@gmail.com>

When a recipe DEPENDS on multiple other npm based recipes,
the symlink will create a conflict.

Signed-off-by: Zoltán Böszörményi <zboszor@gmail.com>
---
 meta/classes/npm.bbclass | 4 ----
 1 file changed, 4 deletions(-)

diff --git a/meta/classes/npm.bbclass b/meta/classes/npm.bbclass
index 86ee0f665a..dbfc2e728e 100644
--- a/meta/classes/npm.bbclass
+++ b/meta/classes/npm.bbclass
@@ -307,10 +307,6 @@ npm_do_install() {
     # Remove the shrinkwrap file which does not need to be packed
     rm -f ${D}/${nonarch_libdir}/node_modules/*/npm-shrinkwrap.json
     rm -f ${D}/${nonarch_libdir}/node_modules/@*/*/npm-shrinkwrap.json
-
-    # node(1) is using /usr/lib/node as default include directory and npm(1) is
-    # using /usr/lib/node_modules as install directory. Let's make both happy.
-    ln -fs node_modules ${D}/${nonarch_libdir}/node
 }
 
 FILES:${PN} += " \
-- 
2.36.1

[meta-oe][PATCH v2 3/3] nodejs: Add /usr/lib/node -> node_modules symlink

[Zoltan Boszormenyi]

From: Zoltán Böszörményi <zboszor@gmail.com>

While /usr/lib/node_modules and all npm-related modules are
shipped in the npm subpackage, keep the symlink in the main
package because 3rd party modules that don't need npm are
also installed into /usr/lib/node_modules.

Signed-off-by: Zoltán Böszörményi <zboszor@gmail.com>
---
 meta-oe/recipes-devtools/nodejs/nodejs_16.14.2.bb | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/meta-oe/recipes-devtools/nodejs/nodejs_16.14.2.bb b/meta-oe/recipes-devtools/nodejs/nodejs_16.14.2.bb
index 62188f94a..be68afd4c 100644
--- a/meta-oe/recipes-devtools/nodejs/nodejs_16.14.2.bb
+++ b/meta-oe/recipes-devtools/nodejs/nodejs_16.14.2.bb
@@ -159,6 +159,10 @@ do_compile () {
 
 do_install () {
     oe_runmake install DESTDIR=${D}
+
+    # node(1) is using /usr/lib/node as default include directory and npm(1) is
+    # using /usr/lib/node_modules as install directory. Let's make both happy.
+    ln -fs node_modules ${D}/${nonarch_libdir}/node
 }
 
 BINARIES = " \
@@ -176,6 +180,7 @@ do_install:append:class-native() {
 }
 
 PACKAGES =+ "${PN}-npm"
+FILES:${PN} += "${nonarch_libdir}/node"
 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"
-- 
2.36.1

Re: [OE-core] [meta-oe][PATCH v2 3/3] nodejs: Add /usr/lib/node -> node_modules symlink

[Alexander Kanavin]

This needs to be sent to the openembedded-devel list.

Alex

On Fri, 13 May 2022 at 17:31, Zoltan Boszormenyi via
lists.openembedded.org <zboszor=pr.hu@lists.openembedded.org> wrote:
>
> From: Zoltán Böszörményi <zboszor@gmail.com>
>
> While /usr/lib/node_modules and all npm-related modules are
> shipped in the npm subpackage, keep the symlink in the main
> package because 3rd party modules that don't need npm are
> also installed into /usr/lib/node_modules.
>
> Signed-off-by: Zoltán Böszörményi <zboszor@gmail.com>
> ---
>  meta-oe/recipes-devtools/nodejs/nodejs_16.14.2.bb | 5 +++++
>  1 file changed, 5 insertions(+)
>
> diff --git a/meta-oe/recipes-devtools/nodejs/nodejs_16.14.2.bb b/meta-oe/recipes-devtools/nodejs/nodejs_16.14.2.bb
> index 62188f94a..be68afd4c 100644
> --- a/meta-oe/recipes-devtools/nodejs/nodejs_16.14.2.bb
> +++ b/meta-oe/recipes-devtools/nodejs/nodejs_16.14.2.bb
> @@ -159,6 +159,10 @@ do_compile () {
>
>  do_install () {
>      oe_runmake install DESTDIR=${D}
> +
> +    # node(1) is using /usr/lib/node as default include directory and npm(1) is
> +    # using /usr/lib/node_modules as install directory. Let's make both happy.
> +    ln -fs node_modules ${D}/${nonarch_libdir}/node
>  }
>
>  BINARIES = " \
> @@ -176,6 +180,7 @@ do_install:append:class-native() {
>  }
>
>  PACKAGES =+ "${PN}-npm"
> +FILES:${PN} += "${nonarch_libdir}/node"
>  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"
> --
> 2.36.1
>
>
> -=-=-=-=-=-=-=-=-=-=-=-
> Links: You receive all messages sent to this group.
> View/Reply Online (#165573): https://lists.openembedded.org/g/openembedded-core/message/165573
> Mute This Topic: https://lists.openembedded.org/mt/91083341/1686489
> Group Owner: openembedded-core+owner@lists.openembedded.org
> Unsubscribe: https://lists.openembedded.org/g/openembedded-core/unsub [alex.kanavin@gmail.com]
> -=-=-=-=-=-=-=-=-=-=-=-
>

Re: [OE-core] [meta-oe][PATCH v2 3/3] nodejs: Add /usr/lib/node -> node_modules symlink

[Zoltan Boszormenyi]

2022. 05. 13. 17:42 keltezéssel, Alexander Kanavin írta:
> This needs to be sent to the openembedded-devel list.

Is it ok just to cc openembedded-devel? Because applying
this 3rd patch to meta-oe without applying the second to
oe-core will cause conflicts and has a high chance to be
rejected.

> 
> Alex
> 
> On Fri, 13 May 2022 at 17:31, Zoltan Boszormenyi via
> lists.openembedded.org <zboszor=pr.hu@lists.openembedded.org> wrote:
>>
>> From: Zoltán Böszörményi <zboszor@gmail.com>
>>
>> While /usr/lib/node_modules and all npm-related modules are
>> shipped in the npm subpackage, keep the symlink in the main
>> package because 3rd party modules that don't need npm are
>> also installed into /usr/lib/node_modules.
>>
>> Signed-off-by: Zoltán Böszörményi <zboszor@gmail.com>
>> ---
>>   meta-oe/recipes-devtools/nodejs/nodejs_16.14.2.bb | 5 +++++
>>   1 file changed, 5 insertions(+)
>>
>> diff --git a/meta-oe/recipes-devtools/nodejs/nodejs_16.14.2.bb b/meta-oe/recipes-devtools/nodejs/nodejs_16.14.2.bb
>> index 62188f94a..be68afd4c 100644
>> --- a/meta-oe/recipes-devtools/nodejs/nodejs_16.14.2.bb
>> +++ b/meta-oe/recipes-devtools/nodejs/nodejs_16.14.2.bb
>> @@ -159,6 +159,10 @@ do_compile () {
>>
>>   do_install () {
>>       oe_runmake install DESTDIR=${D}
>> +
>> +    # node(1) is using /usr/lib/node as default include directory and npm(1) is
>> +    # using /usr/lib/node_modules as install directory. Let's make both happy.
>> +    ln -fs node_modules ${D}/${nonarch_libdir}/node
>>   }
>>
>>   BINARIES = " \
>> @@ -176,6 +180,7 @@ do_install:append:class-native() {
>>   }
>>
>>   PACKAGES =+ "${PN}-npm"
>> +FILES:${PN} += "${nonarch_libdir}/node"
>>   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"
>> --
>> 2.36.1
>>
>>
>> 
>>

Re: [OE-core] [meta-oe][PATCH v2 3/3] nodejs: Add /usr/lib/node -> node_modules symlink

[Khem Raj]

On Fri, May 13, 2022 at 9:49 AM Zoltan Boszormenyi via
lists.openembedded.org <zboszor=pr.hu@lists.openembedded.org> wrote:
>
> 2022. 05. 13. 17:42 keltezéssel, Alexander Kanavin írta:
> > This needs to be sent to the openembedded-devel list.
>
> Is it ok just to cc openembedded-devel? Because applying
> this 3rd patch to meta-oe without applying the second to
> oe-core will cause conflicts and has a high chance to be
> rejected.

get the oe-core things done first.

>
> >
> > Alex
> >
> > On Fri, 13 May 2022 at 17:31, Zoltan Boszormenyi via
> > lists.openembedded.org <zboszor=pr.hu@lists.openembedded.org> wrote:
> >>
> >> From: Zoltán Böszörményi <zboszor@gmail.com>
> >>
> >> While /usr/lib/node_modules and all npm-related modules are
> >> shipped in the npm subpackage, keep the symlink in the main
> >> package because 3rd party modules that don't need npm are
> >> also installed into /usr/lib/node_modules.
> >>
> >> Signed-off-by: Zoltán Böszörményi <zboszor@gmail.com>
> >> ---
> >>   meta-oe/recipes-devtools/nodejs/nodejs_16.14.2.bb | 5 +++++
> >>   1 file changed, 5 insertions(+)
> >>
> >> diff --git a/meta-oe/recipes-devtools/nodejs/nodejs_16.14.2.bb b/meta-oe/recipes-devtools/nodejs/nodejs_16.14.2.bb
> >> index 62188f94a..be68afd4c 100644
> >> --- a/meta-oe/recipes-devtools/nodejs/nodejs_16.14.2.bb
> >> +++ b/meta-oe/recipes-devtools/nodejs/nodejs_16.14.2.bb
> >> @@ -159,6 +159,10 @@ do_compile () {
> >>
> >>   do_install () {
> >>       oe_runmake install DESTDIR=${D}
> >> +
> >> +    # node(1) is using /usr/lib/node as default include directory and npm(1) is
> >> +    # using /usr/lib/node_modules as install directory. Let's make both happy.
> >> +    ln -fs node_modules ${D}/${nonarch_libdir}/node
> >>   }
> >>
> >>   BINARIES = " \
> >> @@ -176,6 +180,7 @@ do_install:append:class-native() {
> >>   }
> >>
> >>   PACKAGES =+ "${PN}-npm"
> >> +FILES:${PN} += "${nonarch_libdir}/node"
> >>   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"
> >> --
> >> 2.36.1
> >>
> >>
> >>
> >>
>
>
> -=-=-=-=-=-=-=-=-=-=-=-
> Links: You receive all messages sent to this group.
> View/Reply Online (#165580): https://lists.openembedded.org/g/openembedded-core/message/165580
> Mute This Topic: https://lists.openembedded.org/mt/91083341/1997914
> Group Owner: openembedded-core+owner@lists.openembedded.org
> Unsubscribe: https://lists.openembedded.org/g/openembedded-core/unsub [raj.khem@gmail.com]
> -=-=-=-=-=-=-=-=-=-=-=-
>