Skip to content

Commit 8ad0a48

Browse files
net: posix: fix hostname config conflict with unique updates
Decouple NET_HOSTNAME_MAX_LEN from NET_HOSTNAME_DYNAMIC to resolve Kconfig conflict when using POSIX networking with unique hostname updates. This restores functionality that worked in Zephyr 3.6. - Remove forced selection of NET_HOSTNAME_DYNAMIC from POSIX_NETWORKING - Make NET_HOSTNAME_MAX_LEN available independently - Add build assertions for hostname length validation - Update test configurations for new dependency structure Fixes #95811 Signed-off-by: Pragati Garg <[email protected]> Signed-off-by: PragatiGarg-eaton <[email protected]>
1 parent fa61e87 commit 8ad0a48

File tree

4,124 files changed

+130984
-30181
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

4,124 files changed

+130984
-30181
lines changed

.checkpatch.conf

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -29,3 +29,4 @@
2929
--ignore ENOSYS
3030
--ignore IS_ENABLED_CONFIG
3131
--ignore EXPORT_SYMBOL
32+
--ignore COMPARISON_TO_NULL

.editorconfig

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -86,6 +86,10 @@ indent_size = 8
8686
[COMMIT_EDITMSG]
8787
max_line_length = 75
8888

89+
# Patches
90+
[{*.patch,*.diff}]
91+
trim_trailing_whitespace = false
92+
8993
# Kconfig
9094
[Kconfig*]
9195
indent_style = tab

.github/workflows/compliance.yml

Lines changed: 19 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -60,6 +60,17 @@ jobs:
6060
west config manifest.group-filter -- +ci,-optional
6161
west update -o=--depth=1 -n 2>&1 1> west.update.log || west update -o=--depth=1 -n 2>&1 1> west.update2.log
6262
63+
- name: Setup Node.js
64+
uses: actions/setup-node@2028fbc5c25fe9cf00d9f06a71cc4710d4507903 # v6.0.0
65+
with:
66+
node-version: "lts/*"
67+
cache: npm
68+
check-latest: true
69+
cache-dependency-path: ./scripts/ci/package-lock.json
70+
71+
- name: Install Node dependencies
72+
run: npm --prefix ./scripts/ci ci
73+
6374
- name: Run Compliance Tests
6475
continue-on-error: true
6576
id: compliance
@@ -86,6 +97,14 @@ jobs:
8697
name: compliance.xml
8798
path: compliance.xml
8899

100+
- name: Upload dts linter patch
101+
uses: actions/upload-artifact@ea165f8d65b6e75b540449e92b4886f43607fa02 # v4.6.2
102+
continue-on-error: true
103+
if: hashFiles('dts_linter.patch') != ''
104+
with:
105+
name: dts_linter.patch
106+
path: dts_linter.patch
107+
89108
- name: check-warns
90109
run: |
91110
if [[ ! -s "compliance.xml" ]]; then

.github/workflows/doc-build.yml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -4,9 +4,9 @@
44
name: Documentation Build
55

66
on:
7-
schedule:
8-
- cron: '0 */3 * * *'
97
push:
8+
branches:
9+
- main
1010
tags:
1111
- v*
1212
pull_request:
@@ -61,7 +61,7 @@ jobs:
6161
container:
6262
image: ghcr.io/zephyrproject-rtos/ci-repo-cache:v0.28.6.20251003
6363
options: '--entrypoint /bin/bash'
64-
timeout-minutes: 20
64+
timeout-minutes: 60
6565
concurrency:
6666
group: doc-build-html-${{ github.ref }}
6767
cancel-in-progress: true

.github/workflows/twister.yaml

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -68,7 +68,6 @@ jobs:
6868
uses: zephyrproject-rtos/action-zephyr-setup@c125c5ebeeadbd727fa740b407f862734af1e52a # v1.0.9
6969
with:
7070
app-path: zephyr
71-
toolchains: all
7271
enable-ccache: false
7372

7473
- name: Environment Setup

.gitignore

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -76,6 +76,7 @@ target/
7676

7777
# CI output
7878
compliance.xml
79+
dts_linter.patch
7980
_error.types
8081

8182
# Tag files
@@ -94,6 +95,7 @@ BoardYml.txt
9495
Checkpatch.txt
9596
ClangFormat.txt
9697
DevicetreeBindings.txt
98+
DevicetreeLinting.txt
9799
GitDiffCheck.txt
98100
Gitlint.txt
99101
Identity.txt
@@ -118,3 +120,6 @@ TextEncoding.txt
118120
YAMLLint.txt
119121
ZephyrModuleFile.txt
120122
# zephyr-keep-sorted-stop
123+
124+
# Node dependecies
125+
node_modules

.ruff-excludes.toml

Lines changed: 9 additions & 94 deletions
Large diffs are not rendered by default.

CMakeLists.txt

