summaryrefslogtreecommitdiffstats
path: root/conf
diff options
context:
space:
mode:
authorCalifornia Sullivan <california.l.sullivan@intel.com>2017-05-13 00:15:34 (GMT)
committerSaul Wold <sgw@linux.intel.com>2017-05-16 15:05:07 (GMT)
commitc339fa115a441a5d0d487457ae776a4f7a2fc505 (patch)
tree6db09e9960bd7129a280792766dad2f2601359bd /conf
parent3e540d736154c5b5371b6e7a2bdced0e2cda1382 (diff)
downloadmeta-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')
-rw-r--r--conf/machine/intel-core2-32.conf2
-rw-r--r--conf/machine/intel-corei7-64.conf2
2 files changed, 2 insertions, 2 deletions
diff --git a/conf/machine/intel-core2-32.conf b/conf/machine/intel-core2-32.conf
index c15f72b..a08ce89 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"
33PACKAGE_INSTALL_append_pn-core-image-minimal-initramfs = " linux-firmware-i915" 33PACKAGE_INSTALL_append_pn-core-image-minimal-initramfs = " linux-firmware-i915"
34 34
35IMAGE_FSTYPES += "wic" 35IMAGE_FSTYPES += "wic"
36WKS_FILE ?= "systemd-bootdisk-uuid.wks" 36WKS_FILE ?= "systemd-bootdisk.wks"
37do_image_wic[depends] += "gptfdisk-native:do_populate_sysroot mtools-native:do_populate_sysroot dosfstools-native:do_populate_sysroot" 37do_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 1e5de49..cca45c7 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"
34PACKAGE_INSTALL_append_pn-core-image-minimal-initramfs = " linux-firmware-i915" 34PACKAGE_INSTALL_append_pn-core-image-minimal-initramfs = " linux-firmware-i915"
35 35
36IMAGE_FSTYPES += "wic" 36IMAGE_FSTYPES += "wic"
37WKS_FILE ?= "systemd-bootdisk-uuid.wks" 37WKS_FILE ?= "systemd-bootdisk.wks"
38do_image_wic[depends] += "gptfdisk-native:do_populate_sysroot mtools-native:do_populate_sysroot dosfstools-native:do_populate_sysroot" 38do_image_wic[depends] += "gptfdisk-native:do_populate_sysroot mtools-native:do_populate_sysroot dosfstools-native:do_populate_sysroot"