summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorKostiantyn Bushko <kbushko@intellias.com>2020-01-23 10:54:45 +0200
committerKostiantyn Bushko <kbushko@intellias.com>2020-01-23 10:54:45 +0200
commit52f60c0dd1948d197cc051baa1b828521679c174 (patch)
tree47d5647d3e67cd403a5d4e45d01f90b0be941a4f
parentad01ab114dd83edda61c06aa01fd899c80ee0a68 (diff)
downloadmeta-updater-feat/OTA-2937/non-ostree-build.tar.gz
Fix default uboot-enable variable in qemu command scriptfeat/OTA-2937/non-ostree-build
Signed-off-by: Kostiantyn Bushko <kbushko@intellias.com>
-rwxr-xr-xscripts/envsetup.sh2
-rw-r--r--scripts/qemucommand.py2
2 files changed, 2 insertions, 2 deletions
diff --git a/scripts/envsetup.sh b/scripts/envsetup.sh
index 5b3b068..a7ee877 100755
--- a/scripts/envsetup.sh
+++ b/scripts/envsetup.sh
@@ -45,7 +45,7 @@ if [[ ! -f "${BUILDDIR}/conf/local.conf" ]]; then
45 cat "${METADIR}/meta-updater/conf/include/bblayers/sota_${MACHINE}.inc" >> conf/bblayers.conf 45 cat "${METADIR}/meta-updater/conf/include/bblayers/sota_${MACHINE}.inc" >> conf/bblayers.conf
46 sed -e "s/##MACHINE##/$MACHINE/g" \ 46 sed -e "s/##MACHINE##/$MACHINE/g" \
47 -e "s/##DISTRO##/$DISTRO/g" \ 47 -e "s/##DISTRO##/$DISTRO/g" \
48 "${METADIR}/meta-updater/conf/$BASE_CONF" >> conf/local.conf 48 "${METADIR}/meta-updater/conf/$BASE_CONF" >> conf/local.conf
49 49
50 for config in ${DISTRO_CONFIGS[@]}; do 50 for config in ${DISTRO_CONFIGS[@]}; do
51 if [[ "$BASE_CONF" != "$config" ]]; then 51 if [[ "$BASE_CONF" != "$config" ]]; then
diff --git a/scripts/qemucommand.py b/scripts/qemucommand.py
index bd7b890..86b5b9f 100644
--- a/scripts/qemucommand.py
+++ b/scripts/qemucommand.py
@@ -41,7 +41,7 @@ def random_mac():
41class QemuCommand(object): 41class QemuCommand(object):
42 def __init__(self, args): 42 def __init__(self, args):
43 print(args) 43 print(args)
44 self.enable_u_boot = None 44 self.enable_u_boot = True
45 self.dry_run = args.dry_run 45 self.dry_run = args.dry_run
46 self.overlay = args.overlay 46 self.overlay = args.overlay
47 self.host_fwd = None 47 self.host_fwd = None