Difuse/routing
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Merge pull request #786 from ecsv/batman-parallel

Browse source 
batman packages: Allow parallel builds
This commit is contained in:
Elektra Wagenrad 2022-02-19 12:27:34 +01:00 committed by GitHub
commit 6bfc5220fd
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
6 changed files with 16 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
alfred/Makefile
View file

@ -14,6 +14,8 @@ PKG_MAINTAINER:=Simon Wunderlich <sw@simonwunderlich.de>
PKG_LICENSE:=GPL-2.0-only MIT PKG_LICENSE:=GPL-2.0-only MIT
PKG_LICENSE_FILES:=LICENSES/preferred/GPL-2.0 LICENSES/preferred/MIT PKG_LICENSE_FILES:=LICENSES/preferred/GPL-2.0 LICENSES/preferred/MIT
PKG_BUILD_PARALLEL:=1
include $(INCLUDE_DIR)/package.mk include $(INCLUDE_DIR)/package.mk
define Package/alfred define Package/alfred

2
batctl/Makefile
View file

@ -15,6 +15,8 @@ PKG_MAINTAINER:=Simon Wunderlich <sw@simonwunderlich.de>
PKG_LICENSE:=GPL-2.0-only ISC MIT PKG_LICENSE:=GPL-2.0-only ISC MIT
PKG_LICENSE_FILES:=LICENSES/preferred/GPL-2.0 LICENSES/preferred/MIT LICENSES/deprecated/ISC PKG_LICENSE_FILES:=LICENSES/preferred/GPL-2.0 LICENSES/preferred/MIT LICENSES/deprecated/ISC
PKG_BUILD_PARALLEL:=1
include $(INCLUDE_DIR)/package.mk include $(INCLUDE_DIR)/package.mk
define Package/batctl/Default define Package/batctl/Default

2
batman-adv/Makefile
View file

@ -15,6 +15,8 @@ PKG_MAINTAINER:=Simon Wunderlich <sw@simonwunderlich.de>
PKG_LICENSE:=GPL-2.0-only MIT PKG_LICENSE:=GPL-2.0-only MIT
PKG_LICENSE_FILES:=LICENSES/preferred/GPL-2.0 LICENSES/preferred/MIT PKG_LICENSE_FILES:=LICENSES/preferred/GPL-2.0 LICENSES/preferred/MIT
PKG_BUILD_PARALLEL:=1
STAMP_CONFIGURED_DEPENDS := $(STAGING_DIR)/usr/include/mac80211-backport/backport/autoconf.h STAMP_CONFIGURED_DEPENDS := $(STAGING_DIR)/usr/include/mac80211-backport/backport/autoconf.h
include $(INCLUDE_DIR)/kernel.mk include $(INCLUDE_DIR)/kernel.mk

2
batmand/Makefile
View file

@ -22,6 +22,8 @@ PKG_SOURCE:=$(PKG_SOURCE_SUBDIR).tar.gz
PKG_MIRROR_HASH:=ceb8e0e399f79b1b663594fcf9642e1efc40e696a7604daf709c77da9b6ec52f PKG_MIRROR_HASH:=ceb8e0e399f79b1b663594fcf9642e1efc40e696a7604daf709c77da9b6ec52f
PKG_BUILD_DIR:=$(BUILD_DIR)/$(PKG_SOURCE_SUBDIR) PKG_BUILD_DIR:=$(BUILD_DIR)/$(PKG_SOURCE_SUBDIR)
PKG_BUILD_PARALLEL:=1
include $(INCLUDE_DIR)/package.mk include $(INCLUDE_DIR)/package.mk
define Package/batmand define Package/batmand

14
batmand/patches/0001-Allow-one-to-disable-forking-to-background-in-debug_.patch
View file

@ -6,8 +6,6 @@ Subject: Allow one to disable forking to background in debug_mode 0
posix/init.c | 19 ++++++++++++++----- posix/init.c | 19 ++++++++++++++-----
1 file changed, 14 insertions(+), 5 deletions(-) 1 file changed, 14 insertions(+), 5 deletions(-)
diff --git a/posix/init.c b/posix/init.c
index afd409f..901c65a 100644
--- a/posix/init.c --- a/posix/init.c
+++ b/posix/init.c +++ b/posix/init.c
@@ -44,6 +44,7 @@ @@ -44,6 +44,7 @@
@ -18,7 +16,7 @@ index afd409f..901c65a 100644
@@ -159,6 +160,7 @@ void apply_init_args( int argc, char *argv[] ) { @@ -159,6 +160,7 @@ void apply_init_args( int argc, char *ar
{"purge-timeout", required_argument, 0, 'q'}, {"purge-timeout", required_argument, 0, 'q'},
{"disable-aggregation", no_argument, 0, 'x'}, {"disable-aggregation", no_argument, 0, 'x'},
{"disable-client-nat", no_argument, 0, 'z'}, {"disable-client-nat", no_argument, 0, 'z'},
@ -26,16 +24,16 @@ index afd409f..901c65a 100644
{0, 0, 0, 0} {0, 0, 0, 0}
}; };
@@ -166,7 +168,7 @@ void apply_init_args( int argc, char *argv[] ) { @@ -169,7 +171,7 @@ void apply_init_args( int argc, char *ar
stop = 0; if ( strstr( SOURCE_VERSION, "-" ) != NULL )
prog_name = argv[0]; printf( "WARNING: You are using the unstable batman branch. If you are interested in *using* batman get the latest stable release !\n" );
- while ( ( optchar = getopt_long( argc, argv, "a:A:bcd:hHio:g:p:r:s:vV", long_options, &option_index ) ) != -1 ) { - while ( ( optchar = getopt_long( argc, argv, "a:A:bcd:hHio:g:p:r:s:vV", long_options, &option_index ) ) != -1 ) {
+ while ( ( optchar = getopt_long( argc, argv, "a:A:bcd:hHio:g:p:r:s:vVD", long_options, &option_index ) ) != -1 ) { + while ( ( optchar = getopt_long( argc, argv, "a:A:bcd:hHio:g:p:r:s:vVD", long_options, &option_index ) ) != -1 ) {
switch ( optchar ) { switch ( optchar ) {
@@ -378,6 +380,11 @@ void apply_init_args( int argc, char *argv[] ) { @@ -381,6 +383,11 @@ void apply_init_args( int argc, char *ar
found_args++; found_args++;
break; break;
@ -47,7 +45,7 @@ index afd409f..901c65a 100644
case 'h': case 'h':
default: default:
usage(); usage();
@@ -536,12 +543,14 @@ void apply_init_args( int argc, char *argv[] ) { @@ -539,12 +546,14 @@ void apply_init_args( int argc, char *ar
/* daemonize */ /* daemonize */
if (debug_level == 0) { if (debug_level == 0) {

2
vis/Makefile
View file

@ -22,6 +22,8 @@ PKG_SOURCE:=$(PKG_SOURCE_SUBDIR).tar.gz
PKG_MIRROR_HASH:=fd4b337a56993eec9a03ad8e7918bccc7691aa8b2e5ab6dd7863350f07503285 PKG_MIRROR_HASH:=fd4b337a56993eec9a03ad8e7918bccc7691aa8b2e5ab6dd7863350f07503285
PKG_BUILD_DIR:=$(BUILD_DIR)/$(PKG_SOURCE_SUBDIR) PKG_BUILD_DIR:=$(BUILD_DIR)/$(PKG_SOURCE_SUBDIR)
PKG_BUILD_PARALLEL:=1
include $(INCLUDE_DIR)/package.mk include $(INCLUDE_DIR)/package.mk
define Package/vis define Package/vis