[meta-oe][meta-initramfs][PATCH 1/4] initramfs-kexecboot images: install ubiattach for boot from UBI volumes

[meta-oe][meta-initramfs][PATCH 1/4] initramfs-kexecboot images: install ubiattach for boot from UBI volumes

[Andrea Adami]

Signed-off-by: Andrea Adami <andrea.adami@gmail.com>
---
 .../images/initramfs-kexecboot-image.bb            |    2 +-
 .../images/initramfs-kexecboot-klibc-image.bb      |    2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/meta-initramfs/recipes-bsp/images/initramfs-kexecboot-image.bb b/meta-initramfs/recipes-bsp/images/initramfs-kexecboot-image.bb
index f306fb5..2368699 100644
--- a/meta-initramfs/recipes-bsp/images/initramfs-kexecboot-image.bb
+++ b/meta-initramfs/recipes-bsp/images/initramfs-kexecboot-image.bb
@@ -9,7 +9,7 @@ IMAGE_FSTYPES = "${INITRAMFS_FSTYPES}"
 # avoid circular dependencies
 EXTRA_IMAGEDEPENDS = ""
 
-IMAGE_INSTALL = "kexec kexecboot"
+IMAGE_INSTALL = "kexec kexecboot ubiattach"
 
 # Do not pollute the initrd image with rootfs features
 IMAGE_FEATURES = ""
diff --git a/meta-initramfs/recipes-bsp/images/initramfs-kexecboot-klibc-image.bb b/meta-initramfs/recipes-bsp/images/initramfs-kexecboot-klibc-image.bb
index e81f9ee..e4e52cf 100644
--- a/meta-initramfs/recipes-bsp/images/initramfs-kexecboot-klibc-image.bb
+++ b/meta-initramfs/recipes-bsp/images/initramfs-kexecboot-klibc-image.bb
@@ -1,5 +1,5 @@
 require initramfs-kexecboot-image.bb
 
-IMAGE_INSTALL = "kexec-klibc kexecboot-klibc"
+IMAGE_INSTALL = "kexec-klibc kexecboot-klibc ubiattach-klibc"
 
 export IMAGE_BASENAME = "initramfs-kexecboot-klibc-image"
-- 
1.7.3.4

[meta-oe][meta-initramfs][PATCH 2/4] kexecboot-cfg: update and use new LABEL separator

[Andrea Adami]

* previously the sections were separated by KERNEL string

Signed-off-by: Andrea Adami <andrea.adami@gmail.com>
---
 .../recipes-bsp/kexecboot/kexecboot-cfg_0.1.bb     |    7 +++----
 1 files changed, 3 insertions(+), 4 deletions(-)

