diff options
| author | Tim 'timtim' Ellis <tim.ellis@foonas.org> | 2009-02-02 18:27:28 +0000 |
|---|---|---|
| committer | Tim 'timtim' Ellis <tim.ellis@foonas.org> | 2009-02-02 18:27:28 +0000 |
| commit | 8dfef90d3425764e078e53d84b7bd45a1a8f6a10 (patch) | |
| tree | 3280daf7d1e2415ef749c4231c5cac2a8b90921c | |
| parent | 60fabe643960cfee39e3de65c1031ff8e42ec652 (diff) | |
| parent | e63550e3b306bc6d6261ebdad7ff639ae128a90c (diff) | |
Merge branch 'org.openembedded.dev' of git@git.openembedded.net:openembedded into org.openembedded.dev
| -rw-r--r-- | conf/machine/include/kexecboot.inc | 1 | ||||
| -rw-r--r-- | packages/kexecboot/initramfs-kexecboot-image.bb | 1 | ||||
| -rw-r--r-- | packages/kexecboot/linux-kexecboot.inc | 2 |
3 files changed, 3 insertions, 1 deletions
diff --git a/conf/machine/include/kexecboot.inc b/conf/machine/include/kexecboot.inc index deaccb3add..0a9f209fe2 100644 --- a/conf/machine/include/kexecboot.inc +++ b/conf/machine/include/kexecboot.inc @@ -5,6 +5,7 @@ MACHINE_FEATURES_append = " kexecboot " IMAGE_FSTYPES += " tar.gz " +EXTRA_IMAGEDEPENDS += "linux-kexecboot" # Include Kernel image in kexecboot enabled images RDEPENDS_kernel-base = "kernel-image" diff --git a/packages/kexecboot/initramfs-kexecboot-image.bb b/packages/kexecboot/initramfs-kexecboot-image.bb index 3fc3c93f3e..1e06703a6d 100644 --- a/packages/kexecboot/initramfs-kexecboot-image.bb +++ b/packages/kexecboot/initramfs-kexecboot-image.bb @@ -10,5 +10,6 @@ IMAGE_DEVICE_TABLES_h2200 = "device_table-oldmmc.txt" export IMAGE_BASENAME = "initramfs-kexecboot-image" +EXTRA_IMAGEDEPENDS = "" IMAGE_INSTALL = "kexecboot" IMAGE_LINGUAS = "" diff --git a/packages/kexecboot/linux-kexecboot.inc b/packages/kexecboot/linux-kexecboot.inc index 9d4ce03796..86c4ebbbbe 100644 --- a/packages/kexecboot/linux-kexecboot.inc +++ b/packages/kexecboot/linux-kexecboot.inc @@ -27,7 +27,7 @@ TKSRC = "http://www.informatik.hu-berlin.de/~tkunze/zaurus/patches" KERNEL_IMAGE_BASE_NAME = "${KERNEL_IMAGETYPE}-kexecboot-${PV}-${PR}-${MACHINE}" KERNEL_IMAGE_SYMLINK_NAME = "${KERNEL_IMAGETYPE}-kexecboot-${MACHINE}" -do_compile[depends] += "${INITRAMFS_IMAGE}:do_rootfs" +do_configure[depends] += "${INITRAMFS_IMAGE}:do_rootfs" do_configure_append() { sed -i -e /CONFIG_BLK_DEV_INITRD/d \ |