From b71686390b3cc918623cb5d3f897962ba4534d7a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jonas=20H=C3=B6glund?= Date: Fri, 2 Sep 2016 14:46:54 +0200 Subject: [PATCH 1/3] Fix fw_setenv symlink in uboot package --- uboot/Makefile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/uboot/Makefile b/uboot/Makefile index cc9821a5f..b57a91f9e 100644 --- a/uboot/Makefile +++ b/uboot/Makefile @@ -77,7 +77,7 @@ define Package/uboot/install/default $(BIN_DIR)/$(TARGET)/ $(INSTALL_DIR) $$(1)/usr/sbin $(INSTALL_BIN) $(PKG_BUILD_DIR)/tools/env/fw_printenv $$(1)/usr/sbin/ - ln -s $$(1)/usr/sbin/fw_printenv $$(1)/usr/sbin/fw_setenv + ln -s /usr/sbin/fw_printenv $$(1)/usr/sbin/fw_setenv endef define Package/uboot/install/template From d2d3a7844abcf6ce247e4fedeff6db3b466e928c Mon Sep 17 00:00:00 2001 From: Kenneth Johansson Date: Fri, 2 Sep 2016 14:57:29 +0200 Subject: [PATCH 2/3] lmbench again. for real this time. --- lmbench/Makefile | 122 ++++++++++++++++++ .../patches/001-fix_socklen_t_define.patch | 11 ++ lmbench/patches/002-install-cache.patch | 10 ++ lmbench/patches/003-add-LDLIBS.patch | 30 +++++ .../100-bw_mem-add-newline-after-usage.patch | 11 ++ 5 files changed, 184 insertions(+) create mode 100644 lmbench/Makefile create mode 100644 lmbench/patches/001-fix_socklen_t_define.patch create mode 100644 lmbench/patches/002-install-cache.patch create mode 100644 lmbench/patches/003-add-LDLIBS.patch create mode 100644 lmbench/patches/100-bw_mem-add-newline-after-usage.patch diff --git a/lmbench/Makefile b/lmbench/Makefile new file mode 100644 index 000000000..91866a1dd --- /dev/null +++ b/lmbench/Makefile @@ -0,0 +1,122 @@ +# +# Copyright (C) 2012 OpenWrt.org +# +# This is free software, licensed under the GNU General Public License v2. +# See /LICENSE for more information. +# + +include $(TOPDIR)/rules.mk + +PKG_NAME:=lmbench +PKG_VERSION:=3.0-a9 +PKG_RELEASE:=1 + +PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tgz +PKG_SOURCE_URL:=@SF/lmbench/ +PKG_MD5SUM:=b3351a3294db66a72e2864a199d37cbf + +PKG_BUILD_DEPENDS:=librpc + +include $(INCLUDE_DIR)/package.mk + +define Package/lmbench + SECTION:=utils + CATEGORY:=Utilities + TITLE:=lmbench microbenchmarks + URL:=http://sourceforge.net/projects/lmbench + MENU:=1 +endef + +define Package/lmbench/description + lmbench is a series of micro benchmarks intended to measure basic operating + system and hardware system metrics. +endef + +define Package/lmbench/install + true +endef + +define Build/Compile + $(MAKE) -C $(PKG_BUILD_DIR)/src \ + CC="$(TARGET_CC)" \ + AR="$(TARGET_CROSS)ar" \ + OS="$(ARCH)" \ + BASE="$(PKG_INSTALL_DIR)" \ + LDLIBS="-lrpc" \ + COMPILE="$(TARGET_CC) $(TARGET_CFLAGS) $(TARGET_CPPFLAGS) $(TARGET_LDFLAGS)" \ + lmbench install +endef + +define PartGen +define Package/lmbench-$(subst _,-,$(1)) + SECTION:=utils + CATEGORY:=Utilities + TITLE:=$(1) microbenchmark + URL:=http://sourceforge.net/projects/lmbench + DEPENDS:=lmbench +librpc +endef +endef + +define PartInstall +define Package/lmbench-$(subst _,-,$(1))/install + $(INSTALL_DIR) $$(1)/usr/sbin + $(INSTALL_BIN) $(PKG_INSTALL_DIR)/bin/$(1) $$(1)/usr/sbin/$(1) +endef +endef + +LMBENCH_FILES:= \ + bw_file_rd \ + bw_mem \ + bw_mmap_rd \ + bw_pipe \ + bw_tcp \ + bw_unix \ + cache \ + disk \ + enough \ + flushdisk \ + hello \ + lat_cmd \ + lat_connect \ + lat_ctx \ + lat_dram_page \ + lat_fcntl \ + lat_fifo \ + lat_fs \ + lat_http \ + lat_mem_rd \ + lat_mmap \ + lat_ops \ + lat_pagefault \ + lat_pipe \ + lat_pmake \ + lat_proc \ + lat_rand \ + lat_rpc \ + lat_select \ + lat_sem \ + lat_sig \ + lat_syscall \ + lat_tcp \ + lat_udp \ + lat_unix \ + lat_unix_connect \ + lat_usleep \ + line \ + lmdd \ + lmhttp \ + loop_o \ + memsize \ + mhz \ + msleep \ + par_mem \ + par_ops \ + stream \ + timing_o \ + tlb + +$(foreach file,$(LMBENCH_FILES),$(eval $(call PartGen,$(file)))) +$(foreach file,$(LMBENCH_FILES),$(eval $(call PartInstall,$(file)))) + +$(eval $(call BuildPackage,lmbench)) +$(foreach file,$(LMBENCH_FILES),$(eval $(call BuildPackage,lmbench-$(subst _,-,$(file))))) diff --git a/lmbench/patches/001-fix_socklen_t_define.patch b/lmbench/patches/001-fix_socklen_t_define.patch new file mode 100644 index 000000000..967e207cc --- /dev/null +++ b/lmbench/patches/001-fix_socklen_t_define.patch @@ -0,0 +1,11 @@ +--- a/src/bench.h ++++ b/src/bench.h +@@ -77,7 +77,7 @@ typedef long long int64; + #endif /* HAVE_int64_t */ + #endif /* HAVE_int64 */ + +-#ifndef HAVE_socklen_t ++#if (!defined(HAVE_socklen_t) && !defined(__socklen_t_defined)) + typedef int socklen_t; + #endif + diff --git a/lmbench/patches/002-install-cache.patch b/lmbench/patches/002-install-cache.patch new file mode 100644 index 000000000..89543b83f --- /dev/null +++ b/lmbench/patches/002-install-cache.patch @@ -0,0 +1,10 @@ +--- a/src/Makefile ++++ b/src/Makefile +@@ -144,6 +144,7 @@ install-target: + if [ ! -d $(BASE)/include ]; then mkdir $(BASE)/include; fi + if [ ! -d $(BASE)/lib ]; then mkdir $(BASE)/lib; fi + cp $(EXES) $(BASE)/bin ++ cp $(OPT_EXES) $(BASE)/bin + cp $(INCS) $(BASE)/include + cp $O/lmbench.a $(BASE)/lib/libmbench.a + cd ../doc; env MAKEFLAGS="$(MAKEFLAGS)" make CC="${CC}" OS="${OS}" BASE="$(BASE)" install diff --git a/lmbench/patches/003-add-LDLIBS.patch b/lmbench/patches/003-add-LDLIBS.patch new file mode 100644 index 000000000..66a7243ae --- /dev/null +++ b/lmbench/patches/003-add-LDLIBS.patch @@ -0,0 +1,30 @@ +--- a/scripts/build ++++ b/scripts/build +@@ -18,7 +18,7 @@ done + + trap 'rm -f ${BASE}$$.s ${BASE}$$.c ${BASE}$$.o ${BASE}$$; exit 1' 1 2 15 + +-LDLIBS=-lm ++LDLIBS=${LDLIBS-"-lm -lrpc"} + + # check for HP-UX's ANSI compiler + echo "main(int ac, char *av[]) { int i; }" > ${BASE}$$.c +--- a/src/Makefile ++++ b/src/Makefile +@@ -38,6 +38,7 @@ CC=`../scripts/compiler` + MAKE=`../scripts/make` + AR=ar + ARCREATE=cr ++LDLIBS= + + # base of installation location + BASE=/usr/local +@@ -111,7 +112,7 @@ LIBOBJS= $O/lib_tcp.o $O/lib_udp.o $O/li + $O/lib_sched.o + + lmbench: $(UTILS) +- @env CFLAGS=-O MAKE="$(MAKE)" MAKEFLAGS="$(MAKEFLAGS)" CC="$(CC)" OS="$(OS)" ../scripts/build all ++ @env CFLAGS=-O MAKE="$(MAKE)" MAKEFLAGS="$(MAKEFLAGS)" CC="$(CC)" OS="$(OS)" LDLIBS="$(LDLIBS)" ../scripts/build all + -@env CFLAGS=-O MAKE="$(MAKE)" MAKEFLAGS="k$(MAKEFLAGS)" CC="$(CC)" OS="$(OS)" ../scripts/build opt + + results: lmbench diff --git a/lmbench/patches/100-bw_mem-add-newline-after-usage.patch b/lmbench/patches/100-bw_mem-add-newline-after-usage.patch new file mode 100644 index 000000000..d03ad4a9f --- /dev/null +++ b/lmbench/patches/100-bw_mem-add-newline-after-usage.patch @@ -0,0 +1,11 @@ +--- a/src/bw_mem.c ++++ b/src/bw_mem.c +@@ -65,7 +65,7 @@ main(int ac, char **av) + size_t nbytes; + state_t state; + int c; +- char *usage = "[-P ] [-W ] [-N ] what [conflict]\nwhat: rd wr rdwr cp fwr frd fcp bzero bcopy\n must be larger than 512"; ++ char *usage = "[-P ] [-W ] [-N ] what [conflict]\nwhat: rd wr rdwr cp fwr frd fcp bzero bcopy\n must be larger than 512\n"; + + state.overhead = 0; + From f2054628296143de2b979df91bc417a48242b005 Mon Sep 17 00:00:00 2001 From: Sukru Senli Date: Fri, 2 Sep 2016 15:10:35 +0200 Subject: [PATCH 3/3] Update feed [ feed_inteno_packages ] package [ questd ] ------------------------------------------------------------------------------- * 2ee2e5c support showing linkspeed for sfp ports ------------------------------------------------------------------------------- commit 2ee2e5c1819f08d06ea33e4c45896fee29dfae64 Author: Sukru Senli Date: 2016-09-02 15:09:40 +0200 support showing linkspeed for sfp ports Base directory -> / port.c | 55 ++++++++++++++++++++++++++++++++++++++++--------------- 1 file changed, 40 insertions(+), 15 deletions(-) ------------------------------------------------------------------------------- --- questd/Makefile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/questd/Makefile b/questd/Makefile index a8025da1f..91a6b69e5 100644 --- a/questd/Makefile +++ b/questd/Makefile @@ -8,7 +8,7 @@ include $(INCLUDE_DIR)/kernel.mk PKG_NAME:=questd PKG_VERSION:=3.1.14 -PKG_SOURCE_VERSION:=73693db533f430ac90a3a0fb7292f8a8d8e171ac +PKG_SOURCE_VERSION:=2ee2e5c1819f08d06ea33e4c45896fee29dfae64 PKG_SOURCE_PROTO:=git PKG_SOURCE_URL:=http://public.inteno.se:/questd