scripts: remove bin2c
Subsystems (2)
PATCH 1/1 scripts: remove bin2c
Commit 80f8be7af03f ("tomoyo: Omit use of bin2c") removed the last use of bin2c.
Signed-off-by Masahiro Yamada <[email protected]>
---
Documentation/dontdiff | 1 - init/Kconfig | 4 ---- scripts/.gitignore | 1 - scripts/Makefile | 1 - scripts/bin2c.c | 36 ------------------------------------ scripts/remove-stale-files | 2 ++ 6 files changed, 2 insertions(+), 43 deletions(-) delete mode 100644 scripts/bin2c.c
Documentation/dontdiff +0 -1
@@ -91,7 +91,6 @@ asm_offsets.h autoconf.h* av_permissions.h bbootsect -bin2c binkernel.spec bootsect bounds.h
init/Kconfig +0 -4
@@ -682,10 +682,6 @@ config CPU_ISOLATION source "kernel/rcu/Kconfig" -config BUILD_BIN2C - bool - default n - config IKCONFIG tristate "Kernel .config support" help
scripts/.gitignore +0 -1
@@ -1,6 +1,5 @@ # SPDX-License-Identifier: GPL-2.0-only /asn1_compiler -/bin2c /generate_rust_target /insert-sys-cert /kallsyms
scripts/Makefile +0 -1
@@ -3,7 +3,6 @@ # scripts contains sources for various helper programs used throughout # the kernel for the build process. -hostprogs-always-$(CONFIG_BUILD_BIN2C) += bin2c hostprogs-always-$(CONFIG_KALLSYMS) += kallsyms hostprogs-always-$(BUILD_C_RECORDMCOUNT) += recordmcount hostprogs-always-$(CONFIG_BUILDTIME_TABLE_SORT) += sorttable
scripts/bin2c.c deleted +0 -36
@@ -1,36 +0,0 @@ -/* -* Unloved program to convert a binary on stdin to a C include on stdout -* -* Jan 1999 Matt Mackall <[email protected]> -* -* This software may be used and distributed according to the terms -* of the GNU General Public License, incorporated herein by reference. -*/ - -#include <stdio.h> - -int main (int argc,char *argv[]) -{ -int ch, total =0 ; - -if (argc >1 ) -printf ("const char %s[] %s=\n" , - argv[1 ], argc >2 ? argv[2 ] :"" ); - -do { -printf ("\t\"" ); -while ((ch =getchar ()) !=EOF ) { - total++; -printf ("\\x%02x" , ch); -if (total %16 ==0 ) -break ; - } -printf ("\"\n" ); - }while (ch !=EOF ); - -if (argc >1 ) -printf ("\t;\n\n#include <linux/types.h>\n\nconst size_t %s_size = %d;\n" , - argv[1 ], total); - -return 0 ; -}
scripts/remove-stale-files +2 -0
@@ -29,3 +29,5 @@ rm -f scripts/extract-cert rm -f scripts/kconfig/[gmnq]conf-cfg rm -f rust/target.json + +rm -f scripts/bin2c
Signature · 1 line
2.34.1
Quoted 119 lines · Masahiro Yamada
Commit
80f8be7af03f("tomoyo: Omit use of bin2c") removed the last use of bin2c.Signed-off-by Masahiro Yamada <[email protected]>---
Documentation/dontdiff | 1 - init/Kconfig | 4 ---- scripts/.gitignore | 1 - scripts/Makefile | 1 - scripts/bin2c.c | 36 ------------------------------------ scripts/remove-stale-files | 2 ++ 6 files changed, 2 insertions(+), 43 deletions(-) delete mode 100644 scripts/bin2c.cDocumentation/dontdiff +0
-1@@ -91,7 +91,6 @@ asm_offsets.h autoconf.h* av_permissions.h bbootsect -bin2c binkernel.spec bootsect bounds.hinit/Kconfig +0
-4@@ -682,10 +682,6 @@ config CPU_ISOLATION source "kernel/rcu/Kconfig" -config BUILD_BIN2C - bool - default n - config IKCONFIG tristate "Kernel .config support" helpscripts/.gitignore +0
-1@@ -1,6 +1,5 @@ # SPDX-License-Identifier: GPL-2.0-only /asn1_compiler -/bin2c /generate_rust_target /insert-sys-cert /kallsymsscripts/Makefile +0
-1@@ -3,7 +3,6 @@ # scripts contains sources for various helper programs used throughout # the kernel for the build process. -hostprogs-always-$(CONFIG_BUILD_BIN2C) += bin2c hostprogs-always-$(CONFIG_KALLSYMS) += kallsyms hostprogs-always-$(BUILD_C_RECORDMCOUNT) += recordmcount hostprogs-always-$(CONFIG_BUILDTIME_TABLE_SORT) += sorttablescripts/bin2c.c deleted +0
-36@@ -1,36 +0,0 @@ -/* -* Unloved program to convert a binary on stdin to a C include on stdout -* -* Jan 1999 Matt Mackall <[email protected]> -* -* This software may be used and distributed according to the terms -* of the GNU General Public License, incorporated herein by reference. -*/ - -#include <stdio.h> - -int main (int argc,char *argv[]) -{ -int ch, total =0 ; - -if (argc >1 ) -printf ("const char %s[] %s=\n" , - argv[1 ], argc >2 ? argv[2 ] :"" ); - -do { -printf ("\t\"" ); -while ((ch =getchar ()) !=EOF ) { - total++; -printf ("\\x%02x" , ch); -if (total %16 ==0 ) -break ; - } -printf ("\"\n" ); - }while (ch !=EOF ); - -if (argc >1 ) -printf ("\t;\n\n#include <linux/types.h>\n\nconst size_t %s_size = %d;\n" , - argv[1 ], total); - -return 0 ; -}scripts/remove-stale-files +2
-0@@ -29,3 +29,5 @@ rm -f scripts/extract-cert rm -f scripts/kconfig/[gmnq]conf-cfg rm -f rust/target.json + +rm -f scripts/bin2cSignature · 1 line
2.34.1
Reviewed-by Nicolas Schier <[email protected]>
Quoted 5 lines · Masahiro Yamada
Commit
80f8be7af03f("tomoyo: Omit use of bin2c") removed the last use of bin2c.Signed-off-by Masahiro Yamada <[email protected]>
With yesterday's build including latest tomoyo changes in Linus Git I see:
$ scripts/diffconfig /boot/config-6.2.0-rc4-1-amd64-clang15-kcfi /boot/config-6.2.0-rc4-2-amd64-clang15-kcfi -BUILD_BIN2C y BUILD_SALT "6.2.0-rc4-1-amd64-clang15-kcfi" -> "6.2.0-rc4-2-amd64-clang15-kcfi"
So, yes bin2c can go.
Reviewed-by Sedat Dilek <[email protected]>
-Sedat-
Quoted 7 lines · Masahiro Yamada
Commit
80f8be7af03f("tomoyo: Omit use of bin2c") removed the last use of bin2c.Signed-off-by Masahiro Yamada <[email protected]>---
Quoted 8 lines
Documentation/dontdiff | 1 - init/Kconfig | 4 ---- scripts/.gitignore | 1 - scripts/Makefile | 1 - scripts/bin2c.c | 36 ------------------------------------ scripts/remove-stale-files | 2 ++ 6 files changed, 2 insertions(+), 43 deletions(-) delete mode 100644 scripts/bin2c.c
Applied to linux-kbuild.
Quoted 106 lines
Documentation/dontdiff +0
-1@@ -91,7 +91,6 @@ asm_offsets.h autoconf.h* av_permissions.h bbootsect -bin2c binkernel.spec bootsect bounds.hinit/Kconfig +0
-4@@ -682,10 +682,6 @@ config CPU_ISOLATION source "kernel/rcu/Kconfig" -config BUILD_BIN2C - bool - default n - config IKCONFIG tristate "Kernel .config support" helpscripts/.gitignore +0
-1@@ -1,6 +1,5 @@ # SPDX-License-Identifier: GPL-2.0-only /asn1_compiler -/bin2c /generate_rust_target /insert-sys-cert /kallsymsscripts/Makefile +0
-1@@ -3,7 +3,6 @@ # scripts contains sources for various helper programs used throughout # the kernel for the build process. -hostprogs-always-$(CONFIG_BUILD_BIN2C) += bin2c hostprogs-always-$(CONFIG_KALLSYMS) += kallsyms hostprogs-always-$(BUILD_C_RECORDMCOUNT) += recordmcount hostprogs-always-$(CONFIG_BUILDTIME_TABLE_SORT) += sorttablescripts/bin2c.c deleted +0
-36@@ -1,36 +0,0 @@ -/* -* Unloved program to convert a binary on stdin to a C include on stdout -* -* Jan 1999 Matt Mackall <[email protected]> -* -* This software may be used and distributed according to the terms -* of the GNU General Public License, incorporated herein by reference. -*/ - -#include <stdio.h> - -int main (int argc,char *argv[]) -{ -int ch, total =0 ; - -if (argc >1 ) -printf ("const char %s[] %s=\n" , - argv[1 ], argc >2 ? argv[2 ] :"" ); - -do { -printf ("\t\"" ); -while ((ch =getchar ()) !=EOF ) { - total++; -printf ("\\x%02x" , ch); -if (total %16 ==0 ) -break ; - } -printf ("\"\n" ); - }while (ch !=EOF ); - -if (argc >1 ) -printf ("\t;\n\n#include <linux/types.h>\n\nconst size_t %s_size = %d;\n" , - argv[1 ], total); - -return 0 ; -}scripts/remove-stale-files +2
-1@@ -29,3 +29,5 @@ rm -f scripts/extract-cert rm -f scripts/kconfig/[gmnq]conf-cfg rm -f rust/target.json + +rm -f scripts/bin2c --2.34.1
Signature · 2 lines
Best Regards Masahiro Yamada