* [1.52][PATCH 1/4] process: Do not mix stderr with stdout
2021-12-31 0:21 [1.52][PATCH 0/4] Review request Anuj Mittal
@ 2021-12-31 0:21 ` Anuj Mittal
2021-12-31 0:21 ` [1.52][PATCH 2/4] fetch: npm: Quote destdir in run chmod command Anuj Mittal
` (2 subsequent siblings)
3 siblings, 0 replies; 6+ messages in thread
From: Anuj Mittal @ 2021-12-31 0:21 UTC (permalink / raw)
To: bitbake-devel
From: Anton Mikanovich <amikan@ilbers.de>
We should not redirect stderr to stdout if we need to get separated
stdout and stderr contents from Popen.communicate() later.
Signed-off-by: Anton Mikanovich <amikan@ilbers.de>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
(cherry picked from commit 1ecc1d9424877df89fcda2f23c306998998a65ff)
Signed-off-by: Anuj Mittal <anuj.mittal@intel.com>
---
lib/bb/process.py | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/lib/bb/process.py b/lib/bb/process.py
index d5a1775f..af5d804a 100644
--- a/lib/bb/process.py
+++ b/lib/bb/process.py
@@ -60,7 +60,7 @@ class Popen(subprocess.Popen):
"close_fds": True,
"preexec_fn": subprocess_setup,
"stdout": subprocess.PIPE,
- "stderr": subprocess.STDOUT,
+ "stderr": subprocess.PIPE,
"stdin": subprocess.PIPE,
"shell": False,
}
--
2.33.1
^ permalink raw reply related [flat|nested] 6+ messages in thread* [1.52][PATCH 2/4] fetch: npm: Quote destdir in run chmod command
2021-12-31 0:21 [1.52][PATCH 0/4] Review request Anuj Mittal
2021-12-31 0:21 ` [1.52][PATCH 1/4] process: Do not mix stderr with stdout Anuj Mittal
@ 2021-12-31 0:21 ` Anuj Mittal
2021-12-31 0:21 ` [1.52][PATCH 3/4] fetch: npm: Use temporary file for empty user config Anuj Mittal
2021-12-31 0:21 ` [1.52][PATCH 4/4] tests/fetch: Drop gnu urls from wget connectivity test Anuj Mittal
3 siblings, 0 replies; 6+ messages in thread
From: Anuj Mittal @ 2021-12-31 0:21 UTC (permalink / raw)
To: bitbake-devel
From: Stefan Herbrechtsmeier <stefan.herbrechtsmeier@weidmueller.com>
Quote destdir in run chmod command to support special characters in
package name and to avoid syntax error for packages like
'@(._.)/execute'.
Signed-off-by: Stefan Herbrechtsmeier <stefan.herbrechtsmeier@weidmueller.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
(cherry picked from commit a701dfce3f0e74b4d7c687eeda83fe9c8e7240b1)
Signed-off-by: Anuj Mittal <anuj.mittal@intel.com>
---
lib/bb/fetch2/npm.py | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/lib/bb/fetch2/npm.py b/lib/bb/fetch2/npm.py
index e497c38d..d9daec20 100644
--- a/lib/bb/fetch2/npm.py
+++ b/lib/bb/fetch2/npm.py
@@ -72,7 +72,7 @@ def npm_unpack(tarball, destdir, d):
cmd += " --delay-directory-restore"
cmd += " --strip-components=1"
runfetchcmd(cmd, d, workdir=destdir)
- runfetchcmd("chmod -R +X %s" % (destdir), d, quiet=True, workdir=destdir)
+ runfetchcmd("chmod -R +X '%s'" % (destdir), d, quiet=True, workdir=destdir)
class NpmEnvironment(object):
"""
--
2.33.1
^ permalink raw reply related [flat|nested] 6+ messages in thread* [1.52][PATCH 3/4] fetch: npm: Use temporary file for empty user config
2021-12-31 0:21 [1.52][PATCH 0/4] Review request Anuj Mittal
2021-12-31 0:21 ` [1.52][PATCH 1/4] process: Do not mix stderr with stdout Anuj Mittal
2021-12-31 0:21 ` [1.52][PATCH 2/4] fetch: npm: Quote destdir in run chmod command Anuj Mittal
@ 2021-12-31 0:21 ` Anuj Mittal
2021-12-31 0:21 ` [1.52][PATCH 4/4] tests/fetch: Drop gnu urls from wget connectivity test Anuj Mittal
3 siblings, 0 replies; 6+ messages in thread
From: Anuj Mittal @ 2021-12-31 0:21 UTC (permalink / raw)
To: bitbake-devel
From: Stefan Herbrechtsmeier <stefan.herbrechtsmeier@weidmueller.com>
Always use a temporary file for the user config 'NPM_CONFIG_USERCONFIG'
because npm otherwise failed if configs and npmrc aren't set:
double-loading config "/dev/null" as "global", previously loaded as "user"
Signed-off-by: Stefan Herbrechtsmeier <stefan.herbrechtsmeier@weidmueller.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
(cherry picked from commit 9f272ad7f76c1559e745e9af686d0a529f917659)
Signed-off-by: Anuj Mittal <anuj.mittal@intel.com>
---
lib/bb/fetch2/npm.py | 14 +++++---------
1 file changed, 5 insertions(+), 9 deletions(-)
diff --git a/lib/bb/fetch2/npm.py b/lib/bb/fetch2/npm.py
index d9daec20..b3a3a444 100644
--- a/lib/bb/fetch2/npm.py
+++ b/lib/bb/fetch2/npm.py
@@ -79,16 +79,12 @@ class NpmEnvironment(object):
Using a npm config file seems more reliable than using cli arguments.
This class allows to create a controlled environment for npm commands.
"""
- def __init__(self, d, configs=None, npmrc=None):
+ def __init__(self, d, configs=[], npmrc=None):
self.d = d
- if configs:
- self.user_config = tempfile.NamedTemporaryFile(mode="w", buffering=1)
- self.user_config_name = self.user_config.name
- for key, value in configs:
- self.user_config.write("%s=%s\n" % (key, value))
- else:
- self.user_config_name = "/dev/null"
+ self.user_config = tempfile.NamedTemporaryFile(mode="w", buffering=1)
+ for key, value in configs:
+ self.user_config.write("%s=%s\n" % (key, value))
if npmrc:
self.global_config_name = npmrc
@@ -109,7 +105,7 @@ class NpmEnvironment(object):
workdir = tmpdir
def _run(cmd):
- cmd = "NPM_CONFIG_USERCONFIG=%s " % (self.user_config_name) + cmd
+ cmd = "NPM_CONFIG_USERCONFIG=%s " % (self.user_config.name) + cmd
cmd = "NPM_CONFIG_GLOBALCONFIG=%s " % (self.global_config_name) + cmd
return runfetchcmd(cmd, d, workdir=workdir)
--
2.33.1
^ permalink raw reply related [flat|nested] 6+ messages in thread* [1.52][PATCH 4/4] tests/fetch: Drop gnu urls from wget connectivity test
2021-12-31 0:21 [1.52][PATCH 0/4] Review request Anuj Mittal
` (2 preceding siblings ...)
2021-12-31 0:21 ` [1.52][PATCH 3/4] fetch: npm: Use temporary file for empty user config Anuj Mittal
@ 2021-12-31 0:21 ` Anuj Mittal
3 siblings, 0 replies; 6+ messages in thread
From: Anuj Mittal @ 2021-12-31 0:21 UTC (permalink / raw)
To: bitbake-devel
From: Richard Purdie <richard.purdie@linuxfoundation.org>
These urls are no longer adding much to the test coverage but the intermittent
network issues connecting to them are painful. Drop the urls.
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
(cherry picked from commit bdf5739c5d831dc97a7d81568f94a0953c71017f)
Signed-off-by: Anuj Mittal <anuj.mittal@intel.com>
---
lib/bb/tests/fetch.py | 3 ---
1 file changed, 3 deletions(-)
diff --git a/lib/bb/tests/fetch.py b/lib/bb/tests/fetch.py
index a85ebdf4..34f3a4f6 100644
--- a/lib/bb/tests/fetch.py
+++ b/lib/bb/tests/fetch.py
@@ -1378,9 +1378,6 @@ class FetchCheckStatusTest(FetcherTest):
"https://downloads.yoctoproject.org/releases/opkg/opkg-0.1.7.tar.gz",
"https://downloads.yoctoproject.org/releases/opkg/opkg-0.3.0.tar.gz",
"ftp://sourceware.org/pub/libffi/libffi-1.20.tar.gz",
- "http://ftp.gnu.org/gnu/autoconf/autoconf-2.60.tar.gz",
- "https://ftp.gnu.org/gnu/chess/gnuchess-5.08.tar.gz",
- "https://ftp.gnu.org/gnu/gmp/gmp-4.0.tar.gz",
# GitHub releases are hosted on Amazon S3, which doesn't support HEAD
"https://github.com/kergoth/tslib/releases/download/1.1/tslib-1.1.tar.xz"
]
--
2.33.1
^ permalink raw reply related [flat|nested] 6+ messages in thread