commits

commits@lists.open-mesh.org

1 participants
12421 discussions

[openwrt-feed-devel] master: batman-adv-devel: Add missing prefix for version (af53530)
by postmaster＠open-mesh.org 14 Oct '18

14 Oct '18

Repository : ssh://git@open-mesh.org/openwrt-feed-devel On branch : master >--------------------------------------------------------------- commit af53530e892c6b8cb0354634b5dbcf21fb636ae1 Author: Sven Eckelmann <sven(a)narfation.org> Date: Sun Oct 14 18:18:57 2018 +0200 batman-adv-devel: Add missing prefix for version Signed-off-by: Sven Eckelmann <sven(a)narfation.org> >--------------------------------------------------------------- af53530e892c6b8cb0354634b5dbcf21fb636ae1 batman-adv-devel/Makefile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/batman-adv-devel/Makefile b/batman-adv-devel/Makefile index bd2e1a7..bb31dea 100644 --- a/batman-adv-devel/Makefile +++ b/batman-adv-devel/Makefile @@ -85,7 +85,7 @@ NOSTDINC_FLAGS = \ -I$(PKG_BUILD_DIR)/include/ \ -include backport/backport.h \ -include $(PKG_BUILD_DIR)/compat-hacks.h \ - -DBATADV_SOURCE_VERSION=\\\"$(PKG_VERSION)\\\" \ + -DBATADV_SOURCE_VERSION=\\\"openwrt-$(PKG_VERSION)\\\" \ COMPAT_SOURCES = \ $(if $(CONFIG_KMOD_BATMAN_ADV_MCAST),../../compat-sources/net/core/skbuff.o,) \

1 0

[openwrt-feed-devel] master: batman-adv-devel: Disable MCAST during compilation (0ecc4dd)
by postmaster＠open-mesh.org 14 Oct '18

14 Oct '18

Repository : ssh://git@open-mesh.org/openwrt-feed-devel On branch : master >--------------------------------------------------------------- commit 0ecc4ddb883a250f3b164fce749c3034c1919a50 Author: Sven Eckelmann <sven(a)narfation.org> Date: Sun Oct 14 16:58:01 2018 +0200 batman-adv-devel: Disable MCAST during compilation The multicast optimization compile option is disabled by default in the Kconfig of batman-adv. The out-of-tree module should keep this setting in sync and thus has to also disable the build of multicast optimization by default. Signed-off-by: Sven Eckelmann <sven(a)narfation.org> >--------------------------------------------------------------- 0ecc4ddb883a250f3b164fce749c3034c1919a50 batman-adv-devel/Config.in | 1 - 1 file changed, 1 deletion(-) diff --git a/batman-adv-devel/Config.in b/batman-adv-devel/Config.in index 0d78925..753bb1a 100644 --- a/batman-adv-devel/Config.in +++ b/batman-adv-devel/Config.in @@ -22,7 +22,6 @@ config KMOD_BATMAN_ADV_DEVEL_NC config KMOD_BATMAN_ADV_DEVEL_MCAST bool "enable multicast transmission optimization" depends on PACKAGE_kmod-batman-adv-devel - default y config KMOD_BATMAN_ADV_DEVEL_DEBUGFS bool "enable debugfs support"

1 0

[linux-merge]linux integration; annotated tag, v4.19-rc7, created. v4.19-rc7
by postmaster＠open-mesh.org 07 Oct '18

07 Oct '18

