skip raspi deps/config if not on raspi platform

scripts/pi-setup/install-pi-dependencies.sh

@@ -23,6 +23,16 @@ source "$SCRIPT_DIR/utils.sh"
 
 print_start_of_script
 
+if ! is_running_on_raspberry_pi; then
+    if is_running_in_wsl; then
+        print_script_step "Skipping Raspberry Pi dependencies (running in WSL)"
+    else
+        print_script_step "Skipping Raspberry Pi dependencies (not running on Raspberry Pi)"
+    fi
+    print_end_of_script
+    exit 0
+fi
+
 print_script_step "Silence user prompts about reboot and service restart required (script will prompt user to reboot in the end)"
 sudo sed -i "s/#\$nrconf{kernelhints} = -1;/\$nrconf{kernelhints} = -1;/g" /etc/needrestart/needrestart.conf
 sudo sed -i "s/#\$nrconf{restart} = 'i';/\$nrconf{restart} = 'a';/" /etc/needrestart/needrestart.conf

scripts/ubuntu/2-machine-cofiguration.sh

@@ -33,10 +33,11 @@ sudo groupadd docker
 sudo usermod -a -G docker $USER
 sudo service docker restart
 
-# Setup Wifi
-print_script_step "Create System Service for wpa_suppliant"
-printf "\n Writing: /etc/systemd/system/dbus-fi.w1.wpa_supplicant1.service"
-cat << EOF | sudo tee /etc/systemd/system/dbus-fi.w1.wpa_supplicant1.service
+# Setup Wifi (Raspberry Pi only)
+if is_running_on_raspberry_pi; then
+    print_script_step "Create System Service for wpa_suppliant"
+    printf "\n Writing: /etc/systemd/system/dbus-fi.w1.wpa_supplicant1.service"
+    cat << EOF | sudo tee /etc/systemd/system/dbus-fi.w1.wpa_supplicant1.service
 [Unit]
 Description=WPA supplicant
 Before=network.target
@@ -53,30 +54,42 @@ ExecStart=/sbin/wpa_supplicant -u -s -i $WLAN_INTERFACE -c /etc/wpa_supplicant/w
 WantedBy=multi-user.target
 Alias=dbus-fi.w1.wpa_supplicant1.service
 EOF
-sudo systemctl daemon-reload
-sudo systemctl enable dbus-fi.w1.wpa_supplicant1
-
-WPA_SUPPLICANT_FILE=/etc/wpa_supplicant/wpa_supplicant.conf
-WPA_SUPPLICANT_SETTINGS=(
-    "ctrl_interface=DIR=/run/wpa_supplicant"
-    "update_config=1"
-)
-printf "\n Updating: $WPA_SUPPLICANT_FILE\n"
-sudo touch "$WPA_SUPPLICANT_FILE"
-for setting in ${WPA_SUPPLICANT_SETTINGS[@]}; do
-    echo "  setting: $setting"
-    grep -qxF "$setting" "$WPA_SUPPLICANT_FILE" || echo "$setting" | sudo tee -a "$WPA_SUPPLICANT_FILE"
-done
+    sudo systemctl daemon-reload
+    sudo systemctl enable dbus-fi.w1.wpa_supplicant1
+
+    WPA_SUPPLICANT_FILE=/etc/wpa_supplicant/wpa_supplicant.conf
+    WPA_SUPPLICANT_SETTINGS=(
+        "ctrl_interface=DIR=/run/wpa_supplicant"
+        "update_config=1"
+    )
+    printf "\n Updating: $WPA_SUPPLICANT_FILE\n"
+    sudo touch "$WPA_SUPPLICANT_FILE"
+    for setting in ${WPA_SUPPLICANT_SETTINGS[@]}; do
+        echo "  setting: $setting"
+        grep -qxF "$setting" "$WPA_SUPPLICANT_FILE" || echo "$setting" | sudo tee -a "$WPA_SUPPLICANT_FILE"
+    done
+elif is_running_in_wsl; then
+    print_script_step "Skipping WiFi configuration (running in WSL)"
+else
+    print_script_step "Skipping WiFi configuration (not running on Raspberry Pi)"
+fi
 
 # Setup Network
 print_script_step "Accept Router Advertisements on network interfaces"
 SYSCTL_FILE=/etc/sysctl.conf
 SYSCTL_SETTINGS=(
     "net.ipv6.conf.eth0.accept_ra=2"
     "net.ipv6.conf.eth0.accept_ra_rt_info_max_plen=64"
-    "net.ipv6.conf.$WLAN_INTERFACE.accept_ra=2"
-    "net.ipv6.conf.$WLAN_INTERFACE.accept_ra_rt_info_max_plen=64"
 )
