From edb44f9948269ef710dfb5bc9d84217b95a1f8c0 Mon Sep 17 00:00:00 2001 From: Jose Diaz de Grenu Date: Fri, 5 Jan 2018 14:58:29 +0100 Subject: [PATCH] rocko migration: update recipes All this recipes only need to be renamed to the new version: * cherokee * curl * imx-codec * imx-gst1.0-plugin * imx-parser https://jira.digi.com/browse/DEL-5518 Signed-off-by: Jose Diaz de Grenu --- .../{cherokee_1.2.98.bbappend => cherokee_git.bbappend} | 2 +- .../0001-gstimxv4l2-map-dev-video1-to-dev-fb0.patch | 0 ...ugin_4.1.4.bbappend => imx-gst1.0-plugin_4.3.1.bbappend} | 2 +- .../{imx-codec_4.1.4.bbappend => imx-codec_4.2.1.bbappend} | 2 +- ...{imx-parser_4.1.4.bbappend => imx-parser_4.2.1.bbappend} | 2 +- meta-digi-dey/recipes-support/curl/curl_7.50.1.bbappend | 6 ------ meta-digi-dey/recipes-support/curl/curl_7.54.1.bbappend | 5 +++++ 7 files changed, 9 insertions(+), 10 deletions(-) rename meta-digi-dey/recipes-connectivity/cherokee/{cherokee_1.2.98.bbappend => cherokee_git.bbappend} (92%) rename meta-digi-dey/recipes-multimedia/gstreamer/{imx-gst1.0-plugin-4.1.4 => imx-gst1.0-plugin-4.3.1}/0001-gstimxv4l2-map-dev-video1-to-dev-fb0.patch (100%) rename meta-digi-dey/recipes-multimedia/gstreamer/{imx-gst1.0-plugin_4.1.4.bbappend => imx-gst1.0-plugin_4.3.1.bbappend} (71%) rename meta-digi-dey/recipes-multimedia/imx-codec/{imx-codec_4.1.4.bbappend => imx-codec_4.2.1.bbappend} (96%) rename meta-digi-dey/recipes-multimedia/imx-parser/{imx-parser_4.1.4.bbappend => imx-parser_4.2.1.bbappend} (91%) delete mode 100644 meta-digi-dey/recipes-support/curl/curl_7.50.1.bbappend create mode 100644 meta-digi-dey/recipes-support/curl/curl_7.54.1.bbappend diff --git a/meta-digi-dey/recipes-connectivity/cherokee/cherokee_1.2.98.bbappend b/meta-digi-dey/recipes-connectivity/cherokee/cherokee_git.bbappend similarity index 92% rename from meta-digi-dey/recipes-connectivity/cherokee/cherokee_1.2.98.bbappend rename to meta-digi-dey/recipes-connectivity/cherokee/cherokee_git.bbappend index 4305deba6..adb2e3bcd 100644 --- a/meta-digi-dey/recipes-connectivity/cherokee/cherokee_1.2.98.bbappend +++ b/meta-digi-dey/recipes-connectivity/cherokee/cherokee_git.bbappend @@ -1,4 +1,4 @@ -# Copyright (C) 2013 Digi International. +# Copyright (C) 2013-2018 Digi International. FILESEXTRAPATHS_prepend := "${THISDIR}/${BPN}:" diff --git a/meta-digi-dey/recipes-multimedia/gstreamer/imx-gst1.0-plugin-4.1.4/0001-gstimxv4l2-map-dev-video1-to-dev-fb0.patch b/meta-digi-dey/recipes-multimedia/gstreamer/imx-gst1.0-plugin-4.3.1/0001-gstimxv4l2-map-dev-video1-to-dev-fb0.patch similarity index 100% rename from meta-digi-dey/recipes-multimedia/gstreamer/imx-gst1.0-plugin-4.1.4/0001-gstimxv4l2-map-dev-video1-to-dev-fb0.patch rename to meta-digi-dey/recipes-multimedia/gstreamer/imx-gst1.0-plugin-4.3.1/0001-gstimxv4l2-map-dev-video1-to-dev-fb0.patch diff --git a/meta-digi-dey/recipes-multimedia/gstreamer/imx-gst1.0-plugin_4.1.4.bbappend b/meta-digi-dey/recipes-multimedia/gstreamer/imx-gst1.0-plugin_4.3.1.bbappend similarity index 71% rename from meta-digi-dey/recipes-multimedia/gstreamer/imx-gst1.0-plugin_4.1.4.bbappend rename to meta-digi-dey/recipes-multimedia/gstreamer/imx-gst1.0-plugin_4.3.1.bbappend index 3ed49a327..0910aca5a 100644 --- a/meta-digi-dey/recipes-multimedia/gstreamer/imx-gst1.0-plugin_4.1.4.bbappend +++ b/meta-digi-dey/recipes-multimedia/gstreamer/imx-gst1.0-plugin_4.3.1.bbappend @@ -1,4 +1,4 @@ -# Copyright (C) 2016, 2017 Digi International +# Copyright (C) 2016-2018 Digi International FILESEXTRAPATHS_prepend := "${THISDIR}/${BP}:" diff --git a/meta-digi-dey/recipes-multimedia/imx-codec/imx-codec_4.1.4.bbappend b/meta-digi-dey/recipes-multimedia/imx-codec/imx-codec_4.2.1.bbappend similarity index 96% rename from meta-digi-dey/recipes-multimedia/imx-codec/imx-codec_4.1.4.bbappend rename to meta-digi-dey/recipes-multimedia/imx-codec/imx-codec_4.2.1.bbappend index 4438d9cfd..2e5247bce 100644 --- a/meta-digi-dey/recipes-multimedia/imx-codec/imx-codec_4.1.4.bbappend +++ b/meta-digi-dey/recipes-multimedia/imx-codec/imx-codec_4.2.1.bbappend @@ -1,4 +1,4 @@ -# Copyright (C) 2017 Digi International Inc. +# Copyright (C) 2017, 2018 Digi International Inc. # Empirically detected binaries that are not needed for a given platform REDUNDANT_BINS ?= "" diff --git a/meta-digi-dey/recipes-multimedia/imx-parser/imx-parser_4.1.4.bbappend b/meta-digi-dey/recipes-multimedia/imx-parser/imx-parser_4.2.1.bbappend similarity index 91% rename from meta-digi-dey/recipes-multimedia/imx-parser/imx-parser_4.1.4.bbappend rename to meta-digi-dey/recipes-multimedia/imx-parser/imx-parser_4.2.1.bbappend index e8363a7e8..63258969c 100644 --- a/meta-digi-dey/recipes-multimedia/imx-parser/imx-parser_4.1.4.bbappend +++ b/meta-digi-dey/recipes-multimedia/imx-parser/imx-parser_4.2.1.bbappend @@ -1,4 +1,4 @@ -# Copyright (C) 2017 Digi International Inc. +# Copyright (C) 2017, 2018 Digi International Inc. # Empirically detected binaries that are not needed for a given platform REDUNDANT_BINS ?= "" diff --git a/meta-digi-dey/recipes-support/curl/curl_7.50.1.bbappend b/meta-digi-dey/recipes-support/curl/curl_7.50.1.bbappend deleted file mode 100644 index 29bf61f82..000000000 --- a/meta-digi-dey/recipes-support/curl/curl_7.50.1.bbappend +++ /dev/null @@ -1,6 +0,0 @@ -# Copyright (C) 2017 Digi International Inc. - -# 'ares' and 'threaded-resolver' are mutually exclusive -PACKAGECONFIG_append_class-target = " ares" -PACKAGECONFIG[ares] = "--enable-ares,--disable-ares,c-ares" -PACKAGECONFIG[threaded-resolver] = "--enable-threaded-resolver,--disable-threaded-resolver," diff --git a/meta-digi-dey/recipes-support/curl/curl_7.54.1.bbappend b/meta-digi-dey/recipes-support/curl/curl_7.54.1.bbappend new file mode 100644 index 000000000..f6826841b --- /dev/null +++ b/meta-digi-dey/recipes-support/curl/curl_7.54.1.bbappend @@ -0,0 +1,5 @@ +# Copyright (C) 2017, 2018 Digi International Inc. + +# 'ares' and 'threaded-resolver' are mutually exclusive +PACKAGECONFIG_remove_class-target = "threaded-resolver" +PACKAGECONFIG_append_class-target = " ares"