diff --git a/.gitmodules b/.gitmodules index 1ed47a5c38..562845d9ad 100644 --- a/.gitmodules +++ b/.gitmodules @@ -4,3 +4,6 @@ [submodule "tests/suites/os/tests/secureboot/kernel-module-build"] path = tests/suites/os/tests/secureboot/kernel-module-build url = https://github.com/balena-os/kernel-module-build +[submodule "meta-clang"] + path = meta-clang + url = https://github.com/kraj/meta-clang.git diff --git a/meta-balena-common/classes/image-balena.bbclass b/meta-balena-common/classes/image-balena.bbclass index c6dc14042b..f750904385 100644 --- a/meta-balena-common/classes/image-balena.bbclass +++ b/meta-balena-common/classes/image-balena.bbclass @@ -10,11 +10,23 @@ DEPENDS += "coreutils-native jq-native ${@bb.utils.contains('BALENA_DISABLE_KERN # Deploy the license.manifest of the current image we baked deploy_image_license_manifest () { - IMAGE_LICENSE_MANIFEST="${LICENSE_DIRECTORY}/${IMAGE_NAME}/license.manifest" - if [ ! -f "${IMAGE_LICENSE_MANIFEST}" ]; then - # Pyro and above have renamed this file - IMAGE_LICENSE_MANIFEST="${LICENSE_DIRECTORY}/${IMAGE_NAME}/image_license.manifest" + # Pre-Pyro + # Post-Pyro + # Post-Nanbield + for manifest_path in \ + "${LICENSE_DIRECTORY}/${IMAGE_NAME}/image_license.manifest" \ + "${LICENSE_DIRECTORY}/${IMAGE_NAME}/license.manifest" \ + "${LICENSE_DIRECTORY}/${SSTATE_PKGARCH}/${IMAGE_NAME}/license.manifest"; do + if [ -f "${manifest_path}" ]; then + IMAGE_LICENSE_MANIFEST="${manifest_path}" + break + fi + done + + if [ -z "${IMAGE_LICENSE_MANIFEST}" ]; then + bbfatal "Unable to locate license for for image '${IMAGE_NAME}'" fi + # XXX support for post morty yocto versions # Check if we are running on a poky version which deploys to IMGDEPLOYDIR instead # of DEPLOY_DIR_IMAGE (poky morty introduced this change) @@ -26,7 +38,7 @@ deploy_image_license_manifest () { DEPLOY_SYMLINK_IMAGE_LICENSE_MANIFEST="${DEPLOY_DIR_IMAGE}/${IMAGE_LINK_NAME}.license.manifest" fi cp -f ${IMAGE_LICENSE_MANIFEST} ${DEPLOY_IMAGE_LICENSE_MANIFEST} - ln -sf ${IMAGE_NAME}.rootfs.license.manifest ${DEPLOY_SYMLINK_IMAGE_LICENSE_MANIFEST} + ln -sf ${IMAGE_NAME}.license.manifest ${DEPLOY_SYMLINK_IMAGE_LICENSE_MANIFEST} } do_populate_lic_deploy[nostamp] = "1" diff --git a/meta-balena-common/classes/image_types_balena.bbclass b/meta-balena-common/classes/image_types_balena.bbclass index 7be1f9e680..b23990c87b 100644 --- a/meta-balena-common/classes/image_types_balena.bbclass +++ b/meta-balena-common/classes/image_types_balena.bbclass @@ -69,16 +69,16 @@ python() { # instead of DEPLOY_DIR_IMAGE (poky morty introduced this change) if d.getVar('IMGDEPLOYDIR', True): d.setVar('BALENA_ROOT_FS', '${IMGDEPLOYDIR}/${IMAGE_LINK_NAME}.${BALENA_ROOT_FSTYPE}') - d.setVar('BALENA_RAW_IMG', '${IMGDEPLOYDIR}/${IMAGE_NAME}.rootfs.balenaos-img') - d.setVar('BALENA_RAW_BMAP', '${IMGDEPLOYDIR}/${IMAGE_NAME}.rootfs.bmap') - d.setVar('BALENA_DOCKER_IMG', '${IMGDEPLOYDIR}/${IMAGE_NAME}.rootfs.docker') - d.setVar('BALENA_HOSTAPP_IMG', '${IMGDEPLOYDIR}/${IMAGE_NAME}.rootfs.${BALENA_ROOT_FSTYPE}') + d.setVar('BALENA_RAW_IMG', '${IMGDEPLOYDIR}/${IMAGE_NAME}.balenaos-img') + d.setVar('BALENA_RAW_BMAP', '${IMGDEPLOYDIR}/${IMAGE_NAME}.bmap') + d.setVar('BALENA_DOCKER_IMG', '${IMGDEPLOYDIR}/${IMAGE_NAME}.docker') + d.setVar('BALENA_HOSTAPP_IMG', '${IMGDEPLOYDIR}/${IMAGE_NAME}.${BALENA_ROOT_FSTYPE}') else: d.setVar('BALENA_ROOT_FS', '${DEPLOY_DIR_IMAGE}/${IMAGE_LINK_NAME}.${BALENA_ROOT_FSTYPE}') - d.setVar('BALENA_RAW_IMG', '${DEPLOY_DIR_IMAGE}/${IMAGE_NAME}.rootfs.balenaos-img') - d.setVar('BALENA_RAW_BMAP', '${DEPLOY_DIR_IMAGE}/${IMAGE_NAME}.rootfs.bmap') - d.setVar('BALENA_DOCKER_IMG', '${DEPLOY_DIR_IMAGE}/${IMAGE_NAME}.rootfs.docker') - d.setVar('BALENA_HOSTAPP_IMG', '${DEPLOY_DIR_IMAGE}/${IMAGE_NAME}.rootfs.${BALENA_ROOT_FSTYPE}') + d.setVar('BALENA_RAW_IMG', '${DEPLOY_DIR_IMAGE}/${IMAGE_NAME}.balenaos-img') + d.setVar('BALENA_RAW_BMAP', '${DEPLOY_DIR_IMAGE}/${IMAGE_NAME}.bmap') + d.setVar('BALENA_DOCKER_IMG', '${DEPLOY_DIR_IMAGE}/${IMAGE_NAME}.docker') + d.setVar('BALENA_HOSTAPP_IMG', '${DEPLOY_DIR_IMAGE}/${IMAGE_NAME}.${BALENA_ROOT_FSTYPE}') d.setVar('BALENA_IMAGE_BOOTLOADER_DEPLOY_TASK', ' '.join(bootloader + ':do_populate_sysroot' for bootloader in d.getVar("BALENA_IMAGE_BOOTLOADER", True).split())) } @@ -137,7 +137,7 @@ do_image_balenaos_img[depends] = " \ e2fsprogs-native:do_populate_sysroot \ mtools-native:do_populate_sysroot \ parted-native:do_populate_sysroot \ - bmap-tools-native:do_populate_sysroot \ + bmaptool-native:do_populate_sysroot \ virtual/kernel:do_deploy \ ${BALENA_IMAGE_BOOTLOADER_DEPLOY_TASK} \ " diff --git a/meta-balena-common/classes/resin-sanity.bbclass b/meta-balena-common/classes/resin-sanity.bbclass index 83a78fbf1f..d2c772195c 100644 --- a/meta-balena-common/classes/resin-sanity.bbclass +++ b/meta-balena-common/classes/resin-sanity.bbclass @@ -10,7 +10,7 @@ BALENA_DEPRECATED_COLLECTIONS = " \ resin-common:balena-common \ " -def balenaos_build_configuration(): +def balenaos_build_configuration(d): success = True if d.getVar('PACKAGE_CLASSES', True) != "package_ipk": bb.warn("ResinOS distro depends on opkg packages (ipk). Make sure PACKAGE_CLASSES is set on package_ipk.") @@ -31,10 +31,11 @@ def balenaos_build_configuration(): return success python balenaos_sanity_handler() { + d = e.data if d.getVar('RESINOS_SANITY_SKIP', True) == "1": bb.warn('ResinOS specific sanity checks were skipped.') return - if not balenaos_build_configuration(): + if not balenaos_build_configuration(d): bb.fatal("ResinOS sanity checks failed. See above.") } diff --git a/meta-balena-common/conf/distro/include/balena-os.inc b/meta-balena-common/conf/distro/include/balena-os.inc index 9c10006ac6..7e001b4013 100644 --- a/meta-balena-common/conf/distro/include/balena-os.inc +++ b/meta-balena-common/conf/distro/include/balena-os.inc @@ -73,6 +73,9 @@ SPLASH = "plymouth" IMAGE_CLASSES += "image_types_balena" +IMAGE_NAME ?= "${IMAGE_LINK_NAME}${IMAGE_VERSION_SUFFIX}" +IMAGE_LINK_NAME ?= "${IMAGE_BASENAME}${IMAGE_MACHINE_SUFFIX}${IMAGE_NAME_SUFFIX}" + # Define the URL where resin exposes source or prebuilt packages AMAZON_BALENA_SHARE = "https://s3.amazonaws.com/resin-share/build_requirements" @@ -90,6 +93,7 @@ OS_KERNEL_SECUREBOOT_CMDLINE ?= "module.sig_enforce lockdown=integrity" # Initramfs INITRAMFS_IMAGE = "balena-image-initramfs" INITRAMFS_IMAGE_BUNDLE = "1" +INITRAMFS_IMAGE_NAME = "${INITRAMFS_IMAGE}${IMAGE_MACHINE_SUFFIX}" KERNEL_INITRAMFS = "-initramfs" INITRAMFS_TASK = "" @@ -122,6 +126,8 @@ PREFERRED_VERSION_upx-native:arm = "3.94" # let's pin linux-firmware to the version we imported from Poky kirkstone release PREFERRED_VERSION_linux-firmware = "20230404" +#PREFERRED_VERSION_gcc = "11.4" + # balena-engine go version requirement GOVERSION = "1.17.13" PREFERRED_PROVIDER_go-native = "go-native" diff --git a/meta-balena-common/conf/distro/resin-systemd.conf b/meta-balena-common/conf/distro/resin-systemd.conf index 97571a3597..43c8d4563f 100644 --- a/meta-balena-common/conf/distro/resin-systemd.conf +++ b/meta-balena-common/conf/distro/resin-systemd.conf @@ -6,3 +6,4 @@ DISTRO_FEATURES:append = " systemd" VIRTUAL-RUNTIME_init_manager = "systemd" DISTRO_FEATURES_BACKFILL_CONSIDERED = "sysvinit" VIRTUAL-RUNTIME_base-utils-syslog = "" +INIT_MANAGER = "systemd" diff --git a/meta-balena-common/conf/layer.conf b/meta-balena-common/conf/layer.conf index 496c338590..9bd6e1db66 100644 --- a/meta-balena-common/conf/layer.conf +++ b/meta-balena-common/conf/layer.conf @@ -7,7 +7,7 @@ BBFILE_COLLECTIONS += "balena-common" BBFILE_PATTERN_balena-common := "^${LAYERDIR}/" BBFILE_PRIORITY_balena-common = "1337" -LAYERSERIES_COMPAT_balena-common = "honister kirkstone" +LAYERSERIES_COMPAT_balena-common = "honister kirkstone scarthgap" BALENA_DEPRECATED_YOCTO_LAYER ?= "0" diff --git a/meta-balena-common/recipes-connectivity/bluez5/bluez5.inc b/meta-balena-common/recipes-connectivity/bluez5/bluez5.inc index 8fde05065f..a31d7076ba 100644 --- a/meta-balena-common/recipes-connectivity/bluez5/bluez5.inc +++ b/meta-balena-common/recipes-connectivity/bluez5/bluez5.inc @@ -7,6 +7,7 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=12f884d2ae1ff87c09e5b7ccc2c4ca7e \ file://COPYING.LIB;md5=fb504b67c50331fc78734fed90fb0e09 \ file://src/main.c;beginline=1;endline=24;md5=0ad83ca0dc37ab08af448777c581e7ac" DEPENDS = "dbus glib-2.0" +RDEPENDS:${PN} += "dbus" PROVIDES += "bluez-hcidump" RPROVIDES:${PN} += "bluez-hcidump" @@ -49,6 +50,7 @@ PACKAGECONFIG[manpages] = "--enable-manpages,--disable-manpages,python3-docutils SRC_URI = "${KERNELORG_MIRROR}/linux/bluetooth/bluez-${PV}.tar.xz \ file://init \ + file://run-ptest \ ${@bb.utils.contains('DISTRO_FEATURES', 'systemd', '', 'file://0001-Allow-using-obexd-without-systemd-in-the-user-sessio.patch', d)} \ file://0001-tests-add-a-target-for-building-tests-without-runnin.patch \ file://0001-test-gatt-Fix-hung-issue.patch \ @@ -58,21 +60,26 @@ S = "${WORKDIR}/bluez-${PV}" CVE_PRODUCT = "bluez" -inherit autotools pkgconfig systemd update-rc.d gobject-introspection-data +inherit autotools pkgconfig systemd update-rc.d ptest gobject-introspection-data EXTRA_OECONF = "\ + --enable-test \ --enable-datafiles \ --enable-library \ + --enable-pie \ --without-zsh-completion-dir \ " CFLAGS += "-DFIRMWARE_DIR=\\"${nonarch_base_libdir}/firmware\\"" + # bluez5 builds a large number of useful utilities but does not # install them. Specify which ones we want put into ${PN}-noinst-tools. NOINST_TOOLS_READLINE ??= "" +NOINST_TOOLS_TESTING ??= "" NOINST_TOOLS_BT ??= "" NOINST_TOOLS = " \ ${@bb.utils.contains('PACKAGECONFIG', 'readline', '${NOINST_TOOLS_READLINE}', '', d)} \ + ${@bb.utils.contains('PACKAGECONFIG', 'testing', '${NOINST_TOOLS_TESTING}', '', d)} \ ${@bb.utils.contains('PACKAGECONFIG', 'tools', '${NOINST_TOOLS_BT}', '', d)} \ " @@ -80,14 +87,6 @@ do_install:append() { install -d ${D}${INIT_D_DIR} install -m 0755 ${WORKDIR}/init ${D}${INIT_D_DIR}/bluetooth - install -d ${D}${sysconfdir}/bluetooth/ - if [ -f ${S}/profiles/network/network.conf ]; then - install -m 0644 ${S}/profiles/network/network.conf ${D}/${sysconfdir}/bluetooth/ - fi - if [ -f ${S}/profiles/input/input.conf ]; then - install -m 0644 ${S}/profiles/input/input.conf ${D}/${sysconfdir}/bluetooth/ - fi - if [ -f ${D}/${sysconfdir}/init.d/bluetooth ]; then sed -i -e 's#@LIBEXECDIR@#${libexecdir}#g' ${D}/${sysconfdir}/init.d/bluetooth fi @@ -96,9 +95,13 @@ do_install:append() { for f in ${NOINST_TOOLS} ; do install -m 755 ${B}/$f ${D}/${bindir} done + + # Patch python tools to use Python 3; they should be source compatible, but + # still refer to Python 2 in the shebang + sed -i -e '1s,#!.*python.*,#!${bindir}/python3,' ${D}${libdir}/bluez/test/* } -PACKAGES =+ "${PN}-obex ${PN}-noinst-tools" +PACKAGES =+ "${PN}-testtools ${PN}-obex ${PN}-noinst-tools" FILES:${PN} += " \ ${libdir}/bluetooth/plugins/*.so \ @@ -118,6 +121,8 @@ FILES:${PN}-obex = "${libexecdir}/bluetooth/obexd \ " SYSTEMD_SERVICE:${PN}-obex = "obex.service" +FILES:${PN}-testtools = "${libdir}/bluez/test/*" + def get_noinst_tools_paths (d, bb, tools): s = list() bindir = d.getVar("bindir") @@ -128,6 +133,20 @@ def get_noinst_tools_paths (d, bb, tools): FILES:${PN}-noinst-tools = "${@get_noinst_tools_paths(d, bb, d.getVar('NOINST_TOOLS'))}" +RDEPENDS:${PN}-testtools += "python3-core python3-dbus" +RDEPENDS:${PN}-testtools += "${@bb.utils.contains('GI_DATA_ENABLED', 'True', 'python3-pygobject', '', d)}" + SYSTEMD_SERVICE:${PN} = "${@bb.utils.contains('PACKAGECONFIG', 'systemd', 'bluetooth.service', '', d)}" INITSCRIPT_PACKAGES = "${PN}" INITSCRIPT_NAME:${PN} = "bluetooth" + +do_compile_ptest() { + oe_runmake buildtests +} + +do_install_ptest() { + cp -r ${B}/unit/ ${D}${PTEST_PATH} + rm -f ${D}${PTEST_PATH}/unit/*.o +} + +RDEPENDS:${PN}-ptest:append:libc-glibc = " glibc-gconv-utf-16" diff --git a/meta-balena-common/recipes-connectivity/bluez5/bluez5/0001-test-gatt-Fix-hung-issue.patch b/meta-balena-common/recipes-connectivity/bluez5/bluez5/0001-test-gatt-Fix-hung-issue.patch index e90b6a546f..b1e93dbe19 100644 --- a/meta-balena-common/recipes-connectivity/bluez5/bluez5/0001-test-gatt-Fix-hung-issue.patch +++ b/meta-balena-common/recipes-connectivity/bluez5/bluez5/0001-test-gatt-Fix-hung-issue.patch @@ -1,4 +1,4 @@ -From 61e741654cc2eb167bca212a3bb2ba8f3ba280c1 Mon Sep 17 00:00:00 2001 +From fb583a57f9f4ab956a09e9bb96d89aa13553bf21 Mon Sep 17 00:00:00 2001 From: Mingli Yu Date: Fri, 24 Aug 2018 12:04:03 +0800 Subject: [PATCH] test-gatt: Fix hung issue @@ -21,15 +21,16 @@ no action. Upstream-Status: Submitted [https://marc.info/?l=linux-bluetooth&m=153508881804635&w=2] Signed-off-by: Mingli Yu + --- unit/test-gatt.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/unit/test-gatt.c b/unit/test-gatt.c -index c7e28f8..b57373b 100644 +index 5e06d4e..4864d36 100644 --- a/unit/test-gatt.c +++ b/unit/test-gatt.c -@@ -4463,7 +4463,7 @@ int main(int argc, char *argv[]) +@@ -4546,7 +4546,7 @@ int main(int argc, char *argv[]) test_server, service_db_1, NULL, raw_pdu(0x03, 0x00, 0x02), raw_pdu(0xbf, 0x00), @@ -38,6 +39,3 @@ index c7e28f8..b57373b 100644 define_test_server("/robustness/unkown-command", test_server, service_db_1, NULL, --- -2.7.4 - diff --git a/meta-balena-common/recipes-connectivity/bluez5/bluez5/0001-tests-add-a-target-for-building-tests-without-runnin.patch b/meta-balena-common/recipes-connectivity/bluez5/bluez5/0001-tests-add-a-target-for-building-tests-without-runnin.patch index 24ddae6b63..881494a354 100644 --- a/meta-balena-common/recipes-connectivity/bluez5/bluez5/0001-tests-add-a-target-for-building-tests-without-runnin.patch +++ b/meta-balena-common/recipes-connectivity/bluez5/bluez5/0001-tests-add-a-target-for-building-tests-without-runnin.patch @@ -1,19 +1,20 @@ -From 4bdf0f96dcaa945fd29f26d56e5b36d8c23e4c8b Mon Sep 17 00:00:00 2001 +From 738e73b386352fd90f1f26cc1ee75427cf4dc23b Mon Sep 17 00:00:00 2001 From: Alexander Kanavin Date: Fri, 1 Apr 2016 17:07:34 +0300 Subject: [PATCH] tests: add a target for building tests without running them Upstream-Status: Inappropriate [oe specific] Signed-off-by: Alexander Kanavin + --- Makefile.am | 3 +++ 1 file changed, 3 insertions(+) diff --git a/Makefile.am b/Makefile.am -index 1a48a71..ba3b92f 100644 +index e738eb3..dab17dd 100644 --- a/Makefile.am +++ b/Makefile.am -@@ -425,6 +425,9 @@ endif +@@ -710,6 +710,9 @@ endif TESTS = $(unit_tests) AM_TESTS_ENVIRONMENT = MALLOC_CHECK_=3 MALLOC_PERTURB_=69 @@ -23,6 +24,3 @@ index 1a48a71..ba3b92f 100644 if DBUS_RUN_SESSION AM_TESTS_ENVIRONMENT += dbus-run-session -- endif --- -2.8.0.rc3 - diff --git a/meta-balena-common/recipes-connectivity/bluez5/bluez5/0004-src-shared-util.c-include-linux-limits.h.patch b/meta-balena-common/recipes-connectivity/bluez5/bluez5/0004-src-shared-util.c-include-linux-limits.h.patch index f954f6dab2..516d859069 100644 --- a/meta-balena-common/recipes-connectivity/bluez5/bluez5/0004-src-shared-util.c-include-linux-limits.h.patch +++ b/meta-balena-common/recipes-connectivity/bluez5/bluez5/0004-src-shared-util.c-include-linux-limits.h.patch @@ -1,4 +1,4 @@ -From 51584158b9a2e58f3790f8a7387b5cf167eca88b Mon Sep 17 00:00:00 2001 +From b53df61b41088b68c127ac76cc71683ac3453b9d Mon Sep 17 00:00:00 2001 From: Alexander Kanavin Date: Mon, 12 Dec 2022 13:10:19 +0100 Subject: [PATCH] src/shared/util.c: include linux/limits.h @@ -8,15 +8,16 @@ systems such as those using musl. Upstream-Status: Submitted [to linux-bluetooth@vger.kernel.org,luiz.von.dentz@intel.com,frederic.danis@collabora.com] Signed-off-by: Alexander Kanavin + --- src/shared/util.c | 1 + 1 file changed, 1 insertion(+) diff --git a/src/shared/util.c b/src/shared/util.c -index 0a0308c..1f61314 100644 +index c0c2c4a..036dc0d 100644 --- a/src/shared/util.c +++ b/src/shared/util.c -@@ -22,6 +22,7 @@ +@@ -23,6 +23,7 @@ #include #include #include diff --git a/meta-balena-common/recipes-connectivity/bluez5/bluez5/run-ptest b/meta-balena-common/recipes-connectivity/bluez5/bluez5/run-ptest new file mode 100644 index 0000000000..0335e68e48 --- /dev/null +++ b/meta-balena-common/recipes-connectivity/bluez5/bluez5/run-ptest @@ -0,0 +1,31 @@ +#! /bin/sh + +cd unit + +failed=0 +all=0 + +for f in test-*; do + "./$f" -q + case "$?" in + 0) + echo "PASS: $f" + all=$((all + 1)) + ;; + 77) + echo "SKIP: $f" + ;; + *) + echo "FAIL: $f" + failed=$((failed + 1)) + all=$((all + 1)) + ;; + esac +done + +if [ "$failed" -eq 0 ] ; then + echo "All $all tests passed" +else + echo "$failed of $all tests failed" +fi + diff --git a/meta-balena-common/recipes-connectivity/bluez5/bluez5_%.bbappend b/meta-balena-common/recipes-connectivity/bluez5/bluez5_%.bbappend deleted file mode 100644 index 6050d8fc9e..0000000000 --- a/meta-balena-common/recipes-connectivity/bluez5/bluez5_%.bbappend +++ /dev/null @@ -1,21 +0,0 @@ -FILESEXTRAPATHS:append := ":${THISDIR}/files" - -SRC_URI += " \ - file://10-local-bt-hci-up.rules \ - file://bluetooth.conf.systemd \ - file://main.conf \ - " - -do_install:append() { - install -D -m 0755 ${WORKDIR}/10-local-bt-hci-up.rules ${D}/lib/udev/rules.d/10-local-bt-hci-up.rules - - install -d ${D}${sysconfdir}/systemd/system/bluetooth.service.d - install -m 0644 ${WORKDIR}/bluetooth.conf.systemd ${D}${sysconfdir}/systemd/system/bluetooth.service.d/bluetooth.conf - sed -i "s,@pkglibexecdir@,${libexecdir},g" ${D}${sysconfdir}/systemd/system/bluetooth.service.d/bluetooth.conf - - install -d ${D}/var/lib/bluetooth - install -d ${D}${sysconfdir}/bluetooth - install -m 0644 ${WORKDIR}/main.conf ${D}${sysconfdir}/bluetooth/main.conf -} - -PACKAGECONFIG:append = " sixaxis" diff --git a/meta-balena-common/recipes-connectivity/bluez5/bluez5_5.66.bb b/meta-balena-common/recipes-connectivity/bluez5/bluez5_5.72.bb similarity index 88% rename from meta-balena-common/recipes-connectivity/bluez5/bluez5_5.66.bb rename to meta-balena-common/recipes-connectivity/bluez5/bluez5_5.72.bb index 2208b730b0..9fda960ea7 100644 --- a/meta-balena-common/recipes-connectivity/bluez5/bluez5_5.66.bb +++ b/meta-balena-common/recipes-connectivity/bluez5/bluez5_5.72.bb @@ -1,9 +1,8 @@ require bluez5.inc -SRC_URI[sha256sum] = "39fea64b590c9492984a0c27a89fc203e1cdc74866086efb8f4698677ab2b574" +SRC_URI[sha256sum] = "499d7fa345a996c1bb650f5c6749e1d929111fa6ece0be0e98687fee6124536e" -# These issues have kernel fixes rather than bluez fixes so exclude here -CVE_CHECK_IGNORE += "CVE-2020-12352 CVE-2020-24490" +CVE_STATUS[CVE-2020-24490] = "cpe-incorrect: This issue has kernel fixes rather than bluez fixes" # noinst programs in Makefile.tools that are conditional on READLINE # support diff --git a/meta-balena-common/recipes-connectivity/bluez5/files/10-local-bt-hci-up.rules b/meta-balena-common/recipes-connectivity/bluez5/files/10-local-bt-hci-up.rules deleted file mode 100644 index ec8f94e80d..0000000000 --- a/meta-balena-common/recipes-connectivity/bluez5/files/10-local-bt-hci-up.rules +++ /dev/null @@ -1 +0,0 @@ -ACTION=="add", SUBSYSTEM=="bluetooth", KERNEL=="hci[0-9]*", RUN+="/usr/bin/hciconfig %k up" diff --git a/meta-balena-common/recipes-connectivity/bluez5/files/bluetooth.conf.systemd b/meta-balena-common/recipes-connectivity/bluez5/files/bluetooth.conf.systemd deleted file mode 100644 index 854cc01a4a..0000000000 --- a/meta-balena-common/recipes-connectivity/bluez5/files/bluetooth.conf.systemd +++ /dev/null @@ -1,7 +0,0 @@ -[Unit] -Requires=bind-var-lib-bluetooth.service -After=bind-var-lib-bluetooth.service - -[Service] -ExecStart= -ExecStart=@pkglibexecdir@/bluetooth/bluetoothd --experimental diff --git a/meta-balena-common/recipes-connectivity/bluez5/files/main.conf b/meta-balena-common/recipes-connectivity/bluez5/files/main.conf deleted file mode 100644 index 4f772479e6..0000000000 --- a/meta-balena-common/recipes-connectivity/bluez5/files/main.conf +++ /dev/null @@ -1,5 +0,0 @@ -[General] -DeviceID=false - -[Policy] -AutoEnable=true diff --git a/meta-balena-common/recipes-connectivity/libnss-ato/libnss-ato/0001-libnss_ato.c-Enable-use-for-root-user.patch b/meta-balena-common/recipes-connectivity/libnss-ato/libnss-ato/0001-libnss_ato.c-Enable-use-for-root-user.patch index aaff78ac0c..1ba31eb3ba 100644 --- a/meta-balena-common/recipes-connectivity/libnss-ato/libnss-ato/0001-libnss_ato.c-Enable-use-for-root-user.patch +++ b/meta-balena-common/recipes-connectivity/libnss-ato/libnss-ato/0001-libnss_ato.c-Enable-use-for-root-user.patch @@ -1,28 +1,30 @@ -From aad1c867e60ab328aad3f15c682b37eadf223218 Mon Sep 17 00:00:00 2001 +From 700afe1c27610bc1cad53417476d4c76164543c1 Mon Sep 17 00:00:00 2001 From: Andrei Gherzan Date: Fri, 10 May 2019 17:25:57 +0100 -Subject: [PATCH] libnss_ato.c: Enable use for root user +Subject: [PATCH 1/1] libnss_ato.c: Enable use for root user Upstream-status: Inappropriate [configuration] Signed-off-by: Andrei Gherzan +Signed-off-by: Joseph Kogut --- libnss_ato.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/libnss_ato.c b/libnss_ato.c -index bfd02b2..8e51b80 100644 +index c404e86..b532456 100644 --- a/libnss_ato.c +++ b/libnss_ato.c @@ -28,8 +28,8 @@ #include - + /* for security reasons */ -#define MIN_UID_NUMBER 500 -#define MIN_GID_NUMBER 500 +#define MIN_UID_NUMBER 0 +#define MIN_GID_NUMBER 0 + #define BAD_CHARS ":" #define CONF_FILE "/etc/libnss-ato.conf" + +-- +2.44.0 - /* --- -2.17.1 diff --git a/meta-balena-common/recipes-connectivity/libnss-ato/libnss-ato_git.bb b/meta-balena-common/recipes-connectivity/libnss-ato/libnss-ato_git.bb index 8b247323cc..127e600d22 100644 --- a/meta-balena-common/recipes-connectivity/libnss-ato/libnss-ato_git.bb +++ b/meta-balena-common/recipes-connectivity/libnss-ato/libnss-ato_git.bb @@ -11,7 +11,7 @@ SRC_URI = " \ file://0001-libnss_ato.c-Enable-use-for-root-user.patch \ file://libnss-ato.conf \ " -SRCREV = "4b4a77bd56113fdb6bff63bd851250b6ec029446" +SRCREV = "7f33780a09b3a6a256ff77601adaed28d9bb117a" S = "${WORKDIR}/git" do_compile() { @@ -19,9 +19,9 @@ do_compile() { } do_install() { - mkdir -p ${D}${base_libdir} + mkdir -p ${D}${libdir} mkdir -p ${D}${mandir}/man3 - oe_runmake 'prefix=${D}' install + oe_runmake 'prefix=${D}${prefix}' install mkdir -p ${D}${sysconfdir} install -m 0644 ${WORKDIR}/libnss-ato.conf ${D}${sysconfdir} diff --git a/meta-balena-common/recipes-connectivity/networkmanager/networkmanager_%.bbappend b/meta-balena-common/recipes-connectivity/networkmanager/networkmanager_%.bbappend index fa8e58c1dd..ade530342b 100644 --- a/meta-balena-common/recipes-connectivity/networkmanager/networkmanager_%.bbappend +++ b/meta-balena-common/recipes-connectivity/networkmanager/networkmanager_%.bbappend @@ -49,6 +49,10 @@ EXTRA_OEMESON += " \ -Dfirewalld_zone=false \ " +# disable init script as we use systemd +INITSCRIPT_PACKAGES = "" +INITSCRIPT_NAME:${PN}-daemon = "" + do_install:append() { install -d ${D}${sysconfdir}/tmpfiles.d install -m 0644 ${WORKDIR}/nm-tmpfiles.conf ${D}${sysconfdir}/tmpfiles.d/ diff --git a/meta-balena-common/recipes-connectivity/openvpn/openvpn/openvpn-volatile.conf b/meta-balena-common/recipes-connectivity/openvpn/openvpn/openvpn-volatile.conf index 1205806d52..9cffe2cf0c 100644 --- a/meta-balena-common/recipes-connectivity/openvpn/openvpn/openvpn-volatile.conf +++ b/meta-balena-common/recipes-connectivity/openvpn/openvpn/openvpn-volatile.conf @@ -1 +1 @@ -d @LOCALSTATEDIR@/run/openvpn 0755 root root - +d /run/openvpn 0755 root root - diff --git a/meta-balena-common/recipes-connectivity/openvpn/openvpn_2.5.6.bb b/meta-balena-common/recipes-connectivity/openvpn/openvpn_2.5.6.bb index 218e72b7a8..cdb9e896b1 100644 --- a/meta-balena-common/recipes-connectivity/openvpn/openvpn_2.5.6.bb +++ b/meta-balena-common/recipes-connectivity/openvpn/openvpn_2.5.6.bb @@ -58,7 +58,6 @@ do_install:append() { install -d ${D}${sysconfdir}/tmpfiles.d install -m 0644 ${WORKDIR}/openvpn-volatile.conf ${D}${sysconfdir}/tmpfiles.d/openvpn.conf - sed -i -e 's#@LOCALSTATEDIR@#${localstatedir}#g' ${D}${sysconfdir}/tmpfiles.d/openvpn.conf fi } diff --git a/meta-balena-common/recipes-containers/balena/balena_git.bb b/meta-balena-common/recipes-containers/balena/balena_git.bb index de04ff433d..db7df733c1 100644 --- a/meta-balena-common/recipes-containers/balena/balena_git.bb +++ b/meta-balena-common/recipes-containers/balena/balena_git.bb @@ -59,7 +59,7 @@ DEPENDS:append:class-native = " go-native" INSANE_SKIP:${PN} += "already-stripped" FILES:${PN} += " \ - /lib/systemd/system/* \ + ${systemd_unitdir}/system/* \ /home/root \ ${localstatedir} \ " diff --git a/meta-balena-common/recipes-core/base-files/base-files_%.bbappend b/meta-balena-common/recipes-core/base-files/base-files_%.bbappend index 8a13130bf4..a1435ef636 100644 --- a/meta-balena-common/recipes-core/base-files/base-files_%.bbappend +++ b/meta-balena-common/recipes-core/base-files/base-files_%.bbappend @@ -13,7 +13,7 @@ do_install:append () { # Supervisor depends on the existance of /lib/modules even if we don't # deploy any kernel modules (ex.: resinOS in container) - install -d -m 755 ${D}/lib/modules + install -d -m 755 ${D}/usr/lib/modules } do_install_basefilesissue:append () { diff --git a/meta-balena-common/recipes-core/extra-udev-rules/extra-udev-rules.bb b/meta-balena-common/recipes-core/extra-udev-rules/extra-udev-rules.bb index c3faadc610..66ec3b2091 100644 --- a/meta-balena-common/recipes-core/extra-udev-rules/extra-udev-rules.bb +++ b/meta-balena-common/recipes-core/extra-udev-rules/extra-udev-rules.bb @@ -12,11 +12,11 @@ SRC_URI = " \ do_install:append() { # Rules to prevent ModemManager attempting to use Teensy boards as a modem - install -D -m 0644 ${WORKDIR}/00-teensy.rules ${D}/lib/udev/rules.d/00-teensy.rules + install -D -m 0644 ${WORKDIR}/00-teensy.rules ${D}/usr/lib/udev/rules.d/00-teensy.rules # Install miscellaneous rules file - install -D -m 0644 ${WORKDIR}/99-misc.rules ${D}/lib/udev/rules.d/99-misc.rules + install -D -m 0644 ${WORKDIR}/99-misc.rules ${D}/usr/lib/udev/rules.d/99-misc.rules # Install wlan rules file - install -D -m 0644 ${WORKDIR}/79-wlan-power.rules ${D}/lib/udev/rules.d/79-wlan-power.rules + install -D -m 0644 ${WORKDIR}/79-wlan-power.rules ${D}/usr/lib/udev/rules.d/79-wlan-power.rules } diff --git a/meta-balena-common/recipes-core/fatrw/fatrw_0.2.21.bb b/meta-balena-common/recipes-core/fatrw/fatrw_0.2.21.bb index d96d043cad..59c540cc63 100644 --- a/meta-balena-common/recipes-core/fatrw/fatrw_0.2.21.bb +++ b/meta-balena-common/recipes-core/fatrw/fatrw_0.2.21.bb @@ -70,6 +70,60 @@ SRC_URI += " \ crate://crates.io/winapi/0.3.9 \ " +SRC_URI[aho-corasick-0.7.18.sha256sum] = "1e37cfd5e7657ada45f742d6e99ca5788580b5c529dc78faf11ece6dc702656f" +SRC_URI[anyhow-1.0.62.sha256sum] = "1485d4d2cc45e7b201ee3767015c96faa5904387c9d87c6efdd0fb511f12d305" +SRC_URI[atty-0.2.14.sha256sum] = "d9b39be18770d11421cdb1b9947a45dd3f37e93092cbf377614828a319d5fee8" +SRC_URI[autocfg-1.1.0.sha256sum] = "d468802bab17cbc0cc575e9b053f41e72aa36bfa6b7f55e3529ffa43161b97fa" +SRC_URI[bitflags-1.3.2.sha256sum] = "bef38d45163c2f1dde094a7dfd33ccf595c92905c8f8f4fdc18d06fb1037718a" +SRC_URI[block-buffer-0.10.2.sha256sum] = "0bf7fe51849ea569fd452f37822f606a5cabb684dc918707a0193fd4664ff324" +SRC_URI[cfg-if-1.0.0.sha256sum] = "baf1de4339761588bc0619e3cbc0120ee582ebb74b53b4efbf79117bd2da40fd" +SRC_URI[clap-3.2.17.sha256sum] = "29e724a68d9319343bb3328c9cc2dfde263f4b3142ee1059a9980580171c954b" +SRC_URI[clap_derive-3.2.17.sha256sum] = "13547f7012c01ab4a0e8f8967730ada8f9fdf419e8b6c792788f39cf4e46eefa" +SRC_URI[clap_lex-0.2.4.sha256sum] = "2850f2f5a82cbf437dd5af4d49848fbdfc27c157c3d010345776f952765261c5" +SRC_URI[crypto-common-0.1.6.sha256sum] = "1bfb12502f3fc46cca1bb51ac28df9d618d813cdc3d2f25b9fe775a34af26bb3" +SRC_URI[digest-0.10.3.sha256sum] = "f2fb860ca6fafa5552fb6d0e816a69c8e49f0908bf524e30a90d97c85892d506" +SRC_URI[env_logger-0.9.0.sha256sum] = "0b2cf0344971ee6c64c31be0d530793fba457d322dfec2810c453d0ef228f9c3" +SRC_URI[fastrand-1.8.0.sha256sum] = "a7a407cfaa3385c4ae6b23e84623d48c2798d06e3e6a1878f7f59f17b3f86499" +SRC_URI[generic-array-0.14.6.sha256sum] = "bff49e947297f3312447abdca79f45f4738097cc82b06e72054d2223f601f1b9" +SRC_URI[getrandom-0.2.7.sha256sum] = "4eb1a864a501629691edf6c15a593b7a51eebaa1e8468e9ddc623de7c9b58ec6" +SRC_URI[glob-0.3.0.sha256sum] = "9b919933a397b79c37e33b77bb2aa3dc8eb6e165ad809e58ff75bc7db2e34574" +SRC_URI[hashbrown-0.12.3.sha256sum] = "8a9ee70c43aaf417c914396645a0fa852624801b24ebb7ae78fe8272889ac888" +SRC_URI[heck-0.4.0.sha256sum] = "2540771e65fc8cb83cd6e8a237f70c319bd5c29f78ed1084ba5d50eeac86f7f9" +SRC_URI[hermit-abi-0.1.19.sha256sum] = "62b467343b94ba476dcb2500d242dadbb39557df889310ac77c5d99100aaac33" +SRC_URI[humantime-2.1.0.sha256sum] = "9a3a5bfb195931eeb336b2a7b4d761daec841b97f947d34394601737a7bba5e4" +SRC_URI[indexmap-1.9.1.sha256sum] = "10a35a97730320ffe8e2d410b5d3b69279b98d2c14bdb8b70ea89ecf7888d41e" +SRC_URI[instant-0.1.12.sha256sum] = "7a5bbe824c507c5da5956355e86a746d82e0e1464f65d862cc5e71da70e94b2c" +SRC_URI[libc-0.2.132.sha256sum] = "8371e4e5341c3a96db127eb2465ac681ced4c433e01dd0e938adbef26ba93ba5" +SRC_URI[log-0.4.17.sha256sum] = "abb12e687cfb44aa40f41fc3978ef76448f9b6038cad6aef4259d3c095a2382e" +SRC_URI[md-5-0.10.1.sha256sum] = "658646b21e0b72f7866c7038ab086d3d5e1cd6271f060fd37defb241949d0582" +SRC_URI[memchr-2.5.0.sha256sum] = "2dffe52ecf27772e601905b7522cb4ef790d2cc203488bbd0e2fe85fcb74566d" +SRC_URI[once_cell-1.13.1.sha256sum] = "074864da206b4973b84eb91683020dbefd6a8c3f0f38e054d93954e891935e4e" +SRC_URI[os_str_bytes-6.3.0.sha256sum] = "9ff7415e9ae3fff1225851df9e0d9e4e5479f947619774677a63572e55e80eff" +SRC_URI[path-absolutize-3.0.13.sha256sum] = "d3de4b40bd9736640f14c438304c09538159802388febb02c8abaae0846c1f13" +SRC_URI[path-dedot-3.0.17.sha256sum] = "d611d5291372b3738a34ebf0d1f849e58b1dcc1101032f76a346eaa1f8ddbb5b" +SRC_URI[proc-macro-error-attr-1.0.4.sha256sum] = "a1be40180e52ecc98ad80b184934baf3d0d29f979574e439af5a55274b35f869" +SRC_URI[proc-macro-error-1.0.4.sha256sum] = "da25490ff9892aab3fcf7c36f08cfb902dd3e71ca0f9f9517bea02a73a5ce38c" +SRC_URI[proc-macro2-1.0.43.sha256sum] = "0a2ca2c61bc9f3d74d2886294ab7b9853abd9c1ad903a3ac7815c58989bb7bab" +SRC_URI[quote-1.0.21.sha256sum] = "bbe448f377a7d6961e30f5955f9b8d106c3f5e449d493ee1b125c1d43c2b5179" +SRC_URI[redox_syscall-0.2.16.sha256sum] = "fb5a58c1855b4b6819d59012155603f0b22ad30cad752600aadfcb695265519a" +SRC_URI[regex-syntax-0.6.27.sha256sum] = "a3f87b73ce11b1619a3c6332f45341e0047173771e8b8b73f87bfeefb7b56244" +SRC_URI[regex-1.6.0.sha256sum] = "4c4eb3267174b8c6c2f654116623910a0fef09c4753f8dd83db29c48a0df988b" +SRC_URI[remove_dir_all-0.5.3.sha256sum] = "3acd125665422973a33ac9d3dd2df85edad0f4ae9b00dafb1a05e43a9f5ef8e7" +SRC_URI[strsim-0.10.0.sha256sum] = "73473c0e59e6d5812c5dfe2a064a6444949f089e20eec9a2e5506596494e4623" +SRC_URI[syn-1.0.99.sha256sum] = "58dbef6ec655055e20b86b15a8cc6d439cca19b667537ac6a1369572d151ab13" +SRC_URI[tempfile-3.3.0.sha256sum] = "5cdb1ef4eaeeaddc8fbd371e5017057064af0911902ef36b39801f67cc6d79e4" +SRC_URI[termcolor-1.1.3.sha256sum] = "bab24d30b911b2376f3a13cc2cd443142f0c81dda04c118693e35b3835757755" +SRC_URI[textwrap-0.15.0.sha256sum] = "b1141d4d61095b28419e22cb0bbf02755f5e54e0526f97f1e3d1d160e60885fb" +SRC_URI[typenum-1.15.0.sha256sum] = "dcf81ac59edc17cc8697ff311e8f5ef2d99fcbd9817b34cec66f90b6c3dfd987" +SRC_URI[unicode-ident-1.0.3.sha256sum] = "c4f5b37a154999a8f3f98cc23a628d850e154479cd94decf3414696e12e31aaf" +SRC_URI[version_check-0.9.4.sha256sum] = "49874b5167b65d7193b8aba1567f5c7d93d001cafc34600cee003eda787e483f" +SRC_URI[wasi-0.11.0+wasi-snapshot-preview1.sha256sum] = "9c8d87e72b64a3b4db28d11ce29237c246188f4f51057d65a7eab63b7987e423" +SRC_URI[winapi-i686-pc-windows-gnu-0.4.0.sha256sum] = "ac3b87c63620426dd9b991e5ce0329eff545bccbbb34f3be09ff6fb6ab51b7b6" +SRC_URI[winapi-util-0.1.5.sha256sum] = "70ec6ce85bb158151cae5e5c87f95a8e97d2c0c4b001223f33a334e3ce5de178" +SRC_URI[winapi-x86_64-pc-windows-gnu-0.4.0.sha256sum] = "712e227841d057c1ee1cd2fb22fa7e5a5461ae8e48fa2ca79ec42cfc1931183f" +SRC_URI[winapi-0.3.9.sha256sum] = "5c839a674fcd7a98952e593242ea400abe93992746761e38641405d28b00f419" + + # FIXME: update generateme with the real MD5 of the license file diff --git a/meta-balena-common/recipes-core/healthdog/healthdog_1.0.6.bb b/meta-balena-common/recipes-core/healthdog/healthdog_1.0.6.bb index 80f99e1548..d5e9b66592 100644 --- a/meta-balena-common/recipes-core/healthdog/healthdog_1.0.6.bb +++ b/meta-balena-common/recipes-core/healthdog/healthdog_1.0.6.bb @@ -40,6 +40,28 @@ SRC_URI += " \ crate://crates.io/winapi/0.3.8 \ " +SRC_URI[bitflags-1.2.1.sha256sum] = "cf1de2fe8c75bc145a2f577add951f8134889b4795d47466a54a5c846d691693" +SRC_URI[cc-1.0.46.sha256sum] = "0213d356d3c4ea2c18c40b037c3be23cd639825c18f25ee670ac7813beeef99c" +SRC_URI[cfg-if-0.1.10.sha256sum] = "4785bdd1c96b2a846b2bd7cc02e86b6b3dbf14e7e53446c4f54c92a361040822" +SRC_URI[cstr-argument-0.0.2.sha256sum] = "514570a4b719329df37f93448a70df2baac553020d0eb43a8dfa9c1f5ba7b658" +SRC_URI[errno-dragonfly-0.1.1.sha256sum] = "14ca354e36190500e1e1fb267c647932382b54053c50b14970856c0b00a35067" +SRC_URI[errno-0.2.4.sha256sum] = "c2a071601ed01b988f896ab14b95e67335d1eeb50190932a1320f7fe3cadc84e" +SRC_URI[exec-0.3.1.sha256sum] = "886b70328cba8871bfc025858e1de4be16b1d5088f2ba50b57816f4210672615" +SRC_URI[gcc-0.3.55.sha256sum] = "8f5f3913fa0bfe7ee1fd8248b6b9f42a5af4b9d65ec2dd2c3c26132b950ecfc2" +SRC_URI[getopts-0.2.21.sha256sum] = "14dbbfd5c71d70241ecf9e6f13737f7b5ce823821063188d7e46c41d371eebd5" +SRC_URI[libc-0.2.65.sha256sum] = "1a31a0627fdf1f6a39ec0dd577e101440b7db22672c0901fe00a9a6fbb5c24e8" +SRC_URI[libsystemd-sys-0.2.2.sha256sum] = "d7b98458cd04a5c3aacba6f1a3a3c4b9abcb0ae4d66a055eee502e0d52dc226b" +SRC_URI[log-0.4.8.sha256sum] = "14b6052be84e6b71ab17edffc2eeabf5c2c3ae1fdb464aae35ac50c67a44e1f7" +SRC_URI[memchr-1.0.2.sha256sum] = "148fab2e51b4f1cfc66da2a7c32981d1d3c083a803978268bb11fe4b86925e7a" +SRC_URI[nix-0.15.0.sha256sum] = "3b2e0b4f3320ed72aaedb9a5ac838690a8047c7b275da22711fddff4f8a14229" +SRC_URI[pkg-config-0.3.16.sha256sum] = "72d5370d90f49f70bd033c3d75e87fc529fbfff9d6f7cccef07d6170079d91ea" +SRC_URI[systemd-0.4.0.sha256sum] = "daf2fd2d346d2dfb5fdc5f47b355f60dcfc35f5ee3e89e64e7ae2849ec8792a5" +SRC_URI[unicode-width-0.1.6.sha256sum] = "7007dbd421b92cc6e28410fe7362e2e0a2503394908f417b68ec8d1c364c4e20" +SRC_URI[utf8-cstr-0.1.6.sha256sum] = "55bcbb425141152b10d5693095950b51c3745d019363fc2929ffd8f61449b628" +SRC_URI[void-1.0.2.sha256sum] = "6a02e4885ed3bc0f2de90ea6dd45ebcbb66dacffe03547fadbb0eeae2770887d" +SRC_URI[winapi-i686-pc-windows-gnu-0.4.0.sha256sum] = "ac3b87c63620426dd9b991e5ce0329eff545bccbbb34f3be09ff6fb6ab51b7b6" +SRC_URI[winapi-x86_64-pc-windows-gnu-0.4.0.sha256sum] = "712e227841d057c1ee1cd2fb22fa7e5a5461ae8e48fa2ca79ec42cfc1931183f" +SRC_URI[winapi-0.3.8.sha256sum] = "8093091eeb260906a183e6ae1abdba2ef5ef2257a21801128899c3fc699229c6" # FIXME: update generateme with the real MD5 of the license file diff --git a/meta-balena-common/recipes-core/images/balena-image-flasher.bb b/meta-balena-common/recipes-core/images/balena-image-flasher.bb index 1f38ffe21b..c743d25b5d 100644 --- a/meta-balena-common/recipes-core/images/balena-image-flasher.bb +++ b/meta-balena-common/recipes-core/images/balena-image-flasher.bb @@ -60,7 +60,7 @@ BALENA_BOOT_PARTITION_FILES:append = " ${BALENA_COREBASE}/../../../${MACHINE}.js # Put balena-image in the flasher rootfs add_resin_image_to_flasher_rootfs() { mkdir -p ${WORKDIR}/rootfs/opt - cp ${DEPLOY_DIR_IMAGE}/balena-image-${MACHINE}.balenaos-img ${WORKDIR}/rootfs/opt + cp ${DEPLOY_DIR_IMAGE}/balena-image${IMAGE_MACHINE_SUFFIX}${IMAGE_NAME_SUFFIX}.balenaos-img ${WORKDIR}/rootfs/opt } IMAGE_PREPROCESS_COMMAND += " add_resin_image_to_flasher_rootfs; " diff --git a/meta-balena-common/recipes-core/os-config/os-config_1.2.11.bb b/meta-balena-common/recipes-core/os-config/os-config_1.2.11.bb index b50f03e83d..61df09d14e 100644 --- a/meta-balena-common/recipes-core/os-config/os-config_1.2.11.bb +++ b/meta-balena-common/recipes-core/os-config/os-config_1.2.11.bb @@ -303,6 +303,291 @@ SRC_URI += " \ git://github.com/balena-os/fatrw;protocol=https;nobranch=1;name=fatrw;destsuffix=fatrw \ " +SRC_URI[actix-net-0.2.6.sha256sum] = "8bebfbe6629e0131730746718c9e032b58f02c6ce06ed7c982b9fef6c8545acd" +SRC_URI[actix-web-0.7.19.sha256sum] = "b0ac60f86c65a50b140139f499f4f7c6e49e4b5d88fbfba08e4e3975991f7bf4" +SRC_URI[actix-0.7.9.sha256sum] = "6c616db5fa4b0c40702fb75201c2af7f8aa8f3a2e2c1dda3b0655772aa949666" +SRC_URI[actix_derive-0.3.2.sha256sum] = "4300e9431455322ae393d43a2ba1ef96b8080573c0fc23b196219efedfb6ba69" +SRC_URI[addr2line-0.15.2.sha256sum] = "e7a2e47a1fbe209ee101dd6d61285226744c6c8d3c21c8dc878ba6cb9f467f3a" +SRC_URI[adler-1.0.2.sha256sum] = "f26201604c87b1e01bd3d98f8d5d9a8fcbb815e8cedb41ffccbeb4bf593a35fe" +SRC_URI[adler32-1.2.0.sha256sum] = "aae1277d39aeec15cb388266ecc24b11c80469deae6067e17a1a7aa9e5c1f234" +SRC_URI[aead-0.3.2.sha256sum] = "7fc95d1bdb8e6666b2b217308eeeb09f2d6728d104be3e31916cc74d15420331" +SRC_URI[aes-gcm-0.8.0.sha256sum] = "5278b5fabbb9bd46e24aa69b2fdea62c99088e0a950a9be40e3e0101298f88da" +SRC_URI[aes-soft-0.6.4.sha256sum] = "be14c7498ea50828a38d0e24a765ed2effe92a705885b57d029cd67d45744072" +SRC_URI[aes-0.6.0.sha256sum] = "884391ef1066acaa41e766ba8f596341b96e93ce34f9a43e7d24bf0a0eaf0561" +SRC_URI[aesni-0.10.0.sha256sum] = "ea2e11f5e94c2f7d386164cc2aa1f97823fed6f259e486940a71c174dd01b0ce" +SRC_URI[aho-corasick-0.7.15.sha256sum] = "7404febffaa47dac81aa44dba71523c9d069b1bdc50a77db41195149e17f68e5" +SRC_URI[anyhow-1.0.2.sha256sum] = "ec0db9345168b6570edf7372318cdcc0d24494644809e912b2546b44b81953d9" +SRC_URI[assert_cli-0.6.3.sha256sum] = "a29ab7c0ed62970beb0534d637a8688842506d0ff9157de83286dacd065c8149" +SRC_URI[atty-0.2.14.sha256sum] = "d9b39be18770d11421cdb1b9947a45dd3f37e93092cbf377614828a319d5fee8" +SRC_URI[autocfg-0.1.8.sha256sum] = "0dde43e75fd43e8a1bf86103336bc699aa8d17ad1be60c76c0bdfd4828e19b78" +SRC_URI[autocfg-1.1.0.sha256sum] = "d468802bab17cbc0cc575e9b053f41e72aa36bfa6b7f55e3529ffa43161b97fa" +SRC_URI[backtrace-0.3.59.sha256sum] = "4717cfcbfaa661a0fd48f8453951837ae7e8f81e481fbb136e3202d72805a744" +SRC_URI[base64-0.10.1.sha256sum] = "0b25d992356d2eb0ed82172f5248873db5560c4721f564b13cb5193bda5e668e" +SRC_URI[base64-0.13.0.sha256sum] = "904dfeac50f3cdaba28fc6f57fdcddb75f49ed61346676a78c4ffe55877802fd" +SRC_URI[bitflags-1.2.1.sha256sum] = "cf1de2fe8c75bc145a2f577add951f8134889b4795d47466a54a5c846d691693" +SRC_URI[block-buffer-0.7.3.sha256sum] = "c0940dc441f31689269e10ac70eb1002a3a1d3ad1390e030043662eb7fe4688b" +SRC_URI[block-buffer-0.9.0.sha256sum] = "4152116fd6e9dadb291ae18fc1ec3575ed6d84c29642d97890f4b4a3417297e4" +SRC_URI[block-padding-0.1.5.sha256sum] = "fa79dedbb091f449f1f39e53edf88d5dbe95f895dae6135a8d7b881fb5af73f5" +SRC_URI[brotli-sys-0.3.2.sha256sum] = "4445dea95f4c2b41cde57cc9fee236ae4dbae88d8fcbdb4750fc1bb5d86aaecd" +SRC_URI[brotli2-0.3.2.sha256sum] = "0cb036c3eade309815c15ddbacec5b22c4d1f3983a774ab2eac2e3e9ea85568e" +SRC_URI[build_const-0.2.2.sha256sum] = "b4ae4235e6dac0694637c763029ecea1a2ec9e4e06ec2729bd21ba4d9c863eb7" +SRC_URI[byte-tools-0.3.1.sha256sum] = "e3b5ca7a04898ad4bcd41c90c5285445ff5b791899bb1b0abdd2a2aa791211d7" +SRC_URI[byteorder-1.3.4.sha256sum] = "08c48aae112d48ed9f069b33538ea9e3e90aa263cfa3d1c24309612b1f7472de" +SRC_URI[bytes-0.4.12.sha256sum] = "206fdffcfa2df7cbe15601ef46c813fce0965eb3286db6b56c583b814b51c81c" +SRC_URI[cc-1.0.73.sha256sum] = "2fff2a6927b3bb87f9595d67196a70493f627687a71d87a0d692242c33f58c11" +SRC_URI[cfg-if-0.1.10.sha256sum] = "4785bdd1c96b2a846b2bd7cc02e86b6b3dbf14e7e53446c4f54c92a361040822" +SRC_URI[cfg-if-1.0.0.sha256sum] = "baf1de4339761588bc0619e3cbc0120ee582ebb74b53b4efbf79117bd2da40fd" +SRC_URI[cipher-0.2.5.sha256sum] = "12f8e7987cbd042a63249497f41aed09f8e65add917ea6566effbc56578d6801" +SRC_URI[clap-2.33.0.sha256sum] = "5067f5bb2d80ef5d68b4c87db81601f0b75bca627bc2ef76b141d7b846a3c6d9" +SRC_URI[cloudabi-0.0.3.sha256sum] = "ddfc5b9aa5d4507acaf872de71051dfd0e309860e88966e1051e462a077aac4f" +SRC_URI[colored-1.9.3.sha256sum] = "f4ffc801dacf156c5854b9df4f425a626539c3a6ef7893cc0c5084a23f0b6c59" +SRC_URI[cookie-0.11.4.sha256sum] = "80f6044740a4a516b8aac14c140cdf35c1a640b1bd6b98b6224e49143b2f1566" +SRC_URI[cookie-0.12.0.sha256sum] = "888604f00b3db336d2af898ec3c1d5d0ddf5e6d462220f2ededc33a87ac4bbd5" +SRC_URI[cookie_store-0.7.0.sha256sum] = "46750b3f362965f197996c4448e4a0935e791bf7d6631bfce9ee0af3d24c919c" +SRC_URI[core-foundation-sys-0.7.0.sha256sum] = "b3a71ab494c0b5b860bdc8407ae08978052417070c2ced38573a9157ad75b8ac" +SRC_URI[core-foundation-0.7.0.sha256sum] = "57d24c7a13c43e870e37c1556b74555437870a04514f7685f5b354e090567171" +SRC_URI[cpufeatures-0.2.2.sha256sum] = "59a6001667ab124aebae2a495118e11d30984c3a653e99d86d58971708cf5e4b" +SRC_URI[cpuid-bool-0.2.0.sha256sum] = "dcb25d077389e53838a8158c8e99174c5a9d902dee4904320db714f3c653ffba" +SRC_URI[crc-1.8.1.sha256sum] = "d663548de7f5cca343f1e0a48d14dcfb0e9eb4e079ec58883b7251539fa10aeb" +SRC_URI[crc32fast-1.3.2.sha256sum] = "b540bd8bc810d3885c6ea91e2018302f68baba2129ab3e88f32389ee9370880d" +SRC_URI[crossbeam-channel-0.3.9.sha256sum] = "c8ec7fcd21571dc78f96cc96243cab8d8f035247c3efd16c687be154c3fa9efa" +SRC_URI[crossbeam-deque-0.7.4.sha256sum] = "c20ff29ded3204c5106278a81a38f4b482636ed4fa1e6cfbeef193291beb29ed" +SRC_URI[crossbeam-epoch-0.8.2.sha256sum] = "058ed274caafc1f60c4997b5fc07bf7dc7cca454af7c6e81edffe5f33f70dace" +SRC_URI[crossbeam-queue-0.2.3.sha256sum] = "774ba60a54c213d409d5353bda12d49cd68d14e45036a285234c8d6f91f92570" +SRC_URI[crossbeam-utils-0.6.6.sha256sum] = "04973fa96e96579258a5091af6003abde64af786b860f18622b82e026cca60e6" +SRC_URI[crossbeam-utils-0.7.2.sha256sum] = "c3c7c73a2d1e9fc0886a08b93e98eb643461230d5f1925e4036204d5f2e261a8" +SRC_URI[crypto-mac-0.10.1.sha256sum] = "bff07008ec701e8028e2ceb8f83f0e4274ee62bd2dbdc4fefff2e9a91824081a" +SRC_URI[ctr-0.6.0.sha256sum] = "fb4a30d54f7443bf3d6191dcd486aca19e67cb3c49fa7a06a319966346707e7f" +SRC_URI[dbus-0.6.5.sha256sum] = "48b5f0f36f1eebe901b0e6bee369a77ed3396334bf3f09abd46454a576f71819" +SRC_URI[difference-2.0.0.sha256sum] = "524cbf6897b527295dff137cec09ecf3a05f4fddffd7dfcd1585403449e74198" +SRC_URI[digest-0.8.1.sha256sum] = "f3d0c8c8752312f9713efd397ff63acb9f85585afbf179282e720e7704954dd5" +SRC_URI[digest-0.9.0.sha256sum] = "d3dd60d1080a57a05ab032377049e0591415d2b31afd7028356dbf3cc6dcb066" +SRC_URI[dtoa-0.4.8.sha256sum] = "56899898ce76aaf4a0f24d914c97ea6ed976d42fec6ad33fcbb0a1103e07b2b0" +SRC_URI[either-1.7.0.sha256sum] = "3f107b87b6afc2a64fd13cac55fe06d6c8859f12d4b14cbcdd2c67d0976781be" +SRC_URI[encoding-index-japanese-1.20141219.5.sha256sum] = "04e8b2ff42e9a05335dbf8b5c6f7567e5591d0d916ccef4e0b1710d32a0d0c91" +SRC_URI[encoding-index-korean-1.20141219.5.sha256sum] = "4dc33fb8e6bcba213fe2f14275f0963fd16f0a02c878e3095ecfdf5bee529d81" +SRC_URI[encoding-index-simpchinese-1.20141219.5.sha256sum] = "d87a7194909b9118fc707194baa434a4e3b0fb6a5a757c73c3adb07aa25031f7" +SRC_URI[encoding-index-singlebyte-1.20141219.5.sha256sum] = "3351d5acffb224af9ca265f435b859c7c01537c0849754d3db3fdf2bfe2ae84a" +SRC_URI[encoding-index-tradchinese-1.20141219.5.sha256sum] = "fd0e20d5688ce3cab59eb3ef3a2083a5c77bf496cb798dc6fcdb75f323890c18" +SRC_URI[encoding-0.2.33.sha256sum] = "6b0d943856b990d12d3b55b359144ff341533e516d94098b1d3fc1ac666d36ec" +SRC_URI[encoding_index_tests-0.1.4.sha256sum] = "a246d82be1c9d791c5dfde9a2bd045fc3cbba3fa2b11ad558f27d01712f00569" +SRC_URI[encoding_rs-0.8.31.sha256sum] = "9852635589dc9f9ea1b6fe9f05b50ef208c85c834a562f0c6abb1c475736ec2b" +SRC_URI[env_logger-0.6.2.sha256sum] = "aafcde04e90a5226a6443b7aabdb016ba2f8307c847d524724bd9b346dd1a2d3" +SRC_URI[environment-0.1.1.sha256sum] = "1f4b14e20978669064c33b4c1e0fb4083412e40fe56cbea2eae80fd7591503ee" +SRC_URI[error-chain-0.12.4.sha256sum] = "2d2f06b9cac1506ece98fe3231e3cc9c4410ec3d5b1f24ae1c8946f0742cdefc" +SRC_URI[error-chain-0.8.1.sha256sum] = "6930e04918388a9a2e41d518c25cf679ccafe26733fb4127dbf21993f2575d46" +SRC_URI[failure-0.1.8.sha256sum] = "d32e9bd16cc02eae7db7ef620b392808b89f6a5e16bb3497d159c6b92a0f4f86" +SRC_URI[failure_derive-0.1.8.sha256sum] = "aa4da3c766cd7a0db8242e326e9e4e081edd567072893ed320008189715366a4" +SRC_URI[flate2-1.0.8.sha256sum] = "246b6f24d8e616b0c176a8143486ddc8bb0bac2f30f0a0d3efbcf1e0d47cb7e5" +SRC_URI[fnv-1.0.7.sha256sum] = "3f9eec918d3f24069decb9af1554cad7c880e2da24a9afd88aca000531ab82c1" +SRC_URI[foreign-types-shared-0.1.1.sha256sum] = "00b0228411908ca8685dba7fc2cdd70ec9990a6e753e89b6ac91a84c40fbaf4b" +SRC_URI[foreign-types-0.3.2.sha256sum] = "f6f339eb8adc052cd2ca78910fda869aefa38d22d5cb648e6485e4d3fc06f3b1" +SRC_URI[form_urlencoded-1.0.1.sha256sum] = "5fc25a87fa4fd2094bffb06925852034d90a17f0d1e05197d4956d3555752191" +SRC_URI[fuchsia-cprng-0.1.1.sha256sum] = "a06f77d526c1a601b7c4cdd98f54b5eaabffc14d5f2f0296febdc7f357c6d3ba" +SRC_URI[fuchsia-zircon-sys-0.3.3.sha256sum] = "3dcaa9ae7725d12cdb85b3ad99a434db70b468c09ded17e012d86b5c1010f7a7" +SRC_URI[fuchsia-zircon-0.3.3.sha256sum] = "2e9763c69ebaae630ba35f74888db465e49e259ba1bc0eda7d06f4a067615d82" +SRC_URI[futures-cpupool-0.1.8.sha256sum] = "ab90cde24b3319636588d0c35fe03b1333857621051837ed769faefb4c2162e4" +SRC_URI[futures-0.1.31.sha256sum] = "3a471a38ef8ed83cd6e40aa59c1ffe17db6855c18e3604d9c4ed8c08ebc28678" +SRC_URI[generic-array-0.12.4.sha256sum] = "ffdf9f34f1447443d37393cc6c2b8313aebddcd96906caf34e54c68d8e57d7bd" +SRC_URI[generic-array-0.14.6.sha256sum] = "bff49e947297f3312447abdca79f45f4738097cc82b06e72054d2223f601f1b9" +SRC_URI[getrandom-0.1.16.sha256sum] = "8fc3cb4d91f53b50155bdcfd23f6a4c39ae1969c2ae85982b135750cccaf5fce" +SRC_URI[getrandom-0.2.7.sha256sum] = "4eb1a864a501629691edf6c15a593b7a51eebaa1e8468e9ddc623de7c9b58ec6" +SRC_URI[ghash-0.3.1.sha256sum] = "97304e4cd182c3846f7575ced3890c53012ce534ad9114046b0a9e00bb30a375" +SRC_URI[gimli-0.24.0.sha256sum] = "0e4075386626662786ddb0ec9081e7c7eeb1ba31951f447ca780ef9f5d568189" +SRC_URI[glob-0.3.0.sha256sum] = "9b919933a397b79c37e33b77bb2aa3dc8eb6e165ad809e58ff75bc7db2e34574" +SRC_URI[h2-0.1.26.sha256sum] = "a5b34c246847f938a410a03c5458c7fee2274436675e76d8b903c08efc29c462" +SRC_URI[hashbrown-0.12.3.sha256sum] = "8a9ee70c43aaf417c914396645a0fa852624801b24ebb7ae78fe8272889ac888" +SRC_URI[hermit-abi-0.1.19.sha256sum] = "62b467343b94ba476dcb2500d242dadbb39557df889310ac77c5d99100aaac33" +SRC_URI[hex-0.3.2.sha256sum] = "805026a5d0141ffc30abb3be3173848ad46a1b1664fe632428479619a3644d77" +SRC_URI[hkdf-0.10.0.sha256sum] = "51ab2f639c231793c5f6114bdb9bbe50a7dbbfcd7c7c6bd8475dec2d991e964f" +SRC_URI[hmac-0.10.1.sha256sum] = "c1441c6b1e930e2817404b5046f1f989899143a12bf92de603b69f4e0aee1e15" +SRC_URI[hostname-0.3.1.sha256sum] = "3c731c3e10504cc8ed35cfe2f1db4c9274c3d35fa486e3b31df46f068ef3e867" +SRC_URI[http-body-0.1.0.sha256sum] = "6741c859c1b2463a423a1dbce98d418e6c3c3fc720fb0d45528657320920292d" +SRC_URI[http-0.1.21.sha256sum] = "d6ccf5ede3a895d8856620237b2f02972c1bbc78d2965ad7fe8838d4a0ed41f0" +SRC_URI[httparse-1.7.1.sha256sum] = "496ce29bb5a52785b44e0f7ca2847ae0bb839c9bd28f69acac9b99d461c0c04c" +SRC_URI[humantime-1.3.0.sha256sum] = "df004cfca50ef23c36850aaaa59ad52cc70d0e90243c3c7737a4dd32dc7a3c4f" +SRC_URI[hyper-tls-0.3.2.sha256sum] = "3a800d6aa50af4b5850b2b0f659625ce9504df908e9733b635720483be26174f" +SRC_URI[hyper-0.12.36.sha256sum] = "5c843caf6296fc1f93444735205af9ed4e109a539005abb2564ae1d6fad34c52" +SRC_URI[idna-0.1.5.sha256sum] = "38f09e0f0b1fb55fdee1f17470ad800da77af5186a1a76c026b679358b7e844e" +SRC_URI[idna-0.2.1.sha256sum] = "de910d521f7cc3135c4de8db1cb910e0b5ed1dc6f57c381cd07e8e661ce10094" +SRC_URI[indexmap-1.9.1.sha256sum] = "10a35a97730320ffe8e2d410b5d3b69279b98d2c14bdb8b70ea89ecf7888d41e" +SRC_URI[iovec-0.1.4.sha256sum] = "b2b3ea6ff95e175473f8ffe6a7eb7c00d054240321b84c57051175fe3c1e075e" +SRC_URI[ipconfig-0.1.9.sha256sum] = "08f7eadeaf4b52700de180d147c4805f199854600b36faa963d91114827b2ffc" +SRC_URI[itoa-0.4.8.sha256sum] = "b71991ff56294aa922b450139ee08b3bfc70982c6b2c7562771375cf73542dd4" +SRC_URI[itoa-1.0.3.sha256sum] = "6c8af84674fe1f223a982c933a0ee1086ac4d4052aa0fb8060c12c6ad838e754" +SRC_URI[kernel32-sys-0.2.2.sha256sum] = "7507624b29483431c0ba2d82aece8ca6cdba9382bff4ddd0f7490560c056098d" +SRC_URI[language-tags-0.2.2.sha256sum] = "a91d884b6667cd606bb5a69aa0c99ba811a115fc68915e7056ec08a46e93199a" +SRC_URI[lazy_static-1.4.0.sha256sum] = "e2abad23fbc42b3700f2f279844dc832adb2b2eb069b2df918f455c4e18cc646" +SRC_URI[lazycell-1.3.0.sha256sum] = "830d08ce1d1d941e6b30645f1a0eb5643013d835ce3779a5fc208261dbe10f55" +SRC_URI[libc-0.2.127.sha256sum] = "505e71a4706fa491e9b1b55f51b95d4037d0821ee40131190475f692b35b009b" +SRC_URI[libdbus-sys-0.2.2.sha256sum] = "c185b5b7ad900923ef3a8ff594083d4d9b5aea80bb4f32b8342363138c0d456b" +SRC_URI[linked-hash-map-0.5.6.sha256sum] = "0717cef1bc8b636c6e1c1bbdefc09e6322da8a9321966e8928ef80d20f7f770f" +SRC_URI[lock_api-0.1.5.sha256sum] = "62ebf1391f6acad60e5c8b43706dde4582df75c06698ab44511d15016bc2442c" +SRC_URI[lock_api-0.3.4.sha256sum] = "c4da24a77a3d8a6d4862d95f72e6fdb9c09a643ecdb402d754004a557f2bec75" +SRC_URI[log-0.4.17.sha256sum] = "abb12e687cfb44aa40f41fc3978ef76448f9b6038cad6aef4259d3c095a2382e" +SRC_URI[lru-cache-0.1.2.sha256sum] = "31e24f1ad8321ca0e8a1e0ac13f23cb668e6f5466c2c57319f6a5cf1cc8e3b1c" +SRC_URI[maplit-1.0.2.sha256sum] = "3e2e65a1a2e43cfcb47a895c4c8b10d1f4a61097f9f254f183aee60cad9c651d" +SRC_URI[match_cfg-0.1.0.sha256sum] = "ffbee8634e0d45d258acb448e7eaab3fce7a0a467395d4d9f228e3c1f01fb2e4" +SRC_URI[matches-0.1.9.sha256sum] = "a3e378b66a060d48947b590737b30a1be76706c8dd7b8ba0f2fe3989c68a853f" +SRC_URI[maybe-uninit-2.0.0.sha256sum] = "60302e4db3a61da70c0cb7991976248362f30319e88850c487b9b95bbf059e00" +SRC_URI[md-5-0.8.0.sha256sum] = "a18af3dcaf2b0219366cdb4e2af65a6101457b415c3d1a5c71dd9c2b7c77b9c8" +SRC_URI[memchr-2.3.0.sha256sum] = "3197e20c7edb283f87c071ddfc7a2cca8f8e0b888c242959846a6fce03c72223" +SRC_URI[memoffset-0.5.6.sha256sum] = "043175f069eda7b85febe4a74abbaeff828d9f8b448515d3151a14a3542811aa" +SRC_URI[mime-0.3.16.sha256sum] = "2a60c7ce501c71e03a9c9c0d35b861413ae925bd979cc7a4e30d060069aaac8d" +SRC_URI[mime_guess-2.0.4.sha256sum] = "4192263c238a5f0d0c6bfd21f336a313a4ce1c450542449ca191bb657b4642ef" +SRC_URI[miniz-sys-0.1.12.sha256sum] = "1e9e3ae51cea1576ceba0dde3d484d30e6e5b86dee0b2d412fe3a16a15c98202" +SRC_URI[miniz_oxide-0.2.3.sha256sum] = "5f6d7b3dd914b70db7cef7ab9dc74339ffcadf4d033464a987237bb0b9418cd4" +SRC_URI[miniz_oxide-0.4.4.sha256sum] = "a92518e98c078586bc6c934028adcca4c92a53d6a958196de835170a01d84e4b" +SRC_URI[miniz_oxide_c_api-0.2.0.sha256sum] = "28edaef377517fd9fe3e085c37d892ce7acd1fbeab9239c5a36eec352d8a8b7e" +SRC_URI[mio-uds-0.6.8.sha256sum] = "afcb699eb26d4332647cc848492bbc15eafb26f08d0304550d5aa1f612e066f0" +SRC_URI[mio-0.6.23.sha256sum] = "4afd66f5b91bf2a3bc13fad0e21caedac168ca4c707504e75585648ae80e4cc4" +SRC_URI[miow-0.2.2.sha256sum] = "ebd808424166322d4a38da87083bfddd3ac4c131334ed55856112eb06d46944d" +SRC_URI[native-tls-0.2.4.sha256sum] = "2b0d88c06fe90d5ee94048ba40409ef1d9315d86f6f38c2efdaad4fb50c58b2d" +SRC_URI[net2-0.2.37.sha256sum] = "391630d12b68002ae1e25e8f974306474966550ad82dac6886fb8910c19568ae" +SRC_URI[nom-4.2.3.sha256sum] = "2ad2a91a8e869eeb30b9cb3119ae87773a8f4ae617f41b1eb9c154b2905f7bd6" +SRC_URI[num_cpus-1.13.1.sha256sum] = "19e64526ebdee182341572e50e9ad03965aa510cd94427a4549448f285e957a1" +SRC_URI[object-0.24.0.sha256sum] = "1a5b3dd1c072ee7963717671d1ca129f1048fda25edea6b752bfc71ac8854170" +SRC_URI[once_cell-1.13.0.sha256sum] = "18a6dbe30758c9f83eb00cbea4ac95966305f5a7772f3f42ebfc7fc7eddbd8e1" +SRC_URI[opaque-debug-0.2.3.sha256sum] = "2839e79665f131bdb5782e51f2c6c9599c133c6098982a54c794358bf432529c" +SRC_URI[opaque-debug-0.3.0.sha256sum] = "624a8340c38c1b80fd549087862da4ba43e08858af025b236e509b6649fc13d5" +SRC_URI[openssl-macros-0.1.0.sha256sum] = "b501e44f11665960c7e7fcf062c7d96a14ade4aa98116c004b2e37b5be7d736c" +SRC_URI[openssl-probe-0.1.5.sha256sum] = "ff011a302c396a5197692431fc1948019154afc178baf7d8e37367442a4601cf" +SRC_URI[openssl-sys-0.9.75.sha256sum] = "e5f9bd0c2710541a3cda73d6f9ac4f1b240de4ae261065d309dbe73d9dceb42f" +SRC_URI[openssl-0.10.41.sha256sum] = "618febf65336490dfcf20b73f885f5651a0c89c64c2d4a8c3662585a70bf5bd0" +SRC_URI[owning_ref-0.4.1.sha256sum] = "6ff55baddef9e4ad00f88b6c743a2a8062d4c6ade126c2a528644b8e444d52ce" +SRC_URI[parking_lot-0.7.1.sha256sum] = "ab41b4aed082705d1056416ae4468b6ea99d52599ecf3169b00088d43113e337" +SRC_URI[parking_lot-0.9.0.sha256sum] = "f842b1982eb6c2fe34036a4fbfb06dd185a3f5c8edfaacdf7d1ea10b07de6252" +SRC_URI[parking_lot_core-0.4.0.sha256sum] = "94c8c7923936b28d546dfd14d4472eaf34c99b14e1c973a32b3e6d4eb04298c9" +SRC_URI[parking_lot_core-0.6.2.sha256sum] = "b876b1b9e7ac6e1a74a6da34d25c42e17e8862aa409cbbbdcfc8d86c6f3bc62b" +SRC_URI[path-absolutize-2.0.2.sha256sum] = "e235cf90152d56079f1fb4ddb3834e3b97620ec4d24737f9324323ddcef72d86" +SRC_URI[path-dedot-2.0.5.sha256sum] = "c0f3d9132a3ad0e216bc8f9b6ea77a0aaa786bad1fc5075fdf9943c3718b4a58" +SRC_URI[percent-encoding-1.0.1.sha256sum] = "31010dd2e1ac33d5b46a5b413495239882813e0369f8ed8a5e266f173602f831" +SRC_URI[percent-encoding-2.1.0.sha256sum] = "d4fd5641d01c8f18a23da7b6fe29298ff4b55afcccdf78973b24cf3175fee32e" +SRC_URI[pkg-config-0.3.25.sha256sum] = "1df8c4ec4b0627e53bdf214615ad287367e482558cf84b109250b37464dc03ae" +SRC_URI[polyval-0.4.5.sha256sum] = "eebcc4aa140b9abd2bc40d9c3f7ccec842679cd79045ac3a7ac698c1a064b7cd" +SRC_URI[ppv-lite86-0.2.16.sha256sum] = "eb9f9e6e233e5c4a35559a617bf40a4ec447db2e84c20b55a6f83167b7e57872" +SRC_URI[proc-macro2-0.4.30.sha256sum] = "cf3d2011ab5c909338f7887f4fc896d35932e29146c12c8d01da6b22a80ba759" +SRC_URI[proc-macro2-1.0.43.sha256sum] = "0a2ca2c61bc9f3d74d2886294ab7b9853abd9c1ad903a3ac7815c58989bb7bab" +SRC_URI[publicsuffix-1.5.4.sha256sum] = "3bbaa49075179162b49acac1c6aa45fb4dafb5f13cf6794276d77bc7fd95757b" +SRC_URI[quick-error-1.2.3.sha256sum] = "a1d01941d82fa2ab50be1e79e6714289dd7cde78eba4c074bc5a4374f650dfe0" +SRC_URI[quote-0.6.13.sha256sum] = "6ce23b6b870e8f94f81fb0a363d65d86675884b34a09043c81e5562f11c1f8e1" +SRC_URI[quote-1.0.21.sha256sum] = "bbe448f377a7d6961e30f5955f9b8d106c3f5e449d493ee1b125c1d43c2b5179" +SRC_URI[rand-0.4.6.sha256sum] = "552840b97013b1a26992c11eac34bdd778e464601a4c2054b5f0bff7c6761293" +SRC_URI[rand-0.5.6.sha256sum] = "c618c47cd3ebd209790115ab837de41425723956ad3ce2e6a7f09890947cacb9" +SRC_URI[rand-0.6.5.sha256sum] = "6d71dacdc3c88c1fde3885a3be3fbab9f35724e6ce99467f7d9c5026132184ca" +SRC_URI[rand-0.8.5.sha256sum] = "34af8d1a0e25924bc5b7c43c079c942339d8f0a8b57c39049bef581b46327404" +SRC_URI[rand_chacha-0.1.1.sha256sum] = "556d3a1ca6600bfcbab7c7c91ccb085ac7fbbcd70e008a98742e7847f4f7bcef" +SRC_URI[rand_chacha-0.3.1.sha256sum] = "e6c10a63a0fa32252be49d21e7709d4d4baf8d231c2dbce1eaa8141b9b127d88" +SRC_URI[rand_core-0.3.1.sha256sum] = "7a6fdeb83b075e8266dcc8762c22776f6877a63111121f5f8c7411e5be7eed4b" +SRC_URI[rand_core-0.4.2.sha256sum] = "9c33a3c44ca05fa6f1807d8e6743f3824e8509beca625669633be0acbdf509dc" +SRC_URI[rand_core-0.6.3.sha256sum] = "d34f1408f55294453790c48b2f1ebbb1c5b4b7563eb1f418bcfcfdbb06ebb4e7" +SRC_URI[rand_hc-0.1.0.sha256sum] = "7b40677c7be09ae76218dc623efbf7b18e34bced3f38883af07bb75630a21bc4" +SRC_URI[rand_isaac-0.1.1.sha256sum] = "ded997c9d5f13925be2a6fd7e66bf1872597f759fd9dd93513dd7e92e5a5ee08" +SRC_URI[rand_jitter-0.1.4.sha256sum] = "1166d5c91dc97b88d1decc3285bb0a99ed84b05cfd0bc2341bdf2d43fc41e39b" +SRC_URI[rand_os-0.1.3.sha256sum] = "7b75f676a1e053fc562eafbb47838d67c84801e38fc1ba459e8f180deabd5071" +SRC_URI[rand_pcg-0.1.2.sha256sum] = "abf9b09b01790cfe0364f52bf32995ea3c39f4d2dd011eac241d2914146d0b44" +SRC_URI[rand_xorshift-0.1.1.sha256sum] = "cbf7e9e623549b0e21f6e97cf8ecf247c1a8fd2e8a992ae265314300b2455d5c" +SRC_URI[rdrand-0.4.0.sha256sum] = "678054eb77286b51581ba43620cc911abf02758c91f93f479767aed0f90458b2" +SRC_URI[redox_syscall-0.1.57.sha256sum] = "41cc0f7e4d5d4544e8861606a285bb08d3e70712ccc7d2b84d7c0ccfaf4b05ce" +SRC_URI[regex-syntax-0.6.27.sha256sum] = "a3f87b73ce11b1619a3c6332f45341e0047173771e8b8b73f87bfeefb7b56244" +SRC_URI[regex-1.4.6.sha256sum] = "2a26af418b574bd56588335b3a3659a65725d4e636eb1016c2f9e3b38c7cc759" +SRC_URI[remove_dir_all-0.5.3.sha256sum] = "3acd125665422973a33ac9d3dd2df85edad0f4ae9b00dafb1a05e43a9f5ef8e7" +SRC_URI[reqwest-0.9.24.sha256sum] = "f88643aea3c1343c804950d7bf983bd2067f5ab59db6d613a08e05572f2714ab" +SRC_URI[resolv-conf-0.6.3.sha256sum] = "11834e137f3b14e309437a8276714eed3a80d1ef894869e510f2c0c0b98b9f4a" +SRC_URI[rustc-demangle-0.1.21.sha256sum] = "7ef03e0a2b150c7a90d01faf6254c9c48a41e95fb2a8c2ac1c6f0d2b9aefc342" +SRC_URI[rustc_version-0.2.3.sha256sum] = "138e3e0acb6c9fb258b19b67cb8abd63c00679d2851805ea151465464fe9030a" +SRC_URI[ryu-1.0.11.sha256sum] = "4501abdff3ae82a1c1b477a17252eb69cee9e66eb915c1abaa4f44d873df9f09" +SRC_URI[schannel-0.1.20.sha256sum] = "88d6731146462ea25d9244b2ed5fd1d716d25c52e4d54aa4fb0f3c4e9854dbe2" +SRC_URI[scopeguard-0.3.3.sha256sum] = "94258f53601af11e6a49f722422f6e3425c52b06245a5cf9bc09908b174f5e27" +SRC_URI[scopeguard-1.1.0.sha256sum] = "d29ab0c6d3fc0ee92fe66e2d99f700eab17a8d57d1c1d3b748380fb20baa78cd" +SRC_URI[security-framework-sys-0.4.3.sha256sum] = "17bf11d99252f512695eb468de5516e5cf75455521e69dfe343f3b74e4748405" +SRC_URI[security-framework-0.4.4.sha256sum] = "64808902d7d99f78eaddd2b4e2509713babc3dc3c85ad6f4c447680f3c01e535" +SRC_URI[semver-parser-0.7.0.sha256sum] = "388a1df253eca08550bef6c72392cfe7c30914bf41df5269b68cbd6ff8f570a3" +SRC_URI[semver-0.9.0.sha256sum] = "1d7eb9ef2c18661902cc47e535f9bc51b78acd254da71d375c2f6720d9a40403" +SRC_URI[serde-1.0.100.sha256sum] = "f4473e8506b213730ff2061073b48fa51dcc66349219e2e7c5608f0296a1d95a" +SRC_URI[serde_derive-1.0.94.sha256sum] = "ef45eb79d6463b22f5f9e16d283798b7c0175ba6050bc25c1a946c122727fe7b" +SRC_URI[serde_json-1.0.83.sha256sum] = "38dd04e3c8279e75b31ef29dbdceebfe5ad89f4d0937213c53f7d49d01b3d5a7" +SRC_URI[serde_urlencoded-0.5.5.sha256sum] = "642dd69105886af2efd227f75a520ec9b44a820d65bc133a9131f7d229fd165a" +SRC_URI[sha1-0.6.1.sha256sum] = "c1da05c97445caa12d05e848c4a4fcbbea29e748ac28f7e80e9b010392063770" +SRC_URI[sha1_smol-1.0.0.sha256sum] = "ae1a47186c03a32177042e55dbc5fd5aee900b8e0069a8d70fba96a9375cd012" +SRC_URI[sha2-0.9.9.sha256sum] = "4d58a1e1bf39749807d89cf2d98ac2dfa0ff1cb3faa38fbb64dd88ac8013d800" +SRC_URI[signal-hook-registry-1.4.0.sha256sum] = "e51e73328dc4ac0c7ccbda3a494dfa03df1de2f46018127f60c693f2648455b0" +SRC_URI[slab-0.4.7.sha256sum] = "4614a76b2a8be0058caa9dbbaf66d988527d86d003c11a94fbd335d7661edcef" +SRC_URI[smallvec-0.6.14.sha256sum] = "b97fcaeba89edba30f044a10c6a3cc39df9c3f17d7cd829dd1446cab35f890e0" +SRC_URI[socket2-0.3.19.sha256sum] = "122e570113d28d773067fab24266b66753f6ea915758651696b6e35e49f88d6e" +SRC_URI[stable_deref_trait-1.2.0.sha256sum] = "a8f112729512f8e442d81f95a8a7ddf2b7c6b8a1a6f509a95864142b30cab2d3" +SRC_URI[string-0.2.1.sha256sum] = "d24114bfcceb867ca7f71a0d3fe45d45619ec47a6fbfa98cb14e14250bfa5d6d" +SRC_URI[subtle-2.4.1.sha256sum] = "6bdef32e8150c2a081110b42772ffe7d7c9032b606bc226c8260fd97e0976601" +SRC_URI[syn-0.15.44.sha256sum] = "9ca4b3b69a77cbe1ffc9e198781b7acb0c7365a883670e8f1c1bc66fba79a5c5" +SRC_URI[syn-1.0.99.sha256sum] = "58dbef6ec655055e20b86b15a8cc6d439cca19b667537ac6a1369572d151ab13" +SRC_URI[synstructure-0.12.6.sha256sum] = "f36bdaa60a83aca3921b5259d5400cbf5e90fc51931376a9bd4a0eb79aa7210f" +SRC_URI[tempdir-0.3.7.sha256sum] = "15f2b5fb00ccdf689e0149d1b1b3c03fead81c2b37735d812fa8bddbbf41b6d8" +SRC_URI[tempfile-3.0.5.sha256sum] = "7e91405c14320e5c79b3d148e1c86f40749a36e490642202a31689cb1a3452b2" +SRC_URI[termcolor-1.1.3.sha256sum] = "bab24d30b911b2376f3a13cc2cd443142f0c81dda04c118693e35b3835757755" +SRC_URI[textwrap-0.11.0.sha256sum] = "d326610f408c7a4eb6f51c37c330e496b08506c9457c9d34287ecc38809fb060" +SRC_URI[time-0.1.44.sha256sum] = "6db9e6914ab8b1ae1c260a4ae7a49b6c5611b40328a735b21862567685e73255" +SRC_URI[tokio-buf-0.1.1.sha256sum] = "8fb220f46c53859a4b7ec083e41dec9778ff0b1851c0942b211edb89e0ccdc46" +SRC_URI[tokio-codec-0.1.2.sha256sum] = "25b2998660ba0e70d18684de5d06b70b70a3a747469af9dea7618cc59e75976b" +SRC_URI[tokio-current-thread-0.1.7.sha256sum] = "b1de0e32a83f131e002238d7ccde18211c0a5397f60cbfffcb112868c2e0e20e" +SRC_URI[tokio-executor-0.1.10.sha256sum] = "fb2d1b8f4548dbf5e1f7818512e9c406860678f29c300cdf0ebac72d1a3a1671" +SRC_URI[tokio-fs-0.1.7.sha256sum] = "297a1206e0ca6302a0eed35b700d292b275256f596e2f3fea7729d5e629b6ff4" +SRC_URI[tokio-io-0.1.13.sha256sum] = "57fc868aae093479e3131e3d165c93b1c7474109d13c90ec0dda2a1bbfff0674" +SRC_URI[tokio-openssl-0.2.1.sha256sum] = "4646ae1fd623393de3d796ea53af75acd02938dd5579544fbd6d236d041978a6" +SRC_URI[tokio-reactor-0.1.12.sha256sum] = "09bc590ec4ba8ba87652da2068d150dcada2cfa2e07faae270a5e0409aa51351" +SRC_URI[tokio-signal-0.2.9.sha256sum] = "d0c34c6e548f101053321cba3da7cbb87a610b85555884c41b07da2eb91aff12" +SRC_URI[tokio-sync-0.1.8.sha256sum] = "edfe50152bc8164fcc456dab7891fa9bf8beaf01c5ee7e1dd43a397c3cf87dee" +SRC_URI[tokio-tcp-0.1.4.sha256sum] = "98df18ed66e3b72e742f185882a9e201892407957e45fbff8da17ae7a7c51f72" +SRC_URI[tokio-threadpool-0.1.18.sha256sum] = "df720b6581784c118f0eb4310796b12b1d242a7eb95f716a8367855325c25f89" +SRC_URI[tokio-timer-0.2.13.sha256sum] = "93044f2d313c95ff1cb7809ce9a7a05735b012288a888b62d4434fd58c94f296" +SRC_URI[tokio-udp-0.1.6.sha256sum] = "e2a0b10e610b39c38b031a2fcab08e4b82f16ece36504988dcbd81dbba650d82" +SRC_URI[tokio-uds-0.2.7.sha256sum] = "ab57a4ac4111c8c9dbcf70779f6fc8bc35ae4b2454809febac840ad19bd7e4e0" +SRC_URI[tokio-0.1.22.sha256sum] = "5a09c0b5bb588872ab2f09afa13ee6e9dac11e10a0ec9e8e3ba39a5a5d530af6" +SRC_URI[tower-service-0.1.0.sha256sum] = "b32f72af77f1bfe3d3d4da8516a238ebe7039b51dd8637a09841ac7f16d2c987" +SRC_URI[trust-dns-proto-0.5.0.sha256sum] = "0838272e89f1c693b4df38dc353412e389cf548ceed6f9fd1af5a8d6e0e7cf74" +SRC_URI[trust-dns-proto-0.6.3.sha256sum] = "09144f0992b0870fa8d2972cc069cbf1e3c0fda64d1f3d45c4d68d0e0b52ad4e" +SRC_URI[trust-dns-resolver-0.10.3.sha256sum] = "8a9f877f7a1ad821ab350505e1f1b146a4960402991787191d6d8cab2ce2de2c" +SRC_URI[try-lock-0.2.3.sha256sum] = "59547bce71d9c38b83d9c0e92b6066c4253371f15005def0c30d9657f50c7642" +SRC_URI[try_from-0.3.2.sha256sum] = "283d3b89e1368717881a9d51dad843cc435380d8109c9e47d38780a324698d8b" +SRC_URI[typenum-1.15.0.sha256sum] = "dcf81ac59edc17cc8697ff311e8f5ef2d99fcbd9817b34cec66f90b6c3dfd987" +SRC_URI[unicase-2.6.0.sha256sum] = "50f37be617794602aabbeee0be4f259dc1778fabe05e2d67ee8f79326d5cb4f6" +SRC_URI[unicode-bidi-0.3.8.sha256sum] = "099b7128301d285f79ddd55b9a83d5e6b9e97c92e0ea0daebee7263e932de992" +SRC_URI[unicode-ident-1.0.3.sha256sum] = "c4f5b37a154999a8f3f98cc23a628d850e154479cd94decf3414696e12e31aaf" +SRC_URI[unicode-normalization-0.1.9.sha256sum] = "09c8070a9942f5e7cfccd93f490fdebd230ee3c3c9f107cb25bad5351ef671cf" +SRC_URI[unicode-width-0.1.9.sha256sum] = "3ed742d4ea2bd1176e236172c8429aaf54486e7ac098db29ffe6529e0ce50973" +SRC_URI[unicode-xid-0.1.0.sha256sum] = "fc72304796d0818e357ead4e000d19c9c174ab23dc11093ac919054d20a6a7fc" +SRC_URI[unicode-xid-0.2.3.sha256sum] = "957e51f3646910546462e67d5f7599b9e4fb8acdd304b087a6494730f9eebf04" +SRC_URI[unindent-0.1.10.sha256sum] = "58ee9362deb4a96cef4d437d1ad49cffc9b9e92d202b6995674e928ce684f112" +SRC_URI[universal-hash-0.4.1.sha256sum] = "9f214e8f697e925001e66ec2c6e37a4ef93f0f78c2eed7814394e10c62025b05" +SRC_URI[url-1.7.2.sha256sum] = "dd4e7c0d531266369519a4aa4f399d748bd37043b00bde1e4ff1f60a120b355a" +SRC_URI[url-2.2.2.sha256sum] = "a507c383b2d33b5fc35d1861e77e6b383d158b2da5e14fe51b83dfedf6fd578c" +SRC_URI[uuid-0.7.4.sha256sum] = "90dbc611eb48397705a6b0f6e917da23ae517e4d127123d2cf7674206627d32a" +SRC_URI[v_escape-0.7.4.sha256sum] = "660b101c07b5d0863deb9e7fb3138777e858d6d2a79f9e6049a27d1cc77c6da6" +SRC_URI[v_escape_derive-0.5.6.sha256sum] = "c2ca2a14bc3fc5b64d188b087a7d3a927df87b152e941ccfbc66672e20c467ae" +SRC_URI[v_htmlescape-0.4.5.sha256sum] = "e33e939c0d8cf047514fb6ba7d5aac78bc56677a6938b2ee67000b91f2e97e41" +SRC_URI[vcpkg-0.2.15.sha256sum] = "accd4ea62f7bb7a82fe23066fb0957d48ef677f6eeb8215f372f52e48bb32426" +SRC_URI[version_check-0.1.5.sha256sum] = "914b1a6776c4c929a602fafd8bc742e06365d4bcbe48c30f9cca5824f70dc9dd" +SRC_URI[version_check-0.9.4.sha256sum] = "49874b5167b65d7193b8aba1567f5c7d93d001cafc34600cee003eda787e483f" +SRC_URI[want-0.2.0.sha256sum] = "b6395efa4784b027708f7451087e647ec73cc74f5d9bc2e418404248d679a230" +SRC_URI[wasi-0.10.0+wasi-snapshot-preview1.sha256sum] = "1a143597ca7c7793eff794def352d41792a93c481eb1042423ff7ff72ba2c31f" +SRC_URI[wasi-0.11.0+wasi-snapshot-preview1.sha256sum] = "9c8d87e72b64a3b4db28d11ce29237c246188f4f51057d65a7eab63b7987e423" +SRC_URI[wasi-0.9.0+wasi-snapshot-preview1.sha256sum] = "cccddf32554fecc6acb585f82a32a72e28b48f8c4c1883ddfeeeaa96f7d8e519" +SRC_URI[widestring-0.2.2.sha256sum] = "7157704c2e12e3d2189c507b7482c52820a16dfa4465ba91add92f266667cadb" +SRC_URI[winapi-build-0.1.1.sha256sum] = "2d315eee3b34aca4797b2da6b13ed88266e6d612562a0c46390af8299fc699bc" +SRC_URI[winapi-i686-pc-windows-gnu-0.4.0.sha256sum] = "ac3b87c63620426dd9b991e5ce0329eff545bccbbb34f3be09ff6fb6ab51b7b6" +SRC_URI[winapi-util-0.1.5.sha256sum] = "70ec6ce85bb158151cae5e5c87f95a8e97d2c0c4b001223f33a334e3ce5de178" +SRC_URI[winapi-x86_64-pc-windows-gnu-0.4.0.sha256sum] = "712e227841d057c1ee1cd2fb22fa7e5a5461ae8e48fa2ca79ec42cfc1931183f" +SRC_URI[winapi-0.2.8.sha256sum] = "167dc9d6949a9b857f3451275e911c3f44255842c1f7a76f33c55103a909087a" +SRC_URI[winapi-0.3.9.sha256sum] = "5c839a674fcd7a98952e593242ea400abe93992746761e38641405d28b00f419" +SRC_URI[windows-sys-0.36.1.sha256sum] = "ea04155a16a59f9eab786fe12a4a450e75cdb175f9e0d80da1e17db09f55b8d2" +SRC_URI[windows_aarch64_msvc-0.36.1.sha256sum] = "9bb8c3fd39ade2d67e9874ac4f3db21f0d710bee00fe7cab16949ec184eeaa47" +SRC_URI[windows_i686_gnu-0.36.1.sha256sum] = "180e6ccf01daf4c426b846dfc66db1fc518f074baa793aa7d9b9aaeffad6a3b6" +SRC_URI[windows_i686_msvc-0.36.1.sha256sum] = "e2e7917148b2812d1eeafaeb22a97e4813dfa60a3f8f78ebe204bcc88f12f024" +SRC_URI[windows_x86_64_gnu-0.36.1.sha256sum] = "4dcd171b8776c41b97521e5da127a2d86ad280114807d0b2ab1e462bc764d9e1" +SRC_URI[windows_x86_64_msvc-0.36.1.sha256sum] = "c811ca4a8c853ef420abd8592ba53ddbbac90410fab6903b3e79972a631f7680" +SRC_URI[winreg-0.5.1.sha256sum] = "a27a759395c1195c4cc5cda607ef6f8f6498f64e78f7900f5de0a127a424704a" +SRC_URI[winreg-0.6.2.sha256sum] = "b2986deb581c4fe11b621998a5e53361efe6b48a151178d0cd9eeffa4dc6acc9" +SRC_URI[ws2_32-sys-0.2.1.sha256sum] = "d59cefebd0c892fa2dd6de581e937301d8552cb44489cdff035c6187cb63fa5e" + SRCREV_FORMAT .= "_fatrw" SRCREV_fatrw = "04629a208b9035d642e51db54886f3d39d7ee029" EXTRA_OECARGO_PATHS += "${WORKDIR}/fatrw" diff --git a/meta-balena-common/recipes-core/plymouth/plymouth_%.bbappend b/meta-balena-common/recipes-core/plymouth/plymouth_%.bbappend index aa97248662..84b4a642b2 100644 --- a/meta-balena-common/recipes-core/plymouth/plymouth_%.bbappend +++ b/meta-balena-common/recipes-core/plymouth/plymouth_%.bbappend @@ -75,7 +75,10 @@ do_deploy() { LOGO = "/mnt/boot/splash/balena-logo.png" PACKAGES:remove = "${PN}-initrd" -PACKAGECONFIG = "" +PACKAGECONFIG:remove = "initrd" +PACKAGECONFIG:remove = "freetype" +PACKAGECONFIG:remove = "pango" +PACKAGECONFIG:remove = "systemd" RDEPENDS:${PN} = "bash" addtask deploy before do_package after do_install diff --git a/meta-balena-common/recipes-core/systemd/systemd_%.bbappend b/meta-balena-common/recipes-core/systemd/systemd_%.bbappend index 0f87eace78..41cbf8f286 100644 --- a/meta-balena-common/recipes-core/systemd/systemd_%.bbappend +++ b/meta-balena-common/recipes-core/systemd/systemd_%.bbappend @@ -91,17 +91,17 @@ do_install:append() { ln -s ../proc/self/mounts ${D}${sysconfdir}/mtab # We take care of journald flush ourselves - rm ${D}/lib/systemd/system/sysinit.target.wants/systemd-journal-flush.service + rm ${D}${prefix}/lib/systemd/system/sysinit.target.wants/systemd-journal-flush.service # Vacuum the journal to catch a corner case bug where the log bloats above limit install -d -m 0755 ${D}/${sysconfdir}/systemd/system/systemd-journald.service.d/ install -m 0644 ${WORKDIR}/vacuum.conf ${D}/${sysconfdir}/systemd/system/systemd-journald.service.d/vacuum.conf - install -m 0755 ${WORKDIR}/resin_update_state_probe ${D}/lib/udev/resin_update_state_probe - install -m 0755 ${WORKDIR}/zram-swap-init ${D}/lib/udev/zram-swap-init + install -m 0755 ${WORKDIR}/resin_update_state_probe ${D}${prefix}/lib/udev/resin_update_state_probe + install -m 0755 ${WORKDIR}/zram-swap-init ${D}${prefix}/lib/udev/zram-swap-init # Move udev rules into /lib as /etc/udev/rules.d is bind mounted for custom rules - mv ${D}/etc/udev/rules.d/*.rules ${D}/lib/udev/rules.d/ + mv ${D}/etc/udev/rules.d/*.rules ${D}${prefix}/lib/udev/rules.d/ install -d -m 0755 ${D}/usr/lib/sysctl.d/ install -m 0644 ${WORKDIR}/balena-os-sysctl.conf ${D}/usr/lib/sysctl.d/ @@ -120,8 +120,8 @@ do_install:append() { install -m 0644 ${WORKDIR}/getty-service-development-features.conf ${D}${sysconfdir}/systemd/system/getty@.service.d/development-features.conf # We don't have audit configs enabled in the kernel, so we can remove the audit sockets - rm ${D}/lib/systemd/system/sockets.target.wants/systemd-journald-audit.socket || true - rm ${D}/lib/systemd/system/systemd-journald-audit.socket || true + rm ${D}${prefix}/lib/systemd/system/sockets.target.wants/systemd-journald-audit.socket || true + rm ${D}${prefix}/lib/systemd/system/systemd-journald-audit.socket || true # Disable systemd-gpt-generator as it's currently a noop that just throws errors ln -s /dev/null ${D}${sysconfdir}/systemd/system-generators/systemd-gpt-auto-generator @@ -160,5 +160,5 @@ GROUPADD_PARAM:${PN} += "; -r wheel; -r nobody;" # Clean up udev hardware database source files pkg_postinst:udev-hwdb:append () { # These files have already been used to generate /etc/udev/hwdb.bin which is the only file used at runtime - rm $D/lib/udev/hwdb.d/* + rm $D${prefix}/lib/udev/hwdb.d/* } diff --git a/meta-balena-common/recipes-kernel/peak/peak_8.17.0.bb b/meta-balena-common/recipes-kernel/peak/peak_8.17.0.bb index 5eecd29e06..c6018f74c1 100644 --- a/meta-balena-common/recipes-kernel/peak/peak_8.17.0.bb +++ b/meta-balena-common/recipes-kernel/peak/peak_8.17.0.bb @@ -53,7 +53,7 @@ do_compile() { } do_install() { - MISC_DIR="${D}${nonarch_base_libdir}/modules/${KERNEL_VERSION}/misc" + MISC_DIR="${D}${libdir}/modules/${KERNEL_VERSION}/misc" MODULE_FILENAME="pcan.ko" for FLAVOUR in ${FLAVOURS} @@ -64,7 +64,7 @@ do_install() { if [ -f "${MODULE_FILENAME}.signed" ]; then mv "${MODULE_FILENAME}.signed" "${MODULE_FILENAME}" fi - oe_runmake install_module DEPMOD=echo DESTDIR=${D} KERNEL_VERSION=${KERNEL_VERSION} + oe_runmake install_module DEPMOD=echo DESTDIR=${D}${prefix} KERNEL_VERSION=${KERNEL_VERSION} mv "${MISC_DIR}/${MODULE_FILENAME}" "${MISC_DIR}/pcan_${FLAVOUR}.ko" cd .. rm -rf "${TMP_DIR}" diff --git a/meta-balena-common/recipes-support/bindmount/bindmount_0.0.4.bb b/meta-balena-common/recipes-support/bindmount/bindmount_0.0.4.bb index 3a3021947c..f0f98596bc 100644 --- a/meta-balena-common/recipes-support/bindmount/bindmount_0.0.4.bb +++ b/meta-balena-common/recipes-support/bindmount/bindmount_0.0.4.bb @@ -13,6 +13,13 @@ S = "${WORKDIR}/git" CARGO_SRC_DIR="" PV:append = ".AUTOINC+f597fb0266" +SRC_URI[errno-0.2.3.sha256sum] = "b2c858c42ac0b88532f48fca88b0ed947cad4f1f64d904bcd6c9f138f7b95d70" +SRC_URI[kernel32-sys-0.2.2.sha256sum] = "7507624b29483431c0ba2d82aece8ca6cdba9382bff4ddd0f7490560c056098d" +SRC_URI[libc-0.2.36.sha256sum] = "1e5d97d6708edaa407429faa671b942dc0f2727222fb6b6539bf1db936e4b121" +SRC_URI[winapi-build-0.1.1.sha256sum] = "2d315eee3b34aca4797b2da6b13ed88266e6d612562a0c46390af8299fc699bc" +SRC_URI[winapi-0.2.8.sha256sum] = "167dc9d6949a9b857f3451275e911c3f44255842c1f7a76f33c55103a909087a" + + # please note if you have entries that do not begin with crate:// # you must change them to how that package can be fetched SRC_URI += " \ diff --git a/meta-balena-common/recipes-support/usb-modeswitch/usb-modeswitch-data_20191128.bb b/meta-balena-common/recipes-support/usb-modeswitch/usb-modeswitch-data_20191128.bb index 5d58dd1d34..0da4f01c30 100644 --- a/meta-balena-common/recipes-support/usb-modeswitch/usb-modeswitch-data_20191128.bb +++ b/meta-balena-common/recipes-support/usb-modeswitch/usb-modeswitch-data_20191128.bb @@ -11,7 +11,7 @@ SRC_URI[md5sum] = "e8fce7eb949cbe16c61fb71bade4cc17" SRC_URI[sha256sum] = "3f039b60791c21c7cb15c7986cac89650f076dc274798fa242231b910785eaf9" do_install() { - oe_runmake install DESTDIR=${D} + oe_runmake install DESTDIR=${D} RULESDIR=${D}${nonarch_base_libdir}/udev/rules.d } RDEPENDS:${PN} = "usb-modeswitch (>= 2.4.0)" diff --git a/meta-balena-common/recipes-support/usb-modeswitch/usb-modeswitch_2.5.2.bb b/meta-balena-common/recipes-support/usb-modeswitch/usb-modeswitch_2.5.2.bb index 7a696561c0..20d7d6490b 100644 --- a/meta-balena-common/recipes-support/usb-modeswitch/usb-modeswitch_2.5.2.bb +++ b/meta-balena-common/recipes-support/usb-modeswitch/usb-modeswitch_2.5.2.bb @@ -16,7 +16,7 @@ FILES:${PN} = "${bindir} ${sysconfdir} ${nonarch_base_libdir}/udev/usb_modeswitc RRECOMMENDS:${PN} = "usb-modeswitch-data" do_install() { - oe_runmake DESTDIR=${D} install-static + oe_runmake DESTDIR=${D} UDEVDIR=${D}${nonarch_base_libdir}/udev install-static if ${@bb.utils.contains('DISTRO_FEATURES','systemd','true','false',d)}; then install -d ${D}/${systemd_unitdir}/system install -m 644 ${S}/usb_modeswitch@.service ${D}/${systemd_unitdir}/system diff --git a/meta-balena-rust/classes/cargo.bbclass b/meta-balena-rust/classes/balena_cargo.bbclass similarity index 96% rename from meta-balena-rust/classes/cargo.bbclass rename to meta-balena-rust/classes/balena_cargo.bbclass index 4a780a501f..694aaa4715 100644 --- a/meta-balena-rust/classes/cargo.bbclass +++ b/meta-balena-rust/classes/balena_cargo.bbclass @@ -3,7 +3,7 @@ ## This class is used by any recipes that are built using ## Cargo. -inherit cargo_common +inherit balena_cargo_common # the binary we will use CARGO = "cargo" @@ -48,12 +48,12 @@ oe_cargo_build () { } do_compile[progress] = "outof:\s+(\d+)/(\d+)" -cargo_do_compile () { +balena_cargo_do_compile () { oe_cargo_fix_env oe_cargo_build } -cargo_do_install () { +balena_cargo_do_install () { local have_installed=false for tgt in "${B}/target/${CARGO_TARGET_SUBDIR}/"*; do case $tgt in diff --git a/meta-balena-rust/classes/cargo_common.bbclass b/meta-balena-rust/classes/balena_cargo_common.bbclass similarity index 98% rename from meta-balena-rust/classes/cargo_common.bbclass rename to meta-balena-rust/classes/balena_cargo_common.bbclass index d3ba050aca..e8c0f95252 100644 --- a/meta-balena-rust/classes/cargo_common.bbclass +++ b/meta-balena-rust/classes/balena_cargo_common.bbclass @@ -16,7 +16,7 @@ def set_crate_fetcher(d): # add crate fetch support inherit ${@set_crate_fetcher(d)} -inherit rust-common +inherit balena_rust-common # Where we download our registry and dependencies to export CARGO_HOME = "${WORKDIR}/cargo_home" @@ -35,7 +35,7 @@ CARGO_DISABLE_BITBAKE_VENDORING ?= "0" CARGO_VENDORING_DIRECTORY ?= "${CARGO_HOME}/bitbake" CARGO_RUST_TARGET_CCLD ?= "${RUST_TARGET_CCLD}" -cargo_common_do_configure () { +balena_cargo_common_do_configure () { mkdir -p ${CARGO_HOME}/bitbake cat <<- EOF > ${CARGO_HOME}/config diff --git a/meta-balena-rust/classes/rust-common.bbclass b/meta-balena-rust/classes/balena_rust-common.bbclass similarity index 100% rename from meta-balena-rust/classes/rust-common.bbclass rename to meta-balena-rust/classes/balena_rust-common.bbclass diff --git a/meta-balena-rust/classes/rust.bbclass b/meta-balena-rust/classes/balena_rust.bbclass similarity index 98% rename from meta-balena-rust/classes/rust.bbclass rename to meta-balena-rust/classes/balena_rust.bbclass index 5c8938d09f..c1ee233b90 100644 --- a/meta-balena-rust/classes/rust.bbclass +++ b/meta-balena-rust/classes/balena_rust.bbclass @@ -1,4 +1,4 @@ -inherit rust-common +inherit balena_rust-common RUSTC = "rustc" diff --git a/meta-balena-rust/classes/rust-bin.bbclass b/meta-balena-rust/classes/rust-bin.bbclass index c87343b3cf..6912114c91 100644 --- a/meta-balena-rust/classes/rust-bin.bbclass +++ b/meta-balena-rust/classes/rust-bin.bbclass @@ -1,4 +1,4 @@ -inherit rust +inherit balena_rust RDEPENDS:${PN}:append:class-target = " ${RUSTLIB_DEP}" diff --git a/meta-balena-rust/conf/layer.conf b/meta-balena-rust/conf/layer.conf index b64ebf60d9..e5fd3e59bb 100644 --- a/meta-balena-rust/conf/layer.conf +++ b/meta-balena-rust/conf/layer.conf @@ -7,7 +7,7 @@ BBFILE_COLLECTIONS += "balena-rust" BBFILE_PATTERN_balena-rust := "^${LAYERDIR}/" BBFILE_PRIORITY_balena-rust = "1337" -LAYERSERIES_COMPAT_balena-rust = "honister kirkstone" +LAYERSERIES_COMPAT_balena-rust = "honister kirkstone scarthgap" BALENA_DEPRECATED_YOCTO_LAYER ?= "0" diff --git a/meta-balena-rust/recipes-devtools/cargo/cargo.inc b/meta-balena-rust/recipes-devtools/cargo/cargo.inc index 607c51fc3d..62a0cbf773 100644 --- a/meta-balena-rust/recipes-devtools/cargo/cargo.inc +++ b/meta-balena-rust/recipes-devtools/cargo/cargo.inc @@ -16,7 +16,7 @@ S = "${RUSTSRC}/src/tools/cargo" CARGO_VENDORING_DIRECTORY = "${RUSTSRC}/vendor" EXCLUDE_FROM_WORLD = "1" -inherit cargo pkgconfig +inherit balena_cargo pkgconfig do_cargo_setup_snapshot () { ${WORKDIR}/rust-snapshot-components/${CARGO_SNAPSHOT}/install.sh --prefix="${WORKDIR}/${CARGO_SNAPSHOT}" --disable-ldconfig diff --git a/meta-balena-rust/recipes-devtools/rust/files/0001-bootstrap-replace-references-to-distutils.patch b/meta-balena-rust/recipes-devtools/rust/files/0001-bootstrap-replace-references-to-distutils.patch new file mode 100644 index 0000000000..d88201be30 --- /dev/null +++ b/meta-balena-rust/recipes-devtools/rust/files/0001-bootstrap-replace-references-to-distutils.patch @@ -0,0 +1,47 @@ +From 294f80f61670847ad28f7513d1fffc5ad583bd64 Mon Sep 17 00:00:00 2001 +From: Joseph Kogut +Date: Tue, 2 Apr 2024 11:23:09 -0700 +Subject: [PATCH 1/1] bootstrap: replace references to distutils + +Replace references to deprecated distutils package. + +Signed-off-by: Joseph Kogut +Signed-off-by: Joseph Kogut +--- + src/bootstrap/bootstrap.py | 6 +++--- + 1 file changed, 3 insertions(+), 3 deletions(-) + +diff --git a/src/bootstrap/bootstrap.py b/src/bootstrap/bootstrap.py +index ab4338e1c85..521e48604f0 100644 +--- a/src/bootstrap/bootstrap.py ++++ b/src/bootstrap/bootstrap.py +@@ -2,7 +2,7 @@ from __future__ import absolute_import, division, print_function + import argparse + import contextlib + import datetime +-import distutils.version ++import packaging.version + import hashlib + import json + import os +@@ -933,7 +933,7 @@ class RustBuild(object): + cwd=self.rust_root, verbose=self.verbose) + + update_args = ["git", "submodule", "update", "--init", "--recursive", "--depth=1"] +- if self.git_version >= distutils.version.LooseVersion("2.11.0"): ++ if self.git_version >= packaging.version.Version("2.11.0"): + update_args.append("--progress") + update_args.append(module) + try: +@@ -972,7 +972,7 @@ class RustBuild(object): + + # check the existence and version of 'git' command + git_version_str = require(['git', '--version']).split()[2].decode(default_encoding) +- self.git_version = distutils.version.LooseVersion(git_version_str) ++ self.git_version = packaging.version.Version(git_version_str) + + slow_submodules = self.get_toml('fast-submodules') == "false" + start_time = time() +-- +2.44.0 + diff --git a/meta-balena-rust/recipes-devtools/rust/libstd-rs.inc b/meta-balena-rust/recipes-devtools/rust/libstd-rs.inc index 987956344a..28c98ca600 100644 --- a/meta-balena-rust/recipes-devtools/rust/libstd-rs.inc +++ b/meta-balena-rust/recipes-devtools/rust/libstd-rs.inc @@ -5,7 +5,7 @@ LICENSE = "MIT | Apache-2.0" LIC_FILES_CHKSUM = "file://../../COPYRIGHT;md5=93a95682d51b4cb0a633a97046940ef0" RUSTLIB_DEP = "" -inherit cargo +inherit balena_cargo DEPENDS:append:libc-musl = " libunwind" # rv32 does not have libunwind ported yet diff --git a/meta-balena-rust/recipes-devtools/rust/rust.inc b/meta-balena-rust/recipes-devtools/rust/rust.inc index 262e5b6d26..d3017cdcb5 100644 --- a/meta-balena-rust/recipes-devtools/rust/rust.inc +++ b/meta-balena-rust/recipes-devtools/rust/rust.inc @@ -4,8 +4,8 @@ SECTION = "devel" LICENSE = "MIT | Apache-2.0" LIC_FILES_CHKSUM = "file://COPYRIGHT;md5=93a95682d51b4cb0a633a97046940ef0" -inherit rust -inherit cargo_common +inherit balena_rust +inherit balena_cargo_common DEPENDS += "file-native python3-native" DEPENDS:append:class-native = " rust-llvm-native" @@ -33,7 +33,7 @@ setup_cargo_environment () { # these are build for the same target as the snapshot, e.g. # x86_64-unknown-linux-gnu. # Later stages are build for the native target (i.e. target.x86_64-linux) - cargo_common_do_configure + balena_cargo_common_do_configure printf '[target.%s]\n' "${SNAPSHOT_BUILD_SYS}" >> ${CARGO_HOME}/config printf "linker = '%s'\n" "${RUST_BUILD_CCLD}" >> ${CARGO_HOME}/config diff --git a/meta-balena-rust/recipes-devtools/rust/rust_1.62.0.bb b/meta-balena-rust/recipes-devtools/rust/rust_1.62.0.bb index b505ad46ca..22933d1733 100644 --- a/meta-balena-rust/recipes-devtools/rust/rust_1.62.0.bb +++ b/meta-balena-rust/recipes-devtools/rust/rust_1.62.0.bb @@ -4,6 +4,14 @@ require rust-snapshot.inc INSANE_SKIP:${PN}:class-native = "already-stripped" +SRC_URI += " \ + file://0001-bootstrap-replace-references-to-distutils.patch \ +" + +DEPENDS += " \ + python3-packaging \ + " + do_compile () { rust_runx build --stage 2 } diff --git a/meta-balena-scarthgap/README.md b/meta-balena-scarthgap/README.md new file mode 100644 index 0000000000..482ca98d48 --- /dev/null +++ b/meta-balena-scarthgap/README.md @@ -0,0 +1,11 @@ +# Balena.io layer for Poky Kirkstone supported boards + +## Description +This repository enables building balena.io for scarthgap supported machines. + +## Layer dependencies + +This layer depends on: + +* URI: git://git.yoctoproject.org/poky + * branch: scarthgap diff --git a/meta-balena-scarthgap/classes/kernel-balena-noimage.bbclass b/meta-balena-scarthgap/classes/kernel-balena-noimage.bbclass new file mode 100644 index 0000000000..2f76d9d21d --- /dev/null +++ b/meta-balena-scarthgap/classes/kernel-balena-noimage.bbclass @@ -0,0 +1,9 @@ +# Don't trigger in the kernel image without initramfs +# Boards should: +# a) use kernel-image-initramfs and deploy in in the rootfs (ex bbb) +# b) use boot deployment using BALENA_BOOT_PARTITION_FILES mechanism to deploy +# the initramfs bundled kernel image +python __anonymous() { + kernel_image_type = d.getVar('KERNEL_IMAGETYPE') + d.appendVar('PACKAGE_EXCLUDE', ' kernel-image-%s-*' % kernel_image_type.lower()) +} diff --git a/meta-balena-scarthgap/conf/distro/include/balena-os-yocto-version.inc b/meta-balena-scarthgap/conf/distro/include/balena-os-yocto-version.inc new file mode 100644 index 0000000000..336a83e8c3 --- /dev/null +++ b/meta-balena-scarthgap/conf/distro/include/balena-os-yocto-version.inc @@ -0,0 +1,2 @@ +# required by systemd after scarthgap +DISTRO_FEATURES:append = " usrmerge" diff --git a/meta-balena-scarthgap/conf/layer.conf b/meta-balena-scarthgap/conf/layer.conf new file mode 100644 index 0000000000..6ae4e51895 --- /dev/null +++ b/meta-balena-scarthgap/conf/layer.conf @@ -0,0 +1,10 @@ +BBPATH .= ":${LAYERDIR}" + +BBFILES += "${LAYERDIR}/recipes-*/*/*.bb \ + ${LAYERDIR}/recipes-*/*/*.bbappend" + +BBFILE_COLLECTIONS += "balena-scarthgap" +BBFILE_PATTERN_balena-scarthgap := "^${LAYERDIR}/" +BBFILE_PRIORITY_balena-scarthgap = "1337" + +LAYERSERIES_COMPAT_balena-scarthgap = "scarthgap" diff --git a/meta-balena-scarthgap/recipes-core/busybox/busybox_%.bbappend b/meta-balena-scarthgap/recipes-core/busybox/busybox_%.bbappend new file mode 100644 index 0000000000..6489647d3c --- /dev/null +++ b/meta-balena-scarthgap/recipes-core/busybox/busybox_%.bbappend @@ -0,0 +1,2 @@ +ALTERNATIVE:${PN} += "partprobe" +ALTERNATIVE_LINK_NAME[partprobe] = "${sbindir}/partprobe" diff --git a/meta-balena-scarthgap/recipes-core/packagegroups/packagegroup-balena-connectivity.bbappend b/meta-balena-scarthgap/recipes-core/packagegroups/packagegroup-balena-connectivity.bbappend new file mode 100644 index 0000000000..6bf7a31d2a --- /dev/null +++ b/meta-balena-scarthgap/recipes-core/packagegroups/packagegroup-balena-connectivity.bbappend @@ -0,0 +1,19 @@ +CONNECTIVITY_FIRMWARES:append = " \ + linux-firmware-bcm43143 \ + linux-firmware-iwlwifi-135-6 \ + linux-firmware-iwlwifi-3160 \ + linux-firmware-iwlwifi-6000-4 \ + linux-firmware-iwlwifi-6000g2a-6 \ + linux-firmware-iwlwifi-6000g2b-6 \ + linux-firmware-iwlwifi-6050-5 \ + linux-firmware-iwlwifi-7260 \ + linux-firmware-iwlwifi-7265 \ + linux-firmware-iwlwifi-7265d \ + linux-firmware-iwlwifi-8000c \ + linux-firmware-iwlwifi-8265 \ + linux-firmware-iwlwifi-9260 \ + linux-firmware-rtl8188eu \ + linux-firmware-wl12xx \ + linux-firmware-wl18xx \ + wireless-regdb-static \ + " diff --git a/meta-balena-scarthgap/recipes-kernel/linux/linux-firmware_%.bbappend b/meta-balena-scarthgap/recipes-kernel/linux/linux-firmware_%.bbappend new file mode 100644 index 0000000000..038f2ba16d --- /dev/null +++ b/meta-balena-scarthgap/recipes-kernel/linux/linux-firmware_%.bbappend @@ -0,0 +1,17 @@ +inherit balena-linux-firmware + +# Cleanup iwlwifi firmware files +IWLWIFI_PATH = "${D}${nonarch_base_libdir}/firmware" +IWLWIFI_REGEX = "^iwlwifi-([0-9a-zA-Z-]+)-([0-9]+).ucode$" +IWLWIFI_FW_TOCLEAN ?= " \ + 7260 \ + 7265 \ + 7265D \ + 8000C \ + 8265 \ +" +IWLWIFI_FW_MIN_API[7260] = "17" +IWLWIFI_FW_MIN_API[7265] = "17" +IWLWIFI_FW_MIN_API[7265D] = "29" +IWLWIFI_FW_MIN_API[8000C] = "34" +IWLWIFI_FW_MIN_API[8265] = "34" diff --git a/meta-clang b/meta-clang new file mode 160000 index 0000000000..ce7d354da7 --- /dev/null +++ b/meta-clang @@ -0,0 +1 @@ +Subproject commit ce7d354da7a498f90ba260c006d29a4d23e3b4f7