diff options
| author | Andrea Adami <andrea.adami@gmail.com> | 2012-02-22 22:05:32 +0000 |
|---|---|---|
| committer | Koen Kooi <koen@dominion.thruhere.net> | 2012-02-23 16:46:32 +0100 |
| commit | 30122ec63d2cbd4ca9c52ffbd54fed3986cae679 (patch) | |
| tree | 92763a86a0888f1bfa9684515754abba25fdb5c5 /meta-initramfs | |
| parent | 2cf07dd7d0ca3f5c85e44716da866d89f1cceade (diff) | |
| download | meta-openembedded-30122ec63d2cbd4ca9c52ffbd54fed3986cae679.tar.gz | |
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 <andrea.adami@gmail.com>
Signed-off-by: Koen Kooi <koen@dominion.thruhere.net>
Diffstat (limited to 'meta-initramfs')
| -rw-r--r-- | meta-initramfs/recipes-bsp/kexecboot/kexecboot-cfg/icon.xpm | 43 | ||||
| -rw-r--r-- | meta-initramfs/recipes-bsp/kexecboot/kexecboot-cfg_0.1.bb | 6 |
2 files changed, 46 insertions, 3 deletions
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 @@ | |||
| 1 | /* XPM */ | ||
| 2 | static char * icon_xpm[] = { | ||
| 3 | "32 32 8 1", | ||
| 4 | " c None", | ||
| 5 | ". c #D6DBDE", | ||
| 6 | "+ c #9BA6AE", | ||
| 7 | "@ c #60727D", | ||
| 8 | "# c #B8BFC5", | ||
| 9 | "$ c #A9E8F6", | ||
| 10 | "% c #12BCE4", | ||
| 11 | "& c #57D2EC", | ||
| 12 | " ", | ||
| 13 | " ", | ||
| 14 | " ", | ||
| 15 | " .++@@@@++. ", | ||
| 16 | " +@@@@@@@@@@@@+ ", | ||
| 17 | " #@@@@@@@@@@@@@@@@# ", | ||
| 18 | " +@@@@@@@@@@@@@@@@@@+ ", | ||
| 19 | " .@@@@@@@@++##+@@@@@@@@@. ", | ||
| 20 | " @@@@@@@. .@@@@@@@ ", | ||
| 21 | " +@@@@@+ $$$$ #@@@@@+ ", | ||
| 22 | " #@@@@@. $%%%%%%%%$ .@@@@@# ", | ||
| 23 | " @@@@@. &%%%%%%%%%%& .@@@@@ ", | ||
| 24 | " #@@@@+ %%%%%%%%%%%%%% +@@@@# ", | ||
| 25 | " @@@@@ &%%%%%%%%%%%%%%& @@@@@ ", | ||
| 26 | ".@@@@. $%%%%%& $%%%%%& .@@@@.", | ||
| 27 | "+@@@@ %%%%% $%%%%%& @@@@+", | ||
| 28 | "+@@@+ %%%%$ $%%%%%& $$ +@@@+", | ||
| 29 | "@@@@+ $%%%% $%%%%%& $%$ +@@@@", | ||
| 30 | "@@@@# &%%%& &%%%%& $%%& #@@@@", | ||
| 31 | "@@@@. &%%%& %%%%& $%%%& .@@@@", | ||
| 32 | "@@@@# $%%%& &%%& &%%%$ #@@@@", | ||
| 33 | "+@@@+ $%%%% %%%%$ +@@@+", | ||
| 34 | "+@@@@ %%%%& &%%%% @@@@+", | ||
| 35 | "#@@@@ &%%%%& &%%%%& @@@@#", | ||
| 36 | " @@@@+ %%%%%%&$$&%%%%%% +@@@@ ", | ||
| 37 | " +@@@@. $%%%%%%%%%%%%%%$ .@@@@+ ", | ||
| 38 | " .@@@@@ $%%%%%%%%%%%%$ @@@@@. ", | ||
| 39 | " #++++. &%%%%%%%%& .++++# ", | ||
| 40 | " $&&%%&&$ ", | ||
| 41 | " ", | ||
| 42 | " ", | ||
| 43 | " "}; | ||
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" | |||
| 3 | LICENSE = "MIT" | 3 | LICENSE = "MIT" |
| 4 | LIC_FILES_CHKSUM = "file://${COREBASE}/LICENSE;md5=3f40d7994397109285ec7b81fdeb3b58" | 4 | LIC_FILES_CHKSUM = "file://${COREBASE}/LICENSE;md5=3f40d7994397109285ec7b81fdeb3b58" |
| 5 | 5 | ||
| 6 | PR = "r13" | 6 | PR = "r14" |
| 7 | 7 | ||
| 8 | INHIBIT_DEFAULT_DEPS = "1" | 8 | INHIBIT_DEFAULT_DEPS = "1" |
| 9 | 9 | ||
| 10 | SRC_URI = "file://icon.xpm" | 10 | SRC_URI = "file://icon.xpm" |
| 11 | 11 | ||
| 12 | CMDLINE ?= "" | 12 | CMDLINE ?= "" |
| 13 | CMDLINE_DEBUG ?= "${@base_conditional('DISTRO_TYPE', 'release', 'quiet', 'debug',d)}" | 13 | CMDLINE_DEBUG ?= "quiet" |
| 14 | 14 | ||
| 15 | # Note: for qvga the label is currently limited to about 24 chars | 15 | # Note: for qvga the label is currently limited to about 24 chars |
| 16 | KEXECBOOT_LABEL ?= "${@d.getVar('DISTRO', True) or d.getVar('DISTRO_VERSION', True)}-${MACHINE}" | 16 | KEXECBOOT_LABEL ?= "${@d.getVar('DISTRO', True) or d.getVar('DISTRO_VERSION', True)}-${MACHINE}" |
| @@ -45,7 +45,7 @@ APPEND=${CMDLINE} ${CMDLINE_DEBUG} | |||
| 45 | # | 45 | # |
| 46 | # Second kernel stanza. | 46 | # Second kernel stanza. |
| 47 | # KERNEL=/boot/${KERNEL_IMAGETYPE}-test | 47 | # KERNEL=/boot/${KERNEL_IMAGETYPE}-test |
| 48 | # LABEL=${DISTRO}-${MACHINE}-test | 48 | # LABEL=${KEXECBOOT_LABEL}-test |
| 49 | # APPEND=${CMDLINE} | 49 | # APPEND=${CMDLINE} |
| 50 | #' >> ${S}/boot.cfg | 50 | #' >> ${S}/boot.cfg |
| 51 | } | 51 | } |