diff options
-rw-r--r-- | conf/distro/sota.conf.inc | 3 | ||||
-rw-r--r-- | recipes-bsp/u-boot/u-boot_2016.11.bb | 13 | ||||
-rw-r--r-- | recipes-support/glib-networking/glib-networking_%.bbappend | 7 | ||||
-rw-r--r-- | recipes-support/libsoup/libsoup-2.4_%.bbappend | 2 | ||||
-rw-r--r-- | scripts/lib/wic/plugins/source/otaimage.py | 11 |
5 files changed, 16 insertions, 20 deletions
diff --git a/conf/distro/sota.conf.inc b/conf/distro/sota.conf.inc index 7438424..ea1ca95 100644 --- a/conf/distro/sota.conf.inc +++ b/conf/distro/sota.conf.inc | |||
@@ -5,6 +5,9 @@ | |||
5 | # require conf/distro/sota.conf.inc | 5 | # require conf/distro/sota.conf.inc |
6 | 6 | ||
7 | DISTRO_FEATURES_append = " sota" | 7 | DISTRO_FEATURES_append = " sota" |
8 | DISTRO_FEATURES_NATIVE_append = " sota" | ||
8 | INHERIT += " sota" | 9 | INHERIT += " sota" |
9 | # Prelinking increases the size of downloads and causes build errors | 10 | # Prelinking increases the size of downloads and causes build errors |
10 | USER_CLASSES_remove = "image-prelink" | 11 | USER_CLASSES_remove = "image-prelink" |
12 | |||
13 | HOSTTOOLS_append = " sync sha256sum" | ||
diff --git a/recipes-bsp/u-boot/u-boot_2016.11.bb b/recipes-bsp/u-boot/u-boot_2016.11.bb deleted file mode 100644 index e6e1fcf..0000000 --- a/recipes-bsp/u-boot/u-boot_2016.11.bb +++ /dev/null | |||
@@ -1,13 +0,0 @@ | |||
1 | require recipes-bsp/u-boot/u-boot.inc | ||
2 | |||
3 | DEPENDS += "dtc-native" | ||
4 | |||
5 | SRCREV = "5ea3e51fc481613a8dee8c02848d1b42c81ad892" | ||
6 | |||
7 | PV = "v2016.11+git${SRCPV}" | ||
8 | |||
9 | #This patch is not compliant with u-boot 2016.11 | ||
10 | #Version of u-boot from yocto 2.2 Morty is 2016.03 from: | ||
11 | # meta/recipes-bsp/u-boot/u-boot_2016.03.bb | ||
12 | SRC_URI_remove_raspberrypi3 = "file://0003-Include-lowlevel_init.o-for-rpi2.patch" | ||
13 | SRC_URI_remove_raspberrypi2 = "file://0003-Include-lowlevel_init.o-for-rpi2.patch" | ||
diff --git a/recipes-support/glib-networking/glib-networking_%.bbappend b/recipes-support/glib-networking/glib-networking_%.bbappend index fccb949..1c4fe19 100644 --- a/recipes-support/glib-networking/glib-networking_%.bbappend +++ b/recipes-support/glib-networking/glib-networking_%.bbappend | |||
@@ -1 +1,6 @@ | |||
1 | BBCLASSEXTEND_append_sota = " native" | 1 | BBCLASSEXTEND_append_sota = " native nativesdk" |
2 | |||
3 | # Hackery to prevent relocatable_native_pcfiles from crashing | ||
4 | do_install_append_class-native () { | ||
5 | rmdir ${D}${libdir}/pkgconfig | ||
6 | } | ||
diff --git a/recipes-support/libsoup/libsoup-2.4_%.bbappend b/recipes-support/libsoup/libsoup-2.4_%.bbappend index ce4df6d..18383f1 100644 --- a/recipes-support/libsoup/libsoup-2.4_%.bbappend +++ b/recipes-support/libsoup/libsoup-2.4_%.bbappend | |||
@@ -1,3 +1,3 @@ | |||
1 | BBCLASSEXTEND_append_sota = " native" | 1 | BBCLASSEXTEND_append_sota = " native nativesdk" |
2 | 2 | ||
3 | DEPENDS_append_class-native = "${@bb.utils.contains('DISTRO_FEATURES', 'sota', ' glib-networking-native', ' ', d)}" | 3 | DEPENDS_append_class-native = "${@bb.utils.contains('DISTRO_FEATURES', 'sota', ' glib-networking-native', ' ', d)}" |
diff --git a/scripts/lib/wic/plugins/source/otaimage.py b/scripts/lib/wic/plugins/source/otaimage.py index dc507a8..eef0bb4 100644 --- a/scripts/lib/wic/plugins/source/otaimage.py +++ b/scripts/lib/wic/plugins/source/otaimage.py | |||
@@ -15,11 +15,12 @@ | |||
15 | # 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. | 15 | # 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. |
16 | # | 16 | # |
17 | 17 | ||
18 | import logging | ||
18 | import os | 19 | import os |
20 | import sys | ||
19 | 21 | ||
20 | from wic import msger | ||
21 | from wic.pluginbase import SourcePlugin | 22 | from wic.pluginbase import SourcePlugin |
22 | from wic.utils.oe.misc import get_bitbake_var | 23 | from wic.utils.misc import get_bitbake_var |
23 | 24 | ||
24 | class OTAImagePlugin(SourcePlugin): | 25 | class OTAImagePlugin(SourcePlugin): |
25 | """ | 26 | """ |
@@ -57,12 +58,12 @@ class OTAImagePlugin(SourcePlugin): | |||
57 | """ | 58 | """ |
58 | bootimg_dir = get_bitbake_var("DEPLOY_DIR_IMAGE") | 59 | bootimg_dir = get_bitbake_var("DEPLOY_DIR_IMAGE") |
59 | if not bootimg_dir: | 60 | if not bootimg_dir: |
60 | msger.error("Couldn't find DEPLOY_DIR_IMAGE, exiting\n") | 61 | logger.error("Couldn't find DEPLOY_DIR_IMAGE, exiting\n") |
61 | 62 | ||
62 | msger.debug('Bootimg dir: %s' % bootimg_dir) | 63 | logger.debug('Bootimg dir: %s' % bootimg_dir) |
63 | 64 | ||
64 | src = bootimg_dir + "/" + get_bitbake_var("IMAGE_LINK_NAME") + ".otaimg" | 65 | src = bootimg_dir + "/" + get_bitbake_var("IMAGE_LINK_NAME") + ".otaimg" |
65 | 66 | ||
66 | msger.debug('Preparing partition using image %s' % (src)) | 67 | logger.debug('Preparing partition using image %s' % (src)) |
67 | part.prepare_rootfs_from_fs_image(cr_workdir, src, "") | 68 | part.prepare_rootfs_from_fs_image(cr_workdir, src, "") |
68 | 69 | ||