Browse Source

Treewide: drop HTTP var, Q: Add core-utils PR

master
Felix 2 years ago
parent
commit
6abc279de7
  1. 17
      ix5_repo_update.sh
  2. 13
      lineage_repo_update.sh
  3. 25
      master_repo_update.sh
  4. 26
      q_repo_update.sh
  5. 3
      treble_repo_update.sh

17
ix5_repo_update.sh

@ -5,7 +5,6 @@ set -e
ANDROOT=$PWD
HTTP=https
OFFLINE=$SODP_WORK_OFFLINE
RESOLVED_REPO_PATH="$ANDROOT/$(dirname $(readlink $0))"
PATCHES_PATH=$RESOLVED_REPO_PATH/patches
@ -107,7 +106,7 @@ pushd $ANDROOT/frameworks/base
# Enable development settings by default
git am < $PATCHES_PATH/enable-development-settings-by-default.patch
#LINK=$HTTP && LINK+="://github.com/Thespartann/android_frameworks_base_microG/"
#LINK="https://github.com/Thespartann/android_frameworks_base_microG/"
#(git remote --verbose | grep -q $LINK) || git remote add thespartann $LINK
#git fetch thespartann
@ -118,7 +117,7 @@ git am < $PATCHES_PATH/enable-development-settings-by-default.patch
popd
pushd $ANDROOT/device/sony/common
LINK=$HTTP && LINK+="://git.ix5.org/felix/device-sony-common"
LINK="https://git.ix5.org/felix/device-sony-common"
(git remote --verbose | grep -q $LINK) || git remote add ix5 $LINK
do_if_online git fetch ix5
# git checkout 'selinux-enforcing'
@ -156,7 +155,7 @@ apply_commit 5df1a36972a8709f76463f8fe184d472e75d93a1
# TODO: is in master, needs to land in p-mr1
#apply_commit f0bc81b29670a8b6402dc1c26b47da60a0ea4701
LINK=$HTTP && LINK+="://github.com/sonyxperiadev/device-sony-common"
LINK="https://github.com/sonyxperiadev/device-sony-common"
# https://github.com/sonyxperiadev/device-sony-common/pull/617
# odm: Use PRODUCT_ODM_PROPERTIES for version
@ -192,7 +191,7 @@ popd
pushd $ANDROOT/device/sony/sepolicy
LINK=$HTTP && LINK+="://git.ix5.org/felix/device-sony-sepolicy"
LINK="https://git.ix5.org/felix/device-sony-sepolicy"
(git remote --verbose | grep -q $LINK) || git remote add ix5 $LINK
do_if_online git fetch ix5
@ -215,7 +214,7 @@ do_if_online git fetch ix5
# TODO: Variation of this is in master, needs to land in p-mr1
#apply_commit 444894b98f8d14c3f0b64a1ba23b19a907638b2f
LINK=$HTTP && LINK+="://github.com/sonyxperiadev/device-sony-sepolicy"
LINK="https://github.com/sonyxperiadev/device-sony-sepolicy"
# [Q-COMPAT] system_app: Remove obsolete perfprofd dontaudit
# TODO: is in master, needs to land in p-mr1
@ -223,7 +222,7 @@ apply_pull_commit 531 617c2ebd443f36a54687cc136c86f0880b0f5e1f
popd
pushd $ANDROOT/device/sony/tone
LINK=$HTTP && LINK+="://git.ix5.org/felix/device-sony-tone"
LINK="https://git.ix5.org/felix/device-sony-tone"
(git remote --verbose | grep -q $LINK) || git remote add ix5 $LINK
do_if_online git fetch ix5
@ -235,7 +234,7 @@ apply_commit b611c8d91a374f246be393d89f20bbf3fc2ab9f7
popd
pushd $ANDROOT/device/sony/loire
LINK=$HTTP && LINK+="://git.ix5.org/felix/device-sony-loire"
LINK="https://git.ix5.org/felix/device-sony-loire"
(git remote --verbose | grep -q $LINK) || git remote add ix5 $LINK
do_if_online git fetch ix5
# git checkout 'disable-verity-no-forceencrypt'
@ -247,7 +246,7 @@ popd
pushd $ANDROOT/device/sony/kagura
LINK=$HTTP && LINK+="://git.ix5.org/felix/device-sony-kagura"
LINK="https://git.ix5.org/felix/device-sony-kagura"
(git remote --verbose | grep -q $LINK) || git remote add ix5 $LINK
do_if_online git fetch ix5

