Merge branch 'qualcomm-linux:main' into feature/add_packages_openssh_server

Author: vemana1niranjan

.github/workflows/lava-test.yml

@@ -92,7 +92,7 @@ jobs:
 
       - name: Submit ${{ matrix.target }}
         timeout-minutes: 240
-        uses: foundriesio/lava-action@v11
+        uses: foundriesio/lava-action@v12
         with:
           lava_token: ${{ secrets.LAVATOKEN }}
           lava_url: 'lava.infra.foundries.io'

debos-recipes/overlays/backports/etc/apt/preferences.d/debian-backports.pref

@@ -1,6 +1,6 @@
 # for binary packages built from these source packages, score the version from
 # Debian backports higher as to get hardware enabled or better hardware support
 
-Package: src:alsa-ucm-conf:any src:firmware-free:any src:firmware-nonfree:any src:linux:any src:linux-signed-arm64:any src:mesa:any src:u-boot-efi-dtb
+Package: src:alsa-ucm-conf:any src:fastrpc src:firmware-free:any src:firmware-nonfree:any src:hexagon-dsp-binaries src:linux:any src:linux-signed-arm64:any src:mesa:any src:u-boot-efi-dtb
 Pin: release n=trixie-backports
 Pin-Priority: 900

debos-recipes/qualcomm-linux-debian-flash.yaml

@@ -372,7 +372,7 @@ actions:
           rm -rf "${flash_dir}"
           mkdir -v "${flash_dir}"
           # copy platform partition files
