From a241e7b8f0911bf447e8a0d88359a238993ce78f Mon Sep 17 00:00:00 2001 From: Ziyang Zhou Date: Tue, 30 Aug 2022 23:09:29 +0800 Subject: [PATCH] remove legacy build instructions --- android-builder-docker/Dockerfile.1404 | 26 ------------------------ android-builder-docker/README.md | 16 ++++----------- android-builder-docker/sources.1404.list | 10 --------- 3 files changed, 4 insertions(+), 48 deletions(-) delete mode 100644 android-builder-docker/Dockerfile.1404 delete mode 100644 android-builder-docker/sources.1404.list diff --git a/android-builder-docker/Dockerfile.1404 b/android-builder-docker/Dockerfile.1404 deleted file mode 100644 index 9bf627d..0000000 --- a/android-builder-docker/Dockerfile.1404 +++ /dev/null @@ -1,26 +0,0 @@ -FROM ubuntu:14.04 - -ARG userid -ARG groupid -ARG username - -# COPY apt.conf /etc/apt/apt.conf - -# COPY sources.1404.list etc/apt/sources.list - -# gettext python-mako python3-mako python-enum34 used to build mesa3d -RUN apt-get update && apt-get install -y git-core gnupg flex bison gperf build-essential zip curl zlib1g-dev gcc-multilib g++-multilib libc6-dev-i386 lib32ncurses5-dev x11proto-core-dev libx11-dev lib32z-dev ccache libgl1-mesa-dev libxml2-utils xsltproc unzip python gettext python-mako python3-mako python-enum34 - -RUN groupadd -g $groupid $username \ - && useradd -m -u $userid -g $groupid $username \ - && echo "$username ALL=(ALL) NOPASSWD: ALL" >> /etc/sudoers \ - && echo $username >/root/username \ - && echo "$username:$username" | chpasswd && adduser $username sudo - -ENV HOME=/home/$username \ - USER=$username \ - PATH=/src/.repo/repo:/src/prebuilts/jdk/jdk8/linux-x86/bin/:$PATH \ - USE_CCACHE=1 \ - CCACHE_DIR=/src/.ccache - -ENTRYPOINT chroot --userspec=$(cat /root/username):$(cat /root/username) / /bin/bash -i diff --git a/android-builder-docker/README.md b/android-builder-docker/README.md index 2d868a4..916a3c7 100644 --- a/android-builder-docker/README.md +++ b/android-builder-docker/README.md @@ -2,6 +2,7 @@ ## Sync Code ReDroid manifest include several branches / snapshots: +- `redroid-13.0.0` - `redroid-12.0.0` - `redroid-11.0.0` - `redroid-10.0.0` @@ -11,11 +12,6 @@ ReDroid manifest include several branches / snapshots: ```bash # fetch code - -# install git-lfs -apt install git-lfs -git lfs install - mkdir ~/redroid && cd ~/redroid repo init -u https://github.com/remote-android/platform_manifests.git -b --depth=1 repo sync -c @@ -23,13 +19,9 @@ repo sync -c ## Build ```bash -# create builder docker image (ubuntu 20.04) -# adjust apt.conf and source.list if needed +# create builder docker image docker build --build-arg userid=$(id -u) --build-arg groupid=$(id -g) --build-arg username=$(id -un) -t redroid-builder . -# OR ubuntu 14.04 (old mesa3d release) -docker build --build-arg userid=$(id -u) --build-arg groupid=$(id -g) --build-arg username=$(id -un) -t redroid-builder -f Dockerfile.1404 . - # start builder docker run -it --rm --hostname redroid-builder --name redroid-builder -v :/src redroid-builder @@ -40,8 +32,8 @@ cd /src lunch redroid_x86_64-userdebug # redroid_arm64-userdebug -# redroid_x86_64_only-userdebug (64 bit only, redroid 12) -# redroid_arm64_only-userdebug (64 bit only, redroid 12) +# redroid_x86_64_only-userdebug (64 bit only, redroid 12+) +# redroid_arm64_only-userdebug (64 bit only, redroid 12+) m diff --git a/android-builder-docker/sources.1404.list b/android-builder-docker/sources.1404.list deleted file mode 100644 index 5ceebcb..0000000 --- a/android-builder-docker/sources.1404.list +++ /dev/null @@ -1,10 +0,0 @@ -deb http://mirrors.163.com/ubuntu/ trusty main restricted universe multiverse -deb http://mirrors.163.com/ubuntu/ trusty-security main restricted universe multiverse -deb http://mirrors.163.com/ubuntu/ trusty-updates main restricted universe multiverse -deb http://mirrors.163.com/ubuntu/ trusty-proposed main restricted universe multiverse -deb http://mirrors.163.com/ubuntu/ trusty-backports main restricted universe multiverse -deb-src http://mirrors.163.com/ubuntu/ trusty main restricted universe multiverse -deb-src http://mirrors.163.com/ubuntu/ trusty-security main restricted universe multiverse -deb-src http://mirrors.163.com/ubuntu/ trusty-updates main restricted universe multiverse -deb-src http://mirrors.163.com/ubuntu/ trusty-proposed main restricted universe multiverse -deb-src http://mirrors.163.com/ubuntu/ trusty-backports main restricted universe multiverse