13
lineage_repo_update.sh

@ -5,7 +5,6 @@ set -e
ANDROOT=$PWD
HTTP=https
OFFLINE=$SODP_WORK_OFFLINE
RESOLVED_REPO_PATH="$ANDROOT/$(dirname $(readlink $0))"
PATCHES_PATH=$RESOLVED_REPO_PATH/patches
@ -104,7 +103,7 @@ git am < $PATCHES_PATH/lineage-fwb-remove-libapf-dep.patch
popd
pushd $ANDROOT/device/sony/common
LINK=$HTTP && LINK+="://git.ix5.org/felix/device-sony-common"
LINK="https://git.ix5.org/felix/device-sony-common"
(git remote --verbose | grep -q $LINK) || git remote add ix5 $LINK
do_if_online git fetch ix5
# git checkout 'selinux-enforcing'
@ -141,7 +140,7 @@ apply_commit 5df1a36972a8709f76463f8fe184d472e75d93a1
# TODO: is in master, needs to land in p-mr1
#apply_commit f0bc81b29670a8b6402dc1c26b47da60a0ea4701
LINK=$HTTP && LINK+="://github.com/sonyxperiadev/device-sony-common"
LINK="https://github.com/sonyxperiadev/device-sony-common"
# https://github.com/sonyxperiadev/device-sony-common/pull/617
# odm: Use PRODUCT_ODM_PROPERTIES for version
@ -181,7 +180,7 @@ popd
pushd $ANDROOT/device/sony/sepolicy
LINK=$HTTP && LINK+="://git.ix5.org/felix/device-sony-sepolicy"
LINK="https://git.ix5.org/felix/device-sony-sepolicy"
(git remote --verbose | grep -q $LINK) || git remote add ix5 $LINK
do_if_online git fetch ix5
@ -204,14 +203,14 @@ do_if_online git fetch ix5
# TODO: is in master, needs to land in p-mr1
#apply_commit 444894b98f8d14c3f0b64a1ba23b19a907638b2f
LINK=$HTTP && LINK+="://github.com/sonyxperiadev/device-sony-sepolicy"
LINK="https://github.com/sonyxperiadev/device-sony-sepolicy"
# [Q-COMPAT] system_app: Remove obsolete perfprofd dontaudit
apply_pull_commit 531 617c2ebd443f36a54687cc136c86f0880b0f5e1f
popd
pushd $ANDROOT/device/sony/tone-common
LINK=$HTTP && LINK+="://git.ix5.org/felix/device-sony-tone"
LINK="https://git.ix5.org/felix/device-sony-tone"
(git remote --verbose | grep -q $LINK) || git remote add ix5 $LINK
do_if_online git fetch ix5
@ -223,7 +222,7 @@ do_if_online git fetch ix5
popd
pushd $ANDROOT/device/sony/kagura
LINK=$HTTP && LINK+="://git.ix5.org/felix/device-sony-kagura"
LINK="https://git.ix5.org/felix/device-sony-kagura"
(git remote --verbose | grep -q $LINK) || git remote add ix5 $LINK
do_if_online git fetch ix5

25
master_repo_update.sh

