From eb8dc40360f0cfef56fb6947cc817a547d6d9bc6 Mon Sep 17 00:00:00 2001 From: Dave Cobbley Date: Tue, 14 Aug 2018 10:05:37 -0700 Subject: [Subtree] Removing import-layers directory As part of the move to subtrees, need to bring all the import layers content to the top level. Change-Id: I4a163d10898cbc6e11c27f776f60e1a470049d8f Signed-off-by: Dave Cobbley Signed-off-by: Brad Bishop --- .../scripts/lib/wic/canned-wks/common.wks.inc | 3 --- .../canned-wks/directdisk-bootloader-config.cfg | 27 ---------------------- .../canned-wks/directdisk-bootloader-config.wks | 8 ------- .../scripts/lib/wic/canned-wks/directdisk-gpt.wks | 10 -------- .../lib/wic/canned-wks/directdisk-multi-rootfs.wks | 23 ------------------ .../scripts/lib/wic/canned-wks/directdisk.wks | 8 ------- .../scripts/lib/wic/canned-wks/efi-bootdisk.wks.in | 3 --- .../scripts/lib/wic/canned-wks/mkefidisk.wks | 11 --------- .../scripts/lib/wic/canned-wks/mkhybridiso.wks | 7 ------ .../lib/wic/canned-wks/qemux86-directdisk.wks | 8 ------- .../lib/wic/canned-wks/sdimage-bootpart.wks | 6 ----- .../lib/wic/canned-wks/systemd-bootdisk.wks | 11 --------- 12 files changed, 125 deletions(-) delete mode 100644 import-layers/yocto-poky/scripts/lib/wic/canned-wks/common.wks.inc delete mode 100644 import-layers/yocto-poky/scripts/lib/wic/canned-wks/directdisk-bootloader-config.cfg delete mode 100644 import-layers/yocto-poky/scripts/lib/wic/canned-wks/directdisk-bootloader-config.wks delete mode 100644 import-layers/yocto-poky/scripts/lib/wic/canned-wks/directdisk-gpt.wks delete mode 100644 import-layers/yocto-poky/scripts/lib/wic/canned-wks/directdisk-multi-rootfs.wks delete mode 100644 import-layers/yocto-poky/scripts/lib/wic/canned-wks/directdisk.wks delete mode 100644 import-layers/yocto-poky/scripts/lib/wic/canned-wks/efi-bootdisk.wks.in delete mode 100644 import-layers/yocto-poky/scripts/lib/wic/canned-wks/mkefidisk.wks delete mode 100644 import-layers/yocto-poky/scripts/lib/wic/canned-wks/mkhybridiso.wks delete mode 100644 import-layers/yocto-poky/scripts/lib/wic/canned-wks/qemux86-directdisk.wks delete mode 100644 import-layers/yocto-poky/scripts/lib/wic/canned-wks/sdimage-bootpart.wks delete mode 100644 import-layers/yocto-poky/scripts/lib/wic/canned-wks/systemd-bootdisk.wks (limited to 'import-layers/yocto-poky/scripts/lib/wic/canned-wks') diff --git a/import-layers/yocto-poky/scripts/lib/wic/canned-wks/common.wks.inc b/import-layers/yocto-poky/scripts/lib/wic/canned-wks/common.wks.inc deleted file mode 100644 index 89880b417..000000000 --- a/import-layers/yocto-poky/scripts/lib/wic/canned-wks/common.wks.inc +++ /dev/null @@ -1,3 +0,0 @@ -# This file is included into 3 canned wks files from this directory -part /boot --source bootimg-pcbios --ondisk sda --label boot --active --align 1024 -part / --source rootfs --use-uuid --fstype=ext4 --label platform --align 1024 diff --git a/import-layers/yocto-poky/scripts/lib/wic/canned-wks/directdisk-bootloader-config.cfg b/import-layers/yocto-poky/scripts/lib/wic/canned-wks/directdisk-bootloader-config.cfg deleted file mode 100644 index c58e74a85..000000000 --- a/import-layers/yocto-poky/scripts/lib/wic/canned-wks/directdisk-bootloader-config.cfg +++ /dev/null @@ -1,27 +0,0 @@ -# This is an example configuration file for syslinux. -TIMEOUT 50 -ALLOWOPTIONS 1 -SERIAL 0 115200 -PROMPT 0 - -UI vesamenu.c32 -menu title Select boot options -menu tabmsg Press [Tab] to edit, [Return] to select - -DEFAULT Graphics console boot - -LABEL Graphics console boot -KERNEL /vmlinuz -APPEND label=boot rootwait - -LABEL Serial console boot -KERNEL /vmlinuz -APPEND label=boot rootwait console=ttyS0,115200 - -LABEL Graphics console install -KERNEL /vmlinuz -APPEND label=install rootwait - -LABEL Serial console install -KERNEL /vmlinuz -APPEND label=install rootwait console=ttyS0,115200 diff --git a/import-layers/yocto-poky/scripts/lib/wic/canned-wks/directdisk-bootloader-config.wks b/import-layers/yocto-poky/scripts/lib/wic/canned-wks/directdisk-bootloader-config.wks deleted file mode 100644 index 3529e05c8..000000000 --- a/import-layers/yocto-poky/scripts/lib/wic/canned-wks/directdisk-bootloader-config.wks +++ /dev/null @@ -1,8 +0,0 @@ -# short-description: Create a 'pcbios' direct disk image with custom bootloader config -# long-description: Creates a partitioned legacy BIOS disk image that the user -# can directly dd to boot media. The bootloader configuration source is a user file. - -include common.wks.inc - -bootloader --configfile="directdisk-bootloader-config.cfg" - diff --git a/import-layers/yocto-poky/scripts/lib/wic/canned-wks/directdisk-gpt.wks b/import-layers/yocto-poky/scripts/lib/wic/canned-wks/directdisk-gpt.wks deleted file mode 100644 index 8d7d8de6e..000000000 --- a/import-layers/yocto-poky/scripts/lib/wic/canned-wks/directdisk-gpt.wks +++ /dev/null @@ -1,10 +0,0 @@ -# short-description: Create a 'pcbios' direct disk image -# long-description: Creates a partitioned legacy BIOS disk image that the user -# can directly dd to boot media. - - -part /boot --source bootimg-pcbios --ondisk sda --label boot --active --align 1024 -part / --source rootfs --ondisk sda --fstype=ext4 --label platform --align 1024 --use-uuid - -bootloader --ptable gpt --timeout=0 --append="rootwait rootfstype=ext4 video=vesafb vga=0x318 console=tty0 console=ttyS0,115200n8" - diff --git a/import-layers/yocto-poky/scripts/lib/wic/canned-wks/directdisk-multi-rootfs.wks b/import-layers/yocto-poky/scripts/lib/wic/canned-wks/directdisk-multi-rootfs.wks deleted file mode 100644 index f61d941d6..000000000 --- a/import-layers/yocto-poky/scripts/lib/wic/canned-wks/directdisk-multi-rootfs.wks +++ /dev/null @@ -1,23 +0,0 @@ -# short-description: Create multi rootfs image using rootfs plugin -# long-description: Creates a partitioned disk image with two rootfs partitions -# using rootfs plugin. -# -# Partitions can use either -# - indirect rootfs references to image recipe(s): -# wic create directdisk-multi-indirect-recipes -e core-image-minimal \ -# --rootfs-dir rootfs1=core-image-minimal -# --rootfs-dir rootfs2=core-image-minimal-dev -# -# - or paths to rootfs directories: -# wic create directdisk-multi-rootfs \ -# --rootfs-dir rootfs1=tmp/work/qemux86_64-poky-linux/core-image-minimal/1.0-r0/rootfs/ -# --rootfs-dir rootfs2=tmp/work/qemux86_64-poky-linux/core-image-minimal-dev/1.0-r0/rootfs/ -# -# - or any combinations of -r and --rootfs command line options - -part /boot --source bootimg-pcbios --ondisk sda --label boot --active --align 1024 -part / --source rootfs --rootfs-dir=rootfs1 --ondisk sda --fstype=ext4 --label platform --align 1024 -part /rescue --source rootfs --rootfs-dir=rootfs2 --ondisk sda --fstype=ext4 --label secondary --align 1024 - -bootloader --timeout=0 --append="rootwait rootfstype=ext4 video=vesafb vga=0x318 console=tty0 console=ttyS0,115200n8" - diff --git a/import-layers/yocto-poky/scripts/lib/wic/canned-wks/directdisk.wks b/import-layers/yocto-poky/scripts/lib/wic/canned-wks/directdisk.wks deleted file mode 100644 index 8c8e06b02..000000000 --- a/import-layers/yocto-poky/scripts/lib/wic/canned-wks/directdisk.wks +++ /dev/null @@ -1,8 +0,0 @@ -# short-description: Create a 'pcbios' direct disk image -# long-description: Creates a partitioned legacy BIOS disk image that the user -# can directly dd to boot media. - -include common.wks.inc - -bootloader --timeout=0 --append="rootwait rootfstype=ext4 video=vesafb vga=0x318 console=tty0 console=ttyS0,115200n8" - diff --git a/import-layers/yocto-poky/scripts/lib/wic/canned-wks/efi-bootdisk.wks.in b/import-layers/yocto-poky/scripts/lib/wic/canned-wks/efi-bootdisk.wks.in deleted file mode 100644 index 7300e65e3..000000000 --- a/import-layers/yocto-poky/scripts/lib/wic/canned-wks/efi-bootdisk.wks.in +++ /dev/null @@ -1,3 +0,0 @@ -bootloader --ptable gpt -part /boot --source rootfs --rootfs-dir=${IMAGE_ROOTFS}/boot --fstype=vfat --label boot --active --align 1024 --use-uuid --overhead-factor 1.0 -part / --source rootfs --fstype=ext4 --label root --align 1024 --exclude-path boot/ diff --git a/import-layers/yocto-poky/scripts/lib/wic/canned-wks/mkefidisk.wks b/import-layers/yocto-poky/scripts/lib/wic/canned-wks/mkefidisk.wks deleted file mode 100644 index 9f534fe18..000000000 --- a/import-layers/yocto-poky/scripts/lib/wic/canned-wks/mkefidisk.wks +++ /dev/null @@ -1,11 +0,0 @@ -# short-description: Create an EFI disk image -# long-description: Creates a partitioned EFI disk image that the user -# can directly dd to boot media. - -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" diff --git a/import-layers/yocto-poky/scripts/lib/wic/canned-wks/mkhybridiso.wks b/import-layers/yocto-poky/scripts/lib/wic/canned-wks/mkhybridiso.wks deleted file mode 100644 index 9d34e9b47..000000000 --- a/import-layers/yocto-poky/scripts/lib/wic/canned-wks/mkhybridiso.wks +++ /dev/null @@ -1,7 +0,0 @@ -# short-description: Create a hybrid ISO image -# long-description: Creates an EFI and legacy bootable hybrid ISO image -# which can be used on optical media as well as USB media. - -part /boot --source isoimage-isohybrid --sourceparams="loader=grub-efi,image_name=HYBRID_ISO_IMG" --ondisk cd --label HYBRIDISO --fstype=ext4 - -bootloader --timeout=15 --append="" diff --git a/import-layers/yocto-poky/scripts/lib/wic/canned-wks/qemux86-directdisk.wks b/import-layers/yocto-poky/scripts/lib/wic/canned-wks/qemux86-directdisk.wks deleted file mode 100644 index 1f8466af2..000000000 --- a/import-layers/yocto-poky/scripts/lib/wic/canned-wks/qemux86-directdisk.wks +++ /dev/null @@ -1,8 +0,0 @@ -# short-description: Create a qemu machine 'pcbios' direct disk image -# long-description: Creates a partitioned legacy BIOS disk image that the user -# can directly use to boot a qemu machine. - -include common.wks.inc - -bootloader --timeout=0 --append="vga=0 uvesafb.mode_option=640x480-32 rw mem=256M ip=192.168.7.2::192.168.7.1:255.255.255.0 oprofile.timer=1 rootfstype=ext4 " - diff --git a/import-layers/yocto-poky/scripts/lib/wic/canned-wks/sdimage-bootpart.wks b/import-layers/yocto-poky/scripts/lib/wic/canned-wks/sdimage-bootpart.wks deleted file mode 100644 index 7ffd632f4..000000000 --- a/import-layers/yocto-poky/scripts/lib/wic/canned-wks/sdimage-bootpart.wks +++ /dev/null @@ -1,6 +0,0 @@ -# short-description: Create SD card image with a boot partition -# long-description: Creates a partitioned SD card image. Boot files -# are located in the first vfat partition. - -part /boot --source bootimg-partition --ondisk mmcblk --fstype=vfat --label boot --active --align 4 --size 16 -part / --source rootfs --ondisk mmcblk --fstype=ext4 --label root --align 4 diff --git a/import-layers/yocto-poky/scripts/lib/wic/canned-wks/systemd-bootdisk.wks b/import-layers/yocto-poky/scripts/lib/wic/canned-wks/systemd-bootdisk.wks deleted file mode 100644 index 95d7b97a6..000000000 --- a/import-layers/yocto-poky/scripts/lib/wic/canned-wks/systemd-bootdisk.wks +++ /dev/null @@ -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 --use-uuid - -part / --source rootfs --ondisk sda --fstype=ext4 --label platform --align 1024 --use-uuid - -part swap --ondisk sda --size 44 --label swap1 --fstype=swap --use-uuid - -bootloader --ptable gpt --timeout=5 --append="rootwait rootfstype=ext4 console=ttyS0,115200 console=tty0" -- cgit v1.2.1