From d8ba563dab24bdc7bb4f25b215938f2928d38e77 Mon Sep 17 00:00:00 2001 From: Ming Liu Date: Sat, 11 Nov 2017 15:22:32 +0800 Subject: image_types_ota.bbclass: drop deprecated IMAGE_DEPENDS IMAGE_DEPENDS is deprecated in latest OE, replace it with: do_image_[depends] += ":" Signed-off-by: Ming Liu --- classes/image_types_ota.bbclass | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/classes/image_types_ota.bbclass b/classes/image_types_ota.bbclass index 09c30ff..88fb1c5 100644 --- a/classes/image_types_ota.bbclass +++ b/classes/image_types_ota.bbclass @@ -11,9 +11,9 @@ inherit image OSTREE_BOOTLOADER ??= 'u-boot' -IMAGE_DEPENDS_otaimg = "e2fsprogs-native:do_populate_sysroot \ - ${@'grub:do_populate_sysroot' if d.getVar('OSTREE_BOOTLOADER', True) == 'grub' else ''} \ - ${@'virtual/bootloader:do_deploy' if d.getVar('OSTREE_BOOTLOADER', True) == 'u-boot' else ''}" +do_image_otaimg[depends] += "e2fsprogs-native:do_populate_sysroot \ + ${@'grub:do_populate_sysroot' if d.getVar('OSTREE_BOOTLOADER', True) == 'grub' else ''} \ + ${@'virtual/bootloader:do_deploy' if d.getVar('OSTREE_BOOTLOADER', True) == 'u-boot' else ''}" calculate_size () { BASE=$1 -- cgit v1.2.3-54-g00ecf From 1091fb12e0c48e7c84fe4efad03fe48d5adc54a3 Mon Sep 17 00:00:00 2001 From: Ming Liu Date: Sat, 11 Nov 2017 15:25:03 +0800 Subject: image_types_ota.bbclass: do not inherit image As a image_types_* bbclass, it does not have to inherit image class, it is sort of redundant code. Signed-off-by: Ming Liu --- classes/image_types_ota.bbclass | 2 -- 1 file changed, 2 deletions(-) diff --git a/classes/image_types_ota.bbclass b/classes/image_types_ota.bbclass index 88fb1c5..ae217e3 100644 --- a/classes/image_types_ota.bbclass +++ b/classes/image_types_ota.bbclass @@ -7,8 +7,6 @@ # boot scripts, kernel and initramfs images # -inherit image - OSTREE_BOOTLOADER ??= 'u-boot' do_image_otaimg[depends] += "e2fsprogs-native:do_populate_sysroot \ -- cgit v1.2.3-54-g00ecf From a5ba79191a87869596b84296519f5c6f0e773a11 Mon Sep 17 00:00:00 2001 From: Ming Liu Date: Fri, 17 Nov 2017 09:53:05 +0800 Subject: image_types_ostree.bbclass: do not inherit image As a image_types_* bbclass, it does not have to inherit image class, it is sort of redundant code. Signed-off-by: Ming Liu --- classes/image_types_ostree.bbclass | 2 -- 1 file changed, 2 deletions(-) diff --git a/classes/image_types_ostree.bbclass b/classes/image_types_ostree.bbclass index 172f2c8..8143b67 100644 --- a/classes/image_types_ostree.bbclass +++ b/classes/image_types_ostree.bbclass @@ -1,7 +1,5 @@ # OSTree deployment -inherit image - IMAGE_DEPENDS_ostree = "ostree-native:do_populate_sysroot \ openssl-native:do_populate_sysroot \ coreutils-native:do_populate_sysroot \ -- cgit v1.2.3-54-g00ecf