Merge pull request #389 from eku/watchio

Dependency of WatchIO to PORTIO_FULL_FEATURED added.
ethersex · Mar 15, 2015 · 16b78d2 · 16b78d2
2 parents 3f59c22 + ef92198
commit 16b78d2
Show file tree

Hide file tree

Showing 31 changed files with 39 additions and 3 deletions.
diff --git a/config.in b/config.in
@@ -306,9 +306,11 @@ comment "I/O"
 			Simple PORTIO_SCHEME
 
 		if [ x"$PORTIO_SCHEME" = x"PORTIO_SIMPLE" ]; then
-			define_bool PORTIO_SIMPLE_SUPPORT y;
+			define_bool PORTIO_SIMPLE_SUPPORT y
+			define_bool PORTIO_SUPPORT n
 		elif [ x"$PORTIO_SCHEME" = x"PORTIO_FULL_FEATURED" ]; then
-			define_bool PORTIO_SUPPORT y;
+			define_bool PORTIO_SIMPLE_SUPPORT n
+			define_bool PORTIO_SUPPORT y
 		fi
 
 		source core/portio/config.in

diff --git a/contrib/autotest/profiles/openvpn-cast5-md5-ipv6 b/contrib/autotest/profiles/openvpn-cast5-md5-ipv6
@@ -268,6 +268,7 @@ PORTIO_SCHEME=PORTIO_SIMPLE
 PORTIO_SIMPLE=y
 # PORTIO_FULL_FEATURED is not set
 PORTIO_SIMPLE_SUPPORT=y
+# PORTIO_SUPPORT is not set
 # NAMED_PIN_SUPPORT is not set
 # TTY_SUPPORT is not set
 TTY_COLS=16

diff --git a/contrib/autotest/profiles/rs485-modbus-dmx-onewire-compile-test b/contrib/autotest/profiles/rs485-modbus-dmx-onewire-compile-test
@@ -274,6 +274,7 @@ PORTIO_SCHEME=PORTIO_SIMPLE
 PORTIO_SIMPLE=y
 # PORTIO_FULL_FEATURED is not set
 PORTIO_SIMPLE_SUPPORT=y
+# PORTIO_SUPPORT is not set
 # NAMED_PIN_SUPPORT is not set
 # TTY_SUPPORT is not set
 TTY_COLS=16

diff --git a/contrib/autotest/profiles/whale-ipv6 b/contrib/autotest/profiles/whale-ipv6
@@ -288,6 +288,7 @@ DEBUG_UNKNOWN_PACKETS=y
 # PORTIO_SIMPLE is not set
 PORTIO_SCHEME=PORTIO_FULL_FEATURED
 PORTIO_FULL_FEATURED=y
+# PORTIO_SIMPLE_SUPPORT is not set
 PORTIO_SUPPORT=y
 NAMED_PIN_SUPPORT=y
 # conrad_probot is not set

diff --git a/scripts/pinning_hardware_list.sh b/scripts/pinning_hardware_list.sh
@@ -2,5 +2,5 @@
 
 . scripts/osdefaults.sh
 
-ls pinning/hardware/ | ${SED} '/\.m4$/!d;s/.m4//;s/\(.*\)/\1 \1/;s/_/:/;s/^./\U&\E/;s/:./\U&\E/'
+ls -1 pinning/hardware/ | sort -fd | ${SED} '/\.m4$/!d;s/.m4//;s/\(.*\)/\1 \1/;s/_/:/;s/^./\U&\E/;s/:./\U&\E/'
 
diff --git a/scripts/profiles/Jackalope b/scripts/profiles/Jackalope
@@ -273,6 +273,7 @@ PORTIO_SCHEME=PORTIO_SIMPLE
 PORTIO_SIMPLE=y
 # PORTIO_FULL_FEATURED is not set
 PORTIO_SIMPLE_SUPPORT=y
+# PORTIO_SUPPORT is not set
 NAMED_PIN_SUPPORT=y
 # conrad_probot is not set
 # default is not set

diff --git a/scripts/profiles/JeeLinkv2 b/scripts/profiles/JeeLinkv2
@@ -277,6 +277,7 @@ PORTIO_SCHEME=PORTIO_SIMPLE
 PORTIO_SIMPLE=y
 # PORTIO_FULL_FEATURED is not set
 PORTIO_SIMPLE_SUPPORT=y
