...
 
Commits (2)
  • Chirayu Desai's avatar
    metadata: Add Ripple · f8c25a40
    Chirayu Desai authored
    f8c25a40
  • Chirayu Desai's avatar
    manage: Fixes, mainly kernel related · 8023b30e
    Chirayu Desai authored
    * In an ideal world I'd go back and amend the kernel commits
    * In the real world this stuff is mainly for internal use and
      thus it does not matter that much, this script is a mess anyway,
      the more I add to it the more I feel like maybe it should be
      something else.
    
    * In the future, it would be nice to have the CI setup do these
      merges automatically and push to a staging branch, or maybe gerrit?
    * Would need to do something for conflicts though!
    8023b30e
......@@ -14,7 +14,7 @@ wait_for_conflict() {
error() {
echo error: $1, please try again >&2
echo "Usage: $0 aosp/calyx/independent/kernel/lineage"
echo "Usage: `basename $0` aosp/calyx/independent/kernel/lineage"
echo " aosp includes kernels too"
echo " calyx == independent"
exit 1
......@@ -60,6 +60,9 @@ fi
if [[ "kernel" == "$1" || "aosp" == "$1" ]]; then
for kernel in "${!kernels[@]}"; do
if [[ "google_msmdash4dot9" == "$kernel" ]]; then
kernel="google_msm-4.9"
fi
echo -e "\n>>> $(tput setaf 3)Handling kernel_$kernel$(tput sgr0)"
cd kernel_$kernel || exit 1
......@@ -68,13 +71,16 @@ for kernel in "${!kernels[@]}"; do
git checkout -b $branch gitlab-priv/$prev_branch || exit 1
git fetch aosp --tags || exit 1
if [[ "google_msm-4.9" == "$kernel" ]]; then
kernel="google_msmdash4dot9"
fi
kernel_tag=${kernels[$kernel]}
if [[ -z $kernel_tag ]]; then
cd .. || exit 1
continue
fi
git push $GIT_ARGS gitlab-priv HEAD:refs/heads/backup/${prev_branch}-${DATE}
git pull $GIT_ARGS --rebase=interactive $kernel_tag || wait_for_conflict $kernel
git pull $GIT_ARGS --rebase=interactive aosp $kernel_tag || wait_for_conflict $kernel
git push $GIT_ARGS -f gitlab-priv HEAD:refs/heads/$branch || exit 1
git push $GIT_ARGS -f gitlab-priv $kernel_tag:refs/tags/$kernel_tag || exit 1
......@@ -88,7 +94,12 @@ for kernel in "${!kernels[@]}"; do
done
for kernel in "${!kernels[@]}"; do
for kernel_module in ${${kernels[$kernel]}[@]}; do
if [[ -v ${kernel[@]} ]]; then
kernel_modules="$kernel[@]"
for kernel_module in "${!kernel_modules}"; do
if [[ "google_msmdash4dot9" == "$kernel" ]]; then
kernel="google_msm-4.9"
fi
echo -e "\n>>> $(tput setaf 3)Handling kernel_${kernel}_${kernel_module}$(tput sgr0)"
cd kernel_${kernel}_${kernel_module} || exit 1
......@@ -97,13 +108,16 @@ for kernel in "${!kernels[@]}"; do
git checkout -b $branch gitlab-priv/$prev_branch || exit 1
git fetch aosp --tags || exit 1
if [[ "google_msm-4.9" == "$kernel" ]]; then
kernel="google_msmdash4dot9"
fi
kernel_tag=${kernels[$kernel]}
if [[ -z $kernel_tag ]]; then
cd .. || exit 1
continue
fi
git push $GIT_ARGS gitlab-priv HEAD:refs/heads/backup/${prev_branch}-${DATE}
git pull $GIT_ARGS --rebase=interactive $kernel_tag || wait_for_conflict $kernel
git pull $GIT_ARGS --rebase=interactive aosp $kernel_tag || wait_for_conflict $kernel
git push $GIT_ARGS -f gitlab-priv HEAD:refs/heads/$branch || exit 1
git push $GIT_ARGS -f gitlab-priv $kernel_tag:refs/tags/$kernel_tag || exit 1
......@@ -115,6 +129,7 @@ for kernel in "${!kernels[@]}"; do
cd .. || exit 1
done
fi
done
fi
......
......@@ -69,12 +69,12 @@ aosp_forks=(
declare -A kernels
kernels[google_wahoo]=android-10.0.0_r0.64 # 2020-06-05
kernels[google_msm-4.9]=android-10.0.0_r66 # 2020-06-05
kernels[google_coral]=android-10.0.0_r67 # 2020-06-05
kernels[google_msmdash4dot9]=android-10.0.0_r0.66 # 2020-06-05
kernels[google_coral]=android-10.0.0_r0.67 # 2020-06-05
# Modules, like calyxos/kernel_google_msm-4.9_techpack_audio
google_wahoo=()
google_msm-4.9=(
google_msmdash4dot9=(
drivers_staging_qcacld-3.0
techpack_audio
)
......@@ -83,6 +83,7 @@ google_coral=()
independent=(
platform_manifest # Always handled manually!
platform_packages_apps_F-DroidPrivilegedExtension
platform_packages_apps_Ripple
platform_packages_apps_Updater
platform_prebuilts_calyx
vendor_android-prepare-vendor
......