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
diff --git a/Documentation/dontdiff b/Documentation/dontdiff
index 352ff53a2306..3c399f132e2d 100644
--- a/Documentation/dontdiff
+++ b/Documentation/dontdiff
@@ -91,7 +91,6 @@ asm_offsets.h
autoconf.h*
av_permissions.h
bbootsect
-bin2c
binkernel.spec
bootsect
bounds.h
diff --git a/init/Kconfig b/init/Kconfig
index 7ceabd320425..f66ba19f9482 100644
--- a/init/Kconfig
+++ b/init/Kconfig
@@ -682,10 +682,6 @@ config CPU_ISOLATION
source "kernel/rcu/Kconfig"
-config BUILD_BIN2C
- bool
- default n
-
config IKCONFIG
tristate "Kernel .config support"
help
diff --git a/scripts/.gitignore b/scripts/.gitignore
index 11bf3c075fb6..6e9ce6720a05 100644
--- a/scripts/.gitignore
+++ b/scripts/.gitignore
@@ -1,6 +1,5 @@
# SPDX-License-Identifier: GPL-2.0-only
/asn1_compiler
-/bin2c
/generate_rust_target
/insert-sys-cert
/kallsyms
diff --git a/scripts/Makefile b/scripts/Makefile
index 0e0ae3c06ed7..32b6ba722728 100644
--- a/scripts/Makefile
+++ b/scripts/Makefile
@@ -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
diff --git a/scripts/bin2c.c b/scripts/bin2c.c
deleted file mode 100644
index c3d7eef3ad06..000000000000
--- a/scripts/bin2c.c
+++ /dev/null
@@ -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;
-}
diff --git a/scripts/remove-stale-files b/scripts/remove-stale-files
index c71bf2f68360..04fcdf739638 100755
--- a/scripts/remove-stale-files
+++ b/scripts/remove-stale-files
@@ -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
On Thu 19 Jan 2023 16:12:15 GMT, Masahiro Yamada wrote:
> 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
>
> diff --git a/Documentation/dontdiff b/Documentation/dontdiff
> index 352ff53a2306..3c399f132e2d 100644
> --- a/Documentation/dontdiff
> +++ b/Documentation/dontdiff
> @@ -91,7 +91,6 @@ asm_offsets.h
> autoconf.h*
> av_permissions.h
> bbootsect
> -bin2c
> binkernel.spec
> bootsect
> bounds.h
> diff --git a/init/Kconfig b/init/Kconfig
> index 7ceabd320425..f66ba19f9482 100644
> --- a/init/Kconfig
> +++ b/init/Kconfig
> @@ -682,10 +682,6 @@ config CPU_ISOLATION
>
> source "kernel/rcu/Kconfig"
>
> -config BUILD_BIN2C
> - bool
> - default n
> -
> config IKCONFIG
> tristate "Kernel .config support"
> help
> diff --git a/scripts/.gitignore b/scripts/.gitignore
> index 11bf3c075fb6..6e9ce6720a05 100644
> --- a/scripts/.gitignore
> +++ b/scripts/.gitignore
> @@ -1,6 +1,5 @@
> # SPDX-License-Identifier: GPL-2.0-only
> /asn1_compiler
> -/bin2c
> /generate_rust_target
> /insert-sys-cert
> /kallsyms
> diff --git a/scripts/Makefile b/scripts/Makefile
> index 0e0ae3c06ed7..32b6ba722728 100644
> --- a/scripts/Makefile
> +++ b/scripts/Makefile
> @@ -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
> diff --git a/scripts/bin2c.c b/scripts/bin2c.c
> deleted file mode 100644
> index c3d7eef3ad06..000000000000
> --- a/scripts/bin2c.c
> +++ /dev/null
> @@ -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;
> -}
> diff --git a/scripts/remove-stale-files b/scripts/remove-stale-files
> index c71bf2f68360..04fcdf739638 100755
> --- a/scripts/remove-stale-files
> +++ b/scripts/remove-stale-files
> @@ -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
Reviewed-by: Nicolas Schier <[email protected]>
On Thu, Jan 19, 2023 at 8:16 AM Masahiro Yamada <[email protected]> wrote:
>
> 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-
On Thu, Jan 19, 2023 at 4:13 PM Masahiro Yamada <[email protected]> wrote:
>
> 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
Applied to linux-kbuild.
>
> diff --git a/Documentation/dontdiff b/Documentation/dontdiff
> index 352ff53a2306..3c399f132e2d 100644
> --- a/Documentation/dontdiff
> +++ b/Documentation/dontdiff
> @@ -91,7 +91,6 @@ asm_offsets.h
> autoconf.h*
> av_permissions.h
> bbootsect
> -bin2c
> binkernel.spec
> bootsect
> bounds.h
> diff --git a/init/Kconfig b/init/Kconfig
> index 7ceabd320425..f66ba19f9482 100644
> --- a/init/Kconfig
> +++ b/init/Kconfig
> @@ -682,10 +682,6 @@ config CPU_ISOLATION
>
> source "kernel/rcu/Kconfig"
>
> -config BUILD_BIN2C
> - bool
> - default n
> -
> config IKCONFIG
> tristate "Kernel .config support"
> help
> diff --git a/scripts/.gitignore b/scripts/.gitignore
> index 11bf3c075fb6..6e9ce6720a05 100644
> --- a/scripts/.gitignore
> +++ b/scripts/.gitignore
> @@ -1,6 +1,5 @@
> # SPDX-License-Identifier: GPL-2.0-only
> /asn1_compiler
> -/bin2c
> /generate_rust_target
> /insert-sys-cert
> /kallsyms
> diff --git a/scripts/Makefile b/scripts/Makefile
> index 0e0ae3c06ed7..32b6ba722728 100644
> --- a/scripts/Makefile
> +++ b/scripts/Makefile
> @@ -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
> diff --git a/scripts/bin2c.c b/scripts/bin2c.c
> deleted file mode 100644
> index c3d7eef3ad06..000000000000
> --- a/scripts/bin2c.c
> +++ /dev/null
> @@ -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;
> -}
> diff --git a/scripts/remove-stale-files b/scripts/remove-stale-files
> index c71bf2f68360..04fcdf739638 100755
> --- a/scripts/remove-stale-files
> +++ b/scripts/remove-stale-files
> @@ -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
>
--
Best Regards
Masahiro Yamada