Lines changed: 10 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -409,7 +409,7 @@ if(CONFIG_COMPILER_FREESTANDING)
409409
zephyr_compile_options($<$<COMPILE_LANGUAGE:ASM>:$<TARGET_PROPERTY:compiler,freestanding>>)
410410
endif()
411411

412-
if (CONFIG_PICOLIBC AND NOT CONFIG_PICOLIBC_IO_FLOAT)
412+
if(CONFIG_PICOLIBC AND NOT CONFIG_PICOLIBC_IO_FLOAT)
413413
# @Intent: Set compiler specific flag to disable printf-related optimizations
414414
zephyr_compile_options($<$<COMPILE_LANGUAGE:C>:$<TARGET_PROPERTY:compiler,no_printf_return_value>>)
415415
endif()
@@ -737,6 +737,10 @@ zephyr_get(KERNEL_VERSION_CUSTOMIZATION SYSBUILD LOCAL)
737737
set_property(TARGET version_h PROPERTY KERNEL_VERSION_CUSTOMIZATION ${KERNEL_VERSION_CUSTOMIZATION})
738738

739739
if(EXISTS ${APPLICATION_SOURCE_DIR}/VERSION)
740+
# A generator expression is used to allow applications to add their own dependencies for the
741+
# file version, this might typically be the git index file if the application is in a git
742+
# repository. To add a dependency to the application version file, this can be used:
743+
# set_property(TARGET app_version_h PROPERTY APP_VERSION_DEPENDS <FILE>)
740744
add_custom_command(
741745
OUTPUT ${PROJECT_BINARY_DIR}/include/generated/zephyr/app_version.h
742746
COMMAND ${CMAKE_COMMAND} -DZEPHYR_BASE=${ZEPHYR_BASE}
@@ -747,6 +751,7 @@ if(EXISTS ${APPLICATION_SOURCE_DIR}/VERSION)
747751
${build_version_argument}
748752
-P ${ZEPHYR_BASE}/cmake/gen_version_h.cmake
749753
DEPENDS ${APPLICATION_SOURCE_DIR}/VERSION ${git_dependency}
754+
$<TARGET_PROPERTY:app_version_h,APP_VERSION_DEPENDS>
750755
COMMAND_EXPAND_LISTS
751756
)
752757
add_custom_target(
@@ -1157,7 +1162,7 @@ endif()
11571162

11581163
get_property(OUTPUT_FORMAT GLOBAL PROPERTY PROPERTY_OUTPUT_FORMAT)
11591164

1160-
if (CONFIG_CODE_DATA_RELOCATION)
1165+
if(CONFIG_CODE_DATA_RELOCATION)
11611166
set(CODE_RELOCATION_DEP code_relocation_source_lib)
11621167
endif() # CONFIG_CODE_DATA_RELOCATION
11631168

@@ -2134,7 +2139,7 @@ if(CONFIG_BUILD_OUTPUT_INFO_HEADER)
21342139
)
21352140
endif()
21362141

2137-
if (CONFIG_LLEXT AND CONFIG_LLEXT_EXPORT_BUILTINS_BY_SLID)
2142+
if(CONFIG_LLEXT AND CONFIG_LLEXT_EXPORT_BUILTINS_BY_SLID)
21382143
#slidgen must be the first post-build command to be executed
21392144
#on the Zephyr ELF to ensure that all other commands, such as
21402145
#binary file generation, are operating on a preparated ELF.
@@ -2200,7 +2205,7 @@ if(signing_script)
22002205
endif()
22012206

22022207
# Generate USB-C VIF policies in XML format
2203-
if (CONFIG_BUILD_OUTPUT_VIF)
2208+
if(CONFIG_BUILD_OUTPUT_VIF)
22042209
include(${CMAKE_CURRENT_LIST_DIR}/cmake/vif.cmake)
22052210
endif()
22062211

@@ -2251,7 +2256,7 @@ if(LOG_DICT_DB_NAME_ARG)
22512256
--build-header ${PROJECT_BINARY_DIR}/include/generated/zephyr/version.h
22522257
)
22532258

2254-
if (NOT CONFIG_LOG_DICTIONARY_DB_TARGET)
2259+
if(NOT CONFIG_LOG_DICTIONARY_DB_TARGET)
22552260
# If not using a separate target for generating logging dictionary
22562261
# database, add the generation to post build command to make sure
22572262
# the database is actually being generated.

MAINTAINERS.yml

