Merge branch 'dev'

Author: SirRGB

Dockerfile

@@ -1,24 +1,24 @@
-FROM docker.io/bitnami/minideb:bookworm
+FROM docker.io/debian:trixie-slim
 
 # User
 ARG userid=1000
 ARG groupid=1000
 ARG username=droid
-ENV USER "${username}"
+ENV USER="${username}"
 
 # Dirs
 ARG ROOT_DIR=/droid_workdir
-ENV SCRIPT_DIR "${ROOT_DIR}"/scripts
-ENV ROM_DIR "${ROOT_DIR}"/src/Los15
-ENV KEYS_DIR "${ROOT_DIR}"/keys
-ENV BIN_DIR "${ROOT_DIR}"/bin
-ENV LOGS_DIR "${ROOT_DIR}"/logs
+ENV SCRIPT_DIR="${ROOT_DIR}"/scripts
+ENV ROM_DIR="${ROOT_DIR}"/src/Los15
+ENV KEYS_DIR="${ROOT_DIR}"/keys
+ENV BIN_DIR="${ROOT_DIR}"/bin
+ENV LOGS_DIR="${ROOT_DIR}"/logs
 
 # Switch to Root for Setup
 USER root
 
 # Android build dependencies
-RUN install_packages \
+RUN DEBIAN_FRONTEND=noninteractive apt-get update -qq && DEBIAN_FRONTEND=noninteractive apt-get install -y --no-install-recommends \
     bc \
     bison \
     build-essential \
@@ -36,12 +36,12 @@ RUN install_packages \
     lib32readline-dev \
     lib32z1-dev \
     libelf-dev \
-    liblz4-tool \
-    libncurses5 \
+    libncurses6 \
     libsdl1.2-dev \
     libssl-dev \
     libxml2 \
     libxml2-utils \
+    lz4 \
     lzop \
     pngcrush \
     python3 \
@@ -54,21 +54,21 @@ RUN install_packages \
     zip \
     zlib1g-dev \
 # Python
-    libffi-dev \
     libbz2-dev \
-    libncursesw5-dev \
-    libreadline-dev \
-    libsqlite3-dev \
-    libxml2-dev \
-    libxmlsec1-dev \
     liblzma-dev \
-    tk-dev \
-    xz-utils \
+    libsqlite3-dev \
+    libreadline-dev \
 # Automation
     file \
     jq \
     unzip
 
+RUN rm --recursive /var/lib/apt/lists /var/cache/apt/archives
+
+# Symlink libncurses for compatibility
+RUN ln -s /usr/lib/x86_64-linux-gnu/libncurses.so.6 /usr/lib/x86_64-linux-gnu/libncurses.so.5
+RUN ln -s /usr/lib/x86_64-linux-gnu/libtinfo.so.6 /usr/lib/x86_64-linux-gnu/libtinfo.so.5
+
 # Create dirs and copy scripts
 RUN mkdir -p "${SCRIPT_DIR}" "${BIN_DIR}" "${KEYS_DIR}"
 COPY scripts/ "${SCRIPT_DIR}"/
@@ -96,30 +96,33 @@ RUN sed -i "s/  password/password=\"\"/g; s/echo; exit 1' EXIT INT QUIT/' EXIT/g
 # Make scripts executable
 RUN chmod -R 500 "${BIN_DIR}" "${SCRIPT_DIR}"
 
