Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit e7dbb502 authored by Romain Hunault's avatar Romain Hunault 💻
Browse files

Merge branch 'git-lfs' into 'master' 

include git-lfs

See merge request !42
parents f9e79647 c0a1996c

Dockerfile

+1 −1
Original line number Original line Diff line number Diff line
@@ -153,7 +153,7 @@ RUN apt-get -qq update 
RUN apt-get -qqy upgrade

RUN apt-get -qqy upgrade





RUN apt-get install -y bc bison bsdmainutils build-essential ccache cgpt clang cron \

RUN apt-get install -y bc bison bsdmainutils build-essential ccache cgpt clang cron \

      curl flex g++-multilib gcc-multilib git gnupg gperf imagemagick kmod \

      curl flex g++-multilib gcc-multilib git git-lfs gnupg gperf imagemagick kmod \

      lib32ncurses5-dev libncurses5 lib32readline-dev lib32z1-dev libtinfo5 liblz4-tool \

      lib32ncurses5-dev libncurses5 lib32readline-dev lib32z1-dev libtinfo5 liblz4-tool \

      libncurses5-dev libsdl1.2-dev libssl-dev libxml2 \

      libncurses5-dev libsdl1.2-dev libssl-dev libxml2 \

      libxml2-utils lsof lzop maven openjdk-8-jdk pngcrush \

      libxml2-utils lsof lzop maven openjdk-8-jdk pngcrush \

Dockerfile.community

+1 −1
Original line number Original line Diff line number Diff line
@@ -153,7 +153,7 @@ RUN apt-get -qq update 
RUN apt-get -qqy upgrade

RUN apt-get -qqy upgrade





RUN apt-get install -y bc bison bsdmainutils build-essential ccache cgpt clang cron \

RUN apt-get install -y bc bison bsdmainutils build-essential ccache cgpt clang cron \

      curl flex g++-multilib gcc-multilib git gnupg gperf imagemagick kmod \

      curl flex g++-multilib gcc-multilib git git-lfs gnupg gperf imagemagick kmod \

      lib32ncurses5-dev libncurses5 lib32readline-dev lib32z1-dev libtinfo5 liblz4-tool \

      lib32ncurses5-dev libncurses5 lib32readline-dev lib32z1-dev libtinfo5 liblz4-tool \

      libncurses5-dev libsdl1.2-dev libssl-dev libxml2 \

      libncurses5-dev libsdl1.2-dev libssl-dev libxml2 \

      libxml2-utils lsof lzop maven pngcrush \

      libxml2-utils lsof lzop maven pngcrush \

src/build.sh

+3 −0
Original line number Original line Diff line number Diff line
@@ -119,8 +119,11 @@ if [ -n "${BRANCH_NAME}" ] && [ -n "${DEVICE}" ]; then 
  if ! repo sync -c --force-sync

  if ! repo sync -c --force-sync

  then

  then

    sync_successful=false

    sync_successful=false

  else

    repo forall -c 'git lfs pull'

  fi

  fi

  

  



  if [ ! -d "vendor/$vendor" ]; then

  if [ ! -d "vendor/$vendor" ]; then

    echo ">> [$(date)] Missing \"vendor/$vendor\", aborting"

    echo ">> [$(date)] Missing \"vendor/$vendor\", aborting"

    exit 1

    exit 1