From e6a48b1cc86f31511209c1a2a1756b6be0004694 Mon Sep 17 00:00:00 2001 From: "Ycarus (Yannick Chabanois)" Date: Sat, 31 Oct 2020 09:35:50 +0100 Subject: [PATCH 1/2] Fix version display --- build.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build.sh b/build.sh index 39f4437c..5539da02 100755 --- a/build.sh +++ b/build.sh @@ -39,7 +39,7 @@ OMR_TARGET_CONFIG="config-$OMR_TARGET" OMR_KERNEL=${OMR_KERNEL:-5.4} #OMR_RELEASE=${OMR_RELEASE:-$(git describe --tags `git rev-list --tags --max-count=1` | sed 's/^\([0-9.]*\).*/\1/')} #OMR_RELEASE=${OMR_RELEASE:-$(git tag --sort=committerdate | tail -1)} -OMR_RELEASE=${OMR_RELEASE:-$(git describe --tags `git rev-list --tags --max-count=1` | tail -1)} +OMR_RELEASE=${OMR_RELEASE:-$(git describe --tags `git rev-list --tags --max-count=1` | tail -1 | cut -d '-' -f1)} OMR_REPO=${OMR_REPO:-http://$OMR_HOST:$OMR_PORT/release/$OMR_RELEASE/$OMR_TARGET} OMR_FEED_URL="${OMR_FEED_URL:-https://github.com/ysurac/openmptcprouter-feeds}" From c09ea7be1224215daf5e48940c20552ba740303f Mon Sep 17 00:00:00 2001 From: "Ycarus (Yannick Chabanois)" Date: Sat, 31 Oct 2020 09:53:32 +0100 Subject: [PATCH 2/2] Fix arm64 kernel options --- config-bpi-r64 | 2 +- config-rpi4 | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/config-bpi-r64 b/config-bpi-r64 index dbbb6649..c2eefeed 100644 --- a/config-bpi-r64 +++ b/config-bpi-r64 @@ -6,4 +6,4 @@ CONFIG_TARGET_mediatek_mt7622_DEVICE_bpi_bananapi-r64=y CONFIG_PACKAGE_uboot-mediatek=y CONFIG_PACKAGE_uboot-envtools=y CONFIG_PACKAGE_mt7622-preloader=y -CONFIG_KERNEL_ARM_MODULE_PLTS=y +CONFIG_KERNEL_ARM64_MODULE_PLTS=y diff --git a/config-rpi4 b/config-rpi4 index 39fb7fb7..673501f4 100644 --- a/config-rpi4 +++ b/config-rpi4 @@ -5,4 +5,4 @@ CONFIG_PACKAGE_kmod-ath10k-ct=n CONFIG_PACKAGE_kmod-ath9k=y CONFIG_PACKAGE_bcm27xx-eeprom=y CONFIG_PACKAGE_bcm27xx-userland=y -CONFIG_KERNEL_ARM_MODULE_PLTS=y +CONFIG_KERNEL_ARM64_MODULE_PLTS=y