From ef76bd9cc96170830e7b07cddc14f1003793cb31 Mon Sep 17 00:00:00 2001
From: Li Bin <huawei.libin@huawei.com>
Date: Fri, 16 Oct 2015 17:25:00 +0800
Subject: [PATCH] kpatch-build: support adding new files in patch

Geting the changed objects from the patched dir, in order to support
adding new files in patch.

Signed-off-by: Li Bin <huawei.libin@huawei.com>
---
 kpatch-build/kpatch-build | 35 ++++++++++++++++++++---------------
 kpatch-build/kpatch-gcc   |  2 +-
 2 files changed, 21 insertions(+), 16 deletions(-)

diff --git a/kpatch-build/kpatch-build b/kpatch-build/kpatch-build
index b31d69d..6bc110a 100755
--- a/kpatch-build/kpatch-build
+++ b/kpatch-build/kpatch-build
@@ -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
diff --git a/kpatch-build/kpatch-gcc b/kpatch-build/kpatch-gcc
index 46755e0..e7bbab0 100755
--- a/kpatch-build/kpatch-gcc
+++ b/kpatch-build/kpatch-gcc
@@ -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
 					;;