[PATCH 0/3] initramfs-framework installation improvements

[PATCH 0/3] initramfs-framework installation improvements

[California Sullivan]

initramfs-framework was improved last release to support live booting
and installation. Meta-intel adopted the initramfs-framework scripts
early, but unfortunately we missed that there was not yet a non-EFI
installation script, resulting in bug [YOCTO #12346].

The third patch address that issue, whereas the first two are just minor
improvements to the install-efi module.

California Sullivan (3):
  initramfs-module-install-efi: point to original copy and delete new
    file
  initramfs-module-install-efi: update summary
  initramfs-framework: add install module

 .../initramfs-framework/install-efi.sh             | 276 ---------------------
 .../initramfs-module-install-efi_1.0.bb            |   8 +-
 .../initrdscripts/initramfs-module-install_1.0.bb  |  20 ++
 3 files changed, 24 insertions(+), 280 deletions(-)
 delete mode 100644 meta/recipes-core/initrdscripts/initramfs-framework/install-efi.sh
 create mode 100644 meta/recipes-core/initrdscripts/initramfs-module-install_1.0.bb

-- 
2.9.5

[PATCH 1/3] initramfs-module-install-efi: point to original copy and delete new file

[California Sullivan]

There is no need to maintain two of the exact same files.

Signed-off-by: California Sullivan <california.l.sullivan@intel.com>
---
 .../initramfs-framework/install-efi.sh             | 276 ---------------------
 .../initramfs-module-install-efi_1.0.bb            |   6 +-
 2 files changed, 3 insertions(+), 279 deletions(-)
 delete mode 100644 meta/recipes-core/initrdscripts/initramfs-framework/install-efi.sh

diff --git a/meta/recipes-core/initrdscripts/initramfs-framework/install-efi.sh b/meta/recipes-core/initrdscripts/initramfs-framework/install-efi.sh
deleted file mode 100644
index 5ad3a60..0000000
--- a/meta/recipes-core/initrdscripts/initramfs-framework/install-efi.sh
+++ /dev/null
@@ -1,276 +0,0 @@
-#!/bin/sh -e
-#
-# Copyright (c) 2012, Intel Corporation.
-# All rights reserved.
-#
-# install.sh [device_name] [rootfs_name]
-#
-
-PATH=/sbin:/bin:/usr/sbin:/usr/bin
-
-# We need 20 Mb for the boot partition
-boot_size=20
-
-# 5% for swap
-swap_ratio=5
-
-# Get a list of hard drives
-hdnamelist=""
-live_dev_name=`cat /proc/mounts | grep ${1%/} | awk '{print $1}'`
-live_dev_name=${live_dev_name#\/dev/}
-# Only strip the digit identifier if the device is not an mmc
-case $live_dev_name in
-    mmcblk*)
-    ;;
-    nvme*)
-    ;;
-    *)
-        live_dev_name=${live_dev_name%%[0-9]*}
-    ;;
-esac
-
-echo "Searching for hard drives ..."
-
-# Some eMMC devices have special sub devices such as mmcblk0boot0 etc
-# we're currently only interested in the root device so pick them wisely
-devices=`ls /sys/block/ | grep -v mmcblk` || true
-mmc_devices=`ls /sys/block/ | grep "mmcblk[0-9]\{1,\}$"` || true
-devices="$devices $mmc_devices"
-
-for device in $devices; do
-    case $device in
-        loop*)
-            # skip loop device
-            ;;
-        sr*)
-            # skip CDROM device
-            ;;
-        ram*)
-            # skip ram device
-            ;;
-        *)
-            # skip the device LiveOS is on
-            # Add valid hard drive name to the list
-            case $device in
-                $live_dev_name*)
-                # skip the device we are running from
-                ;;
-                *)
-                    hdnamelist="$hdnamelist $device"
-                ;;
-            esac
-            ;;
-    esac
-done
-
-if [ -z "${hdnamelist}" ]; then
-    echo "You need another device (besides the live device /dev/${live_dev_name}) to install the image. Installation aborted."
-    exit 1
-fi
-
-TARGET_DEVICE_NAME=""
-for hdname in $hdnamelist; do
-    # Display found hard drives and their basic info
-    echo "-------------------------------"
-    echo /dev/$hdname
-    if [ -r /sys/block/$hdname/device/vendor ]; then
-        echo -n "VENDOR="
-        cat /sys/block/$hdname/device/vendor
-    fi
-    if [ -r /sys/block/$hdname/device/model ]; then
-        echo -n "MODEL="
-        cat /sys/block/$hdname/device/model
-    fi
-    if [ -r /sys/block/$hdname/device/uevent ]; then
-        echo -n "UEVENT="
-        cat /sys/block/$hdname/device/uevent
-    fi
-    echo
-done
-
-# Get user choice
-while true; do
-    echo "Please select an install target or press n to exit ($hdnamelist ): "
-    read answer
-    if [ "$answer" = "n" ]; then
-        echo "Installation manually aborted."
-        exit 1
-    fi
-    for hdname in $hdnamelist; do
-        if [ "$answer" = "$hdname" ]; then
-            TARGET_DEVICE_NAME=$answer
-            break
-        fi
-    done
-    if [ -n "$TARGET_DEVICE_NAME" ]; then
-        break
-    fi
-done
-
-if [ -n "$TARGET_DEVICE_NAME" ]; then
-    echo "Installing image on /dev/$TARGET_DEVICE_NAME ..."
-else
-    echo "No hard drive selected. Installation aborted."
-    exit 1
-fi
-
-device=/dev/$TARGET_DEVICE_NAME
-
-#
-# The udev automounter can cause pain here, kill it
-#
-rm -f /etc/udev/rules.d/automount.rules
-rm -f /etc/udev/scripts/mount*
-
-#
-# Unmount anything the automounter had mounted
-#
-umount ${device}* 2> /dev/null || /bin/true
-
-mkdir -p /tmp
-
-# Create /etc/mtab if not present
-if [ ! -e /etc/mtab ] && [ -e /proc/mounts ]; then
-    ln -sf /proc/mounts /etc/mtab
-fi
-
-disk_size=$(parted ${device} unit mb print | grep '^Disk .*: .*MB' | 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#/dev/mmcblk}" = "${device}" ] || \
-   [ ! "${device#/dev/nvme}" = "${device}" ]; then
-    part_prefix="p"
-    rootwait="rootwait"
-fi
-
-# USB devices also require rootwait
-if [ -n `readlink /dev/disk/by-id/usb* | grep $TARGET_DEVICE_NAME` ]; then
-    rootwait="rootwait"
-fi
-
-bootfs=${device}${part_prefix}1
-rootfs=${device}${part_prefix}2
-swap=${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 ${device} ..."
-dd if=/dev/zero of=${device} bs=512 count=35
-
-echo "Creating new partition table on ${device} ..."
-parted ${device} mklabel gpt
-
-echo "Creating boot partition on $bootfs"
-parted ${device} mkpart boot fat32 0% $boot_size
-parted ${device} set 1 boot on
-
-echo "Creating rootfs partition on $rootfs"
-parted ${device} mkpart root ext3 $rootfs_start $rootfs_end
-
-echo "Creating swap partition on $swap"
-parted ${device} mkpart swap linux-swap $swap_start 100%
-
-parted ${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 /tgt_root
-mkdir /src_root
-mkdir -p /boot
-
-# Handling of the target root partition
-mount $rootfs /tgt_root
-mount -o rw,loop,noatime,nodiratime /run/media/$1/$2 /src_root
-echo "Copying rootfs files..."
-cp -a /src_root/* /tgt_root
-if [ -d /tgt_root/etc/ ] ; then
-    boot_uuid=$(blkid -o value -s UUID ${bootfs})
-    swap_part_uuid=$(blkid -o value -s PARTUUID ${swap})
-    echo "/dev/disk/by-partuuid/$swap_part_uuid                swap             swap       defaults              0  0" >> /tgt_root/etc/fstab
-    echo "UUID=$boot_uuid              /boot            vfat       defaults              1  2" >> /tgt_root/etc/fstab
-    # We dont want udev to mount our root device while we're booting...
-    if [ -d /tgt_root/etc/udev/ ] ; then
-        echo "${device}" >> /tgt_root/etc/udev/mount.blacklist
-    fi
-fi
-
-umount /src_root
-
-# Handling of the target boot partition
-mount $bootfs /boot
-echo "Preparing boot partition..."
-
-EFIDIR="/boot/EFI/BOOT"
-mkdir -p $EFIDIR
-# Copy the efi loader
-cp /run/media/$1/EFI/BOOT/*.efi $EFIDIR
-
-if [ -f /run/media/$1/EFI/BOOT/grub.cfg ]; then
-    root_part_uuid=$(blkid -o value -s PARTUUID ${rootfs})
-    GRUBCFG="$EFIDIR/grub.cfg"
-    cp /run/media/$1/EFI/BOOT/grub.cfg $GRUBCFG
-    # 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
-    # Delete any root= strings
-    sed -i "s/ root=[^ ]*/ /g" $GRUBCFG
-    # Add the root= and other standard boot options
-    sed -i "s@linux /vmlinuz *@linux /vmlinuz root=PARTUUID=$root_part_uuid rw $rootwait quiet @" $GRUBCFG
-fi
-
-if [ -d /run/media/$1/loader ]; then
-    rootuuid=$(blkid -o value -s PARTUUID ${rootfs})
-    SYSTEMDBOOT_CFGS="/boot/loader/entries/*.conf"
-    # copy config files for systemd-boot
-    cp -dr /run/media/$1/loader /boot
-    # delete the install entry
-    rm -f /boot/loader/entries/install.conf
-    # delete the initrd lines
-    sed -i "/initrd /d" $SYSTEMDBOOT_CFGS
-    # delete any LABEL= strings
-    sed -i "s/ LABEL=[^ ]*/ /" $SYSTEMDBOOT_CFGS
-    # delete any root= strings
-    sed -i "s/ root=[^ ]*/ /" $SYSTEMDBOOT_CFGS
-    # add the root= and other standard boot options
-    sed -i "s@options *@options root=PARTUUID=$rootuuid rw $rootwait quiet @" $SYSTEMDBOOT_CFGS
-fi
-
-umount /tgt_root
-
-cp /run/media/$1/vmlinuz /boot
-
-umount /boot
-
-sync
-
-echo "Remove your installation media, and press ENTER"
-
-read enter
-
-echo "Rebooting..."
-reboot -f
diff --git a/meta/recipes-core/initrdscripts/initramfs-module-install-efi_1.0.bb b/meta/recipes-core/initrdscripts/initramfs-module-install-efi_1.0.bb
index 2270441..3d8c9e7 100644
--- a/meta/recipes-core/initrdscripts/initramfs-module-install-efi_1.0.bb
+++ b/meta/recipes-core/initrdscripts/initramfs-module-install-efi_1.0.bb
@@ -7,14 +7,14 @@ PR = "r4"
 
 inherit allarch
 
-FILESEXTRAPATHS_prepend := "${THISDIR}/initramfs-framework:"
-SRC_URI = "file://install-efi.sh"
+FILESEXTRAPATHS_prepend := "${THISDIR}/files:"
+SRC_URI = "file://init-install-efi.sh"
 
 S = "${WORKDIR}"
 
 do_install() {
     install -d ${D}/init.d
-    install -m 0755 ${WORKDIR}/install-efi.sh ${D}/init.d/install-efi.sh
+    install -m 0755 ${WORKDIR}/init-install-efi.sh ${D}/init.d/install-efi.sh
 }
 
 FILES_${PN} = "/init.d/install-efi.sh"
-- 
2.9.5

[PATCH 2/3] initramfs-module-install-efi: update summary

[California Sullivan]

Note that this is an installation option for EFI systems.

Signed-off-by: California Sullivan <california.l.sullivan@intel.com>
---
 meta/recipes-core/initrdscripts/initramfs-module-install-efi_1.0.bb | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/meta/recipes-core/initrdscripts/initramfs-module-install-efi_1.0.bb b/meta/recipes-core/initrdscripts/initramfs-module-install-efi_1.0.bb
index 3d8c9e7..24b53a8 100644
--- a/meta/recipes-core/initrdscripts/initramfs-module-install-efi_1.0.bb
+++ b/meta/recipes-core/initrdscripts/initramfs-module-install-efi_1.0.bb
@@ -1,4 +1,4 @@
-SUMMARY = "initramfs-framework module for installation option"
+SUMMARY = "initramfs-framework module for EFI installation option"
 LICENSE = "MIT"
 LIC_FILES_CHKSUM = "file://${COREBASE}/meta/COPYING.MIT;md5=3da9cfbcb788c80a0384361b4de20420"
 RDEPENDS_${PN} = "initramfs-framework-base parted e2fsprogs-mke2fs dosfstools util-linux-blkid"
-- 
2.9.5

[PATCH 3/3] initramfs-framework: add install module

[California Sullivan]

The non-EFI counterpart for installation was previously missing for
initramfs-framework. This simply puts the normal install script in the
correct location for initramfs-framework to make use of it.

Partial fix for [YOCTO #12346].

Signed-off-by: California Sullivan <california.l.sullivan@intel.com>
---
 .../initrdscripts/initramfs-module-install_1.0.bb    | 20 ++++++++++++++++++++
 1 file changed, 20 insertions(+)
 create mode 100644 meta/recipes-core/initrdscripts/initramfs-module-install_1.0.bb

diff --git a/meta/recipes-core/initrdscripts/initramfs-module-install_1.0.bb b/meta/recipes-core/initrdscripts/initramfs-module-install_1.0.bb
new file mode 100644
index 0000000..76f8fda
--- /dev/null
+++ b/meta/recipes-core/initrdscripts/initramfs-module-install_1.0.bb
@@ -0,0 +1,20 @@
+SUMMARY = "initramfs-framework module for installation option"
+LICENSE = "MIT"
+LIC_FILES_CHKSUM = "file://${COREBASE}/meta/COPYING.MIT;md5=3da9cfbcb788c80a0384361b4de20420"
+RDEPENDS_${PN} = "initramfs-framework-base grub parted e2fsprogs-mke2fs util-linux-blkid"
+
+PR = "r4"
+
+inherit allarch
+
+FILESEXTRAPATHS_prepend := "${THISDIR}/files:"
+SRC_URI = "file://init-install.sh"
+
+S = "${WORKDIR}"
+
+do_install() {
+    install -d ${D}/init.d
+    install -m 0755 ${WORKDIR}/init-install.sh ${D}/init.d/install.sh
+}
+
+FILES_${PN} = "/init.d/install.sh"
-- 
2.9.5

[PATCH 3/3 V2] initramfs-framework: add install module

[California Sullivan]

The non-EFI counterpart for installation was previously missing for
initramfs-framework. This simply puts the normal install script in the
correct location for initramfs-framework to make use of it.

Signed-off-by: California Sullivan <california.l.sullivan@intel.com>
---
V2 changes:
* Add the module's dependencies to SIGGEN_EXCLUDE_SAFE_RECIPE_DEPS, since
  its dependencies changing don't matter in regards building the package.
* PR = "r1" since its a new recipe.

 meta/conf/layer.conf                                 |  4 ++++
 .../initrdscripts/initramfs-module-install_1.0.bb    | 20 ++++++++++++++++++++
 2 files changed, 24 insertions(+)
 create mode 100644 meta/recipes-core/initrdscripts/initramfs-module-install_1.0.bb

diff --git a/meta/conf/layer.conf b/meta/conf/layer.conf
index 0342324..6782058 100644
--- a/meta/conf/layer.conf
+++ b/meta/conf/layer.conf
@@ -57,6 +57,10 @@ SIGGEN_EXCLUDE_SAFE_RECIPE_DEPS += " \
   initramfs-module-install-efi->e2fsprogs \
   initramfs-module-install-efi->parted \
   initramfs-module-install-efi->util-linux \
+  initramfs-module-install->e2fsprogs \
+  initramfs-module-install->grub \
+  initramfs-module-install->parted \
+  initramfs-module-install->util-linux \
   liberation-fonts->fontconfig \
   cantarell-fonts->fontconfig \
   gnome-icon-theme->librsvg \
diff --git a/meta/recipes-core/initrdscripts/initramfs-module-install_1.0.bb b/meta/recipes-core/initrdscripts/initramfs-module-install_1.0.bb
new file mode 100644
index 0000000..ce7f165
--- /dev/null
+++ b/meta/recipes-core/initrdscripts/initramfs-module-install_1.0.bb
@@ -0,0 +1,20 @@
+SUMMARY = "initramfs-framework module for installation option"
+LICENSE = "MIT"
+LIC_FILES_CHKSUM = "file://${COREBASE}/meta/COPYING.MIT;md5=3da9cfbcb788c80a0384361b4de20420"
+RDEPENDS_${PN} = "initramfs-framework-base grub parted e2fsprogs-mke2fs util-linux-blkid"
+
+PR = "r1"
+
+inherit allarch
+
+FILESEXTRAPATHS_prepend := "${THISDIR}/files:"
+SRC_URI = "file://init-install.sh"
+
+S = "${WORKDIR}"
+
+do_install() {
+    install -d ${D}/init.d
+    install -m 0755 ${WORKDIR}/init-install.sh ${D}/init.d/install.sh
+}
+
+FILES_${PN} = "/init.d/install.sh"
-- 
2.9.5

[PATCHi 3/3 V3] initramfs-framework: add install module

[California Sullivan]

The non-EFI counterpart for installation was previously missing for
initramfs-framework. This simply puts the normal install script in the
correct location for initramfs-framework to make use of it.

Partial fix for [YOCTO #12346].

Signed-off-by: California Sullivan <california.l.sullivan@intel.com>
---
V2 changes:
* Add the module's dependencies to SIGGEN_EXCLUDE_SAFE_RECIPE_DEPS, since
  its dependencies changing don't matter in regards building the package.
* PR = "r1" since its a new recipe.

V3 changes:
* Add back bug ID that I somehow dropped from commit message. Sorry for spam.

 meta/conf/layer.conf                                 |  4 ++++
 .../initrdscripts/initramfs-module-install_1.0.bb    | 20 ++++++++++++++++++++
 2 files changed, 24 insertions(+)
 create mode 100644 meta/recipes-core/initrdscripts/initramfs-module-install_1.0.bb

diff --git a/meta/conf/layer.conf b/meta/conf/layer.conf
index 0342324..6782058 100644
--- a/meta/conf/layer.conf
+++ b/meta/conf/layer.conf
@@ -57,6 +57,10 @@ SIGGEN_EXCLUDE_SAFE_RECIPE_DEPS += " \
   initramfs-module-install-efi->e2fsprogs \
   initramfs-module-install-efi->parted \
   initramfs-module-install-efi->util-linux \
+  initramfs-module-install->e2fsprogs \
+  initramfs-module-install->grub \
+  initramfs-module-install->parted \
+  initramfs-module-install->util-linux \
   liberation-fonts->fontconfig \
   cantarell-fonts->fontconfig \
   gnome-icon-theme->librsvg \
diff --git a/meta/recipes-core/initrdscripts/initramfs-module-install_1.0.bb b/meta/recipes-core/initrdscripts/initramfs-module-install_1.0.bb
new file mode 100644
index 0000000..ce7f165
--- /dev/null
+++ b/meta/recipes-core/initrdscripts/initramfs-module-install_1.0.bb
@@ -0,0 +1,20 @@
+SUMMARY = "initramfs-framework module for installation option"
+LICENSE = "MIT"
+LIC_FILES_CHKSUM = "file://${COREBASE}/meta/COPYING.MIT;md5=3da9cfbcb788c80a0384361b4de20420"
+RDEPENDS_${PN} = "initramfs-framework-base grub parted e2fsprogs-mke2fs util-linux-blkid"
+
+PR = "r1"
+
+inherit allarch
+
+FILESEXTRAPATHS_prepend := "${THISDIR}/files:"
+SRC_URI = "file://init-install.sh"
+
+S = "${WORKDIR}"
+
+do_install() {
+    install -d ${D}/init.d
+    install -m 0755 ${WORKDIR}/init-install.sh ${D}/init.d/install.sh
+}
+
+FILES_${PN} = "/init.d/install.sh"
-- 
2.9.5

Re: [PATCH 1/3] initramfs-module-install-efi: point to original copy and delete new file

[Otavio Salvador]

On Tue, Nov 14, 2017 at 7:20 PM, California Sullivan
<california.l.sullivan@intel.com> wrote:
> There is no need to maintain two of the exact same files.
>
> Signed-off-by: California Sullivan <california.l.sullivan@intel.com>

Acked-by: Otavio Salvador <otavio@ossystems.com.br>

Please also queue this for rocko backport. It seems a good fix.

-- 
Otavio Salvador                             O.S. Systems
http://www.ossystems.com.br        http://code.ossystems.com.br
Mobile: +55 (53) 9981-7854            Mobile: +1 (347) 903-9750

Re: [PATCH 2/3] initramfs-module-install-efi: update summary

[Otavio Salvador]

On Tue, Nov 14, 2017 at 7:20 PM, California Sullivan
<california.l.sullivan@intel.com> wrote:
> Note that this is an installation option for EFI systems.
>
> Signed-off-by: California Sullivan <california.l.sullivan@intel.com>


Acked-by: Otavio Salvador <otavio@ossystems.com.br>

Please also queue this for rocko backport. It seems a good fix.


-- 
Otavio Salvador                             O.S. Systems
http://www.ossystems.com.br        http://code.ossystems.com.br
Mobile: +55 (53) 9981-7854            Mobile: +1 (347) 903-9750

Re: [PATCHi 3/3 V3] initramfs-framework: add install module

[Otavio Salvador]

On Tue, Nov 14, 2017 at 8:10 PM, California Sullivan
<california.l.sullivan@intel.com> wrote:
> The non-EFI counterpart for installation was previously missing for
> initramfs-framework. This simply puts the normal install script in the
> correct location for initramfs-framework to make use of it.
>
> Partial fix for [YOCTO #12346].
>
> Signed-off-by: California Sullivan <california.l.sullivan@intel.com>
> ---
> V2 changes:
> * Add the module's dependencies to SIGGEN_EXCLUDE_SAFE_RECIPE_DEPS, since
>   its dependencies changing don't matter in regards building the package.
> * PR = "r1" since its a new recipe.
>
> V3 changes:
> * Add back bug ID that I somehow dropped from commit message. Sorry for spam.

Acked-by: Otavio Salvador <otavio@ossystems.com.br>

Please also queue this for rocko backport. It seems a good fix.

-- 
Otavio Salvador                             O.S. Systems
http://www.ossystems.com.br        http://code.ossystems.com.br
Mobile: +55 (53) 9981-7854            Mobile: +1 (347) 903-9750

Re: [PATCH 3/3 V2] initramfs-framework: add install module

[Martin Jansa]

[-- Attachment #1: Type: text/plain, Size: 3567 bytes --]

Why does it inherit allarch when it depends on TUNE_PKGARCH grub and other
packages?

Also it should repect the restrictions which are in grub recipe:

COMPATIBLE_HOST = '(x86_64.*|i.86.*|arm.*|aarch64.*)-(linux.*|freebsd.*)'
COMPATIBLE_HOST_armv7a = 'null'
COMPATIBLE_HOST_armv7ve = 'null'

because without it it adds new ERROR to "bitbake world":
ERROR: Nothing RPROVIDES 'grub' (but
oe-core/meta/recipes-core/initrdscripts/initramfs-module-install_1.0.bb
RDEPENDS on or otherwise requires it)
grub was skipped: incompatible with host arm-oe-linux-gnueabi (not in
COMPATIBLE_HOST)
grub was skipped: incompatible with host arm-oe-linux-gnueabi (not in
COMPATIBLE_HOST)
NOTE: Runtime target 'grub' is unbuildable, removing...
Missing or unbuildable dependency chain was: ['grub']
ERROR: Required build target 'meta-world-pkgdata' has no buildable
providers.

On Tue, Nov 14, 2017 at 11:03 PM, California Sullivan <
california.l.sullivan@intel.com> wrote:

> The non-EFI counterpart for installation was previously missing for
> initramfs-framework. This simply puts the normal install script in the
> correct location for initramfs-framework to make use of it.
>
> Signed-off-by: California Sullivan <california.l.sullivan@intel.com>
> ---
> V2 changes:
> * Add the module's dependencies to SIGGEN_EXCLUDE_SAFE_RECIPE_DEPS, since
>   its dependencies changing don't matter in regards building the package.
> * PR = "r1" since its a new recipe.
>
>  meta/conf/layer.conf                                 |  4 ++++
>  .../initrdscripts/initramfs-module-install_1.0.bb    | 20
> ++++++++++++++++++++
>  2 files changed, 24 insertions(+)
>  create mode 100644 meta/recipes-core/initrdscripts/initramfs-
> module-install_1.0.bb
>
> diff --git a/meta/conf/layer.conf b/meta/conf/layer.conf
> index 0342324..6782058 100644
> --- a/meta/conf/layer.conf
> +++ b/meta/conf/layer.conf
> @@ -57,6 +57,10 @@ SIGGEN_EXCLUDE_SAFE_RECIPE_DEPS += " \
>    initramfs-module-install-efi->e2fsprogs \
>    initramfs-module-install-efi->parted \
>    initramfs-module-install-efi->util-linux \
> +  initramfs-module-install->e2fsprogs \
> +  initramfs-module-install->grub \
> +  initramfs-module-install->parted \
> +  initramfs-module-install->util-linux \
>    liberation-fonts->fontconfig \
>    cantarell-fonts->fontconfig \
>    gnome-icon-theme->librsvg \
> diff --git a/meta/recipes-core/initrdscripts/initramfs-
> module-install_1.0.bb b/meta/recipes-core/initrdscripts/initramfs-
> module-install_1.0.bb
> new file mode 100644
> index 0000000..ce7f165
> --- /dev/null
> +++ b/meta/recipes-core/initrdscripts/initramfs-module-install_1.0.bb
> @@ -0,0 +1,20 @@
> +SUMMARY = "initramfs-framework module for installation option"
> +LICENSE = "MIT"
> +LIC_FILES_CHKSUM = "file://${COREBASE}/meta/COPYING.MIT;md5=
> 3da9cfbcb788c80a0384361b4de20420"
> +RDEPENDS_${PN} = "initramfs-framework-base grub parted e2fsprogs-mke2fs
> util-linux-blkid"
> +
> +PR = "r1"
> +
> +inherit allarch
> +
> +FILESEXTRAPATHS_prepend := "${THISDIR}/files:"
> +SRC_URI = "file://init-install.sh"
> +
> +S = "${WORKDIR}"
> +
> +do_install() {
> +    install -d ${D}/init.d
> +    install -m 0755 ${WORKDIR}/init-install.sh ${D}/init.d/install.sh
> +}
> +
> +FILES_${PN} = "/init.d/install.sh"
> --
> 2.9.5
>
> --
> _______________________________________________
> Openembedded-core mailing list
> Openembedded-core@lists.openembedded.org
> http://lists.openembedded.org/mailman/listinfo/openembedded-core
>

[-- Attachment #2: Type: text/html, Size: 5361 bytes --]

[PATCH] initramfs-module-install: Remove allarch and FILESEXTRAPATHS

[Martin Jansa]

* files is already included in default FILESPATH
* it cannot inherit allarch as it RDEPENDS on bunch of TUNE_PKGARCH packages
* use the same COMPATIBLE_HOST restrictions as grub has to prevent ERRORs in
  bitbake world
  ERROR: Nothing RPROVIDES 'grub' (but oe-core/meta/recipes-core/initrdscripts/initramfs-module-install_1.0.bb RDEPENDS on or otherwise requires it)
  grub was skipped: incompatible with host arm-oe-linux-gnueabi (not in COMPATIBLE_HOST)
  grub was skipped: incompatible with host arm-oe-linux-gnueabi (not in COMPATIBLE_HOST)
  NOTE: Runtime target 'grub' is unbuildable, removing...
  Missing or unbuildable dependency chain was: ['grub']
  ERROR: Required build target 'meta-world-pkgdata' has no buildable providers.

Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
---
 .../initrdscripts/initramfs-module-install-efi_1.0.bb             | 3 ---
 meta/recipes-core/initrdscripts/initramfs-module-install_1.0.bb   | 8 +++++---
 2 files changed, 5 insertions(+), 6 deletions(-)

diff --git a/meta/recipes-core/initrdscripts/initramfs-module-install-efi_1.0.bb b/meta/recipes-core/initrdscripts/initramfs-module-install-efi_1.0.bb
index 24b53a8..1e7f76f 100644
--- a/meta/recipes-core/initrdscripts/initramfs-module-install-efi_1.0.bb
+++ b/meta/recipes-core/initrdscripts/initramfs-module-install-efi_1.0.bb
@@ -5,9 +5,6 @@ RDEPENDS_${PN} = "initramfs-framework-base parted e2fsprogs-mke2fs dosfstools ut
 
 PR = "r4"
 
-inherit allarch
-
-FILESEXTRAPATHS_prepend := "${THISDIR}/files:"
 SRC_URI = "file://init-install-efi.sh"
 
 S = "${WORKDIR}"
diff --git a/meta/recipes-core/initrdscripts/initramfs-module-install_1.0.bb b/meta/recipes-core/initrdscripts/initramfs-module-install_1.0.bb
index ce7f165..02b69f3 100644
--- a/meta/recipes-core/initrdscripts/initramfs-module-install_1.0.bb
+++ b/meta/recipes-core/initrdscripts/initramfs-module-install_1.0.bb
@@ -3,11 +3,13 @@ LICENSE = "MIT"
 LIC_FILES_CHKSUM = "file://${COREBASE}/meta/COPYING.MIT;md5=3da9cfbcb788c80a0384361b4de20420"
 RDEPENDS_${PN} = "initramfs-framework-base grub parted e2fsprogs-mke2fs util-linux-blkid"
 
-PR = "r1"
+# The same restriction as grub
+COMPATIBLE_HOST = '(x86_64.*|i.86.*|arm.*|aarch64.*)-(linux.*|freebsd.*)'
+COMPATIBLE_HOST_armv7a = 'null'
+COMPATIBLE_HOST_armv7ve = 'null'
 
-inherit allarch
+PR = "r1"
 
-FILESEXTRAPATHS_prepend := "${THISDIR}/files:"
 SRC_URI = "file://init-install.sh"
 
 S = "${WORKDIR}"
-- 
2.7.4

✗ patchtest: failure for initramfs-framework installation improvements (rev4)

[Patchwork]

== Series Details ==

Series: initramfs-framework installation improvements (rev4)
Revision: 4
URL   : https://patchwork.openembedded.org/series/9783/
State : failure

== Summary ==


Thank you for submitting this patch series to OpenEmbedded Core. This is
an automated response. Several tests have been executed on the proposed
series by patchtest resulting in the following failures:



* Issue             Series does not apply on top of target branch [test_series_merge_on_head] 
  Suggested fix    Rebase your series on top of targeted branch
  Targeted branch  master (currently at addf309165)



If you believe any of these test results are incorrect, please reply to the
mailing list (openembedded-core@lists.openembedded.org) raising your concerns.
Otherwise we would appreciate you correcting the issues and submitting a new
version of the patchset if applicable. Please ensure you add/increment the
version number when sending the new version (i.e. [PATCH] -> [PATCH v2] ->
[PATCH v3] -> ...).

---
Guidelines:     https://www.openembedded.org/wiki/Commit_Patch_Message_Guidelines
Test framework: http://git.yoctoproject.org/cgit/cgit.cgi/patchtest
Test suite:     http://git.yoctoproject.org/cgit/cgit.cgi/patchtest-oe

Re: [PATCH 3/3 V2] initramfs-framework: add install module

[Cal Sullivan]

[-- Attachment #1: Type: text/plain, Size: 4699 bytes --]

My bad. I was using initramfs-module-install-efi as a template when I 
shouldn't have.

I see you already sent a patch addressing the issue. Looks good, and 
thanks for that.

---
Cal

On 12/01/2017 01:01 PM, Martin Jansa wrote:
> Why does it inherit allarch when it depends on TUNE_PKGARCH grub and 
> other packages?
>
> Also it should repect the restrictions which are in grub recipe:
>
> COMPATIBLE_HOST = '(x86_64.*|i.86.*|arm.*|aarch64.*)-(linux.*|freebsd.*)'
> COMPATIBLE_HOST_armv7a = 'null'
> COMPATIBLE_HOST_armv7ve = 'null'
>
> because without it it adds new ERROR to "bitbake world":
> ERROR: Nothing RPROVIDES 'grub' (but 
> oe-core/meta/recipes-core/initrdscripts/initramfs-module-install_1.0.bb 
> <http://initramfs-module-install_1.0.bb> RDEPENDS on or otherwise 
> requires it)
> grub was skipped: incompatible with host arm-oe-linux-gnueabi (not in 
> COMPATIBLE_HOST)
> grub was skipped: incompatible with host arm-oe-linux-gnueabi (not in 
> COMPATIBLE_HOST)
> NOTE: Runtime target 'grub' is unbuildable, removing...
> Missing or unbuildable dependency chain was: ['grub']
> ERROR: Required build target 'meta-world-pkgdata' has no buildable 
> providers.
>
> On Tue, Nov 14, 2017 at 11:03 PM, California Sullivan 
> <california.l.sullivan@intel.com 
> <mailto:california.l.sullivan@intel.com>> wrote:
>
>     The non-EFI counterpart for installation was previously missing for
>     initramfs-framework. This simply puts the normal install script in the
>     correct location for initramfs-framework to make use of it.
>
>     Signed-off-by: California Sullivan
>     <california.l.sullivan@intel.com
>     <mailto:california.l.sullivan@intel.com>>
>     ---
>     V2 changes:
>     * Add the module's dependencies to
>     SIGGEN_EXCLUDE_SAFE_RECIPE_DEPS, since
>       its dependencies changing don't matter in regards building the
>     package.
>     * PR = "r1" since its a new recipe.
>
>      meta/conf/layer.conf                                 |  4 ++++
>      .../initrdscripts/initramfs-module-install_1.0.bb
>     <http://initramfs-module-install_1.0.bb>   | 20 ++++++++++++++++++++
>      2 files changed, 24 insertions(+)
>      create mode 100644
>     meta/recipes-core/initrdscripts/initramfs-module-install_1.0.bb
>     <http://initramfs-module-install_1.0.bb>
>
>     diff --git a/meta/conf/layer.conf b/meta/conf/layer.conf
>     index 0342324..6782058 100644
>     --- a/meta/conf/layer.conf
>     +++ b/meta/conf/layer.conf
>     @@ -57,6 +57,10 @@ SIGGEN_EXCLUDE_SAFE_RECIPE_DEPS += " \
>        initramfs-module-install-efi->e2fsprogs \
>        initramfs-module-install-efi->parted \
>        initramfs-module-install-efi->util-linux \
>     +  initramfs-module-install->e2fsprogs \
>     +  initramfs-module-install->grub \
>     +  initramfs-module-install->parted \
>     +  initramfs-module-install->util-linux \
>        liberation-fonts->fontconfig \
>        cantarell-fonts->fontconfig \
>        gnome-icon-theme->librsvg \
>     diff --git
>     a/meta/recipes-core/initrdscripts/initramfs-module-install_1.0.bb
>     <http://initramfs-module-install_1.0.bb>
>     b/meta/recipes-core/initrdscripts/initramfs-module-install_1.0.bb
>     <http://initramfs-module-install_1.0.bb>
>     new file mode 100644
>     index 0000000..ce7f165
>     --- /dev/null
>     +++
>     b/meta/recipes-core/initrdscripts/initramfs-module-install_1.0.bb
>     <http://initramfs-module-install_1.0.bb>
>     @@ -0,0 +1,20 @@
>     +SUMMARY = "initramfs-framework module for installation option"
>     +LICENSE = "MIT"
>     +LIC_FILES_CHKSUM =
>     "file://${COREBASE}/meta/COPYING.MIT;md5=3da9cfbcb788c80a0384361b4de20420"
>     +RDEPENDS_${PN} = "initramfs-framework-base grub parted
>     e2fsprogs-mke2fs util-linux-blkid"
>     +
>     +PR = "r1"
>     +
>     +inherit allarch
>     +
>     +FILESEXTRAPATHS_prepend := "${THISDIR}/files:"
>     +SRC_URI = "file://init-install.sh"
>     +
>     +S = "${WORKDIR}"
>     +
>     +do_install() {
>     +    install -d ${D}/init.d
>     +    install -m 0755 ${WORKDIR}/init-install.sh ${D}/init.d/install.sh
>     +}
>     +
>     +FILES_${PN} = "/init.d/install.sh"
>     --
>     2.9.5
>
>     --
>     _______________________________________________
>     Openembedded-core mailing list
>     Openembedded-core@lists.openembedded.org
>     <mailto:Openembedded-core@lists.openembedded.org>
>     http://lists.openembedded.org/mailman/listinfo/openembedded-core
>     <http://lists.openembedded.org/mailman/listinfo/openembedded-core>
>
>


[-- Attachment #2: Type: text/html, Size: 8195 bytes --]

Re: ✗ patchtest: failure for initramfs-framework installation improvements (rev4)

[Martin Jansa]

[-- Attachment #1: Type: text/plain, Size: 1711 bytes --]

Is it trying to apply whole series (including the 2 patches which were
already merged to master and actually introduced the issue I was trying to
fix)?

Does it mean that I cannot send a fix into the e-mail thread where the
issue was introduced and discussed?

Regards,

On Fri, Dec 1, 2017 at 11:02 PM, Patchwork <
patchwork@patchwork.openembedded.org> wrote:

> == Series Details ==
>
> Series: initramfs-framework installation improvements (rev4)
> Revision: 4
> URL   : https://patchwork.openembedded.org/series/9783/
> State : failure
>
> == Summary ==
>
>
> Thank you for submitting this patch series to OpenEmbedded Core. This is
> an automated response. Several tests have been executed on the proposed
> series by patchtest resulting in the following failures:
>
>
>
> * Issue             Series does not apply on top of target branch
> [test_series_merge_on_head]
>   Suggested fix    Rebase your series on top of targeted branch
>   Targeted branch  master (currently at addf309165)
>
>
>
> If you believe any of these test results are incorrect, please reply to the
> mailing list (openembedded-core@lists.openembedded.org) raising your
> concerns.
> Otherwise we would appreciate you correcting the issues and submitting a
> new
> version of the patchset if applicable. Please ensure you add/increment the
> version number when sending the new version (i.e. [PATCH] -> [PATCH v2] ->
> [PATCH v3] -> ...).
>
> ---
> Guidelines:     https://www.openembedded.org/wiki/Commit_Patch_Message_
> Guidelines
> Test framework: http://git.yoctoproject.org/cgit/cgit.cgi/patchtest
> Test suite:     http://git.yoctoproject.org/cgit/cgit.cgi/patchtest-oe
>
>

[-- Attachment #2: Type: text/html, Size: 2651 bytes --]

Re: ✗ patchtest: failure for initramfs-framework installation improvements (rev4)

[Leonardo Sandoval]

On Fri, 1 Dec 2017 23:07:48 +0100
Martin Jansa <martin.jansa@gmail.com> wrote:

> Is it trying to apply whole series (including the 2 patches which were
> already merged to master and actually introduced the issue I was trying to
> fix)?
> 
> Does it mean that I cannot send a fix into the e-mail thread where the
> issue was introduced and discussed?

I do not the answer but I can tell you about the fail check: patchtest is pretty dummy in this check, it simply does git apply --check <your series.mbox> so you need to base on master's HEAD.


> 
> Regards,
> 
> On Fri, Dec 1, 2017 at 11:02 PM, Patchwork <
> patchwork@patchwork.openembedded.org> wrote:  
> 
> > == Series Details ==
> >
> > Series: initramfs-framework installation improvements (rev4)
> > Revision: 4
> > URL   : https://patchwork.openembedded.org/series/9783/
> > State : failure
> >
> > == Summary ==
> >
> >
> > Thank you for submitting this patch series to OpenEmbedded Core. This is
> > an automated response. Several tests have been executed on the proposed
> > series by patchtest resulting in the following failures:
> >
> >
> >
> > * Issue             Series does not apply on top of target branch
> > [test_series_merge_on_head]
> >   Suggested fix    Rebase your series on top of targeted branch
> >   Targeted branch  master (currently at addf309165)
> >
> >
> >
> > If you believe any of these test results are incorrect, please reply to the
> > mailing list (openembedded-core@lists.openembedded.org) raising your
> > concerns.
> > Otherwise we would appreciate you correcting the issues and submitting a
> > new
> > version of the patchset if applicable. Please ensure you add/increment the
> > version number when sending the new version (i.e. [PATCH] -> [PATCH v2] ->
> > [PATCH v3] -> ...).
> >
> > ---
> > Guidelines:     https://www.openembedded.org/wiki/Commit_Patch_Message_
> > Guidelines
> > Test framework: http://git.yoctoproject.org/cgit/cgit.cgi/patchtest
> > Test suite:     http://git.yoctoproject.org/cgit/cgit.cgi/patchtest-oe
> >
> >  

Re: ✗ patchtest: failure for initramfs-framework installation improvements (rev4)

[Martin Jansa]

[-- Attachment #1: Type: text/plain, Size: 3079 bytes --]

On Mon, Dec 04, 2017 at 09:23:59AM -0600, Leonardo Sandoval wrote:
> On Fri, 1 Dec 2017 23:07:48 +0100
> Martin Jansa <martin.jansa@gmail.com> wrote:
> 
> > Is it trying to apply whole series (including the 2 patches which were
> > already merged to master and actually introduced the issue I was trying to
> > fix)?
> > 
> > Does it mean that I cannot send a fix into the e-mail thread where the
> > issue was introduced and discussed?
> 
> I do not the answer but I can tell you about the fail check: patchtest is pretty dummy in this check, it simply does git apply --check <your series.mbox> so you need to base on master's HEAD.

But the patch I've sent is rebased on master's HEAD.

My question is how to send the patch to the thread where it IMHO belongs
without patchtest trying to apply all the patches in the thread (if
that's what it meants by "series".

See:
https://patchwork.openembedded.org/series/9783/
the last patch isn't 3/3 from this series, it's just independent new fix for changes
introduced in this series (e-mail thread).

so it should apply only this one:
https://patchwork.openembedded.org/patch/146352/

I know this cannot be as clever as e.g. gerrit, but my question still
stands:
Do we need to send fixes for already merged changes as new e-mail
threads (replace In-reply-to: with maybe just a link to ML archive
in the commit message)?

Regards,

> > On Fri, Dec 1, 2017 at 11:02 PM, Patchwork <
> > patchwork@patchwork.openembedded.org> wrote:  
> > 
> > > == Series Details ==
> > >
> > > Series: initramfs-framework installation improvements (rev4)
> > > Revision: 4
> > > URL   : https://patchwork.openembedded.org/series/9783/
> > > State : failure
> > >
> > > == Summary ==
> > >
> > >
> > > Thank you for submitting this patch series to OpenEmbedded Core. This is
> > > an automated response. Several tests have been executed on the proposed
> > > series by patchtest resulting in the following failures:
> > >
> > >
> > >
> > > * Issue             Series does not apply on top of target branch
> > > [test_series_merge_on_head]
> > >   Suggested fix    Rebase your series on top of targeted branch
> > >   Targeted branch  master (currently at addf309165)
> > >
> > >
> > >
> > > If you believe any of these test results are incorrect, please reply to the
> > > mailing list (openembedded-core@lists.openembedded.org) raising your
> > > concerns.
> > > Otherwise we would appreciate you correcting the issues and submitting a
> > > new
> > > version of the patchset if applicable. Please ensure you add/increment the
> > > version number when sending the new version (i.e. [PATCH] -> [PATCH v2] ->
> > > [PATCH v3] -> ...).
> > >
> > > ---
> > > Guidelines:     https://www.openembedded.org/wiki/Commit_Patch_Message_
> > > Guidelines
> > > Test framework: http://git.yoctoproject.org/cgit/cgit.cgi/patchtest
> > > Test suite:     http://git.yoctoproject.org/cgit/cgit.cgi/patchtest-oe
> > >
> > >  

-- 
Martin 'JaMa' Jansa     jabber: Martin.Jansa@gmail.com

[-- Attachment #2: Digital signature --]
[-- Type: application/pgp-signature, Size: 201 bytes --]

Re: [PATCH] initramfs-module-install: Remove allarch and FILESEXTRAPATHS

[Cal Sullivan]

Ack'd.

We need this in master so it can be backported to rocko along with my 
patches.

Thanks,
Cal

On 12/01/2017 01:53 PM, Martin Jansa wrote:
> * files is already included in default FILESPATH
> * it cannot inherit allarch as it RDEPENDS on bunch of TUNE_PKGARCH packages
> * use the same COMPATIBLE_HOST restrictions as grub has to prevent ERRORs in
>    bitbake world
>    ERROR: Nothing RPROVIDES 'grub' (but oe-core/meta/recipes-core/initrdscripts/initramfs-module-install_1.0.bb RDEPENDS on or otherwise requires it)
>    grub was skipped: incompatible with host arm-oe-linux-gnueabi (not in COMPATIBLE_HOST)
>    grub was skipped: incompatible with host arm-oe-linux-gnueabi (not in COMPATIBLE_HOST)
>    NOTE: Runtime target 'grub' is unbuildable, removing...
>    Missing or unbuildable dependency chain was: ['grub']
>    ERROR: Required build target 'meta-world-pkgdata' has no buildable providers.
>
> Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
> ---
>   .../initrdscripts/initramfs-module-install-efi_1.0.bb             | 3 ---
>   meta/recipes-core/initrdscripts/initramfs-module-install_1.0.bb   | 8 +++++---
>   2 files changed, 5 insertions(+), 6 deletions(-)
>
> diff --git a/meta/recipes-core/initrdscripts/initramfs-module-install-efi_1.0.bb b/meta/recipes-core/initrdscripts/initramfs-module-install-efi_1.0.bb
> index 24b53a8..1e7f76f 100644
> --- a/meta/recipes-core/initrdscripts/initramfs-module-install-efi_1.0.bb
> +++ b/meta/recipes-core/initrdscripts/initramfs-module-install-efi_1.0.bb
> @@ -5,9 +5,6 @@ RDEPENDS_${PN} = "initramfs-framework-base parted e2fsprogs-mke2fs dosfstools ut
>   
>   PR = "r4"
>   
> -inherit allarch
> -
> -FILESEXTRAPATHS_prepend := "${THISDIR}/files:"
>   SRC_URI = "file://init-install-efi.sh"
>   
>   S = "${WORKDIR}"
> diff --git a/meta/recipes-core/initrdscripts/initramfs-module-install_1.0.bb b/meta/recipes-core/initrdscripts/initramfs-module-install_1.0.bb
> index ce7f165..02b69f3 100644
> --- a/meta/recipes-core/initrdscripts/initramfs-module-install_1.0.bb
> +++ b/meta/recipes-core/initrdscripts/initramfs-module-install_1.0.bb
> @@ -3,11 +3,13 @@ LICENSE = "MIT"
>   LIC_FILES_CHKSUM = "file://${COREBASE}/meta/COPYING.MIT;md5=3da9cfbcb788c80a0384361b4de20420"
>   RDEPENDS_${PN} = "initramfs-framework-base grub parted e2fsprogs-mke2fs util-linux-blkid"
>   
> -PR = "r1"
> +# The same restriction as grub
> +COMPATIBLE_HOST = '(x86_64.*|i.86.*|arm.*|aarch64.*)-(linux.*|freebsd.*)'
> +COMPATIBLE_HOST_armv7a = 'null'
> +COMPATIBLE_HOST_armv7ve = 'null'
>   
> -inherit allarch
> +PR = "r1"
>   
> -FILESEXTRAPATHS_prepend := "${THISDIR}/files:"
>   SRC_URI = "file://init-install.sh"
>   
>   S = "${WORKDIR}"