Merge pull request #164 from siemens/jan/dunfell-fixes

dunfell fixes
siemens · Nov 4, 2020 · 48bb089 · 48bb089
2 parents 7c33fe5 + f41efbe
commit 48bb089
Show file tree

Hide file tree

Showing 5 changed files with 4 additions and 6 deletions.
diff --git a/meta-iot2000-bsp/conf/machine/iot2000.conf b/meta-iot2000-bsp/conf/machine/iot2000.conf
@@ -34,6 +34,7 @@ INITRD_LIVE_prepend = "${DEPLOY_DIR_IMAGE}/acpi-upgrades-${MACHINE}.cpio "
 
 # runqemu configuration
 IMAGE_CLASSES += "qemuboot"
+IMAGE_FSTYPES += "ext4"
 QB_SYSTEM_NAME = "qemu-system-i386"
 QB_MEM = "-m 1024"
 QB_CPU = "-cpu pentium"

diff --git a/meta-iot2000-example/conf/distro/poky-iot2000.conf b/meta-iot2000-example/conf/distro/poky-iot2000.conf
@@ -4,8 +4,6 @@ DISTRO = "poky-iot2000"
 DISTRO_NAME = "IOT2000 Example Image"
 DISTRO_VERSION = "V2.6.0"
 
-LINUXLIBCVERSION = "4.4%"
-
 BINDINGS_pn-mraa = "python nodejs"
 
 WICVARS += "BBLAYERS \

diff --git a/meta-iot2000-example/recipes-devtools/tcf-agent/tcf-agent_git.bbappend b/meta-iot2000-example/recipes-devtools/tcf-agent/tcf-agent_git.bbappend
diff --git a/meta-iot2000-example/recipes-kernel/linux-libc-headers/linux-libc-headers_4.4.bb b/meta-iot2000-example/recipes-kernel/linux-libc-headers/linux-libc-headers_4.4.bb
diff --git a/meta-iot2000-example/recipes-kernel/linux/linux-cip_4.4.bbappend b/meta-iot2000-example/recipes-kernel/linux/linux-cip_4.4.bbappend
@@ -1,3 +1,5 @@
 FILESEXTRAPATHS_prepend := "${THISDIR}/configs:"
 
-SRC_URI += "file://iot2000-example.scc"
+SRC_URI += " \
+    file://iot2000-example.scc \
+    file://iot2000-example.cfg"