x86/build: Add {kvm_guest,xen}.config targets to make help's output
Borislav Petkov
maintainerPATCH 1/2 x86/build: Add {kvm_guest,xen}.config targets to make help's output
From: Borislav Petkov <[email protected]>
Add the targets which add Kconfig items to the .config so that the kernel can be run as a guest, to the 'make help' output so that they can be found easier and there's no need to grep the tree each time to remember what they should be called.
--- arch/x86/Makefile | 3 +++ 1 file changed, 3 insertions(+)
arch/x86/Makefile +3 -0
@@ -304,4 +304,7 @@ define archhelp echo ' bzdisk/fdimage*/isoimage also accept:' echo ' FDARGS="..." arguments for the booted kernel' echo ' FDINITRD=file initrd for the booted kernel' + echo ' kvm_guest.config - Enable Kconfig items for running this kernel as a KVM guest' + echo ' xen.config - Enable Kconfig items for running this kernel as a Xen guest' + endef
Signature · 1 line
2.29.2
Borislav Petkov
maintainerPATCH 2/2 x86/build: Realign archhelp
From: Borislav Petkov <[email protected]>
Realign help text vertically and add spacing so that target help text is properly separated.
No functional changes.
--- arch/x86/Makefile | 29 +++++++++++++++-------------- 1 file changed, 15 insertions(+), 14 deletions(-)
arch/x86/Makefile +15 -14
@@ -292,19 +292,20 @@ archclean: $(Q)$(MAKE) $(clean)=arch/x86/tools define archhelp - echo '* bzImage - Compressed kernel image (arch/x86/boot/bzImage)' - echo ' install - Install kernel using' - echo ' (your) ~/bin/$(INSTALLKERNEL) or' - echo ' (distribution) /sbin/$(INSTALLKERNEL) or' - echo ' install to $$(INSTALL_PATH) and run lilo' - echo ' fdimage - Create 1.4MB boot floppy image (arch/x86/boot/fdimage)' - echo ' fdimage144 - Create 1.4MB boot floppy image (arch/x86/boot/fdimage)' - echo ' fdimage288 - Create 2.8MB boot floppy image (arch/x86/boot/fdimage)' - echo ' isoimage - Create a boot CD-ROM image (arch/x86/boot/image.iso)' - echo ' bzdisk/fdimage*/isoimage also accept:' - echo ' FDARGS="..." arguments for the booted kernel' - echo ' FDINITRD=file initrd for the booted kernel' - echo ' kvm_guest.config - Enable Kconfig items for running this kernel as a KVM guest' - echo ' xen.config - Enable Kconfig items for running this kernel as a Xen guest' + echo '* bzImage - Compressed kernel image (arch/x86/boot/bzImage)' + echo ' install - Install kernel using (your) ~/bin/$(INSTALLKERNEL) or' + echo ' (distribution) /sbin/$(INSTALLKERNEL) or install to ' + echo ' $$(INSTALL_PATH) and run lilo' + echo '' + echo ' fdimage - Create 1.4MB boot floppy image (arch/x86/boot/fdimage)' + echo ' fdimage144 - Create 1.4MB boot floppy image (arch/x86/boot/fdimage)' + echo ' fdimage288 - Create 2.8MB boot floppy image (arch/x86/boot/fdimage)' + echo ' isoimage - Create a boot CD-ROM image (arch/x86/boot/image.iso)' + echo ' bzdisk/fdimage*/isoimage also accept:' + echo ' FDARGS="..." arguments for the booted kernel' + echo ' FDINITRD=file initrd for the booted kernel' + echo '' + echo ' kvm_guest.config - Enable Kconfig items for running this kernel as a KVM guest' + echo ' xen.config - Enable Kconfig items for running this kernel as a Xen guest' endef
Signature · 1 line
2.29.2
The following commit has been merged into the x86/build branch of tip:
The following commit has been merged into the x86/build branch of tip:
Commit-ID: fbaf0aa8c7a8d4f7c3e4664f2f03ec8c7cc79910 Gitweb: https://git.kernel.org/tip/fbaf0aa8c7a8d4f7c3e4664f2f03ec8c7cc79910 Author: Borislav Petkov <[email protected]> AuthorDate: Thu, 17 Dec 2020 13:13:34 +01:00 Committer: Borislav Petkov <[email protected]> CommitterDate: Mon, 28 Dec 2020 18:23:25 +01:00
x86/build: Add {kvm_guest,xen}.config targets to make help's output
Add the targets which add additional items to the .config which facilitate running the kernel as a guest, to the 'make help' output so that they can be found easier and there's no need to grep the tree each time to remember what they should be called.
--- arch/x86/Makefile | 3 +++ 1 file changed, 3 insertions(+)
arch/x86/Makefile +3 -0
@@ -304,4 +304,7 @@ define archhelp echo ' bzdisk/fdimage*/isoimage also accept:' echo ' FDARGS="..." arguments for the booted kernel' echo ' FDINITRD=file initrd for the booted kernel' + echo ' kvm_guest.config - Enable Kconfig items for running this kernel as a KVM guest' + echo ' xen.config - Enable Kconfig items for running this kernel as a Xen guest' + endef
[tip: x86/build] x86/build: Realign archhelp
In reply to Borislav PetkovThe following commit has been merged into the x86/build branch of tip:
The following commit has been merged into the x86/build branch of tip:
Commit-ID: ac5d08870d0b94cbfa8103c9e294de2b96f249bc Gitweb: https://git.kernel.org/tip/ac5d08870d0b94cbfa8103c9e294de2b96f249bc Author: Borislav Petkov <[email protected]> AuthorDate: Thu, 17 Dec 2020 14:42:00 +01:00 Committer: Borislav Petkov <[email protected]> CommitterDate: Mon, 28 Dec 2020 18:25:53 +01:00
x86/build: Realign archhelp
Realign help text vertically and add spacing so that the target help text is properly separated.
No functional changes.
--- arch/x86/Makefile | 29 +++++++++++++++-------------- 1 file changed, 15 insertions(+), 14 deletions(-)
arch/x86/Makefile +15 -14
@@ -292,19 +292,20 @@ archclean: $(Q)$(MAKE) $(clean)=arch/x86/tools define archhelp - echo '* bzImage - Compressed kernel image (arch/x86/boot/bzImage)' - echo ' install - Install kernel using' - echo ' (your) ~/bin/$(INSTALLKERNEL) or' - echo ' (distribution) /sbin/$(INSTALLKERNEL) or' - echo ' install to $$(INSTALL_PATH) and run lilo' - echo ' fdimage - Create 1.4MB boot floppy image (arch/x86/boot/fdimage)' - echo ' fdimage144 - Create 1.4MB boot floppy image (arch/x86/boot/fdimage)' - echo ' fdimage288 - Create 2.8MB boot floppy image (arch/x86/boot/fdimage)' - echo ' isoimage - Create a boot CD-ROM image (arch/x86/boot/image.iso)' - echo ' bzdisk/fdimage*/isoimage also accept:' - echo ' FDARGS="..." arguments for the booted kernel' - echo ' FDINITRD=file initrd for the booted kernel' - echo ' kvm_guest.config - Enable Kconfig items for running this kernel as a KVM guest' - echo ' xen.config - Enable Kconfig items for running this kernel as a Xen guest' + echo '* bzImage - Compressed kernel image (arch/x86/boot/bzImage)' + echo ' install - Install kernel using (your) ~/bin/$(INSTALLKERNEL) or' + echo ' (distribution) /sbin/$(INSTALLKERNEL) or install to ' + echo ' $$(INSTALL_PATH) and run lilo' + echo '' + echo ' fdimage - Create 1.4MB boot floppy image (arch/x86/boot/fdimage)' + echo ' fdimage144 - Create 1.4MB boot floppy image (arch/x86/boot/fdimage)' + echo ' fdimage288 - Create 2.8MB boot floppy image (arch/x86/boot/fdimage)' + echo ' isoimage - Create a boot CD-ROM image (arch/x86/boot/image.iso)' + echo ' bzdisk/fdimage*/isoimage also accept:' + echo ' FDARGS="..." arguments for the booted kernel' + echo ' FDINITRD=file initrd for the booted kernel' + echo '' + echo ' kvm_guest.config - Enable Kconfig items for running this kernel as a KVM guest' + echo ' xen.config - Enable Kconfig items for running this kernel as a Xen guest' endef