diff --git a/meta-initramfs/recipes-bsp/kexecboot/kexecboot-cfg_0.1.bb b/meta-initramfs/recipes-bsp/kexecboot/kexecboot-cfg_0.1.bb
index 4dca06c..6f70edd 100644
--- a/meta-initramfs/recipes-bsp/kexecboot/kexecboot-cfg_0.1.bb
+++ b/meta-initramfs/recipes-bsp/kexecboot/kexecboot-cfg_0.1.bb
@@ -21,11 +21,10 @@ do_configure_prepend () {
 
 do_install_prepend () {
 echo '# First kernel stanza.
-# Specify full kernel path on target.
-KERNEL=/boot/${KERNEL_IMAGETYPE}
-
 # Show this label in kexecboot menu.
 LABEL=${KEXECBOOT_LABEL}
+# Specify full kernel path on target.
+KERNEL=/boot/${KERNEL_IMAGETYPE}
 #
 # Append this tags to the kernel cmdline.
 APPEND=${CMDLINE} ${CMDLINE_DEBUG}
@@ -44,8 +43,8 @@ APPEND=${CMDLINE} ${CMDLINE_DEBUG}
 #
 #
 # Second kernel stanza.
-# KERNEL=/boot/${KERNEL_IMAGETYPE}-test
 # LABEL=${KEXECBOOT_LABEL}-test
+# KERNEL=/boot/${KERNEL_IMAGETYPE}-test
 # APPEND=${CMDLINE}
 #' >> ${S}/boot.cfg
 }
-- 
1.7.3.4

[meta-oe][meta-initramfs][PATCH 3/4] kexecboot: upgrade and move to git tag 0daa77

[Andrea Adami]

* new git repository on github
* new LABEL separator
* text-ui fallback
* install /sys for upcoming ubifs detection
* menu-bug fix
* minor fixes

Signed-off-by: Andrea Adami <andrea.adami@gmail.com>
---
 .../recipes-bsp/kexecboot/kexecboot-klibc_git.bb   |    6 +++---
 meta-initramfs/recipes-bsp/kexecboot/kexecboot.inc |    3 ++-
 .../recipes-bsp/kexecboot/kexecboot_git.bb         |    4 ++--
 3 files changed, 7 insertions(+), 6 deletions(-)

diff --git a/meta-initramfs/recipes-bsp/kexecboot/kexecboot-klibc_git.bb b/meta-initramfs/recipes-bsp/kexecboot/kexecboot-klibc_git.bb
index 0d6d00f..da479c8 100644
--- a/meta-initramfs/recipes-bsp/kexecboot/kexecboot-klibc_git.bb
+++ b/meta-initramfs/recipes-bsp/kexecboot/kexecboot-klibc_git.bb
@@ -1,9 +1,9 @@
 RDEPENDS_${PN} = "kexec-klibc"
 PV = "0.5.9"
-PR = "r8+gitr${SRCREV}"
+PR = "r9+gitr${SRCREV}"
 
-SRC_URI = "git://git.linuxtogo.org/home/groups/kexecboot/kexecboot.git;protocol=git "
-SRCREV = "8f1d3cc3d9c650c6a6c88f83071185d6ee0ef9c7"
+SRC_URI = "git://github.com/kexecboot/kexecboot.git;protocol=git"
+SRCREV = "0daa774eac019602cd89048961e95985ea50dadf"
 S = "${WORKDIR}/git"
 
 # the binary is statically linked against klibc
diff --git a/meta-initramfs/recipes-bsp/kexecboot/kexecboot.inc b/meta-initramfs/recipes-bsp/kexecboot/kexecboot.inc
index a205904..2a53f96 100644
--- a/meta-initramfs/recipes-bsp/kexecboot/kexecboot.inc
+++ b/meta-initramfs/recipes-bsp/kexecboot/kexecboot.inc
@@ -43,11 +43,12 @@ do_install () {
         install -d ${D}/proc
         install -d ${D}/mnt
         install -d ${D}/dev
+        install -d ${D}/sys
 }
 
 PACKAGE_ARCH = "${MACHINE_ARCH}"
 
-FILES_${PN} += " ${bindir}/kexecboot /init /proc /mnt /dev"
+FILES_${PN} += " ${bindir}/kexecboot /init /proc /mnt /dev /sys"
 
 pkg_postinst_${PN} () {
         ln -sf ${bindir}/kexecboot $D/init
diff --git a/meta-initramfs/recipes-bsp/kexecboot/kexecboot_git.bb b/meta-initramfs/recipes-bsp/kexecboot/kexecboot_git.bb
index 1341461..b33b640 100644
--- a/meta-initramfs/recipes-bsp/kexecboot/kexecboot_git.bb
+++ b/meta-initramfs/recipes-bsp/kexecboot/kexecboot_git.bb
@@ -2,8 +2,8 @@ RDEPENDS_${PN} = "kexec"
 PV = "0.5.9"
 PR = "r8+gitr${SRCREV}"
 
-SRC_URI = "git://git.linuxtogo.org/home/groups/kexecboot/kexecboot.git;protocol=git "
-SRCREV = "8f1d3cc3d9c650c6a6c88f83071185d6ee0ef9c7"
+SRC_URI = "git://github.com/kexecboot/kexecboot.git;protocol=git"
+SRCREV = "0daa774eac019602cd89048961e95985ea50dadf"
 S = "${WORKDIR}/git"
 
 require kexecboot.inc
-- 
1.7.3.4

[meta-oe][meta-initramfs][PATCH 4/4] linux-kexecboot: remove all, now we use linux-yocto-tiny-kexecboot

[Andrea Adami]

* The linux-yocto-tiny-kexecboot recipe can be extended and support
* more devices migrating the patches and renaming the defconfig as
* done for Sharp Zaurus devices.

Signed-off-by: Andrea Adami <andrea.adami@gmail.com>
---
 .../recipes-kernel/linux/linux-kexecboot.inc       |  124 --------------------
 .../recipes-kernel/linux/linux-kexecboot_3.1.bb    |   13 --
 .../recipes-kernel/linux/linux-kexecboot_3.2.bb    |   13 --
 .../recipes-kernel/linux/linux-kexecboot_git.bb    |   23 ----
 4 files changed, 0 insertions(+), 173 deletions(-)
 delete mode 100644 meta-initramfs/recipes-kernel/linux/linux-kexecboot.inc
 delete mode 100644 meta-initramfs/recipes-kernel/linux/linux-kexecboot_3.1.bb
 delete mode 100644 meta-initramfs/recipes-kernel/linux/linux-kexecboot_3.2.bb
 delete mode 100644 meta-initramfs/recipes-kernel/linux/linux-kexecboot_git.bb

diff --git a/meta-initramfs/recipes-kernel/linux/linux-kexecboot.inc b/meta-initramfs/recipes-kernel/linux/linux-kexecboot.inc
deleted file mode 100644
index 19c5ea9..0000000
--- a/meta-initramfs/recipes-kernel/linux/linux-kexecboot.inc
+++ /dev/null
@@ -1,124 +0,0 @@
-DESCRIPTION = "Linux Kernel"
-SECTION = "kernel"
-LICENSE = "GPLv2"
-LIC_FILES_CHKSUM = "file://COPYING;md5=d7810fab7487fb0aad327b76f1be7cd7"
-
-INC_PR = "r2"
-
-inherit kernel siteinfo
-
-DEPENDS += "xz-native"
-
-# Set the verbosity of kernel messages during runtime
-# You can define CMDLINE_DEBUG in your local.conf or distro.conf to override this behaviour
-# Note that you need i.e. loglevel=3 and master console on serial to protect bootlogo
-CMDLINE_DEBUG ?= "loglevel=3"
-
-PACKAGES = ""
-PROVIDES = ""
-
-KERNEL_IMAGE_BASE_NAME = "${KERNEL_IMAGETYPE}-kexecboot-${PV}-${PR}-${MACHINE}"
-KERNEL_IMAGE_SYMLINK_NAME = "${KERNEL_IMAGETYPE}-kexecboot-${MACHINE}"
-
-LOCALVERSION ?= ""
-
-# we want the smallest size
-INITRAMFS_IMAGE = "initramfs-kexecboot-klibc-image"
-
-kernel_conf_variable() {
-        CONF_SED_SCRIPT="$CONF_SED_SCRIPT /CONFIG_$1[ =]/d;"
-        if test "$2" = "n"
-        then
-                echo "# CONFIG_$1 is not set" >> ${S}/.config
-        else
-                echo "CONFIG_$1=$2" >> ${S}/.config
-        fi
-}
-
-do_configure_prepend() {
-
-        echo "" > ${S}/.config
-        CONF_SED_SCRIPT=""
-
-        #
-        # CONFIG_CMDLINE mangling
-        #
-        kernel_conf_variable CMDLINE_BOOL y
-        kernel_conf_variable CMDLINE "\"${CMDLINE} ${CMDLINE_DEBUG}\""
-
-        # mips and x86
-        kernel_conf_variable CMDLINE_OVERRIDE y
-
-        # sh only
-        kernel_conf_variable CMDLINE_OVERWRITE y
-        kernel_conf_variable CMDLINE_EXTEND n
-
-        #
-        # endian support
-        #
-        if [ "${SITEINFO_ENDIANNESS}" = "be" ]; then
-                kernel_conf_variable CPU_BIG_ENDIAN y
-        fi
-
-        #
-        # logo support, if you supply logo_linux_clut224.ppm in SRC_URI, then it is going to be used
-        #
-        if [ -e ${WORKDIR}/logo_linux_clut224.ppm ]; then
-                install -m 0644 ${WORKDIR}/logo_linux_clut224.ppm drivers/video/logo/logo_linux_clut224.ppm
-                kernel_conf_variable LOGO y
-                kernel_conf_variable LOGO_LINUX_CLUT224 y
-        fi
-
-        # When enabling thumb for userspace we also need thumb support in the kernel
-        if [ "${ARM_INSTRUCTION_SET}" = "thumb" ] ; then
-                kernel_conf_variable ARM_THUMB y
-        fi
-
-        kernel_conf_variable LOCALVERSION "\"${LOCALVERSION}\""
-        kernel_conf_variable LOCALVERSION_AUTO n
-
-        # Force sane defaults for kexec-enabled kernels and keep size small
-        kernel_conf_variable BLK_DEV_INITRD y
-        kernel_conf_variable KEXEC y
-        CONF_SED_SCRIPT="$CONF_SED_SCRIPT /=m/d;"
-        kernel_conf_variable MODULES n
-        if ${@base_contains("CMDLINE_DEBUG", "debug", "true", "false", d)}; then
-                kernel_conf_variable DEBUG_LL y
-                kernel_conf_variable PRINTK y
-                kernel_conf_variable EARLY_PRINTK y
-                kernel_conf_variable BUG y
-                kernel_conf_variable DEBUG_ERRORS y
-                kernel_conf_variable DEBUG_BUGVERBOSE y
-                kernel_conf_variable DEBUG_KERNEL y
-        else
-                kernel_conf_variable DEBUG_ERRORS n
-                kernel_conf_variable DEBUG_BUGVERBOSE n
-                kernel_conf_variable DEBUG_KERNEL n
-        fi
-
-        # Force lzma for arm kernels only
-        if [ "${ARCH}" = "arm" ] ; then
-                CONF_SED_SCRIPT="$CONF_SED_SCRIPT /CONFIG_KERNEL/d;"
-                CONF_SED_SCRIPT="$CONF_SED_SCRIPT /CONFIG_RD/d;"
-                CONF_SED_SCRIPT="$CONF_SED_SCRIPT /CONFIG_INITRAMFS_COMPRESSION/d;"
-                CONF_SED_SCRIPT="$CONF_SED_SCRIPT /CONFIG_INITRAMFS_SOURCE/d;"
-                kernel_conf_variable KERNEL_LZMA y
-                kernel_conf_variable RD_LZMA y
-                kernel_conf_variable INITRAMFS_COMPRESSION_LZMA y
-                kernel_conf_variable INITRAMFS_SOURCE "\"initramfs.cpio.lzma\""
-        fi
-
-        sed -e "${CONF_SED_SCRIPT}" \
-                        < '${WORKDIR}/defconfig' >>'${S}/.config'
-
-        yes '' | oe_runmake oldconfig
-}
-
-do_populate_sysroot() {
-        :
-}
-
-do_install() {
-        :
-}
-
diff --git a/meta-initramfs/recipes-kernel/linux/linux-kexecboot_3.1.bb b/meta-initramfs/recipes-kernel/linux/linux-kexecboot_3.1.bb
deleted file mode 100644
index b045ff7..0000000
--- a/meta-initramfs/recipes-kernel/linux/linux-kexecboot_3.1.bb
+++ /dev/null
@@ -1,13 +0,0 @@
-require linux-kexecboot.inc
-
-PR = "${INC_PR}.8"
-S = "${WORKDIR}/linux-${PV}"
-
-SRC_URI += "${KERNELORG_MIRROR}/linux/kernel/v3.x/linux-${PV}.tar.bz2;name=kernel \
-           ${KERNELORG_MIRROR}/linux/kernel/v3.x/patch-${PV}.10.bz2;apply=yes;name=stablepatch \
-           "
-
-SRC_URI[kernel.md5sum] = "8d43453f8159b2332ad410b19d86a931"
-SRC_URI[kernel.sha256sum] = "2573d2378c754b0c602b57586e9311e5b38c5d1e6c137f02873833633a4b9359"
-SRC_URI[stablepatch.md5sum] = "a8e1c25a93a685ec2a1c3a808715fe9d"
-SRC_URI[stablepatch.sha256sum] = "f25126052d1a083a415ddd313b40c7fcdb3742f40474cb4a826af7e43fee29d3"
diff --git a/meta-initramfs/recipes-kernel/linux/linux-kexecboot_3.2.bb b/meta-initramfs/recipes-kernel/linux/linux-kexecboot_3.2.bb
deleted file mode 100644
index 8cb19aa..0000000
--- a/meta-initramfs/recipes-kernel/linux/linux-kexecboot_3.2.bb
+++ /dev/null
@@ -1,13 +0,0 @@
-require linux-kexecboot.inc
-
-PR = "${INC_PR}.5"
-S = "${WORKDIR}/linux-${PV}"
-
-SRC_URI += "${KERNELORG_MIRROR}/linux/kernel/v3.x/linux-${PV}.tar.bz2;name=kernel \
-           ${KERNELORG_MIRROR}/linux/kernel/v3.x/patch-${PV}.12.bz2;apply=yes;name=stablepatch \
-           "
-
-SRC_URI[kernel.md5sum] = "7ceb61f87c097fc17509844b71268935"
-SRC_URI[kernel.sha256sum] = "c881fc2b53cf0da7ca4538aa44623a7de043a41f76fd5d0f51a31f6ed699d463"
-SRC_URI[stablepatch.md5sum] = "377a6d731cd246aaa0c0f6a432b7aece"
-SRC_URI[stablepatch.sha256sum] = "c6991964901ef7797cca09ff9d1b4ed7abda27e2796ad55cad09a266eaaebb5d"
diff --git a/meta-initramfs/recipes-kernel/linux/linux-kexecboot_git.bb b/meta-initramfs/recipes-kernel/linux/linux-kexecboot_git.bb
deleted file mode 100644
index b1fc75b..0000000
--- a/meta-initramfs/recipes-kernel/linux/linux-kexecboot_git.bb
+++ /dev/null
@@ -1,23 +0,0 @@
-require linux-kexecboot.inc
-
-PR = "${INC_PR}.1"
-
-KERNEL_RELEASE = "3.2.0-rc7"
-OLD_KERNEL_RELEASE = "3.1.99"
-PV = "${OLD_KERNEL_RELEASE}+${KERNEL_RELEASE}+gitr${SRCPV}"
-
-SRCREV = "371de6e4e0042adf4f9b54c414154f57414ddd37"
-
-CMDLINE_DEBUG = "debug"
-
-S = "${WORKDIR}/git"
-SRC_URI = "git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6.git;protocol=git;branch=master"
-
-do_configure_prepend() {
-#otherwise it gets extra '+' "2.6.37+"
-#because:
-#$ scripts/setlocalversion . => +
-#$ make kernelversion => 2.6.37
-#$ make kernelrelease => 2.6.37+
-  rm -rf ${S}/.git
-}
-- 
1.7.3.4