From 73823ebf7df59280c43f9b250996857337dccbae Mon Sep 17 00:00:00 2001 From: Peter Jones Date: Thu, 3 Aug 2017 15:06:42 -0400 Subject: [PATCH] Undo those last two - something is going wrong with fedpkg locally. Somehow the wrong version is getting built, and I'm quite confused as to why: trillian:~/devel/fedora/grub2/master$ fedpkg build /usr/lib/python2.7/site-packages/fedora/client/bodhi.py:48: DeprecationWarning: fedora.client.bodhi has been deprecated. Please use bodhi.client.bindings instead. DeprecationWarning) Building grub2-2.02-3.fc27 for rawhide ^^^^^^^^^^^^^^^^^ looks correct Created task: 21022413 Task info: https://koji.fedoraproject.org/koji/taskinfo?taskID=21022413 Watching tasks (this may be safely interrupted)... 21022413 build (rawhide, /rpms/grub2:bf8e18bc1df80b77e218e3e673f9e3f8f2116542): free 21022413 build (rawhide, /rpms/grub2:bf8e18bc1df80b77e218e3e673f9e3f8f2116542): free -> open (buildvm-aarch64-01.arm.fedoraproject.org) 21022414 buildSRPMFromSCM (/rpms/grub2:bf8e18bc1df80b77e218e3e673f9e3f8f2116542): free 21022414 buildSRPMFromSCM (/rpms/grub2:bf8e18bc1df80b77e218e3e673f9e3f8f2116542): free -> open (buildvm-aarch64-01.arm.fedoraproject.org) 21022414 buildSRPMFromSCM (/rpms/grub2:bf8e18bc1df80b77e218e3e673f9e3f8f2116542): open (buildvm-aarch64-01.arm.fedoraproject.org) -> closed 0 free 1 open 1 done 0 failed 21022475 buildArch (grub2-2.02-0.25.fc27.src.rpm, i686): free ^^^^^^^^^^^^^^^^^^^^ does not look correct So I'm trying from a fresh checkout instead. Signed-off-by: Peter Jones --- grub2.spec | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/grub2.spec b/grub2.spec index 7064f28..6ef251a 100644 --- a/grub2.spec +++ b/grub2.spec @@ -66,11 +66,11 @@ Source8: strtoull_test.c # And these are: # git checkout debuginfo # git format-patch fedora-23.. -#Patch10001: 10001-Put-the-correct-.file-directives-in-our-.S-files.patch -#Patch10002: 10002-Make-it-possible-to-enabled-build-id-sha1.patch +Patch10001: 10001-Put-the-correct-.file-directives-in-our-.S-files.patch +Patch10002: 10002-Make-it-possible-to-enabled-build-id-sha1.patch #Patch10003: 10003-Don-t-tell-the-compiler-to-do-annoying-things-with-.patch -#Patch10004: 10004-Add-grub_qdprintf-grub_dprintf-without-the-file-lin.patch -#Patch10005: 10005-Make-a-gdb-dprintf-that-tells-us-load-addresses.patch +Patch10004: 10004-Add-grub_qdprintf-grub_dprintf-without-the-file-lin.patch +Patch10005: 10005-Make-a-gdb-dprintf-that-tells-us-load-addresses.patch #Patch10006: 10006-Try-it-in-gentpl-again.patch BuildRequires: flex bison binutils python