do not force build of linux-kexecboot
cover do not force build of linux-kexecboot
* This patchset makes minor changes to the initramfs-kexecboot images
* in order to make clear there are two binaries inside.
* Following patches are Zaurus-specific and allow to build generic images
* without building zaurus-installer (which builds linux-kexecboot)
Andrea Adami (3):
initramfs-kexecboot(-klibc)-image: explicitly install kexec(-klibc)
kexecboot-cfg: Inhibit toolchain dependencies and echo
$DISTRO_VERSION
zaurus.inc: decouple build of zaurus-installer (and linux-kexecboot)
conf/machine/include/initramfs-kexecboot.inc | 18 ------------------ conf/machine/include/zaurus.inc | 14 +++++++++----- recipes-bsp/images/initramfs-kexecboot-image.bb | 2 +- .../images/initramfs-kexecboot-klibc-image.bb | 2 +- recipes-bsp/kexecboot/kexecboot-cfg_0.1.bb | 6 ++++-- 5 files changed, 15 insertions(+), 27 deletions(-) delete mode 100644 conf/machine/include/initramfs-kexecboot.inc
Signature · 1 line
1.7.3.4
PATCH 1/3 initramfs-kexecboot(-klibc)-image: explicitly install kexec(-klibc)
* for clarity, specify we just install the two binaries
* (despite the fact that kexec is a runtime dependency for kexecboot)
--- recipes-bsp/images/initramfs-kexecboot-image.bb | 2 +- .../images/initramfs-kexecboot-klibc-image.bb | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-)
recipes-bsp/images/initramfs-kexecboot-image.bb +1 -1
@@ -9,7 +9,7 @@ IMAGE_FSTYPES = "${INITRAMFS_FSTYPES}" # avoid circular dependencies EXTRA_IMAGEDEPENDS = "" -IMAGE_INSTALL = "kexecboot" +IMAGE_INSTALL = "kexec kexecboot" # Do not pollute the initrd image with rootfs features IMAGE_FEATURES = ""
recipes-bsp/images/initramfs-kexecboot-klibc-image.bb +1 -1
@@ -1,5 +1,5 @@ require initramfs-kexecboot-image.bb -IMAGE_INSTALL = "kexecboot-klibc" +IMAGE_INSTALL = "kexec-klibc kexecboot-klibc" export IMAGE_BASENAME = "initramfs-kexecboot-klibc-image"
Signature · 1 line
1.7.3.4
PATCH 2/3 kexecboot-cfg: Inhibit toolchain dependencies and echo $DISTRO_VERSION
In reply to Andrea Adami* $DISTRO_VERSION is always set and is more detailed
* bump PR
--- recipes-bsp/kexecboot/kexecboot-cfg_0.1.bb | 6 ++++-- 1 files changed, 4 insertions(+), 2 deletions(-)
recipes-bsp/kexecboot/kexecboot-cfg_0.1.bb +4 -2
@@ -3,7 +3,9 @@ SECTION = "base" LICENSE = "MIT" LIC_FILES_CHKSUM = "file://${COREBASE}/LICENSE;md5=3f40d7994397109285ec7b81fdeb3b58" -PR = "r12" +PR = "r13" + +INHIBIT_DEFAULT_DEPS = "1" SRC_URI = "file://icon.xpm"
@@ -20,7 +22,7 @@ echo '# First kernel stanza. KERNEL=/boot/${KERNEL_IMAGETYPE} # Show this label in kexecboot menu. -LABEL=${DISTRO}-${MACHINE} +LABEL=${DISTRO_VERSION}-${MACHINE} # # Append this tags to the kernel cmdline. APPEND=${CMDLINE} ${CMDLINE_DEBUG}
Signature · 1 line
1.7.3.4
Re: [meta-handheld] [PATCH 2/3] kexecboot-cfg: Inhibit toolchain dependencies and echo $DISTRO_VERSION
Quoted 1 line · On Thursday 19 January 2012 00:52:58 Andrea Adami wrote:
* $DISTRO_VERSION is always set and is more detailed
I just looked at Poky and Angstrom and neither of these have the distro name in DISTRO_VERSION, so this patch would lose that; would there be sufficient room to include both variables?
Cheers,
Paul
Signature · 2 lines
Paul Eggleton Intel Open Source Technology Centre
Re: [meta-handheld] [PATCH 2/3] kexecboot-cfg: Inhibit toolchain dependencies and echo $DISTRO_VERSION
Il giorno 20/gen/2012, alle ore 13:22, Paul Eggleton <[email protected]> ha scritto:
Quoted 7 lines · On Thursday 19 January 2012 00:52:58 Andrea Adami wrote:
Quoted 1 line
* $DISTRO_VERSION is always set and is more detailed
I just looked at Poky and Angstrom and neither of these have the distro name in
DISTRO_VERSION, so this patch would lose that; would there be sufficient room to include both variables?
Hm...building distro-less I get 'oe-core-0' or alike as DISTRO_VERSION. I fear both could make the label too long.
Regards
Andrea
Quoted 7 lines
Cheers,
PaulSignature · 2 lines
Paul Eggleton Intel Open Source Technology Centre
PATCH 3/3 zaurus.inc: decouple build of zaurus-installer (and linux-kexecboot)
In reply to Andrea Adami* Once flashed on device there isn't any advantage rebuilding
* initramfs images for linux-kexecboot on each image build. *
* One would bitbake zaurus-installer only when needed.
--- conf/machine/include/initramfs-kexecboot.inc | 18 ------------------ conf/machine/include/zaurus.inc | 14 +++++++++----- 2 files changed, 9 insertions(+), 23 deletions(-) delete mode 100644 conf/machine/include/initramfs-kexecboot.inc
conf/machine/include/initramfs-kexecboot.inc deleted +0 -18
@@ -1,18 +0,0 @@ -# Initramfs-kexecboot extra config - - -# If set here, each image will also build linux-kexecboot. -# Usually the machine-installer recipe already DEPENDS on it -# -EXTRA_IMAGEDEPENDS += "linux-kexecboot" - - -# Force inclusion of kernel in target images -# (done by default) -# -RDEPENDS_kernel-base = "kernel-image" - - -# Install /boot/boot.cfg in target images -# -MACHINE_ESSENTIAL_EXTRA_RRECOMMENDS_append = " kexecboot-cfg "
conf/machine/include/zaurus.inc +9 -5
@@ -16,8 +16,6 @@ INITRAMFS_FSTYPES ?= "cpio.gz cpio.lzma" EXTRA_IMAGECMD_jffs2 = "-p -l --eraseblock=${ERASEBLOCKSIZE}" EXTRA_IMAGECMD_sum.jffs2 = "${EXTRA_IMAGECMD_jffs2}" -EXTRA_IMAGEDEPENDS += "zaurus-installer" - IMAGE_DEVICE_TABLES = "" #########
@@ -74,11 +72,17 @@ MACHINE_EXTRA_RDEPENDS_collie = "zaurusd" # MACHINE_EXTRA_RRECOMMENDS_tosa = "apm-tosa-suspendfix" ################################## -# build kexecboot kernel while -# making sure rootfs is compatible +# Zaurus rootfs are booted by +# linux-kexecboot ################################## -require conf/machine/include/initramfs-kexecboot.inc +# If set here, each image will also build linux-kexecboot and the updater +# EXTRA_IMAGEDEPENDS += "zaurus-installer" + +# Install /boot/boot.cfg in target images +MACHINE_ESSENTIAL_EXTRA_RRECOMMENDS_append = " kexecboot-cfg " + + # FIXME # blindly import from linux-rp.inc (2.6.2x)
Signature · 1 line
1.7.3.4
Paul Eggleton
AppliedQuoted 11 lines · On Thursday 19 January 2012 00:52:56 Andrea Adami wrote:
* This patchset makes minor changes to the initramfs-kexecboot images
* in order to make clear there are two binaries inside.
* Following patches are Zaurus-specific and allow to build generic images
* without building zaurus-installer (which builds linux-kexecboot)Andrea Adami (3):
initramfs-kexecboot(-klibc)-image: explicitly install kexec(-klibc)
kexecboot-cfg: Inhibit toolchain dependencies and echo
$DISTRO_VERSION
zaurus.inc: decouple build of zaurus-installer (and linux-kexecboot)
Quoted 8 lines
conf/machine/include/initramfs-kexecboot.inc | 18 ------------------ conf/machine/include/zaurus.inc | 14 +++++++++----- recipes-bsp/images/initramfs-kexecboot-image.bb | 2 +- .../images/initramfs-kexecboot-klibc-image.bb | 2 +- recipes-bsp/kexecboot/kexecboot-cfg_0.1.bb | 6 ++++-- 5 files changed, 15 insertions(+), 27 deletions(-) delete mode 100644 conf/machine/include/initramfs-kexecboot.inc
Merged to meta-handheld after some minor reworking of 3/3.
Thanks!
Cheers,
Paul
Signature · 2 lines
Paul Eggleton Intel Open Source Technology Centre