From 8ff17746432413753dadffd360e19191a2bf3a82 Mon Sep 17 00:00:00 2001 From: Natanael Copa Date: Wed, 7 Feb 2024 17:16:20 +0000 Subject: [PATCH] main/linux-lts: enable zstd compression of firmware ref https://gitlab.alpinelinux.org/alpine/aports/-/issues/15758 --- main/linux-lts/APKBUILD | 14 +++++++------- main/linux-lts/lts.aarch64.config | 3 +++ main/linux-lts/lts.armv7.config | 3 +++ main/linux-lts/lts.ppc64le.config | 3 +++ main/linux-lts/lts.s390x.config | 3 +++ main/linux-lts/lts.x86.config | 3 +++ main/linux-lts/lts.x86_64.config | 3 +++ 7 files changed, 25 insertions(+), 7 deletions(-) diff --git a/main/linux-lts/APKBUILD b/main/linux-lts/APKBUILD index 221a310325e..6930b662a7c 100644 --- a/main/linux-lts/APKBUILD +++ b/main/linux-lts/APKBUILD @@ -7,7 +7,7 @@ case $pkgver in *.*.*) _kernver=${pkgver%.*};; *.*) _kernver=$pkgver;; esac -pkgrel=0 +pkgrel=1 pkgdesc="Linux lts kernel" url="https://www.kernel.org" depends="initramfs-generator" @@ -344,12 +344,12 @@ sha512sums=" 75f232b6becee7d36d360ffaf2aaa837d13518f9ec620ca159bcb2a0e98eb18a77631406a9b44244ea0164a7ed59fad583823909681e9b894a012f9d13365b69 0003-kexec-add-kexec_load_disabled-boot-option.patch 2956050bb332411d00a285e9656618f2e34b631492bbc19bef54d83a6e91b8531f4e18830b9313cfe52fbf8a8ca6fb76cf55b3ddd146ca3b977046cf2fd10cad 0004-objtool-respect-AWK-setting.patch 4b16f15b47b5e5835b926126e39723f519290469517875cfb2d2b857a93ad1344f0d1ba4b255289e20f4da9c867647526b344f752981cee0a48c51577badac3f 0005-powerpc-config-defang-gcc-check-for-stack-protector-.patch -39f8932a62efb46c59516342752917affb87c69c8ab46bb286d881357684f361f60ad9c7861d52eeb8d105c3907619dd25c55ba4b46abda0688afe5c401f6eb2 lts.aarch64.config -6bec077be5d89334860ce6e5f2ad1f79101656ba0e8e8b9fa31365cb951c3c8c10ed82c7c92cb860e18b8d996f005e39826fde6efbe5d264edd249f6d8b4dfc9 lts.armv7.config -4d4a8f64eebdb9690bd9e9ed8e33b0f28424329448c176d0f8f4b08db4095708fc976624a11e037935bd864290e7b2b04f7bab92241d5cafacac2f78e3122a21 lts.x86.config -d792b0b606374ff6a09302fdd0c8d8fda3944c278018cd1162510613d1f306714654890875a4eda3da2fc2afe180e7e20cf825bcb942157efeb40a0fe0cfd4c2 lts.x86_64.config -bb5d193f9ea543603ab0854c6fc86a7c4fb5e1893c29cf175bdd8accd180fe13ad6a0566272a464b85b6e7a0a91ff60d3a9c22889aff0314a83987bd12ed34ad lts.ppc64le.config -e8a90a018aa6d83ba969cd369a4bad4316bf1d06113befe231fedafb36a5e765a34a98eb6dacd118b85a2051961bacecdeacb9eb7a10d821b9ce24d86d834bff lts.s390x.config +6ec9fb8682471125f4438e6e9758fdd65327baa2013ea71a9afaa64c2a2c19bc56d9e1f086a9becb3204c30388adf6c790ac54df3d82e3e6983d2f9c0f9d90ab lts.aarch64.config +0b97af6395644a7004716e54522eac2353a5679937b80b01aebdf6f8a89d2e68acaacf1d51e31b9d9f5d81f17e69cda2b6d1d2adac58fa92a6f8bdd20e412ddb lts.armv7.config +5c169099861f319bac2835163c621415b6e6fa8bce033d567f83a276a168554409c658e7f5f9ccdfe63e68e4e6fb0d0a8009a659bcdde6a07c8febc7861cb8a1 lts.x86.config +188247514177833fcdc5467ff727850584f5bd3c15748ee190f637bd68e5c95e14965f938fc8ab8f123f3b9e90cacab6e69d5aabfeb11dc518c85820c641c6ed lts.x86_64.config +2408be547df5e30a13507a42343bd20d70b5852926ac5387c9434dca354c9b1c812213a9fafb11b962cbdcd11059679f323ab961c8854df8bd2c952ed91cc642 lts.ppc64le.config +90df6cb377461f0ca368fc386a58b2396e1d6f86aa10e95d979abe3f4cf6316d4c65dc1b93f912ee5e9545ebfc20118dbaf10922efba7f026f95ee46f8eabdfb lts.s390x.config 41c684fa1a60d550d82b6a60b573b5d260d3e7dc61cc38dfd4f22d445f0723b7075ffa9a0f210d99e04db60933b15e2653ea232586a335751f02081b5364fdab virt.aarch64.config 4b98a383c0650acba705e6d308c61f9eb56a79034ea8c46f7512a50fe312cb5a1c7690df62ffaa1cc89f233beac0f3206f35fde54df88e1c83f70c0cbcfea937 virt.armv7.config a6d1be15ef851f576a13708631fec3728cfaa42ecdcab6849163ae5ea0b3ace5c8632d72aa4652c762d8799d57edfd2f559f479224b1e19ec96a777124a90cba virt.ppc64le.config diff --git a/main/linux-lts/lts.aarch64.config b/main/linux-lts/lts.aarch64.config index 2932956302f..5a0ed12df04 100644 --- a/main/linux-lts/lts.aarch64.config +++ b/main/linux-lts/lts.aarch64.config @@ -630,6 +630,9 @@ CONFIG_DEVTMPFS=y CONFIG_DEVTMPFS_MOUNT=y CONFIG_DEVTMPFS_SAFE=y # CONFIG_PREVENT_FIRMWARE_BUILD is not set +CONFIG_FW_LOADER_COMPRESS=y +# CONFIG_FW_LOADER_COMPRESS_XZ is not set +CONFIG_FW_LOADER_COMPRESS_ZSTD=y # CONFIG_ALLOW_DEV_COREDUMP is not set CONFIG_DEBUG_DEVRES=y CONFIG_HISILICON_LPC=y diff --git a/main/linux-lts/lts.armv7.config b/main/linux-lts/lts.armv7.config index 4da03eec8e0..7367b996caa 100644 --- a/main/linux-lts/lts.armv7.config +++ b/main/linux-lts/lts.armv7.config @@ -593,6 +593,9 @@ CONFIG_DEVTMPFS=y CONFIG_DEVTMPFS_MOUNT=y CONFIG_DEVTMPFS_SAFE=y # CONFIG_PREVENT_FIRMWARE_BUILD is not set +CONFIG_FW_LOADER_COMPRESS=y +# CONFIG_FW_LOADER_COMPRESS_XZ is not set +CONFIG_FW_LOADER_COMPRESS_ZSTD=y # CONFIG_ALLOW_DEV_COREDUMP is not set CONFIG_DEBUG_DEVRES=y # CONFIG_QCOM_EBI2 is not set diff --git a/main/linux-lts/lts.ppc64le.config b/main/linux-lts/lts.ppc64le.config index 71345fe64c4..430c1f29480 100644 --- a/main/linux-lts/lts.ppc64le.config +++ b/main/linux-lts/lts.ppc64le.config @@ -348,6 +348,9 @@ CONFIG_UEVENT_HELPER_PATH="/sbin/hotplug" CONFIG_DEVTMPFS=y CONFIG_DEVTMPFS_MOUNT=y CONFIG_DEVTMPFS_SAFE=y +CONFIG_FW_LOADER_COMPRESS=y +# CONFIG_FW_LOADER_COMPRESS_XZ is not set +CONFIG_FW_LOADER_COMPRESS_ZSTD=y CONFIG_MTD=y CONFIG_MTD_BLOCK=y CONFIG_MTD_POWERNV_FLASH=y diff --git a/main/linux-lts/lts.s390x.config b/main/linux-lts/lts.s390x.config index f449aabca2f..0ec941c5c48 100644 --- a/main/linux-lts/lts.s390x.config +++ b/main/linux-lts/lts.s390x.config @@ -484,6 +484,9 @@ CONFIG_UEVENT_HELPER=y CONFIG_UEVENT_HELPER_PATH="/sbin/hotplug" CONFIG_DEVTMPFS=y CONFIG_DEVTMPFS_SAFE=y +CONFIG_FW_LOADER_COMPRESS=y +# CONFIG_FW_LOADER_COMPRESS_XZ is not set +CONFIG_FW_LOADER_COMPRESS_ZSTD=y CONFIG_CONNECTOR=y CONFIG_MTD=m CONFIG_MTD_AR7_PARTS=m diff --git a/main/linux-lts/lts.x86.config b/main/linux-lts/lts.x86.config index 1816bdb0959..9a80a9efd80 100644 --- a/main/linux-lts/lts.x86.config +++ b/main/linux-lts/lts.x86.config @@ -617,6 +617,9 @@ CONFIG_DEVTMPFS=y CONFIG_DEVTMPFS_MOUNT=y CONFIG_DEVTMPFS_SAFE=y # CONFIG_PREVENT_FIRMWARE_BUILD is not set +CONFIG_FW_LOADER_COMPRESS=y +# CONFIG_FW_LOADER_COMPRESS_XZ is not set +CONFIG_FW_LOADER_COMPRESS_ZSTD=y # CONFIG_ALLOW_DEV_COREDUMP is not set CONFIG_DEBUG_DEVRES=y CONFIG_CONNECTOR=y diff --git a/main/linux-lts/lts.x86_64.config b/main/linux-lts/lts.x86_64.config index 0a4f67e45f6..e23d52f7387 100644 --- a/main/linux-lts/lts.x86_64.config +++ b/main/linux-lts/lts.x86_64.config @@ -652,6 +652,9 @@ CONFIG_DEVTMPFS=y CONFIG_DEVTMPFS_MOUNT=y CONFIG_DEVTMPFS_SAFE=y # CONFIG_PREVENT_FIRMWARE_BUILD is not set +CONFIG_FW_LOADER_COMPRESS=y +# CONFIG_FW_LOADER_COMPRESS_XZ is not set +CONFIG_FW_LOADER_COMPRESS_ZSTD=y # CONFIG_ALLOW_DEV_COREDUMP is not set CONFIG_DEBUG_DEVRES=y CONFIG_CONNECTOR=y