summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAnuj Mittal <anuj.mittal@intel.com>2022-03-30 23:27:37 +0800
committerAnuj Mittal <anuj.mittal@intel.com>2022-03-30 23:27:37 +0800
commitd529ae1e1ec37d40991259d824e274351ffae6d7 (patch)
tree8818b1ee6c1f400623083389cea49bc152a0e84a
parentdea9048c4b3977d6eed437196ca7d237510644ee (diff)
downloadmeta-intel-d529ae1e1ec37d40991259d824e274351ffae6d7.tar.gz
zlib-intel: remove recipe
zlib has a new release and this fork hasn't rebased onto that version yet. Drop this recipe and use the OE-core version for now. Signed-off-by: Anuj Mittal <anuj.mittal@intel.com>
-rw-r--r--conf/include/maintainers.inc1
-rw-r--r--conf/layer.conf4
-rw-r--r--recipes-core/zlib/zlib-intel_1.2.11.1.jtkv6.3.bb18
3 files changed, 0 insertions, 23 deletions
diff --git a/conf/include/maintainers.inc b/conf/include/maintainers.inc
index 01136aab..d6f2306a 100644
--- a/conf/include/maintainers.inc
+++ b/conf/include/maintainers.inc
@@ -54,4 +54,3 @@ RECIPE_MAINTAINER:pn-secureboot-selftest-image-signed = "Anuj Mittal <anuj.mitta
54RECIPE_MAINTAINER:pn-secureboot-selftest-image-unsigned = "Anuj Mittal <anuj.mittal@intel.com>" 54RECIPE_MAINTAINER:pn-secureboot-selftest-image-unsigned = "Anuj Mittal <anuj.mittal@intel.com>"
55RECIPE_MAINTAINER:pn-thermald = "Anuj Mittal <anuj.mittal@intel.com>" 55RECIPE_MAINTAINER:pn-thermald = "Anuj Mittal <anuj.mittal@intel.com>"
56RECIPE_MAINTAINER:pn-xf86-video-ast = "Anuj Mittal <anuj.mittal@intel.com>" 56RECIPE_MAINTAINER:pn-xf86-video-ast = "Anuj Mittal <anuj.mittal@intel.com>"
57RECIPE_MAINTAINER:pn-zlib-intel = "Naveen Saini <naveen.kumar.saini@intel.com>"
diff --git a/conf/layer.conf b/conf/layer.conf
index fb073b0d..b81d891c 100644
--- a/conf/layer.conf
+++ b/conf/layer.conf
@@ -32,10 +32,6 @@ BBFILES_DYNAMIC += " \
32 32
33require ${LAYERDIR}/conf/include/maintainers.inc 33require ${LAYERDIR}/conf/include/maintainers.inc
34 34
35PREFERRED_PROVIDER_zlib ?= "zlib"
36PREFERRED_PROVIDER_zlib-native ?= "zlib-native"
37PREFERRED_PROVIDER_nativesdk-zlib ?= "nativesdk-zlib"
38
39# Use the libva from OE-Core when layer is included but no MACHINE 35# Use the libva from OE-Core when layer is included but no MACHINE
40# from meta-intel is being used. 36# from meta-intel is being used.
41PREFERRED_PROVIDER_libva ?= "libva" 37PREFERRED_PROVIDER_libva ?= "libva"
diff --git a/recipes-core/zlib/zlib-intel_1.2.11.1.jtkv6.3.bb b/recipes-core/zlib/zlib-intel_1.2.11.1.jtkv6.3.bb
deleted file mode 100644
index 71c21a04..00000000
--- a/recipes-core/zlib/zlib-intel_1.2.11.1.jtkv6.3.bb
+++ /dev/null
@@ -1,18 +0,0 @@
1require recipes-core/zlib/zlib_1.2.11.bb
2
3FILESEXTRAPATHS:append = ":${COREBASE}/meta/recipes-core/zlib/zlib"
4
5SUMMARY = "Zlib Compression Library (Intel-tuned)"
6
7PROVIDES = "zlib"
8
9SRC_URI:remove = "${SOURCEFORGE_MIRROR}/libpng/${BPN}/${PV}/${BPN}-${PV}.tar.xz"
10SRC_URI:prepend = "git://github.com/jtkukunas/zlib.git;protocol=https;branch=master "
11
12SRCREV = "a43a247bfa16ec5368747b5b64f11ea5ca033010"
13S = "${WORKDIR}/git"
14
15RPROVIDES:${PN} += "zlib"
16RPROVIDES:${PN}-ptest += "zlib-ptest"
17
18UPSTREAM_CHECK_GITTAGREGEX = "^v(?P<pver>(\d+(\.\d+)+)_jtkv(\d+(\.\d+)+))$"