The annotated tag, v4.19-rc7 has been created at 8c7d64c58fc97a3db97d6f2f6c30c6a70b55cc45 (tag) tagging 0238df646e6224016a45505d2c111a24669ebe21 (commit) replaces v4.19-rc6 tagged by Greg Kroah-Hartman on Sun Oct 7 17:35:13 2018 +0200 - Shortlog ------------------------------------------------------------ This is the 4.19-rc7 release -----BEGIN PGP SIGNATURE----- iQIzBAABCAAdFiEEZH8oZUiU471FcZm+ONu9yGCSaT4FAlu6J7EACgkQONu9yGCS aT50lg//ZGZDhUmzWbY5UOGIZOmqdudaQ3dvL/duS8rOe/OWtudpMtfIOoeegNoF aMU2zr7TRy+RisuGVcxc/X5iw7hrbpiymH6ioeeq4pmelJ7KZB0A2NKBIttN5l/a 8+V5+xD2tpBS8/mLSt76ourEqA/RzAWUuBphrCzoRPv7wnIPZt+5WKqUYNzOpyme xsAQb4A0QLpFAmSY+1RloX9oecwM0whFhZ0qNQfpNbonoIRKpYSXfqRuYCjJJhK3 hAkoK+mjqMoo8HTo+y/V3Xl4/pCnLcUBSQOna6SUmnZ147zwRNXvBqJDYnLH0gww LbKeFKNtOB3M4lLwo3nQOsMKKC+Wlx5zZ7JoR/j7QOl5zTFYoFLfWhywhd3f0KWx tuRE4/XlOiPlaJIhMx+h2UfO/4CB3KDe439Vof5yGDXIFWcvG/+cmUhYlSKhFoHh oU6/w4N+ap44fKz+iRP0/bpsn2/S6zU3+sM90tku4UsVki3zqZfamJXykj2JRmHr pfo12hUBUr1uwAN6yXW/fuzVysupzEcCFM04u8pPOBNCp2mBY8lF4QgNswIC/oX6 /ClkTnncNek1W9nm5EX0WdVN0H21HcaEXadn/Bq+vWr8BsiiWWoXcF5K7FEIfSnQ 39T8Ocs6umxzz42mVeUNXxPDfrSPkfrmOObn4lhzocoYa/WOYlU= =lDis -----END PGP SIGNATURE----- ----------------------------------------------------------------------- -- linux integration

1 0

[openwrt-feed-devel] master: batctl-devel: Add option to select download source (f341283)
by postmaster＠open-mesh.org 07 Oct '18

07 Oct '18

Repository : ssh://git@open-mesh.org/openwrt-feed-devel On branch : master >--------------------------------------------------------------- commit f341283108cd308e5a7956b84b71a97008c6375e Author: Sven Eckelmann <sven(a)narfation.org> Date: Sun Oct 7 15:47:51 2018 +0200 batctl-devel: Add option to select download source The current way to download the alfred master branch sources via a special script on open-mesh.org doesn't work anymore because each https download requires the checksum of this file. Thus the whole download implementation has to be replaced to get everything via the native OpenWrt download helpers. The supported methods are now: * download via git - free selection of the git repository remote - free selection of the branch or tag * copy from local source directory Signed-off-by: Sven Eckelmann <sven(a)narfation.org> >--------------------------------------------------------------- f341283108cd308e5a7956b84b71a97008c6375e batctl-devel/Config.devel.in | 50 ++++++++++++++++++++++++++++++++++++++++++++ batctl-devel/Config.in | 9 -------- batctl-devel/Makefile | 38 ++++++++++++++++++++++++++------- 3 files changed, 80 insertions(+), 17 deletions(-) diff --git a/batctl-devel/Config.devel.in b/batctl-devel/Config.devel.in new file mode 100644 index 0000000..fbdd9a9 --- /dev/null +++ b/batctl-devel/Config.devel.in @@ -0,0 +1,50 @@ +if PACKAGE_batctl-devel + +choice + prompt "Selected batctl-devel download method" + default batctl-devel_SOURCE_GIT + + config batctl-devel_SOURCE_GIT + bool "git repository" + + config batctl-devel_SOURCE_DIRECTORY + bool "directory" + +endchoice + +endif + +if batctl-devel_SOURCE_GIT + +config batctl-devel_REPOSITORY + string + prompt "batctl-devel repository to build" + depends on PACKAGE_batctl-devel + default "https://git.open-mesh.org/batctl.git" + help + Enter a batctl-devel repository url + +config batctl-devel_BRANCH + string + prompt "batctl-devel branch to build" + depends on PACKAGE_batctl-devel + default "master" + help + Enter a batctl branch name or git tag to override package + default value. This allows to build from non-master branches + to test unreleased features. + +endif + + +if batctl-devel_SOURCE_DIRECTORY + +config batctl-devel_DIRECTORY + string + prompt "batctl-devel source directory" + depends on PACKAGE_batctl-devel + default "/tmp/batctl-devel" + help + Enter a batctl-devel source directory + +endif diff --git a/batctl-devel/Config.in b/batctl-devel/Config.in deleted file mode 100644 index 09f9c5f..0000000 --- a/batctl-devel/Config.in +++ /dev/null @@ -1,9 +0,0 @@ -config BATCTL_DEVEL_BATCTL_BRANCH - string - prompt "batctl branch to build package with" - depends on PACKAGE_batctl-devel - default "master" - help - Enter a batctl branch name or git tag to override package - default value. This allows to build from non-master branches - to test unreleased features. diff --git a/batctl-devel/Makefile b/batctl-devel/Makefile index d740f60..4c0ba24 100644 --- a/batctl-devel/Makefile +++ b/batctl-devel/Makefile @@ -9,15 +9,27 @@ include $(TOPDIR)/rules.mk PKG_NAME:=batctl-devel -PKG_BRANCH:=$(call qstrip,$(CONFIG_BATCTL_DEVEL_BATCTL_BRANCH)) -PKG_VERSION:=$(shell git ls-remote https://git@git.open-mesh.org/batctl.git $(PKG_BRANCH) | cut -c1-7) -PKG_BATCTL_FNAME:=batctl-devel-$(PKG_VERSION).tar.gz -PKG_BATCTL_DIR:=batctl-$(PKG_VERSION) +ifdef CONFIG_batctl-devel_SOURCE_GIT -PKG_SOURCE_URL:=https://git.open-mesh.org/snapshot/ -PKG_SOURCE:=$(PKG_BATCTL_FNAME) +PKG_BRANCH:=$(call qstrip,$(CONFIG_batctl-devel_BRANCH)) +PKG_SOURCE_URL:=$(call qstrip,$(CONFIG_batctl-devel_REPOSITORY)) +PKG_REV:=$(shell git ls-remote $(PKG_SOURCE_URL) $(PKG_BRANCH)|cut -c1-40) +PKG_VERSION:=0.$(PKG_REV) +PKG_SOURCE_PROTO:=git -PKG_BUILD_DIR:=$(BUILD_DIR)/$(PKG_NAME)/$(PKG_BATCTL_DIR) +PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz +PKG_SOURCE_VERSION:=$(PKG_REV) + +endif + +ifdef CONFIG_batctl-devel_SOURCE_DIRECTORY + +PKG_REV:=0 +PKG_VERSION:=0.$(PKG_REV) + +endif + +PKG_LICENSE:=GPL-2.0 include $(INCLUDE_DIR)/package.mk @@ -38,7 +50,7 @@ development version ($(PKG_VERSION)). endef define Package/batctl-devel/config - source "$(SOURCE)/Config.in" + source "$(SOURCE)/Config.devel.in" endef # The linker can identify unused sections of a binary when each symbol is stored @@ -69,6 +81,16 @@ MAKE_BATCTL_ARGS += \ REVISION="openwrt-$(PKG_VERSION)" +ifdef CONFIG_batctl-devel_SOURCE_DIRECTORY + +define Build/Prepare + mkdir -p $(PKG_BUILD_DIR) + $(CP) $(CONFIG_batctl-devel_DIRECTORY)/* $(PKG_BUILD_DIR)/ + $(call Build/Prepare/Default) +endef + +endif + define Build/Compile $(MAKE_BATCTL_ENV) $(MAKE) -C "$(PKG_BUILD_DIR)" $(MAKE_BATCTL_ARGS) endef

