From 3f7be8037dbe7aeb8dd948f8a218d651782640d2 Mon Sep 17 00:00:00 2001 From: Stefan Hansson Date: Sun, 11 Aug 2024 17:03:52 +0200 Subject: [PATCH] linux-purism-librem5: set CONFIG_LOGO=n (MR 5482) Otherwise we get penguins when the device first boots up. While I have nothing against Tux, this is a change that came as a result of the configuration being restarted to sync with Purism's configuration, and I think it visually clutters the boot sequence for no good reason. As such, disable this and return to the previous behaviour. [ci:skip-build]: already built successfully in CI --- device/main/linux-purism-librem5/APKBUILD | 4 ++-- .../linux-purism-librem5/config-purism-librem5.aarch64 | 10 +++------- 2 files changed, 5 insertions(+), 9 deletions(-) diff --git a/device/main/linux-purism-librem5/APKBUILD b/device/main/linux-purism-librem5/APKBUILD index 9fe921f80..a4cccdb73 100644 --- a/device/main/linux-purism-librem5/APKBUILD +++ b/device/main/linux-purism-librem5/APKBUILD @@ -4,7 +4,7 @@ # Contributor: Clayton Craft pkgname=linux-purism-librem5 pkgver=6.6.40 -pkgrel=1 +pkgrel=2 # NOTE: Don't forget to rebase the config! See prepare() for instructions. _purismrel=2 # . @@ -90,5 +90,5 @@ package() { sha512sums=" b16f6d040024d826d4ac7a33ad23137fafbf1ac7ac8adeef3fd80a80dc308b70cf572de6e4a451eb607b1d18ad58c03493108c7a1ff9b26fa2bd03a475002903 linux-purism-librem5-6.6.40pureos2.tar.gz -2982f5950820153cef5167b2cfebff7310b682266fda67fa370cebb8b6a93877f331a0f0877b127fc5ad186a72c9e6ed8b181ceeb6eb9ce74a56a4e9e4805ad2 config-purism-librem5.aarch64 +8039685a22032bc5dcda9b2abfb16aac3bb5a5f416e66e39178a593dfef15a1526b3d513b3c4120332dc1b1b1f72e0a97f7303c495fe3a648067842b51911868 config-purism-librem5.aarch64 " diff --git a/device/main/linux-purism-librem5/config-purism-librem5.aarch64 b/device/main/linux-purism-librem5/config-purism-librem5.aarch64 index 3cd18eae2..1b6556a69 100644 --- a/device/main/linux-purism-librem5/config-purism-librem5.aarch64 +++ b/device/main/linux-purism-librem5/config-purism-librem5.aarch64 @@ -2,9 +2,9 @@ # Automatically generated file; DO NOT EDIT. # Linux/arm64 6.6.40 Kernel Configuration # -CONFIG_CC_VERSION_TEXT="aarch64-alpine-linux-musl-gcc (Alpine 13.2.1_git20240309) 13.2.1 20240309" +CONFIG_CC_VERSION_TEXT="aarch64-alpine-linux-musl-gcc (Alpine 14.2.0) 14.2.0" CONFIG_CC_IS_GCC=y -CONFIG_GCC_VERSION=130201 +CONFIG_GCC_VERSION=140200 CONFIG_CLANG_VERSION=0 CONFIG_AS_IS_GNU=y CONFIG_AS_VERSION=24200 @@ -13,7 +13,6 @@ CONFIG_LD_VERSION=24200 CONFIG_LLD_VERSION=0 CONFIG_CC_HAS_ASM_GOTO_OUTPUT=y CONFIG_CC_HAS_ASM_GOTO_TIED_OUTPUT=y -CONFIG_GCC_ASM_GOTO_OUTPUT_WORKAROUND=y CONFIG_CC_HAS_ASM_INLINE=y CONFIG_CC_HAS_NO_PROFILE_FN_ATTR=y CONFIG_PAHOLE_VERSION=0 @@ -4769,10 +4768,7 @@ CONFIG_FRAMEBUFFER_CONSOLE_DETECT_PRIMARY=y # CONFIG_FRAMEBUFFER_CONSOLE_DEFERRED_TAKEOVER is not set # end of Console display driver support -CONFIG_LOGO=y -# CONFIG_LOGO_LINUX_MONO is not set -# CONFIG_LOGO_LINUX_VGA16 is not set -CONFIG_LOGO_LINUX_CLUT224=y +# CONFIG_LOGO is not set # end of Graphics support # CONFIG_DRM_ACCEL is not set