@ -5,7 +5,6 @@ set -e
ANDROOT=$PWD
HTTP=https
OFFLINE=$SODP_WORK_OFFLINE
RESOLVED_REPO_PATH="$ANDROOT/$(dirname $(readlink $0))"
PATCHES_PATH=$RESOLVED_REPO_PATH/patches
@ -76,7 +75,7 @@ echo ""
pushd $ANDROOT/kernel/sony/msm-4.14/kernel
#LINK=$HTTP && LINK+="://github.com/sonyxperiadev/kernel"
#LINK="https://github.com/sonyxperiadev/kernel"
# TEMP: Build-able makefile for Q and 4.14
#git am < $PATCHES_PATH/q-kernel-4.14-makefile.patch
@ -129,7 +128,7 @@ git am < $PATCHES_PATH/master-networkstack-tests-net-Remove-libapf-deps.patch
popd
pushd $ANDROOT/device/sony/sepolicy
LINK=$HTTP && LINK+="://git.ix5.org/felix/device-sony-sepolicy"
LINK="https://git.ix5.org/felix/device-sony-sepolicy"
(git remote --verbose | grep -q $LINK) || git remote add ix5 $LINK
do_if_online git fetch ix5
# git checkout 'gatekeeper-4.9-qti-compat'
@ -138,7 +137,7 @@ apply_commit ca356bc5abfa6a45ff5b82e8d5c8dc43eff0865d
popd
pushd $ANDROOT/device/sony/common
LINK=$HTTP && LINK+="://git.ix5.org/felix/device-sony-common"
LINK="https://git.ix5.org/felix/device-sony-common"
(git remote --verbose | grep -q $LINK) || git remote add ix5 $LINK
do_if_online git fetch ix5
@ -161,7 +160,7 @@ apply_commit a259a415bc746c55fb4b213010c7ee1bda34d5b1
# init: Remove verity statements
apply_commit 6c33a4a8f5fe4615235df9d7abcfe3644f299672
LINK=$HTTP && LINK+="://github.com/sonyxperiadev/device-sony-common"
LINK="https://github.com/sonyxperiadev/device-sony-common"
# TODO: Remove me once merged into Q/master
# https://github.com/sonyxperiadev/device-sony-common/pull/616
@ -187,7 +186,7 @@ apply_pull_commit 675 ea42febdd4e78c3b80c31488c8fc7ca0e6287287
# TEMP: Kernel 4.9 backward compat
apply_pull_commit 666 5e50e2aac459f59da9c374557d5c692baaa63abb
LINK=$HTTP && LINK+="://git.ix5.org/felix/device-sony-common"
LINK="https://git.ix5.org/felix/device-sony-common"
# git checkout 'treble-odm-3'
# Use oem as /vendor and add treble quirks
apply_commit e3552cd64513cf5395a7b5c4206eeca0cd2c2c60
@ -200,11 +199,11 @@ popd
pushd $ANDROOT/device/sony/tone
# TODO: Remove me once merged into Q/master
LINK=$HTTP && LINK+="://github.com/sonyxperiadev/device-sony-tone"
LINK="https://github.com/sonyxperiadev/device-sony-tone"
# platform.mk: Move KERNEL_PATH to common
apply_pull_commit 188 5337faa4a7222158e312c498128ee2bc0bd74c11
LINK=$HTTP && LINK+="://git.ix5.org/felix/device-sony-tone"
LINK="https://git.ix5.org/felix/device-sony-tone"
(git remote --verbose | grep -q $LINK) || git remote add ix5 $LINK
do_if_online git fetch ix5
@ -229,7 +228,7 @@ popd
pushd $ANDROOT/device/sony/tama
LINK=$HTTP && LINK+="://git.ix5.org/felix/device-sony-tama"
LINK="https://git.ix5.org/felix/device-sony-tama"
(git remote --verbose | grep -q $LINK) || git remote add ix5 $LINK
do_if_online git fetch ix5
@ -238,7 +237,7 @@ do_if_online git fetch ix5
apply_commit 28915c56a25f9965aa22487366ba69ed8e78574b
# TODO: Remove me once merged into Q/master
LINK=$HTTP && LINK+="://github.com/sonyxperiadev/device-sony-tama"
LINK="https://github.com/sonyxperiadev/device-sony-tama"
# PlatformConfig: (Unconditionally) TARGET_NEEDS_DTBOIMAGE
apply_pull_commit 76 844349867e5853cfcf9d669518aba2f3d9b4c7bb
# platform.mk: Move KERNEL_PATH to common
@ -247,7 +246,7 @@ popd
pushd $ANDROOT/device/sony/kagura
LINK=$HTTP && LINK+="://git.ix5.org/felix/device-sony-kagura"
LINK="https://git.ix5.org/felix/device-sony-kagura"
(git remote --verbose | grep -q $LINK) || git remote add ix5 $LINK
do_if_online git fetch ix5
@ -265,13 +264,13 @@ apply_commit 449f9eccfd292d968a98d08546062aedbf6e1a2d
popd
pushd $ANDROOT/device/sony/apollo
LINK=$HTTP && LINK+="://github.com/sonyxperiadev/device-sony-apollo"
LINK="https://github.com/sonyxperiadev/device-sony-apollo"
# BoardConfig: Unify DTBOIMAGE defs in tama+common
apply_pull_commit 23 19243695b21e1096f3df451161cc0a6bcbd9be8d
popd
pushd $ANDROOT/system/sepolicy
LINK=$HTTP && LINK+="://android.googlesource.com/platform/system/sepolicy"
LINK="https://android.googlesource.com/platform/system/sepolicy"
# TODO: Remove me once merged AOSP master
# property_contexts: Drop COMPATIBLE_PROP guard
apply_gerrit_cl_commit refs/changes/04/1185404/2 dc7275cc8564597618e556169e92050545ba5068