1 0

[openwrt-feed-devel] master: batman-adv-devel: Add option to select download source (4e16eba)
by postmaster＠open-mesh.org 07 Oct '18

07 Oct '18

Repository : ssh://git@open-mesh.org/openwrt-feed-devel On branch : master >--------------------------------------------------------------- commit 4e16ebaf5a17a3f1c84a84e99ecc5b51b565ce21 Author: Sven Eckelmann <sven(a)narfation.org> Date: Sun Oct 7 15:47:51 2018 +0200 batman-adv-devel: Add option to select download source The current way to download the alfred master branch sources via a special script on open-mesh.org doesn't work anymore because each https download requires the checksum of this file. Thus the whole download implementation has to be replaced to get everything via the native OpenWrt download helpers. The supported methods are now: * download via git - free selection of the git repository remote - free selection of the branch or tag * copy from local source directory Signed-off-by: Sven Eckelmann <sven(a)narfation.org> >--------------------------------------------------------------- 4e16ebaf5a17a3f1c84a84e99ecc5b51b565ce21 batman-adv-devel/Config.devel.in | 50 ++++++++++++++++++++++++++++++++++++++++ batman-adv-devel/Config.in | 11 --------- batman-adv-devel/Makefile | 40 ++++++++++++++++++++++++-------- 3 files changed, 81 insertions(+), 20 deletions(-) diff --git a/batman-adv-devel/Config.devel.in b/batman-adv-devel/Config.devel.in new file mode 100644 index 0000000..cb60763 --- /dev/null +++ b/batman-adv-devel/Config.devel.in @@ -0,0 +1,50 @@ +if PACKAGE_kmod-batman-adv-devel + +choice + prompt "Selected batman-adv-devel download method" + default batman-adv-devel_SOURCE_GIT + + config batman-adv-devel_SOURCE_GIT + bool "git repository" + + config batman-adv-devel_SOURCE_DIRECTORY + bool "directory" + +endchoice + +endif + +if batman-adv-devel_SOURCE_GIT + +config batman-adv-devel_REPOSITORY + string + prompt "batman-adv-devel repository to build" + depends on PACKAGE_kmod-batman-adv-devel + default "https://git.open-mesh.org/batman-adv.git" + help + Enter a batman-adv-devel repository url + +config batman-adv-devel_BRANCH + string + prompt "batman-adv-devel branch to build" + depends on PACKAGE_kmod-batman-adv-devel + default "master" + help + Enter a batman-adv branch name or git tag to override package + default value. This allows to build from non-master branches + to test unreleased features. + +endif + + +if batman-adv-devel_SOURCE_DIRECTORY + +config batman-adv-devel_DIRECTORY + string + prompt "batman-adv-devel source directory" + depends on PACKAGE_kmod-batman-adv-devel + default "/tmp/batman-adv-devel" + help + Enter a batman-adv-devel source directory + +endif diff --git a/batman-adv-devel/Config.in b/batman-adv-devel/Config.in index 4df1528..188a818 100644 --- a/batman-adv-devel/Config.in +++ b/batman-adv-devel/Config.in @@ -33,14 +33,3 @@ config KMOD_BATMAN_ADV_DEVEL_BATMAN_V bool "enable batman v routing algorithm" depends on PACKAGE_kmod-batman-adv-devel default y - -config KMOD_BATMAN_ADV_DEVEL_BATMAN_BRANCH - string - prompt "batman-adv branch to build package with" - depends on PACKAGE_kmod-batman-adv-devel - default "master" - help - Enter a batman-adv branch name or git tag to override package - default value. This allows to build from non-master branches - to test unreleased features. - diff --git a/batman-adv-devel/Makefile b/batman-adv-devel/Makefile index 108885b..bd2e1a7 100644 --- a/batman-adv-devel/Makefile +++ b/batman-adv-devel/Makefile @@ -9,13 +9,26 @@ include $(TOPDIR)/rules.mk PKG_NAME:=batman-adv-devel -PKG_BRANCH:=$(call qstrip,$(CONFIG_KMOD_BATMAN_ADV_DEVEL_BATMAN_BRANCH)) -PKG_BATMAN_SHORTREV:=$(shell git ls-remote https://git@git.open-mesh.org/batman-adv.git $(PKG_BRANCH) | cut -c1-7) -PKG_BATMAN_FNAME:=batman-adv-devel-$(PKG_BATMAN_SHORTREV).tar.gz -PKG_BATMAN_DIR:=batman-adv-$(PKG_BATMAN_SHORTREV) +ifdef CONFIG_batman-adv-devel_SOURCE_GIT + +PKG_BRANCH:=$(call qstrip,$(CONFIG_batman-adv-devel_BRANCH)) +PKG_SOURCE_URL:=$(call qstrip,$(CONFIG_batman-adv-devel_REPOSITORY)) +PKG_REV:=$(shell git ls-remote $(PKG_SOURCE_URL) $(PKG_BRANCH)|cut -c1-40) +PKG_VERSION:=0.$(PKG_REV) +PKG_SOURCE_PROTO:=git + +PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz +PKG_SOURCE_VERSION:=$(PKG_REV) + +endif + +ifdef CONFIG_batman-adv-devel_SOURCE_DIRECTORY + +PKG_REV:=0 +PKG_VERSION:=0.$(PKG_REV) + +endif -PKG_SOURCE_URL:=https://git.open-mesh.org/snapshot/ -PKG_SOURCE:=$(PKG_BATMAN_FNAME) PKG_LICENSE:=GPL-2.0 PKG_EXTMOD_SUBDIRS=net/batman-adv @@ -24,8 +37,6 @@ STAMP_CONFIGURED_DEPENDS := $(STAGING_DIR)/usr/include/mac80211-backport/backpor include $(INCLUDE_DIR)/kernel.mk include $(INCLUDE_DIR)/package.mk -PKG_BUILD_DIR:=$(KERNEL_BUILD_DIR)/$(PKG_NAME)/$(PKG_BATMAN_DIR) - define KernelPackage/batman-adv-devel URL:=https://www.open-mesh.org/ MAINTAINER:=Simon Wunderlich <sw(a)simonwunderlich.de> @@ -43,6 +54,7 @@ development version. endef define KernelPackage/batman-adv-devel/config + source "$(SOURCE)/Config.devel.in" source "$(SOURCE)/Config.in" endef @@ -73,7 +85,7 @@ NOSTDINC_FLAGS = \ -I$(PKG_BUILD_DIR)/include/ \ -include backport/backport.h \ -include $(PKG_BUILD_DIR)/compat-hacks.h \ - -DBATADV_SOURCE_VERSION=\\\"$(PKG_BATMAN_SHORTREV)\\\" \ + -DBATADV_SOURCE_VERSION=\\\"$(PKG_VERSION)\\\" \ COMPAT_SOURCES = \ $(if $(CONFIG_KMOD_BATMAN_ADV_MCAST),../../compat-sources/net/core/skbuff.o,) \ @@ -92,6 +104,16 @@ define Build/Compile modules endef +ifdef CONFIG_batman-adv-devel_SOURCE_DIRECTORY + +define Build/Prepare + mkdir -p $(PKG_BUILD_DIR) + $(CP) $(CONFIG_batman-adv-devel_DIRECTORY)/* $(PKG_BUILD_DIR)/ + $(call Build/Prepare/Default) +endef + +endif + define KernelPackage/batman-adv-devel/install $(CP) ./files/. $(1)/ endef

