From 747d8eec1f2b19751172f958dc518b7c865494f1 Mon Sep 17 00:00:00 2001 From: Andrea Adami Date: Tue, 7 Apr 2009 00:10:28 +0200 Subject: [PATCH] initramfs-kexecboot-image: fix EXTRA_IMAGEDEPENDS for all Zaurus --- conf/machine/include/zaurus-2.6.inc | 4 ++-- conf/machine/include/zaurus-clamshell.inc | 3 +-- recipes/kexecboot/initramfs-kexecboot-image.bb | 4 ++-- 3 files changed, 5 insertions(+), 6 deletions(-) diff --git a/conf/machine/include/zaurus-2.6.inc b/conf/machine/include/zaurus-2.6.inc index 5ce1cdca6a..61b636bebb 100644 --- a/conf/machine/include/zaurus-2.6.inc +++ b/conf/machine/include/zaurus-2.6.inc @@ -10,8 +10,8 @@ ERASEBLOCKSIZE_akita = "0x20000" EXTRA_IMAGECMD_jffs2 = "--little-endian --eraseblock=${ERASEBLOCKSIZE} --pad --faketime -n" -ZAURUS-UPDATER = "zaurus-updater" -EXTRA_IMAGEDEPENDS += "${ZAURUS-UPDATER}" +EXTRA_IMAGEDEPENDS += "zaurus-updater" +KEXECBOOT_IMAGEDEPENDS = "zaurus-updater" SERIAL_CONSOLE = "115200 ttyS0" diff --git a/conf/machine/include/zaurus-clamshell.inc b/conf/machine/include/zaurus-clamshell.inc index df4e243eef..714380e9aa 100644 --- a/conf/machine/include/zaurus-clamshell.inc +++ b/conf/machine/include/zaurus-clamshell.inc @@ -3,9 +3,8 @@ include conf/machine/include/tune-xscale.inc UBOOT_ENTRYPOINT = "0x80008000" UBOOT_LOADADDRESS = "0x80008000" - -LEGACY_IMAGEDEPENDS = "${ZAURUS-UPDATER} sharp-flash-header-c700" EXTRA_IMAGEDEPENDS += "sharp-flash-header-c700" +KEXECBOOT_IMAGEDEPENDS += "sharp-flash-header-c700" IMAGE_CMD_jffs2 = "mkfs.jffs2 --root=${IMAGE_ROOTFS} --faketime -m favourlzo \ --output=${T}/${IMAGE_NAME}.rootfs.jffs2 --pad --little-endian --eraseblock=${ERASEBLOCKSIZE} -n \ diff --git a/recipes/kexecboot/initramfs-kexecboot-image.bb b/recipes/kexecboot/initramfs-kexecboot-image.bb index 1aacceaa30..385bd258ea 100644 --- a/recipes/kexecboot/initramfs-kexecboot-image.bb +++ b/recipes/kexecboot/initramfs-kexecboot-image.bb @@ -10,8 +10,8 @@ IMAGE_DEVICE_TABLES_h2200 = "device_table-oldmmc.txt" export IMAGE_BASENAME = "initramfs-kexecboot-image" -#EXTRA_IMAGEDEPENDS = "" -EXTRA_IMAGEDEPENDS = "${LEGACY_IMAGEDEPENDS}" +# avoid to depend from kexecboot +EXTRA_IMAGEDEPENDS = "${KEXECBOOT_IMAGEDEPENDS}" IMAGE_INSTALL = "kexecboot" IMAGE_LINGUAS = "" -- 2.39.5