26
q_repo_update.sh

@ -5,7 +5,6 @@ set -e
ANDROOT=$PWD
HTTP=https
OFFLINE=$SODP_WORK_OFFLINE
RESOLVED_REPO_PATH="$ANDROOT/$(dirname $(readlink $0))"
PATCHES_PATH=$RESOLVED_REPO_PATH/patches
@ -78,7 +77,7 @@ echo ""
pushd $ANDROOT/kernel/sony/msm-4.14/kernel
#LINK=$HTTP && LINK+="://github.com/sonyxperiadev/kernel"
#LINK="https://github.com/sonyxperiadev/kernel"
# TEMP: Build-able makefile for Q and 4.14
#git am < $PATCHES_PATH/q-kernel-4.14-makefile.patch
@ -140,7 +139,7 @@ git am < $PATCHES_PATH/q-networkstack-remove-libapf.patch
popd
pushd $ANDROOT/device/sony/sepolicy
LINK=$HTTP && LINK+="://git.ix5.org/felix/device-sony-sepolicy"
LINK="https://git.ix5.org/felix/device-sony-sepolicy"
(git remote --verbose | grep -q $LINK) || git remote add ix5 $LINK
do_if_online git fetch ix5
# git checkout 'gatekeeper-4.9-qti-compat'
@ -149,7 +148,7 @@ apply_commit ca356bc5abfa6a45ff5b82e8d5c8dc43eff0865d
popd
pushd $ANDROOT/device/sony/common
LINK=$HTTP && LINK+="://git.ix5.org/felix/device-sony-common"
LINK="https://git.ix5.org/felix/device-sony-common"
(git remote --verbose | grep -q $LINK) || git remote add ix5 $LINK
do_if_online git fetch ix5
@ -172,7 +171,7 @@ apply_commit 6206e8d57adf6dbc87ad785a8e1c5eac1141e44a
# init: Remove verity statements
apply_commit 6c33a4a8f5fe4615235df9d7abcfe3644f299672
LINK=$HTTP && LINK+="://github.com/sonyxperiadev/device-sony-common"
LINK="https://github.com/sonyxperiadev/device-sony-common"
# TODO: Remove me once merged into master
# https://github.com/sonyxperiadev/device-sony-common/pull/616
@ -184,7 +183,7 @@ apply_pull_commit 616 76fc5c2fb36a3f1bfe24d51daa04caeb5ce14fdb
# TEMP: Kernel 4.9 backward compat
apply_pull_commit 666 3b30e30b38f8588fcd6b821240aa09df8e6d3c61
LINK=$HTTP && LINK+="://git.ix5.org/felix/device-sony-common"
LINK="https://git.ix5.org/felix/device-sony-common"
# git checkout 'treble-odm-4'
# Use oem as /vendor and add treble quirks
apply_commit dc74eda759434c49b602514b43ceb1cb42b53d03
@ -208,7 +207,7 @@ popd
pushd $ANDROOT/device/sony/tone
LINK=$HTTP && LINK+="://git.ix5.org/felix/device-sony-tone"
LINK="https://git.ix5.org/felix/device-sony-tone"
(git remote --verbose | grep -q $LINK) || git remote add ix5 $LINK
do_if_online git fetch ix5
@ -229,7 +228,7 @@ popd
pushd $ANDROOT/device/sony/tama
LINK=$HTTP && LINK+="://git.ix5.org/felix/device-sony-tama"
LINK="https://git.ix5.org/felix/device-sony-tama"
(git remote --verbose | grep -q $LINK) || git remote add ix5 $LINK
do_if_online git fetch ix5
@ -251,7 +250,7 @@ popd
pushd $ANDROOT/device/sony/kagura
LINK=$HTTP && LINK+="://git.ix5.org/felix/device-sony-kagura"
LINK="https://git.ix5.org/felix/device-sony-kagura"
(git remote --verbose | grep -q $LINK) || git remote add ix5 $LINK
do_if_online git fetch ix5
@ -269,7 +268,7 @@ do_if_online git fetch ix5
popd
pushd $ANDROOT/system/sepolicy
LINK=$HTTP && LINK+="://android.googlesource.com/platform/system/sepolicy"
LINK="https://android.googlesource.com/platform/system/sepolicy"
# Disabled for now
#git am < $PATCHES_PATH/q-sepolicy-app-neverallow-exception-matlog.patch
popd
@ -279,6 +278,13 @@ pushd $ANDROOT/system/core
git am < $PATCHES_PATH/q-system-core-propertyservice-read-odm-buildprop.patch
popd
pushd $ANDROOT/vendor/qcom/opensource/core-utils
LINK="https://github.com/sonyxperiadev/vendor-qcom-opensource-utils"
# https://github.com/sonyxperiadev/vendor-qcom-opensource-core-utils/pull/3/commits
# fwk-detect: Drop libnativehelper includes
apply_pull_commit 3 0918f28102609638f05fa399ef1711b6f998d54c
popd
pushd $ANDROOT/prebuilts/gcc/linux-x86/aarch64/aarch64-linux-android-4.9
# aarch64: Drop sleep constructor
git am < $PATCHES_PATH/q-gcc-sleep-constructor-aarch64.patch

3
treble_repo_update.sh

@ -5,7 +5,6 @@ set -e
ANDROOT=$PWD
HTTP=https
RESOLVED_REPO_PATH="$ANDROOT/$(dirname $(readlink $0))"
PATCHES_PATH=$RESOLVED_REPO_PATH/patches
@ -95,7 +94,7 @@ git am < $PATCHES_PATH/build-releasetools-allow-no-system-ota.patch
popd
pushd $ANDROOT/device/sony/common
#LINK=$HTTP && LINK+="://git.ix5.org/felix/device-sony-common"
#LINK="https://git.ix5.org/felix/device-sony-common"
#(git remote --verbose | grep -q $LINK) || git remote add ix5 $LINK
#do_if_online git fetch ix5

Loading…
Cancel
Save