RepoMirrors/kpatch
1
0
Fork 0
mirror of https://github.com/dynup/kpatch synced 2025-03-02 00:40:54 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #510 from libin2015/support-add-new-file-v2

Browse Source 
kpatch-build: support adding new files in patch
This commit is contained in:
Seth Jennings 2015-10-16 09:29:45 -05:00
commit d444caa907
2 changed files with 21 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

35
kpatch-build/kpatch-build
View File

@ -463,7 +463,7 @@ do
done
echo "Extracting new and modified ELF sections"
cd "$TEMPDIR/orig"
cd "$TEMPDIR/patched"
FILES="$(find * -type f)"
cd "$TEMPDIR"
mkdir output
@ -482,21 +482,26 @@ for i in $FILES; do
cd $TEMPDIR
debugopt=
[[ $DEBUG -eq 1 ]] && debugopt=-d
"$TOOLSDIR"/create-diff-object $debugopt "orig/$i" "patched/$i" "$KOBJFILE" "output/$i" 2>&1 |tee -a "$LOGFILE"
rc="${PIPESTATUS[0]}"
if [[ $rc = 139 ]]; then
warn "create-diff-object SIGSEGV"
if ls core* &> /dev/null; then
cp core* /tmp
die "core file at /tmp/$(ls core*)"
if [[ -e "orig/$i" ]]; then
"$TOOLSDIR"/create-diff-object $debugopt "orig/$i" "patched/$i" "$KOBJFILE" "output/$i" 2>&1 |tee -a "$LOGFILE"
rc="${PIPESTATUS[0]}"
if [[ $rc = 139 ]]; then
warn "create-diff-object SIGSEGV"
if ls core* &> /dev/null; then
cp core* /tmp
die "core file at /tmp/$(ls core*)"
fi
die "no core file found, run 'ulimit -c unlimited' and try to recreate"
fi
die "no core file found, run 'ulimit -c unlimited' and try to recreate"
fi
# create-diff-object returns 3 if no functional change is found
[[ $rc -eq 0 ]] || [[ $rc -eq 3 ]] || ERROR=$(expr $ERROR "+" 1)
if [[ $rc -eq 0 ]]; then
[[ -n $ERROR_IF_DIFF ]] && die $ERROR_IF_DIFF
CHANGED=1
# create-diff-object returns 3 if no functional change is found
[[ $rc -eq 0 ]] || [[ $rc -eq 3 ]] || ERROR=$(expr $ERROR "+" 1)
if [[ $rc -eq 0 ]]; then
[[ -n $ERROR_IF_DIFF ]] && die $ERROR_IF_DIFF
CHANGED=1
objnames[$KOBJFILE]=1
fi
else
cp -f "patched/$i" "output/$i"
objnames[$KOBJFILE]=1
fi
done

2
kpatch-build/kpatch-gcc
View File

@ -35,7 +35,7 @@ if [[ "$TOOLCHAINCMD" = "gcc" ]] ; then
;;
*.o)
mkdir -p "$TEMPDIR/orig/$(dirname $obj)"
cp -f "$obj" "$TEMPDIR/orig/$obj"
[[ -e $obj ]] && cp -f "$obj" "$TEMPDIR/orig/$obj"
echo "$obj" >> "$TEMPDIR/changed_objs"
break
;;