Replace whole repo with latest content from branch stream-16-rhel-8.8.0
Content corresponds with RHEL dist-git commit 3b6d622
This commit is contained in:
parent
777e281b39
commit
1e0f970a53
@ -1,72 +0,0 @@
|
|||||||
From e2ff0fc92ddbaa5535d684e353c55cefe99eb081 Mon Sep 17 00:00:00 2001
|
|
||||||
From: rpm-build <rpm-build>
|
|
||||||
Date: Tue, 27 Sep 2022 13:48:12 +0200
|
|
||||||
Subject: [PATCH] Install both binaries and use libdir
|
|
||||||
|
|
||||||
Signed-off-by: rpm-build <rpm-build>
|
|
||||||
---
|
|
||||||
configure.py | 7 +++++++
|
|
||||||
tools/install.py | 8 +++++---
|
|
||||||
2 files changed, 12 insertions(+), 3 deletions(-)
|
|
||||||
|
|
||||||
diff --git a/configure.py b/configure.py
|
|
||||||
index 1a7023d..b16db0c 100755
|
|
||||||
--- a/configure.py
|
|
||||||
+++ b/configure.py
|
|
||||||
@@ -739,6 +739,12 @@ parser.add_argument('--shared',
|
|
||||||
help='compile shared library for embedding node in another project. ' +
|
|
||||||
'(This mode is not officially supported for regular applications)')
|
|
||||||
|
|
||||||
+parser.add_argument('--libdir',
|
|
||||||
+ action='store',
|
|
||||||
+ dest='libdir',
|
|
||||||
+ default='lib',
|
|
||||||
+ help='a directory to install the shared library into')
|
|
||||||
+
|
|
||||||
parser.add_argument('--without-v8-platform',
|
|
||||||
action='store_true',
|
|
||||||
dest='without_v8_platform',
|
|
||||||
@@ -1368,6 +1374,7 @@ def configure_node(o):
|
|
||||||
o['variables']['node_no_browser_globals'] = b(options.no_browser_globals)
|
|
||||||
|
|
||||||
o['variables']['node_shared'] = b(options.shared)
|
|
||||||
+ o['variables']['libdir'] = options.libdir
|
|
||||||
node_module_version = getmoduleversion.get_version()
|
|
||||||
|
|
||||||
if options.dest_os == 'android':
|
|
||||||
diff --git a/tools/install.py b/tools/install.py
|
|
||||||
index a6d1f8b..e3ef9d7 100755
|
|
||||||
--- a/tools/install.py
|
|
||||||
+++ b/tools/install.py
|
|
||||||
@@ -144,6 +144,7 @@ def files(action):
|
|
||||||
is_windows = sys.platform == 'win32'
|
|
||||||
output_file = 'node'
|
|
||||||
output_prefix = 'out/Release/'
|
|
||||||
+ output_libprefix = output_prefix
|
|
||||||
|
|
||||||
if is_windows:
|
|
||||||
output_file += '.exe'
|
|
||||||
@@ -151,8 +152,8 @@ def files(action):
|
|
||||||
|
|
||||||
if 'true' == variables.get('node_shared'):
|
|
||||||
if is_windows:
|
|
||||||
- action([output_prefix + 'libnode.dll'], 'bin/libnode.dll')
|
|
||||||
- action([output_prefix + 'libnode.lib'], 'lib/libnode.lib')
|
|
||||||
+ action([output_libprefix + 'libnode.dll'], 'bin/libnode.dll')
|
|
||||||
+ action([output_libprefix + 'libnode.lib'], 'lib/libnode.lib')
|
|
||||||
elif sys.platform == 'zos':
|
|
||||||
# GYP will output to lib.target; see _InstallableTargetInstallPath
|
|
||||||
# function in tools/gyp/pylib/gyp/generator/make.py
|
|
||||||
@@ -176,7 +177,8 @@ def files(action):
|
|
||||||
try_symlink(so_name, link_path)
|
|
||||||
else:
|
|
||||||
output_lib = 'libnode.' + variables.get('shlib_suffix')
|
|
||||||
- action([output_prefix + output_lib], 'lib/' + output_lib)
|
|
||||||
+ action([output_libprefix + output_lib], variables.get('libdir') + '/' + output_lib)
|
|
||||||
+
|
|
||||||
if 'true' == variables.get('node_use_dtrace'):
|
|
||||||
action(['out/Release/node.d'], 'lib/dtrace/node.d')
|
|
||||||
|
|
||||||
--
|
|
||||||
2.37.3
|
|
||||||
|
|
@ -1,6 +0,0 @@
|
|||||||
--- !Policy
|
|
||||||
product_versions:
|
|
||||||
- rhel-9
|
|
||||||
decision_context: osci_compose_gate
|
|
||||||
rules:
|
|
||||||
- !PassingTestCaseRule {test_case_name: baseos-ci.brew-build.tier1.functional}
|
|
@ -749,15 +749,12 @@ end
|
|||||||
|
|
||||||
* Wed Nov 16 2022 Zuzana Svetlikova <zsvetlik@redhat.com> - 1:16.18.1-1
|
* Wed Nov 16 2022 Zuzana Svetlikova <zsvetlik@redhat.com> - 1:16.18.1-1
|
||||||
- Rebase + CVE fixes
|
- Rebase + CVE fixes
|
||||||
- Resolves: #2142806
|
- Resolves: #2121024
|
||||||
- Resolves: #2142837, #2142851
|
- Resolves: #2135490, #2140926
|
||||||
|
|
||||||
* Fri Oct 07 2022 Zuzana Svetlikova <zsvetlik@redhat.com> - 1:16.17.1-1
|
* Fri Oct 07 2022 Zuzana Svetlikova <zsvetlik@redhat.com> - 1:16.17.1-1
|
||||||
- Rebase to version 16.17.1
|
- Rebase to version 16.17.1
|
||||||
- Resolves: CVE-2022-35255 CVE-2022-35256
|
- Resolves: CVE-2022-35255 CVE-2022-35256
|
||||||
- Resolves: #2130553
|
|
||||||
- Resolves #2132003
|
|
||||||
- Resolves #2121095
|
|
||||||
|
|
||||||
* Tue Aug 23 2022 Zuzana Svetlikova <zsvetlik@redhat.com> - 1:16.16.0-1
|
* Tue Aug 23 2022 Zuzana Svetlikova <zsvetlik@redhat.com> - 1:16.16.0-1
|
||||||
- Resolves: #2104754, #2108057, #2108062, #2108067, #2108072
|
- Resolves: #2104754, #2108057, #2108062, #2108067, #2108072
|
||||||
|
@ -1,2 +0,0 @@
|
|||||||
[koji]
|
|
||||||
targets = master f34 f33
|
|
Loading…
Reference in New Issue
Block a user