Merge pull request #786 from ecsv/batman-parallel

batman packages: Allow parallel builds

6 files changed, 16 insertions, 8 deletions

diff --git a/alfred/Makefile b/alfred/Makefile
index aeb2c00..f0af528 100644
--- a/alfred/Makefile
+++ b/alfred/Makefile
@@ -14,6 +14,8 @@ PKG_MAINTAINER:=Simon Wunderlich <sw@simonwunderlich.de>
 PKG_LICENSE:=GPL-2.0-only MIT
 PKG_LICENSE_FILES:=LICENSES/preferred/GPL-2.0 LICENSES/preferred/MIT
 
+PKG_BUILD_PARALLEL:=1
+
 include $(INCLUDE_DIR)/package.mk
 
 define Package/alfred
diff --git a/batctl/Makefile b/batctl/Makefile
index d9a4a7d..5572901 100644
--- a/batctl/Makefile
+++ b/batctl/Makefile
@@ -15,6 +15,8 @@ PKG_MAINTAINER:=Simon Wunderlich <sw@simonwunderlich.de>
 PKG_LICENSE:=GPL-2.0-only ISC MIT
 PKG_LICENSE_FILES:=LICENSES/preferred/GPL-2.0 LICENSES/preferred/MIT LICENSES/deprecated/ISC
 
+PKG_BUILD_PARALLEL:=1
+
 include $(INCLUDE_DIR)/package.mk
 
 define Package/batctl/Default
diff --git a/batman-adv/Makefile b/batman-adv/Makefile
index 15fe398..3ec2321 100644
--- a/batman-adv/Makefile
+++ b/batman-adv/Makefile
@@ -15,6 +15,8 @@ PKG_MAINTAINER:=Simon Wunderlich <sw@simonwunderlich.de>
 PKG_LICENSE:=GPL-2.0-only 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
 
 include $(INCLUDE_DIR)/kernel.mk
diff --git a/batmand/Makefile b/batmand/Makefile
index a6afa46..f015d87 100644
--- a/batmand/Makefile
+++ b/batmand/Makefile
@@ -22,6 +22,8 @@ PKG_SOURCE:=$(PKG_SOURCE_SUBDIR).tar.gz
 PKG_MIRROR_HASH:=ceb8e0e399f79b1b663594fcf9642e1efc40e696a7604daf709c77da9b6ec52f
 PKG_BUILD_DIR:=$(BUILD_DIR)/$(PKG_SOURCE_SUBDIR)
 
+PKG_BUILD_PARALLEL:=1
+
 include $(INCLUDE_DIR)/package.mk
 
 define Package/batmand
diff --git a/batmand/patches/0001-Allow-one-to-disable-forking-to-background-in-debug_.patch b/batmand/patches/0001-Allow-one-to-disable-forking-to-background-in-debug_.patch
index 90527e6..7b01751 100644
--- a/batmand/patches/0001-Allow-one-to-disable-forking-to-background-in-debug_.patch
+++ b/batmand/patches/0001-Allow-one-to-disable-forking-to-background-in-debug_.patch
@@ -6,8 +6,6 @@ Subject: Allow one to disable forking to background in debug_mode 0
  posix/init.c | 19 ++++++++++++++-----
  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
 +++ b/posix/init.c
 @@ -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'},
  		{"disable-aggregation",     no_argument,       0, 'x'},
  		{"disable-client-nat",     no_argument,       0, 'z'},
@@ -26,16 +24,16 @@ index afd409f..901c65a 100644
  		{0, 0, 0, 0}
  	};
  
-@@ -166,7 +168,7 @@ void apply_init_args( int argc, char *argv[] ) {
- 	stop = 0;
- 	prog_name = argv[0];
+@@ -169,7 +171,7 @@ void apply_init_args( int argc, char *ar
+ 	if ( strstr( SOURCE_VERSION, "-" ) != NULL )
+ 		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:vVD", long_options, &option_index ) ) != -1 ) {
  
  		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++;
  				break;
  
@@ -47,7 +45,7 @@ index afd409f..901c65a 100644
  			case 'h':
  			default:
  				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 */
  		if (debug_level == 0) {
  
diff --git a/vis/Makefile b/vis/Makefile
index d806513..ed96166 100644
--- a/vis/Makefile
+++ b/vis/Makefile
@@ -22,6 +22,8 @@ PKG_SOURCE:=$(PKG_SOURCE_SUBDIR).tar.gz
 PKG_MIRROR_HASH:=fd4b337a56993eec9a03ad8e7918bccc7691aa8b2e5ab6dd7863350f07503285
 PKG_BUILD_DIR:=$(BUILD_DIR)/$(PKG_SOURCE_SUBDIR)
 
+PKG_BUILD_PARALLEL:=1
+
 include $(INCLUDE_DIR)/package.mk
 
 define Package/vis