From 9882169d240529162378f5c4f8f00023d450cfd0 Mon Sep 17 00:00:00 2001
From: Andrea Adami <andrea.adami@gmail.com>
Date: Sun, 12 Apr 2015 23:59:26 +0200
Subject: kexecboot-cfg: maintenance update to v. 0.2

This configuration file is only suitable for kexecboot > 0.5.9.
With the upcoming release of linux_4.0 based kexecboot kernels it is preferable
to clearly distinguish old and new versions.

Fix WARNING: ... kexecboot-cfg-0.1 ('S') doesn't exist, please set 'S' to a proper value
Remove PR
Increase PV

Signed-off-by: Andrea Adami <andrea.adami@gmail.com>
---
 .../recipes-bsp/kexecboot/kexecboot-cfg_0.1.bb     | 62 ---------------------
 .../recipes-bsp/kexecboot/kexecboot-cfg_0.2.bb     | 63 ++++++++++++++++++++++
 2 files changed, 63 insertions(+), 62 deletions(-)
 delete mode 100644 meta-initramfs/recipes-bsp/kexecboot/kexecboot-cfg_0.1.bb
 create mode 100644 meta-initramfs/recipes-bsp/kexecboot/kexecboot-cfg_0.2.bb

diff --git a/meta-initramfs/recipes-bsp/kexecboot/kexecboot-cfg_0.1.bb b/meta-initramfs/recipes-bsp/kexecboot/kexecboot-cfg_0.1.bb
deleted file mode 100644
index ec476f8295..0000000000
--- a/meta-initramfs/recipes-bsp/kexecboot/kexecboot-cfg_0.1.bb
+++ /dev/null
@@ -1,62 +0,0 @@
-SUMMARY = "Configuration files for kexecboot"
-DESCRIPTION = "Default icon and boot.cfg for kexecboot linux-as-bootloader."
-SECTION = "base"
-LICENSE = "MIT"
-LIC_FILES_CHKSUM = "file://${COREBASE}/LICENSE;md5=4d92cd373abda3937c2bc47fbc49d690"
-PR = "r14"
-
-SRC_URI = "file://icon.xpm"
-
-do_configure_prepend () {
-    install -m 0644 ${WORKDIR}/icon.xpm ${S}
-}
-do_install_prepend () {
-echo '# /boot/boot.cfg - KEXECBOOT configuration file.
-#
-# First kernel stanza.
-# 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}
-#
-# Specify optional initrd/initramfs.
-# INITRD=/boot/initramfs.cpio.gz
-#
-# Specify full path for a custom icon for the menu-item.
-# If not set, use device-icons as default (NAND, SD, CF, ...).
-# ICON=/boot/icon.xpm
-#
-# Priority of item in kexecboot menu.
-# Items with highest priority will be shown at top of menu.
-# Default: 0 (lowest, ordered by device ordering)
-# PRIORITY=10
-#
-#
-# Second kernel stanza.
-# LABEL=${KEXECBOOT_LABEL}-test
-# KERNEL=/boot/${KERNEL_IMAGETYPE}-test
-# APPEND=${CMDLINE}
-#' > ${S}/boot.cfg
-}
-do_install () {
-    install -d ${D}/boot
-    install -m 0644 boot.cfg ${D}/boot/boot.cfg
-    install -m 0644 icon.xpm ${D}/boot/icon.xpm
-}
-
-PACKAGE_ARCH = "${MACHINE_ARCH}"
-
-FILES_${PN} += "/boot/*"
-
-CMDLINE ?= ""
-CMDLINE_DEBUG ?= "quiet"
-
-INHIBIT_DEFAULT_DEPS = "1"
-
-# Note: for qvga the label is currently limited to about 24 chars
-KEXECBOOT_LABEL ?= "${@d.getVar('DISTRO', True) or d.getVar('DISTRO_VERSION', True)}-${MACHINE}"
diff --git a/meta-initramfs/recipes-bsp/kexecboot/kexecboot-cfg_0.2.bb b/meta-initramfs/recipes-bsp/kexecboot/kexecboot-cfg_0.2.bb
new file mode 100644
index 0000000000..bd861f3dd4
--- /dev/null
+++ b/meta-initramfs/recipes-bsp/kexecboot/kexecboot-cfg_0.2.bb
@@ -0,0 +1,63 @@
+SUMMARY = "Configuration files for kexecboot"
+DESCRIPTION = "Default icon and boot.cfg for kexecboot linux-as-bootloader."
+SECTION = "base"
+LICENSE = "MIT"
+LIC_FILES_CHKSUM = "file://${COREBASE}/LICENSE;md5=4d92cd373abda3937c2bc47fbc49d690"
+
+SRC_URI = "file://icon.xpm"
+
+S = "${WORKDIR}/${BP}"
+
+do_configure_prepend () {
+    install -m 0644 ${WORKDIR}/icon.xpm ${S}
+}
+do_install_prepend () {
+echo '# /boot/boot.cfg - KEXECBOOT configuration file.
+#
+# First kernel stanza.
+# 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}
+#
+# Specify optional initrd/initramfs.
+# INITRD=/boot/initramfs.cpio.gz
+#
+# Specify full path for a custom icon for the menu-item.
+# If not set, use device-icons as default (NAND, SD, CF, ...).
+# ICON=/boot/icon.xpm
+#
+# Priority of item in kexecboot menu.
+# Items with highest priority will be shown at top of menu.
+# Default: 0 (lowest, ordered by device ordering)
+# PRIORITY=10
+#
+#
+# Second kernel stanza.
+# LABEL=${KEXECBOOT_LABEL}-test
+# KERNEL=/boot/${KERNEL_IMAGETYPE}-test
+# APPEND=${CMDLINE}
+#' > ${S}/boot.cfg
+}
+do_install () {
+    install -d ${D}/boot
+    install -m 0644 boot.cfg ${D}/boot/boot.cfg
+    install -m 0644 icon.xpm ${D}/boot/icon.xpm
+}
+
+PACKAGE_ARCH = "${MACHINE_ARCH}"
+
+FILES_${PN} += "/boot/*"
+
+CMDLINE ?= ""
+CMDLINE_DEBUG ?= "quiet"
+
+INHIBIT_DEFAULT_DEPS = "1"
+
+# Note: for qvga the label is currently limited to about 24 chars
+KEXECBOOT_LABEL ?= "${@d.getVar('DISTRO', True) or d.getVar('DISTRO_VERSION', True)}-${MACHINE}"
-- 
cgit 1.2.3-korg