1 0

[openwrt-feed-devel] master: alfred-devel: Add option to select download source (5b3e6d8)
by postmaster＠open-mesh.org 07 Oct '18

07 Oct '18

Repository : ssh://git@open-mesh.org/openwrt-feed-devel On branch : master >--------------------------------------------------------------- commit 5b3e6d820633a1e1a0798a35d42d3af13379060a Author: Sven Eckelmann <sven(a)narfation.org> Date: Sun Oct 7 15:47:51 2018 +0200 alfred-devel: Add option to select download source The current way to download the alfred master branch sources via a special script on open-mesh.org doesn't work anymore because each https download requires the checksum of this file. Thus the whole download implementation has to be replaced to get everything via the native OpenWrt download helpers. The supported methods are now: * download via git - free selection of the git repository remote - free selection of the branch or tag * copy from local source directory Signed-off-by: Sven Eckelmann <sven(a)narfation.org> >--------------------------------------------------------------- 5b3e6d820633a1e1a0798a35d42d3af13379060a alfred-devel/Config.devel.in | 50 ++++++++++++++++++++++++++++++++++++++++++++ alfred-devel/Config.in | 10 --------- alfred-devel/Makefile | 36 ++++++++++++++++++++++++------- 3 files changed, 79 insertions(+), 17 deletions(-) diff --git a/alfred-devel/Config.devel.in b/alfred-devel/Config.devel.in new file mode 100644 index 0000000..c5eccc3 --- /dev/null +++ b/alfred-devel/Config.devel.in @@ -0,0 +1,50 @@ +if PACKAGE_alfred-devel + +choice + prompt "Selected alfred-devel download method" + default alfred-devel_SOURCE_GIT + + config alfred-devel_SOURCE_GIT + bool "git repository" + + config alfred-devel_SOURCE_DIRECTORY + bool "directory" + +endchoice + +endif + +if alfred-devel_SOURCE_GIT + +config alfred-devel_REPOSITORY + string + prompt "alfred-devel repository to build" + depends on PACKAGE_alfred-devel + default "https://git.open-mesh.org/alfred.git" + help + Enter a alfred-devel repository url + +config alfred-devel_BRANCH + string + prompt "alfred-devel branch to build" + depends on PACKAGE_alfred-devel + default "master" + help + Enter a alfred branch name or git tag to override package + default value. This allows to build from non-master branches + to test unreleased features. + +endif + + +if alfred-devel_SOURCE_DIRECTORY + +config alfred-devel_DIRECTORY + string + prompt "alfred-devel source directory" + depends on PACKAGE_alfred-devel + default "/tmp/alfred-devel" + help + Enter a alfred-devel source directory + +endif diff --git a/alfred-devel/Config.in b/alfred-devel/Config.in index 5cf1a85..98c409b 100644 --- a/alfred-devel/Config.in +++ b/alfred-devel/Config.in @@ -20,13 +20,3 @@ config PACKAGE_ALFRED_DEVEL_GPSD depends on PACKAGE_alfred-devel select ALFRED_DEVEL_NEEDS_libgps default n - -config ALFRED_DEVEL_ALFRED_BRANCH - string - prompt "alfred branch to build package with" - depends on PACKAGE_alfred-devel - default "master" - help - Enter an alfred branch name or git tag to override package - default value. This allows to build from non-master branches - to test unreleased features. diff --git a/alfred-devel/Makefile b/alfred-devel/Makefile index d241da1..f308bf7 100644 --- a/alfred-devel/Makefile +++ b/alfred-devel/Makefile @@ -9,15 +9,26 @@ include $(TOPDIR)/rules.mk PKG_NAME:=alfred-devel -PKG_BRANCH:=$(call qstrip,$(CONFIG_ALFRED_DEVEL_ALFRED_BRANCH)) -PKG_VERSION:=$(shell git ls-remote https://git@git.open-mesh.org/alfred.git $(PKG_BRANCH) | cut -c1-7) -PKG_ALFRED_FNAME:=alfred-devel-$(PKG_VERSION).tar.gz -PKG_ALFRED_DIR:=alfred-$(PKG_VERSION) +ifdef CONFIG_alfred-devel_SOURCE_GIT -PKG_SOURCE_URL:=https://git.open-mesh.org/snapshot/ -PKG_SOURCE:=$(PKG_ALFRED_FNAME) +PKG_BRANCH:=$(call qstrip,$(CONFIG_alfred-devel_BRANCH)) +PKG_SOURCE_URL:=$(call qstrip,$(CONFIG_alfred-devel_REPOSITORY)) +PKG_REV:=$(shell git ls-remote $(PKG_SOURCE_URL) $(PKG_BRANCH)|cut -c1-40) +PKG_VERSION:=0.$(PKG_REV) +PKG_SOURCE_PROTO:=git + +PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz +PKG_SOURCE_VERSION:=$(PKG_REV) + +endif + +ifdef CONFIG_alfred-devel_SOURCE_DIRECTORY + +PKG_REV:=0 +PKG_VERSION:=0.$(PKG_REV) + +endif -PKG_BUILD_DIR:=$(BUILD_DIR)/$(PKG_NAME)/$(PKG_ALFRED_DIR) PKG_LICENSE:=GPL-2.0 include $(INCLUDE_DIR)/package.mk @@ -55,6 +66,7 @@ define Package/alfred-devel/conffiles endef define Package/alfred-devel/config + source "$(SOURCE)/Config.devel.in" source "$(SOURCE)/Config.in" endef @@ -69,6 +81,16 @@ MAKE_ALFRED_FLAGS=\ TARGET_CFLAGS += -ffunction-sections -fdata-sections -flto TARGET_LDFLAGS += -Wl,--gc-sections -fuse-linker-plugin +ifdef CONFIG_alfred-devel_SOURCE_DIRECTORY + +define Build/Prepare + mkdir -p $(PKG_BUILD_DIR) + $(CP) $(CONFIG_alfred-devel_DIRECTORY)/* $(PKG_BUILD_DIR)/ + $(call Build/Prepare/Default) +endef + +endif + define Build/Compile CFLAGS="$(TARGET_CPPFLAGS) $(TARGET_CFLAGS)" \ LDFLAGS="$(TARGET_LDFLAGS)" \

