From 05e4d908dfbac3444466263639ec6ac5f5d8f235 Mon Sep 17 00:00:00 2001
From: DevTekVE <devtekve@gmail.com>
Date: Fri, 17 Nov 2023 22:53:16 +0100
Subject: [PATCH 1/3] Enhance SConstruct by enabling arbitrary compiler flags
 (#30484)

* Update SConstruct allow no-inline

Allows disabling inline functions when compiling to help with the debugging process

* Update SConstruct

typos

* Update SConstruct
---
 SConstruct | 10 ++++++++++
 1 file changed, 10 insertions(+)

diff --git a/SConstruct b/SConstruct
index e72e344516..eb9cd737e2 100644
--- a/SConstruct
+++ b/SConstruct
@@ -37,6 +37,12 @@ AddOption('--clazy',
 AddOption('--compile_db',
           action='store_true',
           help='build clang compilation database')
+          
+AddOption('--ccflags',
+          action='store',
+          type='string',
+          default='',
+          help='pass arbitrary flags over the command line')
 
 AddOption('--snpe',
           action='store_true',
@@ -170,6 +176,10 @@ if arch != "Darwin":
 cflags += ['-DSWAGLOG="\\"common/swaglog.h\\""']
 cxxflags += ['-DSWAGLOG="\\"common/swaglog.h\\""']
 
+ccflags_option = GetOption('ccflags')
+if ccflags_option:
+  ccflags += ccflags_option.split(' ')
+
 env = Environment(
   ENV=lenv,
   CCFLAGS=[

From d3aad9ca4601ae0a448ed971c1cd151c7c1eb690 Mon Sep 17 00:00:00 2001
From: Adeeb Shihadeh <adeebshihadeh@gmail.com>
Date: Fri, 17 Nov 2023 15:29:52 -0800
Subject: [PATCH 2/3] esim is metered (#30486)

* esim is metered

* it's an enum

---------

Co-authored-by: Comma Device <device@comma.ai>
---
 release/files_common                   | 1 +
 system/hardware/tici/esim.nmconnection | 1 +
 2 files changed, 2 insertions(+)

diff --git a/release/files_common b/release/files_common
index a1a164bfbf..53720aa05a 100644
--- a/release/files_common
+++ b/release/files_common
@@ -214,6 +214,7 @@ system/hardware/tici/agnos.json
 system/hardware/tici/amplifier.py
 system/hardware/tici/updater
 system/hardware/tici/iwlist.py
+system/hardware/tici/esim.nmconnection
 system/hardware/pc/__init__.py
 system/hardware/pc/hardware.h
 system/hardware/pc/hardware.py
diff --git a/system/hardware/tici/esim.nmconnection b/system/hardware/tici/esim.nmconnection
index 302ed28ed6..74f6f8e82c 100644
--- a/system/hardware/tici/esim.nmconnection
+++ b/system/hardware/tici/esim.nmconnection
@@ -6,6 +6,7 @@ permissions=
 autoconnect=true
 autoconnect-retries=100
 autoconnect-priority=2
+metered=1
 
 [gsm]
 apn=

From fa353401f44751d88ffdc583449177451d726d63 Mon Sep 17 00:00:00 2001
From: Adeeb Shihadeh <adeebshihadeh@gmail.com>
Date: Fri, 17 Nov 2023 18:44:05 -0800
Subject: [PATCH 3/3] bump to 0.9.6

---
 RELEASES.md      | 3 +++
 common/version.h | 2 +-
 2 files changed, 4 insertions(+), 1 deletion(-)

diff --git a/RELEASES.md b/RELEASES.md
index 1cb6105680..4c12971c54 100644
--- a/RELEASES.md
+++ b/RELEASES.md
@@ -1,3 +1,6 @@
+Version 0.9.6 (2023-XX-XX)
+========================
+
 Version 0.9.5 (2023-11-17)
 ========================
 * New driving model
diff --git a/common/version.h b/common/version.h
index 946f6a1fec..787bc897d7 100644
--- a/common/version.h
+++ b/common/version.h
@@ -1 +1 @@
-#define COMMA_VERSION "0.9.5"
+#define COMMA_VERSION "0.9.6"