* [PATCH 0/1 V2] EFI: Make installer EFI aware @ 2012-07-17 19:29 Darren Hart 2012-07-17 19:29 ` [PATCH 1/1] " Darren Hart 0 siblings, 1 reply; 7+ messages in thread From: Darren Hart @ 2012-07-17 19:29 UTC (permalink / raw) To: openembedded-core, Richard Purdie, Khem Raj, Tom Zanussi, Kishore Bodke, Saul Wold V2: Add missing initramfs-live-install-efi_1.0.bb file. The following changes since commit 2bd0aaf98c5d586638d82f5f22c1c24122a889a3: toolchain-scripts: Sync the SDK/ADT values to the build system (2012-07-17 18:02:10 +0100) are available in the git repository at: git://git.yoctoproject.org/user-contrib/dvhart/oe-core installer http://git.yoctoproject.org/cgit.cgi/user-contrib/dvhart/oe-core/log/?h=installer Darren Hart (1): EFI: Make installer EFI aware meta/classes/grub-efi.bbclass | 2 + .../images/core-image-minimal-initramfs.bb | 2 +- .../initrdscripts/files/init-install-efi.sh | 188 ++++++++++++++++++++ meta/recipes-core/initrdscripts/files/init-live.sh | 6 +- .../initramfs-live-install-efi_1.0.bb | 22 +++ 5 files changed, 216 insertions(+), 4 deletions(-) create mode 100644 meta/recipes-core/initrdscripts/files/init-install-efi.sh create mode 100644 meta/recipes-core/initrdscripts/initramfs-live-install-efi_1.0.bb -- 1.7.5.4 ^ permalink raw reply [flat|nested] 7+ messages in thread
* [PATCH 1/1] EFI: Make installer EFI aware 2012-07-17 19:29 [PATCH 0/1 V2] EFI: Make installer EFI aware Darren Hart @ 2012-07-17 19:29 ` Darren Hart 2012-07-17 19:40 ` Saul Wold 0 siblings, 1 reply; 7+ messages in thread From: Darren Hart @ 2012-07-17 19:29 UTC (permalink / raw) To: openembedded-core, Richard Purdie, Khem Raj, Tom Zanussi, Kishore Bodke, Saul Wold [YOCTO #1919] Create a basic EFI installer script modeled after the existing installer and add it to a new initramfs-live-install-efi recipe. Update the init-live.sh script to distinguish between LABEL=install and LABEL=install-efi and select the appropriate script. Add the efi installer to core-image-minimal-initramfs. Update grub-efi.bbclass to use "LABEL=install-efi" when it detects a label of "install". This is clearly not ideal, but a proper fix would involve decoupling the LABELS assignment from the image-live.bbclass usage of SYSLINUX_LABELS. We should be able to address that in a follow-on clean-up series. Signed-off-by: Darren Hart <dvhart@linux.intel.com> --- meta/classes/grub-efi.bbclass | 2 + .../images/core-image-minimal-initramfs.bb | 2 +- .../initrdscripts/files/init-install-efi.sh | 188 ++++++++++++++++++++ meta/recipes-core/initrdscripts/files/init-live.sh | 6 +- .../initramfs-live-install-efi_1.0.bb | 22 +++ 5 files changed, 216 insertions(+), 4 deletions(-) create mode 100644 meta/recipes-core/initrdscripts/files/init-install-efi.sh create mode 100644 meta/recipes-core/initrdscripts/initramfs-live-install-efi_1.0.bb diff --git a/meta/classes/grub-efi.bbclass b/meta/classes/grub-efi.bbclass index 1efb43b..147accc 100644 --- a/meta/classes/grub-efi.bbclass +++ b/meta/classes/grub-efi.bbclass @@ -99,6 +99,8 @@ python build_grub_cfg() { bb.data.update_data(localdata) cfgfile.write('\nmenuentry \'%s\'{\n' % (label)) + if label == "install": + label = "install-efi" cfgfile.write('linux /vmlinuz LABEL=%s' % (label)) append = localdata.getVar('APPEND', True) diff --git a/meta/recipes-core/images/core-image-minimal-initramfs.bb b/meta/recipes-core/images/core-image-minimal-initramfs.bb index 4aeb618..7f6826c 100644 --- a/meta/recipes-core/images/core-image-minimal-initramfs.bb +++ b/meta/recipes-core/images/core-image-minimal-initramfs.bb @@ -3,7 +3,7 @@ DESCRIPTION = "Small image capable of booting a device. The kernel includes \ the Minimal RAM-based Initial Root Filesystem (initramfs), which finds the \ first “init” program more efficiently." -IMAGE_INSTALL = "initramfs-live-boot initramfs-live-install busybox udev base-passwd" +IMAGE_INSTALL = "initramfs-live-boot initramfs-live-install initramfs-live-install-efi busybox udev base-passwd" # Do not pollute the initrd image with rootfs features IMAGE_FEATURES = "" diff --git a/meta/recipes-core/initrdscripts/files/init-install-efi.sh b/meta/recipes-core/initrdscripts/files/init-install-efi.sh new file mode 100644 index 0000000..c762f4b --- /dev/null +++ b/meta/recipes-core/initrdscripts/files/init-install-efi.sh @@ -0,0 +1,188 @@ +#!/bin/sh -e +# +# Copyright (c) 2012, Intel Corporation. +# All rights reserved. +# +# install.sh [device_name] [rootfs_name] [video_mode] [vga_mode] +# + +PATH=/sbin:/bin:/usr/sbin:/usr/bin + +# We need 20 Mb for the boot partition +boot_size=20 + +# 5% for the swap +swap_ratio=5 + +found="no" + +echo "Searching for a hard drive..." +for device in 'hda' 'hdb' 'sda' 'sdb' 'mmcblk0' 'mmcblk1' +do + if [ -e /sys/block/${device}/removable ]; then + if [ "$(cat /sys/block/${device}/removable)" = "0" ]; then + found="yes" + + while true; do + # Try sleeping here to avoid getting kernel messages + # obscuring/confusing user + sleep 5 + echo "Found drive at /dev/${device}. Do you want to install this image there ? [y/n]" + read answer + if [ "$answer" = "y" ] ; then + break + fi + + if [ "$answer" = "n" ] ; then + found=no + break + fi + + echo "Please answer y or n" + done + fi + fi + + if [ "$found" = "yes" ]; then + break; + fi + +done + +if [ "$found" = "no" ]; then + exit 1 +fi + +echo "Installing image on /dev/${device}" + +# +# The udev automounter can cause pain here, kill it +# +rm -f /etc/udev/scripts/mount* + +# +# Unmount anything the automounter had mounted +# +umount /dev/${device}* 2> /dev/null || /bin/true + +# We always build with devtmpfs, this is not necessary +#if [ ! -b /dev/sda ] ; then +# mknod /dev/sda b 8 0 +#fi +# +#if [ ! -b /dev/sdb ] ; then +# mknod /dev/sdb b 8 16 +#fi +# +#if [ ! -b /dev/loop0 ] ; then +# mknod /dev/loop0 b 7 0 +#fi + +mkdir -p /tmp +cat /proc/mounts > /etc/mtab + +disk_size=$(parted /dev/${device} unit mb print | grep Disk | cut -d" " -f 3 | sed -e "s/MB//") + +swap_size=$((disk_size*swap_ratio/100)) +rootfs_size=$((disk_size-boot_size-swap_size)) + +rootfs_start=$((boot_size)) +rootfs_end=$((rootfs_start+rootfs_size)) +swap_start=$((rootfs_end)) + +# MMC devices are special in a couple of ways +# 1) they use a partition prefix character 'p' +# 2) they are detected asynchronously (need rootwait) +rootwait="" +part_prefix="" +if [ ! "${device#mmcblk}" = "${device}" ]; then + part_prefix="p" + rootwait="rootwait" +fi +bootfs=/dev/${device}${part_prefix}1 +rootfs=/dev/${device}${part_prefix}2 +swap=/dev/${device}${part_prefix}3 + +echo "*****************" +echo "Boot partition size: $boot_size MB ($bootfs)" +echo "Rootfs partition size: $rootfs_size MB ($rootfs)" +echo "Swap partition size: $swap_size MB ($swap)" +echo "*****************" +echo "Deleting partition table on /dev/${device} ..." +dd if=/dev/zero of=/dev/${device} bs=512 count=2 + +echo "Creating new partition table on /dev/${device} ..." +parted /dev/${device} mklabel gpt + +echo "Creating boot partition on $bootfs" +parted /dev/${device} mkpart primary 0% $boot_size + +echo "Creating rootfs partition on $rootfs" +parted /dev/${device} mkpart primary $rootfs_start $rootfs_end + +echo "Creating swap partition on $swap" +parted /dev/${device} mkpart primary $swap_start 100% + +parted /dev/${device} print + +echo "Formatting $bootfs to vfat..." +mkfs.vfat $bootfs + +echo "Formatting $rootfs to ext3..." +mkfs.ext3 $rootfs + +echo "Formatting swap partition...($swap)" +mkswap $swap + +mkdir /ssd +mkdir /rootmnt +mkdir /bootmnt + +mount $rootfs /ssd +mount -o rw,loop,noatime,nodiratime /media/$1/$2 /rootmnt + +echo "Copying rootfs files..." +cp -a /rootmnt/* /ssd + +if [ -d /ssd/etc/ ] ; then + echo "$swap swap swap defaults 0 0" >> /ssd/etc/fstab + + # We dont want udev to mount our root device while we're booting... + if [ -d /ssd/etc/udev/ ] ; then + echo "/dev/${device}" >> /ssd/etc/udev/mount.blacklist + fi +fi + +umount /ssd +umount /rootmnt + +echo "Preparing boot partition..." +mount $bootfs /ssd + +EFIDIR="/ssd/EFI/BOOT" +mkdir -p $EFIDIR +GRUBCFG="$EFIDIR/grub.cfg" + +cp /media/$1/vmlinuz /ssd +# Copy the efi loader and config (booti*.efi and grub.cfg) +cp /media/$1/EFI/BOOT/* $EFIDIR + +# Update grub config for the installed image +# Delete the install entry +sed -i "/menuentry 'install'/,/^}/d" $GRUBCFG +# Delete the initrd lines +sed -i "/initrd /d" $GRUBCFG +# Delete any LABEL= strings +sed -i "s/ LABEL=[^ ]*/ /" $GRUBCFG +# Replace the ramdisk root with the install device and include other options +sed -i "s@ root=[^ ]*@ root=$rootfs rw $rootwait quiet@" $GRUBCFG + +umount /ssd +sync + +echo "Remove your installation media, and press ENTER" + +read enter + +echo "Rebooting..." +reboot -f diff --git a/meta/recipes-core/initrdscripts/files/init-live.sh b/meta/recipes-core/initrdscripts/files/init-live.sh index 737dae4..d02ed19 100644 --- a/meta/recipes-core/initrdscripts/files/init-live.sh +++ b/meta/recipes-core/initrdscripts/files/init-live.sh @@ -110,11 +110,11 @@ case $label in fi fi ;; - install) + install|install-efi) if [ -f /media/$i/$ISOLINUX/$ROOT_IMAGE ] ; then - ./install.sh $i/$ISOLINUX $ROOT_IMAGE $video_mode $vga_mode + ./$label.sh $i/$ISOLINUX $ROOT_IMAGE $video_mode $vga_mode else - fatal "Could not find install script" + fatal "Could not find $label script" fi # If we're getting here, we failed... diff --git a/meta/recipes-core/initrdscripts/initramfs-live-install-efi_1.0.bb b/meta/recipes-core/initrdscripts/initramfs-live-install-efi_1.0.bb new file mode 100644 index 0000000..6696d94 --- /dev/null +++ b/meta/recipes-core/initrdscripts/initramfs-live-install-efi_1.0.bb @@ -0,0 +1,22 @@ +DESCRIPTION = "A live image init script for grub-efi" +LICENSE = "MIT" +LIC_FILES_CHKSUM = "file://${COREBASE}/meta/COPYING.MIT;md5=3da9cfbcb788c80a0384361b4de20420" +SRC_URI = "file://init-install-efi.sh" + +PR = "r7" + +RDEPENDS_${PN} = "parted e2fsprogs-mke2fs dosfstools" + +do_install() { + install -m 0755 ${WORKDIR}/init-install-efi.sh ${D}/install-efi.sh +} + +# While this package maybe an allarch due to it being a +# simple script, reality is that it is Host specific based +# on the COMPATIBLE_HOST below, which needs to take precedence +#inherit allarch +INHIBIT_DEFAULT_DEPS = "1" + +FILES_${PN} = " /install-efi.sh " + +COMPATIBLE_HOST = "(i.86|x86_64).*-linux" -- 1.7.5.4 ^ permalink raw reply related [flat|nested] 7+ messages in thread
* Re: [PATCH 1/1] EFI: Make installer EFI aware 2012-07-17 19:29 ` [PATCH 1/1] " Darren Hart @ 2012-07-17 19:40 ` Saul Wold 2012-07-17 19:47 ` Darren Hart 0 siblings, 1 reply; 7+ messages in thread From: Saul Wold @ 2012-07-17 19:40 UTC (permalink / raw) To: Darren Hart; +Cc: openembedded-core On 07/17/2012 12:29 PM, Darren Hart wrote: > [YOCTO #1919] > > Create a basic EFI installer script modeled after the existing installer > and add it to a new initramfs-live-install-efi recipe. Update the > init-live.sh script to distinguish between LABEL=install and > LABEL=install-efi and select the appropriate script. Add the efi > installer to core-image-minimal-initramfs. > > Update grub-efi.bbclass to use "LABEL=install-efi" when it detects a > label of "install". This is clearly not ideal, but a proper fix would > involve decoupling the LABELS assignment from the image-live.bbclass > usage of SYSLINUX_LABELS. We should be able to address that in a > follow-on clean-up series. > > Signed-off-by: Darren Hart <dvhart@linux.intel.com> > --- > meta/classes/grub-efi.bbclass | 2 + > .../images/core-image-minimal-initramfs.bb | 2 +- > .../initrdscripts/files/init-install-efi.sh | 188 ++++++++++++++++++++ > meta/recipes-core/initrdscripts/files/init-live.sh | 6 +- > .../initramfs-live-install-efi_1.0.bb | 22 +++ > 5 files changed, 216 insertions(+), 4 deletions(-) > create mode 100644 meta/recipes-core/initrdscripts/files/init-install-efi.sh > create mode 100644 meta/recipes-core/initrdscripts/initramfs-live-install-efi_1.0.bb > > diff --git a/meta/classes/grub-efi.bbclass b/meta/classes/grub-efi.bbclass > index 1efb43b..147accc 100644 > --- a/meta/classes/grub-efi.bbclass > +++ b/meta/classes/grub-efi.bbclass > @@ -99,6 +99,8 @@ python build_grub_cfg() { > bb.data.update_data(localdata) > > cfgfile.write('\nmenuentry \'%s\'{\n' % (label)) > + if label == "install": > + label = "install-efi" > cfgfile.write('linux /vmlinuz LABEL=%s' % (label)) > > append = localdata.getVar('APPEND', True) > diff --git a/meta/recipes-core/images/core-image-minimal-initramfs.bb b/meta/recipes-core/images/core-image-minimal-initramfs.bb > index 4aeb618..7f6826c 100644 > --- a/meta/recipes-core/images/core-image-minimal-initramfs.bb > +++ b/meta/recipes-core/images/core-image-minimal-initramfs.bb > @@ -3,7 +3,7 @@ DESCRIPTION = "Small image capable of booting a device. The kernel includes \ > the Minimal RAM-based Initial Root Filesystem (initramfs), which finds the \ > first “init” program more efficiently." > > -IMAGE_INSTALL = "initramfs-live-boot initramfs-live-install busybox udev base-passwd" > +IMAGE_INSTALL = "initramfs-live-boot initramfs-live-install initramfs-live-install-efi busybox udev base-passwd" > > # Do not pollute the initrd image with rootfs features > IMAGE_FEATURES = "" Does this now need a PR bump also? > diff --git a/meta/recipes-core/initrdscripts/files/init-install-efi.sh b/meta/recipes-core/initrdscripts/files/init-install-efi.sh > new file mode 100644 > index 0000000..c762f4b > --- /dev/null > +++ b/meta/recipes-core/initrdscripts/files/init-install-efi.sh > @@ -0,0 +1,188 @@ > +#!/bin/sh -e > +# > +# Copyright (c) 2012, Intel Corporation. > +# All rights reserved. > +# > +# install.sh [device_name] [rootfs_name] [video_mode] [vga_mode] > +# > + > +PATH=/sbin:/bin:/usr/sbin:/usr/bin > + > +# We need 20 Mb for the boot partition > +boot_size=20 > + > +# 5% for the swap > +swap_ratio=5 > + > +found="no" > + > +echo "Searching for a hard drive..." > +for device in 'hda' 'hdb' 'sda' 'sdb' 'mmcblk0' 'mmcblk1' > +do > + if [ -e /sys/block/${device}/removable ]; then > + if [ "$(cat /sys/block/${device}/removable)" = "0" ]; then > + found="yes" > + > + while true; do > + # Try sleeping here to avoid getting kernel messages > + # obscuring/confusing user > + sleep 5 > + echo "Found drive at /dev/${device}. Do you want to install this image there ? [y/n]" > + read answer > + if [ "$answer" = "y" ] ; then > + break > + fi > + > + if [ "$answer" = "n" ] ; then > + found=no > + break > + fi > + > + echo "Please answer y or n" > + done > + fi > + fi > + > + if [ "$found" = "yes" ]; then > + break; > + fi > + > +done > + > +if [ "$found" = "no" ]; then > + exit 1 > +fi > + > +echo "Installing image on /dev/${device}" > + > +# > +# The udev automounter can cause pain here, kill it > +# > +rm -f /etc/udev/scripts/mount* > + > +# > +# Unmount anything the automounter had mounted > +# > +umount /dev/${device}* 2> /dev/null || /bin/true > + > +# We always build with devtmpfs, this is not necessary > +#if [ ! -b /dev/sda ] ; then > +# mknod /dev/sda b 8 0 > +#fi > +# > +#if [ ! -b /dev/sdb ] ; then > +# mknod /dev/sdb b 8 16 > +#fi > +# > +#if [ ! -b /dev/loop0 ] ; then > +# mknod /dev/loop0 b 7 0 > +#fi > + > +mkdir -p /tmp > +cat /proc/mounts > /etc/mtab > + > +disk_size=$(parted /dev/${device} unit mb print | grep Disk | cut -d" " -f 3 | sed -e "s/MB//") > + > +swap_size=$((disk_size*swap_ratio/100)) > +rootfs_size=$((disk_size-boot_size-swap_size)) > + > +rootfs_start=$((boot_size)) > +rootfs_end=$((rootfs_start+rootfs_size)) > +swap_start=$((rootfs_end)) > + > +# MMC devices are special in a couple of ways > +# 1) they use a partition prefix character 'p' > +# 2) they are detected asynchronously (need rootwait) > +rootwait="" > +part_prefix="" > +if [ ! "${device#mmcblk}" = "${device}" ]; then > + part_prefix="p" > + rootwait="rootwait" > +fi > +bootfs=/dev/${device}${part_prefix}1 > +rootfs=/dev/${device}${part_prefix}2 > +swap=/dev/${device}${part_prefix}3 > + > +echo "*****************" > +echo "Boot partition size: $boot_size MB ($bootfs)" > +echo "Rootfs partition size: $rootfs_size MB ($rootfs)" > +echo "Swap partition size: $swap_size MB ($swap)" > +echo "*****************" > +echo "Deleting partition table on /dev/${device} ..." > +dd if=/dev/zero of=/dev/${device} bs=512 count=2 > + > +echo "Creating new partition table on /dev/${device} ..." > +parted /dev/${device} mklabel gpt > + > +echo "Creating boot partition on $bootfs" > +parted /dev/${device} mkpart primary 0% $boot_size > + > +echo "Creating rootfs partition on $rootfs" > +parted /dev/${device} mkpart primary $rootfs_start $rootfs_end > + > +echo "Creating swap partition on $swap" > +parted /dev/${device} mkpart primary $swap_start 100% > + > +parted /dev/${device} print > + > +echo "Formatting $bootfs to vfat..." > +mkfs.vfat $bootfs > + > +echo "Formatting $rootfs to ext3..." > +mkfs.ext3 $rootfs > + > +echo "Formatting swap partition...($swap)" > +mkswap $swap > + > +mkdir /ssd > +mkdir /rootmnt > +mkdir /bootmnt > + > +mount $rootfs /ssd > +mount -o rw,loop,noatime,nodiratime /media/$1/$2 /rootmnt > + > +echo "Copying rootfs files..." > +cp -a /rootmnt/* /ssd > + > +if [ -d /ssd/etc/ ] ; then > + echo "$swap swap swap defaults 0 0" >> /ssd/etc/fstab > + > + # We dont want udev to mount our root device while we're booting... > + if [ -d /ssd/etc/udev/ ] ; then > + echo "/dev/${device}" >> /ssd/etc/udev/mount.blacklist > + fi > +fi > + > +umount /ssd > +umount /rootmnt > + > +echo "Preparing boot partition..." > +mount $bootfs /ssd > + > +EFIDIR="/ssd/EFI/BOOT" > +mkdir -p $EFIDIR > +GRUBCFG="$EFIDIR/grub.cfg" > + > +cp /media/$1/vmlinuz /ssd > +# Copy the efi loader and config (booti*.efi and grub.cfg) > +cp /media/$1/EFI/BOOT/* $EFIDIR > + > +# Update grub config for the installed image > +# Delete the install entry > +sed -i "/menuentry 'install'/,/^}/d" $GRUBCFG > +# Delete the initrd lines > +sed -i "/initrd /d" $GRUBCFG > +# Delete any LABEL= strings > +sed -i "s/ LABEL=[^ ]*/ /" $GRUBCFG > +# Replace the ramdisk root with the install device and include other options > +sed -i "s@ root=[^ ]*@ root=$rootfs rw $rootwait quiet@" $GRUBCFG > + > +umount /ssd > +sync > + > +echo "Remove your installation media, and press ENTER" > + > +read enter > + > +echo "Rebooting..." > +reboot -f > diff --git a/meta/recipes-core/initrdscripts/files/init-live.sh b/meta/recipes-core/initrdscripts/files/init-live.sh > index 737dae4..d02ed19 100644 > --- a/meta/recipes-core/initrdscripts/files/init-live.sh > +++ b/meta/recipes-core/initrdscripts/files/init-live.sh > @@ -110,11 +110,11 @@ case $label in > fi > fi > ;; > - install) > + install|install-efi) > if [ -f /media/$i/$ISOLINUX/$ROOT_IMAGE ] ; then > - ./install.sh $i/$ISOLINUX $ROOT_IMAGE $video_mode $vga_mode > + ./$label.sh $i/$ISOLINUX $ROOT_IMAGE $video_mode $vga_mode > else > - fatal "Could not find install script" > + fatal "Could not find $label script" > fi > > # If we're getting here, we failed... > diff --git a/meta/recipes-core/initrdscripts/initramfs-live-install-efi_1.0.bb b/meta/recipes-core/initrdscripts/initramfs-live-install-efi_1.0.bb > new file mode 100644 > index 0000000..6696d94 > --- /dev/null > +++ b/meta/recipes-core/initrdscripts/initramfs-live-install-efi_1.0.bb > @@ -0,0 +1,22 @@ > +DESCRIPTION = "A live image init script for grub-efi" > +LICENSE = "MIT" > +LIC_FILES_CHKSUM = "file://${COREBASE}/meta/COPYING.MIT;md5=3da9cfbcb788c80a0384361b4de20420" > +SRC_URI = "file://init-install-efi.sh" > + > +PR = "r7" > + Why PR = r7 for a new recipe, there should be no PR as it defaults to r0? Sau! > +RDEPENDS_${PN} = "parted e2fsprogs-mke2fs dosfstools" > + > +do_install() { > + install -m 0755 ${WORKDIR}/init-install-efi.sh ${D}/install-efi.sh > +} > + > +# While this package maybe an allarch due to it being a > +# simple script, reality is that it is Host specific based > +# on the COMPATIBLE_HOST below, which needs to take precedence > +#inherit allarch > +INHIBIT_DEFAULT_DEPS = "1" > + > +FILES_${PN} = " /install-efi.sh " > + > +COMPATIBLE_HOST = "(i.86|x86_64).*-linux" > ^ permalink raw reply [flat|nested] 7+ messages in thread
* Re: [PATCH 1/1] EFI: Make installer EFI aware 2012-07-17 19:40 ` Saul Wold @ 2012-07-17 19:47 ` Darren Hart 2012-07-19 16:15 ` Richard Purdie 0 siblings, 1 reply; 7+ messages in thread From: Darren Hart @ 2012-07-17 19:47 UTC (permalink / raw) To: Saul Wold; +Cc: openembedded-core On 07/17/2012 12:40 PM, Saul Wold wrote: > On 07/17/2012 12:29 PM, Darren Hart wrote: >> --- a/meta/recipes-core/images/core-image-minimal-initramfs.bb >> +++ b/meta/recipes-core/images/core-image-minimal-initramfs.bb >> @@ -3,7 +3,7 @@ DESCRIPTION = "Small image capable of booting a device. The kernel includes \ >> the Minimal RAM-based Initial Root Filesystem (initramfs), which finds the \ >> first “init” program more efficiently." >> >> -IMAGE_INSTALL = "initramfs-live-boot initramfs-live-install busybox udev base-passwd" >> +IMAGE_INSTALL = "initramfs-live-boot initramfs-live-install initramfs-live-install-efi busybox udev base-passwd" >> >> # Do not pollute the initrd image with rootfs features >> IMAGE_FEATURES = "" > > Does this now need a PR bump also? I didn't think so as this recipe is rebuilt for every image anyway. There is no PR in this recipe. >> diff --git a/meta/recipes-core/initrdscripts/initramfs-live-install-efi_1.0.bb b/meta/recipes-core/initrdscripts/initramfs-live-install-efi_1.0.bb >> new file mode 100644 >> index 0000000..6696d94 >> --- /dev/null >> +++ b/meta/recipes-core/initrdscripts/initramfs-live-install-efi_1.0.bb >> @@ -0,0 +1,22 @@ >> +DESCRIPTION = "A live image init script for grub-efi" >> +LICENSE = "MIT" >> +LIC_FILES_CHKSUM = "file://${COREBASE}/meta/COPYING.MIT;md5=3da9cfbcb788c80a0384361b4de20420" >> +SRC_URI = "file://init-install-efi.sh" >> + >> +PR = "r7" >> + > Why PR = r7 for a new recipe, there should be no PR as it defaults to r0? Good catch, just my forcing rebuilds during development, or perhaps a left-over copy from the initramfs-live-install_1.0.bb I based it on. Updated as r0 in the branch. Thanks, -- Darren Hart Intel Open Source Technology Center Yocto Project - Linux Kernel ^ permalink raw reply [flat|nested] 7+ messages in thread
* Re: [PATCH 1/1] EFI: Make installer EFI aware 2012-07-17 19:47 ` Darren Hart @ 2012-07-19 16:15 ` Richard Purdie 2012-07-19 16:27 ` Darren Hart 0 siblings, 1 reply; 7+ messages in thread From: Richard Purdie @ 2012-07-19 16:15 UTC (permalink / raw) To: Darren Hart; +Cc: openembedded-core On Tue, 2012-07-17 at 12:47 -0700, Darren Hart wrote: > > On 07/17/2012 12:40 PM, Saul Wold wrote: > > On 07/17/2012 12:29 PM, Darren Hart wrote: > > >> --- a/meta/recipes-core/images/core-image-minimal-initramfs.bb > >> +++ b/meta/recipes-core/images/core-image-minimal-initramfs.bb > >> @@ -3,7 +3,7 @@ DESCRIPTION = "Small image capable of booting a device. The kernel includes \ > >> the Minimal RAM-based Initial Root Filesystem (initramfs), which finds the \ > >> first “init” program more efficiently." > >> > >> -IMAGE_INSTALL = "initramfs-live-boot initramfs-live-install busybox udev base-passwd" > >> +IMAGE_INSTALL = "initramfs-live-boot initramfs-live-install initramfs-live-install-efi busybox udev base-passwd" > >> > >> # Do not pollute the initrd image with rootfs features > >> IMAGE_FEATURES = "" > > > > Does this now need a PR bump also? > > I didn't think so as this recipe is rebuilt for every image anyway. > There is no PR in this recipe. > > >> diff --git a/meta/recipes-core/initrdscripts/initramfs-live-install-efi_1.0.bb b/meta/recipes-core/initrdscripts/initramfs-live-install-efi_1.0.bb > >> new file mode 100644 > >> index 0000000..6696d94 > >> --- /dev/null > >> +++ b/meta/recipes-core/initrdscripts/initramfs-live-install-efi_1.0.bb > >> @@ -0,0 +1,22 @@ > >> +DESCRIPTION = "A live image init script for grub-efi" > >> +LICENSE = "MIT" > >> +LIC_FILES_CHKSUM = "file://${COREBASE}/meta/COPYING.MIT;md5=3da9cfbcb788c80a0384361b4de20420" > >> +SRC_URI = "file://init-install-efi.sh" > >> + > >> +PR = "r7" > >> + > > Why PR = r7 for a new recipe, there should be no PR as it defaults to r0? > > Good catch, just my forcing rebuilds during development, or perhaps a > left-over copy from the initramfs-live-install_1.0.bb I based it on. > Updated as r0 in the branch. Could I ask you to update this on top of Radu's fix please? Cheers, Richard ^ permalink raw reply [flat|nested] 7+ messages in thread
* Re: [PATCH 1/1] EFI: Make installer EFI aware 2012-07-19 16:15 ` Richard Purdie @ 2012-07-19 16:27 ` Darren Hart 2012-07-19 16:54 ` Richard Purdie 0 siblings, 1 reply; 7+ messages in thread From: Darren Hart @ 2012-07-19 16:27 UTC (permalink / raw) To: Richard Purdie; +Cc: openembedded-core On 07/19/2012 09:15 AM, Richard Purdie wrote: > On Tue, 2012-07-17 at 12:47 -0700, Darren Hart wrote: >> >> On 07/17/2012 12:40 PM, Saul Wold wrote: >>> On 07/17/2012 12:29 PM, Darren Hart wrote: >> >>>> --- a/meta/recipes-core/images/core-image-minimal-initramfs.bb >>>> +++ b/meta/recipes-core/images/core-image-minimal-initramfs.bb >>>> @@ -3,7 +3,7 @@ DESCRIPTION = "Small image capable of booting a device. The kernel includes \ >>>> the Minimal RAM-based Initial Root Filesystem (initramfs), which finds the \ >>>> first “init” program more efficiently." >>>> >>>> -IMAGE_INSTALL = "initramfs-live-boot initramfs-live-install busybox udev base-passwd" >>>> +IMAGE_INSTALL = "initramfs-live-boot initramfs-live-install initramfs-live-install-efi busybox udev base-passwd" >>>> >>>> # Do not pollute the initrd image with rootfs features >>>> IMAGE_FEATURES = "" >>> >>> Does this now need a PR bump also? >> >> I didn't think so as this recipe is rebuilt for every image anyway. >> There is no PR in this recipe. >> >>>> diff --git a/meta/recipes-core/initrdscripts/initramfs-live-install-efi_1.0.bb b/meta/recipes-core/initrdscripts/initramfs-live-install-efi_1.0.bb >>>> new file mode 100644 >>>> index 0000000..6696d94 >>>> --- /dev/null >>>> +++ b/meta/recipes-core/initrdscripts/initramfs-live-install-efi_1.0.bb >>>> @@ -0,0 +1,22 @@ >>>> +DESCRIPTION = "A live image init script for grub-efi" >>>> +LICENSE = "MIT" >>>> +LIC_FILES_CHKSUM = "file://${COREBASE}/meta/COPYING.MIT;md5=3da9cfbcb788c80a0384361b4de20420" >>>> +SRC_URI = "file://init-install-efi.sh" >>>> + >>>> +PR = "r7" >>>> + >>> Why PR = r7 for a new recipe, there should be no PR as it defaults to r0? >> >> Good catch, just my forcing rebuilds during development, or perhaps a >> left-over copy from the initramfs-live-install_1.0.bb I based it on. >> Updated as r0 in the branch. > > Could I ask you to update this on top of Radu's fix please? Will do. -- Darren Hart Intel Open Source Technology Center Yocto Project - Linux Kernel ^ permalink raw reply [flat|nested] 7+ messages in thread
* Re: [PATCH 1/1] EFI: Make installer EFI aware 2012-07-19 16:27 ` Darren Hart @ 2012-07-19 16:54 ` Richard Purdie 0 siblings, 0 replies; 7+ messages in thread From: Richard Purdie @ 2012-07-19 16:54 UTC (permalink / raw) To: Darren Hart; +Cc: openembedded-core On Thu, 2012-07-19 at 09:27 -0700, Darren Hart wrote: > > On 07/19/2012 09:15 AM, Richard Purdie wrote: > > On Tue, 2012-07-17 at 12:47 -0700, Darren Hart wrote: > >> > >> On 07/17/2012 12:40 PM, Saul Wold wrote: > >>> On 07/17/2012 12:29 PM, Darren Hart wrote: > >> > >>>> --- a/meta/recipes-core/images/core-image-minimal-initramfs.bb > >>>> +++ b/meta/recipes-core/images/core-image-minimal-initramfs.bb > >>>> @@ -3,7 +3,7 @@ DESCRIPTION = "Small image capable of booting a device. The kernel includes \ > >>>> the Minimal RAM-based Initial Root Filesystem (initramfs), which finds the \ > >>>> first “init” program more efficiently." > >>>> > >>>> -IMAGE_INSTALL = "initramfs-live-boot initramfs-live-install busybox udev base-passwd" > >>>> +IMAGE_INSTALL = "initramfs-live-boot initramfs-live-install initramfs-live-install-efi busybox udev base-passwd" > >>>> > >>>> # Do not pollute the initrd image with rootfs features > >>>> IMAGE_FEATURES = "" > >>> > >>> Does this now need a PR bump also? > >> > >> I didn't think so as this recipe is rebuilt for every image anyway. > >> There is no PR in this recipe. > >> > >>>> diff --git a/meta/recipes-core/initrdscripts/initramfs-live-install-efi_1.0.bb b/meta/recipes-core/initrdscripts/initramfs-live-install-efi_1.0.bb > >>>> new file mode 100644 > >>>> index 0000000..6696d94 > >>>> --- /dev/null > >>>> +++ b/meta/recipes-core/initrdscripts/initramfs-live-install-efi_1.0.bb > >>>> @@ -0,0 +1,22 @@ > >>>> +DESCRIPTION = "A live image init script for grub-efi" > >>>> +LICENSE = "MIT" > >>>> +LIC_FILES_CHKSUM = "file://${COREBASE}/meta/COPYING.MIT;md5=3da9cfbcb788c80a0384361b4de20420" > >>>> +SRC_URI = "file://init-install-efi.sh" > >>>> + > >>>> +PR = "r7" > >>>> + > >>> Why PR = r7 for a new recipe, there should be no PR as it defaults to r0? > >> > >> Good catch, just my forcing rebuilds during development, or perhaps a > >> left-over copy from the initramfs-live-install_1.0.bb I based it on. > >> Updated as r0 in the branch. > > > > Could I ask you to update this on top of Radu's fix please? > > Will do. Thanks, merged to master. Richard ^ permalink raw reply [flat|nested] 7+ messages in thread
end of thread, other threads:[~2012-07-19 17:06 UTC | newest] Thread overview: 7+ messages (download: mbox.gz follow: Atom feed -- links below jump to the message on this page -- 2012-07-17 19:29 [PATCH 0/1 V2] EFI: Make installer EFI aware Darren Hart 2012-07-17 19:29 ` [PATCH 1/1] " Darren Hart 2012-07-17 19:40 ` Saul Wold 2012-07-17 19:47 ` Darren Hart 2012-07-19 16:15 ` Richard Purdie 2012-07-19 16:27 ` Darren Hart 2012-07-19 16:54 ` Richard Purdie
This is a public inbox, see mirroring instructions for how to clone and mirror all data and code used for this inbox