diff --git a/config/functions b/config/functions index b7bb809469..52aec3771c 100644 --- a/config/functions +++ b/config/functions @@ -160,6 +160,24 @@ flag_enabled() { fi } +setup_pkg_config_target() { + export PKG_CONFIG="$TOOLCHAIN/bin/pkg-config" + export PKG_CONFIG_PATH="" + export PKG_CONFIG_LIBDIR="$SYSROOT_PREFIX/usr/lib/pkgconfig:$SYSROOT_PREFIX/usr/share/pkgconfig" + export PKG_CONFIG_SYSROOT_DIR="$SYSROOT_PREFIX" + export PKG_CONFIG_ALLOW_SYSTEM_CFLAGS=1 + export PKG_CONFIG_ALLOW_SYSTEM_LIBS=1 +} + +setup_pkg_config_host() { + export PKG_CONFIG="$TOOLCHAIN/bin/pkg-config" + export PKG_CONFIG_PATH="" + export PKG_CONFIG_LIBDIR="$TOOLCHAIN/lib/pkgconfig:$TOOLCHAIN/share/pkgconfig" + export PKG_CONFIG_SYSROOT_DIR="" + unset PKG_CONFIG_ALLOW_SYSTEM_CFLAGS + unset PKG_CONFIG_ALLOW_SYSTEM_LIBS +} + setup_toolchain() { if [ "$LTO_SUPPORT" = "yes" ]; then if flag_enabled "lto-parallel" "no"; then @@ -241,12 +259,7 @@ setup_toolchain() { export CFLAGS="$TARGET_CFLAGS" export CXXFLAGS="$TARGET_CXXFLAGS" export LDFLAGS="$TARGET_LDFLAGS" - export PKG_CONFIG="$TOOLCHAIN/bin/pkg-config" - export PKG_CONFIG_PATH="" - export PKG_CONFIG_LIBDIR="$SYSROOT_PREFIX/usr/lib/pkgconfig:$SYSROOT_PREFIX/usr/share/pkgconfig" - export PKG_CONFIG_SYSROOT_DIR="$SYSROOT_PREFIX" - export PKG_CONFIG_ALLOW_SYSTEM_CFLAGS=1 - export PKG_CONFIG_ALLOW_SYSTEM_LIBS=1 + setup_pkg_config_target export CMAKE_CONF=$TOOLCHAIN/etc/cmake-$TARGET_NAME.conf export CMAKE="cmake -DCMAKE_TOOLCHAIN_FILE=$CMAKE_CONF -DCMAKE_INSTALL_PREFIX=/usr" if [ ! -f $CMAKE_CONF ] ; then @@ -293,12 +306,7 @@ setup_toolchain() { export CFLAGS="$HOST_CFLAGS" export CXXFLAGS="$HOST_CXXFLAGS" export LDFLAGS="$HOST_LDFLAGS" - export PKG_CONFIG="$TOOLCHAIN/bin/pkg-config" - export PKG_CONFIG_PATH="" - export PKG_CONFIG_LIBDIR="$TOOLCHAIN/lib/pkgconfig:$TOOLCHAIN/share/pkgconfig" - export PKG_CONFIG_SYSROOT_DIR="" - unset PKG_CONFIG_ALLOW_SYSTEM_CFLAGS - unset PKG_CONFIG_ALLOW_SYSTEM_LIBS + setup_pkg_config_host export CMAKE_CONF=$TOOLCHAIN/etc/cmake-$HOST_NAME.conf export CMAKE="cmake -DCMAKE_TOOLCHAIN_FILE=$CMAKE_CONF -DCMAKE_INSTALL_PREFIX=$TOOLCHAIN" if [ ! -f $CMAKE_CONF ] ; then @@ -966,15 +974,19 @@ kernel_config_path() { } kernel_make() { - LDFLAGS="" make CROSS_COMPILE=$TARGET_KERNEL_PREFIX \ - ARCH="$TARGET_KERNEL_ARCH" \ - HOSTCC="$TOOLCHAIN/bin/host-gcc" \ - HOSTCXX="$TOOLCHAIN/bin/host-g++" \ - HOSTCFLAGS="$HOST_CFLAGS" \ - HOSTLDFLAGS="$HOST_LDFLAGS" \ - HOSTCXXFLAGS="$HOST_CXXFLAGS" \ - DEPMOD="$TOOLCHAIN/bin/depmod" \ - "$@" + ( + setup_pkg_config_host + + LDFLAGS="" make CROSS_COMPILE=$TARGET_KERNEL_PREFIX \ + ARCH="$TARGET_KERNEL_ARCH" \ + HOSTCC="$TOOLCHAIN/bin/host-gcc" \ + HOSTCXX="$TOOLCHAIN/bin/host-g++" \ + HOSTCFLAGS="$HOST_CFLAGS" \ + HOSTLDFLAGS="$HOST_LDFLAGS" \ + HOSTCXXFLAGS="$HOST_CXXFLAGS" \ + DEPMOD="$TOOLCHAIN/bin/depmod" \ + "$@" + ) } # get kernel module dir diff --git a/packages/devel/elfutils/package.mk b/packages/devel/elfutils/package.mk index 6a2cedbc36..19835bea90 100644 --- a/packages/devel/elfutils/package.mk +++ b/packages/devel/elfutils/package.mk @@ -25,30 +25,3 @@ PKG_CONFIGURE_OPTS_HOST="utrace_cv_cc_biarch=false \ --with-zlib \ --without-bzlib \ --without-lzma" - -makeinstall_host() { - make DESTDIR="$INSTALL" -C libelf install -} - -make_target() { - make V=1 -C libelf libelf.a - make V=1 -C libebl libebl.a - make V=1 -C libdwfl libdwfl.a - make V=1 -C libdwelf libdwelf.a - make V=1 -C libdw libdw.a -} - -makeinstall_target() { - make DESTDIR="$SYSROOT_PREFIX" -C libelf install-includeHEADERS install-pkgincludeHEADERS - make DESTDIR="$SYSROOT_PREFIX" -C libdwfl install-pkgincludeHEADERS - make DESTDIR="$SYSROOT_PREFIX" -C libdw install-includeHEADERS install-pkgincludeHEADERS - - mkdir -p $SYSROOT_PREFIX/usr/lib - cp libelf/libelf.a $SYSROOT_PREFIX/usr/lib - cp libebl/libebl.a $SYSROOT_PREFIX/usr/lib - cp libdwfl/libdwfl.a $SYSROOT_PREFIX/usr/lib - cp libdw/libdw.a $SYSROOT_PREFIX/usr/lib - - mkdir -p $SYSROOT_PREFIX/usr/include/elfutils - cp version.h $SYSROOT_PREFIX/usr/include/elfutils -} diff --git a/packages/devel/elfutils/patches/elfutils-001-dont-build-executables.patch b/packages/devel/elfutils/patches/elfutils-001-dont-build-executables.patch new file mode 100644 index 0000000000..4267bde764 --- /dev/null +++ b/packages/devel/elfutils/patches/elfutils-001-dont-build-executables.patch @@ -0,0 +1,11 @@ +--- elfutils-0.176/Makefile.am.orig 2019-04-01 12:59:25.141077178 +0200 ++++ elfutils-0.176/Makefile.am 2019-04-01 12:59:34.157100775 +0200 +@@ -28,7 +28,7 @@ + + # Add doc back when we have some real content. + SUBDIRS = config m4 lib libelf libebl libdwelf libdwfl libdw libcpu libasm \ +- backends src po tests ++ backends po tests + + EXTRA_DIST = elfutils.spec GPG-KEY NOTES CONTRIBUTING \ + COPYING COPYING-GPLV2 COPYING-LGPLV3 diff --git a/packages/graphics/bcm2835-driver/package.mk b/packages/graphics/bcm2835-driver/package.mk index 55d6d2e4cd..4abccb8ee6 100644 --- a/packages/graphics/bcm2835-driver/package.mk +++ b/packages/graphics/bcm2835-driver/package.mk @@ -3,8 +3,8 @@ # Copyright (C) 2017-present Team LibreELEC (https://libreelec.tv) PKG_NAME="bcm2835-driver" -PKG_VERSION="d095b96ac33de9eb4b95539cb3261f35a3c74509" -PKG_SHA256="f3d40adebe3dd0cb9a85e4c8b6dec864aedfaa9661e134f447655b2a33097c8c" +PKG_VERSION="fd15e0700e45d9b7db83e30696aba299b9f2f31d" +PKG_SHA256="6324b4638b7b3f906469a1d2b94902f608436279749f167ade70e68c5c4c79a7" PKG_LICENSE="nonfree" PKG_SITE="http://www.broadcom.com" PKG_URL="$DISTRO_SRC/$PKG_NAME-$PKG_VERSION.tar.xz" diff --git a/packages/linux-firmware/kernel-firmware/package.mk b/packages/linux-firmware/kernel-firmware/package.mk index a395f480ee..23f8d82ff8 100644 --- a/packages/linux-firmware/kernel-firmware/package.mk +++ b/packages/linux-firmware/kernel-firmware/package.mk @@ -2,8 +2,8 @@ # Copyright (C) 2016-present Team LibreELEC (https://libreelec.tv) PKG_NAME="kernel-firmware" -PKG_VERSION="28f5f7dc1f077ea37d663f70de4490844db0449d" -PKG_SHA256="422efa46f633acede2290ee4b53e07d1e2786e9b26d5cd0a7a5b8991c3763334" +PKG_VERSION="b0d9583f9528890dfcb28d338fe70b50371084bf" +PKG_SHA256="6ce9bdbe9df28756e8a633c5d6a2c8ced3597e32b75f6897cbc4f576851f611a" PKG_LICENSE="other" PKG_SITE="https://git.kernel.org/pub/scm/linux/kernel/git/firmware/linux-firmware.git/" PKG_URL="https://git.kernel.org/pub/scm/linux/kernel/git/firmware/linux-firmware.git/snapshot/$PKG_VERSION.tar.gz" diff --git a/packages/linux/package.mk b/packages/linux/package.mk index a594ca3008..a7b85b6b04 100644 --- a/packages/linux/package.mk +++ b/packages/linux/package.mk @@ -38,14 +38,14 @@ case "$LINUX" in PKG_SOURCE_NAME="linux-$LINUX-$PKG_VERSION.tar.gz" ;; raspberrypi) - PKG_VERSION="0a7f6900636f7c5a027124fe3388c928f1769c52" # 4.19.23 - PKG_SHA256="937cbaa16d33260148c405f984a9c44bac0e62c5028249a00b2a3ca01605ba91" + PKG_VERSION="6f84467f66ba847e643489a3d18b1cf81bad87d0" # 4.19.34 + PKG_SHA256="6622f794a6b8649cf6c92f439282b632f5cef66a18e9ab961ab743d3e9fc59ba" PKG_URL="https://github.com/raspberrypi/linux/archive/$PKG_VERSION.tar.gz" PKG_SOURCE_NAME="linux-$LINUX-$PKG_VERSION.tar.gz" ;; *) - PKG_VERSION="4.19.23" - PKG_SHA256="2d9b25678aac7f3f109c52e6266fb6ee89cc424b597518a2875874bacb8f130a" + PKG_VERSION="4.19.34" + PKG_SHA256="dd795e2a1fddbee5b03c3bb55a1926829cc08df4fdcabce62dda717ba087b8cc" PKG_URL="https://www.kernel.org/pub/linux/kernel/v4.x/$PKG_NAME-$PKG_VERSION.tar.xz" PKG_PATCH_DIRS="default" ;; @@ -193,8 +193,6 @@ make_target() { NO_LIBAUDIT=1 \ NO_LZMA=1 \ NO_SDT=1 \ - LDFLAGS="$LDFLAGS -ldw -ldwfl -lebl -lelf -ldl -lz" \ - EXTRA_PERFLIBS="-lebl" \ CROSS_COMPILE="$TARGET_PREFIX" \ JOBS="$CONCURRENCY_MAKE_LEVEL" \ make $PERF_BUILD_ARGS diff --git a/packages/linux/patches/default/linux-900-fix-libelf-detection.patch b/packages/linux/patches/default/linux-900-fix-libelf-detection.patch deleted file mode 100644 index 9d581f8ca0..0000000000 --- a/packages/linux/patches/default/linux-900-fix-libelf-detection.patch +++ /dev/null @@ -1,16 +0,0 @@ -diff --git a/Makefile b/Makefile -index c9132594860b..9551c8bc5e91 100644 ---- a/Makefile -+++ b/Makefile -@@ -933,7 +933,7 @@ export mod_sign_cmd - - ifdef CONFIG_STACK_VALIDATION - has_libelf := $(call try-run,\ -- echo "int main() {}" | $(HOSTCC) -xc -o /dev/null -lelf -,1,0) -+ echo "int main() {}" | $(HOSTCC) $(HOSTCFLAGS) -xc -o /dev/null $(HOSTLDFLAGS) -lelf -,1,0) - ifeq ($(has_libelf),1) - objtool_target := tools/objtool FORCE - else --- -2.11.0 - diff --git a/packages/tools/bcm2835-bootloader/package.mk b/packages/tools/bcm2835-bootloader/package.mk index 74b43d51b1..972aca1e11 100644 --- a/packages/tools/bcm2835-bootloader/package.mk +++ b/packages/tools/bcm2835-bootloader/package.mk @@ -3,8 +3,8 @@ # Copyright (C) 2017-present Team LibreELEC (https://libreelec.tv) PKG_NAME="bcm2835-bootloader" -PKG_VERSION="d095b96ac33de9eb4b95539cb3261f35a3c74509" -PKG_SHA256="45fc65720e5792813a3c29ddab9da32d821020fae3b9076eecb184c73c6866d0" +PKG_VERSION="fd15e0700e45d9b7db83e30696aba299b9f2f31d" +PKG_SHA256="c9d32c2355ce4116206b3deae3e340545f345441c0c93ba2347971784fd327ff" PKG_ARCH="arm" PKG_LICENSE="nonfree" PKG_SITE="http://www.broadcom.com" diff --git a/projects/Generic/linux/linux.x86_64.conf b/projects/Generic/linux/linux.x86_64.conf index 19211e8b09..bdb21fb35e 100644 --- a/projects/Generic/linux/linux.x86_64.conf +++ b/projects/Generic/linux/linux.x86_64.conf @@ -1,6 +1,6 @@ # # Automatically generated file; DO NOT EDIT. -# Linux/x86_64 4.19.16 Kernel Configuration +# Linux/x86_64 4.19.33 Kernel Configuration # # @@ -1750,6 +1750,7 @@ CONFIG_MACVLAN=m # CONFIG_MACVTAP is not set # CONFIG_IPVLAN is not set # CONFIG_VXLAN is not set +# CONFIG_GTP is not set # CONFIG_MACSEC is not set CONFIG_NETCONSOLE=y CONFIG_NETCONSOLE_DYNAMIC=y diff --git a/projects/RPi/devices/RPi/linux/linux.arm.conf b/projects/RPi/devices/RPi/linux/linux.arm.conf index df591dcfa6..86e77351c8 100644 --- a/projects/RPi/devices/RPi/linux/linux.arm.conf +++ b/projects/RPi/devices/RPi/linux/linux.arm.conf @@ -1,6 +1,6 @@ # # Automatically generated file; DO NOT EDIT. -# Linux/arm 4.19.20 Kernel Configuration +# Linux/arm 4.19.34 Kernel Configuration # # @@ -1331,6 +1331,7 @@ CONFIG_MACVLAN=m # CONFIG_MACVTAP is not set # CONFIG_IPVLAN is not set # CONFIG_VXLAN is not set +# CONFIG_GTP is not set # CONFIG_MACSEC is not set CONFIG_NETCONSOLE=y CONFIG_NETCONSOLE_DYNAMIC=y @@ -3138,6 +3139,7 @@ CONFIG_SND_BCM2708_SOC_JUSTBOOM_DAC=m CONFIG_SND_BCM2708_SOC_JUSTBOOM_DIGI=m CONFIG_SND_BCM2708_SOC_IQAUDIO_DAC=m CONFIG_SND_BCM2708_SOC_IQAUDIO_DIGI=m +CONFIG_SND_BCM2708_SOC_I_SABRE_Q2M=m CONFIG_SND_BCM2708_SOC_ADAU1977_ADC=m CONFIG_SND_AUDIOINJECTOR_PI_SOUNDCARD=m CONFIG_SND_AUDIOINJECTOR_OCTO_SOUNDCARD=m @@ -3314,6 +3316,7 @@ CONFIG_SND_SOC_WM8804_I2C=m # CONFIG_SND_SOC_NAU8810 is not set # CONFIG_SND_SOC_NAU8824 is not set CONFIG_SND_SOC_TPA6130A2=m +CONFIG_SND_SOC_I_SABRE_CODEC=m CONFIG_SND_SIMPLE_CARD_UTILS=m CONFIG_SND_SIMPLE_CARD=m # CONFIG_SND_SIMPLE_SCU_CARD is not set @@ -3771,6 +3774,7 @@ CONFIG_RTC_DRV_PCF8563=m # CONFIG_RTC_DRV_RX8581 is not set # CONFIG_RTC_DRV_RX8025 is not set # CONFIG_RTC_DRV_EM3027 is not set +# CONFIG_RTC_DRV_RV3028 is not set # CONFIG_RTC_DRV_RV8803 is not set # diff --git a/projects/RPi/devices/RPi2/linux/linux.arm.conf b/projects/RPi/devices/RPi2/linux/linux.arm.conf index d6d92c08f7..7c19a14323 100644 --- a/projects/RPi/devices/RPi2/linux/linux.arm.conf +++ b/projects/RPi/devices/RPi2/linux/linux.arm.conf @@ -1,6 +1,6 @@ # # Automatically generated file; DO NOT EDIT. -# Linux/arm 4.19.20 Kernel Configuration +# Linux/arm 4.19.34 Kernel Configuration # # @@ -1440,6 +1440,7 @@ CONFIG_MACVLAN=m # CONFIG_MACVTAP is not set # CONFIG_IPVLAN is not set # CONFIG_VXLAN is not set +# CONFIG_GTP is not set # CONFIG_MACSEC is not set CONFIG_NETCONSOLE=y CONFIG_NETCONSOLE_DYNAMIC=y @@ -3253,6 +3254,7 @@ CONFIG_SND_BCM2708_SOC_JUSTBOOM_DAC=m CONFIG_SND_BCM2708_SOC_JUSTBOOM_DIGI=m CONFIG_SND_BCM2708_SOC_IQAUDIO_DAC=m CONFIG_SND_BCM2708_SOC_IQAUDIO_DIGI=m +CONFIG_SND_BCM2708_SOC_I_SABRE_Q2M=m CONFIG_SND_BCM2708_SOC_ADAU1977_ADC=m CONFIG_SND_AUDIOINJECTOR_PI_SOUNDCARD=m CONFIG_SND_AUDIOINJECTOR_OCTO_SOUNDCARD=m @@ -3429,6 +3431,7 @@ CONFIG_SND_SOC_WM8804_I2C=m # CONFIG_SND_SOC_NAU8810 is not set # CONFIG_SND_SOC_NAU8824 is not set CONFIG_SND_SOC_TPA6130A2=m +CONFIG_SND_SOC_I_SABRE_CODEC=m CONFIG_SND_SIMPLE_CARD_UTILS=m CONFIG_SND_SIMPLE_CARD=m # CONFIG_SND_SIMPLE_SCU_CARD is not set @@ -3887,6 +3890,7 @@ CONFIG_RTC_DRV_PCF8563=m # CONFIG_RTC_DRV_RX8581 is not set # CONFIG_RTC_DRV_RX8025 is not set # CONFIG_RTC_DRV_EM3027 is not set +# CONFIG_RTC_DRV_RV3028 is not set # CONFIG_RTC_DRV_RV8803 is not set #