RepoMirrors/kpatch
1
0
Fork 0
mirror of https://github.com/dynup/kpatch synced 2025-04-20 14:05:19 +00:00
Code Issues Packages Projects Releases Wiki Activity

kpatch-build: fix find_parent_obj

Browse Source 
When find kobj, it should use 'cat changed_objs' to get the changed
objects, in order to process the following object format:
a/b/c/../../object.o. If using patched dir to get changed object,
the object will be a/object.o, but it is a/b/c/../../object.o in
*.cmd file.
This patch also fix the find_parent_obj that change the format
'a/b/c/../../object.o' to 'a/object.o' in deep find, otherwise
it will fail with "two parent matches for *.o".

Signed-off-by: Li Bin <huawei.libin@huawei.com>
This commit is contained in:
Li Bin 2015-11-13 14:19:01 +08:00
parent eb54876936
commit 9143e88f16
1 changed files with 8 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
kpatch-build/kpatch-build
View File

@ -142,18 +142,21 @@ gcc_version_check() {
find_parent_obj() { find_parent_obj() {
dir=$(dirname $1) dir=$(dirname $1)
absdir=$(readlink -f $dir)
pwddir=$(readlink -f .)
pdir=${absdir#$pwddir/}
file=$(basename $1) file=$(basename $1)
grepname=${1%.o} grepname=${1%.o}
grepname=$grepname\\\.o grepname=$grepname\\\.o
if [[ $DEEP_FIND -eq 1 ]]; then if [[ $DEEP_FIND -eq 1 ]]; then
num=0 num=0
if [[ -n $last_deep_find ]]; then if [[ -n $last_deep_find ]]; then
parent=$(grep -l $grepname $last_deep_find/.*.cmd | grep -v $dir/.${file}.cmd |head -n1) parent=$(grep -l $grepname $last_deep_find/.*.cmd | grep -v $pdir/.${file}.cmd |head -n1)
num=$(grep -l $grepname $last_deep_find/.*.cmd | grep -v $dir/.${file}.cmd |wc -l) num=$(grep -l $grepname $last_deep_find/.*.cmd | grep -v $pdir/.${file}.cmd |wc -l)
fi fi
if [[ $num -eq 0 ]]; then if [[ $num -eq 0 ]]; then
parent=$(find * -name ".*.cmd" | xargs grep -l $grepname | grep -v $dir/.${file}.cmd |head -n1) parent=$(find * -name ".*.cmd" | xargs grep -l $grepname | grep -v $pdir/.${file}.cmd |head -n1)
num=$(find * -name ".*.cmd" | xargs grep -l $grepname | grep -v $dir/.${file}.cmd | wc -l) num=$(find * -name ".*.cmd" | xargs grep -l $grepname | grep -v $pdir/.${file}.cmd | wc -l)
[[ $num -eq 1 ]] && last_deep_find=$(dirname $parent) [[ $num -eq 1 ]] && last_deep_find=$(dirname $parent)
fi fi
else else
@ -502,8 +505,7 @@ do
done done
echo "Extracting new and modified ELF sections" echo "Extracting new and modified ELF sections"
cd "$TEMPDIR/patched" FILES="$(cat "$TEMPDIR/changed_objs")"
FILES="$(find * -type f)"
cd "$TEMPDIR" cd "$TEMPDIR"
mkdir output mkdir output
declare -A objnames declare -A objnames