From b7f957063c3e58ce845830d6550aa6b512c3abef Mon Sep 17 00:00:00 2001 From: Naoto Yamaguchi Date: Sat, 21 May 2022 14:35:48 +0900 Subject: Fix a recipe issue cased by yocto update After the yocto update to kirkstone, meta-agl-lxc caused some recipe issue. Some r-car bsp modification recipe has mismatch to new version. Container config recipe has md5 hash mismatch with common license. Fix path from /lib/systemd/ to ${D}/${systemd_unitdir}/. This patch fix these issue. Bug-AGL : SPEC-4394 Change-Id: Ibf40f74f028b59dcd59431916eeaeac4f4c56e16 Signed-off-by: Naoto Yamaguchi --- .../meta-rcar-gen3/recipes-connectivity/openssl/openssl_%.bbappend | 4 ++++ .../recipes-connectivity/openssl/openssl_1.1.%.bbappend | 4 ---- .../gstreamer/gstreamer1.0-plugins-bad_1.16.3.bbappend | 4 ---- .../gstreamer/gstreamer1.0-plugins-bad_1.20.%.bbappend | 4 ++++ .../recipes-container/lxc-config/lxc-config-cluster-demo_1.0.bb | 2 +- meta-agl-lxc/recipes-container/lxc-config/lxc-config-dummy_1.0.bb | 2 +- meta-agl-lxc/recipes-container/lxc-config/lxc-config-ivi-demo_1.0.bb | 2 +- meta-agl-lxc/recipes-demo/mominavi/mominavi_git.bb | 4 ++-- meta-agl-lxc/recipes-demo/momiplay/momiplay_git.bb | 4 ++-- meta-agl-lxc/recipes-demo/momiscreen/momiscreen_git.bb | 4 ++-- 10 files changed, 17 insertions(+), 17 deletions(-) create mode 100644 meta-agl-lxc/dynamic-layers/meta-rcar-gen3/recipes-connectivity/openssl/openssl_%.bbappend delete mode 100644 meta-agl-lxc/dynamic-layers/meta-rcar-gen3/recipes-connectivity/openssl/openssl_1.1.%.bbappend delete mode 100644 meta-agl-lxc/dynamic-layers/meta-rcar-gen3/recipes-multimedia/gstreamer/gstreamer1.0-plugins-bad_1.16.3.bbappend create mode 100644 meta-agl-lxc/dynamic-layers/meta-rcar-gen3/recipes-multimedia/gstreamer/gstreamer1.0-plugins-bad_1.20.%.bbappend (limited to 'meta-agl-lxc') diff --git a/meta-agl-lxc/dynamic-layers/meta-rcar-gen3/recipes-connectivity/openssl/openssl_%.bbappend b/meta-agl-lxc/dynamic-layers/meta-rcar-gen3/recipes-connectivity/openssl/openssl_%.bbappend new file mode 100644 index 00000000..6060e6b1 --- /dev/null +++ b/meta-agl-lxc/dynamic-layers/meta-rcar-gen3/recipes-connectivity/openssl/openssl_%.bbappend @@ -0,0 +1,4 @@ +# Add a hook to disable depending on cryptodev-module for containers +CRYPTODEV_RDEPENDS = "cryptodev-module" +CRYPTODEV_RDEPENDS:aglcontainerguest = "" +PACKAGECONFIG[cryptodev-linux] = "enable-devcryptoeng,disable-devcryptoeng,cryptodev-linux,,${CRYPTODEV_RDEPENDS}" diff --git a/meta-agl-lxc/dynamic-layers/meta-rcar-gen3/recipes-connectivity/openssl/openssl_1.1.%.bbappend b/meta-agl-lxc/dynamic-layers/meta-rcar-gen3/recipes-connectivity/openssl/openssl_1.1.%.bbappend deleted file mode 100644 index 6060e6b1..00000000 --- a/meta-agl-lxc/dynamic-layers/meta-rcar-gen3/recipes-connectivity/openssl/openssl_1.1.%.bbappend +++ /dev/null @@ -1,4 +0,0 @@ -# Add a hook to disable depending on cryptodev-module for containers -CRYPTODEV_RDEPENDS = "cryptodev-module" -CRYPTODEV_RDEPENDS:aglcontainerguest = "" -PACKAGECONFIG[cryptodev-linux] = "enable-devcryptoeng,disable-devcryptoeng,cryptodev-linux,,${CRYPTODEV_RDEPENDS}" diff --git a/meta-agl-lxc/dynamic-layers/meta-rcar-gen3/recipes-multimedia/gstreamer/gstreamer1.0-plugins-bad_1.16.3.bbappend b/meta-agl-lxc/dynamic-layers/meta-rcar-gen3/recipes-multimedia/gstreamer/gstreamer1.0-plugins-bad_1.16.3.bbappend deleted file mode 100644 index 204b6902..00000000 --- a/meta-agl-lxc/dynamic-layers/meta-rcar-gen3/recipes-multimedia/gstreamer/gstreamer1.0-plugins-bad_1.16.3.bbappend +++ /dev/null @@ -1,4 +0,0 @@ -DEPENDS:remove:aglcontainerguest = "linux-renesas" - -EXTRA_OECONF:remove:aglcontainerguest = "--enable-kms" -PACKAGECONFIG:remove:aglcontainerguest = "kms" diff --git a/meta-agl-lxc/dynamic-layers/meta-rcar-gen3/recipes-multimedia/gstreamer/gstreamer1.0-plugins-bad_1.20.%.bbappend b/meta-agl-lxc/dynamic-layers/meta-rcar-gen3/recipes-multimedia/gstreamer/gstreamer1.0-plugins-bad_1.20.%.bbappend new file mode 100644 index 00000000..204b6902 --- /dev/null +++ b/meta-agl-lxc/dynamic-layers/meta-rcar-gen3/recipes-multimedia/gstreamer/gstreamer1.0-plugins-bad_1.20.%.bbappend @@ -0,0 +1,4 @@ +DEPENDS:remove:aglcontainerguest = "linux-renesas" + +EXTRA_OECONF:remove:aglcontainerguest = "--enable-kms" +PACKAGECONFIG:remove:aglcontainerguest = "kms" diff --git a/meta-agl-lxc/recipes-container/lxc-config/lxc-config-cluster-demo_1.0.bb b/meta-agl-lxc/recipes-container/lxc-config/lxc-config-cluster-demo_1.0.bb index d4e602e7..a30505e9 100644 --- a/meta-agl-lxc/recipes-container/lxc-config/lxc-config-cluster-demo_1.0.bb +++ b/meta-agl-lxc/recipes-container/lxc-config/lxc-config-cluster-demo_1.0.bb @@ -1,6 +1,6 @@ DESCRIPTION = "AGL cluster demo container LXC config" LICENSE = "BSD-3-Clause" -LIC_FILES_CHKSUM = "file://${COMMON_LICENSE_DIR}/BSD-3-Clause;md5=3775480a712fc46a69647678acb234cb" +LIC_FILES_CHKSUM = "file://${COMMON_LICENSE_DIR}/BSD-3-Clause;md5=550794465ba0ec5312d6919e203a55f9" inherit lxc-config diff --git a/meta-agl-lxc/recipes-container/lxc-config/lxc-config-dummy_1.0.bb b/meta-agl-lxc/recipes-container/lxc-config/lxc-config-dummy_1.0.bb index 71d43edd..41246391 100644 --- a/meta-agl-lxc/recipes-container/lxc-config/lxc-config-dummy_1.0.bb +++ b/meta-agl-lxc/recipes-container/lxc-config/lxc-config-dummy_1.0.bb @@ -1,5 +1,5 @@ DESCRIPTION = "AGL dummy container LXC config" LICENSE = "BSD-3-Clause" -LIC_FILES_CHKSUM = "file://${COMMON_LICENSE_DIR}/BSD-3-Clause;md5=3775480a712fc46a69647678acb234cb" +LIC_FILES_CHKSUM = "file://${COMMON_LICENSE_DIR}/BSD-3-Clause;md5=550794465ba0ec5312d6919e203a55f9" inherit lxc-config diff --git a/meta-agl-lxc/recipes-container/lxc-config/lxc-config-ivi-demo_1.0.bb b/meta-agl-lxc/recipes-container/lxc-config/lxc-config-ivi-demo_1.0.bb index f55d336c..0bc7e11c 100644 --- a/meta-agl-lxc/recipes-container/lxc-config/lxc-config-ivi-demo_1.0.bb +++ b/meta-agl-lxc/recipes-container/lxc-config/lxc-config-ivi-demo_1.0.bb @@ -1,6 +1,6 @@ DESCRIPTION = "AGL simple IVI demo container LXC config" LICENSE = "BSD-3-Clause" -LIC_FILES_CHKSUM = "file://${COMMON_LICENSE_DIR}/BSD-3-Clause;md5=3775480a712fc46a69647678acb234cb" +LIC_FILES_CHKSUM = "file://${COMMON_LICENSE_DIR}/BSD-3-Clause;md5=550794465ba0ec5312d6919e203a55f9" inherit lxc-config diff --git a/meta-agl-lxc/recipes-demo/mominavi/mominavi_git.bb b/meta-agl-lxc/recipes-demo/mominavi/mominavi_git.bb index 3c93427a..124252b5 100644 --- a/meta-agl-lxc/recipes-demo/mominavi/mominavi_git.bb +++ b/meta-agl-lxc/recipes-demo/mominavi/mominavi_git.bb @@ -34,8 +34,8 @@ do_configure:prepend() { fi } do_install:append() { - install -d ${D}/lib/systemd/system - install -m 0644 ${WORKDIR}/mominavi.service ${D}/lib/systemd/system + install -d ${D}/${systemd_unitdir}/system + install -m 0644 ${WORKDIR}/mominavi.service ${D}/${systemd_unitdir}/system install -m 0755 -d ${D}${sysconfdir}/default/ install -m 0755 ${WORKDIR}/mominavi ${D}${sysconfdir}/default/ diff --git a/meta-agl-lxc/recipes-demo/momiplay/momiplay_git.bb b/meta-agl-lxc/recipes-demo/momiplay/momiplay_git.bb index 25674fbc..02fc6f66 100644 --- a/meta-agl-lxc/recipes-demo/momiplay/momiplay_git.bb +++ b/meta-agl-lxc/recipes-demo/momiplay/momiplay_git.bb @@ -27,8 +27,8 @@ inherit qmake5 systemd QT_INSTALL_PREFIX = "/usr" do_install:append() { - install -d ${D}/lib/systemd/system - install -m 0644 ${WORKDIR}/momiplay.service ${D}/lib/systemd/system + install -d ${D}/${systemd_unitdir}/system + install -m 0644 ${WORKDIR}/momiplay.service ${D}/${systemd_unitdir}/system install -m 0755 -d ${D}${sysconfdir}/default/ install -m 0755 ${WORKDIR}/momiplay ${D}${sysconfdir}/default/ diff --git a/meta-agl-lxc/recipes-demo/momiscreen/momiscreen_git.bb b/meta-agl-lxc/recipes-demo/momiscreen/momiscreen_git.bb index 35fc6e75..f37a5365 100644 --- a/meta-agl-lxc/recipes-demo/momiscreen/momiscreen_git.bb +++ b/meta-agl-lxc/recipes-demo/momiscreen/momiscreen_git.bb @@ -26,8 +26,8 @@ inherit qmake5 systemd QT_INSTALL_PREFIX = "/usr" do_install:append() { - install -d ${D}/lib/systemd/system - install -m 0644 ${WORKDIR}/momiscreen.service ${D}/lib/systemd/system + install -d ${D}/${systemd_unitdir}/system + install -m 0644 ${WORKDIR}/momiscreen.service ${D}/${systemd_unitdir}/system install -m 0755 -d ${D}${sysconfdir}/default/ install -m 0755 ${WORKDIR}/momiscreen ${D}${sysconfdir}/default/ -- cgit 1.2.3-korg