+# PORTIO_SUPPORT is not set
 # NAMED_PIN_SUPPORT is not set
 # TTY_SUPPORT is not set
 TTY_COLS=16

diff --git a/scripts/profiles/USBrfm12stick b/scripts/profiles/USBrfm12stick
@@ -277,6 +277,8 @@ PORTIO_SCHEME=CONFIG_IO_NONE
 CONFIG_IO_NONE=y
 # PORTIO_SIMPLE is not set
 # PORTIO_FULL_FEATURED is not set
+# PORTIO_SIMPLE_SUPPORT is not set
+# PORTIO_SUPPORT is not set
 # NAMED_PIN_SUPPORT is not set
 # TTY_SUPPORT is not set
 TTY_COLS=16

diff --git a/scripts/profiles/alpengluehn b/scripts/profiles/alpengluehn
@@ -267,6 +267,7 @@ PORTIO_SCHEME=PORTIO_SIMPLE
 PORTIO_SIMPLE=y
 # PORTIO_FULL_FEATURED is not set
 PORTIO_SIMPLE_SUPPORT=y
+# PORTIO_SUPPORT is not set
 # NAMED_PIN_SUPPORT is not set
 # TTY_SUPPORT is not set
 TTY_COLS=16

diff --git a/scripts/profiles/antares_I b/scripts/profiles/antares_I
@@ -270,6 +270,8 @@ PORTIO_SCHEME=CONFIG_IO_NONE
 CONFIG_IO_NONE=y
 # PORTIO_SIMPLE is not set
 # PORTIO_FULL_FEATURED is not set
+# PORTIO_SIMPLE_SUPPORT is not set
+# PORTIO_SUPPORT is not set
 # NAMED_PIN_SUPPORT is not set
 # TTY_SUPPORT is not set
 TTY_COLS=16

diff --git a/scripts/profiles/antares_IO b/scripts/profiles/antares_IO
@@ -268,6 +268,7 @@ PORTIO_SCHEME=CONFIG_IO_NONE
 CONFIG_IO_NONE=y
 # PORTIO_SIMPLE is not set
 # PORTIO_FULL_FEATURED is not set
+# PORTIO_SIMPLE_SUPPORT is not set
 # NAMED_PIN_SUPPORT is not set
 # TTY_SUPPORT is not set
 TTY_COLS=16

diff --git a/scripts/profiles/antares_O b/scripts/profiles/antares_O
@@ -270,6 +270,7 @@ PORTIO_SCHEME=CONFIG_IO_NONE
 CONFIG_IO_NONE=y
 # PORTIO_SIMPLE is not set
 # PORTIO_FULL_FEATURED is not set
+# PORTIO_SIMPLE_SUPPORT is not set
 # NAMED_PIN_SUPPORT is not set
 # TTY_SUPPORT is not set
 TTY_COLS=16

diff --git a/scripts/profiles/arduino_duemilanove b/scripts/profiles/arduino_duemilanove
@@ -273,6 +273,7 @@ PORTIO_SCHEME=PORTIO_SIMPLE
 PORTIO_SIMPLE=y
 # PORTIO_FULL_FEATURED is not set
 PORTIO_SIMPLE_SUPPORT=y
+# PORTIO_SUPPORT is not set
 # NAMED_PIN_SUPPORT is not set
 # TTY_SUPPORT is not set
 TTY_COLS=16

diff --git a/scripts/profiles/beteigeuze b/scripts/profiles/beteigeuze
@@ -273,6 +273,8 @@ PORTIO_SCHEME=CONFIG_IO_NONE
 CONFIG_IO_NONE=y
 # PORTIO_SIMPLE is not set
 # PORTIO_FULL_FEATURED is not set
+# PORTIO_SIMPLE_SUPPORT is not set
+# PORTIO_SUPPORT is not set
 # NAMED_PIN_SUPPORT is not set
 # TTY_SUPPORT is not set
 TTY_COLS=16

diff --git a/scripts/profiles/bootloader b/scripts/profiles/bootloader
@@ -259,6 +259,8 @@ PORTIO_SCHEME=CONFIG_IO_NONE
 CONFIG_IO_NONE=y
 # PORTIO_SIMPLE is not set
 # PORTIO_FULL_FEATURED is not set
