poky: reset subtree on master HEAD(a88251b3e7)
As part of the last subtree update, I used master-next as the
subtree basis because there was a fix we needed in order to get QEMU
to pass. I didn't realize that master-next deviated (because they use
to just have short-term patches in it). Reset the content to the same
fix but from the master branch.
Change-Id: Ic7d2f0ac42e9da3eb263586b26ba56d8798d5bcf
Signed-off-by: Patrick Williams <patrick@stwcx.xyz>
diff --git a/poky/scripts/oe-setup-build b/poky/scripts/oe-setup-build
index c047699..5364f2b 100755
--- a/poky/scripts/oe-setup-build
+++ b/poky/scripts/oe-setup-build
@@ -91,16 +91,7 @@
builddir = args.b if args.b else template["buildpath"]
no_shell = args.no_shell
coredir = os.path.abspath(os.path.join(os.path.dirname(os.path.realpath(__file__)), '..'))
- cmd_base = ". {} {}".format(os.path.join(coredir, 'oe-init-build-env'), os.path.abspath(builddir))
-
- initbuild = os.path.join(builddir, 'init-build-env')
- if not os.path.exists(initbuild):
- os.makedirs(builddir, exist_ok=True)
- with open(initbuild, 'w') as f:
- f.write(cmd_base)
- print("\nRun '. {}' to initialize the build in a current shell session.\n".format(initbuild))
-
- cmd = "TEMPLATECONF={} {}".format(template["templatepath"], cmd_base)
+ cmd = "TEMPLATECONF={} . {} {}".format(template["templatepath"], os.path.join(coredir, 'oe-init-build-env'), builddir)
if not no_shell:
cmd = cmd + " && {}".format(os.environ['SHELL'])
print("Running:", cmd)