1 0

[openwrt-feed-devel] master: alfred-devel: Add openwrt revision to internal version (7221148)
by postmaster＠open-mesh.org 07 Oct '18

07 Oct '18

Repository : ssh://git@open-mesh.org/openwrt-feed-devel On branch : master >--------------------------------------------------------------- commit 72211486b0ade8db78b7994fff7115efd237a0e4 Author: Sven Eckelmann <sven(a)narfation.org> Date: Sun Oct 7 11:10:05 2018 +0200 alfred-devel: Add openwrt revision to internal version OpenWrt is using a modified version of the software and these modifications may introduce extra bugs (or behavior changes). It is also patched for stable releases instead of switching to new releases. The revision should therefore be added to the version number to make it easier understandable which modified version the user may have installed. Signed-off-by: Sven Eckelmann <sven(a)narfation.org> >--------------------------------------------------------------- 72211486b0ade8db78b7994fff7115efd237a0e4 alfred-devel/Makefile | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/alfred-devel/Makefile b/alfred-devel/Makefile index 0bba5a9..d241da1 100644 --- a/alfred-devel/Makefile +++ b/alfred-devel/Makefile @@ -63,7 +63,8 @@ MAKE_ALFRED_FLAGS=\ CONFIG_ALFRED_GPSD=$(if $(CONFIG_PACKAGE_ALFRED_DEVEL_GPSD),y,n) \ CONFIG_ALFRED_CAPABILITIES=n \ LIBNL_NAME="libnl-tiny" \ - LIBNL_GENL_NAME="libnl-tiny" + LIBNL_GENL_NAME="libnl-tiny" \ + REVISION="openwrt-$(PKG_VERSION)" TARGET_CFLAGS += -ffunction-sections -fdata-sections -flto TARGET_LDFLAGS += -Wl,--gc-sections -fuse-linker-plugin

