6 files changed, 38 insertions, 220 deletions

diff --git a/recipes-support/isa-l/isa-l_2.27.0.bb b/recipes-support/isa-l/isa-l_2.31.1.bb
index ac9cfad8..93178942 100644
--- a/recipes-support/isa-l/isa-l_2.27.0.bb
+++ b/recipes-support/isa-l/isa-l_2.31.1.bb
@@ -2,16 +2,17 @@ SUMMARY  = "Intelligent Storage Acceleration Library"
 DESCRIPTION = "ISA-L is a collection of optimized low-level functions \
 targeting storage applications."
 LICENSE  = "BSD-3-Clause"
-LIC_FILES_CHKSUM = "file://LICENSE;md5=e6c7d82ad7dd512687b0991a159a1ca9"
+LIC_FILES_CHKSUM = "file://LICENSE;md5=2476688d0948d4a3f7c69473a603540d"
 SECTION = "lib"
 
 inherit autotools pkgconfig
 
-S = "${WORKDIR}/git"
-SRCREV = "0111c21cbc775bd2b152cd06717f7f09988bc0f1"
-SRC_URI = "git://github.com/intel/isa-l.git"
+SRCREV = "c387163fcbca62701d646149564c550c78a4f985"
+SRC_URI = "git://github.com/intel/isa-l.git;branch=master;protocol=https"
 
 DEPENDS = "nasm-native"
 AS[unexport] = "1"
 
+TARGET_CC_ARCH += "${LDFLAGS}"
+
 COMPATIBLE_HOST = '(x86_64).*-linux'
