Patchwork [1/2] boot-directdisk: remove the default setting of SYSLINUXCFG and SYSLINUXMENU

login
register
mail settings
Submitter Saul Wold
Date April 10, 2012, 9:49 p.m.
Message ID <560645d66f6a67d7a23531a3002d19ab37db1d01.1334094326.git.sgw@linux.intel.com>
Download mbox | patch
Permalink /patch/25537/
State Accepted
Commit 215ea5ea8b97270a3602b3f20469226a56442552
Headers show

Comments

Saul Wold - April 10, 2012, 9:49 p.m.
These two should get setup in {S} and installed into {HDDDIR}, by
having them defined with {HDDDIR} they try to get created when the
directory does not exist yet.

Signed-off-by: Saul Wold <sgw@linux.intel.com>
---
 meta/classes/boot-directdisk.bbclass |    3 ---
 1 files changed, 0 insertions(+), 3 deletions(-)
Darren Hart - April 10, 2012, 10:05 p.m.
On 04/10/2012 02:49 PM, Saul Wold wrote:
> These two should get setup in {S} and installed into {HDDDIR}, by
> having them defined with {HDDDIR} they try to get created when the
> directory does not exist yet.

And they conflict with the syslinux.bbclass which now has appropriate
defaults. This is cruft left over from resurrecting directdisk.

> 
> Signed-off-by: Saul Wold <sgw@linux.intel.com>

Acked-by: Darren Hart <dvhart@linux.intel.com>

> ---
>  meta/classes/boot-directdisk.bbclass |    3 ---
>  1 files changed, 0 insertions(+), 3 deletions(-)
> 
> diff --git a/meta/classes/boot-directdisk.bbclass b/meta/classes/boot-directdisk.bbclass
> index e9e1ba3..7d8f8ff 100644
> --- a/meta/classes/boot-directdisk.bbclass
> +++ b/meta/classes/boot-directdisk.bbclass
> @@ -40,9 +40,6 @@ AUTO_SYSLINUXCFG = "1"
>  SYSLINUX_ROOT ?= "root=/dev/sda2"
>  SYSLINUX_TIMEOUT ?= "10"
>  
> -SYSLINUXCFG  = "${HDDDIR}/syslinux.cfg"
> -SYSLINUXMENU = "${HDDDIR}/menu"
> -
>  inherit syslinux
>  		
>  build_boot_dd() {

Patch

diff --git a/meta/classes/boot-directdisk.bbclass b/meta/classes/boot-directdisk.bbclass
index e9e1ba3..7d8f8ff 100644
--- a/meta/classes/boot-directdisk.bbclass
+++ b/meta/classes/boot-directdisk.bbclass
@@ -40,9 +40,6 @@  AUTO_SYSLINUXCFG = "1"
 SYSLINUX_ROOT ?= "root=/dev/sda2"
 SYSLINUX_TIMEOUT ?= "10"
 
-SYSLINUXCFG  = "${HDDDIR}/syslinux.cfg"
-SYSLINUXMENU = "${HDDDIR}/menu"
-
 inherit syslinux
 		
 build_boot_dd() {