From da448d2bfd870988dc86e59a891275d9c1b42e3f Mon Sep 17 00:00:00 2001 From: Raphael <68374617+raphaelscholle@users.noreply.github.com> Date: Tue, 23 Apr 2024 23:24:57 +0200 Subject: [PATCH] Update BuildRock5ForOpenHD.yaml --- .github/workflows/BuildRock5ForOpenHD.yaml | 21 +++++++++------------ 1 file changed, 9 insertions(+), 12 deletions(-) diff --git a/.github/workflows/BuildRock5ForOpenHD.yaml b/.github/workflows/BuildRock5ForOpenHD.yaml index a14b1673a88c1..280eba84bdabc 100644 --- a/.github/workflows/BuildRock5ForOpenHD.yaml +++ b/.github/workflows/BuildRock5ForOpenHD.yaml @@ -26,18 +26,15 @@ jobs: git clone https://github.com/radxa-repo/bsp --recursive cd bsp chmod +x bsp - # cd linux - # mv .rk3588 rk3588 - # cd .. - # sed -i '/local kernelversion="\$(bsp_version)"/a \ local DATE=$(date +'%Y-%m-%d-%H-%M')' lib/linux.sh - # sed -i 's/LOCALVERSION=-$PKG_REVISION-$FORK KERNELRELEASE=$kernelversion-$PKG_REVISION-$FORK KDEB_PKGVERSION=$kernelversion-${PKG_REVISION}${SOURCE_GITREV:+-$SOURCE_GITREV}/LOCALVERSION=-$PKG_REVISION-$FORK KERNELRELEASE=$kernelversion-$PKG_REVISION-$FORK KDEB_PKGVERSION=$kernelversion-${PKG_REVISION}-${DATE}-${SOURCE_GITREV:+-$SOURCE_GITREV}/g' lib/linux.sh - # sed -i 's/BSP_GIT="https:\/\/github.com\/radxa\/kernel.git"/BSP_GIT="https:\/\/github.com\/openhd\/linux-rock.git"/' linux/rk3588/fork.conf - # sed -i 's#BSP_BRANCH="[^"]*"#BSP_BRANCH="'"$BRANCH"'"#' linux/rk3588/fork.conf - # COMMITHASH=$(curl -s https://api.github.com/repos/OpenHD/overlays/commits/main | grep '"sha"' | head -n 1 | cut -d '"' -f 4) - # echo 'custom_source_action() { - # git_source https://github.com/openhd/overlays.git '"$COMMITHASH"' - # cp -r $SCRIPT_DIR/.src/overlays/arch $TARGET_DIR - # }' > linux/.common/overlays.sh + sed -i '/local kernelversion="\$(bsp_version)"/a \ local DATE=$(date +'%Y-%m-%d-%H-%M')' lib/linux.sh + sed -i 's/LOCALVERSION=-$PKG_REVISION-$FORK KERNELRELEASE=$kernelversion-$PKG_REVISION-$FORK KDEB_PKGVERSION=$kernelversion-${PKG_REVISION}${SOURCE_GITREV:+-$SOURCE_GITREV}/LOCALVERSION=-$PKG_REVISION-$FORK KERNELRELEASE=$kernelversion-$PKG_REVISION-$FORK KDEB_PKGVERSION=$kernelversion-${PKG_REVISION}-${DATE}-${SOURCE_GITREV:+-$SOURCE_GITREV}/g' lib/linux.sh + sed -i 's/BSP_GIT="https:\/\/github.com\/radxa\/kernel.git"/BSP_GIT="https:\/\/github.com\/openhd\/linux-rock.git"/' linux/rockchip/fork.conf + sed -i 's#BSP_BRANCH="[^"]*"#BSP_BRANCH="'"$BRANCH"'"#' linux/rockchip/fork.conf + COMMITHASH=$(curl -s https://api.github.com/repos/OpenHD/overlays/commits/main | grep '"sha"' | head -n 1 | cut -d '"' -f 4) + echo 'custom_source_action() { + git_source https://github.com/openhd/overlays.git '"$COMMITHASH"' + cp -r $SCRIPT_DIR/.src/overlays/arch $TARGET_DIR + }' > linux/.common/overlays.sh # patch -p1 -i ../scripts/patches/openhd_utils.patch - name: build kernel