diff options
author | Paul Barker <pbarker@toganlabs.com> | 2017-09-08 09:35:48 +0000 |
---|---|---|
committer | Andrei Gherzan <andrei@gherzan.com> | 2017-09-24 20:39:35 +0100 |
commit | cbd2412fb4fd38febdd2e71c6e8e9d7f35e94419 (patch) | |
tree | 74b543e9a29f8b6ddade46ef9fc4fc830bae05bf | |
parent | 8311d16e5999566d01e6931003f858d979a6e46c (diff) | |
download | meta-raspberrypi-cbd2412fb4fd38febdd2e71c6e8e9d7f35e94419.tar.gz |
linux-raspberrypi-base.bbclass: Drop
The only remaining function in linux-raspberrypi-base was split_overlays() which
is used in the sdcard_image-rpi class. So we can move this function over and
drop the now-empty linux-raspberrypi-base class.
Signed-off-by: Paul Barker <pbarker@toganlabs.com>
-rw-r--r-- | classes/linux-raspberrypi-base.bbclass | 12 | ||||
-rw-r--r-- | classes/sdcard_image-rpi.bbclass | 12 | ||||
-rw-r--r-- | recipes-kernel/linux/linux-raspberrypi.inc | 1 |
3 files changed, 11 insertions, 14 deletions
diff --git a/classes/linux-raspberrypi-base.bbclass b/classes/linux-raspberrypi-base.bbclass deleted file mode 100644 index 0a21cc9..0000000 --- a/classes/linux-raspberrypi-base.bbclass +++ /dev/null | |||
@@ -1,12 +0,0 @@ | |||
1 | inherit linux-kernel-base | ||
2 | |||
3 | def split_overlays(d, out, ver=None): | ||
4 | dts = d.getVar("KERNEL_DEVICETREE") | ||
5 | if out: | ||
6 | overlays = oe.utils.str_filter_out('\S+\-overlay\.dtb$', dts, d) | ||
7 | overlays = oe.utils.str_filter_out('\S+\.dtbo$', overlays, d) | ||
8 | else: | ||
9 | overlays = oe.utils.str_filter('\S+\-overlay\.dtb$', dts, d) + \ | ||
10 | " " + oe.utils.str_filter('\S+\.dtbo$', dts, d) | ||
11 | |||
12 | return overlays | ||
diff --git a/classes/sdcard_image-rpi.bbclass b/classes/sdcard_image-rpi.bbclass index 8099f77..6d34a29 100644 --- a/classes/sdcard_image-rpi.bbclass +++ b/classes/sdcard_image-rpi.bbclass | |||
@@ -1,5 +1,4 @@ | |||
1 | inherit image_types | 1 | inherit image_types |
2 | inherit linux-raspberrypi-base | ||
3 | 2 | ||
4 | # | 3 | # |
5 | # Create an image that can by written onto a SD card using dd. | 4 | # Create an image that can by written onto a SD card using dd. |
@@ -76,6 +75,17 @@ FATPAYLOAD ?= "" | |||
76 | SDIMG_VFAT = "${IMAGE_NAME}.vfat" | 75 | SDIMG_VFAT = "${IMAGE_NAME}.vfat" |
77 | SDIMG_LINK_VFAT = "${IMGDEPLOYDIR}/${IMAGE_LINK_NAME}.vfat" | 76 | SDIMG_LINK_VFAT = "${IMGDEPLOYDIR}/${IMAGE_LINK_NAME}.vfat" |
78 | 77 | ||
78 | def split_overlays(d, out, ver=None): | ||
79 | dts = d.getVar("KERNEL_DEVICETREE") | ||
80 | if out: | ||
81 | overlays = oe.utils.str_filter_out('\S+\-overlay\.dtb$', dts, d) | ||
82 | overlays = oe.utils.str_filter_out('\S+\.dtbo$', overlays, d) | ||
83 | else: | ||
84 | overlays = oe.utils.str_filter('\S+\-overlay\.dtb$', dts, d) + \ | ||
85 | " " + oe.utils.str_filter('\S+\.dtbo$', dts, d) | ||
86 | |||
87 | return overlays | ||
88 | |||
79 | IMAGE_CMD_rpi-sdimg () { | 89 | IMAGE_CMD_rpi-sdimg () { |
80 | 90 | ||
81 | # Align partitions | 91 | # Align partitions |
diff --git a/recipes-kernel/linux/linux-raspberrypi.inc b/recipes-kernel/linux/linux-raspberrypi.inc index 8aa9577..154e4da 100644 --- a/recipes-kernel/linux/linux-raspberrypi.inc +++ b/recipes-kernel/linux/linux-raspberrypi.inc | |||
@@ -1,5 +1,4 @@ | |||
1 | require linux-rpi.inc | 1 | require linux-rpi.inc |
2 | inherit linux-raspberrypi-base | ||
3 | 2 | ||
4 | DESCRIPTION = "Linux Kernel for Raspberry Pi" | 3 | DESCRIPTION = "Linux Kernel for Raspberry Pi" |
5 | SECTION = "kernel" | 4 | SECTION = "kernel" |