+
+# WLAN sysctl settings are only relevant on Raspberry Pi
+if is_running_on_raspberry_pi; then
+    SYSCTL_SETTINGS+=(
+        "net.ipv6.conf.$WLAN_INTERFACE.accept_ra=2"
+        "net.ipv6.conf.$WLAN_INTERFACE.accept_ra_rt_info_max_plen=64"
+    )
+fi
+
 printf "\n Updating: $SYSCTL_FILE\n"
 sudo touch "$SYSCTL_FILE"
 for setting in ${SYSCTL_SETTINGS[@]}; do

scripts/ubuntu/internal-auto-install.sh

@@ -47,11 +47,49 @@ print_end_of_script
 
 print_installation_success
 
-print_script_step "You need to reboot to finish setup"
-printf "Do you want to reboot now? (Press 1 to reboot now)\n"
-select yn in "Yes" "No"; do
-    case $yn in
-        Yes ) sudo reboot; break;;
-        No ) exit;;
-    esac
-done
+if is_running_in_wsl; then
+    print_script_step "Applying configuration changes (WSL - no reboot needed)"
+
+    echo "Applying sysctl settings..."
+    sudo sysctl -p
+
+    echo "Loading ip6table_filter kernel module..."
+    sudo modprobe ip6table_filter 2>/dev/null || echo "  (module not available in WSL kernel - this is OK)"
+
+    echo "Refreshing docker group membership..."
+    newgrp docker << END
+    echo "  Docker group active"
+END
+
+    SDK_DOCKER_TAG=$(cat $ROOT_DIR/backend/test_collections/matter/config.py | grep SDK_DOCKER_TAG | cut -d'"' -f 2 | cut -d"'" -f 2)
+
+    echo ""
+    echo "********************************************************************************"
+    echo "Setup complete."
+    echo ""
+    echo "REMINDER: Sample apps were not installed for your architecture."
+    echo "You can build them manually from the Matter SDK source"
+    echo "(commit: $SDK_DOCKER_TAG) and copy the resulting binaries to ~/apps/"
+    echo ""
+    echo "  cd ~/connectedhomeip"
+    echo "  git checkout $SDK_DOCKER_TAG"
+    echo "  git submodule update --init --recursive"
+    echo "  . scripts/bootstrap.sh"
+    echo "  . scripts/activate.sh"
+    echo "  ./scripts/build/build_examples.py --target linux-x64-all-clusters build"
+    echo "  cp out/linux-x64-all-clusters/chip-all-clusters-app ~/apps/"
+    echo ""
+    echo "To start the Test Harness, run:"
+    echo "  cd $ROOT_DIR && ./scripts/start.sh"
+    echo "********************************************************************************"
+    echo ""
+else
+    print_script_step "You need to reboot to finish setup"
+    printf "Do you want to reboot now? (Press 1 to reboot now)\n"
+    select yn in "Yes" "No"; do
+        case $yn in
+            Yes ) sudo reboot; break;;
+            No ) exit;;
+        esac
+    done
+fi

scripts/utils.sh

@@ -112,3 +112,14 @@ check_installation_prerequisites()
         exit 1
     fi
 }
+
+is_running_on_raspberry_pi()
+{
+    [ -f /sys/firmware/devicetree/base/model ] && \
+        grep -qi "raspberry pi" /sys/firmware/devicetree/base/model 2>/dev/null
+}
+
+is_running_in_wsl()
+{
+    grep -qi microsoft /proc/version 2>/dev/null
+}