We only do debug builds on x86. Drop the debug .config files for the other arches.
Not-yet-signed-off-by: Paul Bolle pebolle@tiscali.nl --- What would break if this patch were applied? Because, as far as I can tell, none of these five debug .config files are ever used. I must be overlooking something here.
configs/config_generation | 5 - configs/fedora/debug/arm/CONFIG_LOCK_STAT | 1 - kernel-aarch64-debug.config | 6945 ------------------- kernel-armv7hl-debug.config | 7360 --------------------- kernel-armv7hl-lpae-debug.config | 6924 ------------------- kernel-ppc64le-debug.config | 6061 ----------------- kernel-s390x-debug.config | 6001 ----------------- kernel.spec | 4 - 8 files changed, 33301 deletions(-) delete mode 100644 configs/fedora/debug/arm/CONFIG_LOCK_STAT delete mode 100644 kernel-aarch64-debug.config delete mode 100644 kernel-armv7hl-debug.config delete mode 100644 kernel-armv7hl-lpae-debug.config delete mode 100644 kernel-ppc64le-debug.config delete mode 100644 kernel-s390x-debug.config
diff --git a/configs/config_generation b/configs/config_generation index 97683c517ef5..1105c76294c5 100644 --- a/configs/config_generation +++ b/configs/config_generation @@ -18,18 +18,13 @@ i686-debug=generic:generic-x86:generic-x86-i686:debug:debug-x86
# ppc64le ppc64le=generic:generic-powerpc -ppc64le-debug=generic:generic-powerpc:generic-powerpc:debug
# s390x s390x=generic:generic-s390x -s390x-debug=generic:generic-s390x:debug
# aarch64 aarch64=generic:generic-arm:generic-arm-aarch64 -aarch64-debug=generic:generic-arm:generic-arm-aarch64:debug:debug-arm
# arm armv7hl=generic:generic-arm:generic-arm-armv7:generic-arm-armv7-armv7 -armv7hl-debug=generic:generic-arm:generic-arm-armv7:generic-arm-armv7-armv7:debug:debug-arm armv7hl-lpae=generic:generic-arm:generic-arm-armv7:generic-arm-armv7-lpae -armv7hl-lpae-debug=generic:generic-arm:generic-arm-armv7:generic-arm-armv7-lpae:debug:debug-arm diff --git a/configs/fedora/debug/arm/CONFIG_LOCK_STAT b/configs/fedora/debug/arm/CONFIG_LOCK_STAT deleted file mode 100644 index ab733ddc26ab..000000000000 diff --git a/kernel-aarch64-debug.config b/kernel-aarch64-debug.config deleted file mode 100644 index 64d751925307..000000000000 diff --git a/kernel-armv7hl-debug.config b/kernel-armv7hl-debug.config deleted file mode 100644 index 0a318bfee7c1..000000000000 diff --git a/kernel-armv7hl-lpae-debug.config b/kernel-armv7hl-lpae-debug.config deleted file mode 100644 index 0ce99e3ffe96..000000000000 diff --git a/kernel-ppc64le-debug.config b/kernel-ppc64le-debug.config deleted file mode 100644 index 65f00540bc70..000000000000 diff --git a/kernel-s390x-debug.config b/kernel-s390x-debug.config deleted file mode 100644 index 53a7647c14c2..000000000000 diff --git a/kernel.spec b/kernel.spec index 23b8c13475d6..1b6e52d8ffae 100644 --- a/kernel.spec +++ b/kernel.spec @@ -1565,10 +1565,6 @@ cd linux-%{KVERREL} BuildKernel %make_target %kernel_image %{_use_vdso} debug %endif
-%if %{with_pae_debug} -BuildKernel %make_target %kernel_image %{use_vdso} %{pae}debug -%endif - %if %{with_pae} BuildKernel %make_target %kernel_image %{use_vdso} %{pae} %endif
On Wed, Jan 16, 2019 at 5:52 AM Paul Bolle pebolle@tiscali.nl wrote:
We only do debug builds on x86. Drop the debug .config files for the other arches.
Absolutely not true. Every rawhide build outside of direct rcX builds are debug builds. Stable releases don't use these files.
Not-yet-signed-off-by: Paul Bolle pebolle@tiscali.nl
What would break if this patch were applied? Because, as far as I can tell, none of these five debug .config files are ever used. I must be overlooking something here.
generate_debug_configs.sh
configs/config_generation | 5 - configs/fedora/debug/arm/CONFIG_LOCK_STAT | 1 - kernel-aarch64-debug.config | 6945 ------------------- kernel-armv7hl-debug.config | 7360 --------------------- kernel-armv7hl-lpae-debug.config | 6924 ------------------- kernel-ppc64le-debug.config | 6061 ----------------- kernel-s390x-debug.config | 6001 ----------------- kernel.spec | 4 - 8 files changed, 33301 deletions(-) delete mode 100644 configs/fedora/debug/arm/CONFIG_LOCK_STAT delete mode 100644 kernel-aarch64-debug.config delete mode 100644 kernel-armv7hl-debug.config delete mode 100644 kernel-armv7hl-lpae-debug.config delete mode 100644 kernel-ppc64le-debug.config delete mode 100644 kernel-s390x-debug.config
diff --git a/configs/config_generation b/configs/config_generation index 97683c517ef5..1105c76294c5 100644 --- a/configs/config_generation +++ b/configs/config_generation @@ -18,18 +18,13 @@ i686-debug=generic:generic-x86:generic-x86-i686:debug:debug-x86
# ppc64le ppc64le=generic:generic-powerpc -ppc64le-debug=generic:generic-powerpc:generic-powerpc:debug
# s390x s390x=generic:generic-s390x -s390x-debug=generic:generic-s390x:debug
# aarch64 aarch64=generic:generic-arm:generic-arm-aarch64 -aarch64-debug=generic:generic-arm:generic-arm-aarch64:debug:debug-arm
# arm armv7hl=generic:generic-arm:generic-arm-armv7:generic-arm-armv7-armv7 -armv7hl-debug=generic:generic-arm:generic-arm-armv7:generic-arm-armv7-armv7:debug:debug-arm armv7hl-lpae=generic:generic-arm:generic-arm-armv7:generic-arm-armv7-lpae -armv7hl-lpae-debug=generic:generic-arm:generic-arm-armv7:generic-arm-armv7-lpae:debug:debug-arm diff --git a/configs/fedora/debug/arm/CONFIG_LOCK_STAT b/configs/fedora/debug/arm/CONFIG_LOCK_STAT deleted file mode 100644 index ab733ddc26ab..000000000000 diff --git a/kernel-aarch64-debug.config b/kernel-aarch64-debug.config deleted file mode 100644 index 64d751925307..000000000000 diff --git a/kernel-armv7hl-debug.config b/kernel-armv7hl-debug.config deleted file mode 100644 index 0a318bfee7c1..000000000000 diff --git a/kernel-armv7hl-lpae-debug.config b/kernel-armv7hl-lpae-debug.config deleted file mode 100644 index 0ce99e3ffe96..000000000000 diff --git a/kernel-ppc64le-debug.config b/kernel-ppc64le-debug.config deleted file mode 100644 index 65f00540bc70..000000000000 diff --git a/kernel-s390x-debug.config b/kernel-s390x-debug.config deleted file mode 100644 index 53a7647c14c2..000000000000 diff --git a/kernel.spec b/kernel.spec index 23b8c13475d6..1b6e52d8ffae 100644 --- a/kernel.spec +++ b/kernel.spec @@ -1565,10 +1565,6 @@ cd linux-%{KVERREL} BuildKernel %make_target %kernel_image %{_use_vdso} debug %endif
-%if %{with_pae_debug} -BuildKernel %make_target %kernel_image %{use_vdso} %{pae}debug -%endif
%if %{with_pae} BuildKernel %make_target %kernel_image %{use_vdso} %{pae} %endif -- 2.17.2 _______________________________________________ kernel mailing list -- kernel@lists.fedoraproject.org To unsubscribe send an email to kernel-leave@lists.fedoraproject.org Fedora Code of Conduct: https://getfedora.org/code-of-conduct.html List Guidelines: https://fedoraproject.org/wiki/Mailing_list_guidelines List Archives: https://lists.fedoraproject.org/archives/list/kernel@lists.fedoraproject.org
Justin Forbes schreef op wo 16-01-2019 om 10:17 [-0600]:
Absolutely not true. Every rawhide build outside of direct rcX builds are debug builds. Stable releases don't use these files.
But how do those builds hop past this snippet (in kernel.spec): # don't do debug builds on anything but i686 and x86_64 %ifnarch i686 x86_64 %define with_debug 0 %endif
Anyway, I couldn't find a build on koji.f.o that uses one of these five files. Would you have a pointer to a build that does?
Thanks,
Paul Bolle
On Wed, Jan 16, 2019 at 10:40 AM Paul Bolle pebolle@tiscali.nl wrote:
Justin Forbes schreef op wo 16-01-2019 om 10:17 [-0600]:
Absolutely not true. Every rawhide build outside of direct rcX builds are debug builds. Stable releases don't use these files.
But how do those builds hop past this snippet (in kernel.spec): # don't do debug builds on anything but i686 and x86_64 %ifnarch i686 x86_64 %define with_debug 0 %endif
Look at the references to debugbuildsenabled in kernel.spec. Specifically
for non debug kernels, we build standard kernels and call generate_all_configs.sh, and then x86 also builds a separate debug kernel. This is toggled by 'make release' and 'make debug' and you will see a changelog entry for every time debug is turned on or off. Again, this only tends to happen in rawhide. For debug kernels (most rawhide kernels), all kernels are debug kernels and we call generate_debug_configs.sh instead. To save you having to look through them, here is the content of generate_debug_configs.sh:
#!/bin/sh
for i in kernel-*debug.config; do base=`echo $i | sed -r s/-?debug//g` NEW=kernel-$VERSION-`echo $base | cut -d - -f2-` mv $i $NEW rm $base done
The absolute only difference you will see in a build log, is for debug kernels (approximately 80% of kernels built on rawhide) the logs show
+ cp /builddir/build/SOURCES/merge.pl . + cp /builddir/build/SOURCES/generate_all_configs.sh . + cp /builddir/build/SOURCES/generate_debug_configs.sh . + cp /builddir/build/SOURCES/generate_bls_conf.sh . + VERSION=5.0.0 + ./generate_debug_configs.sh + for i in kernel-5.0.0-aarch64*.config + mv kernel-5.0.0-aarch64.config kernel-5.0.0-aarch64.config.tmp + ./merge.pl /builddir/build/SOURCES/kernel-local kernel-5.0.0-aarch64.config.tmp + rm kernel-5.0.0-aarch64.config.tmp + rm -f 'kernel-5.0.0-*debug.config' + cp /builddir/build/SOURCES/process_configs.sh . + OPTS= + OPTS=' -n' + OPTS=' -n -c' + ./process_configs.sh -n -c kernel 5.0.0
And for non debug standard kernels across standard Fedora releases, or the rcX-git0.1 kernels in rawhide:
+ cp /builddir/build/SOURCES/merge.pl . + cp /builddir/build/SOURCES/generate_all_configs.sh . + cp /builddir/build/SOURCES/generate_debug_configs.sh . + cp /builddir/build/SOURCES/generate_bls_conf.sh . + VERSION=5.0.0 + ./generate_all_configs.sh + for i in kernel-5.0.0-aarch64*.config + mv kernel-5.0.0-aarch64-debug.config kernel-5.0.0-aarch64-debug.config.tmp + ./merge.pl /builddir/build/SOURCES/kernel-local kernel-5.0.0-aarch64-debug.config.tmp + rm kernel-5.0.0-aarch64-debug.config.tmp + for i in kernel-5.0.0-aarch64*.config + mv kernel-5.0.0-aarch64.config kernel-5.0.0-aarch64.config.tmp + ./merge.pl /builddir/build/SOURCES/kernel-local kernel-5.0.0-aarch64.config.tmp + rm kernel-5.0.0-aarch64.config.tmp + cp /builddir/build/SOURCES/process_configs.sh . + OPTS= + OPTS=' -n' + OPTS=' -n -c' + ./process_configs.sh -n -c kernel 5.0.0
Anyway, I couldn't find a build on koji.f.o that uses one of these five files. Would you have a pointer to a build that does?
https://koji.fedoraproject.org/koji/taskinfo?taskID=32066991 would be the
most recent. There are usually 4 a week on rawhide. Though to save you some trouble, the only relevant pieces from the logs are included above.
Justin
Thanks,
Paul Bolle _______________________________________________ kernel mailing list -- kernel@lists.fedoraproject.org To unsubscribe send an email to kernel-leave@lists.fedoraproject.org Fedora Code of Conduct: https://getfedora.org/code-of-conduct.html List Guidelines: https://fedoraproject.org/wiki/Mailing_list_guidelines List Archives: https://lists.fedoraproject.org/archives/list/kernel@lists.fedoraproject.org
Justin,
Justin Forbes schreef op wo 16-01-2019 om 15:30 [-0600]:
#!/bin/sh
for i in kernel-*debug.config; do base=`echo $i | sed -r s/-?debug//g` NEW=kernel-$VERSION-`echo $base | cut -d - -f2-` mv $i $NEW rm $base done
Thanks for taking the time, twice, to look into my RFC.
There should be a way to do the above without dropping boobytraps to the uninitiated? (I'll ponder that.)
Thanks,
Paul Bolle
Paul Bolle schreef op wo 16-01-2019 om 23:01 [+0100]:
There should be a way to do the above without dropping boobytraps to the uninitiated? (I'll ponder that.)
And one of the things I'll have to ponder is why there are only kernel-debug-* packages built for x86 (ie, i686 and x86_64).
Still confused,
Paul Bolle
kernel@lists.fedoraproject.org