| -rw-r--r-- | fixups/0012-arm64-dts-qcom-purwa-Microsoft-Surface-Pro-12in-add-camera-support.patch.sed | 1 | ||||
| -rw-r--r-- | kernel-surface.spec | 2 | ||||
| -rwxr-xr-x | make-sources.sh | 21 |
3 files changed, 24 insertions, 0 deletions
diff --git a/fixups/0012-arm64-dts-qcom-purwa-Microsoft-Surface-Pro-12in-add-camera-support.patch.sed b/fixups/0012-arm64-dts-qcom-purwa-Microsoft-Surface-Pro-12in-add-camera-support.patch.sed new file mode 100644 index 0000000..b0ea155 --- /dev/null +++ b/fixups/0012-arm64-dts-qcom-purwa-Microsoft-Surface-Pro-12in-add-camera-support.patch.sed @@ -0,0 +1 @@ +s/^@@ -753,6 +768,260 @@/@@ -753,6 +768,232 @@/ diff --git a/kernel-surface.spec b/kernel-surface.spec index 0818637..22aa947 100644 --- a/kernel-surface.spec +++ b/kernel-surface.spec @@ -252,6 +252,8 @@ fi * Fri Sep 18 2026 Saya Andy 7.3.0-rc3.1 - Update Linux kernel to 7.3-rc3 - Update Gentoo overlay from dbb15bd8 to 089d5857 (master) +- Repair malformed hunk header in the overlay's Surface Pro 12in camera DTS + patch via sed fixups * Fri Sep 18 2026 Saya Andy 7.2.6-1 - Update Linux kernel from 7.2.4 to 7.2.6 diff --git a/make-sources.sh b/make-sources.sh index 5c11ee2..aa1c13b 100755 --- a/make-sources.sh +++ b/make-sources.sh @@ -130,6 +130,27 @@ while read -r dir; do total=$((total + count)) done < "${order_file}" +# Repair known-bad overlay patches: fixups/<patch basename>.sed is applied to +# the staged copy of that patch. +shopt -s nullglob +for fixup in "${script_dir}"/fixups/*.sed; do + fixup_name=${fixup##*/} + target=${fixup_name%.sed} + staged=$(find "${staging}/patches" -type f -name "${target}" -print -quit) + if [[ -z ${staged} ]]; then + echo "ERROR: fixups/${fixup_name} matches no staged patch; delete it" >&2 + exit 1 + fi + sed -f "${fixup}" "${staged}" > "${staging}/.fixed.patch" + if cmp -s "${staged}" "${staging}/.fixed.patch"; then + echo "ERROR: fixups/${fixup_name} changed nothing (overlay patch repaired?); delete it" >&2 + exit 1 + fi + mv "${staging}/.fixed.patch" "${staged}" + echo " fixup applied: ${target}" +done +shopt -u nullglob + tarball="${output_dir}/kernel-surface-patches-${upstream_ver}-${patchset_ver}.tar.gz" # COPYFILE_DISABLE stops macOS tar from adding ._ AppleDouble members, which # would show up as bogus patch files in the spec's glob. |