mirror of
https://github.com/LibreELEC/LibreELEC.tv.git
synced 2025-07-28 05:06:43 +00:00
Merge pull request #2466 from MilhouseVH/linux41416+
linux: update to linux-4.14.20
This commit is contained in:
commit
c06f971a63
@ -47,8 +47,8 @@ case "$LINUX" in
|
|||||||
PKG_DEPENDS_TARGET="$PKG_DEPENDS_TARGET aml-dtbtools:host"
|
PKG_DEPENDS_TARGET="$PKG_DEPENDS_TARGET aml-dtbtools:host"
|
||||||
;;
|
;;
|
||||||
*)
|
*)
|
||||||
PKG_VERSION="4.14.15"
|
PKG_VERSION="4.14.20"
|
||||||
PKG_SHA256="ffc393a0c66f80375eacd3fb177b92e5c9daa07de0dcf947e925e049352e6142"
|
PKG_SHA256="4ab7f42aa6af9c1e3b00cba6b1fa305a87407666aaa2fae555f7fbdaafb6d292"
|
||||||
PKG_URL="https://www.kernel.org/pub/linux/kernel/v4.x/$PKG_NAME-$PKG_VERSION.tar.xz"
|
PKG_URL="https://www.kernel.org/pub/linux/kernel/v4.x/$PKG_NAME-$PKG_VERSION.tar.xz"
|
||||||
PKG_PATCH_DIRS="default"
|
PKG_PATCH_DIRS="default"
|
||||||
;;
|
;;
|
||||||
|
@ -1,6 +1,6 @@
|
|||||||
#
|
#
|
||||||
# Automatically generated file; DO NOT EDIT.
|
# Automatically generated file; DO NOT EDIT.
|
||||||
# Linux/x86_64 4.14.14 Kernel Configuration
|
# Linux/x86_64 4.14.17 Kernel Configuration
|
||||||
#
|
#
|
||||||
CONFIG_64BIT=y
|
CONFIG_64BIT=y
|
||||||
CONFIG_X86_64=y
|
CONFIG_X86_64=y
|
||||||
@ -5256,6 +5256,7 @@ CONFIG_CRYPTO_RNG2=y
|
|||||||
CONFIG_CRYPTO_RNG_DEFAULT=y
|
CONFIG_CRYPTO_RNG_DEFAULT=y
|
||||||
CONFIG_CRYPTO_AKCIPHER2=y
|
CONFIG_CRYPTO_AKCIPHER2=y
|
||||||
CONFIG_CRYPTO_KPP2=y
|
CONFIG_CRYPTO_KPP2=y
|
||||||
|
CONFIG_CRYPTO_KPP=m
|
||||||
CONFIG_CRYPTO_ACOMP2=y
|
CONFIG_CRYPTO_ACOMP2=y
|
||||||
# CONFIG_CRYPTO_RSA is not set
|
# CONFIG_CRYPTO_RSA is not set
|
||||||
# CONFIG_CRYPTO_DH is not set
|
# CONFIG_CRYPTO_DH is not set
|
||||||
|
@ -1,6 +1,6 @@
|
|||||||
#
|
#
|
||||||
# Automatically generated file; DO NOT EDIT.
|
# Automatically generated file; DO NOT EDIT.
|
||||||
# Linux/arm 4.14.15 Kernel Configuration
|
# Linux/arm 4.14.17 Kernel Configuration
|
||||||
#
|
#
|
||||||
CONFIG_ARM=y
|
CONFIG_ARM=y
|
||||||
CONFIG_ARM_HAS_SG_CHAIN=y
|
CONFIG_ARM_HAS_SG_CHAIN=y
|
||||||
@ -3089,14 +3089,14 @@ CONFIG_SND_SOC_I2C_AND_SPI=m
|
|||||||
CONFIG_SND_SOC_ARIZONA=m
|
CONFIG_SND_SOC_ARIZONA=m
|
||||||
CONFIG_SND_SOC_WM_ADSP=m
|
CONFIG_SND_SOC_WM_ADSP=m
|
||||||
# CONFIG_SND_SOC_AC97_CODEC is not set
|
# CONFIG_SND_SOC_AC97_CODEC is not set
|
||||||
# CONFIG_SND_SOC_ADAU1701 is not set
|
CONFIG_SND_SOC_ADAU1701=m
|
||||||
# CONFIG_SND_SOC_ADAU1761_I2C is not set
|
# CONFIG_SND_SOC_ADAU1761_I2C is not set
|
||||||
# CONFIG_SND_SOC_ADAU1761_SPI is not set
|
# CONFIG_SND_SOC_ADAU1761_SPI is not set
|
||||||
CONFIG_SND_SOC_ADAU1977=m
|
CONFIG_SND_SOC_ADAU1977=m
|
||||||
CONFIG_SND_SOC_ADAU1977_I2C=m
|
CONFIG_SND_SOC_ADAU1977_I2C=m
|
||||||
CONFIG_SND_SOC_ADAU7002=m
|
CONFIG_SND_SOC_ADAU7002=m
|
||||||
# CONFIG_SND_SOC_AK4104 is not set
|
# CONFIG_SND_SOC_AK4104 is not set
|
||||||
# CONFIG_SND_SOC_AK4554 is not set
|
CONFIG_SND_SOC_AK4554=m
|
||||||
# CONFIG_SND_SOC_AK4613 is not set
|
# CONFIG_SND_SOC_AK4613 is not set
|
||||||
# CONFIG_SND_SOC_AK4642 is not set
|
# CONFIG_SND_SOC_AK4642 is not set
|
||||||
# CONFIG_SND_SOC_AK5386 is not set
|
# CONFIG_SND_SOC_AK5386 is not set
|
||||||
@ -3113,7 +3113,8 @@ CONFIG_SND_SOC_ADAU7002=m
|
|||||||
# CONFIG_SND_SOC_CS42L73 is not set
|
# CONFIG_SND_SOC_CS42L73 is not set
|
||||||
CONFIG_SND_SOC_CS4265=m
|
CONFIG_SND_SOC_CS4265=m
|
||||||
# CONFIG_SND_SOC_CS4270 is not set
|
# CONFIG_SND_SOC_CS4270 is not set
|
||||||
# CONFIG_SND_SOC_CS4271_I2C is not set
|
CONFIG_SND_SOC_CS4271=m
|
||||||
|
CONFIG_SND_SOC_CS4271_I2C=m
|
||||||
# CONFIG_SND_SOC_CS4271_SPI is not set
|
# CONFIG_SND_SOC_CS4271_SPI is not set
|
||||||
CONFIG_SND_SOC_CS42XX8=m
|
CONFIG_SND_SOC_CS42XX8=m
|
||||||
CONFIG_SND_SOC_CS42XX8_I2C=m
|
CONFIG_SND_SOC_CS42XX8_I2C=m
|
||||||
@ -3146,8 +3147,10 @@ CONFIG_SND_SOC_PCM1794A=m
|
|||||||
# CONFIG_SND_SOC_RT5631 is not set
|
# CONFIG_SND_SOC_RT5631 is not set
|
||||||
# CONFIG_SND_SOC_RT5677_SPI is not set
|
# CONFIG_SND_SOC_RT5677_SPI is not set
|
||||||
CONFIG_SND_SOC_SGTL5000=m
|
CONFIG_SND_SOC_SGTL5000=m
|
||||||
|
CONFIG_SND_SOC_SIGMADSP=m
|
||||||
|
CONFIG_SND_SOC_SIGMADSP_I2C=m
|
||||||
# CONFIG_SND_SOC_SIRF_AUDIO_CODEC is not set
|
# CONFIG_SND_SOC_SIRF_AUDIO_CODEC is not set
|
||||||
# CONFIG_SND_SOC_SPDIF is not set
|
CONFIG_SND_SOC_SPDIF=m
|
||||||
# CONFIG_SND_SOC_SSM2602_SPI is not set
|
# CONFIG_SND_SOC_SSM2602_SPI is not set
|
||||||
# CONFIG_SND_SOC_SSM2602_I2C is not set
|
# CONFIG_SND_SOC_SSM2602_I2C is not set
|
||||||
# CONFIG_SND_SOC_SSM4567 is not set
|
# CONFIG_SND_SOC_SSM4567 is not set
|
||||||
@ -3193,9 +3196,10 @@ CONFIG_SND_SOC_WM8804_I2C=m
|
|||||||
# CONFIG_SND_SOC_NAU8810 is not set
|
# CONFIG_SND_SOC_NAU8810 is not set
|
||||||
# CONFIG_SND_SOC_NAU8824 is not set
|
# CONFIG_SND_SOC_NAU8824 is not set
|
||||||
CONFIG_SND_SOC_TPA6130A2=m
|
CONFIG_SND_SOC_TPA6130A2=m
|
||||||
# CONFIG_SND_SIMPLE_CARD is not set
|
CONFIG_SND_SIMPLE_CARD_UTILS=m
|
||||||
|
CONFIG_SND_SIMPLE_CARD=m
|
||||||
# CONFIG_SND_SIMPLE_SCU_CARD is not set
|
# CONFIG_SND_SIMPLE_SCU_CARD is not set
|
||||||
# CONFIG_SND_AUDIO_GRAPH_CARD is not set
|
CONFIG_SND_AUDIO_GRAPH_CARD=m
|
||||||
# CONFIG_SND_AUDIO_GRAPH_SCU_CARD is not set
|
# CONFIG_SND_AUDIO_GRAPH_SCU_CARD is not set
|
||||||
|
|
||||||
#
|
#
|
||||||
@ -4429,6 +4433,7 @@ CONFIG_CRYPTO_RNG2=y
|
|||||||
CONFIG_CRYPTO_RNG_DEFAULT=y
|
CONFIG_CRYPTO_RNG_DEFAULT=y
|
||||||
CONFIG_CRYPTO_AKCIPHER2=y
|
CONFIG_CRYPTO_AKCIPHER2=y
|
||||||
CONFIG_CRYPTO_KPP2=y
|
CONFIG_CRYPTO_KPP2=y
|
||||||
|
CONFIG_CRYPTO_KPP=m
|
||||||
CONFIG_CRYPTO_ACOMP2=y
|
CONFIG_CRYPTO_ACOMP2=y
|
||||||
# CONFIG_CRYPTO_RSA is not set
|
# CONFIG_CRYPTO_RSA is not set
|
||||||
# CONFIG_CRYPTO_DH is not set
|
# CONFIG_CRYPTO_DH is not set
|
||||||
|
@ -1,6 +1,6 @@
|
|||||||
#
|
#
|
||||||
# Automatically generated file; DO NOT EDIT.
|
# Automatically generated file; DO NOT EDIT.
|
||||||
# Linux/arm 4.14.15 Kernel Configuration
|
# Linux/arm 4.14.17 Kernel Configuration
|
||||||
#
|
#
|
||||||
CONFIG_ARM=y
|
CONFIG_ARM=y
|
||||||
CONFIG_ARM_HAS_SG_CHAIN=y
|
CONFIG_ARM_HAS_SG_CHAIN=y
|
||||||
@ -3187,14 +3187,14 @@ CONFIG_SND_SOC_I2C_AND_SPI=m
|
|||||||
CONFIG_SND_SOC_ARIZONA=m
|
CONFIG_SND_SOC_ARIZONA=m
|
||||||
CONFIG_SND_SOC_WM_ADSP=m
|
CONFIG_SND_SOC_WM_ADSP=m
|
||||||
# CONFIG_SND_SOC_AC97_CODEC is not set
|
# CONFIG_SND_SOC_AC97_CODEC is not set
|
||||||
# CONFIG_SND_SOC_ADAU1701 is not set
|
CONFIG_SND_SOC_ADAU1701=m
|
||||||
# CONFIG_SND_SOC_ADAU1761_I2C is not set
|
# CONFIG_SND_SOC_ADAU1761_I2C is not set
|
||||||
# CONFIG_SND_SOC_ADAU1761_SPI is not set
|
# CONFIG_SND_SOC_ADAU1761_SPI is not set
|
||||||
CONFIG_SND_SOC_ADAU1977=m
|
CONFIG_SND_SOC_ADAU1977=m
|
||||||
CONFIG_SND_SOC_ADAU1977_I2C=m
|
CONFIG_SND_SOC_ADAU1977_I2C=m
|
||||||
CONFIG_SND_SOC_ADAU7002=m
|
CONFIG_SND_SOC_ADAU7002=m
|
||||||
# CONFIG_SND_SOC_AK4104 is not set
|
# CONFIG_SND_SOC_AK4104 is not set
|
||||||
# CONFIG_SND_SOC_AK4554 is not set
|
CONFIG_SND_SOC_AK4554=m
|
||||||
# CONFIG_SND_SOC_AK4613 is not set
|
# CONFIG_SND_SOC_AK4613 is not set
|
||||||
# CONFIG_SND_SOC_AK4642 is not set
|
# CONFIG_SND_SOC_AK4642 is not set
|
||||||
# CONFIG_SND_SOC_AK5386 is not set
|
# CONFIG_SND_SOC_AK5386 is not set
|
||||||
@ -3211,7 +3211,8 @@ CONFIG_SND_SOC_ADAU7002=m
|
|||||||
# CONFIG_SND_SOC_CS42L73 is not set
|
# CONFIG_SND_SOC_CS42L73 is not set
|
||||||
CONFIG_SND_SOC_CS4265=m
|
CONFIG_SND_SOC_CS4265=m
|
||||||
# CONFIG_SND_SOC_CS4270 is not set
|
# CONFIG_SND_SOC_CS4270 is not set
|
||||||
# CONFIG_SND_SOC_CS4271_I2C is not set
|
CONFIG_SND_SOC_CS4271=m
|
||||||
|
CONFIG_SND_SOC_CS4271_I2C=m
|
||||||
# CONFIG_SND_SOC_CS4271_SPI is not set
|
# CONFIG_SND_SOC_CS4271_SPI is not set
|
||||||
CONFIG_SND_SOC_CS42XX8=m
|
CONFIG_SND_SOC_CS42XX8=m
|
||||||
CONFIG_SND_SOC_CS42XX8_I2C=m
|
CONFIG_SND_SOC_CS42XX8_I2C=m
|
||||||
@ -3244,8 +3245,10 @@ CONFIG_SND_SOC_PCM1794A=m
|
|||||||
# CONFIG_SND_SOC_RT5631 is not set
|
# CONFIG_SND_SOC_RT5631 is not set
|
||||||
# CONFIG_SND_SOC_RT5677_SPI is not set
|
# CONFIG_SND_SOC_RT5677_SPI is not set
|
||||||
CONFIG_SND_SOC_SGTL5000=m
|
CONFIG_SND_SOC_SGTL5000=m
|
||||||
|
CONFIG_SND_SOC_SIGMADSP=m
|
||||||
|
CONFIG_SND_SOC_SIGMADSP_I2C=m
|
||||||
# CONFIG_SND_SOC_SIRF_AUDIO_CODEC is not set
|
# CONFIG_SND_SOC_SIRF_AUDIO_CODEC is not set
|
||||||
# CONFIG_SND_SOC_SPDIF is not set
|
CONFIG_SND_SOC_SPDIF=m
|
||||||
# CONFIG_SND_SOC_SSM2602_SPI is not set
|
# CONFIG_SND_SOC_SSM2602_SPI is not set
|
||||||
# CONFIG_SND_SOC_SSM2602_I2C is not set
|
# CONFIG_SND_SOC_SSM2602_I2C is not set
|
||||||
# CONFIG_SND_SOC_SSM4567 is not set
|
# CONFIG_SND_SOC_SSM4567 is not set
|
||||||
@ -3291,9 +3294,10 @@ CONFIG_SND_SOC_WM8804_I2C=m
|
|||||||
# CONFIG_SND_SOC_NAU8810 is not set
|
# CONFIG_SND_SOC_NAU8810 is not set
|
||||||
# CONFIG_SND_SOC_NAU8824 is not set
|
# CONFIG_SND_SOC_NAU8824 is not set
|
||||||
CONFIG_SND_SOC_TPA6130A2=m
|
CONFIG_SND_SOC_TPA6130A2=m
|
||||||
# CONFIG_SND_SIMPLE_CARD is not set
|
CONFIG_SND_SIMPLE_CARD_UTILS=m
|
||||||
|
CONFIG_SND_SIMPLE_CARD=m
|
||||||
# CONFIG_SND_SIMPLE_SCU_CARD is not set
|
# CONFIG_SND_SIMPLE_SCU_CARD is not set
|
||||||
# CONFIG_SND_AUDIO_GRAPH_CARD is not set
|
CONFIG_SND_AUDIO_GRAPH_CARD=m
|
||||||
# CONFIG_SND_AUDIO_GRAPH_SCU_CARD is not set
|
# CONFIG_SND_AUDIO_GRAPH_SCU_CARD is not set
|
||||||
|
|
||||||
#
|
#
|
||||||
@ -4535,6 +4539,7 @@ CONFIG_CRYPTO_RNG2=y
|
|||||||
CONFIG_CRYPTO_RNG_DEFAULT=y
|
CONFIG_CRYPTO_RNG_DEFAULT=y
|
||||||
CONFIG_CRYPTO_AKCIPHER2=y
|
CONFIG_CRYPTO_AKCIPHER2=y
|
||||||
CONFIG_CRYPTO_KPP2=y
|
CONFIG_CRYPTO_KPP2=y
|
||||||
|
CONFIG_CRYPTO_KPP=m
|
||||||
CONFIG_CRYPTO_ACOMP2=y
|
CONFIG_CRYPTO_ACOMP2=y
|
||||||
# CONFIG_CRYPTO_RSA is not set
|
# CONFIG_CRYPTO_RSA is not set
|
||||||
# CONFIG_CRYPTO_DH is not set
|
# CONFIG_CRYPTO_DH is not set
|
||||||
|
File diff suppressed because it is too large
Load Diff
@ -74,13 +74,14 @@ fi
|
|||||||
# Apply the following config change to reduce chance of duplicate hashes
|
# Apply the following config change to reduce chance of duplicate hashes
|
||||||
git config --local core.abbrev 40
|
git config --local core.abbrev 40
|
||||||
|
|
||||||
git fetch --all --depth=${DEPTH}
|
git fetch --all --depth=${DEPTH} --no-tags
|
||||||
git reset --hard origin/rpi-${BRANCH}.y${REBASE}
|
git reset --hard origin/rpi-${BRANCH}.y${REBASE}
|
||||||
|
|
||||||
if [ -n "${BASEREV}" ]; then
|
if [ -n "${BASEREV}" ]; then
|
||||||
:
|
:
|
||||||
elif [ -z "${KERNEL}" ]; then
|
elif [ -z "${KERNEL}" ]; then
|
||||||
BASEREV="linux-stable/linux-${BRANCH}.y"
|
BASEREV="linux-stable/linux-${BRANCH}.y"
|
||||||
|
KERNEL="$(git log --grep "Linux ${BRANCH}" --pretty=oneline | head -1 | awk '{ print $NF }')"
|
||||||
else
|
else
|
||||||
BASEREV="$(git log --grep "Linux ${KERNEL}" --pretty=oneline | head -1)"
|
BASEREV="$(git log --grep "Linux ${KERNEL}" --pretty=oneline | head -1)"
|
||||||
[ -z "${BASEREV}" ] && BASEREV="$(git log --grep "Linux v${KERNEL}" --pretty=oneline | head -1)"
|
[ -z "${BASEREV}" ] && BASEREV="$(git log --grep "Linux v${KERNEL}" --pretty=oneline | head -1)"
|
||||||
@ -93,7 +94,7 @@ else
|
|||||||
BASEREV="${BASEREV%% *}"
|
BASEREV="${BASEREV%% *}"
|
||||||
fi
|
fi
|
||||||
|
|
||||||
GIT_SEQUENCE_EDITOR=${BIN}/rpi-linux-rebase.sh git rebase -i ${BASEREV}
|
GIT_SEQUENCE_EDITOR=${BIN}/rpi-linux-rebase.sh git rebase -Xours -i ${BASEREV}
|
||||||
git format-patch --no-signature --stdout ${BASEREV} > /tmp/linux-01-RPi_support.patch
|
git format-patch --no-signature --stdout ${BASEREV} > /tmp/linux-01-RPi_support.patch
|
||||||
|
|
||||||
cd .. && rm -fr raspberrypi-linux
|
cd .. && rm -fr raspberrypi-linux
|
||||||
@ -103,6 +104,7 @@ cat /tmp/dropped
|
|||||||
|
|
||||||
echo
|
echo
|
||||||
echo "Dropped patches: /tmp/dropped"
|
echo "Dropped patches: /tmp/dropped"
|
||||||
|
|
||||||
echo "New patch file : /tmp/linux-01-RPi_support.patch"
|
echo "New patch file : /tmp/linux-01-RPi_support.patch"
|
||||||
|
|
||||||
echo
|
echo
|
||||||
|
Loading…
x
Reference in New Issue
Block a user