1 0

[openwrt-feed-devel] master: batctl-devel: Add openwrt revision to internal version (a9483f6)
by postmaster＠open-mesh.org 07 Oct '18

07 Oct '18

Repository : ssh://git@open-mesh.org/openwrt-feed-devel On branch : master >--------------------------------------------------------------- commit a9483f6517f42d61b0d4d1d1878a2d7100418c51 Author: Sven Eckelmann <sven(a)narfation.org> Date: Sun Oct 7 11:10:05 2018 +0200 batctl-devel: Add openwrt revision to internal version OpenWrt is using a modified version of the software and these modifications may introduce extra bugs (or behavior changes). It is also patched for stable releases instead of switching to new releases. The revision should therefore be added to the version number to make it easier understandable which modified version the user may have installed. Signed-off-by: Sven Eckelmann <sven(a)narfation.org> >--------------------------------------------------------------- a9483f6517f42d61b0d4d1d1878a2d7100418c51 batctl-devel/Makefile | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/batctl-devel/Makefile b/batctl-devel/Makefile index 79f5d58..6a48678 100644 --- a/batctl-devel/Makefile +++ b/batctl-devel/Makefile @@ -71,10 +71,10 @@ MAKE_BATCTL_ENV += \ LIBNL_GENL_NAME="libnl-tiny" MAKE_BATCTL_ARGS += \ - REVISION="$(PKG_VERSION)" \ CC="$(TARGET_CC)" \ DESTDIR="$(PKG_INSTALL_DIR)" \ - batctl install + batctl install \ + REVISION="openwrt-$(PKG_VERSION)" define Build/Compile

