aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorEd Bartosh <ed.bartosh@linux.intel.com>2017-01-09 23:34:27 +0200
committerRichard Purdie <richard.purdie@linuxfoundation.org>2017-01-16 18:08:20 +0000
commitacfb6bf01812a0e5c23a5a6b0a6add83796ea1b7 (patch)
treef70fb1c5e6f3d9228e3830a8248208d186844667
parentf689defd6d989581bad5645e1170a2cb25c49c6f (diff)
downloadpoky-acfb6bf01812a0e5c23a5a6b0a6add83796ea1b7.tar.gz
poky-acfb6bf01812a0e5c23a5a6b0a6add83796ea1b7.tar.bz2
poky-acfb6bf01812a0e5c23a5a6b0a6add83796ea1b7.zip
genericx86: add genericx86.wks
Currently genericx86* machines use mkefidisk.wks from scripts/lib/wic/canned-wks. It'd be easier to find this file if it's name contains machine name and it's located in the same layer. Added genericx86.wks to meta-yocto-bsp/wic/ to make it independent from changes in oe-core and easier to maintain. [YOCTO #8719] (From meta-yocto rev: becb5f506198d94762e43f1b5a47b50d24b5ab35) Signed-off-by: Ed Bartosh <ed.bartosh@linux.intel.com> Signed-off-by: Ross Burton <ross.burton@intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
-rw-r--r--meta-yocto-bsp/conf/machine/include/genericx86-common.inc2
-rw-r--r--meta-yocto-bsp/wic/genericx86.wks7
2 files changed, 8 insertions, 1 deletions
diff --git a/meta-yocto-bsp/conf/machine/include/genericx86-common.inc b/meta-yocto-bsp/conf/machine/include/genericx86-common.inc
index eb6f0b9bd7..cec7970852 100644
--- a/meta-yocto-bsp/conf/machine/include/genericx86-common.inc
+++ b/meta-yocto-bsp/conf/machine/include/genericx86-common.inc
@@ -21,6 +21,6 @@ GLIBC_ADDONS = "nptl"
EXTRA_OECONF_append_pn-matchbox-panel-2 = " --with-battery=acpi"
IMAGE_FSTYPES += "wic wic.bmap"
-WKS_FILE ?= "mkefidisk.wks"
+WKS_FILE ?= "genericx86.wks"
do_image_wic[depends] += "gptfdisk-native:do_populate_sysroot"
do_image_wic[recrdeptask] += "do_bootimg"
diff --git a/meta-yocto-bsp/wic/genericx86.wks b/meta-yocto-bsp/wic/genericx86.wks
new file mode 100644
index 0000000000..dab719c584
--- /dev/null
+++ b/meta-yocto-bsp/wic/genericx86.wks
@@ -0,0 +1,7 @@
+# short-description: Create an EFI disk image for genericx86*
+# long-description: Creates a partitioned EFI disk image for genericx86* machines
+part /boot --source bootimg-efi --sourceparams="loader=grub-efi" --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="rootfstype=ext4 console=ttyS0,115200 console=tty0"