From 2e719300a037bbdafdc8a5c38b4812c678d62ddc Mon Sep 17 00:00:00 2001 From: Nicholas Date: Fri, 10 Dec 2021 15:49:00 -0800 Subject: Chore: merge main into laptop --- vendor/sync | 38 ++++++++++++++++++++++++++++++++++---- 1 file changed, 34 insertions(+), 4 deletions(-) (limited to 'vendor/sync') diff --git a/vendor/sync b/vendor/sync index 5daf751..48895f8 100755 --- a/vendor/sync +++ b/vendor/sync @@ -1,4 +1,4 @@ -#!/bin/sh +#!/bin/bash -e # globals @@ -182,6 +182,35 @@ build_wlroots() echo $WLROOTS_TAG > wlroots/build.tag } +# ------------------------------------------------------------------------ +# kernel headers + +KERNEL_URL="https://github.com/sabotage-linux/kernel-headers" +KERNEL_TAG="v4.19.88-1" + +build_kernel() +{ + git clone $KERNEL_URL kernel + cd kernel && git checkout $KERNEL_TAG + + # probably wrong for risxv64 + for subdir in linux asm asm-generic + do + for arch in amd64 i386 riscv64 + do + cp -rL "./x86/include/$subdir" "../../sys/linux/$arch/$subdir" + done + for arch in arm arm64 + do + cp -rL "$arch/include/$subdir" "../../sys/linux/$arch/$subdir" + done + done + + cd $VENDOR + echo $KERNEL_TAG > kernel/build.tag +} + + # ------------------------------------------------------------------------ # utility functions @@ -190,10 +219,10 @@ update() base=$1 tag=$2 - if [ -d $base ] && [ `cat $base/build.tag` = $tag ]; then + if [ -d "$base" ] && [ "$(cat "$base/build.tag")" = "$tag" ]; then echo "$base: up to date" else - build_$base + "build_$base" fi } @@ -205,4 +234,5 @@ update() update musl $MUSL_TAG update zlib $ZLIB_TAG -update wlroots $WLROOTS_TAG +update kernel $WLROOTS_TAG +# update wlroots $WLROOTS_TAG -- cgit v1.2.1