diff options
author | California Sullivan <california.l.sullivan@intel.com> | 2017-05-12 17:15:34 -0700 |
---|---|---|
committer | Saul Wold <sgw@linux.intel.com> | 2017-05-16 08:05:07 -0700 |
commit | c339fa115a441a5d0d487457ae776a4f7a2fc505 (patch) | |
tree | 6db09e9960bd7129a280792766dad2f2601359bd /conf/machine/intel-corei7-64.conf | |
parent | 3e540d736154c5b5371b6e7a2bdced0e2cda1382 (diff) | |
download | meta-intel-c339fa115a441a5d0d487457ae776a4f7a2fc505.tar.gz |
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 <california.l.sullivan@intel.com>
Signed-off-by: Saul Wold <sgw@linux.intel.com>
Diffstat (limited to 'conf/machine/intel-corei7-64.conf')
-rw-r--r-- | conf/machine/intel-corei7-64.conf | 2 |
1 files changed, 1 insertions, 1 deletions
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" | |||
34 | PACKAGE_INSTALL_append_pn-core-image-minimal-initramfs = " linux-firmware-i915" | 34 | PACKAGE_INSTALL_append_pn-core-image-minimal-initramfs = " linux-firmware-i915" |
35 | 35 | ||
36 | IMAGE_FSTYPES += "wic" | 36 | IMAGE_FSTYPES += "wic" |
37 | WKS_FILE ?= "systemd-bootdisk-uuid.wks" | 37 | WKS_FILE ?= "systemd-bootdisk.wks" |
38 | do_image_wic[depends] += "gptfdisk-native:do_populate_sysroot mtools-native:do_populate_sysroot dosfstools-native:do_populate_sysroot" | 38 | do_image_wic[depends] += "gptfdisk-native:do_populate_sysroot mtools-native:do_populate_sysroot dosfstools-native:do_populate_sysroot" |