diff --git a/meta-digi-dey/conf/distro/dey.conf b/meta-digi-dey/conf/distro/dey.conf index 2da86c239..b127a6f24 100644 --- a/meta-digi-dey/conf/distro/dey.conf +++ b/meta-digi-dey/conf/distro/dey.conf @@ -53,9 +53,6 @@ PREFERRED_VERSION_bluez5 ?= "5.65" PREFERRED_VERSION_linux-yocto ?= "5.15%" PREFERRED_VERSION_linux-yocto-rt ?= "5.15%" -# Use git recipe for libsoc -PREFERRED_VERSION_libsoc = "git" - # There's a generic opencl-headers recipe in the thud branch of # meta-openembedded, but we should use the package provided by the imx-gpu-viv # recipe in case there are NXP-specific changes in it diff --git a/meta-digi-dey/recipes-support/libsoc/libsoc_%.bbappend b/meta-digi-dey/recipes-support/libsoc/libsoc_%.bbappend new file mode 100644 index 000000000..993181438 --- /dev/null +++ b/meta-digi-dey/recipes-support/libsoc/libsoc_%.bbappend @@ -0,0 +1,15 @@ +# Copyright (C) 2017-2023 Digi International Inc. + +FILESEXTRAPATHS:prepend := "${THISDIR}/${BPN}:" + +SRCREV = "545b354968a9d03008e1e86e14c58e3f8423a20c" + +# The meta-openembedded recipe version is 0.8.2 because there have been no new +# releases/tags on this repo since 2016. +# This bbappend overrides the SRC_URI to use a more updated version of the code +# that doesn't correspond to the package latest tagged version. +SRC_URI:append = " \ + file://0001-gpio-pwm-add-delay-to-allow-udev-rules-to-complete.patch \ +" + +PACKAGECONFIG = "python" diff --git a/meta-digi-dey/recipes-support/libsoc/libsoc_git.bb b/meta-digi-dey/recipes-support/libsoc/libsoc_git.bb deleted file mode 100644 index 2a2fcaaac..000000000 --- a/meta-digi-dey/recipes-support/libsoc/libsoc_git.bb +++ /dev/null @@ -1,38 +0,0 @@ -# Copyright (C) 2017-2021 Digi International Inc. - -SUMMARY = "Library for interfacing with common SoC peripherals" -DESCRIPTION = "libsoc is a C library to interface with common peripherals (gpio, i2c, spi, pwm) \ - found in SoC (System on Chips) through generic Linux Kernel interfaces." - -HOMEPAGE = "https://github.com/jackmitch/libsoc" - -LICENSE = "LGPL-2.1-only" -LIC_FILES_CHKSUM = "file://LICENCE;md5=e0bfebea12a718922225ba987b2126a5" - -inherit autotools pkgconfig python3-dir - -SRCBRANCH ?= "master" -SRCREV = "${AUTOREV}" -SRC_URI = "git://github.com/jackmitch/libsoc.git;branch=master;protocol=https" - -S = "${WORKDIR}/git" - -BOARD ??= "devboard" - -PACKAGECONFIG ?= "" - -PACKAGECONFIG[disabledebug] = "--disable-debug,," -PACKAGECONFIG[allboardconfigs] = "--with-board-configs,," -PACKAGECONFIG[enableboardconfig] = "--enable-board=${BOARD},," -PACKAGECONFIG[python] = "--enable-python=${STAGING_BINDIR_NATIVE}/${PYTHON_PN}-native/${PYTHON_PN},,${PYTHON_PN} ${PYTHON_PN}-native" - -PACKAGES =+ "${@bb.utils.contains('PACKAGECONFIG', 'python', \ - '${PYTHON_PN}-libsoc-staticdev ${PYTHON_PN}-libsoc', '', d)}" - -RDEPENDS:${PN} = "libgcc" -RDEPENDS:${PYTHON_PN}-libsoc = "${PN} ${PYTHON_PN}-ctypes" - -FILES:${PYTHON_PN}-libsoc-staticdev += "${PYTHON_SITEPACKAGES_DIR}/*/*.a" -FILES:${PYTHON_PN}-libsoc += "${PYTHON_SITEPACKAGES_DIR}" - -DEFAULT_PREFERENCE = "-1" diff --git a/meta-digi-dey/recipes-support/libsoc/libsoc_git.bbappend b/meta-digi-dey/recipes-support/libsoc/libsoc_git.bbappend deleted file mode 100644 index af4dd5459..000000000 --- a/meta-digi-dey/recipes-support/libsoc/libsoc_git.bbappend +++ /dev/null @@ -1,15 +0,0 @@ -# Copyright (C) 2017 Digi International Inc. - -FILESEXTRAPATHS:prepend := "${THISDIR}/${BPN}:" - -LIBSOC_URI_STASH = "${DIGI_MTK_GIT}/dey/libsoc.git;protocol=ssh" -LIBSOC_URI_GITHUB = "git://github.com/jackmitch/libsoc.git;protocol=https" -LIBSOC_URI ?= "${@oe.utils.conditional('DIGI_INTERNAL_GIT', '1' , '${LIBSOC_URI_STASH}', '${LIBSOC_URI_GITHUB}', d)}" - -SRCREV = "dc62bb1f04c13d0423078b1af2bb439c62023d6c" -SRC_URI = " \ - ${LIBSOC_URI};nobranch=1 \ - file://0001-gpio-pwm-add-delay-to-allow-udev-rules-to-complete.patch \ -" - -PACKAGECONFIG = "python"