From 5353a4766f5ef99a1cbb612ace06b8c792551fe9 Mon Sep 17 00:00:00 2001 From: Stefan Saraev Date: Wed, 5 Feb 2014 21:20:13 +0200 Subject: [PATCH] network support should not be optional --- projects/ATV/options | 3 --- projects/Cuboxi/options | 3 --- projects/Generic/options | 3 --- projects/RPi/options | 3 --- projects/Virtual/options | 3 --- scripts/image | 4 +--- 6 files changed, 1 insertion(+), 18 deletions(-) diff --git a/projects/ATV/options b/projects/ATV/options index 5aa6909067..74c668b18d 100644 --- a/projects/ATV/options +++ b/projects/ATV/options @@ -166,9 +166,6 @@ # e.g. ADDITIONAL_DRIVERS="DRIVER1 DRIVER2" ADDITIONAL_DRIVERS="RTL8192CU RTL8188EU dvbhdhomerun bcm_sta" -# build with network support (yes / no) - NETWORK="yes" - # build and install bluetooth support (yes / no) BLUETOOTH_SUPPORT="yes" diff --git a/projects/Cuboxi/options b/projects/Cuboxi/options index 5610f351bd..95138a8541 100644 --- a/projects/Cuboxi/options +++ b/projects/Cuboxi/options @@ -168,9 +168,6 @@ # ADDITIONAL_DRIVERS="RTL8192CU RTL8188EU dvbhdhomerun" ADDITIONAL_DRIVERS="RTL8188EU" -# build with network support (yes / no) - NETWORK="yes" - # build and install bluetooth support (yes / no) BLUETOOTH_SUPPORT="no" diff --git a/projects/Generic/options b/projects/Generic/options index 219dbfd1ae..96887abbbe 100644 --- a/projects/Generic/options +++ b/projects/Generic/options @@ -166,9 +166,6 @@ # e.g. ADDITIONAL_DRIVERS="DRIVER1 DRIVER2" ADDITIONAL_DRIVERS="RTL8192CU RTL8188EU dvbhdhomerun" -# build with network support (yes / no) - NETWORK="yes" - # build and install bluetooth support (yes / no) BLUETOOTH_SUPPORT="yes" diff --git a/projects/RPi/options b/projects/RPi/options index fdc6d0a04c..d615acadfc 100644 --- a/projects/RPi/options +++ b/projects/RPi/options @@ -167,9 +167,6 @@ # e.g. ADDITIONAL_DRIVERS="DRIVER1 DRIVER2" ADDITIONAL_DRIVERS="RTL8192CU RTL8188EU dvbhdhomerun" -# build with network support (yes / no) - NETWORK="yes" - # build and install bluetooth support (yes / no) BLUETOOTH_SUPPORT="yes" diff --git a/projects/Virtual/options b/projects/Virtual/options index 9d2b5d7167..709a8a56ea 100644 --- a/projects/Virtual/options +++ b/projects/Virtual/options @@ -161,9 +161,6 @@ # e.g. ADDITIONAL_DRIVERS="DRIVER1 DRIVER2" ADDITIONAL_DRIVERS="vboxguest dvbhdhomerun" -# build with network support (yes / no) - NETWORK="yes" - # build and install bluetooth support (yes / no) BLUETOOTH_SUPPORT="yes" diff --git a/scripts/image b/scripts/image index 41a15f33ec..a013a5236b 100755 --- a/scripts/image +++ b/scripts/image @@ -114,9 +114,7 @@ IMAGE_NAME="$DISTRONAME-$TARGET_VERSION" $SCRIPTS/install busybox $SCRIPTS/install util-linux $SCRIPTS/install corefonts - -# Network support - [ "$NETWORK" = "yes" ] && $SCRIPTS/install network + $SCRIPTS/install network # Graphic support [ ! "$DISPLAYSERVER" = "no" ] && $SCRIPTS/install $DISPLAYSERVER