diff options
Diffstat (limited to 'meta-multimedia/recipes-multimedia/mycroft/files/0002-dev_setup.sh-Remove-the-git-dependency.patch')
-rw-r--r-- | meta-multimedia/recipes-multimedia/mycroft/files/0002-dev_setup.sh-Remove-the-git-dependency.patch | 48 |
1 files changed, 48 insertions, 0 deletions
diff --git a/meta-multimedia/recipes-multimedia/mycroft/files/0002-dev_setup.sh-Remove-the-git-dependency.patch b/meta-multimedia/recipes-multimedia/mycroft/files/0002-dev_setup.sh-Remove-the-git-dependency.patch new file mode 100644 index 0000000000..dd2431fdf9 --- /dev/null +++ b/meta-multimedia/recipes-multimedia/mycroft/files/0002-dev_setup.sh-Remove-the-git-dependency.patch | |||
@@ -0,0 +1,48 @@ | |||
1 | From 88696037af52d6a7f57bc0fb82598de1a25365cc Mon Sep 17 00:00:00 2001 | ||
2 | From: Alistair Francis <alistair.francis@wdc.com> | ||
3 | Date: Fri, 29 Mar 2019 16:09:57 -0700 | ||
4 | Subject: [PATCH 2/5] dev_setup.sh: Remove the git dependency | ||
5 | |||
6 | Signed-off-by: Alistair Francis <alistair.francis@wdc.com> | ||
7 | Upstream-Status: Inappropriate [embedded specific] | ||
8 | --- | ||
9 | dev_setup.sh | 16 ---------------- | ||
10 | 1 file changed, 16 deletions(-) | ||
11 | |||
12 | diff --git a/dev_setup.sh b/dev_setup.sh | ||
13 | index 99a44bfd8a7..672b27080c2 100755 | ||
14 | --- a/dev_setup.sh | ||
15 | +++ b/dev_setup.sh | ||
16 | @@ -340,10 +340,6 @@ ${YELLOW}Make sure to manually install:$BLUE git python3 python-setuptools pytho | ||
17 | |||
18 | install_deps | ||
19 | |||
20 | -# Configure to use the standard commit template for | ||
21 | -# this repo only. | ||
22 | -git config commit.template .gitmessage | ||
23 | - | ||
24 | # Check whether to build mimic (it takes a really long time!) | ||
25 | build_mimic='n' | ||
26 | if [[ $opt_forcemimicbuild == true ]] ; then | ||
27 | @@ -371,18 +367,6 @@ else | ||
28 | fi | ||
29 | fi | ||
30 | |||
31 | -# Install pep8 pre-commit hook | ||
32 | -HOOK_FILE='./.git/hooks/pre-commit' | ||
33 | -if [[ -n $INSTALL_PRECOMMIT_HOOK ]] || grep -q 'MYCROFT DEV SETUP' $HOOK_FILE; then | ||
34 | - if [[ ! -f $HOOK_FILE ]] || grep -q 'MYCROFT DEV SETUP' $HOOK_FILE; then | ||
35 | - echo 'Installing PEP8 check as precommit-hook' | ||
36 | - echo "#! $(which python)" > $HOOK_FILE | ||
37 | - echo '# MYCROFT DEV SETUP' >> $HOOK_FILE | ||
38 | - cat ./scripts/pre-commit >> $HOOK_FILE | ||
39 | - chmod +x $HOOK_FILE | ||
40 | - fi | ||
41 | -fi | ||
42 | - | ||
43 | PYTHON=$(python -c "import sys;print('python{}.{}'.format(sys.version_info[0], sys.version_info[1]))") | ||
44 | |||
45 | # install required python modules | ||
46 | -- | ||
47 | 2.23.0 | ||
48 | |||