-# ROM
-ENV LOCAL_MANIFEST ""
-ENV CLONE_REPOS ""
-ENV DEVICE ""
-ENV BUILD_TYPE ""
-ENV ROM_MANIFEST ""
-ENV ROM_BRANCH ""
-ENV ROM_BUILD_FLAGS ""
-
-ENV LUNCH_PREFIX_FALLBACK ""
-ENV ROM_PREFIX_FALLBACK ""
-ENV ROM_VERSION_FALLBACK ""
-ENV ROM_OTA_BRANCH_FALLBACK ""
-
-# Extra
-ENV CCACHE_SIZE 40
-ENV OTA_REPO_URL ""
-ENV KEYS_SUBJECT '/C=US/ST=California/L=Mountain View/O=Android/OU=Android/CN=Android/[email protected]'
-ENV TIME_ZONE "UTC"
-
-# Auth
-ENV TELEGRAM_TOKEN ""
-ENV GITHUB_TOKEN ""
-ENV SF_USER ""
-ENV SF_RELEASES_REPO ""
-
-ENTRYPOINT "${SCRIPT_DIR}"/init.sh
+# ROM variables
+ENV LOCAL_MANIFEST=''
+ENV CLONE_REPOS=''
+ENV DEVICE=''
+ENV BUILD_TYPE=''
+ENV ROM_MANIFEST=''
+ENV ROM_BRANCH=''
+ENV ROM_BUILD_FLAGS=''
+
+# Fallbacks (required for non-standard naming and conflicts)
+ENV LUNCH_PREFIX_FALLBACK=''
+ENV ROM_PREFIX_FALLBACK=''
+ENV ROM_VERSION_FALLBACK=''
+ENV ROM_OTA_BRANCH_FALLBACK=''
+
+# Extra variables
+ENV CCACHE_SIZE=40
+ENV OTA_REPO_URL=''
+ENV KEYS_SUBJECT='/C=US/ST=California/L=Mountain View/O=Android/OU=Android/CN=Android/[email protected]'
+ENV TIME_ZONE="UTC"
+ENV REPOPICK_PICKS=''
+ENV REPOPICK_TOPICS=''
+
+# Authentification
+ENV TELEGRAM_TOKEN=''
+ENV GITHUB_TOKEN=''
+ENV SF_USER=''
+ENV SF_RELEASES_REPO=''
+
+ENTRYPOINT ["/bin/bash", "-c", "${SCRIPT_DIR}/init.sh"]

README.md

@@ -1,7 +1,8 @@
 ## Why Docker/Podman?
 
 Docker/Podman provides a uniform build environment, without external dependencies, that you have to set up manually.  
-The goal is to make building properly with ota and signing easy for everyone.
+The goal is to make building properly with ota and signing easy for everyone.  
+This project targets Android 7 up to the most recent version.
 
 
 <details>
