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

Commit aa3b6635 authored by Saalim Quadri's avatar Saalim Quadri Committed by Saalim Quadri
Browse files

Integrate cromite as a submodule

parent 0bc17b07
Loading
Loading
Loading
Loading

.gitmodules

0 → 100644
+3 −0
Original line number Diff line number Diff line
[submodule "build/cromite"]
	path = build/cromite
	url = https://github.com/uazo/cromite
+6 −0
Original line number Diff line number Diff line
@@ -35,3 +35,9 @@ Browser is built using the [GitLab's CI/CD](https://docs.gitlab.com/ee/ci/). You
- A the list of contributors can be viewed on this repository's [contributors graph](https://gitlab.e.foundation/e/os/browser/-/graphs/master).

In case you wish to contribute to the development of this project, feel free to open a [Merge Request](https://gitlab.e.foundation/e/os/browser/-/merge_requests) or an [Issue](https://gitlab.e.foundation/e/backlog/-/issues/) for the same. Contributions are always welcome.

## Cromite patches
- The Cromite patch set is tracked via the `build/cromite` git submodule (upstream: [uazo/cromite](https://github.com/uazo/cromite)).
- After cloning this repository, run `git submodule update --init --recursive build/cromite` before building.
- `./update_cromite_patches.sh` fast-forwards the submodule to the branch or tag defined by `cromite_branch` in `versions.txt`.
- `build.sh` applies patches directly from `build/cromite/build/patches` using the order defined in `build/cromite_patches_list.txt`, so the submodule must be kept in sync.
+12 −1
Original line number Diff line number Diff line
@@ -110,8 +110,19 @@ patch() {
  echo ">> [$(date)] Applying cromite patches"

  cromite_patches_list=$(cat "${root_dir}/build/cromite_patches_list.txt")
  cromite_patch_dir="${root_dir}/build/cromite/build/patches"
  if [ ! -d "${cromite_patch_dir}" ]; then
    echo "Cromite patches directory not found at ${cromite_patch_dir}."
    echo "Ensure the cromite submodule is initialized (run ./update_cromite_patches.sh)."
    exit 1
  fi
  for file in $cromite_patches_list; do
    git am -C0 -3 --ignore-whitespace "${root_dir}/build/cromite_patches/$file"
    patch_path="${cromite_patch_dir}/$file"
    if [ ! -f "${patch_path}" ]; then
      echo "Patch ${patch_path} missing."
      exit 1
    fi
    git am -C0 -3 --ignore-whitespace "${patch_path}"
  done

  echo ">> [$(date)] Applying /e/ patches"

build/.gitignore

deleted100644 → 0
+0 −1
Original line number Diff line number Diff line
cromite/
Original line number Diff line number Diff line
Subproject commit 8f68189b3b33eaccd1bff868f1c7347ab7077afc
Loading