1 0

[openwrt-feed-devel] master: batctl-devel: Move config options to external file (e5fc167)
by postmaster＠open-mesh.org 07 Oct '18

07 Oct '18

Repository : ssh://git@open-mesh.org/openwrt-feed-devel On branch : master >--------------------------------------------------------------- commit e5fc167998054874f6581bf8427033a18567dd30 Author: Sven Eckelmann <sven(a)narfation.org> Date: Sun Oct 7 14:46:10 2018 +0200 batctl-devel: Move config options to external file Signed-off-by: Sven Eckelmann <sven(a)narfation.org> >--------------------------------------------------------------- e5fc167998054874f6581bf8427033a18567dd30 batctl-devel/Config.in | 9 +++++++++ batctl-devel/Makefile | 10 +--------- 2 files changed, 10 insertions(+), 9 deletions(-) diff --git a/batctl-devel/Config.in b/batctl-devel/Config.in new file mode 100644 index 0000000..09f9c5f --- /dev/null +++ b/batctl-devel/Config.in @@ -0,0 +1,9 @@ +config BATCTL_DEVEL_BATCTL_BRANCH + string + prompt "batctl branch to build package with" + depends on PACKAGE_batctl-devel + default "master" + help + Enter a batctl branch name or git tag to override package + default value. This allows to build from non-master branches + to test unreleased features. diff --git a/batctl-devel/Makefile b/batctl-devel/Makefile index 6a48678..d740f60 100644 --- a/batctl-devel/Makefile +++ b/batctl-devel/Makefile @@ -38,15 +38,7 @@ development version ($(PKG_VERSION)). endef define Package/batctl-devel/config - config BATCTL_DEVEL_BATCTL_BRANCH - string - prompt "batctl branch to build package with" - depends on PACKAGE_batctl-devel - default "master" - help - Enter a batctl branch name or git tag to override package - default value. This allows to build from non-master branches - to test unreleased features. + source "$(SOURCE)/Config.in" endef # The linker can identify unused sections of a binary when each symbol is stored

1 0

[openwrt-feed-devel] master: alfred-devel: use procd (c7c78f0)
by postmaster＠open-mesh.org 07 Oct '18

07 Oct '18