+# PORTIO_SIMPLE_SUPPORT is not set
+# PORTIO_SUPPORT is not set
 # NAMED_PIN_SUPPORT is not set
 # TTY_SUPPORT is not set
 TTY_COLS=16

diff --git a/scripts/profiles/defconfig b/scripts/profiles/defconfig
@@ -267,6 +267,7 @@ PORTIO_SCHEME=PORTIO_SIMPLE
 PORTIO_SIMPLE=y
 # PORTIO_FULL_FEATURED is not set
 PORTIO_SIMPLE_SUPPORT=y
+# PORTIO_SUPPORT is not set
 # NAMED_PIN_SUPPORT is not set
 # TTY_SUPPORT is not set
 TTY_COLS=16

diff --git a/scripts/profiles/ehaserl b/scripts/profiles/ehaserl
@@ -277,6 +277,7 @@ PORTIO_SCHEME=PORTIO_SIMPLE
 PORTIO_SIMPLE=y
 # PORTIO_FULL_FEATURED is not set
 PORTIO_SIMPLE_SUPPORT=y
+# PORTIO_SUPPORT is not set
 # NAMED_PIN_SUPPORT is not set
 # TTY_SUPPORT is not set
 TTY_COLS=16

diff --git a/scripts/profiles/ethersex b/scripts/profiles/ethersex
@@ -263,6 +263,7 @@ PORTIO_SCHEME=PORTIO_SIMPLE
 PORTIO_SIMPLE=y
 # PORTIO_FULL_FEATURED is not set
 PORTIO_SIMPLE_SUPPORT=y
+# PORTIO_SUPPORT is not set
 # NAMED_PIN_SUPPORT is not set
 # TTY_SUPPORT is not set
 TTY_COLS=16

diff --git a/scripts/profiles/fimser b/scripts/profiles/fimser
@@ -268,6 +268,7 @@ PORTIO_SCHEME=PORTIO_SIMPLE
 PORTIO_SIMPLE=y
 # PORTIO_FULL_FEATURED is not set
 PORTIO_SIMPLE_SUPPORT=y
+# PORTIO_SUPPORT is not set
 # NAMED_PIN_SUPPORT is not set
 # TTY_SUPPORT is not set
 TTY_COLS=16

diff --git a/scripts/profiles/fnordlicht_servo b/scripts/profiles/fnordlicht_servo
@@ -268,6 +268,7 @@ PORTIO_SCHEME=PORTIO_SIMPLE
 PORTIO_SIMPLE=y
 # PORTIO_FULL_FEATURED is not set
 PORTIO_SIMPLE_SUPPORT=y
+# PORTIO_SUPPORT is not set
 # NAMED_PIN_SUPPORT is not set
 # TTY_SUPPORT is not set
 TTY_COLS=16

diff --git a/scripts/profiles/hr20 b/scripts/profiles/hr20
@@ -276,6 +276,8 @@ PORTIO_SCHEME=CONFIG_IO_NONE
 CONFIG_IO_NONE=y
 # PORTIO_SIMPLE is not set
 # PORTIO_FULL_FEATURED is not set
+# PORTIO_SIMPLE_SUPPORT is not set
+# PORTIO_SUPPORT is not set
 # NAMED_PIN_SUPPORT is not set
 # TTY_SUPPORT is not set
 TTY_COLS=16

diff --git a/scripts/profiles/lome6 b/scripts/profiles/lome6
@@ -278,6 +278,7 @@ PORTIO_SCHEME=PORTIO_SIMPLE
 PORTIO_SIMPLE=y
 # PORTIO_FULL_FEATURED is not set
 PORTIO_SIMPLE_SUPPORT=y
+# PORTIO_SUPPORT is not set
 # NAMED_PIN_SUPPORT is not set
 TTY_SUPPORT=y
 TTY_COLS=16

diff --git a/scripts/profiles/netio b/scripts/profiles/netio
@@ -267,6 +267,7 @@ PORTIO_SCHEME=PORTIO_SIMPLE
 PORTIO_SIMPLE=y
 # PORTIO_FULL_FEATURED is not set
 PORTIO_SIMPLE_SUPPORT=y
