Revert "Merge CSA V1.4 branch in our release_2.6-1.4 (#549)"

This reverts commit dc2a1c6.

Author: jmartinez-silabs

.clang-tidy

@@ -46,7 +46,6 @@ Checks: >
   -clang-analyzer-security.insecureAPI.rand,
   -clang-analyzer-security.insecureAPI.strcpy,
   -clang-analyzer-unix.Malloc,
-  -clang-analyzer-webkit.NoUncountedMemberChecker,
   -clang-diagnostic-implicit-int-conversion,
   -clang-diagnostic-missing-template-arg-list-after-template-kw
 WarningsAsErrors: '*'

.devcontainer/Dockerfile

@@ -22,7 +22,7 @@ LABEL org.opencontainers.image.source https://github.com/project-chip/connectedh
 ARG USERNAME=vscode
 ARG USER_UID=1000
 ARG USER_GID=$USER_UID
-ENV LANG=en_US.utf8
+ENV LANG en_US.utf8
 
 
 # These are installed for terminal/dev convenience. If more tooling for build is required, please
@@ -37,14 +37,9 @@ RUN apt-get update \
     valgrind \
     docker.io \
     iputils-ping \
-    icecc \
     && :
 
-RUN (getent passwd $USER_UID && userdel -f $(getent passwd $USER_UID | cut -d: -f1) || true) \
-    && (getent group $USER_GID && groupdel -f $(getent group $USER_GID | cut -d: -f1) || true) \
-    && (getent passwd $USERNAME && userdel -f $USERNAME || true) \
-    && (getent group $USERNAME && groupdel -f $USERNAME || true) \
-    && groupadd -g $USER_GID $USERNAME \
+RUN groupadd -g $USER_GID $USERNAME \
     && useradd --no-log-init -s /bin/bash -u $USER_UID -g $USER_GID -G docker,sudo -m $USERNAME \
     && echo $USERNAME ALL=\(root\) NOPASSWD:ALL > /etc/sudoers.d/$USERNAME \
     && chmod 0440 /etc/sudoers.d/$USERNAME \
@@ -54,20 +49,25 @@ RUN curl https://raw.githubusercontent.com/restyled-io/restyler/master/bin/resty
     && chmod +x /usr/local/bin/restyle-path \
     && :
 
-RUN mkdir -p /opt/android/sdk \
+RUN mkdir -p /opt/sdk/sdks/ \
     && chown -R $USERNAME:$USERNAME \
+    /opt/sdk/sdks/ `# NXP uses a patch_sdk script to change SDK files` \
     $ANDROID_HOME \
     $IDF_TOOLS_PATH \
-    && find $AMEBA_PATH \
-    -name "inc_lp" -print0      -or \
-    -name "inc_hp" -print0      -or \
-    -name "project_lp" -print0  -or \
-    -name "project_hp" -print0 \
-    | xargs -0 -I {} sh -c 'chown -R $USERNAME:$USERNAME {}; chmod -R +w {}' \
-    && find $ANDROID_HOME/cmdline-tools/ -type d -name bin | xargs chmod -R +x `# sdkmanager for accepting licenses` \
+    && find $AMEBA_PATH -name "inc_lp" -print0 | xargs -0 chown -R $USERNAME:$USERNAME \
+    && find $AMEBA_PATH -name "inc_hp" -print0 | xargs -0 chown -R $USERNAME:$USERNAME \
+    && find $AMEBA_PATH -name "project_lp" -print0 | xargs -0 chown -R $USERNAME:$USERNAME \
+    && find $AMEBA_PATH -name "project_hp" -print0 | xargs -0 chown -R $USERNAME:$USERNAME \
+    && chmod -R +x \
+    $ANDROID_HOME/tools/bin `# sdkmanager for accepting licenses`\
     && chmod -R +w \
     $IDF_TOOLS_PATH \
