From 248b47feb364828087f00d1934d85234df6e0be2 Mon Sep 17 00:00:00 2001 From: Saul Wold Date: Wed, 12 Jul 2017 13:35:59 -0700 Subject: wic: Move WKS newer common location This cleans up the wic scripts location to match the newer top-level wic directory location. Signed-off-by: Saul Wold --- scripts/lib/wic/canned-wks/galileodisk-sd.wks | 9 --------- scripts/lib/wic/canned-wks/galileodisk-usb.wks | 9 --------- scripts/lib/wic/canned-wks/generic-bootdisk.wks.in | 6 ------ scripts/lib/wic/canned-wks/mktinygalileodisk.wks | 7 ------- scripts/lib/wic/canned-wks/systemd-bootdisk-tiny32.wks | 8 -------- scripts/lib/wic/canned-wks/systemd-bootdisk-tiny64.wks | 14 -------------- wic/galileodisk-sd.wks | 9 +++++++++ wic/galileodisk-usb.wks | 9 +++++++++ wic/generic-bootdisk.wks.in | 6 ++++++ wic/mktinygalileodisk.wks | 7 +++++++ wic/systemd-bootdisk-tiny32.wks | 8 ++++++++ wic/systemd-bootdisk-tiny64.wks | 14 ++++++++++++++ 12 files changed, 53 insertions(+), 53 deletions(-) delete mode 100644 scripts/lib/wic/canned-wks/galileodisk-sd.wks delete mode 100644 scripts/lib/wic/canned-wks/galileodisk-usb.wks delete mode 100644 scripts/lib/wic/canned-wks/generic-bootdisk.wks.in delete mode 100644 scripts/lib/wic/canned-wks/mktinygalileodisk.wks delete mode 100644 scripts/lib/wic/canned-wks/systemd-bootdisk-tiny32.wks delete mode 100644 scripts/lib/wic/canned-wks/systemd-bootdisk-tiny64.wks create mode 100644 wic/galileodisk-sd.wks create mode 100644 wic/galileodisk-usb.wks create mode 100644 wic/generic-bootdisk.wks.in create mode 100644 wic/mktinygalileodisk.wks create mode 100644 wic/systemd-bootdisk-tiny32.wks create mode 100644 wic/systemd-bootdisk-tiny64.wks diff --git a/scripts/lib/wic/canned-wks/galileodisk-sd.wks b/scripts/lib/wic/canned-wks/galileodisk-sd.wks deleted file mode 100644 index 225778d7..00000000 --- a/scripts/lib/wic/canned-wks/galileodisk-sd.wks +++ /dev/null @@ -1,9 +0,0 @@ -# short-description: Create a Galileo Gen 1/2 disk image (SD card) -# long-description: Creates a partitioned EFI disk image for Intel Galileo Gen 1/2 -# boards that the user can directly dd to an SD card and boot. - -part /boot --source bootimg-efi --sourceparams="loader=systemd-boot" --ondisk mmcblk0 --label msdos --active --align 1024 - -part / --source rootfs --ondisk mmcblk0 --fstype=ext3 --label platform --align 1024 --use-uuid - -bootloader --timeout=1 --append="rootwait console=ttyS1,115200n8 earlycon=uart8250,mmio32,0x9000b000,115200n8 reboot=efi,warm apic=debug rw LABEL=boot debugshell=5" diff --git a/scripts/lib/wic/canned-wks/galileodisk-usb.wks b/scripts/lib/wic/canned-wks/galileodisk-usb.wks deleted file mode 100644 index b561fa09..00000000 --- a/scripts/lib/wic/canned-wks/galileodisk-usb.wks +++ /dev/null @@ -1,9 +0,0 @@ -# short-description: Create a Galileo Gen 1/2 disk image (USB storage) -# long-description: Creates a partitioned EFI disk image for Intel Galileo Gen 1/2 -# that the user can directly dd to USB storage media and boot. - -part /boot --source bootimg-efi --sourceparams="loader=systemd-boot" --ondisk sda --label msdos --active --align 1024 - -part / --source rootfs --ondisk sda --fstype=ext3 --label platform --align 1024 --use-uuid - -bootloader --timeout=1 --append="rootwait console=ttyS1,115200n8 earlycon=uart8250,mmio32,0x9000b000,115200n8 reboot=efi,warm apic=debug rw LABEL=boot debugshell=5" diff --git a/scripts/lib/wic/canned-wks/generic-bootdisk.wks.in b/scripts/lib/wic/canned-wks/generic-bootdisk.wks.in deleted file mode 100644 index 31c708bc..00000000 --- a/scripts/lib/wic/canned-wks/generic-bootdisk.wks.in +++ /dev/null @@ -1,6 +0,0 @@ -# based off of refkit's refkit-directdisk.wks.in kickstart template -# uses the image's boot directory to populate a vfat boot partition, -# which works with EFI. -bootloader --ptable gpt -part /boot --source rootfs --rootfs-dir=${IMAGE_ROOTFS}/boot --fstype=vfat --label msdos --active --align 1024 --use-uuid -part / --source rootfs --fstype=ext4 --label root --align 1024 --uuid ${DISK_SIGNATURE_UUID} diff --git a/scripts/lib/wic/canned-wks/mktinygalileodisk.wks b/scripts/lib/wic/canned-wks/mktinygalileodisk.wks deleted file mode 100644 index 52f1e12c..00000000 --- a/scripts/lib/wic/canned-wks/mktinygalileodisk.wks +++ /dev/null @@ -1,7 +0,0 @@ -# short-description: Create an Galileo Gen 1/2 disk image -# long-description: Creates a partitioned EFI disk image for Intel Galileo Gen 1/2, -# that the user can directly dd to boot media. - -part /boot --source bootimg-efi --sourceparams="loader=systemd-boot,initrd=core-image-tiny-initramfs-intel-quark.cpio.gz" --ondisk mmcblk0 --label msdos --active --align 1024 - -bootloader --timeout=0 --append="console=ttyS1,115200n8 earlycon=uart8250,mmio32,0x9000b000,115200n8 reboot=efi,warm apic=debug rw LABEL=boot debugshell=5" diff --git a/scripts/lib/wic/canned-wks/systemd-bootdisk-tiny32.wks b/scripts/lib/wic/canned-wks/systemd-bootdisk-tiny32.wks deleted file mode 100644 index c4011c0e..00000000 --- a/scripts/lib/wic/canned-wks/systemd-bootdisk-tiny32.wks +++ /dev/null @@ -1,8 +0,0 @@ -# short-description: Create an EFI disk image with systemd-boot and core2-32 -# long-description: Creates a partitioned EFI disk image that the user -# can directly dd to boot media. The selected bootloader is systemd-boot. -# This disk image is meant to be used by core2-32 and core-image-tiny-initramfs - -part /boot --source bootimg-efi --sourceparams="loader=systemd-boot,initrd=core-image-tiny-initramfs-intel-core2-32.cpio.gz" --ondisk sda --label msdos --active --align 1024 - -bootloader --ptable gpt --timeout=5 --append="init=/bin/busybox sh init console=ttyS0,115200 console=tty0 rw LABEL=boot debugshell=5" diff --git a/scripts/lib/wic/canned-wks/systemd-bootdisk-tiny64.wks b/scripts/lib/wic/canned-wks/systemd-bootdisk-tiny64.wks deleted file mode 100644 index c957572a..00000000 --- a/scripts/lib/wic/canned-wks/systemd-bootdisk-tiny64.wks +++ /dev/null @@ -1,14 +0,0 @@ -# short-description: Create an EFI disk image with systemd-boot and corei7-64 -# long-description: Creates a partitioned EFI disk image that the user -# can directly dd to boot media. The selected bootloader is systemd-boot. -# This disk image is meant to be used by corei7-64 and core-image-tiny-initramfs - -part /boot --source bootimg-efi --sourceparams="loader=systemd-boot,initrd=core-image-tiny-initramfs-intel-corei7-64.cpio.gz" --ondisk sda --label msdos --active --align 1024 - -bootloader --ptable gpt --timeout=5 --append="init=/bin/busybox sh init console=ttyS0,115200 console=tty0 rw LABEL=boot debugshell=5" - -# Some devices require different console parameters, the console parameter can be given repeatedly, input is taken -# only from the last listed console, for example on the Minnowboard MAX, the previously listed setting would show -# a login prompt on its video output and not on the serial terminal. -# -# See http://www.tldp.org/HOWTO/Remote-Serial-Console-HOWTO/configure-kernel.html diff --git a/wic/galileodisk-sd.wks b/wic/galileodisk-sd.wks new file mode 100644 index 00000000..225778d7 --- /dev/null +++ b/wic/galileodisk-sd.wks @@ -0,0 +1,9 @@ +# short-description: Create a Galileo Gen 1/2 disk image (SD card) +# long-description: Creates a partitioned EFI disk image for Intel Galileo Gen 1/2 +# boards that the user can directly dd to an SD card and boot. + +part /boot --source bootimg-efi --sourceparams="loader=systemd-boot" --ondisk mmcblk0 --label msdos --active --align 1024 + +part / --source rootfs --ondisk mmcblk0 --fstype=ext3 --label platform --align 1024 --use-uuid + +bootloader --timeout=1 --append="rootwait console=ttyS1,115200n8 earlycon=uart8250,mmio32,0x9000b000,115200n8 reboot=efi,warm apic=debug rw LABEL=boot debugshell=5" diff --git a/wic/galileodisk-usb.wks b/wic/galileodisk-usb.wks new file mode 100644 index 00000000..b561fa09 --- /dev/null +++ b/wic/galileodisk-usb.wks @@ -0,0 +1,9 @@ +# short-description: Create a Galileo Gen 1/2 disk image (USB storage) +# long-description: Creates a partitioned EFI disk image for Intel Galileo Gen 1/2 +# that the user can directly dd to USB storage media and boot. + +part /boot --source bootimg-efi --sourceparams="loader=systemd-boot" --ondisk sda --label msdos --active --align 1024 + +part / --source rootfs --ondisk sda --fstype=ext3 --label platform --align 1024 --use-uuid + +bootloader --timeout=1 --append="rootwait console=ttyS1,115200n8 earlycon=uart8250,mmio32,0x9000b000,115200n8 reboot=efi,warm apic=debug rw LABEL=boot debugshell=5" diff --git a/wic/generic-bootdisk.wks.in b/wic/generic-bootdisk.wks.in new file mode 100644 index 00000000..31c708bc --- /dev/null +++ b/wic/generic-bootdisk.wks.in @@ -0,0 +1,6 @@ +# based off of refkit's refkit-directdisk.wks.in kickstart template +# uses the image's boot directory to populate a vfat boot partition, +# which works with EFI. +bootloader --ptable gpt +part /boot --source rootfs --rootfs-dir=${IMAGE_ROOTFS}/boot --fstype=vfat --label msdos --active --align 1024 --use-uuid +part / --source rootfs --fstype=ext4 --label root --align 1024 --uuid ${DISK_SIGNATURE_UUID} diff --git a/wic/mktinygalileodisk.wks b/wic/mktinygalileodisk.wks new file mode 100644 index 00000000..52f1e12c --- /dev/null +++ b/wic/mktinygalileodisk.wks @@ -0,0 +1,7 @@ +# short-description: Create an Galileo Gen 1/2 disk image +# long-description: Creates a partitioned EFI disk image for Intel Galileo Gen 1/2, +# that the user can directly dd to boot media. + +part /boot --source bootimg-efi --sourceparams="loader=systemd-boot,initrd=core-image-tiny-initramfs-intel-quark.cpio.gz" --ondisk mmcblk0 --label msdos --active --align 1024 + +bootloader --timeout=0 --append="console=ttyS1,115200n8 earlycon=uart8250,mmio32,0x9000b000,115200n8 reboot=efi,warm apic=debug rw LABEL=boot debugshell=5" diff --git a/wic/systemd-bootdisk-tiny32.wks b/wic/systemd-bootdisk-tiny32.wks new file mode 100644 index 00000000..c4011c0e --- /dev/null +++ b/wic/systemd-bootdisk-tiny32.wks @@ -0,0 +1,8 @@ +# short-description: Create an EFI disk image with systemd-boot and core2-32 +# long-description: Creates a partitioned EFI disk image that the user +# can directly dd to boot media. The selected bootloader is systemd-boot. +# This disk image is meant to be used by core2-32 and core-image-tiny-initramfs + +part /boot --source bootimg-efi --sourceparams="loader=systemd-boot,initrd=core-image-tiny-initramfs-intel-core2-32.cpio.gz" --ondisk sda --label msdos --active --align 1024 + +bootloader --ptable gpt --timeout=5 --append="init=/bin/busybox sh init console=ttyS0,115200 console=tty0 rw LABEL=boot debugshell=5" diff --git a/wic/systemd-bootdisk-tiny64.wks b/wic/systemd-bootdisk-tiny64.wks new file mode 100644 index 00000000..c957572a --- /dev/null +++ b/wic/systemd-bootdisk-tiny64.wks @@ -0,0 +1,14 @@ +# short-description: Create an EFI disk image with systemd-boot and corei7-64 +# long-description: Creates a partitioned EFI disk image that the user +# can directly dd to boot media. The selected bootloader is systemd-boot. +# This disk image is meant to be used by corei7-64 and core-image-tiny-initramfs + +part /boot --source bootimg-efi --sourceparams="loader=systemd-boot,initrd=core-image-tiny-initramfs-intel-corei7-64.cpio.gz" --ondisk sda --label msdos --active --align 1024 + +bootloader --ptable gpt --timeout=5 --append="init=/bin/busybox sh init console=ttyS0,115200 console=tty0 rw LABEL=boot debugshell=5" + +# Some devices require different console parameters, the console parameter can be given repeatedly, input is taken +# only from the last listed console, for example on the Minnowboard MAX, the previously listed setting would show +# a login prompt on its video output and not on the serial terminal. +# +# See http://www.tldp.org/HOWTO/Remote-Serial-Console-HOWTO/configure-kernel.html -- cgit v1.2.3-54-g00ecf