From patchwork Mon Jun 25 16:40:23 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Masahiro Yamada X-Patchwork-Id: 139866 Delivered-To: patch@linaro.org Received: by 2002:a2e:970d:0:0:0:0:0 with SMTP id r13-v6csp4203378lji; Mon, 25 Jun 2018 09:43:59 -0700 (PDT) X-Google-Smtp-Source: ADUXVKKsL9YgeF6O7QQovQPF765DY5bmJxuKmnFzFqsXGccqjFMWPB1FG5/WuDzCiCQJJj/nu3PB X-Received: by 2002:a17:902:3041:: with SMTP id u59-v6mr13284299plb.208.1529945039629; Mon, 25 Jun 2018 09:43:59 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1529945039; cv=none; d=google.com; s=arc-20160816; b=qFZLttJUo85tc6rGRe48sOW7IOQ8Zlr2aqH6LIBauxvNlrvmIrtsReNUNtiGIQ8vAT XTelcDQCBDZzGL1h0GEaaOp3cqDMoDBFUwtPWDv3ftFbI372nuklPgjqkxWP1183puYn 0YPnrXQdjNI4I8BFc5D2GiY6k2KUjTlJPgKdj62SHOUWaFwacJ9SI3umGd2aM0dCDaCx XpLMpu5U8hvguGgOT0ZtIxgWr2Vw7YwUnXKPcq5HIPmXVB0VOORNH/B2KqvvTE2wqqmk js1cM0vitN5CWXaT+cxjc3xmVb2T2wFMcPG/OxiDNaoRkwNNl2r5xwDJrLDVkHqiWIXm ROOQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:sender:message-id:date:subject:cc:to:from :dkim-signature:dkim-filter:arc-authentication-results; bh=vK5LFFB15NVR6U2dAR6ekcSyjGGWGKM12lO3lvB7SDA=; b=yZbHOmUZs+0PqDirf+JgmdWgYJlIJ+ZRiKk0rfEo3SzJBcFsL7xIS4OTk8Nf6hOpeF JuaVKvzWMyuBf0WD6OyP8PNhqnNbcEpnOmWHIxhk6cTVRj5AdDxqir/RgfjrqA0DptVs MKIWIjy+Ww8dMDcgqP+mcA838Ogno3YO4GVb14VIWKPHj6zM1u2O5Oe9fEV2sE/iXTaJ dmOxCgHWdEufdC+TXeTK7X5G7hukscpYVZbNxY3oBAChLtOPFuDLZCPm6KVIVcEvB7Wc SMax36Fw7virbM2GadMbwL4oYwakm2OHcSbVaxZZLR3zBmKza0yksPMOmIe3WWbi8dy+ zzmA== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@nifty.com header.s=dec2015msa header.b=j+zkIPPz; spf=pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Return-Path: Received: from vger.kernel.org (vger.kernel.org. [209.132.180.67]) by mx.google.com with ESMTP id t26-v6si11702885pgv.513.2018.06.25.09.43.59; Mon, 25 Jun 2018 09:43:59 -0700 (PDT) Received-SPF: pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) client-ip=209.132.180.67; Authentication-Results: mx.google.com; dkim=pass header.i=@nifty.com header.s=dec2015msa header.b=j+zkIPPz; spf=pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1755134AbeFYQn5 (ORCPT + 31 others); Mon, 25 Jun 2018 12:43:57 -0400 Received: from conuserg-10.nifty.com ([210.131.2.77]:27368 "EHLO conuserg-10.nifty.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S933282AbeFYQnz (ORCPT ); Mon, 25 Jun 2018 12:43:55 -0400 Received: from grover.sesame (FL1-125-199-20-195.osk.mesh.ad.jp [125.199.20.195]) (authenticated) by conuserg-10.nifty.com with ESMTP id w5PGfPxq017815; Tue, 26 Jun 2018 01:41:25 +0900 DKIM-Filter: OpenDKIM Filter v2.10.3 conuserg-10.nifty.com w5PGfPxq017815 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=nifty.com; s=dec2015msa; t=1529944887; bh=vK5LFFB15NVR6U2dAR6ekcSyjGGWGKM12lO3lvB7SDA=; h=From:To:Cc:Subject:Date:From; b=j+zkIPPzDSMnc/VFw/ygeXLUHtosWq0y8OHEzOH57P8j+y4WmekMdnRAWEWeAlmBT 8wTTNjLffoagM3tJ7J8W3j+5CS5mbORGbT7Cl/usXvSSsM6B4TyAMjd1sWtNmFM+IN HlynX2KB8PJrA2beqq9AnAIKG1snNI1dsr+dpIg5CGyE9qolyKX9Azr/XV+XPmGrJY bJGyFIQpuRUDq0bMdgdB7TZC+hVjbhY/W1UBn4LrGb9u+4AWPqcfSN830vcmySTsnT 9UxX8RenpXd5BqT5AK+xtNjiAG+xBZw6B1QCiGJV448C+rtGm67fttdjKUA6OmBm4F 6TkfTG45Gj1fg== X-Nifty-SrcIP: [125.199.20.195] From: Masahiro Yamada To: linux-kbuild@vger.kernel.org Cc: Masahiro Yamada , linux-s390@vger.kernel.org, "H. Peter Anvin" , Kentaro Takeda , Michael Ellerman , Heiko Carstens , x86@kernel.org, Benjamin Herrenschmidt , linux-kernel@vger.kernel.org, Thomas Gleixner , Michal Marek , Paul Mackerras , Tetsuo Handa , "Serge E. Hallyn" , James Morris , Ingo Molnar , linuxppc-dev@lists.ozlabs.org, linux-security-module@vger.kernel.org, Martin Schwidefsky Subject: [PATCH] kbuild: move bin2c back to scripts/ from scripts/basic/ Date: Tue, 26 Jun 2018 01:40:23 +0900 Message-Id: <1529944823-22228-1-git-send-email-yamada.masahiro@socionext.com> X-Mailer: git-send-email 2.7.4 Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Commit 8370edea81e3 ("bin2c: move bin2c in scripts/basic") moved bin2c to the scripts/basic/ directory, incorrectly stating "Kexec wants to use bin2c and it wants to use it really early in the build process. See arch/x86/purgatory/ code in later patches." Commit bdab125c9301 ("Revert "kexec/purgatory: Add clean-up for purgatory directory"") and commit d6605b6bbee8 ("x86/build: Remove unnecessary preparation for purgatory") removed the redundant purgatory build magic entirely. That means that the move of bin2c was unnecessary in the first place. Signed-off-by: Masahiro Yamada --- arch/powerpc/purgatory/Makefile | 3 +-- arch/s390/purgatory/Makefile | 3 +-- arch/x86/purgatory/Makefile | 3 +-- kernel/Makefile | 2 +- scripts/.gitignore | 1 + scripts/Makefile | 1 + scripts/basic/.gitignore | 1 - scripts/basic/Makefile | 1 - scripts/{basic => }/bin2c.c | 0 security/tomoyo/Makefile | 2 +- 10 files changed, 7 insertions(+), 10 deletions(-) rename scripts/{basic => }/bin2c.c (100%) -- 2.7.4 diff --git a/arch/powerpc/purgatory/Makefile b/arch/powerpc/purgatory/Makefile index 30e05de..4314ba5 100644 --- a/arch/powerpc/purgatory/Makefile +++ b/arch/powerpc/purgatory/Makefile @@ -6,9 +6,8 @@ LDFLAGS_purgatory.ro := -e purgatory_start -r --no-undefined $(obj)/purgatory.ro: $(obj)/trampoline.o FORCE $(call if_changed,ld) -CMD_BIN2C = $(objtree)/scripts/basic/bin2c quiet_cmd_bin2c = BIN2C $@ - cmd_bin2c = $(CMD_BIN2C) kexec_purgatory < $< > $@ + cmd_bin2c = $(objtree)/scripts/bin2c kexec_purgatory < $< > $@ $(obj)/kexec-purgatory.c: $(obj)/purgatory.ro FORCE $(call if_changed,bin2c) diff --git a/arch/s390/purgatory/Makefile b/arch/s390/purgatory/Makefile index 1ace023..445c460 100644 --- a/arch/s390/purgatory/Makefile +++ b/arch/s390/purgatory/Makefile @@ -27,9 +27,8 @@ KBUILD_CFLAGS += $(call cc-option,-fno-PIE) $(obj)/purgatory.ro: $(PURGATORY_OBJS) FORCE $(call if_changed,ld) -CMD_BIN2C = $(objtree)/scripts/basic/bin2c quiet_cmd_bin2c = BIN2C $@ - cmd_bin2c = $(CMD_BIN2C) kexec_purgatory < $< > $@ + cmd_bin2c = $(objtree)/scripts/bin2c kexec_purgatory < $< > $@ $(obj)/kexec-purgatory.c: $(obj)/purgatory.ro FORCE $(call if_changed,bin2c) diff --git a/arch/x86/purgatory/Makefile b/arch/x86/purgatory/Makefile index 2e9ee02..d6ac098 100644 --- a/arch/x86/purgatory/Makefile +++ b/arch/x86/purgatory/Makefile @@ -28,9 +28,8 @@ $(obj)/purgatory.ro: $(PURGATORY_OBJS) FORCE targets += kexec-purgatory.c -CMD_BIN2C = $(objtree)/scripts/basic/bin2c quiet_cmd_bin2c = BIN2C $@ - cmd_bin2c = $(CMD_BIN2C) kexec_purgatory < $< > $@ + cmd_bin2c = $(objtree)/scripts/bin2c kexec_purgatory < $< > $@ $(obj)/kexec-purgatory.c: $(obj)/purgatory.ro FORCE $(call if_changed,bin2c) diff --git a/kernel/Makefile b/kernel/Makefile index 04bc07c..7a63d56 100644 --- a/kernel/Makefile +++ b/kernel/Makefile @@ -123,7 +123,7 @@ targets += config_data.gz $(obj)/config_data.gz: $(KCONFIG_CONFIG) FORCE $(call if_changed,gzip) - filechk_ikconfiggz = (echo "static const char kernel_config_data[] __used = MAGIC_START"; cat $< | scripts/basic/bin2c; echo "MAGIC_END;") + filechk_ikconfiggz = (echo "static const char kernel_config_data[] __used = MAGIC_START"; cat $< | scripts/bin2c; echo "MAGIC_END;") targets += config_data.h $(obj)/config_data.h: $(obj)/config_data.gz FORCE $(call filechk,ikconfiggz) diff --git a/scripts/.gitignore b/scripts/.gitignore index 0442c06..12d302d 100644 --- a/scripts/.gitignore +++ b/scripts/.gitignore @@ -1,6 +1,7 @@ # # Generated files # +bin2c conmakehash kallsyms pnmtologo diff --git a/scripts/Makefile b/scripts/Makefile index 25ab143..59c21ec 100644 --- a/scripts/Makefile +++ b/scripts/Makefile @@ -10,6 +10,7 @@ HOST_EXTRACFLAGS += -I$(srctree)/tools/include +hostprogs-$(CONFIG_BUILD_BIN2C) += bin2c hostprogs-$(CONFIG_KALLSYMS) += kallsyms hostprogs-$(CONFIG_LOGO) += pnmtologo hostprogs-$(CONFIG_VT) += conmakehash diff --git a/scripts/basic/.gitignore b/scripts/basic/.gitignore index 9528ec9..a776371 100644 --- a/scripts/basic/.gitignore +++ b/scripts/basic/.gitignore @@ -1,2 +1 @@ fixdep -bin2c diff --git a/scripts/basic/Makefile b/scripts/basic/Makefile index 0372b33..af49b44 100644 --- a/scripts/basic/Makefile +++ b/scripts/basic/Makefile @@ -9,7 +9,6 @@ # fixdep: Used to generate dependency information during build process hostprogs-y := fixdep -hostprogs-$(CONFIG_BUILD_BIN2C) += bin2c always := $(hostprogs-y) # fixdep is needed to compile other host programs diff --git a/scripts/basic/bin2c.c b/scripts/bin2c.c similarity index 100% rename from scripts/basic/bin2c.c rename to scripts/bin2c.c diff --git a/security/tomoyo/Makefile b/security/tomoyo/Makefile index b7c6a7f..cca5a30 100644 --- a/security/tomoyo/Makefile +++ b/security/tomoyo/Makefile @@ -4,7 +4,7 @@ obj-y = audit.o common.o condition.o domain.o environ.o file.o gc.o group.o load targets += builtin-policy.h define do_policy echo "static char tomoyo_builtin_$(1)[] __initdata ="; \ -$(objtree)/scripts/basic/bin2c <$(firstword $(wildcard $(obj)/policy/$(1).conf $(srctree)/$(src)/policy/$(1).conf.default) /dev/null); \ +$(objtree)/scripts/bin2c <$(firstword $(wildcard $(obj)/policy/$(1).conf $(srctree)/$(src)/policy/$(1).conf.default) /dev/null); \ echo ";" endef quiet_cmd_policy = POLICY $@