diff options
| author | Andrea Adami <andrea.adami@gmail.com> | 2009-10-16 02:06:59 +0200 |
|---|---|---|
| committer | Andrea Adami <andrea.adami@gmail.com> | 2009-10-16 02:06:59 +0200 |
| commit | 9a6a9e12a1ef50296621c2eea9fe385464b64f02 (patch) | |
| tree | b2de5d96d993b3174ffd2db7e107219bbed4d5ee | |
| parent | 45f99a1bd269788e996aa817f3d4ac413038158f (diff) | |
kexecboot-cfg: add ICON tag in boot.cfg. Remove kernel-cmdline. Bump PR.
| -rw-r--r-- | recipes/kexecboot/kexecboot-cfg_0.1.bb | 24 |
1 files changed, 17 insertions, 7 deletions
diff --git a/recipes/kexecboot/kexecboot-cfg_0.1.bb b/recipes/kexecboot/kexecboot-cfg_0.1.bb index c6c31247e7..97407a8a0a 100644 --- a/recipes/kexecboot/kexecboot-cfg_0.1.bb +++ b/recipes/kexecboot/kexecboot-cfg_0.1.bb @@ -2,35 +2,45 @@ LICENSE = "GPL" SECTION = "base" DESCRIPTION = "Configuration file for kexecboot" -PR = "r4" +PR = "r5" PACKAGE_ARCH = "${MACHINE_ARCH}" CMDLINE_CON = "console=ttyS0,115200n8 console=tty1 noinitrd" CMDLINE_CON_collie = "console=ttySA0,115200n8 console=tty1 noinitrd rw" CMDLINE_CON_qemuarm = "console=ttyAMA0,115200n8 console=tty1 noinitrd" -CMDLINE_DEBUG = '${@base_conditional("DISTRO_TYPE", "release", "quiet", "debug",d)}' - CMDLINE_MEM_collie = "mem=64M" CMDLINE_ROTATE_spitz = "fbcon=rotate:1" CMDLINE_ROTATE_akita = "fbcon=rotate:1" CMDLINE_ROTATE_collie = "fbcon=rotate:1" CMDLINE_ROTATE_poodle = "fbcon=rotate:1" -FILES_${PN} += "/boot/*" +#CMDLINE_OTHER = "dyntick=enable" +CMDLINE_OTHER = "" + +CMDLINE_DEBUG = '${@base_conditional("DISTRO_TYPE", "release", "quiet", "debug",d)}' + +CMDLINE = ${CMDLINE_CON} +CMDLINE += ${CMDLINE_MEM} +CMDLINE += ${CMDLINE_ROTATE} +CMDLINE += ${CMDLINE_OTHER} +CMDLINE += ${CMDLINE_DEBUG} + +FILES_${PN} += "/boot/*" do_install_prepend () { echo "DEFAULT=${DISTRO}" > ${S}/boot.cfg echo "LABEL=${DISTRO}" >> ${S}/boot.cfg echo "KERNEL=/boot/${KERNEL_IMAGETYPE}" >> ${S}/boot.cfg - echo "APPEND=${CMDLINE_CON} ${CMDLINE_MEM} ${CMDLINE_ROTATE} ${CMDLINE_OTHER} ${CMDLINE_DEBUG}" >> ${S}/boot.cfg + echo "APPEND=${CMDLINE}" >> ${S}/boot.cfg + echo "#ICON=/boot/my_icon.xpm" >> ${S}/boot.cfg } do_install () { install -d ${D}/boot install -m 0644 boot.cfg ${D}/boot/boot.cfg - # old kexecboot versions < 0.6 need '/boot/kernel-cmdline' - echo "${CMDLINE_CON} ${CMDLINE_MEM} ${CMDLINE_ROTATE} ${CMDLINE_OTHER} ${CMDLINE_DEBUG}"> ${D}/boot/kernel-cmdline + # old kexecboot versions < 0.52 were needing '/boot/kernel-cmdline' + # echo "${CMDLINE}"> ${D}/boot/kernel-cmdline } |