On Tue, 10 Sep 2019 11:18:17 +0100
Laura Abbott <labbott(a)redhat.com> wrote:
This looks more like the patch is being applied in the wrong
directory
if it can't find lib/Kconfig. Were there errors further up in the
build log?
No errors. And the directory and file it is looking for from the
patch don't exist in the expanded source. I assume that means they are
missing in the tarball too.
Seem to be in the same directory.
Official build:
+ cd linux-5.3.0-0.rc7.git1.1.fc32.x86_64
My build:
+ cd linux-5.3.0-0.rc7.git1.1.20190908.fc31.x86_64
There are some differences with this because of the differences between
using mock and rpmbuild, but as near as I can tell, they are doing the
same thing.
One thing I notice is that in the official build log, there are some
patch commands run.
+ patch -p1 -F1 -s
In my build log, they are replaced with
+ patch_command='patch -p1 -F1 -s'
I split output between regular output and error output.
Here is the regular output from the run with the first patch commented
out.
setting SOURCE_DATE_EPOCH=1567641600
Executing(%prep): /bin/sh -e /var/tmp/rpm-tmp.wiCmqM
Initialized empty Git repository
in
/home/stan/rpmbuild/BUILD/kernel-5.2.fc31/linux-5.3.0-0.rc7.git1.1.20190908.fc31.x86_64/.git/
Applying: input: kill stupid messages Patch failed at 0001 input: kill
stupid messages When you have resolved this problem, run "git am
--continue". If you prefer to skip this patch, run "git am --skip"
instead. To restore the original branch and stop patching, run "git am
--abort".
RPM build errors:
Here is the error output from the run with the first patch commented
out. I had to shorten the list of patches because the line was really
long, but it was the same as the official build.
+ umask 022
+ cd /home/stan/rpmbuild/BUILD
+ patch_command='patch -p1 -F1 -s'
++ find /home/stan/rpmbuild/BUILD -maxdepth 1 -type d -name 'kernel-5.*'
++ grep -x -v /home/stan/rpmbuild/BUILD/kernel-5.2.fc31
+ sharedirs=
+ :
+ '[' -d kernel-5.2.fc31 ']'
+ cd kernel-5.2.fc31
+ for i in linux-*
+ '[' -d linux-5.3.0-0.rc7.git1.1.20190908.fc31.x86_64 ']'
+ rm -rf deleteme.x86_64
+ mv linux-5.3.0-0.rc7.git1.1.20190908.fc31.x86_64
deleteme-linux-5.3.0-0.rc7.git1.1.20190908.fc31.x86_64
+ cd ..
+ rm -rf deleteme-linux-5.3.0-0.rc7.git1.1.20190908.fc31.x86_64
+ '[' '!' -d kernel-5.2.fc31/vanilla-5.3-rc7-git1 ']'
+ cd kernel-5.2.fc31
+ cp -al vanilla-5.3-rc7-git1
linux-5.3.0-0.rc7.git1.1.20190908.fc31.x86_64
+ cd linux-5.3.0-0.rc7.git1.1.20190908.fc31.x86_64
+ '[' '!' -d .git ']'
+ git init
+ git config user.email kernel-team(a)fedoraproject.org
+ git config user.name 'Fedora Kernel Team'
+ git config gc.auto 0
+ git add .
+ git commit -a -q -m baseline
+ patch_command='patch -p1 -F1 -s'
+ git
am /home/stan/rpmbuild/SOURCES/input-kill-stupid-messages.patch
/home/stan/rpmbuild/SOURCES/die-floppy-die.patch
/home/stan/rpmbuild/SOURCES/no-pcspkr-modalias.patch
/home/stan/rpmbuild/SOURCES/Kbuild-Add-an-option-to-enable-GCC-VTA.patch
/home/stan/rpmbuild/SOURCES/crash-driver.patch
/home/stan/rpmbuild/SOURCES/lis3-improve-handling-of-null-rate.patch
/home/stan/rpmbuild/SOURCES/scsi-sd_revalidate_disk-prevent-NULL-ptr-deref.patch
/home/stan/rpmbuild/SOURCES/namespaces-no-expert.patch ...
error: drivers/input/keyboard/atkbd.c: does not exist in index hint:
Use 'git am --show-current-patch' to see the failed patch error: Bad
exit status from /var/tmp/rpm-tmp.wiCmqM (%prep) Bad exit status
from /var/tmp/rpm-tmp.wiCmqM (%prep)