diff --git a/recipes-support/jhi/jhi_1.33.bb b/recipes-support/jhi/jhi_1.33.bb
deleted file mode 100644
index c52af957..00000000
--- a/recipes-support/jhi/jhi_1.33.bb
+++ /dev/null
@@ -1,66 +0,0 @@
-SUMMARY = "Intel Dynamic Application Loader (DAL) Host Interface"
-DESCRIPTION = "A daemon and libraries which allow user space applications \
-to install Java applets on DAL FW and communicate with them"
-LICENSE = "Apache-2.0"
-LIC_FILES_CHKSUM = "file://LICENSE;md5=833126f14614a3276708a4d7c9734645"
-
-SRC_URI = "git://github.com/intel/dynamic-application-loader-host-interface.git;protocol=https"
-
-inherit cmake useradd systemd pkgconfig
-
-SRCREV = "44d64cdbcf7eacd397ce9c18b9094514b62093e6"
-
-S = "${WORKDIR}/git"
-
-DEPENDS += "util-linux libxml2"
-DEPENDS += "${@bb.utils.contains('DISTRO_FEATURES', 'systemd', 'systemd', '', d)}"
-RDEPENDS_${PN} += "bash"
-
-USERADD_PACKAGES = "${PN}"
-USERADD_PARAM_${PN} = "--system --no-create-home --shell /bin/false -g mei jhi"
-
-GROUPADD_PARAM_${PN} = "-g 880 mei"
-
-SYSTEMD_PACKAGES = "${PN}"
-
-COMPATIBLE_HOST_libc-musl = 'null'
-
-# systemd is the default so they are installed when sysvinit is not selected as INIT_SYSTEM
-EXTRA_OECMAKE = "-DCMAKE_SKIP_RPATH=ON \
-                 -DINIT_SYSTEM=${@bb.utils.contains('DISTRO_FEATURES', 'sysvinit', 'SysVinit', 'systemd', d)} \
-                 -DAPPLETS_DIR=${libdir}/dal/applets \
-                 -DAPP_REPO_DIR=${localstatedir}/cache/dal/applet_repository \
-                 "
-
-do_install_append () {
-        install -d ${D}${localstatedir}/cache/dal/applet_repository
-
-        chown -R jhi ${D}${localstatedir}/cache/dal/applet_repository
-        chgrp -R mei ${D}${localstatedir}/cache/dal/applet_repository
-
-        install -d ${D}${bindir}
-        install -m 755 ${B}/bin_linux/smoketest ${D}${bindir}
-        install -m 755 ${B}/bin_linux/bist ${D}${bindir}
-
-        install -d ${D}${libdir}/dal/applets
-        cp -r ${S}/test/smoketest/applets/* ${D}${libdir}/dal/applets/
-}
-
-PACKAGES =+ "${PN}-test"
-
-FILES_${PN}-dev = ""
-
-FILES_${PN} = "\
-                ${sbindir} \
-                ${sysconfdir} \
-                ${libdir} \
-                ${libdir}/dal/applets \
-                ${nonarch_libdir}/tmpfiles.d \
-                ${systemd_system_unitdir} \
-                ${localstatedir}/cache/dal/applet_repository \
-                "
-
-FILES_${PN}-test = "\
-                     ${bindir} \
-                     ${libdir}/dal/applets \
-                     "
diff --git a/recipes-support/libipt/libipt_2.0.1.bb b/recipes-support/libipt/libipt_2.0.1.bb
deleted file mode 100644
index 1b3e1e64..00000000
--- a/recipes-support/libipt/libipt_2.0.1.bb
+++ /dev/null
@@ -1,16 +0,0 @@
-SUMMARY  = "Intel(R) Processor Trace Decoder Library"
-DESCRIPTION = "The Intel Processor Trace (Intel PT) Decoder Library is Intel's \
-reference implementation for decoding Intel PT. It can be used as a standalone \
-library or it can be partially or fully integrated into your tool."
-HOMEPAGE = "https://github.com/intel/libipt"
-
-LICENSE  = "BSD-3-Clause"
-LIC_FILES_CHKSUM = "file://LICENSE;md5=c91702d8338efc75588b838922b7b803"
-
-inherit pkgconfig cmake
-
-S = "${WORKDIR}/git"
-
-SRC_URI = "git://github.com/intel/libipt.git;protocol=https;branch=stable/v2.0"
-
-SRCREV = "916d777123bf60d323890557347570e5e19dfa12"
diff --git a/recipes-support/libipt/libipt_2.1.2.bb b/recipes-support/libipt/libipt_2.1.2.bb
new file mode 100644
index 00000000..bbaac6f5
--- /dev/null
+++ b/recipes-support/libipt/libipt_2.1.2.bb
@@ -0,0 +1,33 @@
+SUMMARY  = "Intel(R) Processor Trace Decoder Library"
+DESCRIPTION = "The Intel Processor Trace (Intel PT) Decoder Library is Intel's \
+reference implementation for decoding Intel PT. It can be used as a standalone \
+library or it can be partially or fully integrated into your tool."
+HOMEPAGE = "https://github.com/intel/libipt"
+
+LICENSE  = "BSD-3-Clause"
+LIC_FILES_CHKSUM = "file://LICENSE;md5=491799fd9431e57ad52cb0ef3497afce"
+
+inherit pkgconfig cmake
+
+SRC_URI = "git://github.com/intel/libipt.git;protocol=https;branch=stable/v2.1"
+
+SRCREV = "ffc548e5fbc2fa3e9795d4593f861e1df99cf906"
+
+EXTRA_OECMAKE += " \
+                  -DPTDUMP=ON  \
+                  -DPTTC=ON \
+                  -DPTSEG=ON \
+                  -DCMAKE_SKIP_RPATH=ON \
+                  -DCMAKE_POLICY_VERSION_MINIMUM=3.5 \
+                  "
+
+do_install:append() {
+    install -d ${D}${bindir}/libipt
+    install -d ${D}${bindir}/libipt/tests
+
+    cp -r ${B}/bin/* ${D}${bindir}/libipt/
+    cp -r ${S}/test/src/* ${D}${bindir}/libipt/tests
+}
+
+FILES:${PN}-test = "${bindir}"
+PACKAGES =+ "${PN}-test"
diff --git a/recipes-support/sbsigntool/sbsigntool-native_git.bb b/recipes-support/sbsigntool/sbsigntool-native_git.bb
deleted file mode 100644
index 65546c5c..00000000
--- a/recipes-support/sbsigntool/sbsigntool-native_git.bb
+++ /dev/null
@@ -1,80 +0,0 @@
-DESCRIPTION = "Utility for signing and verifying files for UEFI Secure Boot"
-LICENSE = "GPLv3 & LGPL-2.1 & LGPL-3.0 & MIT"
-
-# sbsigntool statically links to libccan.a which is built with modules
-# passed to "create-ccan-tree" (and their dependencies). Therefore,
-# we also keep track of all the ccan module licenses.
-LIC_FILES_CHKSUM = "file://LICENSE.GPLv3;md5=9eef91148a9b14ec7f9df333daebc746 \
-                    file://COPYING;md5=a7710ac18adec371b84a9594ed04fd20 \
-                    file://lib/ccan.git/ccan/endian/LICENSE;md5=2d5025d4aa3495befef8f17206a5b0a1 \
-                    file://lib/ccan.git/ccan/htable/LICENSE;md5=2d5025d4aa3495befef8f17206a5b0a1 \
-                    file://lib/ccan.git/ccan/list/LICENSE;md5=2d5025d4aa3495befef8f17206a5b0a1 \
-                    file://lib/ccan.git/ccan/read_write_all/LICENSE;md5=2d5025d4aa3495befef8f17206a5b0a1 \
-                    file://lib/ccan.git/ccan/talloc/LICENSE;md5=2d5025d4aa3495befef8f17206a5b0a1 \
-                    file://lib/ccan.git/ccan/typesafe_cb/LICENSE;md5=2d5025d4aa3495befef8f17206a5b0a1 \
-                    file://lib/ccan.git/ccan/failtest/LICENSE;md5=6a6a8e020838b23406c81b19c1d46df6 \
-                    file://lib/ccan.git/ccan/tlist/LICENSE;md5=6a6a8e020838b23406c81b19c1d46df6 \
-                    file://lib/ccan.git/ccan/time/LICENSE;md5=838c366f69b72c5df05c96dff79b35f2 \
-"
-
-# The original upstream is git://kernel.ubuntu.com/jk/sbsigntool but it has
-# not been maintained and many patches have been backported in this repo.
-SRC_URI = "git://git.kernel.org/pub/scm/linux/kernel/git/jejb/sbsigntools.git;protocol=https;name=sbsigntools \
-           git://github.com/rustyrussell/ccan.git;protocol=https;destsuffix=git/lib/ccan.git;name=ccan \
-           file://0001-configure-Fixup-build-dependencies-for-cross-compili.patch \
-          "
-
-SRCREV_sbsigntools  ?= "216dbd3331a7e14ff79cc4dd68c29896f1152ae4"
-SRCREV_ccan         ?= "b1f28e17227f2320d07fe052a8a48942fe17caa5"
-SRCREV_FORMAT       =  "sbsigntools_ccan"
-
-DEPENDS = "binutils-native gnu-efi-native help2man-native openssl-native util-linux-native"
-
-PV = "0.9.2-git${SRCPV}"
-
-S = "${WORKDIR}/git"
-
-inherit native autotools pkgconfig
-
-do_configure_prepend() {
-        cd ${S}
-
-        sed -i s#RECIPE_SYSROOT#${RECIPE_SYSROOT_NATIVE}#g configure.ac
-
-        if [ ! -e lib/ccan ]; then
-
-                # Use empty SCOREDIR because 'make scores' is not run.
-                # The default setting depends on (non-whitelisted) host tools.
-                sed -i -e 's#^\(SCOREDIR=\).*#\1#' lib/ccan.git/Makefile
-
-                lib/ccan.git/tools/create-ccan-tree \
-                --build-type=automake lib/ccan \
-                talloc read_write_all build_assert array_size endian
-        fi
-
-        # Create generatable docs from git
-        (
-         echo "Authors of sbsigntool:"
-         echo
-         git log --format='%an' | sort -u | sed 's,^,\t,'
-        ) > AUTHORS
-
-        # Generate simple ChangeLog
-        git log --date=short --format='%ad %t %an <%ae>%n%n  * %s%n' > ChangeLog
-
-        cd ${B}
-}
-
-def efi_arch(d):
-    import re
-    harch = d.getVar("HOST_ARCH")
-    if re.match("i[3456789]86", harch):
-        return "ia32"
-    return harch
-
-EXTRA_OEMAKE = "\
-    INCLUDES+='-I${S}/lib/ccan.git/ \
-              -I${STAGING_INCDIR_NATIVE}/efi \
-              -I${STAGING_INCDIR_NATIVE} \
-              -I${STAGING_INCDIR_NATIVE}/efi/${@efi_arch(d)}' \
-    "
diff --git a/recipes-support/sbsigntool/sbsigntool/0001-configure-Fixup-build-dependencies-for-cross-compili.patch b/recipes-support/sbsigntool/sbsigntool/0001-configure-Fixup-build-dependencies-for-cross-compili.patch
deleted file mode 100644
index ef686511..00000000
--- a/recipes-support/sbsigntool/sbsigntool/0001-configure-Fixup-build-dependencies-for-cross-compili.patch
+++ /dev/null
@@ -1,54 +0,0 @@
-From c3533b8da1e1425801d2fc0bcd231e13d593f16b Mon Sep 17 00:00:00 2001
-From: Ricardo Neri <ricardo.neri-calderon@linux.intel.com>
-Date: Tue, 19 Feb 2019 20:07:45 +0800
-Subject: [PATCH] configure: Fixup build dependencies for cross-compiling
-
-When cross-compiling, custom header files and libraries need to be
-specified. sbsign assumes that all the dependencies are located
-under /usr/include and /usr/lib.
-
-Prepend these paths with a placeholder that can be replaced with the
-actual paths once they are resolved.
-
-Upstream status: inappropriate [OE specific]
-
-Signed-off-by: Ricardo Neri <ricardo.neri-calderon@linux.intel.com>
-
-Taken from :
-https://github.com/intel/luv-yocto/tree/master/meta-luv/recipes-devtools/sbsigntool/sbsigntool
-
-Corrected typo error and ported to version 0.9.2
-
-Signed-off-by: Naveen Saini <naveen.kumar.saini@intel.com>
----
- configure.ac | 7 +++++--
- 1 file changed, 5 insertions(+), 2 deletions(-)
-
-diff --git a/configure.ac b/configure.ac
-index 1459e91..3e34c8d 100644
---- a/configure.ac
-+++ b/configure.ac
-@@ -70,7 +70,10 @@ AM_CONDITIONAL(TEST_BINARY_FORMAT, [ test "$EFI_ARCH" = "arm" -o "$EFI_ARCH" = "
- ##
- # no consistent view of where gnu-efi should dump the efi stuff, so find it
- ##
--for path in /lib /lib64 /usr/lib /usr/lib64 /usr/lib32 /lib/efi /lib64/efi /usr/lib/efi /usr/lib64/efi /usr/lib/gnuefi /usr/lib64/gnuefi ; do
-+for path in RECIPE_SYSROOT/lib RECIPE_SYSROOT/lib64 RECIPE_SYSROOT/usr/lib \
-+            RECIPE_SYSROOT/usr/lib64 RECIPE_SYSROOT/usr/lib32 \
-+            RECIPE_SYSROOT/lib/efi RECIPE_SYSROOT/lib64/efi \
-+            RECIPE_SYSROOT/usr/lib/efi RECIPE_SYSROOT/usr/lib64/efi; do
-     if test -e $path/crt0-efi-$EFI_ARCH.o; then
-        CRTPATH=$path
-     fi
-@@ -79,7 +82,7 @@ if test -z "$CRTPATH"; then
-    AC_MSG_ERROR([cannot find the gnu-efi crt path])
- fi
- 
--EFI_CPPFLAGS="-I/usr/include/efi -I/usr/include/efi/$EFI_ARCH \
-+EFI_CPPFLAGS="-IRECIPE_SYSROOT/usr/include/efi -IRECIPE_SYSROOT/usr/include/efi/$EFI_ARCH \
-  -DEFI_FUNCTION_WRAPPER"
- CPPFLAGS_save="$CPPFLAGS"
- CPPFLAGS="$CPPFLAGS $EFI_CPPFLAGS"
--- 
-2.7.4
-