diff --git a/package/lean/autocore/Makefile b/package/lean/autocore/Makefile index 829236a3ef..1ce4f4cca4 100644 --- a/package/lean/autocore/Makefile +++ b/package/lean/autocore/Makefile @@ -9,7 +9,7 @@ include $(TOPDIR)/rules.mk PKG_NAME:=autocore PKG_VERSION:=1 -PKG_RELEASE:=16 +PKG_RELEASE:=17 include $(INCLUDE_DIR)/package.mk diff --git a/package/lean/autocore/files/index.htm b/package/lean/autocore/files/index.htm index 5832d59623..07b31789d5 100644 --- a/package/lean/autocore/files/index.htm +++ b/package/lean/autocore/files/index.htm @@ -679,7 +679,7 @@ - +
<%:Hostname%><%=luci.sys.hostname() or "?"%>
<%:Model%><%=pcdata(boardinfo.model or boardinfo.system or "?")%>
<%:CPU Info%><%=luci.sys.exec("grep 'MHz' /proc/cpuinfo | cut -c11- |sed -n '1p'")%> MHz <%=luci.sys.exec("sensors | grep 'Core 0' | cut -c10-24")%>
<%:CPU Info%><%=luci.sys.exec("grep 'MHz' /proc/cpuinfo | cut -c11- |sed -n '1p'")%> MHz <%=luci.sys.exec("cat /tmp/bench.log") or " "%> <%=luci.sys.exec("sensors | grep 'Core 0' | cut -c10-24")%>
<%:Firmware Version%> <%=pcdata(ver.distname)%> <%=pcdata(ver.distversion)%> / <%=pcdata(ver.luciname)%> (<%=pcdata(ver.luciversion)%>) diff --git a/package/lean/coremark/Makefile b/package/lean/coremark/Makefile index 5c017d7890..2edb3697b2 100644 --- a/package/lean/coremark/Makefile +++ b/package/lean/coremark/Makefile @@ -15,7 +15,7 @@ include $(TOPDIR)/rules.mk PKG_NAME:=coremark -PKG_RELEASE:=7 +PKG_RELEASE:=8 PKG_SOURCE_PROTO:=git PKG_SOURCE_URL:=https://github.com/eembc/coremark.git @@ -29,17 +29,25 @@ define Package/coremark CATEGORY:=Utilities TITLE:=CoreMark Embedded Microprocessor Benchmark URL:=https://github.com/eembc/coremark - DEPENDS:=@!TARGET_x86 endef define Package/coremark/description Embedded Microprocessor Benchmark endef +DIR_ARCH:=linux + +ifeq ($(ARCH),x86_64) + DIR_ARCH:=linux64 +endif +ifeq ($(ARCH),aarch64) + DIR_ARCH:=linux64 +endif + define Build/Compile - $(SED) 's|EXE = .exe|EXE =|' $(PKG_BUILD_DIR)/linux/core_portme.mak + $(SED) 's|EXE = .exe|EXE =|' $(PKG_BUILD_DIR)/$(DIR_ARCH)/core_portme.mak mkdir $(PKG_BUILD_DIR)/$(ARCH) - cp -r $(PKG_BUILD_DIR)/linux/* $(PKG_BUILD_DIR)/$(ARCH) + cp -r $(PKG_BUILD_DIR)/$(DIR_ARCH)/* $(PKG_BUILD_DIR)/$(ARCH) $(MAKE) XCFLAGS="-DMULTITHREAD=8 -DUSE_PTHREAD" -C $(PKG_BUILD_DIR) PORT_DIR=$(ARCH) $(MAKE_FLAGS) \ compile endef