summaryrefslogtreecommitdiff
path: root/meta-openembedded/meta-multimedia/recipes-multimedia/mycroft/files/0002-dev_setup.sh-Remove-the-git-dependency.patch
diff options
context:
space:
mode:
authorBrad Bishop <bradleyb@fuzziesquirrel.com>2019-10-21 15:11:42 +0300
committerBrad Bishop <bradleyb@fuzziesquirrel.com>2019-10-21 15:11:49 +0300
commit6a62e0e0f4642841f3956fe2977f9d57766c2f2b (patch)
treec158ee7227dd3b9137b3bad7f84358258868b5a9 /meta-openembedded/meta-multimedia/recipes-multimedia/mycroft/files/0002-dev_setup.sh-Remove-the-git-dependency.patch
parent87ad221ffb3753e69264f664dcfc4f8a2e3d9081 (diff)
downloadopenbmc-6a62e0e0f4642841f3956fe2977f9d57766c2f2b.tar.xz
meta-openembedded: subtree update:1bfaa2e63a..64224b92e5
Adrian Bunk (1): networkmanager: Upgrade 1.18.2 -> 1.18.4 Alistair Francis (5): mycroft: Bump to 19.8.1 mycroft: Run the files from /var python3-monotonic: Initial commit of version 1.5 python3-msk: Initial commit of version 0.3.13 python3-google-api-python-client: Initial commit of 1.7.11 Andreas Müller (3): exiv2: initial add 0.27.1 menulibre: upgrade 2.2.0 -> 2.2.1 libmbim: upgrade 1.18.0 -> 1.20.0 Callaghan, Dan (1): strongswan: add a PACKAGECONFIG for libbfd stack traces Changqing Li (1): kea: fix kea-dhcp4.service/kea-dhcp6.service start up failed Christophe PRIOUZEAU (14): xfce4-mpc-plugin: Clarify BSD license variant xfce4-diskperf-plugin: Clarify BSD license variant xfce4-wavelan-plugin: Clarify BSD license variant libmpdclient: Clarify BSD license variant tremor: Clarify BSD license variant xscreensaver: Clarify BSD license variant openjpeg: Clarify BSD license variant sdparm: Clarify BSD license variant onig: Clarify BSD license variant libssh2: Clarify BSD license variant libsmi: Clarify BSD license variant libinih: Clarify BSD license variant gperftools: Clarify BSD license variant daemonize: Clarify BSD license variant Fabio Berton (1): ifplugd: Add recipe for version 0.28 George Kiagiadakis (1): pipewire: Initial add of 0.2.7 Hongxu Jia (1): lvm2/libdevmapper: 2.03.02 -> 2.03.05 Khem Raj (4): wvstreams,wvdial: Mark incompatible for musl pidgin-sipe: Upgrade to 1.25.0 dconf: Upgrade to 0.34.0 libsmi: Fix and operator per SPDX Martin Siegumfeldt (3): Revert "libiio: fix build of python bindins" libiio: allow python3 bindings to be built libiio: bump to version 0.18+ Stefan Wiehler (1): nvme-cli: defer host ID generation to post installation Tekkub (1): nlohmann-fifo: Add recipe Trevor Gamblin (2): rsyslog: fix CVE-2019-17041 quagga: fix PIDFile path for service files Yi Zhao (2): freeradius: fix CVE-2019-10143 ipvsadm: install initscript to /etc/init.d Zang Ruochen (9): python-paste: upgrade 3.2.1 -> 3.2.2 python-pip: upgrade 19.2.3 -> 19.3 python-pyasn1-modules: upgrade 0.2.6 -> 0.2.7 python-pytest: upgrade 5.1.3 -> 5.2.1 python-pytz: upgrade 2019.2 -> 2019.3 python-xxhash: upgrade 1.4.1 -> 1.4.2 python-cffi: upgrade 1.12.3 -> 1.13.0 python-jsonschema: upgrade 3.0.2 -> 3.1.1 protobuf: upgrade 3.9.2 -> 3.10.0 Change-Id: I72806dd6bfe6427787917f687d058c6ced02a00c Signed-off-by: Brad Bishop <bradleyb@fuzziesquirrel.com>
Diffstat (limited to 'meta-openembedded/meta-multimedia/recipes-multimedia/mycroft/files/0002-dev_setup.sh-Remove-the-git-dependency.patch')
-rw-r--r--meta-openembedded/meta-multimedia/recipes-multimedia/mycroft/files/0002-dev_setup.sh-Remove-the-git-dependency.patch48
1 files changed, 48 insertions, 0 deletions
diff --git a/meta-openembedded/meta-multimedia/recipes-multimedia/mycroft/files/0002-dev_setup.sh-Remove-the-git-dependency.patch b/meta-openembedded/meta-multimedia/recipes-multimedia/mycroft/files/0002-dev_setup.sh-Remove-the-git-dependency.patch
new file mode 100644
index 000000000..dd2431fdf
--- /dev/null
+++ b/meta-openembedded/meta-multimedia/recipes-multimedia/mycroft/files/0002-dev_setup.sh-Remove-the-git-dependency.patch
@@ -0,0 +1,48 @@
+From 88696037af52d6a7f57bc0fb82598de1a25365cc Mon Sep 17 00:00:00 2001
+From: Alistair Francis <alistair.francis@wdc.com>
+Date: Fri, 29 Mar 2019 16:09:57 -0700
+Subject: [PATCH 2/5] dev_setup.sh: Remove the git dependency
+
+Signed-off-by: Alistair Francis <alistair.francis@wdc.com>
+Upstream-Status: Inappropriate [embedded specific]
+---
+ dev_setup.sh | 16 ----------------
+ 1 file changed, 16 deletions(-)
+
+diff --git a/dev_setup.sh b/dev_setup.sh
+index 99a44bfd8a7..672b27080c2 100755
+--- a/dev_setup.sh
++++ b/dev_setup.sh
+@@ -340,10 +340,6 @@ ${YELLOW}Make sure to manually install:$BLUE git python3 python-setuptools pytho
+
+ install_deps
+
+-# Configure to use the standard commit template for
+-# this repo only.
+-git config commit.template .gitmessage
+-
+ # Check whether to build mimic (it takes a really long time!)
+ build_mimic='n'
+ if [[ $opt_forcemimicbuild == true ]] ; then
+@@ -371,18 +367,6 @@ else
+ fi
+ fi
+
+-# Install pep8 pre-commit hook
+-HOOK_FILE='./.git/hooks/pre-commit'
+-if [[ -n $INSTALL_PRECOMMIT_HOOK ]] || grep -q 'MYCROFT DEV SETUP' $HOOK_FILE; then
+- if [[ ! -f $HOOK_FILE ]] || grep -q 'MYCROFT DEV SETUP' $HOOK_FILE; then
+- echo 'Installing PEP8 check as precommit-hook'
+- echo "#! $(which python)" > $HOOK_FILE
+- echo '# MYCROFT DEV SETUP' >> $HOOK_FILE
+- cat ./scripts/pre-commit >> $HOOK_FILE
+- chmod +x $HOOK_FILE
+- fi
+-fi
+-
+ PYTHON=$(python -c "import sys;print('python{}.{}'.format(sys.version_info[0], sys.version_info[1]))")
+
+ # install required python modules
+--
+2.23.0
+