Merge branch 'main' into AR-1886

armbian · Oct 11, 2023 · b2dd290 · b2dd290
2 parents eb25c9a + b7bc001
commit b2dd290
Show file tree

Hide file tree

Showing 9 changed files with 32 additions and 9 deletions.
diff --git a/.github/workflows/scorecard.yml b/.github/workflows/scorecard.yml
@@ -31,7 +31,7 @@ jobs:
           persist-credentials: false
 
       - name: "Run analysis"
-        uses: ossf/scorecard-action@v2.2.0
+        uses: ossf/scorecard-action@v2.3.0
         with:
           results_file: results.sarif
           results_format: sarif

diff --git a/config/boards/olimex-teres-a64.conf b/config/boards/olimex-teres-a64.conf
@@ -20,4 +20,4 @@ BOOTCONFIG="teres_i_defconfig"
 
 # NOTE(Krey): Pulseaudio is needed for the audio to work especially in pipewire configuration, I wasn't able to make it work just off of ALSA
 PACKAGE_LIST_BOARD="pulseaudio"
-CRUSTCONFIG="a64_defconfig"
+CRUSTCONFIG="teres_i_defconfig"
diff --git a/config/bootscripts/boot-meson-s4t7.cmd b/config/bootscripts/boot-meson-s4t7.cmd
@@ -9,6 +9,8 @@ setenv verbosity "1"
 setenv earlycon "off"
 setenv bootlogo "false"
 setenv earlyconuart "0xfe078000"
+setenv displaymode "1080p60hz"
+setenv force_16x9_display "false"
 
 if test "${board_name}" = "kvim1s"; then setenv earlyconuart "0xfe07a000"; fi
 
@@ -35,7 +37,21 @@ else
 	setenv consoleargs "splash=verbose ${consoleargs}"
 fi
 
-setenv displayargs "logo=${display_layer},loaded,${fb_addr} vout=${outputmode},${vout_init} panel_type=${panel_type} hdmitx=${cecconfig},${colorattribute} hdmimode=${hdmimode} hdmichecksum=${hdmichecksum} dolby_vision_on=${dolby_vision_on} hdr_policy=${hdr_policy} hdr_priority=${hdr_priority} frac_rate_policy=${frac_rate_policy} hdmi_read_edid=${hdmi_read_edid} cvbsmode=${cvbsmode} osd_reverse=${osd_reverse} video_reverse=${video_reverse}"
+if test -n "${hdmimode}" ; then
+	if test ${display_height} -ge 2160 ; then
+		setenv displaymode "2160p60hz"
+	elif test ${display_height} -ge 1080 ; then
+		setenv displaymode "1080p60hz"
+	else
+		setenv displaymode "720p60hz"
+	fi
+fi
+
+if test "${force_16x9_display}" = "true"; then
+	setenv hdmimode ${displaymode}
+fi
+
+setenv displayargs "logo=${display_layer},loaded,${fb_addr} vout=${hdmimode},${vout_init} panel_type=${panel_type} hdmitx=${cecconfig},${colorattribute} hdmimode=${hdmimode} hdmichecksum=${hdmichecksum} dolby_vision_on=${dolby_vision_on} hdr_policy=${hdr_policy} hdr_priority=${hdr_priority} frac_rate_policy=${frac_rate_policy} hdmi_read_edid=${hdmi_read_edid} cvbsmode=${cvbsmode} osd_reverse=${osd_reverse} video_reverse=${video_reverse}"
 
 setenv bootargs "root=${rootdev} rootwait rootfstype=${rootfstype} ${consoleargs} no_console_suspend ${displayargs} loglevel=${verbosity} mac=${eth_mac} khadas.serial=${usid} partition_type=generic ${extraargs} ${extraboardargs}"
 

