MIRRORS/meta-intel
1
0
Fork 0
mirror of git://git.yoctoproject.org/meta-intel.git synced 2025-07-19 12:59:03 +02:00
Code Issues Actions Packages Projects Releases Wiki Activity

canned-wks/systemd-bootdisk-uuid.wks: remove file

Browse Source 
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>
This commit is contained in:
California Sullivan 2017-05-12 17:15:34 -07:00 committed by Saul Wold
parent 3e540d7361
commit c339fa115a
3 changed files with 2 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
conf/machine/intel-core2-32.conf
View File

@ -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"

2
conf/machine/intel-corei7-64.conf
View File

@ -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"

11
scripts/lib/wic/canned-wks/systemd-bootdisk-uuid.wks
View File

@ -1,11 +0,0 @@
# short-description: Create an EFI disk image with systemd-boot
# long-description: Creates a partitioned EFI disk image that the user
# can directly dd to boot media. The selected bootloader is systemd-boot.
part /boot --source bootimg-efi --sourceparams="loader=systemd-boot" --ondisk sda --label msdos --active --align 1024
part / --source rootfs --ondisk sda --fstype=ext4 --label platform --align 1024 --use-uuid
part swap --ondisk sda --size 44 --label swap1 --fstype=swap
bootloader --ptable gpt --timeout=5 --append="rootwait rootfstype=ext4 console=tty0"