From 9daa96284eb1589f77b05321f7ad8704997575ad Mon Sep 17 00:00:00 2001 From: Joe Bo Run Date: Fri, 11 Aug 2023 19:38:10 +0300 Subject: [PATCH] upg linux-lts (5.10) --- ...eorganize-gimple-includes-for-GCC-13.patch | 108 +++++++++ linux-lts/PKGBUILD | 16 +- linux-lts/PKGBUILD-aur.189 | 205 ++++++++++++++++++ linux-lts/config | 4 +- linux-lts/sha256sums | 46 ++-- linux-lts/time | 6 +- linux-lts54/config | 8 +- linux/config | 4 +- 8 files changed, 365 insertions(+), 32 deletions(-) create mode 100644 linux-lts/0002-reorganize-gimple-includes-for-GCC-13.patch create mode 100644 linux-lts/PKGBUILD-aur.189 diff --git a/linux-lts/0002-reorganize-gimple-includes-for-GCC-13.patch b/linux-lts/0002-reorganize-gimple-includes-for-GCC-13.patch new file mode 100644 index 0000000..a769841 --- /dev/null +++ b/linux-lts/0002-reorganize-gimple-includes-for-GCC-13.patch @@ -0,0 +1,108 @@ +From mboxrd@z Thu Jan 1 00:00:00 1970 +Return-Path: +X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on + aws-us-west-2-korg-lkml-1.web.codeaurora.org +Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) + by smtp.lore.kernel.org (Postfix) with ESMTP id 5B47CC32793 + for ; Wed, 18 Jan 2023 20:24:14 +0000 (UTC) +Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand + id S229966AbjARUYN (ORCPT ); + Wed, 18 Jan 2023 15:24:13 -0500 +Received: from lindbergh.monkeyblade.net ([23.128.96.19]:34048 "EHLO + lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org + with ESMTP id S229940AbjARUYF (ORCPT + ); + Wed, 18 Jan 2023 15:24:05 -0500 +Received: from mail-pl1-x62c.google.com (mail-pl1-x62c.google.com [IPv6:2607:f8b0:4864:20::62c]) + by lindbergh.monkeyblade.net (Postfix) with ESMTPS id AA30C5D904 + for ; Wed, 18 Jan 2023 12:24:04 -0800 (PST) +Received: by mail-pl1-x62c.google.com with SMTP id g23so186772plq.12 + for ; Wed, 18 Jan 2023 12:24:04 -0800 (PST) +DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; + d=chromium.org; s=google; + h=content-transfer-encoding:mime-version:message-id:date:subject:cc + :to:from:from:to:cc:subject:date:message-id:reply-to; + bh=M7nQ+g2J8OLWVvtfKxW9hliY4Yc3cv4OwnKnX3U91hE=; + b=MhP7CFPKMusVUiw6o4PRowhujO/e8aU5sJEsYfnFGzwkO0eKdjfTpPALqtQqB5Zy6j + 4HhX1moUWoFgSiTgqdNnBCZ6fwdpJ4C8Af74LEg3m+WUiFaqrMImOxuHx3uDzpXXalR4 + tushRG6S03QNI9iVt8BOoggY9UMF8Cxi+zYGI= +X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; + d=1e100.net; s=20210112; + h=content-transfer-encoding:mime-version:message-id:date:subject:cc + :to:from:x-gm-message-state:from:to:cc:subject:date:message-id + :reply-to; + bh=M7nQ+g2J8OLWVvtfKxW9hliY4Yc3cv4OwnKnX3U91hE=; + b=0cCGaGR+o74Jurh08/XntGl4chNuLyQNl/iVzNTm+edtBn78KWjWbdbjtPN6+MlzuZ + NLobh3+wVme06DtsTCRLN/nlyaXpmVNjIncsq8oRs/3BgEj0csqqLNiVjoO58/klOo4b + 2+YepXczjwwUb6KFrNxznz/IsE7FYOscOV/i0547T5oQDHEwmBImUAfqTnPm9CCvWdqY + MvZRNHOreAxVyzAxU4MzkeKUekBFhTAfcYZEykYnoMZAFOf1Rk9SQVvlvOVs8BuLqLAb + Ivh67f5gjwPMfheLgVVT58CXobyuBpr+g5HoPDXEvuECUhchsHAUq2JD2wtDLVWPT5/f + Hn2g== +X-Gm-Message-State: AFqh2kpYWvrfwSKyaMOxJIuOcDW5YtHpMnGDnb/xuCtB2S7ZF9xJH+5a + fLAjOHcyz9BBym1IIOjTJbCreg== +X-Google-Smtp-Source: AMrXdXuvhtr6QYHTUipL1E7izXxzP6eU9ELvbbiqPHuu407BTk2+78EO8VAixW82hWCQezgP9BpVtw== +X-Received: by 2002:a17:903:32d1:b0:188:fc0c:b736 with SMTP id i17-20020a17090332d100b00188fc0cb736mr34331887plr.67.1674073444029; + Wed, 18 Jan 2023 12:24:04 -0800 (PST) +Received: from www.outflux.net (smtp.outflux.net. [198.145.64.163]) + by smtp.gmail.com with ESMTPSA id a10-20020a170902ecca00b001891a17bd93sm23667416plh.43.2023.01.18.12.24.03 + (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); + Wed, 18 Jan 2023 12:24:03 -0800 (PST) +From: Kees Cook +To: linux-hardening@vger.kernel.org +Cc: Kees Cook , + Palmer Dabbelt , + linux-kernel@vger.kernel.org +Subject: [PATCH] gcc-plugins: Reorganize gimple includes for GCC 13 +Date: Wed, 18 Jan 2023 12:24:02 -0800 +Message-Id: <20230118202355.never.520-kees@kernel.org> +X-Mailer: git-send-email 2.34.1 +MIME-Version: 1.0 +X-Developer-Signature: v=1; a=openpgp-sha256; l=1189; h=from:subject:message-id; bh=vukSS8cdZdqqtgn6apidKMhxtj1t0IFOu1S+KhQ8h60=; b=owEBbQKS/ZANAwAKAYly9N/cbcAmAcsmYgBjyFVhjOBNRZYH+UzANpQMnfOjTUf8wrb94vsB2GjK IDs1+4mJAjMEAAEKAB0WIQSlw/aPIp3WD3I+bhOJcvTf3G3AJgUCY8hVYQAKCRCJcvTf3G3AJmyREA CcSyhCMz+CA+i5K0m3iYOM2pKAQebVxf9SOeiSsHQ9qtRdv7a5z6CkN/4dhLFAdsSWkvEpnms+0XUp h7G4EIyluvBiJiLLXDusha33r5D26q/YU4jyPKPLBpRAnSG9NjYaQzhgZ/D5rdJZHfnFFMsRbNtUM2 fNoIlLb8dPW61nIg5aa3q+OytDBECibjwTGhfTRfKMCXTxSHQACjBshgbDZiFJjq3KQskjX0oaoueB rbnd4ZVAiK7cFr+Tl7mAqFIj0mfZ/GYFGvI7DTuFjSPlvrSCtNARfYN5JWT6jkdQNjkRChzbN7Wk4e t1oo8yy1+5Z4TatJUjAQ+MHPLTkG29N7QDn+tq3EN+PGbPgQxV9n+EgPv1S6oAw4/mNWVSqaautpSu aQTzy443t5hxKSBar1lgdimhQ0ftdCqgY2054yImNbbpTXWNDsJMIvgIlsXHpYUt/IBSqhudau5ey8 vnb073zDoc8LgAQSkN0a3SCjYfPNc7vqt+xoJuZVr5DZs/mpyTIA6STUfj9QJkiVfflaPqdAIaWC3f S2VjdKhhaFXnp24XgMKV43Cz53EiTQ1/EDN91PauJOI5LmHJb7AfX9vrtnmnTC3uFxJKwybVBVMEi8 0wjQFuS1iUmK4YrLAuqcXE/aA2kCRBRASAN/wkM2oNrPucr9pt8HJ4fSszkg== +X-Developer-Key: i=keescook@chromium.org; a=openpgp; fpr=A5C3F68F229DD60F723E6E138972F4DFDC6DC026 +Content-Transfer-Encoding: 8bit +Precedence: bulk +List-ID: +X-Mailing-List: linux-kernel@vger.kernel.org + +The gimple-iterator.h header must be included before gimple-fold.h +starting with GCC 13. Reorganize gimple headers to work for all GCC +versions. + +Reported-by: Palmer Dabbelt +Link: https://lore.kernel.org/all/20230113173033.4380-1-palmer@rivosinc.com/ +Cc: linux-hardening@vger.kernel.org +Signed-off-by: Kees Cook +--- + scripts/gcc-plugins/gcc-common.h | 4 ++-- + 1 file changed, 2 insertions(+), 2 deletions(-) + +Adapted from Kernel 6.3.1 to 5.10.179 by severach@aur Mon 08 May 2023 10:05:53 PM EDT + +diff --git a/scripts/gcc-plugins/gcc-common.h b/scripts/gcc-plugins/gcc-common.h +index 9a1895747b15..84c730da36dd 100644 +--- a/scripts/gcc-plugins/gcc-common.h ++++ b/scripts/gcc-plugins/gcc-common.h +@@ -108,7 +108,9 @@ + #include "varasm.h" + #include "stor-layout.h" + #include "internal-fn.h" ++#include "gimple.h" + #include "gimple-expr.h" ++#include "gimple-iterator.h" + #include "gimple-fold.h" + #include "context.h" + #include "tree-ssa-alias.h" +@@ -124,13 +126,10 @@ + #include "gimplify.h" + #endif + +-#include "gimple.h" +- + #if BUILDING_GCC_VERSION >= 4009 + #include "tree-ssa-operands.h" + #include "tree-phinodes.h" + #include "tree-cfg.h" +-#include "gimple-iterator.h" + #include "gimple-ssa.h" + #include "ssa-iterators.h" + #endif diff --git a/linux-lts/PKGBUILD b/linux-lts/PKGBUILD index 56f49d5..e1705a9 100644 --- a/linux-lts/PKGBUILD +++ b/linux-lts/PKGBUILD @@ -6,7 +6,7 @@ #-----------------------------------------| DESCRIPTION |--------------------------------------- pkgbase=linux-lts -pkgver=5.10.188 +pkgver=5.10.190 pkgrel=02 pkgdesc='LTS Linux 5.10 + nvme-fix patch w/o zstd & ipv6' _url="https://www.kernel.org/" @@ -211,14 +211,14 @@ validpgpkeys=(ABAF11C65A2970B130ABE3C479BE3E4300411886 # Linus Torvalds 647F28654894E3BD457199BE38DBBDC86092693E) # Greg Kroah-Hartman # https://cdn.kernel.org/pub/linux/kernel/v5.x/sha256sums.asc -# sha256sums:c9558bab35e23ae67661bfb3192c609c857f78582a035449ae63e33d04ab6112 linux-5.10.188.tar.xz +# sha256sums:29723df01d40ff07ff6d254eaaf90c7b3ec3c70f4ebe089b80f785f46efaf597 linux-5.10.190.tar.xz -sha256sums=(c9558bab35e23ae67661bfb3192c609c857f78582a035449ae63e33d04ab6112 # linux-5.10.188.tar.xz - bd60b595855bb1742fb979e9300e4c1c53689b67697f37d2eafd577940a0ccbd # linux-5.10.188.tar.sign - 7423fe0812e5cf3d611a47267e5885efa9e80ec02a872a81b86f9a6646d4bb67 # config +sha256sums=(29723df01d40ff07ff6d254eaaf90c7b3ec3c70f4ebe089b80f785f46efaf597 # linux-5.10.190.tar.xz + 3f251a36e60995996c2c39392f03b6a2aaf52f2ad31fbbcab217c8e8c350f9a2 # linux-5.10.190.tar.sign + 409910f4d67cd0eae1fca6a0a69fdae06dabfa38bab15b4793890e1ce6843397 # config 96a72e1652314215da7140956c3abcf495cafd00811eda3cf4ce03ec5f791f1e # 0001-ZEN-Add-sysctl-and-CONFIG-to-disallow-unprivileged-C.patch 0e14c0d788262a9781d8ba1d6e894f30877f015ccf0b6d768d759eac48bcede9 # 0002-fix-nvme.patch - 472f88e76ff70ca372415aa923d676dbb4ef78cfeb3d8ec7e242037ca21d9c4f) # sha256sums + c66abb3c231c5ce94b4de7e9e6bcf9e8179c4f9c5bcc5aa780b37b629a489fc0) # sha256sums -## 86e594f51a77c537740d9229a05f8cca66ea92d631ef8102c13c7a32e18e9253 linux-lts-headers-5.10.188-02-x86_64.pkg.tar.lz -## f51c66887ad3045b66ae71c7da361b21fcacabc0a73dde71f13d70d8018665d4 linux-lts-5.10.188-02-x86_64.pkg.tar.lz +## +## diff --git a/linux-lts/PKGBUILD-aur.189 b/linux-lts/PKGBUILD-aur.189 new file mode 100644 index 0000000..6997cc3 --- /dev/null +++ b/linux-lts/PKGBUILD-aur.189 @@ -0,0 +1,205 @@ +# Maintainer: Chris Severance aur.severach aATt spamgourmet dott com +# Contributor: Jonathon Fernyhough +# Contributor: Andreas Radke + +pkgbase=linux-lts510 +pkgver=5.10.189 +pkgrel=1 +pkgdesc='LTS 5.10 Linux' +url="https://www.kernel.org/" +arch=(x86_64) +license=(GPL2) +makedepends=( + bc kmod libelf pahole cpio perl tar xz + xmlto python-sphinx python-sphinx_rtd_theme python-six graphviz imagemagick +) +options=('!strip') +_srcname=linux-$pkgver +source=( + https://cdn.kernel.org/pub/linux/kernel/v${pkgver%%.*}.x/${_srcname}.tar.{xz,sign} + config # the main kernel config file + 0001-ZEN-Add-sysctl-and-CONFIG-to-disallow-unprivileged-C.patch + # https://build.opensuse.org/package/show/home:curb:ArchLinux/linux-lts510 + #0002-reorganize-gimple-includes-for-GCC-13.patch # https://lore.kernel.org/lkml/20230118202355.never.520-kees@kernel.org/raw +) +validpgpkeys=( + 'ABAF11C65A2970B130ABE3C479BE3E4300411886' # Linus Torvalds + '647F28654894E3BD457199BE38DBBDC86092693E' # Greg Kroah-Hartman +) +# https://www.kernel.org/pub/linux/kernel/v5.x/sha256sums.asc +md5sums=('f48059da9de0f48e639c74061b2e890c' + 'SKIP' + '8b8fa773fe9c7938a76ba07ca2933ed8' + 'd31360693fb06a0d69c1f126350baa6d') +sha256sums=('4c03516ae1d417571faaef175932d0892710bcbe0173e40550014d043d9098c9' + 'SKIP' + 'ddc8d7c604a2f8373a25674d06cd377fdf80adca9bd426f4c8a50f3d52403001' + '96a72e1652314215da7140956c3abcf495cafd00811eda3cf4ce03ec5f791f1e') + +export KBUILD_BUILD_HOST=archlinux +export KBUILD_BUILD_USER=$pkgbase +export KBUILD_BUILD_TIMESTAMP="$(date -Ru${SOURCE_DATE_EPOCH:+d @$SOURCE_DATE_EPOCH})" + +prepare() { + cd $_srcname + + echo "Setting version..." + scripts/setlocalversion --save-scmversion + echo "-$pkgrel" > localversion.10-pkgrel + echo "${pkgbase#linux}" > localversion.20-pkgname + + local src + for src in "${source[@]}"; do + src="${src%%::*}" + src="${src##*/}" + [[ $src = *.patch ]] || continue + echo "Applying patch $src..." + patch -Np1 < "../$src" + done + + echo "Setting config..." + cp ../config .config + make olddefconfig + + make -s kernelrelease > version + echo "Prepared $pkgbase version $(