From 0eaa9888882dcf393f7244578854baf8c2d8a4cf Mon Sep 17 00:00:00 2001 From: Andrea Adami Date: Thu, 10 Oct 2013 23:26:24 +0200 Subject: kexecboot.inc: merge back in the main recipe and process with oe-stylize.py Signed-off-by: Andrea Adami --- meta-initramfs/recipes-bsp/kexecboot/kexecboot.inc | 58 -------------------- .../recipes-bsp/kexecboot/kexecboot_git.bb | 62 +++++++++++++++++++++- 2 files changed, 60 insertions(+), 60 deletions(-) delete mode 100644 meta-initramfs/recipes-bsp/kexecboot/kexecboot.inc (limited to 'meta-initramfs') diff --git a/meta-initramfs/recipes-bsp/kexecboot/kexecboot.inc b/meta-initramfs/recipes-bsp/kexecboot/kexecboot.inc deleted file mode 100644 index 065e3c1a5e..0000000000 --- a/meta-initramfs/recipes-bsp/kexecboot/kexecboot.inc +++ /dev/null @@ -1,58 +0,0 @@ -########################### -# Configure options: -# -# --enable-static-linking compile kexecboot as static executable [default=no] -# --enable-fbui support framebuffer menu [default=yes] -# --enable-fbui-width limit FB UI width to specified value [default=no] -# --enable-fbui-height limit FB UI height to specified value [default=no] -# --enable-textui support console text user interface [default=no] -# --enable-cfgfiles support config files [default=yes] -# --enable-icons support custom icons (depends on fbui) [default=yes] -# --enable-zaurus compile Sharp Zaurus specific code [default=no] -# --enable-zimage compile with zImage support [default=yes] -# --enable-uimage compile with uImage support [default=no] -# --enable-machine-kernel look for machine-specific zImage kernel [default=no] -# --enable-devices-recreating -# enable devices re-creating [default=yes] -# --enable-debug enable debug output [default=no] -# --enable-host-debug allow for non-destructive executing of kexecboot on -# host system [default=no] -# --enable-numkeys enable menu item selection by keys [0-9] [default=yes] -# --enable-bg-buffer enable buffer for pre-drawed FB GUI background -# -# --enable-timeout allow to boot 1st kernel after timeout in seconds -# [default=no] -# --enable-delay specify delay before device scanning, allowing -# initialization of old CF/SD cards [default=1] -# --enable-bpp enable support of specified bpp modes -# (all,32,24,18,16,4,2,1) [default=all] -# --enable-evdev-rate change evdev (keyboard/mouse) repeat rate -# in milliseconds e.g. "1000,250" [default=no] -# --with-kexec-binary look for kexec binary at path -# [default="/usr/sbin/kexec"] -########################## -SUMMARY = "kexecboot linux-as-bootloader" -DESCRIPTION = "kexecboot is a graphical linux-as-bootloader implementation based on kexec." -HOMEPAGE = "http://kexecboot.org" -LICENSE = "GPLv2" -LIC_FILES_CHKSUM = "file://COPYING;md5=94d55d512a9ba36caa9b7df079bae19f" -inherit autotools - -EXTRA_OECONF = "--enable-delay=2 --enable-evdev-rate=1000,250" - -do_install () { - install -d ${D}${bindir} - install -m 0755 kexecboot ${D}${bindir}/ - 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 /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 b52012e968..7347ea5982 100644 --- a/meta-initramfs/recipes-bsp/kexecboot/kexecboot_git.bb +++ b/meta-initramfs/recipes-bsp/kexecboot/kexecboot_git.bb @@ -1,9 +1,67 @@ +########################### +# Configure options: +# +# --enable-static-linking compile kexecboot as static executable [default=no] +# --enable-fbui support framebuffer menu [default=yes] +# --enable-fbui-width limit FB UI width to specified value [default=no] +# --enable-fbui-height limit FB UI height to specified value [default=no] +# --enable-textui support console text user interface [default=no] +# --enable-cfgfiles support config files [default=yes] +# --enable-icons support custom icons (depends on fbui) [default=yes] +# --enable-zaurus compile Sharp Zaurus specific code [default=no] +# --enable-zimage compile with zImage support [default=yes] +# --enable-uimage compile with uImage support [default=no] +# --enable-machine-kernel look for machine-specific zImage kernel [default=no] +# --enable-devices-recreating +# enable devices re-creating [default=yes] +# --enable-debug enable debug output [default=no] +# --enable-host-debug allow for non-destructive executing of kexecboot on +# host system [default=no] +# --enable-numkeys enable menu item selection by keys [0-9] [default=yes] +# --enable-bg-buffer enable buffer for pre-drawed FB GUI background +# +# --enable-timeout allow to boot 1st kernel after timeout in seconds +# [default=no] +# --enable-delay specify delay before device scanning, allowing +# initialization of old CF/SD cards [default=1] +# --enable-bpp enable support of specified bpp modes +# (all,32,24,18,16,4,2,1) [default=all] +# --enable-evdev-rate change evdev (keyboard/mouse) repeat rate +# in milliseconds e.g. "1000,250" [default=no] +# --with-kexec-binary look for kexec binary at path +# [default="/usr/sbin/kexec"] +########################## +SUMMARY = "kexecboot linux-as-bootloader" +DESCRIPTION = "kexecboot is a graphical linux-as-bootloader implementation based on kexec." +HOMEPAGE = "http://kexecboot.org" +LICENSE = "GPLv2" +LIC_FILES_CHKSUM = "file://COPYING;md5=94d55d512a9ba36caa9b7df079bae19f" +SRCREV = "0bcc14671aa2d84ec20f260582aca36bb901ccf1" PV = "0.5.9.1" SRC_URI = "git://github.com/kexecboot/kexecboot.git" -SRCREV = "0bcc14671aa2d84ec20f260582aca36bb901ccf1" + S = "${WORKDIR}/git" -require kexecboot.inc +inherit autotools + +EXTRA_OECONF = "--enable-delay=2 --enable-evdev-rate=1000,250" + +do_install () { + install -d ${D}${bindir} + install -m 0755 kexecboot ${D}${bindir}/ + 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 /sys" + +pkg_postinst_${PN} () { + ln -sf ${bindir}/kexecboot $D/init +} BBCLASSEXTEND = "klibc" -- cgit 1.2.3-korg