-    && git config --global --add safe.directory "*" `# Safe directory is preferred over chown.` \
+    && find $AMEBA_PATH -name "inc_lp" -print0 | xargs -0 chmod -R +w \
+    && find $AMEBA_PATH -name "inc_hp" -print0 | xargs -0 chmod -R +w \
+    && find $AMEBA_PATH -name "project_lp" -print0 | xargs -0 chmod -R +w \
+    && find $AMEBA_PATH -name "project_hp" -print0 | xargs -0 chmod -R +w \
+    # Safe directory is preffered over chown.
+    && git config --global --add safe.directory "*" \
     && :
 
 # Fix Tizen SDK paths for new user
@@ -76,17 +76,7 @@ RUN sed -i '/^TIZEN_SDK_DATA_PATH/d' $TIZEN_SDK_ROOT/sdk.info \
     && ln -sf /home/$USERNAME/.tizen-cli-config $TIZEN_SDK_ROOT/tools/.tizen-cli-config \
     && : # last line
 
-ENV TIZEN_ROOTFS=/tizen_rootfs
+ENV TIZEN_ROOTFS /tizen_rootfs
 
 # Fast Model GDB plugins path for debugging support
-ENV FAST_MODEL_PLUGINS_PATH=/opt/FastModelsPortfolio_11.16/plugins/Linux64_GCC-9.3
-
-# Set up ccache as a pigweed command launcher when using the scripts/build/build_examples.py
-# script. Also, set up icecc as the command prefix for ccache. Such setup allows to benefit
-# from compilation caching and distributed compilation at the same time.
-#
-# NOTE: In order to use distributed compilation with icecc, one should run
-#       "scripts/icecc.sh start" before starting the build.
-ENV CHIP_PW_COMMAND_LAUNCHER=ccache
-ENV CCACHE_PREFIX=icecc
-ENV PATH=/usr/lib/ccache:$PATH
+ENV FAST_MODEL_PLUGINS_PATH /opt/FastModelsPortfolio_11.16/plugins/Linux64_GCC-9.3

.devcontainer/build.sh

@@ -18,7 +18,7 @@
 
 HERE="$(dirname "$0")"
 CHIP_ROOT="$(realpath "$HERE"/..)"
-BUILD_VERSION=$(sed 's/ .*//' "$CHIP_ROOT/integrations/docker/images/base/chip-build/version")
+BUILD_VERSION="latest"
 IMAGE_TAG="matter-dev-environment:local"
 USER_UID=$UID
 
@@ -32,7 +32,7 @@ Options:
     -h,--help        Show this help
     -t,--tag         Image tag - default is matter-dev-environment:local
     -u,--uid         User UIDa - default is the current user ID
-    -v,--version     Build version - default is the version of the base chip-build docker image
+    -v,--version     Build version - default is the latest
 EOF
 }
 

.devcontainer/devcontainer.json

@@ -1,26 +1,20 @@
 {
     "name": "CHIP Ubuntu Development Environment",
     "runArgs": [
+        "--cap-add=SYS_PTRACE",
+        "--security-opt",
+        "seccomp=unconfined",
         "--network=host",
+        "--privileged",
+        "-v",
+        "/dev/bus/usb:/dev/bus/usb:ro",
         "--device-cgroup-rule=a 189:* rmw",
         "--add-host=host.docker.internal:host-gateway"
     ],
-    "privileged": true,
-    "capAdd": ["SYS_PTRACE"],
-    "securityOpt": ["seccomp=unconfined"],
     "mounts": [
-        {
-            "source": "/var/run/docker.sock",
-            "target": "/var/run/docker.sock",
-            "type": "bind"
-        },
-        {
-            "source": "/dev/bus/usb",
-            "target": "/dev/bus/usb",
-            "type": "bind"
-        }
+        "source=/var/run/docker.sock,target=/var/run/docker.sock,type=bind"
     ],
-    "initializeCommand": "bash .devcontainer/build.sh",
+    "initializeCommand": "bash .devcontainer/build.sh --tag matter-dev-environment:local --version 74",
     "image": "matter-dev-environment:local",
     "remoteUser": "vscode",
     "containerEnv": {