From c339fa115a441a5d0d487457ae776a4f7a2fc505 Mon Sep 17 00:00:00 2001 From: California Sullivan Date: Fri, 12 May 2017 17:15:34 -0700 Subject: canned-wks/systemd-bootdisk-uuid.wks: remove file This was initially added as a stopgap, as OE-core's systemd-bootdisk.wks was using a static device node name rather than device UUID as the root target. Since OE-core's systemd-bootdisk has caught up, we don't need this. OE-core's systemd-bootdisk also includes console=ttyS0, which is common on many platforms and we were missing. Also change the default WKS_FILE to be OE-core's systemd-bootdisk on appropriate MACHINEs. Signed-off-by: California Sullivan Signed-off-by: Saul Wold --- conf/machine/intel-core2-32.conf | 2 +- conf/machine/intel-corei7-64.conf | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) (limited to 'conf') diff --git a/conf/machine/intel-core2-32.conf b/conf/machine/intel-core2-32.conf index c15f72b6..a08ce896 100644 --- a/conf/machine/intel-core2-32.conf +++ b/conf/machine/intel-core2-32.conf @@ -33,5 +33,5 @@ APPEND += "rootwait console=ttyS0,115200 console=ttyPCH0,115200 console=tty0" PACKAGE_INSTALL_append_pn-core-image-minimal-initramfs = " linux-firmware-i915" IMAGE_FSTYPES += "wic" -WKS_FILE ?= "systemd-bootdisk-uuid.wks" +WKS_FILE ?= "systemd-bootdisk.wks" do_image_wic[depends] += "gptfdisk-native:do_populate_sysroot mtools-native:do_populate_sysroot dosfstools-native:do_populate_sysroot" diff --git a/conf/machine/intel-corei7-64.conf b/conf/machine/intel-corei7-64.conf index 1e5de49e..cca45c7a 100644 --- a/conf/machine/intel-corei7-64.conf +++ b/conf/machine/intel-corei7-64.conf @@ -34,5 +34,5 @@ APPEND += "rootwait console=ttyS0,115200 console=tty0" PACKAGE_INSTALL_append_pn-core-image-minimal-initramfs = " linux-firmware-i915" IMAGE_FSTYPES += "wic" -WKS_FILE ?= "systemd-bootdisk-uuid.wks" +WKS_FILE ?= "systemd-bootdisk.wks" do_image_wic[depends] += "gptfdisk-native:do_populate_sysroot mtools-native:do_populate_sysroot dosfstools-native:do_populate_sysroot" -- cgit v1.2.3-54-g00ecf