-          cp --preserve=all --no-dereference -v \
+          cp --preserve=mode,timestamps -v \
               "build/ptool/${platform}"/* "${flash_dir}"
 
           # remove BLANK_GPT, WIPE_PARTITIONS and wipe_rawprogram files as
@@ -402,18 +402,18 @@ actions:
                   -or -name '*.fv' \
                   -or -name '*.mbn' \
               \) \
-              -exec cp --preserve=all --no-dereference -v '{}' "${flash_dir}" \;
+              -exec cp --preserve=mode,timestamps -v '{}' "${flash_dir}" \;
 
           if [ -n "${board_u_boot_file}" ]; then
               # copy U-Boot binary to boot.img; qcom-ptool partitions.conf
               # files use filename=boot.img for boot_a and boot_b partitions
-              cp --preserve=all --no-dereference -v \
+              cp --preserve=mode,timestamps -v \
                   "${ARTIFACTDIR}/${board_u_boot_file}" "${flash_dir}/boot.img"
           fi
 
           if [ -n "$board_cdt_filename" ]; then
               # copy just the CDT data; no partition or flashing files
-              cp --preserve=all --no-dereference -v \
+              cp --preserve=mode,timestamps -v \
                   "build/${board_name}_cdt/${board_cdt_filename}" \
                   "${flash_dir}"
           fi
@@ -446,13 +446,14 @@ actions:
           [ -f "${contents_xml}" ] || continue
           spinor_dir_name="$(basename "${spinor_dir}")"
           board="${spinor_dir_name#flash_}"; board="${board%_spinor}"
-          xmlstarlet sel -t -m "//product_info/chipid" -v "@storage_type" -n "${contents_xml}" | \
-              tr '[:upper:]' '[:lower:]' | sort -u | \
+          # extract storage types to variable to avoid silent pipeline failure
+          storage_types=$(xmlstarlet sel -t -m "//product_info/chipid" -v "@storage_type" -n "${contents_xml}")
+          echo "$storage_types" | tr '[:upper:]' '[:lower:]' | sort -u | \
               while read -r storage; do
                   [ "${storage}" = "spinor" ] && continue
                   target_dir="${ARTIFACTDIR}/flash_${board}_${storage}"
                   [ -d "${target_dir}" ] || continue
-                  cp --preserve=all --no-dereference -av "${spinor_dir}/." "${target_dir}/spinor/"
+                  cp --preserve=mode,timestamps -av "${spinor_dir}/." "${target_dir}/spinor/"
                   efi_img=$("${RECIPEDIR}/../scripts/get-rawprogram-filename.py" efi "${target_dir}/rawprogram0.xml")
                   rootfs_img=$("${RECIPEDIR}/../scripts/get-rawprogram-filename.py" rootfs "${target_dir}/rawprogram0.xml")
                   # fix file_path (../->../../) then rename efi.bin/rootfs.img

debos-recipes/qualcomm-linux-debian-image.yaml

@@ -108,8 +108,9 @@ actions:
       # when building under debos, /sys/firmware/efi is not always present, so
       # the u-boot-efi-dtb postinst doesn't install an initial copy of the
       # DTBs; do this once here
-      latest_kernel="$(
-          linux-version list | linux-version sort --reverse | head -1)"
+      # extract kernel list to variable to avoid silent pipeline failure
+      kernel_list=$(linux-version list)
+      latest_kernel=$(echo "$kernel_list" | linux-version sort --reverse | head -1)
       dtb_path="/usr/lib/linux-image-${latest_kernel}"
       cp -LRT "$dtb_path" "/boot/efi/dtb"
 
@@ -147,8 +148,9 @@ actions:
       set -eux
       sector_size="{{if eq $imagetype "ufs"}}4096{{else}}512{{end}}"
       image="{{ $image }}"
-      fdisk -b "${sector_size}" -l "${image}" |
-          sed -n '1,/^Device/ d; p' |
+      # extract fdisk output to variable to avoid silent pipeline failure
+      fdisk_output=$(fdisk -b "${sector_size}" -l "${image}")
+      echo "$fdisk_output" | sed -n '1,/^Device/ d; p' |
           while read name start end sectors rest; do
               dd if="${image}" of="${ARTIFACTDIR}/${name}" \
                   bs="${sector_size}" skip="${start}" count="${sectors}"

debos-recipes/qualcomm-linux-debian-rootfs.yaml

@@ -388,8 +388,9 @@ actions:
       # this image has pulled a more recent kernel, it's probably to gain
       # support for new hardware which would happen through new or updated dtbs
       # only in that new kernel, so use the latest dtbs
-      latest_kernel="$(
-          ls -d "$ROOTDIR"/usr/lib/linux-image-* | sort -V | tail -1)"
+      # list kernel directories to avoid silent pipeline failure
+      kernel_dirs=$(ls -d "$ROOTDIR"/usr/lib/linux-image-*)
+      latest_kernel=$(echo "$kernel_dirs" | sort -V | tail -1)
       # transform pathnames to strip the leading ./
       tar \
           -C "${latest_kernel}" \

scripts/build-linux-deb.py

@@ -8,14 +8,25 @@
 from pathlib import Path
 
 # git repo/ref to use
-GIT_REPO = "https://github.com/torvalds/linux"
-GIT_REF = "master"
-LINUX_NEXT_GIT_REPO = (
-    "https://git.kernel.org/pub/scm/linux/kernel/git/next/linux-next.git"
-)
-LINUX_NEXT_GIT_REF = "master"
-QCOM_NEXT_GIT_REPO = "https://github.com/qualcomm-linux/kernel"
-QCOM_NEXT_GIT_REF = "qcom-next"
+
+GIT_UPSTREAM = {
+    "linux": {
+        "repo": "https://github.com/torvalds/linux",
+        "ref": "master",
+        "ref_prefix": None,
+    },
+    "linux-next": {
+        "repo": "https://git.kernel.org/pub/scm/linux/kernel/git/next/linux-next.git",  # noqa: E501
+        "ref": "master",
+        "ref_prefix": "next-",
+    },
+    "qcom-next": {
+        "repo": "https://github.com/qualcomm-linux/kernel",
+        "ref": "qcom-next",
+        "ref_prefix": "qcom-next-",
+    },
+}
+
 # base config to use
 BASE_CONFIG = "defconfig"
 # package set to build
@@ -144,16 +155,19 @@ def check_dependencies():
 
 
 def main():
+    DEFAULT_REPO = GIT_UPSTREAM["linux"]["repo"]
+    DEFAULT_REF = GIT_UPSTREAM["linux"]["ref"]
+
     parser = argparse.ArgumentParser(description="Build Linux Deb")
     parser.add_argument(
         "--repo",
-        default=GIT_REPO,
-        help=f"Git repository to clone (default: {GIT_REPO})",
+        default=DEFAULT_REPO,
+        help=f"Git repository to clone (default: {DEFAULT_REPO})",
     )
     parser.add_argument(
         "--ref",
-        default=GIT_REF,
-        help=f"Git ref (branch/tag) to checkout (default: {GIT_REF})",
+        default=DEFAULT_REF,
+        help=f"Git ref (branch/tag) to checkout (default: {DEFAULT_REF})",
     )
     parser.add_argument(
         "--linux-next",
@@ -187,19 +201,19 @@ def main():
     args.fragments = args.fragments + unknown
 
     # default settings for next trees
-    ref_prefix = None
+    git_upstream_key = None
     if args.linux_next:
-        if args.repo == GIT_REPO:
-            args.repo = LINUX_NEXT_GIT_REPO
-        if args.ref == GIT_REF:
-            args.ref = LINUX_NEXT_GIT_REF
-            ref_prefix = "next-"
+        git_upstream_key = "linux-next"
     elif args.qcom_next:
-        if args.repo == GIT_REPO:
-            args.repo = QCOM_NEXT_GIT_REPO
-        if args.ref == GIT_REF:
-            args.ref = QCOM_NEXT_GIT_REF
-            ref_prefix = "qcom-next-"
+        git_upstream_key = "qcom-next"
+
+    ref_prefix = GIT_UPSTREAM["linux"]["ref_prefix"]
+    if git_upstream_key is not None:
+        if args.repo == DEFAULT_REPO:
+            args.repo = GIT_UPSTREAM[git_upstream_key]["repo"]
+        if args.ref == DEFAULT_REF:
+            args.ref = GIT_UPSTREAM[git_upstream_key]["ref"]
+            ref_prefix = GIT_UPSTREAM[git_upstream_key]["ref_prefix"]
 
     if ref_prefix:
         found_tag = get_latest_dated_tag(args.repo, ref_prefix)

scripts/get-rawprogram-filename.py

@@ -2,8 +2,11 @@
 # Copyright (c) Qualcomm Technologies, Inc. and/or its subsidiaries.
 # SPDX-License-Identifier: BSD-3-Clause
 #
-# Print the filename attribute of a <program> element by label from a
-# rawprogram XML file generated by qcom-ptool.
+# Parse a rawprogram XML file generated by qcom-ptool. Search for first
+# <program> element with provided label. Print its filename attribute,
+# stripped of a leading "../" if present.
+#
+# Returns "none" if no such element found.
 #
 # Usage:  get-rawprogram-filename.py <label> <rawprogram0.xml>
 #
@@ -23,9 +26,8 @@
 root = ET.parse(xml_file).getroot()
 e = root.find(f".//program[@label='{label}']")
 if e is None:
-    print(f"error: no <program label='{label}'> found in {xml_file}",
-          file=sys.stderr)
-    sys.exit(1)
+    print("none")
+    sys.exit(0)
 
 filename = e.get("filename")
 # Strip any leading ../ path components