diff options
author | Andrew Geissler <geissonator@yahoo.com> | 2020-04-13 21:39:40 +0300 |
---|---|---|
committer | Andrew Geissler <geissonator@yahoo.com> | 2020-05-05 16:30:44 +0300 |
commit | 82c905dc58a36aeae40b1b273a12f63fb1973cf4 (patch) | |
tree | 38caf00263451b5036435cdc36e035b25d32e623 /poky/meta-yocto-bsp/wic | |
parent | 83ecb75644b3d677c274188f9ac0b2374d6f6925 (diff) | |
download | openbmc-82c905dc58a36aeae40b1b273a12f63fb1973cf4.tar.xz |
meta-openembedded and poky: subtree updates
Squash of the following due to dependencies among them
and OpenBMC changes:
meta-openembedded: subtree update:d0748372d2..9201611135
meta-openembedded: subtree update:9201611135..17fd382f34
poky: subtree update:9052e5b32a..2e11d97b6c
poky: subtree update:2e11d97b6c..a8544811d7
The change log was too large for the jenkins plugin
to handle therefore it has been removed. Here is
the first and last commit of each subtree:
meta-openembedded:d0748372d2
cppzmq: bump to version 4.6.0
meta-openembedded:17fd382f34
mpv: Remove X11 dependency
poky:9052e5b32a
package_ipk: Remove pointless comment to trigger rebuild
poky:a8544811d7
pbzip2: Fix license warning
Change-Id: If0fc6c37629642ee207a4ca2f7aa501a2c673cd6
Signed-off-by: Andrew Geissler <geissonator@yahoo.com>
Diffstat (limited to 'poky/meta-yocto-bsp/wic')
-rw-r--r-- | poky/meta-yocto-bsp/wic/genericx86.wks.in (renamed from poky/meta-yocto-bsp/wic/genericx86.wks) | 2 | ||||
-rw-r--r-- | poky/meta-yocto-bsp/wic/mpc8315e-rdb.wks | 4 |
2 files changed, 1 insertions, 5 deletions
diff --git a/poky/meta-yocto-bsp/wic/genericx86.wks b/poky/meta-yocto-bsp/wic/genericx86.wks.in index dab719c58..7c09ad00a 100644 --- a/poky/meta-yocto-bsp/wic/genericx86.wks +++ b/poky/meta-yocto-bsp/wic/genericx86.wks.in @@ -1,6 +1,6 @@ # 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 /boot --source bootimg-efi --sourceparams="loader=${EFI_PROVIDER}" --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 diff --git a/poky/meta-yocto-bsp/wic/mpc8315e-rdb.wks b/poky/meta-yocto-bsp/wic/mpc8315e-rdb.wks deleted file mode 100644 index d0cb607ff..000000000 --- a/poky/meta-yocto-bsp/wic/mpc8315e-rdb.wks +++ /dev/null @@ -1,4 +0,0 @@ -# short-description: Create SD card image for MPC8315E-RDB -# long-description: Create a partitioned SD card image for Freescale MPC8315E-RDB reference hardware. -part /boot --source bootimg-partition --ondisk sdb --fstype=ext3 --label boot -part / --source rootfs --ondisk sdb --fstype=ext3 --label root |