From 83c707e974a1a05b8340ad0b9bad17aaacd53967 Mon Sep 17 00:00:00 2001 From: Joe Bo Run Date: Fri, 29 Sep 2023 21:44:07 +0300 Subject: [PATCH] upg glibc linux-lts runit --- glibc/PKGBUILD | 8 +- glibc/PKGBUILD-arch | 4 +- glibc/deps | 1 + glibc/time | 5 - linux-lts/.gitignore | 1 + .../0003-Sphinx-7.2.2-8.0-PosixPath.patch | 24 + linux-lts/PKGBUILD | 23 +- linux-lts/PKGBUILD-aur.197 | 208 + linux-lts/config | 2 +- linux-lts/deps | 6 +- linux-lts/sha256sums | 38 +- linux-lts54/config-aur.257 | 10573 ++++++++++++++++ linux/.gitignore | 3 + runit/PKGBUILD | 19 +- runit/halt.c | 4 +- 15 files changed, 10863 insertions(+), 56 deletions(-) create mode 100644 linux-lts/0003-Sphinx-7.2.2-8.0-PosixPath.patch create mode 100644 linux-lts/PKGBUILD-aur.197 create mode 100644 linux-lts54/config-aur.257 diff --git a/glibc/PKGBUILD b/glibc/PKGBUILD index 0c6c501..e97cd2f 100644 --- a/glibc/PKGBUILD +++ b/glibc/PKGBUILD @@ -11,8 +11,8 @@ pkgbase=glibc pkgname=(glibc lib32-glibc) pkgver=2.38 -_commit=0e1ef6779a90bc0f8a05bc367796df2793deecaa -pkgrel=04 +_commit=f6445dc94da185b3d1ee283f0ca0a34c4e1986cc +pkgrel=05 url='https://www.gnu.org/software/libc' makedepends=(git gd lib32-gcc-libs python) #optdepends=('perl: for mtrace') @@ -218,6 +218,6 @@ sha256sums=(SKIP cdc234959c6fdb43f000d3bb7d1080b0103f4080f5e67bcfe8ae1aaf477812f0 # sdt-config.h cf9fe494f7ec69752a63d1b0a9ad689aa620888ae9b902b6383a6fbc7c1726a7) # reenable_DT_HASH.patch -## 9f2a51bcf36ab18a74597e9e18acc9550d246e2f454e0d4cba55bcb335b70fda glibc-2.38-04-x86_64.pkg.tar.lz -## 69b82aac27ce50144c2ce5a8d3941a6b6182e24e47be1513e2f58cec0151952b lib32-glibc-2.38-04-x86_64.pkg.tar.lz +## 48bacaa2f581a7a12b9edc06df56148331c929a10da245d7243c95c5149b3aac glibc-2.38-05-x86_64.pkg.tar.lz +## f80790a0067d89209b2337f7b0e7c336f5a848d3355818cc795bf20e2df61fad lib32-glibc-2.38-05-x86_64.pkg.tar.lz diff --git a/glibc/PKGBUILD-arch b/glibc/PKGBUILD-arch index 7c49072..0c8bfca 100644 --- a/glibc/PKGBUILD-arch +++ b/glibc/PKGBUILD-arch @@ -9,8 +9,8 @@ pkgbase=glibc pkgname=(glibc lib32-glibc) pkgver=2.38 -_commit=0e1ef6779a90bc0f8a05bc367796df2793deecaa -pkgrel=4 +_commit=f6445dc94da185b3d1ee283f0ca0a34c4e1986cc +pkgrel=5 arch=(x86_64) url='https://www.gnu.org/software/libc' license=(GPL LGPL) diff --git a/glibc/deps b/glibc/deps index 1ede3a6..c0357df 100644 --- a/glibc/deps +++ b/glibc/deps @@ -7,3 +7,4 @@ libjpeg-turbo libgit2 + diff --git a/glibc/time b/glibc/time index 22707ef..8b13789 100644 --- a/glibc/time +++ b/glibc/time @@ -1,6 +1 @@ - -real 26m24.374s -user 22m44.066s -sys 4m10.551s - diff --git a/linux-lts/.gitignore b/linux-lts/.gitignore index 5d7eb81..08ae80e 100644 --- a/linux-lts/.gitignore +++ b/linux-lts/.gitignore @@ -17,3 +17,4 @@ /sums /size /warns-195 +/new.deps diff --git a/linux-lts/0003-Sphinx-7.2.2-8.0-PosixPath.patch b/linux-lts/0003-Sphinx-7.2.2-8.0-PosixPath.patch new file mode 100644 index 0000000..3f2bca7 --- /dev/null +++ b/linux-lts/0003-Sphinx-7.2.2-8.0-PosixPath.patch @@ -0,0 +1,24 @@ +diff -ru a/Documentation/sphinx/kerneldoc.py b/Documentation/sphinx/kerneldoc.py +--- a/Documentation/sphinx/kerneldoc.py 2023-08-16 12:21:03.000000000 -0400 ++++ b/Documentation/sphinx/kerneldoc.py 2023-08-22 10:54:28.646583489 -0400 +@@ -148,7 +148,7 @@ + lineoffset = int(match.group(1)) - 1 + # we must eat our comments since the upset the markup + else: +- doc = env.srcdir + "/" + env.docname + ":" + str(self.lineno) ++ doc = str(env.srcdir) + "/" + str(env.docname) + ":" + str(self.lineno) + result.append(line, doc + ": " + filename, lineoffset) + lineoffset += 1 + +diff -ru a/Documentation/sphinx/kfigure.py b/Documentation/sphinx/kfigure.py +--- a/Documentation/sphinx/kfigure.py 2023-08-16 12:21:03.000000000 -0400 ++++ b/Documentation/sphinx/kfigure.py 2023-08-22 10:54:07.629742553 -0400 +@@ -266,7 +266,7 @@ + if dst_fname: + # the builder needs not to copy one more time, so pop it if exists. + translator.builder.images.pop(img_node['uri'], None) +- _name = dst_fname[len(translator.builder.outdir) + 1:] ++ _name = dst_fname[len(str(translator.builder.outdir)) + 1:] + + if isNewer(dst_fname, src_fname): + kernellog.verbose(app, diff --git a/linux-lts/PKGBUILD b/linux-lts/PKGBUILD index 665e9e3..9c98a68 100644 --- a/linux-lts/PKGBUILD +++ b/linux-lts/PKGBUILD @@ -6,13 +6,12 @@ #-----------------------------------------| DESCRIPTION |--------------------------------------- pkgbase=linux-lts -pkgver=5.10.196 +pkgver=5.10.197 pkgrel=01 pkgdesc='LTS Linux 5.10 + nvme-fix patch w/o zstd & ipv6' _url="https://www.kernel.org/" -makedepends=(bc kmod libelf pahole cpio perl tar xz - kmod xmlto python-sphinx python-sphinx_rtd_theme - graphviz imagemagick) # python-six +makedepends=(bc kmod libelf pahole cpio perl tar xz python) +# xmlto python-sphinx python-sphinx_rtd_theme graphviz imagemagick python-six ) ## for docs options=('!strip') _srcname=linux-$pkgver url="https://cdn.kernel.org/pub/linux/kernel" @@ -21,8 +20,6 @@ source=($url/v5.x/$_srcname.tar.{xz,sign} 0001-ZEN-Add-sysctl-and-CONFIG-to-disallow-unprivileged-C.patch 0002-fix-nvme.patch sha256sums::https://cdn.kernel.org/pub/linux/kernel/v5.x/sha256sums.asc) - # https://build.opensuse.org/package/show/home:curb:ArchLinux/linux-lts510 - export KBUILD_BUILD_HOST=joborun export KBUILD_BUILD_USER=$pkgbase @@ -211,15 +208,15 @@ validpgpkeys=(ABAF11C65A2970B130ABE3C479BE3E4300411886 # Linus Torvalds 647F28654894E3BD457199BE38DBBDC86092693E) # Greg Kroah-Hartman # https://cdn.kernel.org/pub/linux/kernel/v5.x/sha256sums.asc -# sha256sums:71ec2e3af082bcd7c4aac4b8ecdbc2e47695befe4984e3e5567791a605a96fc0 # linux-5.10.196.tar.xz +# sha256sums:183a4507b0ebec7816a79ceba6253aa7ad345e25b0fcd4e834ee154be9a993ab linux-5.10.197.tar.xz -sha256sums=(71ec2e3af082bcd7c4aac4b8ecdbc2e47695befe4984e3e5567791a605a96fc0 # linux-5.10.196.tar.xz - c2cec75df0018a0d924aacdd98cb820c743fff4551bfcff0ce27176482da346d # linux-5.10.196.tar.sign - 8503d0f225208a01ccd98b37a38a1eb14fc1f18863fbda798ff5dacd8be104ad # config +sha256sums=(183a4507b0ebec7816a79ceba6253aa7ad345e25b0fcd4e834ee154be9a993ab # linux-5.10.197.tar.xz + ed68d9dd1a657a16c635b051c7d11c330140b0af77c9964b9c9fc5c3923cce22 # linux-5.10.197.tar.sign + da5cc9a122abb345a706d859d9f60b8e1b028382734df331dd5b3953960753fc # config 96a72e1652314215da7140956c3abcf495cafd00811eda3cf4ce03ec5f791f1e # 0001-ZEN-Add-sysctl-and-CONFIG-to-disallow-unprivileged-C.patch 0e14c0d788262a9781d8ba1d6e894f30877f015ccf0b6d768d759eac48bcede9 # 0002-fix-nvme.patch - 92118f1acd03d920cc307a23fa1f7601f5db6613b1cda04ecf75cb4ecdfb836b) # sha256sums + c2ff5ff08c10c1fe7a473ce80a665eb28f70ec616d5e258a04a27cfc17198613) # sha256sums -## d93fcaad3674a56fd8888da169a08fd94afd511362b3ebce0e93ec06b54745a3 linux-lts-5.10.196-01-x86_64.pkg.tar.lz -## 9acfe7412e1dd71ab4f18843e62cbe4bad3bcb0fb089cd2e9dac3e32965e8555 linux-lts-headers-5.10.196-01-x86_64.pkg.tar.lz +## 949157268fe7e56f30c42820e07bcd0715f999f0cc17ba6ea618f0388d76489c linux-lts-5.10.197-01-x86_64.pkg.tar.lz +## d1878d38c128c564c5a9a72c4dc8420097988148ca755c543893c8d706d6b51b linux-lts-headers-5.10.197-01-x86_64.pkg.tar.lz diff --git a/linux-lts/PKGBUILD-aur.197 b/linux-lts/PKGBUILD-aur.197 new file mode 100644 index 0000000..81913a3 --- /dev/null +++ b/linux-lts/PKGBUILD-aur.197 @@ -0,0 +1,208 @@ +# Maintainer: Chris Severance aur.severach aATt spamgourmet dott com +# Contributor: Jonathon Fernyhough +# Contributor: Andreas Radke + +pkgbase=linux-lts510 +pkgver=5.10.197 +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 + '0003-Sphinx-7.2.2-8.0-PosixPath.patch' +) +validpgpkeys=( + 'ABAF11C65A2970B130ABE3C479BE3E4300411886' # Linus Torvalds + '647F28654894E3BD457199BE38DBBDC86092693E' # Greg Kroah-Hartman +) +# https://www.kernel.org/pub/linux/kernel/v5.x/sha256sums.asc +md5sums=('6929e6bb34d6b64a303c05dce068feb7' + 'SKIP' + '8b8fa773fe9c7938a76ba07ca2933ed8' + 'd31360693fb06a0d69c1f126350baa6d' + 'c1f10e50f7ca23d07ae83ae6252854d5') +sha256sums=('183a4507b0ebec7816a79ceba6253aa7ad345e25b0fcd4e834ee154be9a993ab' + 'SKIP' + 'ddc8d7c604a2f8373a25674d06cd377fdf80adca9bd426f4c8a50f3d52403001' + '96a72e1652314215da7140956c3abcf495cafd00811eda3cf4ce03ec5f791f1e' + '453ad77883c50b5d5b1373241a5a27a5f7cdc11c5b66dd929338fc622de6cf14') + +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 $(