diff options
author | Ed Tanous <ed.tanous@intel.com> | 2019-04-15 23:11:05 +0300 |
---|---|---|
committer | Ed Tanous <ed.tanous@intel.com> | 2019-04-15 23:11:05 +0300 |
commit | a75bff085ba9443315222231c42692745e5781e9 (patch) | |
tree | e1aa422babae0dffc866af076a0274ff26c2c4b2 /meta-openembedded/meta-multimedia/recipes-multimedia/mycroft/files/0005-dev_setup.sh-Remove-the-test-setup-dependency.patch | |
parent | 3e809d0d5cf96c18c5720d1b6b3b53e9f4c0cfae (diff) | |
parent | 6d4bcf0a75b2a6055055c9ad8ed6b93599082385 (diff) | |
download | openbmc-a75bff085ba9443315222231c42692745e5781e9.tar.xz |
Merge branch 'master' of ssh://git-amr-1.devtools.intel.com:29418/openbmc-openbmc into intel
Diffstat (limited to 'meta-openembedded/meta-multimedia/recipes-multimedia/mycroft/files/0005-dev_setup.sh-Remove-the-test-setup-dependency.patch')
-rw-r--r-- | meta-openembedded/meta-multimedia/recipes-multimedia/mycroft/files/0005-dev_setup.sh-Remove-the-test-setup-dependency.patch | 31 |
1 files changed, 31 insertions, 0 deletions
diff --git a/meta-openembedded/meta-multimedia/recipes-multimedia/mycroft/files/0005-dev_setup.sh-Remove-the-test-setup-dependency.patch b/meta-openembedded/meta-multimedia/recipes-multimedia/mycroft/files/0005-dev_setup.sh-Remove-the-test-setup-dependency.patch new file mode 100644 index 000000000..5ae868376 --- /dev/null +++ b/meta-openembedded/meta-multimedia/recipes-multimedia/mycroft/files/0005-dev_setup.sh-Remove-the-test-setup-dependency.patch @@ -0,0 +1,31 @@ +From 7fc38ae0dec30789fa0d365f1764f4950b700a98 Mon Sep 17 00:00:00 2001 +From: Alistair Francis <alistair.francis@wdc.com> +Date: Tue, 2 Apr 2019 16:52:44 -0700 +Subject: [PATCH 5/5] dev_setup.sh: Remove the test setup dependency + +Signed-off-by: Alistair Francis <alistair.francis@wdc.com> +Upstream-Status: Inappropriate [embedded specific] + +Signed-off-by: Alistair Francis <alistair.francis@wdc.com> +--- + dev_setup.sh | 4 ---- + 1 file changed, 4 deletions(-) + +diff --git a/dev_setup.sh b/dev_setup.sh +index c6aa783e1ef..bcfaa0c16c2 100755 +--- a/dev_setup.sh ++++ b/dev_setup.sh +@@ -353,10 +353,6 @@ if ! pip3 install -r requirements.txt ; then + fi + fi + +-if ! pip3 install -r test-requirements.txt ; then +- echo "Warning test requirements wasn't installed, Note: normal operation should still work fine..." +-fi +- + SYSMEM=$( free | awk '/^Mem:/ { print $2 }' ) + MAXCORES=$(($SYSMEM / 512000)) + MINCORES=1 +-- +2.21.0 + |