Lines changed: 27 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -337,6 +337,7 @@ Arduino Platforms:
337337
- boards/arduino/
338338
- boards/shields/arduino_*/
339339
- drivers/*/*modulino*
340+
- dts/vendor/arduino/
340341

341342
Base OS:
342343
status: maintained
@@ -761,6 +762,8 @@ Build system:
761762
- scripts/schemas/soc-schema.yaml
762763
- scripts/list_shields.py
763764
- scripts/snippets.py
765+
files-exclude:
766+
- doc/build/dts/
764767
labels:
765768
- "area: Build System"
766769
tests:
@@ -855,8 +858,6 @@ CPU Frequency Scaling:
855858
- seankyer
856859
files:
857860
- include/zephyr/cpu_freq/
858-
- include/zephyr/cpu_load/
859-
- subsys/cpu_load/
860861
- subsys/cpu_freq/
861862
- dts/bindings/p_state/
862863
labels:
@@ -1275,6 +1276,7 @@ Documentation Infrastructure:
12751276
- martinjaeger
12761277
- str4t0m
12771278
files:
1279+
- boards/shields/canis_canpico/
12781280
- boards/shields/mcp2515/
12791281
- boards/shields/tcan4550evm/
12801282
- doc/connectivity/canbus/
@@ -1756,6 +1758,8 @@ Documentation Infrastructure:
17561758
status: maintained
17571759
maintainers:
17581760
- rriveramcrus
1761+
collaborators:
1762+
- Liam-Ogletree
17591763
files:
17601764
- drivers/haptics/
17611765
- dts/bindings/haptics/
@@ -3047,9 +3051,10 @@ JSON Web Token:
30473051
- libraries.encoding.jwt
30483052

30493053
Kconfig:
3050-
status: odd fixes
3051-
collaborators:
3054+
status: maintained
3055+
maintainers:
30523056
- tejlmand
3057+
collaborators:
30533058
- nashif
30543059
files:
30553060
- scripts/kconfig/
@@ -4305,6 +4310,11 @@ Realtek EC Platforms:
43054310
status: maintained
43064311
maintainers:
43074312
- JasonLin-RealTek
4313+
collaborators:
4314+
- elmo9999
4315+
- benson0715
4316+
- JhanBoChao-Realtek
4317+
- Titan-Realtek
43084318
files:
43094319
- boards/realtek/
43104320
- drivers/*/*rts5912*
@@ -4485,10 +4495,10 @@ STM32 Platforms:
44854495
- FRASTM
44864496
- gautierg-st
44874497
- GeorgeCGV
4488-
- marwaiehm-st
44894498
- mathieuchopstm
44904499
- djiatsaf-st
44914500
- etienne-lms
4501+
- juickar
44924502
files:
44934503
- boards/st/
44944504
- drivers/*/*stm32*.c
@@ -4674,6 +4684,7 @@ SiFli SF32LB Platforms:
46744684
- gmarull
46754685
collaborators:
46764686
- cameled
4687+
- ck-telecom
46774688
files:
46784689
- boards/sifli/
46794690
- drivers/*/*sf32lb*
@@ -4738,6 +4749,7 @@ State machine framework:
47384749
collaborators:
47394750
- keith-zephyr
47404751
- glenn-andrews
4752+
- vlad-kulikov
47414753
files:
47424754
- doc/services/smf/
47434755
- include/zephyr/smf.h
@@ -4881,10 +4893,13 @@ TI SimpleLink Platforms:
48814893
status: maintained
48824894
maintainers:
48834895
- vaishnavachath
4896+
collaborators:
4897+
- bogdanovs
48844898
files:
48854899
- boards/ti/cc*/
48864900
- boards/ti/msp*/
48874901
- drivers/*/*cc13*
4902+
- drivers/*/*cc23*
48884903
- drivers/*/*cc25*
48894904
- drivers/*/*cc26*
48904905
- drivers/*/*cc32*
@@ -5711,10 +5726,12 @@ West:
57115726
collaborators:
57125727
- FRASTM
57135728
- gautierg-st
5714-
- marwaiehm-st
5729+
- etienne-lms
5730+
- mathieuchopstm
5731+
- juickar
5732+
- djiatsaf-st
57155733
- asm5878
57165734
- HoZHel
5717-
- benothmn-st
57185735
files:
57195736
- modules/Kconfig.stm32
57205737
labels:
@@ -5813,6 +5830,7 @@ West:
58135830
collaborators:
58145831
- nashif
58155832
- inteljiangwe1
5833+
- dkalowsk
58165834
files: []
58175835
labels:
58185836
- "area: MCTP"
@@ -5939,7 +5957,7 @@ West:
59395957
- "area: Serialization"
59405958

59415959
"West project: net-tools":
5942-
status: odd fixes
5960+
status: maintained
59435961
maintainers:
59445962
- jukkar
59455963
collaborators:
@@ -6097,10 +6115,7 @@ West:
60976115
- thrift
60986116

60996117
"West project: trusted-firmware-a":
6100-
status: maintained
6101-
maintainers:
6102-
- povergoing
6103-
- sgrrzhf
6118+
status: odd fixes
61046119
collaborators:
61056120
- wearyzen
61066121
- ithinuel

VERSION

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
VERSION_MAJOR = 4
2-
VERSION_MINOR = 2
3-
PATCHLEVEL = 99
2+
VERSION_MINOR = 3
3+
PATCHLEVEL = 0
44
VERSION_TWEAK = 0
5-
EXTRAVERSION =
5+
EXTRAVERSION = rc3

0 commit comments

Comments
 (0)