kpatch-build: don't link unchanged objects

The FILES variable can contain unchanged objects, so don't use it to
determine which objects to link.  Instead, just use all the objects that
were placed in the output directory by create-diff-object.
This commit is contained in:
Josh Poimboeuf 2014-08-08 14:20:19 -05:00
parent 1b9868ed33
commit a600f1d117
1 changed files with 1 additions and 1 deletions

View File

@ -463,7 +463,7 @@ cp "$OBJDIR/.config" "$SRCDIR"
cd "$SRCDIR" cd "$SRCDIR"
make prepare >> "$LOGFILE" 2>&1 || die make prepare >> "$LOGFILE" 2>&1 || die
cd "$TEMPDIR/output" cd "$TEMPDIR/output"
ld -r -o ../patch/output.o $FILES >> "$LOGFILE" 2>&1 || die ld -r -o ../patch/output.o $(find . -name "*.o") >> "$LOGFILE" 2>&1 || die
cd "$TEMPDIR/patch" cd "$TEMPDIR/patch"
KPATCH_BUILD="$SRCDIR" KPATCH_NAME="$PATCHNAME" KBUILD_EXTRA_SYMBOLS="$SYMVERSFILE" make "O=$OBJDIR" >> "$LOGFILE" 2>&1 || die KPATCH_BUILD="$SRCDIR" KPATCH_NAME="$PATCHNAME" KBUILD_EXTRA_SYMBOLS="$SYMVERSFILE" make "O=$OBJDIR" >> "$LOGFILE" 2>&1 || die