From patchwork Tue Mar 8 21:48:13 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: =?utf-8?b?SsOpcsO0bWUgUG91aWxsZXI=?= X-Patchwork-Id: 594355 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from hemlock.osuosl.org (smtp2.osuosl.org [140.211.166.133]) by ozlabs.org (Postfix) with ESMTP id 4452A140322 for ; Wed, 9 Mar 2016 08:48:33 +1100 (AEDT) Received: from localhost (localhost [127.0.0.1]) by hemlock.osuosl.org (Postfix) with ESMTP id 7976B95A8A; Tue, 8 Mar 2016 21:48:32 +0000 (UTC) X-Virus-Scanned: amavisd-new at osuosl.org Received: from hemlock.osuosl.org ([127.0.0.1]) by localhost (.osuosl.org [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id kLPIq+On8lOo; Tue, 8 Mar 2016 21:48:31 +0000 (UTC) Received: from ash.osuosl.org (ash.osuosl.org [140.211.166.34]) by hemlock.osuosl.org (Postfix) with ESMTP id A3B2F95A61; Tue, 8 Mar 2016 21:48:31 +0000 (UTC) X-Original-To: buildroot@lists.busybox.net Delivered-To: buildroot@osuosl.org Received: from whitealder.osuosl.org (smtp1.osuosl.org [140.211.166.138]) by ash.osuosl.org (Postfix) with ESMTP id 5D4571C0E25 for ; Tue, 8 Mar 2016 21:48:29 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by whitealder.osuosl.org (Postfix) with ESMTP id 5A4538BE44 for ; Tue, 8 Mar 2016 21:48:29 +0000 (UTC) X-Virus-Scanned: amavisd-new at osuosl.org Received: from whitealder.osuosl.org ([127.0.0.1]) by localhost (.osuosl.org [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id lWxwfLU6E0qm for ; Tue, 8 Mar 2016 21:48:28 +0000 (UTC) X-Greylist: from auto-whitelisted by SQLgrey-1.7.6 Received: from lupi.sysmic.org (sysmic.org [62.210.89.17]) by whitealder.osuosl.org (Postfix) with ESMTPS id D280586745 for ; Tue, 8 Mar 2016 21:48:27 +0000 (UTC) Received: from localhost.localdomain (mag35-2-88-190-32-174.fbxo.proxad.net [88.190.32.174]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-SHA256 (128/128 bits)) (No client certificate requested) (Authenticated sender: jezz) by lupi.sysmic.org (Postfix) with ESMTPSA id 9B13040BCA; Tue, 8 Mar 2016 22:48:26 +0100 (CET) From: =?UTF-8?q?J=C3=A9r=C3=B4me=20Pouiller?= To: buildroot@busybox.net Date: Tue, 8 Mar 2016 22:48:13 +0100 Message-Id: <1457473693-25776-2-git-send-email-jezz@sysmic.org> X-Mailer: git-send-email 2.7.0 In-Reply-To: <1457473693-25776-1-git-send-email-jezz@sysmic.org> References: <1457473693-25776-1-git-send-email-jezz@sysmic.org> MIME-Version: 1.0 Cc: Thomas Petazzoni , =?UTF-8?q?J=C3=A9r=C3=B4me=20Pouiller?= Subject: [Buildroot] [PATCH v2 2/2] help: relocate help messages specific to one package X-BeenThere: buildroot@busybox.net X-Mailman-Version: 2.1.18-1 Precedence: list List-Id: Discussion and development of buildroot List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: buildroot-bounces@busybox.net Sender: "buildroot" Use $EXTRA_HELP feature in order to integrate help messages specific to one package (linux-menuconfig, etc...) package they are related. It would be possible to do it using kconfig framework, but I was not sure it is necessary to document kconfig targets systematicaly. Signed-off-by: Jérôme Pouiller --- v2: - Rename LOCAL_HELP Makefile | 16 ---------------- boot/barebox/barebox.mk | 5 +++++ linux/linux.mk | 7 +++++++ package/busybox/busybox.mk | 4 ++++ package/uclibc/uclibc.mk | 4 ++++ 5 files changed, 20 insertions(+), 16 deletions(-) diff --git a/Makefile b/Makefile index 1c9f63c..eb92052 100644 --- a/Makefile +++ b/Makefile @@ -932,22 +932,6 @@ help: @echo ' -dirclean - Remove build directory' @echo ' -reconfigure - Restart the build from the configure step' @echo ' -rebuild - Restart the build from the build step' -ifeq ($(BR2_PACKAGE_BUSYBOX),y) - @echo ' busybox-menuconfig - Run BusyBox menuconfig' -endif -ifeq ($(BR2_LINUX_KERNEL),y) - @echo ' linux-menuconfig - Run Linux kernel menuconfig' - @echo ' linux-savedefconfig - Run Linux kernel savedefconfig' - @echo ' linux-update-defconfig - Save the Linux configuration to the path specified' - @echo ' by BR2_LINUX_KERNEL_CUSTOM_CONFIG_FILE' -endif -ifeq ($(BR2_TOOLCHAIN_BUILDROOT),y) - @echo ' uclibc-menuconfig - Run uClibc menuconfig' -endif -ifeq ($(BR2_TARGET_BAREBOX),y) - @echo ' barebox-menuconfig - Run barebox menuconfig' - @echo ' barebox-savedefconfig - Run barebox savedefconfig' -endif @for i in $(EXTRA_HELP); do echo " $$i"; done @echo @echo 'Documentation:' diff --git a/boot/barebox/barebox.mk b/boot/barebox/barebox.mk index 7715daf..24d0162 100644 --- a/boot/barebox/barebox.mk +++ b/boot/barebox/barebox.mk @@ -117,4 +117,9 @@ $(error No Barebox config. Check your BR2_TARGET_BAREBOX_BOARD_DEFCONFIG or BR2_ endif endif +ifeq ($(BR2_TARGET_BAREBOX),y) + EXTRA_HELP += 'barebox-menuconfig - Run barebox menuconfig' + EXTRA_HELP += 'barebox-savedefconfig - Run barebox savedefconfig' +endif + $(eval $(kconfig-package)) diff --git a/linux/linux.mk b/linux/linux.mk index 7e20255..6cfc8e7 100644 --- a/linux/linux.mk +++ b/linux/linux.mk @@ -435,6 +435,13 @@ endif endif # BR_BUILDING +ifeq ($(BR2_LINUX_KERNEL),y) + EXTRA_HELP += 'linux-menuconfig - Run Linux kernel menuconfig' + EXTRA_HELP += 'linux-savedefconfig - Run Linux kernel savedefconfig' + EXTRA_HELP += 'linux-update-defconfig - Save the Linux configuration to the path specified' + EXTRA_HELP += ' by BR2_LINUX_KERNEL_CUSTOM_CONFIG_FILE' +endif + $(eval $(kconfig-package)) # Support for rebuilding the kernel after the cpio archive has diff --git a/package/busybox/busybox.mk b/package/busybox/busybox.mk index 7c904c8..d4ee149 100644 --- a/package/busybox/busybox.mk +++ b/package/busybox/busybox.mk @@ -250,4 +250,8 @@ $(error No BusyBox configuration file specified, check your BR2_PACKAGE_BUSYBOX_ endif endif +ifeq ($(BR2_PACKAGE_BUSYBOX),y) + EXTRA_HELP += 'busybox-menuconfig - Run BusyBox menuconfig' +endif + $(eval $(kconfig-package)) diff --git a/package/uclibc/uclibc.mk b/package/uclibc/uclibc.mk index 200de04..9448364 100644 --- a/package/uclibc/uclibc.mk +++ b/package/uclibc/uclibc.mk @@ -460,4 +460,8 @@ $(error No uClibc configuration file specified, check your BR2_UCLIBC_CONFIG set endif endif +ifeq ($(BR2_PACKAGE_UCLIBC),y) + EXTRA_HELP += 'uclibc-menuconfig - Run uClibc menuconfig' +endif + $(eval $(kconfig-package))