thinkpad-x13s: bump to steev's 6.7.y; enable noble userspace; bump alsa-ucm-conf hack to master

This commit is contained in:
Ricardo Pardini 2024-01-27 20:48:56 +01:00 committed by Igor
parent 5e1b3ca392
commit 4c3361a6fa

View File

@ -28,16 +28,16 @@ enable_extension "grub-with-dtb" # important, puts the whole DTB han
declare -g BOARD_FIRMWARE_INSTALL="-full"
# The 6.4 branch is incompatible with x13s Concept's alsa-ucm-conf package, so keep it at 6.3.y for now. @TODO what about 6.6
function post_family_config_branch_sc8280xp__steevs_66y_kernel() {
declare -g KERNEL_MAJOR_MINOR="6.6" # Major and minor versions of this kernel.
declare -g KERNELBRANCH='branch:lenovo-x13s-linux-6.6.y'
function post_family_config_branch_sc8280xp__steevs_67y_kernel() {
declare -g KERNEL_MAJOR_MINOR="6.7" # Major and minor versions of this kernel.
declare -g KERNELBRANCH='branch:lenovo-x13s-linux-6.7.y'
declare -g KERNELSOURCE='https://github.com/steev/linux.git'
declare -g LINUXCONFIG="linux-${ARCH}-${BRANCH}" # for this board: linux-arm64-sc8280xp
display_alert "Set up steev's kernel ${KERNELBRANCH} for" "${BOARD}" "info"
}
function x13s_is_userspace_supported() {
[[ "${RELEASE}" == "trixie" || "${RELEASE}" == "sid" || "${RELEASE}" == "mantic" ]] && return 0
[[ "${RELEASE}" == "trixie" || "${RELEASE}" == "sid" || "${RELEASE}" == "mantic" || "${RELEASE}" == "noble" ]] && return 0
return 1
}
@ -81,10 +81,10 @@ function pre_customize_image__x13s_debian_ucm_hack_via_patch() {
return 0
fi
display_alert "Fixing alsa-ucm-conf for ${BOARD}" "${RELEASE}///${BOARD}" "info"
display_alert "Fixing alsa-ucm-conf for ${BOARD}" "${RELEASE}///${BOARD}" "warn"
(
cd "${SDCARD}/usr/share/alsa"
curl -L "https://github.com/Srinivas-Kandagatla/alsa-ucm-conf/archive/refs/heads/x13s-volume-fixes.tar.gz" | tar xzf - --strip-components=1
curl -L "https://github.com/alsa-project/alsa-ucm-conf/archive/refs/heads/master.tar.gz" | tar xvzf - --strip-components=1
)
chroot_sdcard "apt-mark hold alsa-ucm-conf"