From 14b3fcced3468e2ca8b04839b8461485667c0b1a Mon Sep 17 00:00:00 2001 From: Andre Heider Date: Mon, 10 Feb 2020 11:15:28 +0100 Subject: [PATCH 1/5] libretro-picodrive: add missing "toolchain" dependency build.LibreELEC-RPi2.arm-9.80-devel/toolchain/bin/host-g++: not found --- packages/emulation/libretro-picodrive/package.mk | 1 + 1 file changed, 1 insertion(+) diff --git a/packages/emulation/libretro-picodrive/package.mk b/packages/emulation/libretro-picodrive/package.mk index abf4d53b16..f8855e2e80 100644 --- a/packages/emulation/libretro-picodrive/package.mk +++ b/packages/emulation/libretro-picodrive/package.mk @@ -7,6 +7,7 @@ PKG_SHA256="a6f5bfe5c497de56dcc4b648bbf43471caa96d8ed601ed883e9e7cd4bbd46311" PKG_LICENSE="MAME" PKG_SITE="https://github.com/libretro/picodrive" PKG_URL="https://github.com/libretro/picodrive/archive/$PKG_VERSION.tar.gz" +PKG_DEPENDS_HOST="toolchain:host" PKG_DEPENDS_TARGET="toolchain kodi-platform $PKG_NAME:host" PKG_DEPENDS_UNPACK="cyclone68000" PKG_LONGDESC="Fast MegaDrive/MegaCD/32X emulator" From 1389aefd48424227e7bf74fa761958a2908e2d76 Mon Sep 17 00:00:00 2001 From: Andre Heider Date: Mon, 10 Feb 2020 11:15:36 +0100 Subject: [PATCH 2/5] visualization.pictureit: add missing "glm" dependency CMake Error at CMakeLists.txt:7 (find_package): By not providing "Findglm.cmake" in CMAKE_MODULE_PATH... --- .../kodi-binary-addons/visualization.pictureit/package.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/packages/mediacenter/kodi-binary-addons/visualization.pictureit/package.mk b/packages/mediacenter/kodi-binary-addons/visualization.pictureit/package.mk index 6e0b5b0fb6..bf56b8e3eb 100644 --- a/packages/mediacenter/kodi-binary-addons/visualization.pictureit/package.mk +++ b/packages/mediacenter/kodi-binary-addons/visualization.pictureit/package.mk @@ -10,7 +10,7 @@ PKG_ARCH="x86_64" PKG_LICENSE="GPL" PKG_SITE="http://www.kodi.tv" PKG_URL="https://github.com/linuxwhatelse/visualization.pictureit/archive/$PKG_VERSION.tar.gz" -PKG_DEPENDS_TARGET="toolchain kodi-platform" +PKG_DEPENDS_TARGET="toolchain kodi-platform glm" PKG_SECTION="" PKG_SHORTDESC="visualization.pictureit" PKG_LONGDESC="visualization.pictureit" From f543965c6cf76b920be6d90ea44b84e1535be65c Mon Sep 17 00:00:00 2001 From: Andre Heider Date: Tue, 11 Feb 2020 07:45:45 +0100 Subject: [PATCH 3/5] comskip: link against libdl The static ffmpegx requires this due to omx: libavcodec/omx.c:93: error: undefined reference to 'dlsym' --- packages/addons/addon-depends/comskip/package.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/packages/addons/addon-depends/comskip/package.mk b/packages/addons/addon-depends/comskip/package.mk index ead8c25bf1..8d3c57a23e 100644 --- a/packages/addons/addon-depends/comskip/package.mk +++ b/packages/addons/addon-depends/comskip/package.mk @@ -16,5 +16,5 @@ PKG_BUILD_FLAGS="-sysroot" pre_configure_target() { # pass ffmpegx to build CFLAGS+=" -I$(get_install_dir ffmpegx)/usr/local/include" - LDFLAGS+=" -L$(get_install_dir ffmpegx)/usr/local/lib" + LDFLAGS+=" -L$(get_install_dir ffmpegx)/usr/local/lib -ldl" } From 361c9366e28fc3d3c33cebab2869c095be39f361 Mon Sep 17 00:00:00 2001 From: Andre Heider Date: Wed, 12 Feb 2020 12:59:57 +0100 Subject: [PATCH 4/5] jre-libbluray: JAVA_HOME needs to be set for all make targets --- .../addon-depends/jre-depends/jre-libbluray/package.mk | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/packages/addons/addon-depends/jre-depends/jre-libbluray/package.mk b/packages/addons/addon-depends/jre-depends/jre-libbluray/package.mk index fb773baec8..bd0563131f 100644 --- a/packages/addons/addon-depends/jre-depends/jre-libbluray/package.mk +++ b/packages/addons/addon-depends/jre-depends/jre-libbluray/package.mk @@ -17,14 +17,12 @@ unpack() { } pre_configure_target() { + export JAVA_HOME="$(get_build_dir jdk-x86_64-zulu)" + # build also jar PKG_CONFIGURE_OPTS_TARGET="${PKG_CONFIGURE_OPTS_TARGET/disable-bdjava-jar/enable-bdjava-jar}" } make_target() { - ( - export JAVA_HOME="$(get_build_dir jdk-x86_64-zulu)" - make all-local - ) } From ac1cf14c4946424450e1841a04f021e4f7972bd8 Mon Sep 17 00:00:00 2001 From: Andre Heider Date: Tue, 11 Feb 2020 18:21:36 +0100 Subject: [PATCH 5/5] linux: (re)store the .config too for autoremove & unpack Instead of attempting to recreate the .config of the initial build (and failing at it), just (re)store it along with Module.symvers. This fixes inconsistencies like CONFIG_EXTRA_FIRMWARE not getting set on an autoremove+unpack cycle and prepares for #4201. --- packages/linux/package.mk | 80 +++++++++++++++++++-------------------- 1 file changed, 40 insertions(+), 40 deletions(-) diff --git a/packages/linux/package.mk b/packages/linux/package.mk index 63ed08ba34..7fdd242765 100644 --- a/packages/linux/package.mk +++ b/packages/linux/package.mk @@ -66,50 +66,50 @@ for pkg in $(get_pkg_variable initramfs PKG_DEPENDS_TARGET); do done post_patch() { - cp $PKG_KERNEL_CFG_FILE $PKG_BUILD/.config - - sed -i -e "s|@INITRAMFS_SOURCE@|$BUILD/image/initramfs.cpio|" $PKG_BUILD/.config - - # set default hostname based on $DISTRONAME - sed -i -e "s|@DISTRONAME@|$DISTRONAME|g" $PKG_BUILD/.config - - # disable swap support if not enabled - if [ ! "$SWAP_SUPPORT" = yes ]; then - sed -i -e "s|^CONFIG_SWAP=.*$|# CONFIG_SWAP is not set|" $PKG_BUILD/.config - fi - - # disable nfs support if not enabled - if [ ! "$NFS_SUPPORT" = yes ]; then - sed -i -e "s|^CONFIG_NFS_FS=.*$|# CONFIG_NFS_FS is not set|" $PKG_BUILD/.config - fi - - # disable cifs support if not enabled - if [ ! "$SAMBA_SUPPORT" = yes ]; then - sed -i -e "s|^CONFIG_CIFS=.*$|# CONFIG_CIFS is not set|" $PKG_BUILD/.config - fi - - # disable iscsi support if not enabled - if [ ! "$ISCSI_SUPPORT" = yes ]; then - sed -i -e "s|^CONFIG_SCSI_ISCSI_ATTRS=.*$|# CONFIG_SCSI_ISCSI_ATTRS is not set|" $PKG_BUILD/.config - sed -i -e "s|^CONFIG_ISCSI_TCP=.*$|# CONFIG_ISCSI_TCP is not set|" $PKG_BUILD/.config - sed -i -e "s|^CONFIG_ISCSI_BOOT_SYSFS=.*$|# CONFIG_ISCSI_BOOT_SYSFS is not set|" $PKG_BUILD/.config - sed -i -e "s|^CONFIG_ISCSI_IBFT_FIND=.*$|# CONFIG_ISCSI_IBFT_FIND is not set|" $PKG_BUILD/.config - sed -i -e "s|^CONFIG_ISCSI_IBFT=.*$|# CONFIG_ISCSI_IBFT is not set|" $PKG_BUILD/.config - fi - - # disable lima/panfrost if libmali is configured - if [ "$OPENGLES" = "libmali" ]; then - sed -e "s|^CONFIG_DRM_LIMA=.*$|# CONFIG_DRM_LIMA is not set|" -i $PKG_BUILD/.config - sed -e "s|^CONFIG_DRM_PANFROST=.*$|# CONFIG_DRM_PANFROST is not set|" -i $PKG_BUILD/.config - fi - - # prepare the tree for kernel packages if the build dir has been removed and linux get unpacked again + # linux was already built and its build dir autoremoved - prepare it again for kernel packages if [ -d $PKG_INSTALL/.image ]; then - kernel_make -C $PKG_BUILD oldconfig + cp -p $PKG_INSTALL/.image/.config $PKG_BUILD kernel_make -C $PKG_BUILD prepare # restore the required Module.symvers from an earlier build cp -p $PKG_INSTALL/.image/Module.symvers $PKG_BUILD + else + cp $PKG_KERNEL_CFG_FILE $PKG_BUILD/.config + + sed -i -e "s|@INITRAMFS_SOURCE@|$BUILD/image/initramfs.cpio|" $PKG_BUILD/.config + + # set default hostname based on $DISTRONAME + sed -i -e "s|@DISTRONAME@|$DISTRONAME|g" $PKG_BUILD/.config + + # disable swap support if not enabled + if [ ! "$SWAP_SUPPORT" = yes ]; then + sed -i -e "s|^CONFIG_SWAP=.*$|# CONFIG_SWAP is not set|" $PKG_BUILD/.config + fi + + # disable nfs support if not enabled + if [ ! "$NFS_SUPPORT" = yes ]; then + sed -i -e "s|^CONFIG_NFS_FS=.*$|# CONFIG_NFS_FS is not set|" $PKG_BUILD/.config + fi + + # disable cifs support if not enabled + if [ ! "$SAMBA_SUPPORT" = yes ]; then + sed -i -e "s|^CONFIG_CIFS=.*$|# CONFIG_CIFS is not set|" $PKG_BUILD/.config + fi + + # disable iscsi support if not enabled + if [ ! "$ISCSI_SUPPORT" = yes ]; then + sed -i -e "s|^CONFIG_SCSI_ISCSI_ATTRS=.*$|# CONFIG_SCSI_ISCSI_ATTRS is not set|" $PKG_BUILD/.config + sed -i -e "s|^CONFIG_ISCSI_TCP=.*$|# CONFIG_ISCSI_TCP is not set|" $PKG_BUILD/.config + sed -i -e "s|^CONFIG_ISCSI_BOOT_SYSFS=.*$|# CONFIG_ISCSI_BOOT_SYSFS is not set|" $PKG_BUILD/.config + sed -i -e "s|^CONFIG_ISCSI_IBFT_FIND=.*$|# CONFIG_ISCSI_IBFT_FIND is not set|" $PKG_BUILD/.config + sed -i -e "s|^CONFIG_ISCSI_IBFT=.*$|# CONFIG_ISCSI_IBFT is not set|" $PKG_BUILD/.config + fi + + # disable lima/panfrost if libmali is configured + if [ "$OPENGLES" = "libmali" ]; then + sed -e "s|^CONFIG_DRM_LIMA=.*$|# CONFIG_DRM_LIMA is not set|" -i $PKG_BUILD/.config + sed -e "s|^CONFIG_DRM_PANFROST=.*$|# CONFIG_DRM_PANFROST is not set|" -i $PKG_BUILD/.config + fi fi } @@ -238,7 +238,7 @@ make_target() { makeinstall_target() { mkdir -p $INSTALL/.image - cp -p arch/${TARGET_KERNEL_ARCH}/boot/${KERNEL_TARGET} System.map Module.symvers $INSTALL/.image/ + cp -p arch/${TARGET_KERNEL_ARCH}/boot/${KERNEL_TARGET} System.map .config Module.symvers $INSTALL/.image/ kernel_make INSTALL_MOD_PATH=$INSTALL/$(get_kernel_overlay_dir) modules_install rm -f $INSTALL/$(get_kernel_overlay_dir)/lib/modules/*/build