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

Commit e26efb70 authored by frankpreel's avatar frankpreel
Browse files

Merge branch 'master' into 8_8pro

parents e2cc6bce cd9d1b57

Dockerfile

+4 −15
Original line number Diff line number Diff line
@@ -19,19 +19,8 @@ ENV SNAP="/snap/snapcraft/current" 
ENV SNAP_NAME="snapcraft"

ENV SNAP_ARCH="amd64"



RUN apt-get install -y nsis rsync wget

RUN apt-get install -y nsis rsync



RUN mkdir /usr/lib/jdk && \

        cd /usr/lib/jdk && \

        wget https://github.com/adoptium/temurin11-binaries/releases/download/jdk-11.0.15%2B10/OpenJDK11U-jdk_x64_linux_hotspot_11.0.15_10.tar.gz && \ 

        tar -xvf OpenJDK11U-jdk_x64_linux_hotspot_11.0.15_10.tar.gz



RUN echo 'PATH="${PATH}:/usr/lib/jdk/jdk-11.0.15+10/bin"' >> /etc/environment && \

        echo 'JAVA_HOME="/usr/lib/jdk/jdk-11.0.15+10"' >> /etc/environment && \

        update-alternatives --install "/usr/bin/java" "java" "/usr/lib/jdk/jdk-11.0.15+10/bin/java" 0 && \

        update-alternatives --install "/usr/bin/javac" "javac" "/usr/lib/jdk/jdk-11.0.15+10/bin/javac" 0 && \

        update-alternatives --set java /usr/lib/jdk/jdk-11.0.15+10/bin/java && \

        update-alternatives --set javac /usr/lib/jdk/jdk-11.0.15+10/bin/javac && \

        update-alternatives --list java && \

        update-alternatives --list javac && \

        rm /usr/lib/jdk/OpenJDK11U-jdk_x64_linux_hotspot_11.0.15_10.tar.gz 
# install jvm

COPY buildSrc/linux/jdk-11.0.2 /usr/lib/jdk/jdk-11.0.2

ENV JAVA_HOME=/usr/lib/jdk/jdk-11.0.2

docker/Dockerfile.arch

+2 −2
Original line number Diff line number Diff line
@@ -20,8 +20,8 @@ RUN mkdir /home/builder/pkg &&\ 
    curl -o '/home/builder/pkg/PKGBUILD' https://gitlab.e.foundation/e/devices/easy-installer/-/raw/master/pkg/arch/PKGBUILD && \

    cd /home/builder/pkg/ && \

    sudo pacman -Syyu --noconfirm && \

    yes | makepkg -seo && \

    yes | sudo pacman -Scc && sudo rm -fr /var/lib/pacman/sync/*

    makepkg --noconfirm -seo && \

    sudo pacman -Scc --noconfirm && sudo rm -fr /var/lib/pacman/sync/*



# remove files after installing dependecies

RUN sudo rm -rf /home/builder/pkg/

pkg/arch/PKGBUILD

+2 −4
Original line number Diff line number Diff line
@@ -8,9 +8,7 @@ arch=('x86_64') 
url="https://gitlab.e.foundation/e/tools/${pkgname}"

license=('GPL3')

depends=()

# required java version

_reqjava=11

makedepends=('git' 'gradle' "java-environment-openjdk=${_reqjava}" 'java-runtime-common' 'ruby-ronn')

makedepends=('git' 'gradle' 'java-runtime-common' 'ruby-ronn')

optdepends=()

backup=()

source=("${pkgname}-${pkgver}::git+https://gitlab.e.foundation/e/tools/${pkgname}.git#tag=v${pkgver}"
@@ -24,7 +22,7 @@ MAN8PAGE=${pkgname}.8 


build(){

    cd "$pkgname-$pkgver"

    export JAVA_HOME="/usr/lib/jvm/java-${_reqjava}-openjdk"

    export JAVA_HOME="$(pwd)/buildSrc/linux/jdk-11.0.2/"

    [ ! -d $JAVA_HOME ] && echo "ERROR: $JAVA_HOME does not exist" && exit 3

    ./gradlew dist

}

src/main/resources/lang/translation_de.properties

+7 −0
Original line number Diff line number Diff line
@@ -347,3 +347,10 @@ install_instr_choose_e_recovery_select_details=Mit den Lautstärketasten kann au 
install_instr_choose_e_recovery_select=Wähle den Wiederherstellungs-Modus (Recovery Mode) aus, indem du mit den Lautstärketasten navigierst.

install_instr_startRec_pressPowerBixbyVolUp_e_reco=Drücke gleichzeitig „Ausschalten“ & „Bixby“ & „Lautstärke lauter“, bis der ´e recovery´-Bildschirm erscheint. (Bitte nicht loslassen, wenn der Bildschirm schwarz wird)

install_instr_unlockBootloader_already=Wenn dein Smartphone schon entsperrt ist, musst du nichts tun. Es wird automatisch neu starten.

script_error_cantActivePartition=Fehler beim Aktivieren der Partition

script_error_fastboot_flashingLock_failed=Das Flashing konnte nicht versperrt werden

install_instr_e_recovery_apply_update_from_adb_accept_sign_fail=Eine Meldung wird erscheinen, dass die Signatur-Überprüfung fehlgeschlagen ist. Das ist normal, bitte akzeptiere die Warnung.

emerald_install_instr_accept_lock=Akzeptiere das Sperren, indem du auf „Lautstärke lauter“ tippst



#oneplus

install_instr_e_recovery_oneplus_select_recovery=Installation der Partition