Merge branch 'master' into user/chorkin/dual_csi_upstream_no_aem

Author: chorkin

.readthedocs.yaml

@@ -3,7 +3,7 @@
 version: 2
 
 build:
-  os: ubuntu-22.04
+  os: ubuntu-24.04
   tools:
     python: "3"
   apt_packages:
@@ -16,8 +16,8 @@ build:
     post_install:
       - pip3 install lxml
     pre_build:
-      - meson .build -Ddocs=rst -Ddocs-build=true || cat .build/meson-logs/meson-log.txt
-      - ninja -C .build
+      - meson setup .build -Ddocs=rst -Ddocs-build=true || cat .build/meson-logs/meson-log.txt
+      - meson compile -C .build
 
 sphinx:
   configuration: .build/doc/conf.py

scripts/release.sh

@@ -132,6 +132,42 @@ if [ "$build_doc" = true ]; then
     git commit -s -m "doc: Regenerate all docs for $VERSION"
 fi
 
+declare -A maps
+maps=(
+    [src/libnvme.map]=LIBNVME
+    [src/libnvme-mi.map]=LIBNVME_MI
+)
+
+lib_ver="${ver//./_}"
+
+for map_file in "${!maps[@]}"
+do
+    lib_name=${maps[$map_file]}
+
+    if [ ! -f "${map_file}" ]; then
+       continue
+    fi
+
+    lib_unreleased="${lib_name}_UNRELEASED"
+
+    # Check if UNRELEASED has symbols
+    if ! awk -v lib_unreleased="$lib_unreleased" '
+        $0 ~ "^"lib_unreleased { in_section = 1; next }
+        in_section && $0 ~ /\}/ { exit }
+        in_section && $0 !~ /^[[:space:]]*($|\/|\/\*|\*|#)/ { found = 1; exit }
+        END { exit !found }
+    ' "${map_file}"; then
+        continue
+    fi
+
+    sed -i \
+        -e "s/^${lib_unreleased}\s*{/&\n};\n\n${lib_name}_${lib_ver} {/" \
+        "$map_file"
+
+    git add "${map_file}"
+    echo "${map_file} updated."
+done
+
 # update meson.build
 sed -i -e "0,/[ \t]version: /s/\([ \t]version: \).*/\1\'$ver\',/" meson.build
 if [[ -n "$libnvme_VERSION" ]] && [[ -f subprojects/libnvme.wrap ]]; then

src/libnvme-mi.map

@@ -1,4 +1,5 @@
-LIBNVME_MI_1_14 {
+# SPDX-License-Identifier: LGPL-2.1-or-later
+LIBNVME_MI_UNRELEASED {
 	global:
 		nvme_mi_set_csi;
 };

src/libnvme.map

@@ -1,4 +1,7 @@
 # SPDX-License-Identifier: LGPL-2.1-or-later
+LIBNVME_UNRELEASED {
+};
+
 LIBNVME_1.13 {
 	global:
 		nvme_subsystem_get_fw_rev;