给repo项目打patch

查看当前修改，可能涉及几个不同的仓库

eg.

1
2
3
4
5
6
7
8
9
10
11
12
13
14
$ repo status
project art/                                    (*** NO BRANCH ***)
 -m     runtime/mem_map.cc
project build/make/                             (*** NO BRANCH ***)
 -m     target/board/generic_x86/BoardConfig.mk
 -m     target/board/generic_x86/device.mk
 -m     target/product/runtime_libart.mk
project prebuilts/misc/                         (*** NO BRANCH ***)
 -m     linux-x86/flex/flex-2.5.39
project packages/apps/DeskClock/                (*** NO BRANCH ***)
 -m     src/com/android/deskclock/stopwatch/StopwatchFragment.java
project system/core/                            (*** NO BRANCH ***)
 -m     rootdir/etc/ld.config.txt
 -m     rootdir/init.rc

使用repo diff导出修改

1
repo diff > repo.diff

在其它repo仓库中导入修改

使用以下脚本
repo-diff-patch.sh

1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
#!/bin/sh
## Script to patch up diff reated by `repo diff`

if [ -z "$1" ] || [ ! -e "$1" ]; then
    echo "Usages: $0 <repo_diff_file>";
    exit 0;
fi

rm -fr _tmp_splits*
cat $1 | csplit -qf '' -b "_tmp_splits.%d.diff" - '/^project.*\/$/' '{*}' 

working_dir=`pwd`

for proj_diff in `ls _tmp_splits.*.diff`
do 
    chg_dir=`cat $proj_diff | grep '^project.*\/$' | cut -d " " -f 2`
    echo "FILE: $proj_diff $chg_dir"
    if [ -e $chg_dir ]; then
        ( cd $chg_dir; \
            cat $working_dir/$proj_diff | grep -v '^project.*\/$' | patch -Np1;);
    else
        echo "$0: Project directory $chg_dir don't exists.";
    fi
done

打patch

1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
$ ./repo-diff-patch.sh repo.diff
FILE: _tmp_splits.0.diff
patch: **** Only garbage was found in the patch input.
FILE: _tmp_splits.1.diff art/
patching file runtime/mem_map.cc
FILE: _tmp_splits.2.diff build/make/
patching file target/board/generic_x86/BoardConfig.mk
patching file target/board/generic_x86/device.mk
patching file target/product/runtime_libart.mk
FILE: _tmp_splits.3.diff packages/apps/DeskClock/
patching file src/com/android/deskclock/stopwatch/StopwatchFragment.java
FILE: _tmp_splits.4.diff prebuilts/misc/
patching file linux-x86/flex/flex-2.5.39
FILE: _tmp_splits.5.diff system/core/
patching file rootdir/etc/ld.config.txt
patching file rootdir/init.rc

After patch

其中prebuilts/misc/linux-x86/flex/flex-2.5.39为是二进制文件，patch失败

1
2
3
4
5
6
7
8
9
10
11
12
$ repo status
project art/                                    (*** NO BRANCH ***)
 -m     runtime/mem_map.cc
project build/make/                             (*** NO BRANCH ***)
 -m     target/board/generic_x86/BoardConfig.mk
 -m     target/board/generic_x86/device.mk
 -m     target/product/runtime_libart.mk
project packages/apps/DeskClock/                (*** NO BRANCH ***)
 -m     src/com/android/deskclock/stopwatch/StopwatchFragment.java
project system/core/                            (*** NO BRANCH ***)
 -m     rootdir/etc/ld.config.txt
 -m     rootdir/init.rc
代码管理
#git #教程
给repo项目打patch
https://hqw700.github.io/2024/04/29/2024-04-29-repo-patch-after-repo-diff/
发布于
2024年4月29日
许可协议