From f5701461d8db6009fda35af03bd48f4725db62c7 Mon Sep 17 00:00:00 2001 From: Zuzana Svetlikova Date: Mon, 25 Sep 2017 18:02:15 +0200 Subject: [PATCH 1/9] Adjust modulemd to build from f26 --- README.md | 2 -- nodejs.yaml | 3 ++- 2 files changed, 2 insertions(+), 3 deletions(-) diff --git a/README.md b/README.md index 0b7e42a..16963fc 100644 --- a/README.md +++ b/README.md @@ -6,8 +6,6 @@ build dependencies calculated by brt_dep_solver compat-openssl10 gcc icu -libuv runtime dependencies calculated by brt_dep_solver ------------------------------------------------- -libuv diff --git a/nodejs.yaml b/nodejs.yaml index f851ef1..986f5b5 100644 --- a/nodejs.yaml +++ b/nodejs.yaml @@ -47,7 +47,8 @@ data: nodejs: rationale: Javascript runtime and npm package manager. buildorder: 10 - ref: d54471 + ref: f26 + #46c283 nodejs-packaging: rationale: Runtime dependency of nodejs-devel. buildorder: 10 From 01dadb7a39b98f71fce624dccef9dd72cd912ae9 Mon Sep 17 00:00:00 2001 From: Zuzana Svetlikova Date: Fri, 6 Oct 2017 22:56:33 +0200 Subject: [PATCH 2/9] Update, add rpm macros --- nodejs.yaml | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/nodejs.yaml b/nodejs.yaml index 986f5b5..c981268 100644 --- a/nodejs.yaml +++ b/nodejs.yaml @@ -42,13 +42,16 @@ data: - nodejs - nodejs-devel - npm + buildopts: + rpms: + macros: | + %_with_bootstrap 1 components: rpms: nodejs: rationale: Javascript runtime and npm package manager. buildorder: 10 ref: f26 - #46c283 nodejs-packaging: rationale: Runtime dependency of nodejs-devel. buildorder: 10 From 30d4fe481907f111e012e6cea31caaad48c594c1 Mon Sep 17 00:00:00 2001 From: Stephen Gallagher Date: Tue, 7 Nov 2017 08:27:06 -0500 Subject: [PATCH 3/9] Build the latest Node.js 6.x Signed-off-by: Stephen Gallagher --- nodejs.yaml | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/nodejs.yaml b/nodejs.yaml index c981268..1502afd 100644 --- a/nodejs.yaml +++ b/nodejs.yaml @@ -14,10 +14,10 @@ data: buildrequires: # http-parser, libuv, c-ares and V8 are bundled # openssl, icu and zlib should be provided by platform - platform: master + platform: f27 python2: master requires: - platform: master + platform: f27 python2: master references: community: http://nodejs.org @@ -51,7 +51,8 @@ data: nodejs: rationale: Javascript runtime and npm package manager. buildorder: 10 - ref: f26 + ref: f26 nodejs-packaging: rationale: Runtime dependency of nodejs-devel. buildorder: 10 + ref: master From 2e477ad115fccf840d4e0ca53154e4c53e3ad67c Mon Sep 17 00:00:00 2001 From: Zuzana Svetlikova Date: Fri, 10 Nov 2017 15:43:30 +0100 Subject: [PATCH 4/9] v6.12.0 rebuild From 7e35ebf6016603b3023f223c375d8c4996d964b7 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Petr=20P=C3=ADsa=C5=99?= Date: Thu, 16 Nov 2017 14:39:06 +0100 Subject: [PATCH 5/9] Port to platform:f27 All dependencies including python2 must run-require the same platform stream. --- nodejs.yaml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/nodejs.yaml b/nodejs.yaml index 1502afd..4ea81dc 100644 --- a/nodejs.yaml +++ b/nodejs.yaml @@ -15,10 +15,10 @@ data: # http-parser, libuv, c-ares and V8 are bundled # openssl, icu and zlib should be provided by platform platform: f27 - python2: master + python2: 2.7 requires: platform: f27 - python2: master + python2: 2.7 references: community: http://nodejs.org documentation: http://nodejs.org/en/docs From ed051a3a76cffb5cc7f84181e55bf8e8b7f0bab0 Mon Sep 17 00:00:00 2001 From: Stephen Gallagher Date: Fri, 12 Jan 2018 13:40:45 -0500 Subject: [PATCH 6/9] Building for new hybrid approach Signed-off-by: Stephen Gallagher --- nodejs.yaml | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-) diff --git a/nodejs.yaml b/nodejs.yaml index 4ea81dc..2ff4a56 100644 --- a/nodejs.yaml +++ b/nodejs.yaml @@ -14,11 +14,9 @@ data: buildrequires: # http-parser, libuv, c-ares and V8 are bundled # openssl, icu and zlib should be provided by platform - platform: f27 - python2: 2.7 + platform: f28 requires: - platform: f27 - python2: 2.7 + platform: f28 references: community: http://nodejs.org documentation: http://nodejs.org/en/docs @@ -51,7 +49,7 @@ data: nodejs: rationale: Javascript runtime and npm package manager. buildorder: 10 - ref: f26 + ref: epel7 nodejs-packaging: rationale: Runtime dependency of nodejs-devel. buildorder: 10 From dbefdd467d9baca0d53f95c6fa73d7ed6beacc39 Mon Sep 17 00:00:00 2001 From: Stephen Gallagher Date: Mon, 5 Feb 2018 09:51:17 -0500 Subject: [PATCH 7/9] Build for Modularity 2.0 Signed-off-by: Stephen Gallagher --- nodejs.yaml | 13 +------------ 1 file changed, 1 insertion(+), 12 deletions(-) diff --git a/nodejs.yaml b/nodejs.yaml index 2ff4a56..51e61d5 100644 --- a/nodejs.yaml +++ b/nodejs.yaml @@ -12,9 +12,6 @@ data: module: MIT dependencies: buildrequires: - # http-parser, libuv, c-ares and V8 are bundled - # openssl, icu and zlib should be provided by platform - platform: f28 requires: platform: f28 references: @@ -40,17 +37,9 @@ data: - nodejs - nodejs-devel - npm - buildopts: - rpms: - macros: | - %_with_bootstrap 1 components: rpms: nodejs: rationale: Javascript runtime and npm package manager. buildorder: 10 - ref: epel7 - nodejs-packaging: - rationale: Runtime dependency of nodejs-devel. - buildorder: 10 - ref: master + ref: 6 From e371f804870e64fbe7d75894a21badfef3b8f6af Mon Sep 17 00:00:00 2001 From: Stephen Gallagher Date: Mon, 5 Feb 2018 10:05:04 -0500 Subject: [PATCH 8/9] Fix references Signed-off-by: Stephen Gallagher --- nodejs.yaml | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/nodejs.yaml b/nodejs.yaml index 51e61d5..4f09f79 100644 --- a/nodejs.yaml +++ b/nodejs.yaml @@ -17,8 +17,7 @@ data: references: community: http://nodejs.org documentation: http://nodejs.org/en/docs - github: http://github.com/nodejs/node - npm: http://npmjs.com + tracker: https://github.com/nodejs/node/issues profiles: default: rpms: From 84eb28bf47a095ac30720765f8d7d94b277030d1 Mon Sep 17 00:00:00 2001 From: Stephen Gallagher Date: Mon, 5 Feb 2018 10:16:20 -0500 Subject: [PATCH 9/9] Fix missing BR Signed-off-by: Stephen Gallagher --- nodejs.yaml | 1 + 1 file changed, 1 insertion(+) diff --git a/nodejs.yaml b/nodejs.yaml index 4f09f79..dadb589 100644 --- a/nodejs.yaml +++ b/nodejs.yaml @@ -12,6 +12,7 @@ data: module: MIT dependencies: buildrequires: + platform: f28 requires: platform: f28 references: