fix kernel version: patch before sed, fix scp glob
Some checks failed
release / Release (push) Has been cancelled
Some checks failed
release / Release (push) Has been cancelled
This commit is contained in:
3
.gitignore
vendored
3
.gitignore
vendored
@@ -1,10 +1,11 @@
|
||||
/.config/ai
|
||||
/claude.md
|
||||
/CLAUDE.md
|
||||
.claude
|
||||
**.DS_Store
|
||||
aios-bootstrap*.tar.gz
|
||||
root.x86_64/
|
||||
archiso/
|
||||
build.log
|
||||
.claude
|
||||
/.env
|
||||
/repos
|
||||
|
||||
112
cfg/repo.sh
112
cfg/repo.sh
@@ -4,12 +4,14 @@ set -e
|
||||
d=${0:a:h:h}
|
||||
source $d/.env
|
||||
|
||||
BUILD_KERNEL=false
|
||||
[[ "$1" == "--kernel" ]] && BUILD_KERNEL=true
|
||||
function repo-env() {
|
||||
REPO_NAME="aios"
|
||||
GPG_KEY="$GPG_KEY"
|
||||
}
|
||||
|
||||
# --- Build packages on HOST (aiosc) ---
|
||||
echo "=== Building packages on $HOST ==="
|
||||
ssh "$HOST" zsh -s -- "$GPG_KEY" <<'REMOTE'
|
||||
function repo-pkg-build() {
|
||||
echo "=== Building packages on $HOST ==="
|
||||
ssh "$HOST" zsh -s -- "$GPG_KEY" <<'REMOTE'
|
||||
set -e
|
||||
setopt nonomatch 2>/dev/null || true
|
||||
GPG_KEY="$1"
|
||||
@@ -56,38 +58,62 @@ done
|
||||
rm -rf "$WORK"
|
||||
echo "=== Packages built ==="
|
||||
REMOTE
|
||||
}
|
||||
|
||||
# --- Build kernel on HOST_KERNEL (arch) if requested ---
|
||||
if [[ "$BUILD_KERNEL" == "true" ]]; then
|
||||
echo "=== Building linux-aios on $HOST_KERNEL ==="
|
||||
KERNEL_WORK="\${HOME}/aios-kernel"
|
||||
|
||||
ssh "$HOST_KERNEL" zsh -s <<'KERNEL_REMOTE'
|
||||
function repo-kernel-patch() {
|
||||
echo "=== Patching linux-aios on $HOST_KERNEL ==="
|
||||
ssh "$HOST_KERNEL" zsh -s <<'REMOTE'
|
||||
set -e
|
||||
REPOS="${HOME}/repos"
|
||||
WORK="${HOME}/aios-kernel"
|
||||
rm -rf "$WORK"
|
||||
mkdir -p "$WORK"
|
||||
cd "$WORK"
|
||||
git clone --depth 1 https://git.syui.ai/ai/os.git
|
||||
cp -r "$WORK/os/pkg/linux-aios" "$WORK/linux-aios"
|
||||
cd "$WORK/linux-aios"
|
||||
makepkg -sf --noconfirm --skippgpcheck
|
||||
echo "=== Kernel built ==="
|
||||
KERNEL_REMOTE
|
||||
|
||||
# Transfer kernel packages: HOST_KERNEL -> local -> HOST
|
||||
echo "=== Transferring kernel packages ==="
|
||||
tmpdir=$(mktemp -d)
|
||||
scp "$HOST_KERNEL":~/aios-kernel/linux-aios/linux-aios-*.pkg.tar.zst "$tmpdir/"
|
||||
scp "$tmpdir"/linux-aios-*.pkg.tar.zst "$HOST":~/ai/repo/x86_64/
|
||||
rm -rf "$tmpdir"
|
||||
|
||||
ssh "$HOST_KERNEL" "rm -rf ~/aios-kernel"
|
||||
mkdir -p "$REPOS"
|
||||
if [ -d "$REPOS/archlinux" ]; then
|
||||
cd "$REPOS/archlinux"
|
||||
git pull
|
||||
else
|
||||
git clone --depth 1 https://gitlab.archlinux.org/archlinux/packaging/packages/linux.git "$REPOS/archlinux"
|
||||
fi
|
||||
|
||||
# --- Update repo database on HOST ---
|
||||
echo "=== Updating repo database ==="
|
||||
ssh "$HOST" zsh -s -- "$GPG_KEY" <<'REPO_REMOTE'
|
||||
rm -rf "$WORK"
|
||||
mkdir -p "$WORK/linux-aios"
|
||||
cp "$REPOS/archlinux/PKGBUILD" "$WORK/linux-aios/"
|
||||
cp "$REPOS/archlinux/config.x86_64" "$WORK/linux-aios/"
|
||||
|
||||
cd "$WORK"
|
||||
git clone --depth 1 https://git.syui.ai/ai/os.git
|
||||
cd "$WORK/linux-aios"
|
||||
patch -p1 < "$WORK/os/pkg/linux-aios/aios.patch"
|
||||
|
||||
echo "=== Patch result ==="
|
||||
head -5 PKGBUILD
|
||||
echo "--- prepare() version setting ---"
|
||||
grep -A5 "^ done$" PKGBUILD | head -8
|
||||
REMOTE
|
||||
}
|
||||
|
||||
function repo-kernel-build() {
|
||||
echo "=== Building linux-aios on $HOST_KERNEL ==="
|
||||
ssh "$HOST_KERNEL" zsh -s <<'REMOTE'
|
||||
set -e
|
||||
cd "${HOME}/aios-kernel/linux-aios"
|
||||
makepkg -sf --noconfirm --skippgpcheck
|
||||
echo "=== Kernel built ==="
|
||||
REMOTE
|
||||
}
|
||||
|
||||
function repo-kernel-transfer() {
|
||||
echo "=== Transferring kernel packages ==="
|
||||
tmpdir=$(mktemp -d)
|
||||
ssh "$HOST_KERNEL" "ls ~/aios-kernel/linux-aios/linux-aios-*.pkg.tar.zst" | while read f; do scp "${HOST_KERNEL}:$f" "$tmpdir/"; done
|
||||
scp "$tmpdir"/linux-aios-*.pkg.tar.zst "$HOST":~/ai/repo/x86_64/
|
||||
rm -rf "$tmpdir"
|
||||
ssh "$HOST_KERNEL" "rm -rf ~/aios-kernel"
|
||||
}
|
||||
|
||||
function repo-db-update() {
|
||||
echo "=== Updating repo database ==="
|
||||
ssh "$HOST" zsh -s -- "$GPG_KEY" <<'REMOTE'
|
||||
set -e
|
||||
setopt nonomatch 2>/dev/null || true
|
||||
GPG_KEY="$1"
|
||||
@@ -114,4 +140,26 @@ git commit -m "update $(date +%Y.%m.%d)" || true
|
||||
git push
|
||||
|
||||
echo "=== Done ==="
|
||||
REPO_REMOTE
|
||||
REMOTE
|
||||
}
|
||||
|
||||
repo-env
|
||||
case "$1" in
|
||||
pkg)
|
||||
repo-pkg-build
|
||||
repo-db-update
|
||||
;;
|
||||
kernel)
|
||||
repo-kernel-patch
|
||||
repo-kernel-build
|
||||
repo-kernel-transfer
|
||||
repo-db-update
|
||||
;;
|
||||
kernel-test)
|
||||
repo-kernel-patch
|
||||
;;
|
||||
*)
|
||||
repo-pkg-build
|
||||
repo-db-update
|
||||
;;
|
||||
esac
|
||||
|
||||
@@ -1,249 +0,0 @@
|
||||
# Maintainer: syui <syui@syui.ai>
|
||||
# Based on: Arch Linux linux package by Jan Alexander Steffens (heftig)
|
||||
|
||||
pkgbase=linux-aios
|
||||
pkgver=6.19.8.arch1
|
||||
pkgrel=1
|
||||
pkgdesc='Linux (aios)'
|
||||
url='https://github.com/archlinux/linux'
|
||||
arch=(
|
||||
x86_64
|
||||
)
|
||||
license=(GPL-2.0-only)
|
||||
makedepends=(
|
||||
bc
|
||||
cpio
|
||||
gettext
|
||||
libelf
|
||||
pahole
|
||||
perl
|
||||
python
|
||||
rust
|
||||
rust-bindgen
|
||||
rust-src
|
||||
tar
|
||||
xz
|
||||
|
||||
)
|
||||
options=(
|
||||
!debug
|
||||
!strip
|
||||
)
|
||||
_srcname=linux-${pkgver%.*}
|
||||
_srctag=v${pkgver%.*}-${pkgver##*.}
|
||||
source=(
|
||||
https://cdn.kernel.org/pub/linux/kernel/v${pkgver%%.*}.x/${_srcname}.tar.{xz,sign}
|
||||
$url/releases/download/$_srctag/linux-$_srctag.patch.zst{,.sig}
|
||||
)
|
||||
source_x86_64=(config.x86_64)
|
||||
validpgpkeys=(
|
||||
ABAF11C65A2970B130ABE3C479BE3E4300411886 # Linus Torvalds
|
||||
647F28654894E3BD457199BE38DBBDC86092693E # Greg Kroah-Hartman
|
||||
83BC8889351B5DEBBB68416EB8AC08600F108CDF # Jan Alexander Steffens (heftig)
|
||||
)
|
||||
b2sums=('1bb4591dd0adb2472f31adbaaa5eae03743edf6e7a970173afb1ea1c659677102832d69e6ce692deee9ee757b36cba3d63b116a5eee81a7e5226462c40ae5ca0'
|
||||
'SKIP'
|
||||
'7e6a8cbbb3e9c9d9544f87f490534e68f2a7a7714d857649bc4c6ec60c024e5488641fedee664f7eb8e1cb743c738834fdf665b2660477bf223ca8273c2f38a4'
|
||||
'SKIP')
|
||||
b2sums_x86_64=('900786808bcfb20403ebc49d0dfa7793f5975288238258c3edeff1d1fc293a404844f26e56d7afbb3a14a504ce9fa9c939d444431de67017a612b7b99bb2fa4e')
|
||||
|
||||
# https://www.kernel.org/pub/linux/kernel/v6.x/sha256sums.asc
|
||||
sha256sums=('aada4722db8bcfa0b9732851856d405082b6a4fa2e3ab067be8db17cdd115b38'
|
||||
'SKIP'
|
||||
'4d02c253bc7f02101942d073b3b855c2a7f965db442ffb375c6259dddca240a4'
|
||||
'SKIP')
|
||||
|
||||
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
|
||||
sed -i "s/^EXTRAVERSION = .*/EXTRAVERSION =/" Makefile
|
||||
|
||||
echo "Setting version..."
|
||||
echo "" > localversion.10-pkgrel
|
||||
echo "-aios" > localversion.20-pkgname
|
||||
|
||||
local src
|
||||
for src in "${source[@]}"; do
|
||||
src="${src%%::*}"
|
||||
src="${src##*/}"
|
||||
src="${src%.zst}"
|
||||
[[ $src = *.patch ]] || continue
|
||||
echo "Applying patch $src..."
|
||||
patch -Np1 < "../$src"
|
||||
done
|
||||
|
||||
echo "Setting config..."
|
||||
cp ../config.$CARCH .config
|
||||
make olddefconfig
|
||||
diff -u ../config.$CARCH .config || :
|
||||
|
||||
make -s kernelrelease > version
|
||||
echo "Prepared $pkgbase version $(<version)"
|
||||
}
|
||||
|
||||
build() {
|
||||
cd $_srcname
|
||||
make all
|
||||
make -C tools/bpf/bpftool vmlinux.h feature-clang-bpf-co-re=1
|
||||
}
|
||||
|
||||
_package() {
|
||||
pkgdesc="The $pkgdesc kernel and modules"
|
||||
depends=(
|
||||
coreutils
|
||||
initramfs
|
||||
kmod
|
||||
)
|
||||
optdepends=(
|
||||
"$pkgbase-headers: headers and scripts for building modules"
|
||||
'linux-firmware: firmware images needed for some devices'
|
||||
'scx-scheds: to use sched-ext schedulers'
|
||||
'wireless-regdb: to set the correct wireless channels of your country'
|
||||
)
|
||||
provides=(
|
||||
KSMBD-MODULE
|
||||
NTSYNC-MODULE
|
||||
VIRTUALBOX-GUEST-MODULES
|
||||
WIREGUARD-MODULE
|
||||
)
|
||||
replaces=(
|
||||
virtualbox-guest-modules-arch
|
||||
wireguard-arch
|
||||
)
|
||||
|
||||
cd $_srcname
|
||||
local modulesdir="$pkgdir/usr/lib/modules/$(<version)"
|
||||
|
||||
echo "Installing boot image..."
|
||||
# systemd expects to find the kernel here to allow hibernation
|
||||
# https://github.com/systemd/systemd/commit/edda44605f06a41fb86b7ab8128dcf99161d2344
|
||||
install -Dm644 "$(make -s image_name)" "$modulesdir/vmlinuz"
|
||||
|
||||
# Used by mkinitcpio to name the kernel
|
||||
echo "$pkgbase" | install -Dm644 /dev/stdin "$modulesdir/pkgbase"
|
||||
|
||||
echo "Installing modules..."
|
||||
ZSTD_CLEVEL=19 make INSTALL_MOD_PATH="$pkgdir/usr" INSTALL_MOD_STRIP=1 \
|
||||
DEPMOD=/doesnt/exist modules_install # Suppress depmod
|
||||
|
||||
# remove build link
|
||||
rm "$modulesdir"/build
|
||||
}
|
||||
|
||||
_package-headers() {
|
||||
pkgdesc="Headers and scripts for building modules for the $pkgdesc kernel"
|
||||
depends=(pahole)
|
||||
provides=(LINUX-HEADERS)
|
||||
|
||||
cd $_srcname
|
||||
local builddir="$pkgdir/usr/lib/modules/$(<version)/build"
|
||||
|
||||
local karch
|
||||
case $CARCH in
|
||||
x86_64) karch=x86 ;;
|
||||
*) echo "Unknown CARCH $CARCH"; exit 1 ;;
|
||||
esac
|
||||
|
||||
echo "Installing build files..."
|
||||
install -Dt "$builddir" -m644 .config Makefile Module.symvers System.map \
|
||||
localversion.* version vmlinux tools/bpf/bpftool/vmlinux.h
|
||||
install -Dt "$builddir/kernel" -m644 kernel/Makefile
|
||||
install -Dt "$builddir/arch/$karch" -m644 arch/$karch/Makefile
|
||||
cp -t "$builddir" -a scripts
|
||||
ln -srt "$builddir" "$builddir/scripts/gdb/vmlinux-gdb.py"
|
||||
|
||||
if [[ $(scripts/config -s CONFIG_HAVE_STACK_VALIDATION) = y ]]; then
|
||||
install -Dt "$builddir/tools/objtool" tools/objtool/objtool
|
||||
fi
|
||||
|
||||
if [[ $(scripts/config -s CONFIG_DEBUG_INFO_BTF_MODULES) = y ]]; then
|
||||
install -Dt "$builddir/tools/bpf/resolve_btfids" tools/bpf/resolve_btfids/resolve_btfids
|
||||
fi
|
||||
|
||||
echo "Installing headers..."
|
||||
cp -t "$builddir" -a include
|
||||
cp -t "$builddir/arch/$karch" -a arch/$karch/include
|
||||
install -Dt "$builddir/arch/$karch/kernel" -m644 arch/$karch/kernel/asm-offsets.s
|
||||
|
||||
install -Dt "$builddir/drivers/md" -m644 drivers/md/*.h
|
||||
install -Dt "$builddir/net/mac80211" -m644 net/mac80211/*.h
|
||||
|
||||
# https://bugs.archlinux.org/task/13146
|
||||
install -Dt "$builddir/drivers/media/i2c" -m644 drivers/media/i2c/msp3400-driver.h
|
||||
|
||||
# https://bugs.archlinux.org/task/20402
|
||||
install -Dt "$builddir/drivers/media/usb/dvb-usb" -m644 drivers/media/usb/dvb-usb/*.h
|
||||
install -Dt "$builddir/drivers/media/dvb-frontends" -m644 drivers/media/dvb-frontends/*.h
|
||||
install -Dt "$builddir/drivers/media/tuners" -m644 drivers/media/tuners/*.h
|
||||
|
||||
# https://bugs.archlinux.org/task/71392
|
||||
install -Dt "$builddir/drivers/iio/common/hid-sensors" -m644 drivers/iio/common/hid-sensors/*.h
|
||||
|
||||
echo "Installing KConfig files..."
|
||||
find . -name 'Kconfig*' -exec install -Dm644 {} "$builddir/{}" \;
|
||||
|
||||
echo "Installing Rust files..."
|
||||
if [[ $(scripts/config -s CONFIG_RUST) = y ]]; then
|
||||
install -Dt "$builddir/rust" -m644 rust/*.rmeta
|
||||
install -Dt "$builddir/rust" rust/*.so
|
||||
fi
|
||||
|
||||
echo "Installing unstripped VDSO..."
|
||||
make INSTALL_MOD_PATH="$pkgdir/usr" vdso_install \
|
||||
link= # Suppress build-id symlinks
|
||||
|
||||
echo "Removing unneeded architectures..."
|
||||
local arch
|
||||
for arch in "$builddir"/arch/*/; do
|
||||
[[ $arch = */$karch/ ]] && continue
|
||||
echo "Removing $(basename "$arch")"
|
||||
rm -r "$arch"
|
||||
done
|
||||
|
||||
echo "Removing documentation..."
|
||||
rm -r "$builddir/Documentation"
|
||||
|
||||
echo "Removing broken symlinks..."
|
||||
find -L "$builddir" -type l -printf 'Removing %P\n' -delete
|
||||
|
||||
echo "Removing loose objects..."
|
||||
find "$builddir" -type f -name '*.o' -printf 'Removing %P\n' -delete
|
||||
|
||||
echo "Stripping build tools..."
|
||||
local file
|
||||
while read -rd '' file; do
|
||||
case "$(file -Sib "$file")" in
|
||||
application/x-sharedlib\;*) # Libraries (.so)
|
||||
strip -v $STRIP_SHARED "$file" ;;
|
||||
application/x-archive\;*) # Libraries (.a)
|
||||
strip -v $STRIP_STATIC "$file" ;;
|
||||
application/x-executable\;*) # Binaries
|
||||
strip -v $STRIP_BINARIES "$file" ;;
|
||||
application/x-pie-executable\;*) # Relocatable binaries
|
||||
strip -v $STRIP_SHARED "$file" ;;
|
||||
esac
|
||||
done < <(find "$builddir" -type f -perm -u+x ! -name vmlinux -print0)
|
||||
|
||||
echo "Stripping vmlinux..."
|
||||
strip -v $STRIP_STATIC "$builddir/vmlinux"
|
||||
|
||||
echo "Adding symlink..."
|
||||
mkdir -p "$pkgdir/usr/src"
|
||||
ln -sr "$builddir" "$pkgdir/usr/src/$pkgbase"
|
||||
}
|
||||
|
||||
pkgname=(
|
||||
"$pkgbase"
|
||||
"$pkgbase-headers"
|
||||
)
|
||||
for _p in "${pkgname[@]}"; do
|
||||
eval "package_$_p() {
|
||||
$(declare -f "_package${_p#$pkgbase}")
|
||||
_package${_p#$pkgbase}
|
||||
}"
|
||||
done
|
||||
|
||||
# vim:set ts=8 sts=2 sw=2 et:
|
||||
101
pkg/linux-aios/aios.patch
Normal file
101
pkg/linux-aios/aios.patch
Normal file
@@ -0,0 +1,101 @@
|
||||
--- a/PKGBUILD
|
||||
+++ b/PKGBUILD
|
||||
@@ -1,9 +1,10 @@
|
||||
-# Maintainer: Jan Alexander Steffens (heftig) <heftig@archlinux.org>
|
||||
+# Maintainer: syui <syui@syui.ai>
|
||||
+# Based on: Arch Linux linux package by Jan Alexander Steffens (heftig)
|
||||
|
||||
-pkgbase=linux
|
||||
+pkgbase=linux-aios
|
||||
pkgver=6.19.8.arch1
|
||||
pkgrel=1
|
||||
-pkgdesc='Linux'
|
||||
+pkgdesc='Linux (aios)'
|
||||
url='https://github.com/archlinux/linux'
|
||||
arch=(
|
||||
x86_64
|
||||
@@ -23,12 +24,6 @@
|
||||
tar
|
||||
xz
|
||||
|
||||
- # htmldocs
|
||||
- graphviz
|
||||
- imagemagick
|
||||
- python-sphinx
|
||||
- python-yaml
|
||||
- texlive-latexextra
|
||||
)
|
||||
options=(
|
||||
!debug
|
||||
@@ -65,9 +60,6 @@
|
||||
prepare() {
|
||||
cd $_srcname
|
||||
|
||||
- echo "Setting version..."
|
||||
- echo "-$pkgrel" > localversion.10-pkgrel
|
||||
- echo "${pkgbase#linux}" > localversion.20-pkgname
|
||||
|
||||
local src
|
||||
for src in "${source[@]}"; do
|
||||
@@ -79,6 +71,11 @@
|
||||
patch -Np1 < "../$src"
|
||||
done
|
||||
|
||||
+ echo "Setting version..."
|
||||
+ sed -i "s/^EXTRAVERSION = .*/EXTRAVERSION =/" Makefile
|
||||
+ echo "" > localversion.10-pkgrel
|
||||
+ echo "-aios" > localversion.20-pkgname
|
||||
+
|
||||
echo "Setting config..."
|
||||
cp ../config.$CARCH .config
|
||||
make olddefconfig
|
||||
@@ -92,7 +89,6 @@
|
||||
cd $_srcname
|
||||
make all
|
||||
make -C tools/bpf/bpftool vmlinux.h feature-clang-bpf-co-re=1
|
||||
- make htmldocs SPHINXOPTS=-QT
|
||||
}
|
||||
|
||||
_package() {
|
||||
@@ -208,6 +204,11 @@
|
||||
rm -r "$arch"
|
||||
done
|
||||
|
||||
+ echo "Setting version..."
|
||||
+ sed -i "s/^EXTRAVERSION = .*/EXTRAVERSION =/" Makefile
|
||||
+ echo "" > localversion.10-pkgrel
|
||||
+ echo "-aios" > localversion.20-pkgname
|
||||
+
|
||||
echo "Removing documentation..."
|
||||
rm -r "$builddir/Documentation"
|
||||
|
||||
@@ -240,29 +241,10 @@
|
||||
ln -sr "$builddir" "$pkgdir/usr/src/$pkgbase"
|
||||
}
|
||||
|
||||
-_package-docs() {
|
||||
- pkgdesc="Documentation for the $pkgdesc kernel"
|
||||
-
|
||||
- cd $_srcname
|
||||
- local builddir="$pkgdir/usr/lib/modules/$(<version)/build"
|
||||
-
|
||||
- echo "Installing documentation..."
|
||||
- local src dst
|
||||
- while read -rd '' src; do
|
||||
- dst="${src#Documentation/}"
|
||||
- dst="$builddir/Documentation/${dst#output/}"
|
||||
- install -Dm644 "$src" "$dst"
|
||||
- done < <(find Documentation -name '.*' -prune -o ! -type d -print0)
|
||||
-
|
||||
- echo "Adding symlink..."
|
||||
- mkdir -p "$pkgdir/usr/share/doc"
|
||||
- ln -sr "$builddir/Documentation" "$pkgdir/usr/share/doc/$pkgbase"
|
||||
-}
|
||||
|
||||
pkgname=(
|
||||
"$pkgbase"
|
||||
"$pkgbase-headers"
|
||||
- "$pkgbase-docs"
|
||||
)
|
||||
for _p in "${pkgname[@]}"; do
|
||||
eval "package_$_p() {
|
||||
File diff suppressed because it is too large
Load Diff
Reference in New Issue
Block a user