meta-balena-supervisor/nodejs: Restructure and fix version 6

First of all we fix the path of the inc file required by nodejs_6.13.1.bb by specifying a correct FILESEXTRAPATHS relative to the recipe's directory. We also add the DNS patch only for the 6 version as it is included in version 8 (which is the other version we are using). The last thing included in this patch is fixing compilation by using openssl 1.0.x for nodejs 6 because this version doesn't support openssl 1.1.x. See: nodejs/node#16130 Signed-off-by: Andrei Gherzan <[email protected]>
balena-io · Jan 11, 2019 · 8af91ac · 8af91ac
1 parent a1c1065
commit 8af91ac
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 4 deletions.
diff --git a/meta-balena-supervisor/recipes-devtools/nodejs/nodejs_%.bbappend b/meta-balena-supervisor/recipes-devtools/nodejs/nodejs_%.bbappend
@@ -1,5 +1 @@
 GYP_DEFINES_append_i386-nlp = " v8_target_arch='x87' "
-FILESEXTRAPATHS_append := ":${THISDIR}/${PN}"
-SRC_URI_append = " \
-    file://0001-dns-add-verbatim-option-to-dns.lookup.patch \
-    "
diff --git a/meta-balena-supervisor/recipes-devtools/nodejs/nodejs_6.13.1.bb b/meta-balena-supervisor/recipes-devtools/nodejs/nodejs_6.13.1.bb
@@ -1,5 +1,12 @@
+SRC_URI_append = " file://0001-dns-add-verbatim-option-to-dns.lookup.patch"
+
+# Be able to find the following inc file
+FILESEXTRAPATHS_append := ":${THISDIR}/../../../meta-nodejs/recipes-devtools/${PN}/files"
 require ${TOPDIR}/../meta-nodejs/recipes-devtools/nodejs/nodejs_6.inc
 
+# nodejs 6 doesn't compile with openssl 1.1.x so use the openssl10 dependency
+PACKAGECONFIG[openssl] = "--shared-openssl,,openssl10,"
+
 INC_PR = "r1"
 
 LIC_FILES_CHKSUM = "file://LICENSE;md5=14152103612601231d62308345463670"