@@ -10,19 +11,19 @@ The goal is to make building properly with ota and signing easy for everyone.
 ## Prerequisites
 
 - [Podman](https://podman.io/docs/installation)
-  - [Python venv](https://docs.python.org/3/library/venv.html#creating-virtual-environments)
   - [Podman compose](https://github.com/containers/podman-compose?tab=readme-ov-file#pip)
 - or [Docker](https://docs.docker.com/engine/install)
+  - [Docker Compose](https://docs.docker.com/compose/install)
   - [Docker Rootless](https://docs.docker.com/engine/security/rootless/)
 - [SSH](https://docs.github.com/en/authentication/connecting-to-github-with-ssh/generating-a-new-ssh-key-and-adding-it-to-the-ssh-agent)
 - [GitConfig](https://git-scm.com/book/en/v2/Getting-Started-First-Time-Git-Setup)
-- ZRam (highly recommended): [Debian](https://wiki.debian.org/ZRam), [Fedora](https://github.com/systemd/zram-generator), [Ubuntu](https://wiki.ubuntuusers.de/zRam)
+- ZRam (highly recommended): [Debian](https://wiki.debian.org/ZRam), [Fedora](https://github.com/systemd/zram-generator), [Ubuntu, Arch and others](https://wiki.archlinux.org/title/Zram)
 
 
 ### Setting up permissions
 
 First we need to find the UID, that is used for Docker/Podman.  
-For Debian/Ubuntu this seems to be 100999 and on Fedora 52587,  
+For Debian, Ubuntu and Gentoo this seems to be 100999 and on Fedora 52587,  
 which should be $subUID+$containerUID-1 according to the [docker forums](https://forums.docker.com/t/map-more-uid-on-rootless-docker-and-mount-volume/102928/8).
 
 

TODO.md

@@ -1,3 +1,6 @@
 ## ToDo
 - move printing to printf
   - 94fa96faf062de55062bb79909548e778b692bfb
+- automatic repo pulling for officially supported lineage devices
+- move json and xml handling to python
+- general ssh upload

scripts/compat.sh

@@ -1,34 +1,45 @@
 #!/bin/bash
 
-# Set up Py2
-_setup_py2() {
+# Initialize PyEnv
+_setup_pyenv() {
   curl -fsSL https://pyenv.run | bash
   export PYENV_ROOT="${HOME}"/.pyenv
   [[ -d "${PYENV_ROOT}"/bin ]] && export PATH="${PYENV_ROOT}"/bin:"${PATH}"
   eval "$(pyenv init - bash)"
   "${SHELL}"
+}
 
+# Set up PyEnv with Python 2.7
+_init_py2() {
+  _setup_pyenv
   pyenv install 2
   pyenv global 2
 }
 
-# Set up JDK8 and re-enable TLS 1/1.1
+# Set up PyEnv with Python 3.11
+_init_py3() {
+  _setup_pyenv
+  pyenv install 3.11
+  pyenv global 3.11
+}
+
+# Set up Temurin 8 and re-enable TLS 1/1.1
 _setup_jdk8() {
   local jdk_dir jdk_tag jdk_name
   jdk_dir="${HOME}"/java/jdk
-  jdk_tag=jdk8u462-b08
+  jdk_tag=jdk8u472-b08
   jdk_name=OpenJDK8U-jdk_x64_linux_hotspot_"$(echo ${jdk_tag//jdk/} | tr -d -)".tar.gz
   mkdir -p "${jdk_dir}"
   curl -fsSOL https://github.com/adoptium/temurin8-binaries/releases/download/"${jdk_tag}"/"${jdk_name}" --output-dir "${jdk_dir}"
-  echo 5d64ae542b59a962b3caadadd346f4b1c3010879a28bb02d928326993de16e79 "${jdk_dir}"/"${jdk_name}" | sha256sum --check
+  echo 55963261b4df76f76109eaa442b8e9621425a4a45c69fd5507bb33899dffd7d5 "${jdk_dir}"/"${jdk_name}" | sha256sum --check
   tar xvf "${jdk_dir}"/"${jdk_name}" --directory="${jdk_dir}"
   rm "${jdk_dir}"/"${jdk_name}"
 
   export JAVA_HOME="${jdk_dir}"/"${jdk_tag}"
   export PATH="${JAVA_HOME}"/bin:"${PATH}"
 
   sed -i 's/TLSv1, TLSv1.1, //g' "${JAVA_HOME}"/jre/lib/security/java.security
-  export ANDROID_JACK_VM_ARGS="-Dfile.encoding=UTF-8 -XX:+TieredCompilation -Xmx4G"
+  export ANDROID_JACK_VM_ARGS='-Dfile.encoding=UTF-8 -XX:+TieredCompilation -Xmx4G'
   export LC_ALL=C
 }
 
@@ -41,13 +52,24 @@ _key_size_recovery() {
   sed -i 's/!= 2048/< 2048/' "${ROM_DIR}"/bootable/recovery/tools/dumpkey/DumpPublicKey.java
 }
 
-_setup_py2
+
+# A7-9
+if [[ "${ANDROID_VERSION}" -lt 10 ]]; then
+  _init_py2
+# A10-15
+else
+  _init_py3
+fi
+
+# A7/A8
 if [[ "${ANDROID_VERSION}" -lt 9 ]]; then
   _setup_jdk8
 fi
 
-if [[ "${ANDROID_VERSION}" -gt 7 ]]; then
+# A8/9
+if [[ "${ANDROID_VERSION}" -gt 7 ]] && [[ "${ANDROID_VERSION}" -lt 10 ]]; then
   _key_size_recovery
-else
+# A7
+elif [[ "${ANDROID_VERSION}" -lt 8 ]]; then
   _key_size_sys_core
 fi

scripts/init.sh

@@ -7,8 +7,8 @@ export PATH="${BIN_DIR}":"${PATH}"
 
 # Set up logs
 find "${LOGS_DIR}"/ -type d -ctime +1 -exec rm -r {} \; || true
-BUILD_DATE_UNIX=$(date "+%s")
-BUILD_DATE=$(env TZ="${TIME_ZONE}" date -d @"${BUILD_DATE_UNIX}" "+%Y%m%d-%H%M%S")
+BUILD_DATE_UNIX="$(date '+%s')"
+BUILD_DATE=$(env TZ="${TIME_ZONE}" date -d @"${BUILD_DATE_UNIX}" '+%Y%m%d-%H%M%S')
 mkdir "${LOGS_DIR}"/"${BUILD_DATE}"
 unset BIN_DIR
 

scripts/lunch.sh

@@ -11,15 +11,15 @@ _lunch() {
   local release_codename
   release_codename=
   if [[ -d "${ANDROID_BUILD_TOP}"/build/release/aconfig/ ]]; then
-    release_codename=-$(find "${ANDROID_BUILD_TOP}"/build/release/aconfig/* -maxdepth 0 -type d -name "[a-z][a-z][0-9][a-z]" -printf '%f\n' | tail -n1)
+    release_codename=-$(find "${ANDROID_BUILD_TOP}"/build/release/aconfig/* -maxdepth 0 -type d -name '[a-z][a-z][0-9][a-z]' -printf '%f\n' | tail -n1)
   fi
 
   # Extract lunch prefix from AndroidProducts
   local product
   if [[ -n "${LUNCH_PREFIX_FALLBACK}" ]]; then
     product="${LUNCH_PREFIX_FALLBACK}"_"${TARGET_DEVICE}"
   else
-    product=$(grep -E "${TARGET_DEVICE}" "${ANDROID_BUILD_TOP}"/device/*/"${TARGET_DEVICE}"/AndroidProducts.mk | cut -d"/" -f2 | cut -d"." -f1 | head -n1)
+    product=$(grep -E "${TARGET_DEVICE}" "${ANDROID_BUILD_TOP}"/device/*/"${TARGET_DEVICE}"/AndroidProducts.mk | cut -d'/' -f2 | cut -d'.' -f1 | head -n1)
   fi
 
   # It's all coming together

scripts/ota.sh

@@ -7,8 +7,8 @@ source "${SCRIPT_DIR}"/print.sh
 _ota_info() {
   local file_size id datetime custom_build_type
   file_size=$(stat -c%s "${OUT}"/"${PACKAGE_NAME}")
-  id=$(sha256sum "${OUT}"/"${PACKAGE_NAME}" | cut -d" " -f1)
-  datetime=$(grep ro\.build\.date\.utc "${OUT}"/system/build.prop | cut -d"=" -f2)
+  id=$(sha256sum "${OUT}"/"${PACKAGE_NAME}" | cut -d' ' -f1)
+  datetime=$(grep ro\.build\.date\.utc "${OUT}"/system/build.prop | cut -d'=' -f2)
   custom_build_type="UNOFFICIAL"
   jq -n "{\"response\": [{\"datetime\": ${datetime},\"filename\": \"${PACKAGE_NAME}\",\"id\": \"${id}\",\"romtype\": \"${custom_build_type}\", \"size\": ${file_size}, \"url\": \"${DL_OTA_URL}\", \"version\": \"${ROM_VERSION}\"}]}" > "${OUT}"/"${PACKAGE_NAME}".json
 }
@@ -34,13 +34,14 @@ _push_ota_info() {
     target_ota_repo_url="${OTA_REPO_URL//git@github.com:/https://${GITHUB_TOKEN}@github.com/}"
   fi
 
-  # Append extraversion to avoid collision of different flavours
+  # Specify a fallback, so that roms, that purely rely on android numbers dont collide
   if [[ -n "${ROM_OTA_BRANCH_FALLBACK}" ]]; then
     target_ota_branch="${ROM_OTA_BRANCH_FALLBACK}"
   else
     target_ota_branch="${ROM_BRANCH}"
   fi
 
+  # Append extraversion to avoid collision of different flavours
   if [[ -n "${ROM_EXTRAVERSION}" ]]; then
     target_ota_branch="${target_ota_branch}"-"$(tr -d - <<< "${ROM_EXTRAVERSION,,}")"
   fi

scripts/packaging.sh

@@ -13,29 +13,29 @@ _version() {
 
   # Search for line containing the regex inside *[V|v]ersion.mk|common.mk, cut that number and set points in between
   if [[ -z "${ROM_PREFIX_FALLBACK}" ]]; then
-    ROM_PREFIX=$(find "${ANDROID_BUILD_TOP}"/vendor/*/build/tasks/* "${ANDROID_BUILD_TOP}"/build/core/Makefile -exec grep '_TARGET_PACKAGE[[:space:]]:=' {} \; | cut -d"=" -f2 | cut -d"/" -f2 | cut -d"$" -f1)
+    ROM_PREFIX=$(find "${ANDROID_BUILD_TOP}"/vendor/*/build/tasks/* "${ANDROID_BUILD_TOP}"/build/core/Makefile -exec grep '_TARGET_PACKAGE[[:space:]]:=' {} \; | cut -d'=' -f2 | cut -d'/' -f2 | cut -d'$' -f1)
   else
     ROM_PREFIX="${ROM_PREFIX_FALLBACK}"
   fi
   if [[ -z "${ROM_VERSION_FALLBACK}" ]]; then
-    ROM_VERSION=$(find "${ANDROID_BUILD_TOP}"/vendor/*/config/ \( -name "*[vV]ersion.mk" -o -name common.mk \) -exec grep -E "${major_version_regex}" {} \; | tr -d 'A-z:= \n').\
-$(find "${ANDROID_BUILD_TOP}"/vendor/*/config/ \( -name "*[vV]ersion.mk" -o -name common.mk \) -exec grep -E "${minor_version_regex}" {} \; | tr -d 'A-z:= \n')
+    ROM_VERSION=$(find "${ANDROID_BUILD_TOP}"/vendor/*/config/ \( -name '*[vV]ersion.mk' -o -name common.mk \) -exec grep -E "${major_version_regex}" {} \; | tr -d 'A-z:= \n').\
+$(find "${ANDROID_BUILD_TOP}"/vendor/*/config/ \( -name '*[vV]ersion.mk' -o -name common.mk \) -exec grep -E "${minor_version_regex}" {} \; | tr -d 'A-z:= \n')
   else
     ROM_VERSION="${ROM_VERSION_FALLBACK}"
   fi
-  ROM_EXTRAVERSION=""
-  if [[ -n $(find "${OUT}" -mindepth 2 -name "FakeStore.apk" -print -quit) ]]; then
-    ROM_EXTRAVERSION="MICROG-"
-  elif [[ -n $(find "${OUT}" -mindepth 2 -name "GmsCore.apk" -print -quit) ]]; then
-    ROM_EXTRAVERSION="GMS-"
+  ROM_EXTRAVERSION=''
+  if [[ -n $(find "${OUT}" -mindepth 2 -name 'FakeStore.apk' -print -quit) ]]; then
+    ROM_EXTRAVERSION='MICROG-'
+  elif [[ -n $(find "${OUT}" -mindepth 2 -name 'GmsCore.apk' -print -quit) ]]; then
+    ROM_EXTRAVERSION='GMS-'
   fi
-  PACKAGE_NAME="${ROM_PREFIX}""${ROM_VERSION}"-"${ROM_EXTRAVERSION}"$(env TZ="${TIME_ZONE}" date -d @"${BUILD_DATE_UNIX}" +%Y%m%d)-"${TARGET_DEVICE}"-signed.zip
+  PACKAGE_NAME="${ROM_PREFIX}""${ROM_VERSION}"-"${ROM_EXTRAVERSION}"$(env TZ="${TIME_ZONE}" date -d @"${BUILD_DATE_UNIX}" '+%Y%m%d')-"${TARGET_DEVICE}"-signed.zip
 }
 
 # Create flashable zip from target files
 _packaging() {
   _version
-  local releasetools_prefix=""
+  local releasetools_prefix=''
   # A10 and below need this prepended for signing to work
   if [[ "${ANDROID_VERSION}" -lt 11 ]]; then
     releasetools_prefix="${ANDROID_BUILD_TOP}"/build/tools/releasetools/