Skip to content

Commit 7180532

Browse files
lilydjwglilydjwg
committed
linux-lily: update
1 parent 19c8b47 commit 7180532

3 files changed

Lines changed: 88 additions & 55 deletions

File tree

‎archlinuxcn/linux-lily/PKGBUILD‎

Lines changed: 47 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -1,25 +1,34 @@
11
# Maintainer: Jan Alexander Steffens (heftig) <heftig@archlinux.org>
22

33
pkgbase=linux-lily
4-
pkgver=6.15.2
4+
pkgver=6.19.11
55
pkgrel=1
6-
pkgdesc='Linux-lily'
7-
url="https://www.kernel.org/"
8-
arch=(x86_64)
6+
pkgdesc='Linux'
7+
url='https://github.com/archlinux/linux'
8+
arch=(
9+
x86_64
10+
)
911
license=(GPL-2.0-only)
1012
makedepends=(
1113
bc
14+
binutils
1215
cpio
1316
gettext
17+
glibc
1418
libelf
19+
libgcc
20+
openssl
1521
pahole
1622
perl
1723
python
1824
rust
1925
rust-bindgen
2026
rust-src
2127
tar
28+
xxhash
2229
xz
30+
zlib
31+
zstd
2332

2433
# htmldocs
2534
# graphviz
@@ -37,7 +46,6 @@ _srctag=v${pkgver%.*}-${pkgver##*.}
3746
source=(
3847
# https://cdn.kernel.org/pub/linux/kernel/v${pkgver%%.*}.x/${_srcname}.tar.{xz,sign}
3948
# $url/releases/download/$_srctag/linux-$_srctag.patch.zst{,.sig}
40-
# config # the main kernel config file
4149
)
4250
validpgpkeys=(
4351
ABAF11C65A2970B130ABE3C479BE3E4300411886 # Linus Torvalds
@@ -84,7 +92,7 @@ build() {
8492
cd $_srcname
8593
make all
8694
make -C tools/bpf/bpftool vmlinux.h feature-clang-bpf-co-re=1
87-
# make htmldocs
95+
# make htmldocs SPHINXOPTS=-QT
8896
}
8997

9098
_package() {
@@ -95,6 +103,7 @@ _package() {
95103
kmod
96104
)
97105
optdepends=(
106+
"$pkgbase-headers: headers and scripts for building modules"
98107
'linux-firmware: firmware images needed for some devices'
99108
'scx-scheds: to use sched-ext schedulers'
100109
'wireless-regdb: to set the correct wireless channels of your country'
@@ -131,29 +140,48 @@ _package() {
131140

132141
_package-headers() {
133142
pkgdesc="Headers and scripts for building modules for the $pkgdesc kernel"
134-
depends=(pahole)
143+
depends=(
144+
binutils
145+
glibc
146+
libelf
147+
libgcc
148+
openssl
149+
pahole
150+
xxhash
151+
zlib
152+
zstd
153+
)
154+
provides=(LINUX-HEADERS)
135155

136156
cd $_srcname
137157
local builddir="$pkgdir/usr/lib/modules/$(<version)/build"
138158

159+
local karch
160+
case $CARCH in
161+
x86_64) karch=x86 ;;
162+
*) echo "Unknown CARCH $CARCH"; exit 1 ;;
163+
esac
164+
139165
echo "Installing build files..."
140166
install -Dt "$builddir" -m644 .config Makefile Module.symvers System.map \
141167
localversion.* version vmlinux tools/bpf/bpftool/vmlinux.h
142168
install -Dt "$builddir/kernel" -m644 kernel/Makefile
143-
install -Dt "$builddir/arch/x86" -m644 arch/x86/Makefile
169+
install -Dt "$builddir/arch/$karch" -m644 arch/$karch/Makefile
144170
cp -t "$builddir" -a scripts
145171
ln -srt "$builddir" "$builddir/scripts/gdb/vmlinux-gdb.py"
146172

147-
# required when STACK_VALIDATION is enabled
148-
install -Dt "$builddir/tools/objtool" tools/objtool/objtool
173+
if [[ $(scripts/config -s CONFIG_HAVE_STACK_VALIDATION) = y ]]; then
174+
install -Dt "$builddir/tools/objtool" tools/objtool/objtool
175+
fi
149176

150-
# required when DEBUG_INFO_BTF_MODULES is enabled
151-
install -Dt "$builddir/tools/bpf/resolve_btfids" tools/bpf/resolve_btfids/resolve_btfids
177+
if [[ $(scripts/config -s CONFIG_DEBUG_INFO_BTF_MODULES) = y ]]; then
178+
install -Dt "$builddir/tools/bpf/resolve_btfids" tools/bpf/resolve_btfids/resolve_btfids
179+
fi
152180

153181
echo "Installing headers..."
154182
cp -t "$builddir" -a include
155-
cp -t "$builddir/arch/x86" -a arch/x86/include
156-
install -Dt "$builddir/arch/x86/kernel" -m644 arch/x86/kernel/asm-offsets.s
183+
cp -t "$builddir/arch/$karch" -a arch/$karch/include
184+
install -Dt "$builddir/arch/$karch/kernel" -m644 arch/$karch/kernel/asm-offsets.s
157185

158186
install -Dt "$builddir/drivers/md" -m644 drivers/md/*.h
159187
install -Dt "$builddir/net/mac80211" -m644 net/mac80211/*.h
@@ -173,8 +201,10 @@ _package-headers() {
173201
find . -name 'Kconfig*' -exec install -Dm644 {} "$builddir/{}" \;
174202

175203
echo "Installing Rust files..."
176-
install -Dt "$builddir/rust" -m644 rust/*.rmeta
177-
install -Dt "$builddir/rust" rust/*.so
204+
if [[ $(scripts/config -s CONFIG_RUST) = y ]]; then
205+
install -Dt "$builddir/rust" -m644 rust/*.rmeta
206+
install -Dt "$builddir/rust" rust/*.so
207+
fi
178208

179209
echo "Installing unstripped VDSO..."
180210
make INSTALL_MOD_PATH="$pkgdir/usr" vdso_install \
@@ -183,7 +213,7 @@ _package-headers() {
183213
echo "Removing unneeded architectures..."
184214
local arch
185215
for arch in "$builddir"/arch/*/; do
186-
[[ $arch = */x86/ ]] && continue
216+
[[ $arch = */$karch/ ]] && continue
187217
echo "Removing $(basename "$arch")"
188218
rm -r "$arch"
189219
done

archlinuxcn/linux-lily/config.diff.6.16.4 renamed to archlinuxcn/linux-lily/config.diff.6.19.11

Lines changed: 35 additions & 32 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
1-
--- ../../config 2025-08-29 03:49:15.000000000 +0800
2-
+++ .config 2025-09-04 13:49:38.732972888 +0800
3-
@@ -38,7 +36,7 @@
1+
--- ../../config.x86_64 2026-04-03 07:32:17.000000000 +0800
2+
+++ .config 2026-04-06 13:42:24.220373165 +0800
3+
@@ -42,7 +42,7 @@
44
# CONFIG_COMPILE_TEST is not set
55
# CONFIG_WERROR is not set
66
CONFIG_LOCALVERSION=""
@@ -9,7 +9,7 @@
99
CONFIG_BUILD_SALT=""
1010
CONFIG_HAVE_KERNEL_GZIP=y
1111
CONFIG_HAVE_KERNEL_BZIP2=y
12-
@@ -1401,7 +1399,7 @@
12+
@@ -1453,7 +1453,7 @@
1313
CONFIG_INET_DIAG_DESTROY=y
1414
CONFIG_TCP_CONG_ADVANCED=y
1515
CONFIG_TCP_CONG_BIC=m
@@ -18,7 +18,7 @@
1818
CONFIG_TCP_CONG_WESTWOOD=m
1919
CONFIG_TCP_CONG_HTCP=m
2020
CONFIG_TCP_CONG_HSTCP=m
21-
@@ -1415,10 +1413,10 @@
21+
@@ -1467,10 +1467,10 @@
2222
CONFIG_TCP_CONG_ILLINOIS=m
2323
CONFIG_TCP_CONG_DCTCP=m
2424
CONFIG_TCP_CONG_CDG=m
@@ -32,16 +32,16 @@
3232
CONFIG_TCP_SIGPOOL=y
3333
CONFIG_TCP_AO=y
3434
CONFIG_TCP_MD5SIG=y
35-
@@ -2747,7 +2745,7 @@
35+
@@ -2801,7 +2801,7 @@
3636
CONFIG_ATA_OVER_ETH=m
3737
CONFIG_XEN_BLKDEV_FRONTEND=m
3838
CONFIG_XEN_BLKDEV_BACKEND=m
3939
-CONFIG_VIRTIO_BLK=y
4040
+CONFIG_VIRTIO_BLK=m
41-
# CONFIG_BLK_DEV_RUST_NULL is not set
4241
CONFIG_BLK_DEV_RBD=m
4342
CONFIG_BLK_DEV_UBLK=m
44-
@@ -4800,7 +4798,7 @@
43+
CONFIG_BLKDEV_UBLK_LEGACY_OPCODES=y
44+
@@ -4885,7 +4885,7 @@
4545
CONFIG_PRINTER=m
4646
CONFIG_LP_CONSOLE=y
4747
CONFIG_PPDEV=m
@@ -50,7 +50,7 @@
5050
CONFIG_IPMI_HANDLER=m
5151
CONFIG_IPMI_DMI_DECODE=y
5252
CONFIG_IPMI_PLAT_DATA=y
53-
@@ -7036,7 +7034,7 @@
53+
@@ -7169,7 +7169,7 @@
5454
CONFIG_DRM_DRAW=y
5555
CONFIG_DRM_PANIC=y
5656
CONFIG_DRM_PANIC_FOREGROUND_COLOR=0xffffff
@@ -59,7 +59,7 @@
5959
# CONFIG_DRM_PANIC_DEBUG is not set
6060
CONFIG_DRM_PANIC_SCREEN="qr_code"
6161
CONFIG_DRM_PANIC_SCREEN_QR_CODE=y
62-
@@ -7360,7 +7358,7 @@
62+
@@ -7490,7 +7490,7 @@
6363
CONFIG_FRAMEBUFFER_CONSOLE=y
6464
# CONFIG_FRAMEBUFFER_CONSOLE_LEGACY_ACCELERATION is not set
6565
CONFIG_FRAMEBUFFER_CONSOLE_DETECT_PRIMARY=y
@@ -68,10 +68,10 @@
6868
CONFIG_FRAMEBUFFER_CONSOLE_DEFERRED_TAKEOVER=y
6969
# end of Console display driver support
7070

71-
@@ -10850,14 +10848,14 @@
71+
@@ -11193,14 +11193,14 @@
72+
CONFIG_BUFFER_HEAD=y
7273
CONFIG_LEGACY_DIRECT_IO=y
7374
# CONFIG_EXT2_FS is not set
74-
# CONFIG_EXT3_FS is not set
7575
-CONFIG_EXT4_FS=y
7676
+CONFIG_EXT4_FS=m
7777
CONFIG_EXT4_USE_FOR_EXT2=y
@@ -86,7 +86,7 @@
8686
CONFIG_JFS_FS=m
8787
CONFIG_JFS_POSIX_ACL=y
8888
CONFIG_JFS_SECURITY=y
89-
@@ -10886,12 +10884,12 @@
89+
@@ -11229,7 +11229,7 @@
9090
CONFIG_OCFS2_FS_STATS=y
9191
CONFIG_OCFS2_DEBUG_MASKLOG=y
9292
# CONFIG_OCFS2_DEBUG_FS is not set
@@ -95,13 +95,7 @@
9595
CONFIG_BTRFS_FS_POSIX_ACL=y
9696
# CONFIG_BTRFS_FS_RUN_SANITY_TESTS is not set
9797
# CONFIG_BTRFS_DEBUG is not set
98-
# CONFIG_BTRFS_ASSERT is not set
99-
-# CONFIG_BTRFS_EXPERIMENTAL is not set
100-
+CONFIG_BTRFS_EXPERIMENTAL=y
101-
# CONFIG_BTRFS_FS_REF_VERIFY is not set
102-
CONFIG_NILFS2_FS=m
103-
CONFIG_F2FS_FS=m
104-
@@ -10929,7 +10927,7 @@
98+
@@ -11259,7 +11259,7 @@
10599
CONFIG_EXPORTFS_BLOCK_OPS=y
106100
CONFIG_FILE_LOCKING=y
107101
CONFIG_FS_ENCRYPTION=y
@@ -110,7 +104,7 @@
110104
CONFIG_FS_ENCRYPTION_INLINE_CRYPT=y
111105
CONFIG_FS_VERITY=y
112106
CONFIG_FS_VERITY_BUILTIN_SIGNATURES=y
113-
@@ -11402,7 +11400,7 @@
107+
@@ -11736,7 +11736,7 @@
114108
# end of Kernel hardening options
115109
# end of Security options
116110

@@ -119,7 +113,7 @@
119113
CONFIG_ASYNC_CORE=m
120114
CONFIG_ASYNC_MEMCPY=m
121115
CONFIG_ASYNC_XOR=m
122-
@@ -11511,7 +11509,7 @@
116+
@@ -11844,7 +11844,7 @@
123117
#
124118
# Hashes, digests, and MACs
125119
#
@@ -128,7 +122,7 @@
128122
CONFIG_CRYPTO_CMAC=m
129123
CONFIG_CRYPTO_GHASH=m
130124
CONFIG_CRYPTO_HMAC=y
131-
@@ -11528,7 +11526,7 @@
125+
@@ -11860,7 +11860,7 @@
132126
CONFIG_CRYPTO_STREEBOG=m
133127
CONFIG_CRYPTO_WP512=m
134128
CONFIG_CRYPTO_XCBC=m
@@ -137,7 +131,7 @@
137131
# end of Hashes, digests, and MACs
138132

139133
#
140-
@@ -11679,7 +11677,7 @@
134+
@@ -12005,7 +12005,7 @@
141135
#
142136
# Library routines
143137
#
@@ -146,17 +140,26 @@
146140
# CONFIG_RAID6_PQ_BENCHMARK is not set
147141
CONFIG_LINEAR_RANGES=y
148142
CONFIG_PACKING=y
149-
@@ -11732,7 +11730,7 @@
150-
# end of Crypto library routines
151-
152-
CONFIG_CRC_CCITT=y
143+
@@ -12022,7 +12022,7 @@
144+
CONFIG_ARCH_USE_SYM_ANNOTATIONS=y
145+
CONFIG_CRC7=m
146+
CONFIG_CRC8=m
153147
-CONFIG_CRC16=y
154148
+CONFIG_CRC16=m
149+
CONFIG_CRC_CCITT=y
150+
CONFIG_CRC_ITU_T=m
155151
CONFIG_CRC_T10DIF=y
156-
CONFIG_ARCH_HAS_CRC_T10DIF=y
157-
CONFIG_CRC_T10DIF_ARCH=y
158-
@@ -11859,6 +11857,8 @@
159-
# CONFIG_FONT_SUN12x22 is not set
152+
@@ -12043,7 +12043,7 @@
153+
CONFIG_CRYPTO_LIB_AESGCM=y
154+
CONFIG_CRYPTO_LIB_ARC4=m
155+
CONFIG_CRYPTO_LIB_GF128MUL=y
156+
-CONFIG_CRYPTO_LIB_BLAKE2B=y
157+
+CONFIG_CRYPTO_LIB_BLAKE2B=m
158+
CONFIG_CRYPTO_LIB_BLAKE2S_ARCH=y
159+
CONFIG_CRYPTO_LIB_CHACHA=y
160+
CONFIG_CRYPTO_LIB_CHACHA_ARCH=y
161+
@@ -12181,6 +12181,8 @@
162+
# CONFIG_FONT_TER10x18 is not set
160163
CONFIG_FONT_TER16x32=y
161164
# CONFIG_FONT_6x8 is not set
162165
+CONFIG_FONT_CJK_16x16=y

‎archlinuxcn/linux-lily/update-cmds.txt‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -15,20 +15,20 @@ cd ../linux/src/archlinux-linux
1515
git clean -xdf
1616
git fetch --all
1717
git fetch --tags archlinux
18-
git co -b lily-6.16 v6.16.4-arch1
18+
git co -b lily-6.19 v6.19.11-arch1
1919

20-
patch -p1 < ~/cjktty-6.16.patch
20+
patch -p1 < ~/cjktty-6.19.patch
2121
git add .
2222
git commit -m 'apply cjktty patch'
2323
patch -p1 < ~/cjktty-add-cjk32x32-font-data.patch
2424
git add .
2525
git commit -m 'apply cjktty 32x32 font data'
2626

27-
cp ../../config .config
28-
patch .config ~/archgitrepo/archlinuxcn/linux-lily/config.diff.6.15.2
27+
cp ../../config.x86_64 .config
28+
patch .config ~/archgitrepo/archlinuxcn/linux-lily/config.diff.6.16.4
2929
make clean oldconfig
30-
diff -Naur ../../config .config > ../../config.diff.6.16.4
31-
vim ../../config.diff.6.16.4
30+
diff -Naur ../../config.x86_64 .config > ../../config.diff.6.19.11
31+
vim ../../config.diff.6.19.11
3232

3333
cd ../..
3434
# 升级 gcc

0 commit comments

Comments
 (0)