* [meta-openwrt][PATCH 0/9] Patch series for enabling Juci in Poky
@ 2017-07-17 2:48 Stanley Phoong
2017-07-17 2:48 ` [meta-openwrt][PATCH 1/9] Juci: fix missing openssl for Luci Stanley Phoong
` (9 more replies)
0 siblings, 10 replies; 13+ messages in thread
From: Stanley Phoong @ 2017-07-17 2:48 UTC (permalink / raw)
To: OpenEmbedded Devel Mailing List
This series of patches would help to enable Juci in Poky, it would
compile and build an image without issues, with Juci website installed.
Compatible with Poky master build.
Stanley Cheong Kwan, Phoong (9):
Juci: fix missing openssl for Luci
Juci: added dependency of luajit
Juci: fixed gcc 7 issue
Juci: fix uglify-js not found
Juci: fix issue extraneous package and missing lessc
Juci: replace yui-compressor with minify
Juci: fix missing Juci website
Juci: update Juci git to latest
Juci: fix node_modules dependencies error
recipes-core/juci/juci/0002-fix-bootstrap.patch | 15 +++
recipes-core/juci/juci/0003-fix-juci-compile.patch | 16 +++
recipes-core/juci/juci/0004-makefile-local.patch | 44 +++++++++
recipes-core/juci/juci/0005-makefile-local.patch | 47 +++++++++
.../juci/juci/0006-package-json-update.patch | 108 +++++++++++++++++++++
recipes-core/juci/juci_git.bb | 22 ++++-
recipes-core/juci/jucid/0001-gcc7-fix-jucid.patch | 41 ++++++++
recipes-core/juci/jucid_git.bb | 3 +-
recipes-core/luci/luci_git.bb | 2 +-
9 files changed, 292 insertions(+), 6 deletions(-)
create mode 100644 recipes-core/juci/juci/0002-fix-bootstrap.patch
create mode 100644 recipes-core/juci/juci/0003-fix-juci-compile.patch
create mode 100644 recipes-core/juci/juci/0004-makefile-local.patch
create mode 100644 recipes-core/juci/juci/0005-makefile-local.patch
create mode 100644 recipes-core/juci/juci/0006-package-json-update.patch
create mode 100644 recipes-core/juci/jucid/0001-gcc7-fix-jucid.patch
--
2.7.4
^ permalink raw reply [flat|nested] 13+ messages in thread
* [meta-openwrt][PATCH 1/9] Juci: fix missing openssl for Luci
2017-07-17 2:48 [meta-openwrt][PATCH 0/9] Patch series for enabling Juci in Poky Stanley Phoong
@ 2017-07-17 2:48 ` Stanley Phoong
2017-07-17 2:48 ` [meta-openwrt][PATCH 2/9] Juci: added dependency of luajit Stanley Phoong
` (8 subsequent siblings)
9 siblings, 0 replies; 13+ messages in thread
From: Stanley Phoong @ 2017-07-17 2:48 UTC (permalink / raw)
To: OpenEmbedded Devel Mailing List
From: "Stanley Cheong Kwan, Phoong" <stanley.cheong.kwan.phoong@intel.com>
Missing openssl recipe inside Luci recipe.
Signed-off-by: Stanley Cheong Kwan, Phoong <stanley.cheong.kwan.phoong@intel.com>
---
recipes-core/luci/luci_git.bb | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/recipes-core/luci/luci_git.bb b/recipes-core/luci/luci_git.bb
index 992b72a..6c462a4 100644
--- a/recipes-core/luci/luci_git.bb
+++ b/recipes-core/luci/luci_git.bb
@@ -6,7 +6,7 @@ HOMEPAGE = "https://github.com/openwrt/luci"
LICENSE = "Apache-2.0"
LIC_FILES_CHKSUM = "file://LICENSE;md5=2b42edef8fa55315f34f2370b4715ca9"
SECTION = "base"
-DEPENDS = "json-c libubox libnl lua5.1 iwinfo"
+DEPENDS = "json-c libubox libnl lua5.1 iwinfo openssl"
RDEPENDS_${PN} = "lua5.1"
SRCREV = "d89b022b97b4516bef708212135780b818b9d4a2"
--
2.7.4
^ permalink raw reply related [flat|nested] 13+ messages in thread
* [meta-openwrt][PATCH 2/9] Juci: added dependency of luajit
2017-07-17 2:48 [meta-openwrt][PATCH 0/9] Patch series for enabling Juci in Poky Stanley Phoong
2017-07-17 2:48 ` [meta-openwrt][PATCH 1/9] Juci: fix missing openssl for Luci Stanley Phoong
@ 2017-07-17 2:48 ` Stanley Phoong
2017-07-17 2:48 ` [meta-openwrt][PATCH 3/9] Juci: fixed gcc 7 issue Stanley Phoong
` (7 subsequent siblings)
9 siblings, 0 replies; 13+ messages in thread
From: Stanley Phoong @ 2017-07-17 2:48 UTC (permalink / raw)
To: OpenEmbedded Devel Mailing List
From: "Stanley Cheong Kwan, Phoong" <stanley.cheong.kwan.phoong@intel.com>
Juci was missing dependency of luajit from meta-openembedded
Signed-off-by: Stanley Cheong Kwan, Phoong <stanley.cheong.kwan.phoong@intel.com>
---
recipes-core/juci/jucid_git.bb | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/recipes-core/juci/jucid_git.bb b/recipes-core/juci/jucid_git.bb
index 0fb7b26..85df80d 100644
--- a/recipes-core/juci/jucid_git.bb
+++ b/recipes-core/juci/jucid_git.bb
@@ -18,5 +18,5 @@ SRC_URI = "git://github.com/mkschreder/jucid \
S = "${WORKDIR}/git"
inherit autotools pkgconfig
-DEPENDS += "libblobpack libutype libusys luci uci lua5.1 libwebsockets iwinfo rpcd ubus"
+DEPENDS += "libblobpack libutype libusys luci uci lua5.1 libwebsockets iwinfo rpcd ubus luajit"
RDEPENDS_${PN} += "libutype libblobpack libusys"
--
2.7.4
^ permalink raw reply related [flat|nested] 13+ messages in thread
* [meta-openwrt][PATCH 3/9] Juci: fixed gcc 7 issue
2017-07-17 2:48 [meta-openwrt][PATCH 0/9] Patch series for enabling Juci in Poky Stanley Phoong
2017-07-17 2:48 ` [meta-openwrt][PATCH 1/9] Juci: fix missing openssl for Luci Stanley Phoong
2017-07-17 2:48 ` [meta-openwrt][PATCH 2/9] Juci: added dependency of luajit Stanley Phoong
@ 2017-07-17 2:48 ` Stanley Phoong
2017-07-17 8:57 ` Andreas Oberritter
2017-07-17 2:48 ` [meta-openwrt][PATCH 4/9] Juci: fix uglify-js not found Stanley Phoong
` (6 subsequent siblings)
9 siblings, 1 reply; 13+ messages in thread
From: Stanley Phoong @ 2017-07-17 2:48 UTC (permalink / raw)
To: OpenEmbedded Devel Mailing List
From: "Stanley Cheong Kwan, Phoong" <stanley.cheong.kwan.phoong@intel.com>
Jucid had issues with the snprint:
'snprintf' output 2 or more bytes (assuming 257) into a destination of
size 255
Replaced snprintf with anprintf with pointer rather than a fixed array
length.
Signed-off-by: Stanley Cheong Kwan, Phoong <stanley.cheong.kwan.phoong@intel.com>
---
recipes-core/juci/jucid/0001-gcc7-fix-jucid.patch | 41 +++++++++++++++++++++++
recipes-core/juci/jucid_git.bb | 1 +
2 files changed, 42 insertions(+)
create mode 100644 recipes-core/juci/jucid/0001-gcc7-fix-jucid.patch
diff --git a/recipes-core/juci/jucid/0001-gcc7-fix-jucid.patch b/recipes-core/juci/jucid/0001-gcc7-fix-jucid.patch
new file mode 100644
index 0000000..bae5b31
--- /dev/null
+++ b/recipes-core/juci/jucid/0001-gcc7-fix-jucid.patch
@@ -0,0 +1,41 @@
+Index: git/src/juci.c
+===================================================================
+--- git.orig/src/juci.c
++++ git/src/juci.c
+@@ -14,7 +14,7 @@
+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ GNU General Public License for more details.
+ */
+-
++#define _GNU_SOURCE
+ #include <stdio.h>
+ #include <unistd.h>
+ #include <dirent.h>
+@@ -57,11 +57,11 @@ int juci_load_plugins(struct juci *self,
+ return -ENOENT;
+ }
+ struct dirent *ent = 0;
+- char fname[255];
++ char *fname;
+ while((ent = readdir(dir))){
+ if(strcmp(ent->d_name, ".") == 0 || strcmp(ent->d_name, "..") == 0) continue;
+
+- snprintf(fname, sizeof(fname), "%s/%s", path, ent->d_name);
++ asprintf(&fname, "%s/%s", path, ent->d_name);
+
+ if(ent->d_type == DT_DIR) {
+ rv |= juci_load_plugins(self, fname, base_path);
+@@ -262,11 +262,11 @@ static bool _try_auth(const char *sha1ha
+
+ int _load_session_acls(struct juci_session *ses, const char *pat){
+ glob_t glob_result;
+- char path[255];
++ char *path;
+ char *dir = getenv("JUCI_ACL_DIR_PATH");
+ if(!dir) dir = JUCI_ACL_DIR_PATH;
+ DEBUG("loading acls from %s/%s.acl\n", dir, pat);
+- snprintf(path, sizeof(path), "%s/%s.acl", dir, pat);
++ asprintf(&path, "%s/%s.acl", dir, pat);
+ glob(path, GLOB_TILDE, NULL, &glob_result);
+ for(unsigned int i=0;i<glob_result.gl_pathc;++i){
+ char *text = _load_file(glob_result.gl_pathv[i]);
diff --git a/recipes-core/juci/jucid_git.bb b/recipes-core/juci/jucid_git.bb
index 85df80d..030b32e 100644
--- a/recipes-core/juci/jucid_git.bb
+++ b/recipes-core/juci/jucid_git.bb
@@ -13,6 +13,7 @@ SRC_URI = "git://github.com/mkschreder/jucid \
file://0001-juci_ws_server.c-ubus_srv_ws_client_new-expects-no-p.patch \
file://0001-main.c-define-_DEFAULT_SOURCE.patch \
file://0002-fix-makefile-in.patch \
+ file://0001-gcc7-fix-jucid.patch \
"
S = "${WORKDIR}/git"
--
2.7.4
^ permalink raw reply related [flat|nested] 13+ messages in thread
* [meta-openwrt][PATCH 4/9] Juci: fix uglify-js not found
2017-07-17 2:48 [meta-openwrt][PATCH 0/9] Patch series for enabling Juci in Poky Stanley Phoong
` (2 preceding siblings ...)
2017-07-17 2:48 ` [meta-openwrt][PATCH 3/9] Juci: fixed gcc 7 issue Stanley Phoong
@ 2017-07-17 2:48 ` Stanley Phoong
2017-07-17 3:55 ` Khem Raj
2017-07-17 2:48 ` [meta-openwrt][PATCH 5/9] Juci: fix issue extraneous package and missing lessc Stanley Phoong
` (5 subsequent siblings)
9 siblings, 1 reply; 13+ messages in thread
From: Stanley Phoong @ 2017-07-17 2:48 UTC (permalink / raw)
To: OpenEmbedded Devel Mailing List
From: "Stanley Cheong Kwan, Phoong" <stanley.cheong.kwan.phoong@intel.com>
uglify-js is not found by the Makefile. This happens due to npm install
will install into a local node_modules and this would not be reflected
into recipe-sysroot-native/usr/bin. Added softlink to uglify-js.
Signed-off-by: Stanley Cheong Kwan, Phoong <stanley.cheong.kwan.phoong@intel.com>
---
recipes-core/juci/juci_git.bb | 1 +
1 file changed, 1 insertion(+)
diff --git a/recipes-core/juci/juci_git.bb b/recipes-core/juci/juci_git.bb
index 6d3d798..def6a90 100644
--- a/recipes-core/juci/juci_git.bb
+++ b/recipes-core/juci/juci_git.bb
@@ -23,6 +23,7 @@ do_compile() {
}
do_install_append() {
+ ln -sf ${WORKDIR}/git/node_modules/uglify-js/bin/uglifyjs ${WORKDIR}/recipe-sysroot-native/usr/bin/uglifyjs
oe_runmake
oe_runmake DESTDIR='${D}' install
}
--
2.7.4
^ permalink raw reply related [flat|nested] 13+ messages in thread
* [meta-openwrt][PATCH 5/9] Juci: fix issue extraneous package and missing lessc
2017-07-17 2:48 [meta-openwrt][PATCH 0/9] Patch series for enabling Juci in Poky Stanley Phoong
` (3 preceding siblings ...)
2017-07-17 2:48 ` [meta-openwrt][PATCH 4/9] Juci: fix uglify-js not found Stanley Phoong
@ 2017-07-17 2:48 ` Stanley Phoong
2017-07-17 2:48 ` [meta-openwrt][PATCH 6/9] Juci: replace yui-compressor with minify Stanley Phoong
` (4 subsequent siblings)
9 siblings, 0 replies; 13+ messages in thread
From: Stanley Phoong @ 2017-07-17 2:48 UTC (permalink / raw)
To: OpenEmbedded Devel Mailing List
From: "Stanley Cheong Kwan, Phoong" <stanley.cheong.kwan.phoong@intel.com>
lessc was missing in the package of node_modules that is required by
Juci recipe. Adding lessc into the recipe also causes extraneous
package error which was caused by npm shrinkwrap which is resolved in
this commit.
Signed-off-by: Stanley Cheong Kwan, Phoong <stanley.cheong.kwan.phoong@intel.com>
---
recipes-core/juci/juci_git.bb | 8 ++++++--
1 file changed, 6 insertions(+), 2 deletions(-)
diff --git a/recipes-core/juci/juci_git.bb b/recipes-core/juci/juci_git.bb
index def6a90..dde8f73 100644
--- a/recipes-core/juci/juci_git.bb
+++ b/recipes-core/juci/juci_git.bb
@@ -15,15 +15,19 @@ S = "${WORKDIR}/git"
inherit npm-install
-NPM_INSTALL_append = " uglify-js"
+NPM_INSTALL_append = " --save uglify-js less"
DEPENDS += "jucid lua5.1 grunt-cli-native"
do_compile() {
oe_runmake node_modules
}
-do_install_append() {
+do_compile_append(){
ln -sf ${WORKDIR}/git/node_modules/uglify-js/bin/uglifyjs ${WORKDIR}/recipe-sysroot-native/usr/bin/uglifyjs
+ ln -sf ${WORKDIR}/git/node_modules/less/bin/lessc ${WORKDIR}/recipe-sysroot-native/usr/bin/lessc
+}
+
+do_install_append() {
oe_runmake
oe_runmake DESTDIR='${D}' install
}
--
2.7.4
^ permalink raw reply related [flat|nested] 13+ messages in thread
* [meta-openwrt][PATCH 6/9] Juci: replace yui-compressor with minify
2017-07-17 2:48 [meta-openwrt][PATCH 0/9] Patch series for enabling Juci in Poky Stanley Phoong
` (4 preceding siblings ...)
2017-07-17 2:48 ` [meta-openwrt][PATCH 5/9] Juci: fix issue extraneous package and missing lessc Stanley Phoong
@ 2017-07-17 2:48 ` Stanley Phoong
2017-07-17 2:48 ` [meta-openwrt][PATCH 7/9] Juci: fix missing Juci website Stanley Phoong
` (3 subsequent siblings)
9 siblings, 0 replies; 13+ messages in thread
From: Stanley Phoong @ 2017-07-17 2:48 UTC (permalink / raw)
To: OpenEmbedded Devel Mailing List
From: "Stanley Cheong Kwan, Phoong" <stanley.cheong.kwan.phoong@intel.com>
yui-compressor was missing and it relies on Java, so converted the
dependency of Juci on yui-compressor to minify-js
Signed-off-by: Stanley Cheong Kwan, Phoong <stanley.cheong.kwan.phoong@intel.com>
---
recipes-core/juci/juci/0002-fix-bootstrap.patch | 15 +++++++++++++++
recipes-core/juci/juci/0003-fix-juci-compile.patch | 16 ++++++++++++++++
recipes-core/juci/juci_git.bb | 5 ++++-
3 files changed, 35 insertions(+), 1 deletion(-)
create mode 100644 recipes-core/juci/juci/0002-fix-bootstrap.patch
create mode 100644 recipes-core/juci/juci/0003-fix-juci-compile.patch
diff --git a/recipes-core/juci/juci/0002-fix-bootstrap.patch b/recipes-core/juci/juci/0002-fix-bootstrap.patch
new file mode 100644
index 0000000..af58bd2
--- /dev/null
+++ b/recipes-core/juci/juci/0002-fix-bootstrap.patch
@@ -0,0 +1,15 @@
+Index: git/scripts/bootstrap.sh
+===================================================================
+--- git.orig/scripts/bootstrap.sh
++++ git/scripts/bootstrap.sh
+@@ -9,8 +9,8 @@ if [ "$(which npm)" == "" ]; then
+ ERR=1
+ fi
+
+-if [ "$(which yui-compressor)" == "" ] && [ "$(which yuicompressor)" == "" ]; then
+- perr "!!! yui-compressor is missing. Please install package yui-compressor or yuicompressor.";
++if [ "$(which minify)" == "" ]; then
++ perr "!!! minify is missing. Please install package minify.";
+ ERR=1
+ fi
+
diff --git a/recipes-core/juci/juci/0003-fix-juci-compile.patch b/recipes-core/juci/juci/0003-fix-juci-compile.patch
new file mode 100644
index 0000000..005ae58
--- /dev/null
+++ b/recipes-core/juci/juci/0003-fix-juci-compile.patch
@@ -0,0 +1,16 @@
+Index: git/scripts/juci-compile
+===================================================================
+--- git.orig/scripts/juci-compile
++++ git/scripts/juci-compile
+@@ -14,10 +14,6 @@ done
+
+ for file in `find $BIN/www/css/ -name "*.css"`; do
+ echo "Compiling CSS ${file}.."
+- if [ "$(which yui-compressor)" != "" ]; then
+- yui-compressor ${file} > ${file}.out
+- else
+- yuicompressor ${file} > ${file}.out
+- fi
++ minify ${file} > ${file}.out
+ mv ${file}.out ${file}
+ done
diff --git a/recipes-core/juci/juci_git.bb b/recipes-core/juci/juci_git.bb
index dde8f73..e6977ca 100644
--- a/recipes-core/juci/juci_git.bb
+++ b/recipes-core/juci/juci_git.bb
@@ -10,12 +10,14 @@ SECTION = "apps"
SRCREV = "b173dba22fbd9891bc5e3a55f8b40ba562f38e31"
SRC_URI = "git://github.com/mkschreder/juci"
SRC_URI += "file://0001-juci-pin-grunt-to-0.4.1-for-grunt-angular-gettext.patch"
+SRC_URI += "file://0002-fix-bootstrap.patch"
+SRC_URI += "file://0003-fix-juci-compile.patch"
S = "${WORKDIR}/git"
inherit npm-install
-NPM_INSTALL_append = " --save uglify-js less"
+NPM_INSTALL_append = " --save uglify-js less minify"
DEPENDS += "jucid lua5.1 grunt-cli-native"
do_compile() {
@@ -25,6 +27,7 @@ do_compile() {
do_compile_append(){
ln -sf ${WORKDIR}/git/node_modules/uglify-js/bin/uglifyjs ${WORKDIR}/recipe-sysroot-native/usr/bin/uglifyjs
ln -sf ${WORKDIR}/git/node_modules/less/bin/lessc ${WORKDIR}/recipe-sysroot-native/usr/bin/lessc
+ ln -sf ${WORKDIR}/git/node_modules/.bin/minify ${WORKDIR}/recipe-sysroot-native/usr/bin/minify
}
do_install_append() {
--
2.7.4
^ permalink raw reply related [flat|nested] 13+ messages in thread
* [meta-openwrt][PATCH 7/9] Juci: fix missing Juci website
2017-07-17 2:48 [meta-openwrt][PATCH 0/9] Patch series for enabling Juci in Poky Stanley Phoong
` (5 preceding siblings ...)
2017-07-17 2:48 ` [meta-openwrt][PATCH 6/9] Juci: replace yui-compressor with minify Stanley Phoong
@ 2017-07-17 2:48 ` Stanley Phoong
2017-07-17 2:48 ` [meta-openwrt][PATCH 8/9] Juci: update Juci git to latest Stanley Phoong
` (2 subsequent siblings)
9 siblings, 0 replies; 13+ messages in thread
From: Stanley Phoong @ 2017-07-17 2:48 UTC (permalink / raw)
To: OpenEmbedded Devel Mailing List
From: "Stanley Cheong Kwan, Phoong" <stanley.cheong.kwan.phoong@intel.com>
When building Juci, the www directory was empty. This commit helps to
fix the missing configurations needed by Makefile due to this being a
build from OpenWRT (which depends on menuconfig, Kconfig) and resolve a
bug with the Makefile that does not allow "make -j8" so forced to build
using "make -j1".
Signed-off-by: Stanley Cheong Kwan, Phoong <stanley.cheong.kwan.phoong@intel.com>
---
recipes-core/juci/juci/0004-makefile-local.patch | 44 ++++++++++++++++++++++++
recipes-core/juci/juci_git.bb | 6 ++++
2 files changed, 50 insertions(+)
create mode 100644 recipes-core/juci/juci/0004-makefile-local.patch
diff --git a/recipes-core/juci/juci/0004-makefile-local.patch b/recipes-core/juci/juci/0004-makefile-local.patch
new file mode 100644
index 0000000..571d86c
--- /dev/null
+++ b/recipes-core/juci/juci/0004-makefile-local.patch
@@ -0,0 +1,44 @@
+Index: git/Makefile
+===================================================================
+--- git.orig/Makefile
++++ git/Makefile
+@@ -1,3 +1,39 @@
++## This is a file for building local copy for use with the juci-local-server
++
++CONFIG_PACKAGE_juci=y
++CONFIG_PACKAGE_juci-ddns=y
++CONFIG_PACKAGE_juci-diagnostics=y
++CONFIG_PACKAGE_juci-dnsmasq-dhcp=y
++CONFIG_PACKAGE_juci-dropbear=y
++CONFIG_PACKAGE_juci-dynamic-translator=y
++CONFIG_PACKAGE_juci-ethernet=y
++CONFIG_PACKAGE_juci-event=y
++CONFIG_PACKAGE_juci-firewall-fw3=y
++CONFIG_PACKAGE_juci-freecwmp=y
++CONFIG_PACKAGE_juci-iconnect=y
++CONFIG_PACKAGE_juci-icwmp=y
++CONFIG_PACKAGE_juci-igmpinfo=y
++CONFIG_PACKAGE_juci-macdb=y
++CONFIG_PACKAGE_juci-minidlna=y
++CONFIG_PACKAGE_juci-minisnmpd=y
++CONFIG_PACKAGE_juci-mod-status=y
++CONFIG_PACKAGE_juci-mod-system=y
++CONFIG_PACKAGE_juci-netmode=y
++CONFIG_PACKAGE_juci-network-netifd=y
++CONFIG_PACKAGE_juci-openwrt-wireless=y
++CONFIG_PACKAGE_juci-samba=y
++CONFIG_PACKAGE_juci-simple-gui=y
++CONFIG_PACKAGE_juci-snmpd=y
++CONFIG_PACKAGE_juci-sysupgrade=y
++CONFIG_PACKAGE_juci-uhttpd=y
++CONFIG_PACKAGE_juci-upnp=y
++CONFIG_PACKAGE_juci-usb=y
++CONFIG_PACKAGE_juci-utils=y
++
++####THEMES####
++CONFIG_PACKAGE_juci-theme-openwrt=y
++
++
+ DIRS-y:=juci
+ PLUGINS-y:=
+
diff --git a/recipes-core/juci/juci_git.bb b/recipes-core/juci/juci_git.bb
index e6977ca..cd71a72 100644
--- a/recipes-core/juci/juci_git.bb
+++ b/recipes-core/juci/juci_git.bb
@@ -12,6 +12,7 @@ SRC_URI = "git://github.com/mkschreder/juci"
SRC_URI += "file://0001-juci-pin-grunt-to-0.4.1-for-grunt-angular-gettext.patch"
SRC_URI += "file://0002-fix-bootstrap.patch"
SRC_URI += "file://0003-fix-juci-compile.patch"
+SRC_URI += "file://0004-makefile-local.patch"
S = "${WORKDIR}/git"
@@ -30,9 +31,14 @@ do_compile_append(){
ln -sf ${WORKDIR}/git/node_modules/.bin/minify ${WORKDIR}/recipe-sysroot-native/usr/bin/minify
}
+# PARALLEL_MAKE is required because the Makefile from Juci seems to be broken as "make -j8" would cause it to fail. Hence, forcing it to only build with -j1
+PARALLEL_MAKE = "-j1"
+
do_install_append() {
oe_runmake
oe_runmake DESTDIR='${D}' install
}
FILES_${PN} += "/www ${datadir}/lua"
+FILES_${PN} += "${libdir}/*"
+FILES_${PN} += "${datadir}/*"
--
2.7.4
^ permalink raw reply related [flat|nested] 13+ messages in thread
* [meta-openwrt][PATCH 8/9] Juci: update Juci git to latest
2017-07-17 2:48 [meta-openwrt][PATCH 0/9] Patch series for enabling Juci in Poky Stanley Phoong
` (6 preceding siblings ...)
2017-07-17 2:48 ` [meta-openwrt][PATCH 7/9] Juci: fix missing Juci website Stanley Phoong
@ 2017-07-17 2:48 ` Stanley Phoong
2017-07-17 2:48 ` [meta-openwrt][PATCH 9/9] Juci: fix node_modules dependencies error Stanley Phoong
2017-07-17 3:56 ` [meta-openwrt][PATCH 0/9] Patch series for enabling Juci in Poky Khem Raj
9 siblings, 0 replies; 13+ messages in thread
From: Stanley Phoong @ 2017-07-17 2:48 UTC (permalink / raw)
To: OpenEmbedded Devel Mailing List
From: "Stanley Cheong Kwan, Phoong" <stanley.cheong.kwan.phoong@intel.com>
Updated the Juci to the latest SRCREV, and updated the Makefile
configuration.
Signed-off-by: Stanley Cheong Kwan, Phoong <stanley.cheong.kwan.phoong@intel.com>
---
recipes-core/juci/juci/0005-makefile-local.patch | 47 ++++++++++++++++++++++++
recipes-core/juci/juci_git.bb | 5 +--
2 files changed, 49 insertions(+), 3 deletions(-)
create mode 100644 recipes-core/juci/juci/0005-makefile-local.patch
diff --git a/recipes-core/juci/juci/0005-makefile-local.patch b/recipes-core/juci/juci/0005-makefile-local.patch
new file mode 100644
index 0000000..a99eeb2
--- /dev/null
+++ b/recipes-core/juci/juci/0005-makefile-local.patch
@@ -0,0 +1,47 @@
+Index: git/Makefile
+===================================================================
+--- git.orig/Makefile
++++ git/Makefile
+@@ -2,6 +2,42 @@
+ # Main Makefile
+ # Copyright (c) 2015-2016 Martin K. Schröder <mkschreder.uk@gmail.com>
+
++## This is a file for building local copy for use with the juci-local-server
++
++CONFIG_PACKAGE_juci=y
++CONFIG_PACKAGE_juci-ddns=y
++CONFIG_PACKAGE_juci-diagnostics=y
++CONFIG_PACKAGE_juci-dnsmasq-dhcp=y
++CONFIG_PACKAGE_juci-dropbear=y
++CONFIG_PACKAGE_juci-dynamic-translator=y
++CONFIG_PACKAGE_juci-ethernet=y
++CONFIG_PACKAGE_juci-event=y
++CONFIG_PACKAGE_juci-firewall-fw3=y
++CONFIG_PACKAGE_juci-freecwmp=y
++CONFIG_PACKAGE_juci-iconnect=y
++CONFIG_PACKAGE_juci-icwmp=y
++CONFIG_PACKAGE_juci-igmpinfo=y
++CONFIG_PACKAGE_juci-macdb=y
++CONFIG_PACKAGE_juci-minidlna=y
++CONFIG_PACKAGE_juci-minisnmpd=y
++CONFIG_PACKAGE_juci-mod-status=y
++CONFIG_PACKAGE_juci-mod-system=y
++CONFIG_PACKAGE_juci-netmode=y
++CONFIG_PACKAGE_juci-network-netifd=y
++CONFIG_PACKAGE_juci-openwrt-wireless=y
++CONFIG_PACKAGE_juci-samba=y
++CONFIG_PACKAGE_juci-simple-gui=y
++CONFIG_PACKAGE_juci-snmpd=y
++CONFIG_PACKAGE_juci-sysupgrade=y
++CONFIG_PACKAGE_juci-uhttpd=y
++CONFIG_PACKAGE_juci-upnp=y
++CONFIG_PACKAGE_juci-usb=y
++CONFIG_PACKAGE_juci-utils=y
++
++####THEMES####
++CONFIG_PACKAGE_juci-theme-openwrt=y
++
++
+ DIRS-y:=juci
+ PLUGINS-y:=
+
diff --git a/recipes-core/juci/juci_git.bb b/recipes-core/juci/juci_git.bb
index cd71a72..c79c064 100644
--- a/recipes-core/juci/juci_git.bb
+++ b/recipes-core/juci/juci_git.bb
@@ -7,12 +7,11 @@ LICENSE = "GPL-3.0"
LIC_FILES_CHKSUM = "file://COPYING;md5=87212b5f1ae096371049a12f80034f32"
SECTION = "apps"
-SRCREV = "b173dba22fbd9891bc5e3a55f8b40ba562f38e31"
+SRCREV = "${AUTOREV}"
SRC_URI = "git://github.com/mkschreder/juci"
-SRC_URI += "file://0001-juci-pin-grunt-to-0.4.1-for-grunt-angular-gettext.patch"
SRC_URI += "file://0002-fix-bootstrap.patch"
SRC_URI += "file://0003-fix-juci-compile.patch"
-SRC_URI += "file://0004-makefile-local.patch"
+SRC_URI += "file://0005-makefile-local.patch"
S = "${WORKDIR}/git"
--
2.7.4
^ permalink raw reply related [flat|nested] 13+ messages in thread
* [meta-openwrt][PATCH 9/9] Juci: fix node_modules dependencies error
2017-07-17 2:48 [meta-openwrt][PATCH 0/9] Patch series for enabling Juci in Poky Stanley Phoong
` (7 preceding siblings ...)
2017-07-17 2:48 ` [meta-openwrt][PATCH 8/9] Juci: update Juci git to latest Stanley Phoong
@ 2017-07-17 2:48 ` Stanley Phoong
2017-07-17 3:56 ` [meta-openwrt][PATCH 0/9] Patch series for enabling Juci in Poky Khem Raj
9 siblings, 0 replies; 13+ messages in thread
From: Stanley Phoong @ 2017-07-17 2:48 UTC (permalink / raw)
To: OpenEmbedded Devel Mailing List
From: "Stanley Cheong Kwan, Phoong" <stanley.cheong.kwan.phoong@intel.com>
In the latest Juci build, Juci now has an offline node_modules that is
shipped together as a tar.gz. Some dependencies are not saved properly
inside the package.json which causes the npm shrinkwrap to file error.
This commit fixes this error.
Signed-off-by: Stanley Cheong Kwan, Phoong <stanley.cheong.kwan.phoong@intel.com>
---
.../juci/juci/0006-package-json-update.patch | 108 +++++++++++++++++++++
recipes-core/juci/juci_git.bb | 5 +-
2 files changed, 111 insertions(+), 2 deletions(-)
create mode 100644 recipes-core/juci/juci/0006-package-json-update.patch
diff --git a/recipes-core/juci/juci/0006-package-json-update.patch b/recipes-core/juci/juci/0006-package-json-update.patch
new file mode 100644
index 0000000..68f45fc
--- /dev/null
+++ b/recipes-core/juci/juci/0006-package-json-update.patch
@@ -0,0 +1,108 @@
+Index: git/package.json
+===================================================================
+--- git.orig/package.json
++++ git/package.json
+@@ -18,7 +18,102 @@
+ "gettext-parser": "*",
+ "underscore": "*",
+ "ws": "*",
+- "express-ws": "*"
++ "express-ws": "*",
++ "abbrev": "1.0.7",
++ "angular-gettext-tools": "2.1.11",
++ "espree": "2.2.5",
++ "argparse": "1.0.7",
++ "array-find-index": "1.0.1",
++ "binary-search": "1.2.0",
++ "boolbase": "1.0.0",
++ "builtin-modules": "1.1.1",
++ "camelcase": "2.1.1",
++ "camelcase-keys": "2.1.0",
++ "cheerio": "0.19.0",
++ "coffee-script": "1.10.0",
++ "colors": "1.1.2",
++ "css-select": "1.0.0",
++ "css-what": "1.0.0",
++ "dateformat": "1.0.12",
++ "decamelize": "1.2.0",
++ "dom-serializer": "0.1.0",
++ "domelementtype": "1.1.3",
++ "domelementtype": "1.3.0",
++ "domhandler": "2.3.0",
++ "domutils": "1.4.3",
++ "entities": "1.1.1",
++ "error-ex": "1.3.0",
++ "espree": "2.2.5",
++ "esprima": "2.7.2",
++ "eventemitter2": "0.4.14",
++ "exit": "0.1.2",
++ "find-up": "1.1.2",
++ "findup-sync": "0.3.0",
++ "glob": "7.0.3",
++ "get-stdin": "4.0.1",
++ "getobject": "0.1.0",
++ "grunt": "1.0.0",
++ "grunt-cli": "1.2.0",
++ "grunt-angular-gettext": "2.1.11",
++ "grunt-known-options": "1.1.0",
++ "grunt-legacy-log": "1.0.0",
++ "grunt-legacy-log-utils": "1.0.0",
++ "lodash": "4.3.0",
++ "grunt-legacy-util": "1.0.0",
++ "lodash": "4.3.0",
++ "hooker": "0.2.3",
++ "hosted-git-info": "2.1.4",
++ "htmlparser2": "3.8.3",
++ "indent-string": "2.1.0",
++ "is-absolute": "0.1.7",
++ "is-arrayish": "0.2.1",
++ "is-builtin-module": "1.0.0",
++ "is-finite": "1.0.1",
++ "is-relative": "0.1.3",
++ "is-utf8": "0.2.1",
++ "isarray": "0.0.1",
++ "isexe": "1.1.2",
++ "js-yaml": "3.5.5",
++ "karma": ">=0.12.8",
++ "load-json-file": "1.1.0",
++ "lodash": "3.10.1",
++ "lodash._isnative": "2.4.1",
++ "lodash.isarray": "2.4.1",
++ "loud-rejection": "1.3.0",
++ "map-obj": "1.0.1",
++ "meow": "3.7.0",
++ "minimist": "1.2.0",
++ "nopt": "3.0.6",
++ "normalize-package-data": "2.3.5",
++ "nth-check": "1.0.1",
++ "number-is-nan": "1.0.0",
++ "options": "0.0.6",
++ "parse-json": "2.2.0",
++ "path-exists": "2.1.0",
++ "path-type": "1.1.0",
++ "pify": "2.3.0",
++ "pofile": "1.0.2",
++ "read-pkg": "1.1.0",
++ "read-pkg-up": "1.0.1",
++ "readable-stream": "1.1.13",
++ "redent": "1.0.0",
++ "repeating": "2.0.0",
++ "resolve": "1.1.7",
++ "rimraf": "2.2.8",
++ "semver": "5.1.0",
++ "signal-exit": "2.1.2",
++ "spdx-correct": "1.0.2",
++ "spdx-exceptions": "1.0.4",
++ "spdx-expression-parse": "1.0.2",
++ "spdx-license-ids": "1.2.0",
++ "sprintf-js": "1.0.3",
++ "strip-bom": "2.0.0",
++ "strip-indent": "1.0.1",
++ "trim-newlines": "1.0.0",
++ "ultron": "1.0.2",
++ "underscore.string": "3.2.3",
++ "validate-npm-package-license": "3.0.1",
++ "which": "1.2.4"
+ },
+ "engines": {
+ "node": "0.10.x",
diff --git a/recipes-core/juci/juci_git.bb b/recipes-core/juci/juci_git.bb
index c79c064..4c7cc1c 100644
--- a/recipes-core/juci/juci_git.bb
+++ b/recipes-core/juci/juci_git.bb
@@ -12,13 +12,14 @@ SRC_URI = "git://github.com/mkschreder/juci"
SRC_URI += "file://0002-fix-bootstrap.patch"
SRC_URI += "file://0003-fix-juci-compile.patch"
SRC_URI += "file://0005-makefile-local.patch"
+SRC_URI += "file://0006-package-json-update.patch"
S = "${WORKDIR}/git"
inherit npm-install
-NPM_INSTALL_append = " --save uglify-js less minify"
-DEPENDS += "jucid lua5.1 grunt-cli-native"
+NPM_INSTALL_append = " --save uglify-js less minify espree grunt-cli karma grunt@~0.4.1"
+DEPENDS += "jucid lua5.1 grunt-cli-native gettext-native"
do_compile() {
oe_runmake node_modules
--
2.7.4
^ permalink raw reply related [flat|nested] 13+ messages in thread
* Re: [meta-openwrt][PATCH 4/9] Juci: fix uglify-js not found
2017-07-17 2:48 ` [meta-openwrt][PATCH 4/9] Juci: fix uglify-js not found Stanley Phoong
@ 2017-07-17 3:55 ` Khem Raj
0 siblings, 0 replies; 13+ messages in thread
From: Khem Raj @ 2017-07-17 3:55 UTC (permalink / raw)
To: Stanley Phoong; +Cc: OpenEmbedded Devel Mailing List
On Sun, Jul 16, 2017 at 7:48 PM, Stanley Phoong
<stanley.cheong.kwan.phoong@intel.com> wrote:
> From: "Stanley Cheong Kwan, Phoong" <stanley.cheong.kwan.phoong@intel.com>
>
> uglify-js is not found by the Makefile. This happens due to npm install
> will install into a local node_modules and this would not be reflected
> into recipe-sysroot-native/usr/bin. Added softlink to uglify-js.
>
> Signed-off-by: Stanley Cheong Kwan, Phoong <stanley.cheong.kwan.phoong@intel.com>
> ---
> recipes-core/juci/juci_git.bb | 1 +
> 1 file changed, 1 insertion(+)
>
> diff --git a/recipes-core/juci/juci_git.bb b/recipes-core/juci/juci_git.bb
> index 6d3d798..def6a90 100644
> --- a/recipes-core/juci/juci_git.bb
> +++ b/recipes-core/juci/juci_git.bb
> @@ -23,6 +23,7 @@ do_compile() {
> }
>
> do_install_append() {
> + ln -sf ${WORKDIR}/git/node_modules/uglify-js/bin/uglifyjs ${WORKDIR}/recipe-sysroot-native/usr/bin/uglifyjs
this should be done by a native recipe. May be a new recipe to install
this would be ok.
> oe_runmake
> oe_runmake DESTDIR='${D}' install
> }
> --
> 2.7.4
>
> --
> _______________________________________________
> Openembedded-devel mailing list
> Openembedded-devel@lists.openembedded.org
> http://lists.openembedded.org/mailman/listinfo/openembedded-devel
^ permalink raw reply [flat|nested] 13+ messages in thread
* Re: [meta-openwrt][PATCH 0/9] Patch series for enabling Juci in Poky
2017-07-17 2:48 [meta-openwrt][PATCH 0/9] Patch series for enabling Juci in Poky Stanley Phoong
` (8 preceding siblings ...)
2017-07-17 2:48 ` [meta-openwrt][PATCH 9/9] Juci: fix node_modules dependencies error Stanley Phoong
@ 2017-07-17 3:56 ` Khem Raj
9 siblings, 0 replies; 13+ messages in thread
From: Khem Raj @ 2017-07-17 3:56 UTC (permalink / raw)
To: Stanley Phoong; +Cc: OpenEmbedded Devel Mailing List
On Sun, Jul 16, 2017 at 7:48 PM, Stanley Phoong
<stanley.cheong.kwan.phoong@intel.com> wrote:
> This series of patches would help to enable Juci in Poky, it would
> compile and build an image without issues, with Juci website installed.
> Compatible with Poky master build.
>
> Stanley Cheong Kwan, Phoong (9):
> Juci: fix missing openssl for Luci
> Juci: added dependency of luajit
> Juci: fixed gcc 7 issue
> Juci: fix uglify-js not found
> Juci: fix issue extraneous package and missing lessc
> Juci: replace yui-compressor with minify
> Juci: fix missing Juci website
> Juci: update Juci git to latest
> Juci: fix node_modules dependencies error
There is one issue I see, besides that please send a gh pull request as well
to ease the merging.
>
> recipes-core/juci/juci/0002-fix-bootstrap.patch | 15 +++
> recipes-core/juci/juci/0003-fix-juci-compile.patch | 16 +++
> recipes-core/juci/juci/0004-makefile-local.patch | 44 +++++++++
> recipes-core/juci/juci/0005-makefile-local.patch | 47 +++++++++
> .../juci/juci/0006-package-json-update.patch | 108 +++++++++++++++++++++
> recipes-core/juci/juci_git.bb | 22 ++++-
> recipes-core/juci/jucid/0001-gcc7-fix-jucid.patch | 41 ++++++++
> recipes-core/juci/jucid_git.bb | 3 +-
> recipes-core/luci/luci_git.bb | 2 +-
> 9 files changed, 292 insertions(+), 6 deletions(-)
> create mode 100644 recipes-core/juci/juci/0002-fix-bootstrap.patch
> create mode 100644 recipes-core/juci/juci/0003-fix-juci-compile.patch
> create mode 100644 recipes-core/juci/juci/0004-makefile-local.patch
> create mode 100644 recipes-core/juci/juci/0005-makefile-local.patch
> create mode 100644 recipes-core/juci/juci/0006-package-json-update.patch
> create mode 100644 recipes-core/juci/jucid/0001-gcc7-fix-jucid.patch
>
> --
> 2.7.4
>
> --
> _______________________________________________
> Openembedded-devel mailing list
> Openembedded-devel@lists.openembedded.org
> http://lists.openembedded.org/mailman/listinfo/openembedded-devel
^ permalink raw reply [flat|nested] 13+ messages in thread
* Re: [meta-openwrt][PATCH 3/9] Juci: fixed gcc 7 issue
2017-07-17 2:48 ` [meta-openwrt][PATCH 3/9] Juci: fixed gcc 7 issue Stanley Phoong
@ 2017-07-17 8:57 ` Andreas Oberritter
0 siblings, 0 replies; 13+ messages in thread
From: Andreas Oberritter @ 2017-07-17 8:57 UTC (permalink / raw)
To: Stanley Phoong; +Cc: OpenEmbedded Devel Mailing List
On Mon, 17 Jul 2017 10:48:05 +0800
Stanley Phoong <stanley.cheong.kwan.phoong@intel.com> wrote:
> From: "Stanley Cheong Kwan, Phoong" <stanley.cheong.kwan.phoong@intel.com>
>
> Jucid had issues with the snprint:
>
> 'snprintf' output 2 or more bytes (assuming 257) into a destination of
> size 255
>
> Replaced snprintf with anprintf with pointer rather than a fixed array
> length.
Memory allocated by asprintf must get released manually after use.
Regards,
Andreas
>
> Signed-off-by: Stanley Cheong Kwan, Phoong <stanley.cheong.kwan.phoong@intel.com>
> ---
> recipes-core/juci/jucid/0001-gcc7-fix-jucid.patch | 41 +++++++++++++++++++++++
> recipes-core/juci/jucid_git.bb | 1 +
> 2 files changed, 42 insertions(+)
> create mode 100644 recipes-core/juci/jucid/0001-gcc7-fix-jucid.patch
>
> diff --git a/recipes-core/juci/jucid/0001-gcc7-fix-jucid.patch b/recipes-core/juci/jucid/0001-gcc7-fix-jucid.patch
> new file mode 100644
> index 0000000..bae5b31
> --- /dev/null
> +++ b/recipes-core/juci/jucid/0001-gcc7-fix-jucid.patch
> @@ -0,0 +1,41 @@
> +Index: git/src/juci.c
> +===================================================================
> +--- git.orig/src/juci.c
> ++++ git/src/juci.c
> +@@ -14,7 +14,7 @@
> + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
> + GNU General Public License for more details.
> + */
> +-
> ++#define _GNU_SOURCE
> + #include <stdio.h>
> + #include <unistd.h>
> + #include <dirent.h>
> +@@ -57,11 +57,11 @@ int juci_load_plugins(struct juci *self,
> + return -ENOENT;
> + }
> + struct dirent *ent = 0;
> +- char fname[255];
> ++ char *fname;
> + while((ent = readdir(dir))){
> + if(strcmp(ent->d_name, ".") == 0 || strcmp(ent->d_name, "..") == 0) continue;
> +
> +- snprintf(fname, sizeof(fname), "%s/%s", path, ent->d_name);
> ++ asprintf(&fname, "%s/%s", path, ent->d_name);
> +
> + if(ent->d_type == DT_DIR) {
> + rv |= juci_load_plugins(self, fname, base_path);
> +@@ -262,11 +262,11 @@ static bool _try_auth(const char *sha1ha
> +
> + int _load_session_acls(struct juci_session *ses, const char *pat){
> + glob_t glob_result;
> +- char path[255];
> ++ char *path;
> + char *dir = getenv("JUCI_ACL_DIR_PATH");
> + if(!dir) dir = JUCI_ACL_DIR_PATH;
> + DEBUG("loading acls from %s/%s.acl\n", dir, pat);
> +- snprintf(path, sizeof(path), "%s/%s.acl", dir, pat);
> ++ asprintf(&path, "%s/%s.acl", dir, pat);
> + glob(path, GLOB_TILDE, NULL, &glob_result);
> + for(unsigned int i=0;i<glob_result.gl_pathc;++i){
> + char *text = _load_file(glob_result.gl_pathv[i]);
> diff --git a/recipes-core/juci/jucid_git.bb b/recipes-core/juci/jucid_git.bb
> index 85df80d..030b32e 100644
> --- a/recipes-core/juci/jucid_git.bb
> +++ b/recipes-core/juci/jucid_git.bb
> @@ -13,6 +13,7 @@ SRC_URI = "git://github.com/mkschreder/jucid \
> file://0001-juci_ws_server.c-ubus_srv_ws_client_new-expects-no-p.patch \
> file://0001-main.c-define-_DEFAULT_SOURCE.patch \
> file://0002-fix-makefile-in.patch \
> + file://0001-gcc7-fix-jucid.patch \
> "
>
> S = "${WORKDIR}/git"
^ permalink raw reply [flat|nested] 13+ messages in thread
end of thread, other threads:[~2017-07-17 8:57 UTC | newest]
Thread overview: 13+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2017-07-17 2:48 [meta-openwrt][PATCH 0/9] Patch series for enabling Juci in Poky Stanley Phoong
2017-07-17 2:48 ` [meta-openwrt][PATCH 1/9] Juci: fix missing openssl for Luci Stanley Phoong
2017-07-17 2:48 ` [meta-openwrt][PATCH 2/9] Juci: added dependency of luajit Stanley Phoong
2017-07-17 2:48 ` [meta-openwrt][PATCH 3/9] Juci: fixed gcc 7 issue Stanley Phoong
2017-07-17 8:57 ` Andreas Oberritter
2017-07-17 2:48 ` [meta-openwrt][PATCH 4/9] Juci: fix uglify-js not found Stanley Phoong
2017-07-17 3:55 ` Khem Raj
2017-07-17 2:48 ` [meta-openwrt][PATCH 5/9] Juci: fix issue extraneous package and missing lessc Stanley Phoong
2017-07-17 2:48 ` [meta-openwrt][PATCH 6/9] Juci: replace yui-compressor with minify Stanley Phoong
2017-07-17 2:48 ` [meta-openwrt][PATCH 7/9] Juci: fix missing Juci website Stanley Phoong
2017-07-17 2:48 ` [meta-openwrt][PATCH 8/9] Juci: update Juci git to latest Stanley Phoong
2017-07-17 2:48 ` [meta-openwrt][PATCH 9/9] Juci: fix node_modules dependencies error Stanley Phoong
2017-07-17 3:56 ` [meta-openwrt][PATCH 0/9] Patch series for enabling Juci in Poky Khem Raj
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.