Преглед на файлове

Try ignoring optional packages

Bob Mottram преди 7 години
родител
ревизия
38665c7cf1
променени са 1 файла, в които са добавени 5 реда и са изтрити 13 реда
  1. 5
    13
      src/freedombone-app-peertube

+ 5
- 13
src/freedombone-app-peertube Целия файл

@@ -616,6 +616,8 @@ function mesh_install_peertube {
616 616
     fi
617 617
 
618 618
     chroot "$rootdir" apt-get -yq install ffmpeg
619
+    chroot "$rootdir" apt-get -yq install -y gcc-multilib
620
+    chroot "$rootdir" apt-get -yq install -y g++-multilib
619 621
 
620 622
     function_check install_postgresql
621 623
     install_postgresql
@@ -642,28 +644,18 @@ if [ ! "$?" = "0" ]; then
642 644
     echo $'PeerTube Failed to install yarn'
643 645
     exit 79353234
644 646
 fi
645
-npm install --arch=$NPM_ARCH bcrypt@1.0.3 --build-from-source
646
-if [ ! "$?" = "0" ]; then
647
-    echo $'PeerTube failed to build bcrypt'
648
-    exit 73563543
649
-fi
650
-npm install --arch=$NPM_ARCH fsevents@1.1.3 --build-from-source
651
-if [ ! "$?" = "0" ]; then
652
-    echo $'PeerTube failed to build fsevents'
653
-    exit 2846393
654
-fi
655 647
 yarn add -D webpack --network-concurrency 1
656
-yarn install
648
+yarn install --ignore-optional
657 649
 if [ ! "$?" = "0" ]; then
658 650
     echo $'PeerTube failed to run yarn install'
659 651
     exit 63754235
660 652
 fi
661
-npm install --arch=$NPM_ARCH
653
+npm install --arch=$NPM_ARCH --no-optional
662 654
 if [ ! "$?" = "0" ]; then
663 655
     echo $'PeerTube failed to install peertube'
664 656
     exit 7835243
665 657
 fi
666
-npm run build --arch=$NPM_ARCH
658
+npm run build --arch=$NPM_ARCH --no-optional
667 659
 if [ ! "$?" = "0" ]; then
668 660
     echo $'PeerTube failed to build peertube'
669 661
     exit 5293593