From 30122ec63d2cbd4ca9c52ffbd54fed3986cae679 Mon Sep 17 00:00:00 2001 From: Andrea Adami Date: Wed, 22 Feb 2012 22:05:32 +0000 Subject: kexecboot_cfg: add missing default OE icon.xpm * while there do minor cleanings wrt DISTRO vars: * remove ${@base_conditional('DISTRO_TYPE',... * fix label of second kernel stanza * bump PR Signed-off-by: Andrea Adami Signed-off-by: Koen Kooi --- .../recipes-bsp/kexecboot/kexecboot-cfg/icon.xpm | 43 ++++++++++++++++++++++ .../recipes-bsp/kexecboot/kexecboot-cfg_0.1.bb | 6 +-- 2 files changed, 46 insertions(+), 3 deletions(-) create mode 100644 meta-initramfs/recipes-bsp/kexecboot/kexecboot-cfg/icon.xpm (limited to 'meta-initramfs') diff --git a/meta-initramfs/recipes-bsp/kexecboot/kexecboot-cfg/icon.xpm b/meta-initramfs/recipes-bsp/kexecboot/kexecboot-cfg/icon.xpm new file mode 100644 index 0000000000..6e6fd776d8 --- /dev/null +++ b/meta-initramfs/recipes-bsp/kexecboot/kexecboot-cfg/icon.xpm @@ -0,0 +1,43 @@ +/* XPM */ +static char * icon_xpm[] = { +"32 32 8 1", +" c None", +". c #D6DBDE", +"+ c #9BA6AE", +"@ c #60727D", +"# c #B8BFC5", +"$ c #A9E8F6", +"% c #12BCE4", +"& c #57D2EC", +" ", +" ", +" ", +" .++@@@@++. ", +" +@@@@@@@@@@@@+ ", +" #@@@@@@@@@@@@@@@@# ", +" +@@@@@@@@@@@@@@@@@@+ ", +" .@@@@@@@@++##+@@@@@@@@@. ", +" @@@@@@@. .@@@@@@@ ", +" +@@@@@+ $$$$ #@@@@@+ ", +" #@@@@@. $%%%%%%%%$ .@@@@@# ", +" @@@@@. &%%%%%%%%%%& .@@@@@ ", +" #@@@@+ %%%%%%%%%%%%%% +@@@@# ", +" @@@@@ &%%%%%%%%%%%%%%& @@@@@ ", +".@@@@. $%%%%%& $%%%%%& .@@@@.", +"+@@@@ %%%%% $%%%%%& @@@@+", +"+@@@+ %%%%$ $%%%%%& $$ +@@@+", +"@@@@+ $%%%% $%%%%%& $%$ +@@@@", +"@@@@# &%%%& &%%%%& $%%& #@@@@", +"@@@@. &%%%& %%%%& $%%%& .@@@@", +"@@@@# $%%%& &%%& &%%%$ #@@@@", +"+@@@+ $%%%% %%%%$ +@@@+", +"+@@@@ %%%%& &%%%% @@@@+", +"#@@@@ &%%%%& &%%%%& @@@@#", +" @@@@+ %%%%%%&$$&%%%%%% +@@@@ ", +" +@@@@. $%%%%%%%%%%%%%%$ .@@@@+ ", +" .@@@@@ $%%%%%%%%%%%%$ @@@@@. ", +" #++++. &%%%%%%%%& .++++# ", +" $&&%%&&$ ", +" ", +" ", +" "}; 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 84c1116e33..4dca06c180 100644 --- a/meta-initramfs/recipes-bsp/kexecboot/kexecboot-cfg_0.1.bb +++ b/meta-initramfs/recipes-bsp/kexecboot/kexecboot-cfg_0.1.bb @@ -3,14 +3,14 @@ SECTION = "base" LICENSE = "MIT" LIC_FILES_CHKSUM = "file://${COREBASE}/LICENSE;md5=3f40d7994397109285ec7b81fdeb3b58" -PR = "r13" +PR = "r14" INHIBIT_DEFAULT_DEPS = "1" SRC_URI = "file://icon.xpm" CMDLINE ?= "" -CMDLINE_DEBUG ?= "${@base_conditional('DISTRO_TYPE', 'release', 'quiet', 'debug',d)}" +CMDLINE_DEBUG ?= "quiet" # 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}" @@ -45,7 +45,7 @@ APPEND=${CMDLINE} ${CMDLINE_DEBUG} # # Second kernel stanza. # KERNEL=/boot/${KERNEL_IMAGETYPE}-test -# LABEL=${DISTRO}-${MACHINE}-test +# LABEL=${KEXECBOOT_LABEL}-test # APPEND=${CMDLINE} #' >> ${S}/boot.cfg } -- cgit 1.2.3-korg