diff --git a/config/sources/families/meson-s4t7.conf b/config/sources/families/meson-s4t7.conf
@@ -99,3 +99,10 @@ function post_family_tweaks_bsp__disable_uinitrd_generation() {
 function pre_update_initramfs__change_initrd_compression() {
 	run_host_command_logged sed -i 's/COMPRESS=.*/COMPRESS=xz/g' $MOUNT/etc/initramfs-tools/initramfs.conf
 }
+
+function image_specific_armbian_env_ready__force_16x9_display() {
+	if [[ ${BRANCH} == "legacy" ]]; then
+		display_alert "Forcing 16x9 display"
+		run_host_command_logged echo "force_16x9_display=true" >>${SDCARD}/boot/armbianEnv.txt
+	fi
+}
diff --git a/lib/functions/general/bat-cat.sh b/lib/functions/general/bat-cat.sh
@@ -54,7 +54,7 @@ function run_tool_batcat() {
 
 	declare BATCAT_FN="bat-v${BATCAT_VERSION}-${BATCAT_ARCH_OS}"
 	declare BATCAT_FN_TARXZ="${BATCAT_FN}.tar.gz"
-	declare DOWN_URL="https://github.com/sharkdp/bat/releases/download/v${BATCAT_VERSION}/${BATCAT_FN_TARXZ}"
+	declare DOWN_URL="${GITHUB_SOURCE:-"https://github.com"}/sharkdp/bat/releases/download/v${BATCAT_VERSION}/${BATCAT_FN_TARXZ}"
 	declare BATCAT_BIN="${DIR_BATCAT}/${BATCAT_FN}-bin"
 	declare ACTUAL_VERSION
 
@@ -116,7 +116,7 @@ function try_download_batcat_tooling() {
 	run_host_command_logged rm -rf "${BATCAT_BIN}.tar.gz"
 
 	# EXTRA: get more syntaxes for batcat. We need Debian syntax for CONTROL files, etc.
-	run_host_command_logged wget --no-verbose --progress=dot:giga -O "${DIR_BATCAT}/sublime-debian.tar.gz.tmp" "https://github.com/barnumbirr/sublime-debian/archive/refs/heads/master.tar.gz"
+	run_host_command_logged wget --no-verbose --progress=dot:giga -O "${DIR_BATCAT}/sublime-debian.tar.gz.tmp" "${GITHUB_SOURCE:-"https://github.com"}/barnumbirr/sublime-debian/archive/refs/heads/master.tar.gz"
 	run_host_command_logged mkdir -p "${DIR_BATCAT}/temp-debian-syntax"
 	run_host_command_logged tar -xzf "${DIR_BATCAT}/sublime-debian.tar.gz.tmp" -C "${DIR_BATCAT}/temp-debian-syntax" sublime-debian-master/Syntaxes
 

diff --git a/lib/functions/general/oci-oras.sh b/lib/functions/general/oci-oras.sh
@@ -55,7 +55,7 @@ function run_tool_oras() {
 
 	declare ORAS_FN="oras_${ORAS_VERSION}_${ORAS_OS}_${ORAS_ARCH}"
 	declare ORAS_FN_TARXZ="${ORAS_FN}.tar.gz"
-	declare DOWN_URL="https://github.com/oras-project/oras/releases/download/v${ORAS_VERSION}/${ORAS_FN_TARXZ}"
+	declare DOWN_URL="${GITHUB_SOURCE:-"https://github.com"}/oras-project/oras/releases/download/v${ORAS_VERSION}/${ORAS_FN_TARXZ}"
 	declare ORAS_BIN="${DIR_ORAS}/${ORAS_FN}"
 	declare ACTUAL_VERSION
 

diff --git a/lib/functions/general/shellcheck.sh b/lib/functions/general/shellcheck.sh
@@ -94,7 +94,7 @@ function run_tool_shellcheck() {
 
 	declare SHELLCHECK_FN="shellcheck-v${SHELLCHECK_VERSION}.${SHELLCHECK_OS}.${SHELLCHECK_ARCH}"
 	declare SHELLCHECK_FN_TARXZ="${SHELLCHECK_FN}.tar.xz"
-	declare DOWN_URL="https://github.com/koalaman/shellcheck/releases/download/v${SHELLCHECK_VERSION}/${SHELLCHECK_FN_TARXZ}"
+	declare DOWN_URL="${GITHUB_SOURCE:-"https://github.com"}/koalaman/shellcheck/releases/download/v${SHELLCHECK_VERSION}/${SHELLCHECK_FN_TARXZ}"
 	declare SHELLCHECK_BIN="${DIR_SHELLCHECK}/${SHELLCHECK_FN}"
 	declare ACTUAL_VERSION
 

diff --git a/lib/tools/shellcheck.sh b/lib/tools/shellcheck.sh
@@ -43,7 +43,7 @@ esac
 
 SHELLCHECK_FN="shellcheck-v${SHELLCHECK_VERSION}.${SHELLCHECK_OS}.${SHELLCHECK_ARCH}"
 SHELLCHECK_FN_TARXZ="${SHELLCHECK_FN}.tar.xz"
-DOWN_URL="https://github.com/koalaman/shellcheck/releases/download/v${SHELLCHECK_VERSION}/${SHELLCHECK_FN_TARXZ}"
+DOWN_URL="${GITHUB_SOURCE:-"https://github.com"}/koalaman/shellcheck/releases/download/v${SHELLCHECK_VERSION}/${SHELLCHECK_FN_TARXZ}"
 SHELLCHECK_BIN="${DIR_SHELLCHECK}/${SHELLCHECK_FN}"
 
 if [[ ! -f "${SHELLCHECK_BIN}" ]]; then

diff --git a/lib/tools/shellfmt.sh b/lib/tools/shellfmt.sh
@@ -38,7 +38,7 @@ case "$MACHINE" in
 esac
 
 SHELLFMT_FN="shfmt_v${SHELLFMT_VERSION}_${SHELLFMT_OS}_${SHELLFMT_ARCH}"
-DOWN_URL="https://github.com/mvdan/sh/releases/download/v${SHELLFMT_VERSION}/${SHELLFMT_FN}"
+DOWN_URL="${GITHUB_SOURCE:-"https://github.com"}/mvdan/sh/releases/download/v${SHELLFMT_VERSION}/${SHELLFMT_FN}"
 SHELLFMT_BIN="${DIR_SHELLFMT}/${SHELLFMT_FN}"
 
 echo "MACHINE: ${MACHINE}"