Merge branch 'development' of https://github.com/mmguero-dev/Malcolm …

…into v24.02.0_merge_idaholab
idaholab · Feb 15, 2024 · 1f2f020 · 1f2f020
2 parents a43b538 + 9b227b4
commit 1f2f020
Show file tree

Hide file tree

Showing 3 changed files with 9 additions and 9 deletions.
diff --git a/docker-compose-dev.yml b/docker-compose-dev.yml
@@ -341,7 +341,7 @@ services:
       # NET_ADMIN and NET_RAW - to turn on promiscuous mode and capture raw packets
       - NET_ADMIN
       - NET_RAW
-      # SYS_NICE - to set process nice values, real-timescheduling policies, I/O scheduling
+      # SYS_NICE - to set process nice values, real-time scheduling policies, I/O scheduling
       - SYS_NICE
     env_file:
       - ./config/process.env

diff --git a/sensor-iso/arkime/build-arkime-deb.sh b/sensor-iso/arkime/build-arkime-deb.sh
@@ -35,8 +35,7 @@ make install
 
 cp -r ./capture/plugins/lua/samples "$ARKIME_DIR"/lua
 
-npm install license-checker
-release/notice.txt.pl $ARKIME_DIR NOTICE release/CAPTURENOTICE > $ARKIME_DIR/NOTICE.txt
+cat NOTICE release/CAPTURENOTICE > $ARKIME_DIR/NOTICE.txt
 
 ETC_FILES=$(shopt -s nullglob dotglob; echo /arkime-etc/*)
 if (( ${#ETC_FILES} )) ; then

diff --git a/sensor-raspi/sensor_install.sh b/sensor-raspi/sensor_install.sh
@@ -77,25 +77,26 @@ build_arkime_src(){
     mkdir -p "${WORK_DIR}/arkime" && cd "$_"
     git clone --recurse-submodules --branch="v${arkime_ver}" "$arkime_repo" ./
 
-    # I'm getting "Client network socket disconnected before secure TLS connection was established" when building Arkime,
-    #   and this workaround seems to address it (see https://github.com/npm/cli/issues/4652)
-    for FILE in $(grep -rIcH 'npm ci' ./ | grep -v ':0$' | cut -d: -f 1); do sed -i "s/npm ci/npm ci --maxsockets 1/g" "$FILE"; done
-
     for patch_file in /opt/patches/*.patch; do
         patch -p 1 -r - --no-backup-if-mismatch < $patch_file || true
     done
 
     export PATH="${arkime_dir}/bin:${WORK_DIR}/arkime/node_modules/.bin:${PATH}"
 
+    # I'm getting "Client network socket disconnected before secure TLS connection was established" when building Arkime,
+    #   and this workaround seems to address it (see https://github.com/npm/cli/issues/4652)
+    for FILE in $(grep -rIcH 'npm ci' ./ | grep -v ':0$' | cut -d: -f 1); do sed -i "s/npm ci/npm ci --maxsockets 1/g" "$FILE"; done
+
+    # configure the number of build threads
     sed -i "s/MAKE=make/MAKE='make -j${build_jobs}'/" easybutton-build.sh
+
     ./easybutton-build.sh --dir "$arkime_dir"
 
     make install -j${build_jobs}
 
     cp -r ./capture/plugins/lua/samples "${arkime_dir}"/lua
 
-    npm install license-checker
-    release/notice.txt.pl "${arkime_dir}/" NOTICE release/CAPTURENOTICE > "${arkime_dir}/NOTICE.txt"
+    cat NOTICE release/CAPTURENOTICE > "${arkime_dir}/NOTICE.txt"
 
     rm -f $arkime_dir/etc/*.systemd.service