[oe] [meta-openwrt][PATCH 7/9] Juci: fix missing Juci website
Stanley Phoong
stanley.cheong.kwan.phoong at intel.com
Mon Jul 17 02:48:09 UTC 2017
From: "Stanley Cheong Kwan, Phoong" <stanley.cheong.kwan.phoong at 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 at 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
More information about the Openembedded-devel
mailing list