From 1b1926721820f50def93a7a7b886c9889a86981b Mon Sep 17 00:00:00 2001 From: AmadeusGhost <42570690+AmadeusGhost@users.noreply.github.com> Date: Fri, 21 Feb 2020 17:05:31 +0800 Subject: [PATCH 1/3] brcm2708: rename to bcm27xx --- net/lcdringer/Makefile | 16 +++++++++------- net/lcdringer/patches/010-disable-check.patch | 12 ++++++++++++ utils/collectd/Makefile | 4 ++-- utils/collectd/files/collectd.uci | 3 +++ .../files/usr/share/collectd/plugin/vmem.json | 5 +++++ 5 files changed, 31 insertions(+), 9 deletions(-) create mode 100644 net/lcdringer/patches/010-disable-check.patch create mode 100644 utils/collectd/files/usr/share/collectd/plugin/vmem.json diff --git a/net/lcdringer/Makefile b/net/lcdringer/Makefile index 9c1b3abc..8cf3a223 100644 --- a/net/lcdringer/Makefile +++ b/net/lcdringer/Makefile @@ -8,8 +8,8 @@ include $(TOPDIR)/rules.mk PKG_NAME:=lcdringer -PKG_VERSION:=0.0.2 -PKG_RELEASE:=1 +PKG_VERSION:=0.0.3 +PKG_RELEASE:=2 PKG_MAINTAINER:=W. Michael Petullo @@ -17,11 +17,13 @@ PKG_LICENSE:=GPL-2.0 PKG_LICENSE_FILES:=COPYING PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz -PKG_SOURCE_URL:=http://www.flyn.org/projects/lcdringer -PKG_HASH:=34f8a5325cb20bf404ac1a10fe63d013a077a12814c4558df4e55d95262ff618 -PKG_BUILD_DEPENDS:=vala +PKG_SOURCE_URL:=https://www.flyn.org/projects/lcdringer +PKG_HASH:=72f34473a62f997516e0a73827b4400150966e1d1d98ece4d7b92075e26913e0 +PKG_BUILD_DEPENDS:=vala/host +PKG_BUILD_PARALLEL:=1 PKG_INSTALL:=1 +PKG_FIXUP:=autoreconf include $(INCLUDE_DIR)/package.mk include $(INCLUDE_DIR)/nls.mk @@ -29,9 +31,9 @@ include $(INCLUDE_DIR)/nls.mk define Package/lcdringer SECTION:=network CATEGORY:=Network - DEPENDS:=+libgee +libgstreamer1 +loudmouth @TARGET_brcm2708 + DEPENDS:=+libgee +libgstreamer1 +loudmouth @TARGET_bcm27xx TITLE:=lcdringer - URL:=http://www.flyn.org/projects/lcdringer/ + URL:=https://www.flyn.org/projects/lcdringer/ endef define Package/lcdringer/decription diff --git a/net/lcdringer/patches/010-disable-check.patch b/net/lcdringer/patches/010-disable-check.patch new file mode 100644 index 00000000..b0796098 --- /dev/null +++ b/net/lcdringer/patches/010-disable-check.patch @@ -0,0 +1,12 @@ +--- a/configure.ac ++++ b/configure.ac +@@ -87,9 +87,6 @@ fi + AC_SUBST(GSTREAMER_CFLAGS) + AC_SUBST(GSTREAMER_LIBS) + +-PKG_CHECK_MODULES([CHECK], [check >= 0.9.4],have_check=yes,have_check=no) +-AM_CONDITIONAL(HAVE_CHECK, test x"$have_check" = "xyes") +- + AM_PROG_VALAC([0.11.4]) + AM_CONDITIONAL(HAVE_VALAC, test -x "$VALAC") + diff --git a/utils/collectd/Makefile b/utils/collectd/Makefile index 74fa9c42..809489a6 100644 --- a/utils/collectd/Makefile +++ b/utils/collectd/Makefile @@ -9,7 +9,7 @@ include $(TOPDIR)/rules.mk PKG_NAME:=collectd PKG_VERSION:=5.10.0 -PKG_RELEASE:=2 +PKG_RELEASE:=3 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.bz2 PKG_SOURCE_URL:=https://collectd.org/files/ \ @@ -368,7 +368,7 @@ $(eval $(call BuildPlugin,chrony,chrony status input,chrony,)) $(eval $(call BuildPlugin,conntrack,connection tracking table size input,conntrack,)) $(eval $(call BuildPlugin,contextswitch,context switch input,contextswitch,)) $(eval $(call BuildPlugin,cpu,CPU input,cpu,)) -$(eval $(call BuildPlugin,cpufreq,CPU Freq input,cpufreq,@(TARGET_x86||TARGET_x86_64||TARGET_mvebu||TARGET_ipq806x||TARGET_armvirt||TARGET_ipq40xx||TARGET_brcm2708_bcm2709))) # Only enable on targets with CPUs supporting frequency scaling +$(eval $(call BuildPlugin,cpufreq,CPU Freq input,cpufreq,@(TARGET_x86||TARGET_x86_64||TARGET_mvebu||TARGET_ipq806x||TARGET_armvirt||TARGET_ipq40xx||TARGET_bcm27xx_bcm2709))) # Only enable on targets with CPUs supporting frequency scaling $(eval $(call BuildPlugin,csv,CSV output,csv,)) $(eval $(call BuildPlugin,curl,cURL input,curl,+PACKAGE_collectd-mod-curl:libcurl)) #$(eval $(call BuildPlugin,dbi,relational database input,dbi,+PACKAGE_collectd-mod-dbi:libdbi)) diff --git a/utils/collectd/files/collectd.uci b/utils/collectd/files/collectd.uci index a04cbc31..f4b3df1e 100644 --- a/utils/collectd/files/collectd.uci +++ b/utils/collectd/files/collectd.uci @@ -193,3 +193,6 @@ config globals 'globals' #config plugin 'uptime' # option enable '0' +#config plugin 'vmem' +# option enable '0' +# option Verbose '0' diff --git a/utils/collectd/files/usr/share/collectd/plugin/vmem.json b/utils/collectd/files/usr/share/collectd/plugin/vmem.json new file mode 100644 index 00000000..5fb8a852 --- /dev/null +++ b/utils/collectd/files/usr/share/collectd/plugin/vmem.json @@ -0,0 +1,5 @@ +{ + "bool": [ + "Verbose" + ] +} From 64fa45094af7c81d6fc3f085cc421377de19f6ae Mon Sep 17 00:00:00 2001 From: Soff Date: Sun, 23 Feb 2020 19:00:08 +0800 Subject: [PATCH 2/3] netdata: update to version 1.20.0 --- admin/netdata/Makefile | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/admin/netdata/Makefile b/admin/netdata/Makefile index bd4eb6f0..00929b34 100644 --- a/admin/netdata/Makefile +++ b/admin/netdata/Makefile @@ -8,7 +8,7 @@ include $(TOPDIR)/rules.mk PKG_NAME:=netdata -PKG_VERSION:=1.19.0 +PKG_VERSION:=1.20.0 PKG_RELEASE:=1 PKG_MAINTAINER:=Josef Schlehofer , Daniel Engberg @@ -18,7 +18,7 @@ PKG_CPE_ID:=cpe:/a:my-netdata:netdata PKG_SOURCE:=$(PKG_NAME)-v$(PKG_VERSION).tar.gz PKG_SOURCE_URL:=https://codeload.github.com/netdata/netdata/tar.gz/v$(PKG_VERSION)? -PKG_HASH:=007656f639d3544698af503f35550aeb4d4d5a06b81801bf5acf4ac21db68f6e +PKG_HASH:=c739e0fa8d6d7f433c0c7c8016b763e8f70519d67f0b5e7eca9ee5318f210d90 PKG_INSTALL:=1 PKG_BUILD_PARALLEL:=1 @@ -30,7 +30,7 @@ include $(INCLUDE_DIR)/package.mk define Package/netdata SECTION:=admin CATEGORY:=Administration - DEPENDS:=+zlib +libuuid +libmnl +libjson-c + DEPENDS:=+zlib +libuuid +libmnl +libjson-c +libuv TITLE:=Real-time performance monitoring tool URL:=https://www.netdata.cloud/ endef From f35caf0c4430f63092346af66a5123e1b47acecc Mon Sep 17 00:00:00 2001 From: Texot Date: Thu, 27 Feb 2020 00:31:01 +0800 Subject: [PATCH 3/3] Fix necessary recompiling not detected --- utils/containerd/Makefile | 1 + utils/runc/Makefile | 1 + 2 files changed, 2 insertions(+) diff --git a/utils/containerd/Makefile b/utils/containerd/Makefile index a0a6e092..e669c6b1 100644 --- a/utils/containerd/Makefile +++ b/utils/containerd/Makefile @@ -75,6 +75,7 @@ endef # Avoid installing binaries define Build/InstallDev $(call Build/Compile/Default,clean) + rm -f $(STAMP_BUILT) $(call GoPackage/Build/InstallDev,$(1)) endef diff --git a/utils/runc/Makefile b/utils/runc/Makefile index 5db3759e..754302ea 100644 --- a/utils/runc/Makefile +++ b/utils/runc/Makefile @@ -80,6 +80,7 @@ endef # Avoid installing binaries define Build/InstallDev $(call Build/Compile/Default,clean) + rm -f $(STAMP_BUILT) $(call GoPackage/Build/InstallDev,$(1)) endef