1
0
Fork 0
mirror of https://github.com/Ysurac/openmptcprouter.git synced 2025-03-09 15:40:20 +00:00

Merge branch 'develop' into master

This commit is contained in:
Ycarus (Yannick Chabanois) 2020-10-31 09:53:49 +01:00
commit 54302ebcd7
3 changed files with 3 additions and 3 deletions

View file

@ -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}"

View file

@ -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

View file

@ -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