+# PORTIO_SUPPORT is not set
 # NAMED_PIN_SUPPORT is not set
 # TTY_SUPPORT is not set
 TTY_COLS=16

diff --git a/scripts/profiles/netio_addon b/scripts/profiles/netio_addon
@@ -266,6 +266,7 @@ PORTIO_SCHEME=PORTIO_SIMPLE
 PORTIO_SIMPLE=y
 # PORTIO_FULL_FEATURED is not set
 PORTIO_SIMPLE_SUPPORT=y
+# PORTIO_SUPPORT is not set
 # NAMED_PIN_SUPPORT is not set
 # TTY_SUPPORT is not set
 TTY_COLS=16

diff --git a/scripts/profiles/no-network b/scripts/profiles/no-network
@@ -273,6 +273,7 @@ PORTIO_SCHEME=PORTIO_SIMPLE
 PORTIO_SIMPLE=y
 # PORTIO_FULL_FEATURED is not set
 PORTIO_SIMPLE_SUPPORT=y
+# PORTIO_SUPPORT is not set
 # NAMED_PIN_SUPPORT is not set
 # TTY_SUPPORT is not set
 TTY_COLS=16

diff --git a/scripts/profiles/probot b/scripts/profiles/probot
@@ -267,6 +267,7 @@ CONF_OPENVPN_PORT=1194
 # PORTIO_SIMPLE is not set
 PORTIO_SCHEME=PORTIO_FULL_FEATURED
 PORTIO_FULL_FEATURED=y
+# PORTIO_SIMPLE_SUPPORT is not set
 PORTIO_SUPPORT=y
 NAMED_PIN_SUPPORT=y
 _NP_CONFIG=conrad_probot

diff --git a/scripts/profiles/radig b/scripts/profiles/radig
@@ -272,6 +272,7 @@ PORTIO_SCHEME=PORTIO_SIMPLE
 PORTIO_SIMPLE=y
 # PORTIO_FULL_FEATURED is not set
 PORTIO_SIMPLE_SUPPORT=y
+# PORTIO_SUPPORT is not set
 # NAMED_PIN_SUPPORT is not set
 # TTY_SUPPORT is not set
 TTY_COLS=16

diff --git a/scripts/profiles/rfm12-teensy b/scripts/profiles/rfm12-teensy
@@ -266,6 +266,7 @@ PORTIO_SCHEME=PORTIO_SIMPLE
 PORTIO_SIMPLE=y
 # PORTIO_FULL_FEATURED is not set
 PORTIO_SIMPLE_SUPPORT=y
+# PORTIO_SUPPORT is not set
 # NAMED_PIN_SUPPORT is not set
 # TTY_SUPPORT is not set
 TTY_COLS=16

diff --git a/scripts/profiles/usb-rfm12-dongle b/scripts/profiles/usb-rfm12-dongle
@@ -277,6 +277,7 @@ PORTIO_SCHEME=PORTIO_SIMPLE
 PORTIO_SIMPLE=y
 # PORTIO_FULL_FEATURED is not set
 PORTIO_SIMPLE_SUPPORT=y
+# PORTIO_SUPPORT is not set
 # NAMED_PIN_SUPPORT is not set
 # TTY_SUPPORT is not set
 TTY_COLS=16

diff --git a/scripts/profiles/usb-teensy b/scripts/profiles/usb-teensy
@@ -277,6 +277,7 @@ PORTIO_SCHEME=PORTIO_SIMPLE
 PORTIO_SIMPLE=y
 # PORTIO_FULL_FEATURED is not set
 PORTIO_SIMPLE_SUPPORT=y
+# PORTIO_SUPPORT is not set
 # NAMED_PIN_SUPPORT is not set
 # TTY_SUPPORT is not set
 TTY_COLS=16

diff --git a/scripts/profiles/zbus-teensy b/scripts/profiles/zbus-teensy
@@ -273,6 +273,7 @@ PORTIO_SCHEME=PORTIO_SIMPLE
 PORTIO_SIMPLE=y
 # PORTIO_FULL_FEATURED is not set
 PORTIO_SIMPLE_SUPPORT=y
+# PORTIO_SUPPORT is not set
 # NAMED_PIN_SUPPORT is not set
 # TTY_SUPPORT is not set
 TTY_COLS=16