diff --git a/config/functions b/config/functions index 5384cb9486..6e803d003e 100644 --- a/config/functions +++ b/config/functions @@ -175,6 +175,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 @@ -256,12 +274,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 @@ -308,12 +321,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 @@ -981,15 +989,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 ecb6b700f8..da1dacf708 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/linux/package.mk b/packages/linux/package.mk index c09eb497c2..c40a50f0c6 100644 --- a/packages/linux/package.mk +++ b/packages/linux/package.mk @@ -30,14 +30,14 @@ case "$LINUX" in PKG_SOURCE_NAME="linux-$LINUX-$PKG_VERSION.tar.gz" ;; raspberrypi) - PKG_VERSION="709198a03e40bbf035f75772e9162464dc7fc665" # 5.0.2 - PKG_SHA256="07133de2bf4be2a2926a484ad94bf9ebc72845d0869eae99d266edeb3e83b2c3" + PKG_VERSION="75b821b12af48026ca25614cd8968da26f861964" # 5.0.7 + PKG_SHA256="8448e36fdd7ed4c4433a5a47d7136753dc5b11b7a1c9830889fb82517f22a547" PKG_URL="https://github.com/raspberrypi/linux/archive/$PKG_VERSION.tar.gz" PKG_SOURCE_NAME="linux-$LINUX-$PKG_VERSION.tar.gz" ;; *) - PKG_VERSION="5.0.2" - PKG_SHA256="43bfea3a6b24b4e5f63190409a199bee8cb93dbea01c52ad7f017078ebdf7c9b" + PKG_VERSION="5.0.7" + PKG_SHA256="16e177662b9fc7255bfc51018513979f6effcbe52e459c543aa83a5b15ef54ec" PKG_URL="https://www.kernel.org/pub/linux/kernel/v5.x/$PKG_NAME-$PKG_VERSION.tar.xz" PKG_PATCH_DIRS="default" ;; @@ -185,8 +185,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/linux/patches/default/linux-990.06-hda-Avoid-outputting-HDMI-audio-before-prepare-.patch b/packages/linux/patches/default/linux-990.06-hda-Avoid-outputting-HDMI-audio-before-prepare-.patch deleted file mode 100644 index a3de53495c..0000000000 --- a/packages/linux/patches/default/linux-990.06-hda-Avoid-outputting-HDMI-audio-before-prepare-.patch +++ /dev/null @@ -1,86 +0,0 @@ -From 203eaba8afbb984349b0b11e4e3d4e5d3eb4df4b Mon Sep 17 00:00:00 2001 -From: Stefan Saraev -Date: Mon, 18 Apr 2016 23:51:56 +0300 -Subject: [PATCH] ALSA: hda - Avoid outputting HDMI audio before prepare() and - after close() - -adapted to 4.6 - -From a6024295fd3290a8c9c5519a03316081ee82378a Mon Sep 17 00:00:00 2001 -From: Anssi Hannula -Date: Sat, 16 Feb 2013 17:42:46 +0200 -Subject: [PATCH] ALSA: hda - Avoid outputting HDMI audio before prepare() and - after close() - -Some HDMI codecs (at least NVIDIA 0x10de000b:0x10de0101:0x100100) start -transmitting an empty audio stream as soon as PIN_OUT and AC_DIG1_ENABLE -are enabled. - -Since commit 6169b673618bf0b2518ce413b54925782a603f06 ("ALSA: hda - -Always turn on pins for HDMI/DP") this happens at first open() time, and -will continue even after close(). - -Additionally, some codecs (at least Intel PantherPoint HDMI) currently -continue transmitting HDMI audio even after close() in case some actual -audio was output after open() (this happens regardless of PIN_OUT). - -Empty HDMI audio transmission when not intended has the effect that a -possible HDMI audio sink/receiver may prefer the empty HDMI audio stream -over an actual audio stream on its S/PDIF inputs. - -To avoid the issue before first prepare(), set stream format to 0 on -codec initialization. 0 is not a valid format value for HDMI and will -prevent the audio stream from being output. - -Additionally, at close() time, make sure that the stream is cleaned up. -This will ensure that the format is reset to 0 at that time, preventing -audio from being output in that case. - -Thanks to OpenELEC developers and users for their help in investigating -this issue on the affected NVIDIA "ION2" hardware. Testing of the final -version on NVIDIA ION2 was done by OpenELEC user "MrXIII". Testing on -Intel PantherPoint was done by myself. - -Signed-off-by: Anssi Hannula -Cc: stable@vger.kernel.org ---- - sound/pci/hda/patch_hdmi.c | 14 ++++++++++++++ - 1 file changed, 14 insertions(+) - -diff --git a/sound/pci/hda/patch_hdmi.c b/sound/pci/hda/patch_hdmi.c -index 5af372d..18bad9a 100644 ---- a/sound/pci/hda/patch_hdmi.c -+++ b/sound/pci/hda/patch_hdmi.c -@@ -1630,6 +1630,14 @@ static int hdmi_add_cvt(struct hda_codec *codec, hda_nid_t cvt_nid) - if (err < 0) - return err; - -+ /* -+ * Some HDMI codecs (at least NVIDIA 0x10de000b:0x10de0101:0x100100) -+ * start transmitting an empty audio stream as soon as PIN_OUT and -+ * AC_DIG1_ENABLE are enabled, which happens at open() time. -+ * To avoid that, set format to 0, which is not valid for HDMI. -+ */ -+ snd_hda_codec_write(codec, cvt_nid, 0, AC_VERB_SET_STREAM_FORMAT, 0); -+ - if (spec->num_cvts < ARRAY_SIZE(spec->cvt_nids)) - spec->cvt_nids[spec->num_cvts] = cvt_nid; - spec->num_cvts++; -@@ -1783,6 +1791,12 @@ static int hdmi_pcm_close(struct hda_pcm_stream *hinfo, - int pinctl; - - if (hinfo->nid) { -+ /* -+ * Make sure no empty audio is output after this point by -+ * setting stream format to 0, which is not valid for HDMI. -+ */ -+ __snd_hda_codec_cleanup_stream(codec, hinfo->nid, 1); -+ - pcm_idx = hinfo_to_pcm_index(codec, hinfo); - if (snd_BUG_ON(pcm_idx < 0)) - return -EINVAL; --- -2.7.4 - - - diff --git a/packages/network/wireless-regdb/package.mk b/packages/network/wireless-regdb/package.mk index 3e606e2dd9..7fbfb67488 100644 --- a/packages/network/wireless-regdb/package.mk +++ b/packages/network/wireless-regdb/package.mk @@ -3,8 +3,8 @@ # Copyright (C) 2018-present Team LibreELEC (https://libreelec.tv) PKG_NAME="wireless-regdb" -PKG_VERSION="2018.09.07" -PKG_SHA256="a36b8147f1a3e98e1fd44321a4b8d7ad2f03cac98cdf527ccb1693342f08d65a" +PKG_VERSION="2019.03.01" +PKG_SHA256="3a4e6f7006599bc5764f86e1e86422710da13ad80e0242147b61c6855ebc915f" PKG_LICENSE="GPL" PKG_SITE="http://wireless.kernel.org/en/developers/Regulatory" PKG_URL="https://www.kernel.org/pub/software/network/$PKG_NAME/$PKG_NAME-$PKG_VERSION.tar.xz" diff --git a/projects/Generic/linux/linux.x86_64.conf b/projects/Generic/linux/linux.x86_64.conf index fe13951474..fe3c7166f3 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 5.0.0 Kernel Configuration +# Linux/x86_64 5.0.6 Kernel Configuration # # @@ -1760,6 +1760,7 @@ CONFIG_MACVLAN=m # CONFIG_IPVLAN is not set # CONFIG_VXLAN is not set # CONFIG_GENEVE 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 df3e00608f..57f03e8b74 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 5.0.0 Kernel Configuration +# Linux/arm 5.0.7 Kernel Configuration # # @@ -1321,6 +1321,7 @@ CONFIG_MACVLAN=m # CONFIG_IPVLAN is not set # CONFIG_VXLAN is not set # CONFIG_GENEVE 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/RPi2/linux/linux.arm.conf b/projects/RPi/devices/RPi2/linux/linux.arm.conf index 69246dc43a..b82ec2b2ac 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 5.0.0 Kernel Configuration +# Linux/arm 5.0.7 Kernel Configuration # # @@ -1434,6 +1434,7 @@ CONFIG_MACVLAN=m # CONFIG_IPVLAN is not set # CONFIG_VXLAN is not set # CONFIG_GENEVE is not set +# CONFIG_GTP is not set # CONFIG_MACSEC is not set CONFIG_NETCONSOLE=y CONFIG_NETCONSOLE_DYNAMIC=y