- when creating a shell session for Bitbake, we cannot run "bitbake -e -b recipe.bb" just by setting DISABLE_SANITY_CHECKS=1; we must first append DISABLE_SANITY_CHECKS to BB_ENV_EXTRAWHITE
Signed-off-by: Ioana Grigoropol <ioanax.grigoro...@intel.com> --- .../src/org/yocto/bc/bitbake/BBRecipe.java | 10 +++++----- .../src/org/yocto/bc/bitbake/ShellSession.java | 16 +++++++++------- 2 files changed, 14 insertions(+), 12 deletions(-) diff --git a/plugins/org.yocto.bc.ui/src/org/yocto/bc/bitbake/BBRecipe.java b/plugins/org.yocto.bc.ui/src/org/yocto/bc/bitbake/BBRecipe.java index 7682aee..6a33ade 100644 --- a/plugins/org.yocto.bc.ui/src/org/yocto/bc/bitbake/BBRecipe.java +++ b/plugins/org.yocto.bc.ui/src/org/yocto/bc/bitbake/BBRecipe.java @@ -20,24 +20,24 @@ import java.net.URI; */ public class BBRecipe extends BBSession { private final BBSession session; - private final URI filePath; + private final URI fileURI; public BBRecipe(BBSession session, URI filePath) throws IOException { super(session.shell, session.pinfo.getURI()); this.session = session; - this.filePath = filePath; - this.parsingCmd = "DISABLE_SANITY_CHECKS=1 bitbake -e -b " + filePath; + this.fileURI = filePath; + this.parsingCmd = "DISABLE_SANITY_CHECKS=\"1\" bitbake -e -b " + filePath.getPath(); } @Override public void initialize() throws Exception { if (this.size() == 0) { - System.out.println("Failed to parse " + filePath); + System.out.println("Failed to parse " + fileURI); //throw new IOException("Failed to parse " + filePath); } } protected URI getDefaultDepends() { - return this.filePath; + return this.fileURI; } } diff --git a/plugins/org.yocto.bc.ui/src/org/yocto/bc/bitbake/ShellSession.java b/plugins/org.yocto.bc.ui/src/org/yocto/bc/bitbake/ShellSession.java index a8c46dd..edff746 100644 --- a/plugins/org.yocto.bc.ui/src/org/yocto/bc/bitbake/ShellSession.java +++ b/plugins/org.yocto.bc.ui/src/org/yocto/bc/bitbake/ShellSession.java @@ -46,6 +46,7 @@ public class ShellSession { */ public static final String TERMINATOR = "#234o987dsfkcqiuwey18837032843259d"; public static final String LT = System.getProperty("line.separator"); + public static final String exportCmd = "export BB_ENV_EXTRAWHITE=\"DISABLE_SANITY_CHECKS $BB_ENV_EXTRAWHITE\""; public static String getFilePath(String file) throws IOException { File f = new File(file); @@ -69,7 +70,7 @@ public class ShellSession { private OutputStream pos = null; //private File initFile = null; - private String shellPath = null; +// private String shellPath = null; private final String initCmd; private final IHostFile root; // private final Writer out; @@ -84,10 +85,10 @@ public class ShellSession { // } else { // this.out = out; // } - if (shellType == SHELL_TYPE_SH) { - shellPath = "/bin/sh"; - } - shellPath = "/bin/bash"; +// if (shellType == SHELL_TYPE_SH) { +// shellPath = "/bin/sh"; +// } +// shellPath = "/bin/bash"; initializeShell(new NullProgressMonitor()); } @@ -95,7 +96,8 @@ public class ShellSession { private void initializeShell(IProgressMonitor monitor) throws IOException { try { IHost connection = RemoteHelper.getRemoteConnectionByName(projectInfo.getConnection().getName()); - RemoteHelper.runCommandRemote(connection, new YoctoCommand("source " + initCmd, root.getAbsolutePath(), ""), monitor); + RemoteHelper.runCommandRemote(connection, new YoctoCommand("source " + initCmd, root.getAbsolutePath(), ""), monitor); + RemoteHelper.runCommandRemote(connection, new YoctoCommand(exportCmd, root.getAbsolutePath(), ""), monitor); } catch (Exception e) { e.printStackTrace(); } @@ -110,7 +112,7 @@ public class ShellSession { public String execute(String command, boolean hasErrors) throws IOException { try { IHost connection = RemoteHelper.getRemoteConnectionByName(projectInfo.getConnection().getName()); - hasErrors = RemoteHelper.runCommandRemote(connection, new YoctoCommand(command, root.getAbsolutePath(), ""), new NullProgressMonitor()); + hasErrors = RemoteHelper.runCommandRemote(connection, new YoctoCommand(command, root.getAbsolutePath() + "/build/", ""), new NullProgressMonitor()); return RemoteHelper.getProcessBuffer(connection).getMergedOutputLines(); } catch (Exception e) { e.printStackTrace(); -- 1.7.9.5 _______________________________________________ yocto mailing list yocto@yoctoproject.org https://lists.yoctoproject.org/listinfo/yocto