Merge branch 'main' of https://github.com/evercam/ex_nvr_system_rpi5 …

…into main
evercam · Jan 22, 2025 · dd9f678 · dd9f678
2 parents 1ce5230 + f9b1267
commit dd9f678
Show file tree

Hide file tree

Showing 5 changed files with 10 additions and 5 deletions.
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
@@ -1,6 +1,9 @@
 name: CI
 
-on: [push]
+on:
+  push:
+    tags:
+      - 'v*' 
 
 env:
   OTP_VERSION: 27.1.2

diff --git a/busybox_defconfig b/busybox_defconfig
@@ -666,8 +666,8 @@ CONFIG_FEATURE_DMESG_PRETTY=y
 # CONFIG_MORE is not set
 CONFIG_MOUNT=y
 # CONFIG_FEATURE_MOUNT_FAKE is not set
-# CONFIG_FEATURE_MOUNT_VERBOSE is not set
-# CONFIG_FEATURE_MOUNT_HELPERS is not set
+CONFIG_FEATURE_MOUNT_VERBOSE=y
+CONFIG_FEATURE_MOUNT_HELPERS=y
 CONFIG_FEATURE_MOUNT_LABEL=y
 # CONFIG_FEATURE_MOUNT_NFS is not set
 # CONFIG_FEATURE_MOUNT_CIFS is not set

diff --git a/linux-6.6.defconfig b/linux-6.6.defconfig
@@ -4,7 +4,7 @@ CONFIG_SYSVIPC=y
 CONFIG_POSIX_MQUEUE=y
 CONFIG_NO_HZ=y
 CONFIG_HIGH_RES_TIMERS=y
-CONFIG_PREEMPT_RT=y
+CONFIG_PREEMPT=y
 CONFIG_MEMCG=y
 CONFIG_BLK_CGROUP=y
 CONFIG_CFS_BANDWIDTH=y
@@ -36,7 +36,6 @@ CONFIG_CP15_BARRIER_EMULATION=y
 CONFIG_SETEND_EMULATION=y
 CONFIG_RANDOMIZE_BASE=y
 CONFIG_CMDLINE="console=ttyAMA0,115200 kgdboc=ttyAMA0,115200 root=/dev/mmcblk0p2 rootfstype=ext4 rootwait"
-# CONFIG_EFI is not set
 # CONFIG_SUSPEND is not set
 CONFIG_PM=y
 CONFIG_PM_DEBUG=y

diff --git a/mix.exs b/mix.exs
@@ -100,6 +100,7 @@ defmodule ExNVRSystemRpi5.MixProject do
 
   defp package_files do
     [
+      "busybox_defconfig",
       "fwup_include",
       "rootfs_overlay",
       "CHANGELOG.md",

diff --git a/nerves_defconfig b/nerves_defconfig
@@ -48,6 +48,7 @@ BR2_PACKAGE_FFMPEG_GPL=y
 BR2_PACKAGE_FFMPEG_NONFREE=y
 BR2_PACKAGE_FFMPEG_FFPROBE=y
 BR2_PACKAGE_FFMPEG_SWSCALE=y
+BR2_PACKAGE_E2FSPROGS=y
 BR2_PACKAGE_F2FS_TOOLS=y
 BR2_PACKAGE_MESA3D=y
 BR2_PACKAGE_MESA3D_GALLIUM_DRIVER_V3D=y
@@ -82,6 +83,7 @@ BR2_PACKAGE_WPA_SUPPLICANT_WPS=y
 BR2_PACKAGE_WPA_SUPPLICANT_WPA3=y
 BR2_PACKAGE_WPA_SUPPLICANT_CTRL_IFACE=y
 BR2_PACKAGE_UTIL_LINUX_BINARIES=y
+BR2_PACKAGE_UTIL_LINUX_MOUNT=y
 # BR2_TARGET_ROOTFS_TAR is not set
 BR2_PACKAGE_HOST_KMOD_XZ=y
 BR2_NERVES_SYSTEM_NAME="nerves_system_rpi5"