summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRobert Yang <liezhi.yang@windriver.com>2016-02-24 01:23:56 -0800
committerRichard Purdie <richard.purdie@linuxfoundation.org>2016-02-28 11:33:02 +0000
commita87574cd7ebe30382e5a58b7a074b587adf70cbc (patch)
tree09affd36cfbef86c848f5db63ab7a76fc492ecec
parent76eb8154f1dc5df49daa29d6745077137561b187 (diff)
downloadpoky-a87574cd7ebe30382e5a58b7a074b587adf70cbc.tar.gz
image-live/boot-directdisk.bbclass: remove AUTO_SYSLINUXCFG
No one uses it. (From OE-Core rev: d2eba0a5b67936983ad85766349f7afa4bdb70e8) Signed-off-by: Robert Yang <liezhi.yang@windriver.com> Signed-off-by: Ross Burton <ross.burton@intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
-rw-r--r--meta/classes/boot-directdisk.bbclass1
-rw-r--r--meta/classes/image-live.bbclass1
2 files changed, 0 insertions, 2 deletions
diff --git a/meta/classes/boot-directdisk.bbclass b/meta/classes/boot-directdisk.bbclass
index ee8c74438c..ce637b89d7 100644
--- a/meta/classes/boot-directdisk.bbclass
+++ b/meta/classes/boot-directdisk.bbclass
@@ -58,7 +58,6 @@ inherit ${EFI_CLASS}
58 58
59# Get the build_syslinux_cfg() function from the syslinux class 59# Get the build_syslinux_cfg() function from the syslinux class
60 60
61AUTO_SYSLINUXCFG = "1"
62DISK_SIGNATURE ?= "${DISK_SIGNATURE_GENERATED}" 61DISK_SIGNATURE ?= "${DISK_SIGNATURE_GENERATED}"
63SYSLINUX_ROOT ?= "root=/dev/sda2" 62SYSLINUX_ROOT ?= "root=/dev/sda2"
64SYSLINUX_TIMEOUT ?= "10" 63SYSLINUX_TIMEOUT ?= "10"
diff --git a/meta/classes/image-live.bbclass b/meta/classes/image-live.bbclass
index d2314aaf0a..badf40de54 100644
--- a/meta/classes/image-live.bbclass
+++ b/meta/classes/image-live.bbclass
@@ -1,5 +1,4 @@
1 1
2AUTO_SYSLINUXCFG = "1"
3INITRD_IMAGE ?= "core-image-minimal-initramfs" 2INITRD_IMAGE ?= "core-image-minimal-initramfs"
4INITRD ?= "${DEPLOY_DIR_IMAGE}/${INITRD_IMAGE}-${MACHINE}.cpio.gz" 3INITRD ?= "${DEPLOY_DIR_IMAGE}/${INITRD_IMAGE}-${MACHINE}.cpio.gz"
5SYSLINUX_ROOT ?= "root=/dev/ram0" 4SYSLINUX_ROOT ?= "root=/dev/ram0"