Repository : ssh://git@open-mesh.org/openwrt-feed-devel On branch : master >--------------------------------------------------------------- commit c7c78f024be8d75914d452cfdae2bfa7fd5dd9c5 Author: Paul Spooren <mail(a)aparcar.org> Date: Thu Jun 14 00:08:51 2018 +0900 alfred-devel: use procd Signed-off-by: Paul Spooren <mail(a)aparcar.org> Signed-off-by: Sven Eckelmann <sven(a)narfation.org> >--------------------------------------------------------------- c7c78f024be8d75914d452cfdae2bfa7fd5dd9c5 alfred-devel/Makefile | 2 ++ alfred-devel/files/alfred.init | 73 ++++++++++++++++++------------------------ 2 files changed, 34 insertions(+), 41 deletions(-) diff --git a/alfred-devel/Makefile b/alfred-devel/Makefile index d1cb036..0bba5a9 100644 --- a/alfred-devel/Makefile +++ b/alfred-devel/Makefile @@ -22,6 +22,8 @@ PKG_LICENSE:=GPL-2.0 include $(INCLUDE_DIR)/package.mk +init-y := alfred + define Package/alfred-devel URL:=https://www.open-mesh.org/ SECTION:=net diff --git a/alfred-devel/files/alfred.init b/alfred-devel/files/alfred.init index 8293436..89e33ab 100755 --- a/alfred-devel/files/alfred.init +++ b/alfred-devel/files/alfred.init @@ -1,48 +1,40 @@ #!/bin/sh /etc/rc.common # -# Copyright (C) 2013 OpenWrt.org -# # This is free software, licensed under the GNU General Public License v2. # See /LICENSE for more information. # START=99 -STOP=99 +USE_PROCD=1 alfred_args="" vis_args="" facters_dir="/etc/alfred" -pid_file_alfred="/var/run/alfred.pid" -pid_file_vis="/var/run/batadv-vis.pid" enable=0 vis_enable=0 -SERVICE_DAEMONIZE=1 -SERVICE_WRITE_PID=1 -wait_for_dir() -{ +wait_for_dir() { local ifce="$1" dir="$2" if ! [ -d "$dir" ] ; then timeout=30 - echo "${initscript}: waiting $timeout secs for $ifce interface..." + echo "waiting $timeout secs for $ifce interface..." for i in $(seq $timeout); do sleep 1 [ -d "$dir" ] && break - if [ $i == $timeout ] ; then - echo "${initscript}: $ifce not detected, alfred not starting." + if [ $i = $timeout ] ; then + echo "$ifce not detected, alfred not starting." exit 1 fi done fi } -wait_for_ll_address() -{ +wait_for_ll_address() { local iface="$1" local timeout=30 - echo "${initscript}: waiting $timeout secs for $iface address..." + echo "waiting $timeout secs for $iface address..." for i in $(seq $timeout); do # We look for # - the link-local address (starts with fe80) @@ -58,12 +50,11 @@ wait_for_ll_address() sleep 1 done - echo "${initscript}: $iface address not detected, alfred not starting." + echo "$iface address not detected, alfred not starting." exit 1 } -alfred_start() -{ +alfred_start() { local args="" local section="$1" local disabled interface mode @@ -103,41 +94,41 @@ alfred_start() return 0 } -start() -{ +start_service() { config_load "alfred" config_foreach alfred_start alfred - if [ "$enable" = "0" ]; then - exit 0 - fi + [ "$enable" = "0" ] && exit 0 - echo "${initscript}: starting alfred" - SERVICE_PID_FILE="$pid_file_alfred" - service_start /usr/sbin/alfred ${alfred_args} + procd_open_instance "alfred" + procd_set_param command /usr/sbin/alfred + procd_append_param command ${alfred_args} + procd_close_instance - if [ "$vis_enable" = "1" ]; then - echo "${initscript}: starting batadv-vis" - SERVICE_PID_FILE="$pid_file_vis" - service_start /usr/sbin/batadv-vis ${vis_args} - fi + [ "$vis_enable" = "1" ] && { + procd_open_instance "batadv-vis" + procd_set_param command /usr/sbin/batadv-vis + procd_append_param command ${vis_args} + procd_close_instance + } - if [ "$run_facters" = "1" ]; then + [ "$run_facters" = "1" ] && { ( for file in $facters_dir/* ; do [ -x $file ] && $file ; done ) if ! ( grep -q "for file in $facters_dir/\* ; do " /etc/crontabs/root 2>/dev/null ) ; then echo "*/5 * * * * ( for file in $facters_dir/* ; do [ -x \$file ] && \$file ; done )" >> /etc/crontabs/root /etc/init.d/cron enable /etc/init.d/cron restart fi - fi + } +} + +service_triggers() { + procd_add_reload_trigger "alfred" } -stop() -{ - SERVICE_PID_FILE="$pid_file_alfred" - service_stop /usr/sbin/alfred - SERVICE_PID_FILE="$pid_file_vis" - [ -x /usr/sbin/batadv-vis ] && service_stop /usr/sbin/batadv-vis - sed "\|for file in $facters_dir/\* ; do |d" -i /etc/crontabs/root - /etc/init.d/cron restart +stop_service() { + [ -e /etc/crontabs/root ] && { + sed "\|for file in $facters_dir/\* ; do |d" -i /etc/crontabs/root + /etc/init.d/cron restart + } }

1 0

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

commits