* [Buildroot] [PATCH 0/6] Miscellauneus patches
@ 2014-03-11 12:17 Fabio Porcedda
2014-03-11 12:17 ` [Buildroot] [PATCH 1/6] barebox: fix coding style Fabio Porcedda
` (6 more replies)
0 siblings, 7 replies; 25+ messages in thread
From: Fabio Porcedda @ 2014-03-11 12:17 UTC (permalink / raw)
To: buildroot
Some miscellaneus patches.
v2:
- Add three patches
- Remove the already merged patch
Best regards
Fabio Porcedda (6):
barebox: fix coding style
Remove "dirs" dependencies
Makefile: fix coding style
luajit: needs for 32bit archictectures a 32bit host gcc
infra: add to luarocks support for top-level parallel make
Makefile: do not add the toolchain target to the TARGETS variable
Makefile | 190 +++++++++++++++++++++++------------------------
boot/barebox/barebox.mk | 32 ++++----
package/luajit/Config.in | 1 +
package/pkg-luarocks.mk | 8 +-
package/uclibc/uclibc.mk | 2 +-
5 files changed, 120 insertions(+), 113 deletions(-)
--
1.8.3.2
^ permalink raw reply [flat|nested] 25+ messages in thread
* [Buildroot] [PATCH 1/6] barebox: fix coding style
2014-03-11 12:17 [Buildroot] [PATCH 0/6] Miscellauneus patches Fabio Porcedda
@ 2014-03-11 12:17 ` Fabio Porcedda
2014-03-11 17:33 ` Yann E. MORIN
2014-03-11 12:17 ` [Buildroot] [PATCH 2/6] Remove "dirs" dependencies Fabio Porcedda
` (5 subsequent siblings)
6 siblings, 1 reply; 25+ messages in thread
From: Fabio Porcedda @ 2014-03-11 12:17 UTC (permalink / raw)
To: buildroot
As stated in the buildroot user manual add just a single space before
and after a '=' sign.
Break long lines.
Signed-off-by: Fabio Porcedda <fabio.porcedda@gmail.com>
---
boot/barebox/barebox.mk | 32 +++++++++++++++++++-------------
1 file changed, 19 insertions(+), 13 deletions(-)
diff --git a/boot/barebox/barebox.mk b/boot/barebox/barebox.mk
index 9324c25..f57d297 100644
--- a/boot/barebox/barebox.mk
+++ b/boot/barebox/barebox.mk
@@ -4,15 +4,15 @@
#
################################################################################
-BAREBOX_VERSION = $(call qstrip,$(BR2_TARGET_BAREBOX_VERSION))
+BAREBOX_VERSION = $(call qstrip,$(BR2_TARGET_BAREBOX_VERSION))
ifeq ($(BAREBOX_VERSION),custom)
# Handle custom Barebox tarballs as specified by the configuration
BAREBOX_TARBALL = $(call qstrip,$(BR2_TARGET_BAREBOX_CUSTOM_TARBALL_LOCATION))
-BAREBOX_SITE = $(patsubst %/,%,$(dir $(BAREBOX_TARBALL)))
-BAREBOX_SOURCE = $(notdir $(BAREBOX_TARBALL))
+BAREBOX_SITE = $(patsubst %/,%,$(dir $(BAREBOX_TARBALL)))
+BAREBOX_SOURCE = $(notdir $(BAREBOX_TARBALL))
else ifeq ($(BR2_TARGET_BAREBOX_CUSTOM_GIT),y)
-BAREBOX_SITE = $(call qstrip,$(BR2_TARGET_BAREBOX_CUSTOM_GIT_REPO_URL))
+BAREBOX_SITE = $(call qstrip,$(BR2_TARGET_BAREBOX_CUSTOM_GIT_REPO_URL))
BAREBOX_SITE_METHOD = git
else
# Handle stable official Barebox versions
@@ -26,7 +26,8 @@ BAREBOX_LICENSE_FILES = COPYING
ifneq ($(call qstrip,$(BR2_TARGET_BAREBOX_CUSTOM_PATCH_DIR)),)
define BAREBOX_APPLY_CUSTOM_PATCHES
- support/scripts/apply-patches.sh $(@D) $(BR2_TARGET_BAREBOX_CUSTOM_PATCH_DIR) \
+ support/scripts/apply-patches.sh $(@D) \
+ $(BR2_TARGET_BAREBOX_CUSTOM_PATCH_DIR) \
barebox-$(BAREBOX_VERSION)-\*.patch
endef
@@ -39,25 +40,29 @@ BAREBOX_INSTALL_TARGET = NO
endif
ifeq ($(KERNEL_ARCH),i386)
-BAREBOX_ARCH=x86
+BAREBOX_ARCH = x86
else ifeq ($(KERNEL_ARCH),powerpc)
-BAREBOX_ARCH=ppc
+BAREBOX_ARCH = ppc
else
-BAREBOX_ARCH=$(KERNEL_ARCH)
+BAREBOX_ARCH = $(KERNEL_ARCH)
endif
-BAREBOX_MAKE_FLAGS = ARCH=$(BAREBOX_ARCH) CROSS_COMPILE="$(CCACHE) $(TARGET_CROSS)"
+BAREBOX_MAKE_FLAGS = ARCH=$(BAREBOX_ARCH) CROSS_COMPILE="$(CCACHE) \
+ $(TARGET_CROSS)"
ifeq ($(BR2_TARGET_BAREBOX_USE_DEFCONFIG),y)
-BAREBOX_SOURCE_CONFIG = $(@D)/arch/$(BAREBOX_ARCH)/configs/$(call qstrip,$(BR2_TARGET_BAREBOX_BOARD_DEFCONFIG))_defconfig
+BAREBOX_SOURCE_CONFIG = $(@D)/arch/$(BAREBOX_ARCH)/configs/$(call qstrip,\
+ $(BR2_TARGET_BAREBOX_BOARD_DEFCONFIG))_defconfig
else ifeq ($(BR2_TARGET_BAREBOX_USE_CUSTOM_CONFIG),y)
BAREBOX_SOURCE_CONFIG = $(BR2_TARGET_BAREBOX_CUSTOM_CONFIG_FILE)
endif
define BAREBOX_CONFIGURE_CMDS
- cp $(BAREBOX_SOURCE_CONFIG) $(@D)/arch/$(BAREBOX_ARCH)/configs/buildroot_defconfig
- $(TARGET_MAKE_ENV) $(MAKE) $(BAREBOX_MAKE_FLAGS) -C $(@D) buildroot_defconfig
+ cp $(BAREBOX_SOURCE_CONFIG) \
+ $(@D)/arch/$(BAREBOX_ARCH)/configs/buildroot_defconfig
+ $(TARGET_MAKE_ENV) $(MAKE) $(BAREBOX_MAKE_FLAGS) -C $(@D) \
+ buildroot_defconfig
endef
ifeq ($(BR2_TARGET_BAREBOX_BAREBOXENV),y)
@@ -68,7 +73,8 @@ endef
endif
ifeq ($(BR2_TARGET_BAREBOX_CUSTOM_ENV),y)
-BAREBOX_ENV_NAME = $(notdir $(call qstrip, $(BR2_TARGET_BAREBOX_CUSTOM_ENV_PATH)))
+BAREBOX_ENV_NAME = $(notdir $(call qstrip,\
+ $(BR2_TARGET_BAREBOX_CUSTOM_ENV_PATH)))
define BAREBOX_BUILD_CUSTOM_ENV
$(@D)/scripts/bareboxenv -s \
$(call qstrip, $(BR2_TARGET_BAREBOX_CUSTOM_ENV_PATH)) \
--
1.8.3.2
^ permalink raw reply related [flat|nested] 25+ messages in thread
* [Buildroot] [PATCH 2/6] Remove "dirs" dependencies
2014-03-11 12:17 [Buildroot] [PATCH 0/6] Miscellauneus patches Fabio Porcedda
2014-03-11 12:17 ` [Buildroot] [PATCH 1/6] barebox: fix coding style Fabio Porcedda
@ 2014-03-11 12:17 ` Fabio Porcedda
2014-03-12 7:09 ` Arnout Vandecappelle
2014-03-11 12:17 ` [Buildroot] [PATCH 3/6] Makefile: fix coding style Fabio Porcedda
` (4 subsequent siblings)
6 siblings, 1 reply; 25+ messages in thread
From: Fabio Porcedda @ 2014-03-11 12:17 UTC (permalink / raw)
To: buildroot
The package infrastructure add automatically the "dirs" dependency so
remove it when the package infrastructure is being used.
Signed-off-by: Fabio Porcedda <fabio.porcedda@gmail.com>
---
Makefile | 2 +-
package/uclibc/uclibc.mk | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/Makefile b/Makefile
index 665865b..30d56d0 100644
--- a/Makefile
+++ b/Makefile
@@ -625,7 +625,7 @@ target-post-image: $(TARGETS_ROOTFS) target-finalize
toolchain-eclipse-register:
./support/scripts/eclipse-register-toolchain `readlink -f $(O)` $(notdir $(TARGET_CROSS)) $(BR2_ARCH)
-source: dirs $(TARGETS_SOURCE) $(HOST_SOURCE)
+source: $(TARGETS_SOURCE) $(HOST_SOURCE)
external-deps:
@$(MAKE1) -Bs DL_MODE=SHOW_EXTERNAL_DEPS $(EXTRAMAKEARGS) source | sort -u
diff --git a/package/uclibc/uclibc.mk b/package/uclibc/uclibc.mk
index f0fb53a..020e218 100644
--- a/package/uclibc/uclibc.mk
+++ b/package/uclibc/uclibc.mk
@@ -542,7 +542,7 @@ define UCLIBC_INSTALL_STAGING_CMDS
$(UCLIBC_INSTALL_UTILS_STAGING)
endef
-uclibc-menuconfig: dirs uclibc-patch
+uclibc-menuconfig: uclibc-patch
$(MAKE1) -C $(UCLIBC_DIR) \
$(UCLIBC_MAKE_FLAGS) \
PREFIX=$(STAGING_DIR) \
--
1.8.3.2
^ permalink raw reply related [flat|nested] 25+ messages in thread
* [Buildroot] [PATCH 3/6] Makefile: fix coding style
2014-03-11 12:17 [Buildroot] [PATCH 0/6] Miscellauneus patches Fabio Porcedda
2014-03-11 12:17 ` [Buildroot] [PATCH 1/6] barebox: fix coding style Fabio Porcedda
2014-03-11 12:17 ` [Buildroot] [PATCH 2/6] Remove "dirs" dependencies Fabio Porcedda
@ 2014-03-11 12:17 ` Fabio Porcedda
2014-03-12 7:55 ` Arnout Vandecappelle
2014-03-11 12:17 ` [Buildroot] [PATCH 4/6] luajit: needs for 32bit archictectures a 32bit host gcc Fabio Porcedda
` (3 subsequent siblings)
6 siblings, 1 reply; 25+ messages in thread
From: Fabio Porcedda @ 2014-03-11 12:17 UTC (permalink / raw)
To: buildroot
As stated in the buildroot user manual add just a single space before
and after a '=' sign.
Signed-off-by: Fabio Porcedda <fabio.porcedda@gmail.com>
---
Makefile | 188 +++++++++++++++++++++++++++++++--------------------------------
1 file changed, 94 insertions(+), 94 deletions(-)
diff --git a/Makefile b/Makefile
index 30d56d0..0420364 100644
--- a/Makefile
+++ b/Makefile
@@ -25,10 +25,10 @@
#--------------------------------------------------------------
# Set and export the version string
-export BR2_VERSION:=2014.05-git
+export BR2_VERSION := 2014.05-git
# Check for minimal make version (note: this check will break at make 10.x)
-MIN_MAKE_VERSION=3.81
+MIN_MAKE_VERSION = 3.81
ifneq ($(firstword $(sort $(MAKE_VERSION) $(MIN_MAKE_VERSION))),$(MIN_MAKE_VERSION))
$(error You have make '$(MAKE_VERSION)' installed. GNU make >= $(MIN_MAKE_VERSION) is required)
endif
@@ -59,33 +59,33 @@ export HOSTARCH := $(shell uname -m | \
# make BR2_JLEVEL= -j$((`getconf _NPROCESSORS_ONLN`+1))
# absolute path
-TOPDIR:=$(shell pwd)
-CONFIG_CONFIG_IN=Config.in
-CONFIG=support/kconfig
-DATE:=$(shell date +%Y%m%d)
+TOPDIR := $(shell pwd)
+CONFIG_CONFIG_IN = Config.in
+CONFIG = support/kconfig
+DATE := $(shell date +%Y%m%d)
# Compute the full local version string so packages can use it as-is
# Need to export it, so it can be got from environment in children (eg. mconf)
-export BR2_VERSION_FULL:=$(BR2_VERSION)$(shell $(TOPDIR)/support/scripts/setlocalversion)
+export BR2_VERSION_FULL := $(BR2_VERSION)$(shell $(TOPDIR)/support/scripts/setlocalversion)
-noconfig_targets:=menuconfig nconfig gconfig xconfig config oldconfig randconfig \
+noconfig_targets := menuconfig nconfig gconfig xconfig config oldconfig randconfig \
defconfig %_defconfig allyesconfig allnoconfig silentoldconfig release \
randpackageconfig allyespackageconfig allnopackageconfig \
source-check print-version olddefconfig
# Strip quotes and then whitespaces
-qstrip=$(strip $(subst ",,$(1)))
+qstrip = $(strip $(subst ",,$(1)))
#"))
# Variables for use in Make constructs
-comma:=,
-empty:=
-space:=$(empty) $(empty)
+comma := ,
+empty :=
+space := $(empty) $(empty)
ifneq ("$(origin O)", "command line")
-O:=output
-CONFIG_DIR:=$(TOPDIR)
-NEED_WRAPPER=
+O := output
+CONFIG_DIR := $(TOPDIR)
+NEED_WRAPPER =
else
# other packages might also support Linux-style out of tree builds
# with the O=<dir> syntax (E.G. Busybox does). As make automatically
@@ -97,18 +97,18 @@ MAKEOVERRIDES =
# of the origin function (command line -> environment).
# Unfortunately some packages don't look at origin (E.G. uClibc 0.9.31+)
# To really make O go away, we have to override it.
-override O:=$(O)
-CONFIG_DIR:=$(O)
+override O := $(O)
+CONFIG_DIR := $(O)
# we need to pass O= everywhere we call back into the toplevel makefile
EXTRAMAKEARGS = O=$(O)
-NEED_WRAPPER=y
+NEED_WRAPPER = y
endif
# bash prints the name of the directory on 'cd <dir>' if CDPATH is
# set, so unset it here to not cause problems. Notice that the export
# line doesn't affect the environment of $(shell ..) calls, so
# explictly throw away any output from 'cd' here.
-export CDPATH:=
+export CDPATH :=
BASE_DIR := $(shell mkdir -p $(O) && cd $(O) >/dev/null && pwd)
$(if $(BASE_DIR),, $(error output directory "$(O)" does not exist))
@@ -150,27 +150,27 @@ endif
# Avoids doing the $(or...) everytime
_BR2_GRAPH_OUT := $(or $(BR2_GRAPH_OUT),pdf)
-BUILD_DIR:=$(BASE_DIR)/build
-STAMP_DIR:=$(BASE_DIR)/stamps
-BINARIES_DIR:=$(BASE_DIR)/images
-TARGET_DIR:=$(BASE_DIR)/target
+BUILD_DIR := $(BASE_DIR)/build
+STAMP_DIR := $(BASE_DIR)/stamps
+BINARIES_DIR := $(BASE_DIR)/images
+TARGET_DIR := $(BASE_DIR)/target
# initial definition so that 'make clean' works for most users, even without
# .config. HOST_DIR will be overwritten later when .config is included.
-HOST_DIR:=$(BASE_DIR)/host
-
-LEGAL_INFO_DIR=$(BASE_DIR)/legal-info
-REDIST_SOURCES_DIR_TARGET=$(LEGAL_INFO_DIR)/sources
-REDIST_SOURCES_DIR_HOST=$(LEGAL_INFO_DIR)/host-sources
-LICENSE_FILES_DIR_TARGET=$(LEGAL_INFO_DIR)/licenses
-LICENSE_FILES_DIR_HOST=$(LEGAL_INFO_DIR)/host-licenses
-LEGAL_MANIFEST_CSV_TARGET=$(LEGAL_INFO_DIR)/manifest.csv
-LEGAL_MANIFEST_CSV_HOST=$(LEGAL_INFO_DIR)/host-manifest.csv
-LEGAL_LICENSES_TXT_TARGET=$(LEGAL_INFO_DIR)/licenses.txt
-LEGAL_LICENSES_TXT_HOST=$(LEGAL_INFO_DIR)/host-licenses.txt
-LEGAL_WARNINGS=$(LEGAL_INFO_DIR)/.warnings
-LEGAL_REPORT=$(LEGAL_INFO_DIR)/README
-
-BR2_CONFIG=$(CONFIG_DIR)/.config
+HOST_DIR := $(BASE_DIR)/host
+
+LEGAL_INFO_DIR = $(BASE_DIR)/legal-info
+REDIST_SOURCES_DIR_TARGET = $(LEGAL_INFO_DIR)/sources
+REDIST_SOURCES_DIR_HOST = $(LEGAL_INFO_DIR)/host-sources
+LICENSE_FILES_DIR_TARGET = $(LEGAL_INFO_DIR)/licenses
+LICENSE_FILES_DIR_HOST = $(LEGAL_INFO_DIR)/host-licenses
+LEGAL_MANIFEST_CSV_TARGET = $(LEGAL_INFO_DIR)/manifest.csv
+LEGAL_MANIFEST_CSV_HOST = $(LEGAL_INFO_DIR)/host-manifest.csv
+LEGAL_LICENSES_TXT_TARGET = $(LEGAL_INFO_DIR)/licenses.txt
+LEGAL_LICENSES_TXT_HOST = $(LEGAL_INFO_DIR)/host-licenses.txt
+LEGAL_WARNINGS = $(LEGAL_INFO_DIR)/.warnings
+LEGAL_REPORT = $(LEGAL_INFO_DIR)/README
+
+BR2_CONFIG = $(CONFIG_DIR)/.config
# Pull in the user's configuration file
ifeq ($(filter $(noconfig_targets),$(MAKECMDGOALS)),)
@@ -181,22 +181,22 @@ endif
# Use 'make V=1' to see the full commands
ifdef V
ifeq ("$(origin V)", "command line")
- KBUILD_VERBOSE=$(V)
+ KBUILD_VERBOSE = $(V)
endif
endif
ifndef KBUILD_VERBOSE
- KBUILD_VERBOSE=0
+ KBUILD_VERBOSE = 0
endif
ifeq ($(KBUILD_VERBOSE),1)
- quiet=
- Q=
+ quiet =
+ Q =
ifndef VERBOSE
- VERBOSE=1
+ VERBOSE = 1
endif
else
- quiet=quiet_
- Q=@
+ quiet = quiet_
+ Q = @
endif
# we want bash as shell
@@ -205,56 +205,56 @@ SHELL:=$(shell if [ -x "$$BASH" ]; then echo $$BASH; \
else echo sh; fi; fi)
# kconfig uses CONFIG_SHELL
-CONFIG_SHELL:=$(SHELL)
+CONFIG_SHELL := $(SHELL)
export SHELL CONFIG_SHELL quiet Q KBUILD_VERBOSE VERBOSE
ifndef HOSTAR
-HOSTAR:=ar
+HOSTAR := ar
endif
ifndef HOSTAS
HOSTAS:=as
endif
ifndef HOSTCC
-HOSTCC:=gcc
-HOSTCC:=$(shell which $(HOSTCC) || type -p $(HOSTCC) || echo gcc)
+HOSTCC := gcc
+HOSTCC := $(shell which $(HOSTCC) || type -p $(HOSTCC) || echo gcc)
endif
HOSTCC_NOCCACHE:=$(HOSTCC)
ifndef HOSTCXX
-HOSTCXX:=g++
-HOSTCXX:=$(shell which $(HOSTCXX) || type -p $(HOSTCXX) || echo g++)
+HOSTCXX := g++
+HOSTCXX := $(shell which $(HOSTCXX) || type -p $(HOSTCXX) || echo g++)
endif
-HOSTCXX_NOCCACHE:=$(HOSTCXX)
+HOSTCXX_NOCCACHE := $(HOSTCXX)
ifndef HOSTFC
-HOSTFC:=gfortran
+HOSTFC := gfortran
endif
ifndef HOSTCPP
HOSTCPP:=cpp
endif
ifndef HOSTLD
-HOSTLD:=ld
+HOSTLD := ld
endif
ifndef HOSTLN
-HOSTLN:=ln
+HOSTLN := ln
endif
ifndef HOSTNM
-HOSTNM:=nm
+HOSTNM := nm
endif
ifndef HOSTOBJCOPY
-HOSTOBJCOPY:=objcopy
+HOSTOBJCOPY := objcopy
endif
ifndef HOSTRANLIB
-HOSTRANLIB:=ranlib
-endif
-HOSTAR:=$(shell which $(HOSTAR) || type -p $(HOSTAR) || echo ar)
-HOSTAS:=$(shell which $(HOSTAS) || type -p $(HOSTAS) || echo as)
-HOSTFC:=$(shell which $(HOSTLD) || type -p $(HOSTLD) || echo || which g77 || type -p g77 || echo gfortran)
-HOSTCPP:=$(shell which $(HOSTCPP) || type -p $(HOSTCPP) || echo cpp)
-HOSTLD:=$(shell which $(HOSTLD) || type -p $(HOSTLD) || echo ld)
-HOSTLN:=$(shell which $(HOSTLN) || type -p $(HOSTLN) || echo ln)
-HOSTNM:=$(shell which $(HOSTNM) || type -p $(HOSTNM) || echo nm)
-HOSTOBJCOPY:=$(shell which $(HOSTOBJCOPY) || type -p $(HOSTOBJCOPY) || echo objcopy)
-HOSTRANLIB:=$(shell which $(HOSTRANLIB) || type -p $(HOSTRANLIB) || echo ranlib)
+HOSTRANLIB := ranlib
+endif
+HOSTAR := $(shell which $(HOSTAR) || type -p $(HOSTAR) || echo ar)
+HOSTAS := $(shell which $(HOSTAS) || type -p $(HOSTAS) || echo as)
+HOSTFC := $(shell which $(HOSTLD) || type -p $(HOSTLD) || echo || which g77 || type -p g77 || echo gfortran)
+HOSTCPP := $(shell which $(HOSTCPP) || type -p $(HOSTCPP) || echo cpp)
+HOSTLD := $(shell which $(HOSTLD) || type -p $(HOSTLD) || echo ld)
+HOSTLN := $(shell which $(HOSTLN) || type -p $(HOSTLN) || echo ln)
+HOSTNM := $(shell which $(HOSTNM) || type -p $(HOSTNM) || echo nm)
+HOSTOBJCOPY := $(shell which $(HOSTOBJCOPY) || type -p $(HOSTOBJCOPY) || echo objcopy)
+HOSTRANLIB := $(shell which $(HOSTRANLIB) || type -p $(HOSTRANLIB) || echo ranlib)
export HOSTAR HOSTAS HOSTCC HOSTCXX HOSTFC HOSTLD
export HOSTCC_NOCCACHE HOSTCXX_NOCCACHE
@@ -291,7 +291,7 @@ unexport CONFIG_SITE
unexport QMAKESPEC
unexport TERMINFO
-GNU_HOST_NAME:=$(shell support/gnuconfig/config.guess)
+GNU_HOST_NAME := $(shell support/gnuconfig/config.guess)
################################################################################
#
@@ -300,15 +300,15 @@ GNU_HOST_NAME:=$(shell support/gnuconfig/config.guess)
#
################################################################################
-TARGETS:= toolchain
+TARGETS := toolchain
# silent mode requested?
-QUIET:=$(if $(findstring s,$(MAKEFLAGS)),-q)
+QUIET := $(if $(findstring s,$(MAKEFLAGS)),-q)
# Strip off the annoying quoting
-ARCH:=$(call qstrip,$(BR2_ARCH))
+ARCH := $(call qstrip,$(BR2_ARCH))
-KERNEL_ARCH:=$(shell echo "$(ARCH)" | sed -e "s/-.*//" \
+KERNEL_ARCH := $(shell echo "$(ARCH)" | sed -e "s/-.*//" \
-e s/i.86/i386/ -e s/sun4u/sparc64/ \
-e s/arcle/arc/ \
-e s/arceb/arc/ \
@@ -320,28 +320,28 @@ KERNEL_ARCH:=$(shell echo "$(ARCH)" | sed -e "s/-.*//" \
-e s/ppc.*/powerpc/ -e s/mips.*/mips/ \
-e s/sh.*/sh/)
-ZCAT:=$(call qstrip,$(BR2_ZCAT))
-BZCAT:=$(call qstrip,$(BR2_BZCAT))
-XZCAT:=$(call qstrip,$(BR2_XZCAT))
-TAR_OPTIONS=$(call qstrip,$(BR2_TAR_OPTIONS)) -xf
+ZCAT := $(call qstrip,$(BR2_ZCAT))
+BZCAT := $(call qstrip,$(BR2_BZCAT))
+XZCAT := $(call qstrip,$(BR2_XZCAT))
+TAR_OPTIONS = $(call qstrip,$(BR2_TAR_OPTIONS)) -xf
# packages compiled for the host go here
-HOST_DIR:=$(call qstrip,$(BR2_HOST_DIR))
+HOST_DIR := $(call qstrip,$(BR2_HOST_DIR))
# locales to generate
-GENERATE_LOCALE=$(call qstrip,$(BR2_GENERATE_LOCALE))
+GENERATE_LOCALE = $(call qstrip,$(BR2_GENERATE_LOCALE))
-TARGET_SKELETON=$(TOPDIR)/system/skeleton
+TARGET_SKELETON = $(TOPDIR)/system/skeleton
# Location of a file giving a big fat warning that output/target
# should not be used as the root filesystem.
-TARGET_DIR_WARNING_FILE=$(TARGET_DIR)/THIS_IS_NOT_YOUR_ROOT_FILESYSTEM
+TARGET_DIR_WARNING_FILE = $(TARGET_DIR)/THIS_IS_NOT_YOUR_ROOT_FILESYSTEM
ifeq ($(BR2_CCACHE),y)
-CCACHE:=$(HOST_DIR)/usr/bin/ccache
+CCACHE := $(HOST_DIR)/usr/bin/ccache
BR_CACHE_DIR = $(call qstrip,$(BR2_CCACHE_DIR))
export BR_CACHE_DIR
-HOSTCC := $(CCACHE) $(HOSTCC)
+HOSTCC := $(CCACHE) $(HOSTCC)
HOSTCXX := $(CCACHE) $(HOSTCXX)
endif
@@ -394,23 +394,23 @@ include system/system.mk
include $(BR2_EXTERNAL)/external.mk
ifeq ($(BR2_ENABLE_LOCALE_PURGE),y)
-TARGETS+=target-purgelocales
+TARGETS += target-purgelocales
endif
ifeq ($(BR2_TOOLCHAIN_USES_GLIBC),y)
ifneq ($(GENERATE_LOCALE),)
-TARGETS+=target-generatelocales
+TARGETS += target-generatelocales
endif
endif
ifeq ($(BR2_ECLIPSE_REGISTER),y)
-TARGETS+=toolchain-eclipse-register
+TARGETS += toolchain-eclipse-register
endif
include fs/common.mk
-TARGETS_SOURCE:=$(patsubst %,%-source,$(TARGETS))
-TARGETS_DIRCLEAN:=$(patsubst %,%-dirclean,$(TARGETS))
+TARGETS_SOURCE := $(patsubst %,%-source,$(TARGETS))
+TARGETS_DIRCLEAN := $(patsubst %,%-dirclean,$(TARGETS))
# host-* dependencies have to be handled specially, as those aren't
# visible in Kconfig and hence not added to a variable like TARGETS.
@@ -430,7 +430,7 @@ HOST_DEPS = $(sort $(foreach dep,\
$($(dep))))
HOST_SOURCE += $(addsuffix -source,$(sort $(TARGETS_HOST_DEPS) $(HOST_DEPS)))
-TARGETS_LEGAL_INFO:=$(patsubst %,%-legal-info,\
+TARGETS_LEGAL_INFO := $(patsubst %,%-legal-info,\
$(TARGETS) $(TARGETS_HOST_DEPS) $(HOST_DEPS))))
dirs: $(BUILD_DIR) $(STAGING_DIR) $(TARGET_DIR) \
@@ -483,7 +483,7 @@ $(STAGING_DIR):
@ln -snf $(STAGING_DIR) $(BASE_DIR)/staging
ifeq ($(BR2_ROOTFS_SKELETON_CUSTOM),y)
-TARGET_SKELETON=$(BR2_ROOTFS_SKELETON_CUSTOM_PATH)
+TARGET_SKELETON = $(BR2_ROOTFS_SKELETON_CUSTOM_PATH)
endif
RSYNC_VCS_EXCLUSIONS = \
@@ -577,8 +577,8 @@ endif
$(USER_HOOKS_EXTRA_ENV) $(s) $(TARGET_DIR) $(call qstrip,$(BR2_ROOTFS_POST_SCRIPT_ARGS))$(sep))
ifeq ($(BR2_ENABLE_LOCALE_PURGE),y)
-LOCALE_WHITELIST=$(BUILD_DIR)/locales.nopurge
-LOCALE_NOPURGE=$(call qstrip,$(BR2_ENABLE_LOCALE_WHITELIST))
+LOCALE_WHITELIST = $(BUILD_DIR)/locales.nopurge
+LOCALE_NOPURGE = $(call qstrip,$(BR2_ENABLE_LOCALE_WHITELIST))
target-purgelocales:
rm -f $(LOCALE_WHITELIST)
@@ -682,7 +682,7 @@ endif # ifeq ($(BR2_HAVE_DOT_CONFIG),y)
# configuration
# ---------------------------------------------------------------------------
-HOSTCFLAGS=$(CFLAGS_FOR_BUILD)
+HOSTCFLAGS = $(CFLAGS_FOR_BUILD)
export HOSTCFLAGS
$(BUILD_DIR)/buildroot-config/%onf:
@@ -911,7 +911,7 @@ endif
@echo 'See docs/README, or generate the Buildroot manual for further details'
@echo
-release: OUT=buildroot-$(BR2_VERSION)
+release: OUT = buildroot-$(BR2_VERSION)
# Create release tarballs. We need to fiddle a bit to add the generated
# documentation to the git output
--
1.8.3.2
^ permalink raw reply related [flat|nested] 25+ messages in thread
* [Buildroot] [PATCH 4/6] luajit: needs for 32bit archictectures a 32bit host gcc
2014-03-11 12:17 [Buildroot] [PATCH 0/6] Miscellauneus patches Fabio Porcedda
` (2 preceding siblings ...)
2014-03-11 12:17 ` [Buildroot] [PATCH 3/6] Makefile: fix coding style Fabio Porcedda
@ 2014-03-11 12:17 ` Fabio Porcedda
2014-03-11 19:16 ` François Perrad
2014-03-11 12:17 ` [Buildroot] [PATCH 5/6] infra: add to luarocks support for top-level parallel make Fabio Porcedda
` (2 subsequent siblings)
6 siblings, 1 reply; 25+ messages in thread
From: Fabio Porcedda @ 2014-03-11 12:17 UTC (permalink / raw)
To: buildroot
For 32 bit archictectures the luajit package needs a host compiler
able to generate 32 bit code using the "-m32" option so check if that
option is supported.
Signed-off-by: Fabio Porcedda <fabio.porcedda@gmail.com>
Cc: Yann E. MORIN <yann.morin.1998@free.fr>
Cc: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
Cc: Fran?ois Perrad <francois.perrad@gadz.org>
---
package/luajit/Config.in | 1 +
1 file changed, 1 insertion(+)
diff --git a/package/luajit/Config.in b/package/luajit/Config.in
index 9c4ecc3..dd93609 100644
--- a/package/luajit/Config.in
+++ b/package/luajit/Config.in
@@ -4,6 +4,7 @@ config BR2_PACKAGE_LUAJIT
# Luajit is only available for some target architectures, and
# has some complexity wrt 32/64. See luajit.mk for details.
depends on BR2_i386 || (BR2_x86_64 && BR2_HOSTARCH='x86_64') || BR2_powerpc || BR2_arm || BR2_armeb
+ select BR2_HOSTARCH_NEEDS_IA32_COMPILER if !BR2_ARCH_IS_64
help
LuaJIT implements the full set of language features defined
by Lua 5.1. The virtual machine (VM) is API- and
--
1.8.3.2
^ permalink raw reply related [flat|nested] 25+ messages in thread
* [Buildroot] [PATCH 5/6] infra: add to luarocks support for top-level parallel make
2014-03-11 12:17 [Buildroot] [PATCH 0/6] Miscellauneus patches Fabio Porcedda
` (3 preceding siblings ...)
2014-03-11 12:17 ` [Buildroot] [PATCH 4/6] luajit: needs for 32bit archictectures a 32bit host gcc Fabio Porcedda
@ 2014-03-11 12:17 ` Fabio Porcedda
2014-03-11 19:42 ` François Perrad
2014-03-11 12:17 ` [Buildroot] [PATCH 6/6] Makefile: do not add the toolchain target to the TARGETS variable Fabio Porcedda
2014-03-11 17:38 ` [Buildroot] [PATCH 0/6] Miscellauneus patches Fabio Porcedda
6 siblings, 1 reply; 25+ messages in thread
From: Fabio Porcedda @ 2014-03-11 12:17 UTC (permalink / raw)
To: buildroot
The host-luarock dependency is not always satisfied for the extract
phase because the %-extract target is not anymore in the dependency
chain.
To be sure that the dependency is satfied add the dependency to the
stamp file $(%_TARGET_EXTRACT) instead of the %-extract target.
Signed-off-by: Fabio Porcedda <fabio.porcedda@gmail.com>
Cc: Francois Perrad <fperrad@gmail.com>
---
package/pkg-luarocks.mk | 8 ++++----
1 file changed, 4 insertions(+), 4 deletions(-)
diff --git a/package/pkg-luarocks.mk b/package/pkg-luarocks.mk
index bdda022..7010381 100644
--- a/package/pkg-luarocks.mk
+++ b/package/pkg-luarocks.mk
@@ -43,10 +43,6 @@ $(2)_SITE ?= $(call qstrip,$(BR2_LUAROCKS_MIRROR))
# a target package, and can just add the required dependencies
$(2)_DEPENDENCIES += host-luarocks luainterpreter
-# $(2)_DEPENDENCIES are handled for configure step (too late)
-# but host-luarocks is required to do the extract
-$(1)-extract: host-luarocks
-
#
# Extract step
#
@@ -71,6 +67,10 @@ endif
# make targets
$(call inner-generic-package,$(1),$(2),$(3),$(4))
+# $(2)_DEPENDENCIES are handled for configure step (too late)
+# but host-luarocks is required to do the extract
+$$($(2)_TARGET_EXTRACT): | host-luarocks
+
endef
################################################################################
--
1.8.3.2
^ permalink raw reply related [flat|nested] 25+ messages in thread
* [Buildroot] [PATCH 6/6] Makefile: do not add the toolchain target to the TARGETS variable
2014-03-11 12:17 [Buildroot] [PATCH 0/6] Miscellauneus patches Fabio Porcedda
` (4 preceding siblings ...)
2014-03-11 12:17 ` [Buildroot] [PATCH 5/6] infra: add to luarocks support for top-level parallel make Fabio Porcedda
@ 2014-03-11 12:17 ` Fabio Porcedda
2014-03-17 7:42 ` Arnout Vandecappelle
2014-03-11 17:38 ` [Buildroot] [PATCH 0/6] Miscellauneus patches Fabio Porcedda
6 siblings, 1 reply; 25+ messages in thread
From: Fabio Porcedda @ 2014-03-11 12:17 UTC (permalink / raw)
To: buildroot
Do not add the toolchain target to the TARGETS variable because now the
toolchain target is a dependency added automatically so it is not
necessary to add it anymore.
Signed-off-by: Fabio Porcedda <fabio.porcedda@gmail.com>
---
Makefile | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/Makefile b/Makefile
index 0420364..481f779 100644
--- a/Makefile
+++ b/Makefile
@@ -300,7 +300,7 @@ GNU_HOST_NAME := $(shell support/gnuconfig/config.guess)
#
################################################################################
-TARGETS := toolchain
+TARGETS :=
# silent mode requested?
QUIET := $(if $(findstring s,$(MAKEFLAGS)),-q)
--
1.8.3.2
^ permalink raw reply related [flat|nested] 25+ messages in thread
* [Buildroot] [PATCH 1/6] barebox: fix coding style
2014-03-11 12:17 ` [Buildroot] [PATCH 1/6] barebox: fix coding style Fabio Porcedda
@ 2014-03-11 17:33 ` Yann E. MORIN
2014-03-12 6:45 ` Arnout Vandecappelle
0 siblings, 1 reply; 25+ messages in thread
From: Yann E. MORIN @ 2014-03-11 17:33 UTC (permalink / raw)
To: buildroot
Fabio, All,
On 2014-03-11 13:17 +0100, Fabio Porcedda spake thusly:
> Break long lines.
[--SNIP--]
> -BAREBOX_MAKE_FLAGS = ARCH=$(BAREBOX_ARCH) CROSS_COMPILE="$(CCACHE) $(TARGET_CROSS)"
> +BAREBOX_MAKE_FLAGS = ARCH=$(BAREBOX_ARCH) CROSS_COMPILE="$(CCACHE) \
> + $(TARGET_CROSS)"
Although we have no written rule about thus, I'd rather that folded-lines
assignments continue after the '=' sign, like:
BAREBOX_MAKE_FLAGS = ARCH=$(BAREBOX_ARCH) CROSS_COMPILE="$(CCACHE) \
$(TARGET_CROSS)"
It makes it easier to see the assignment.
> ifeq ($(BR2_TARGET_BAREBOX_USE_DEFCONFIG),y)
> -BAREBOX_SOURCE_CONFIG = $(@D)/arch/$(BAREBOX_ARCH)/configs/$(call qstrip,$(BR2_TARGET_BAREBOX_BOARD_DEFCONFIG))_defconfig
> +BAREBOX_SOURCE_CONFIG = $(@D)/arch/$(BAREBOX_ARCH)/configs/$(call qstrip,\
> + $(BR2_TARGET_BAREBOX_BOARD_DEFCONFIG))_defconfig
Ditto.
> else ifeq ($(BR2_TARGET_BAREBOX_USE_CUSTOM_CONFIG),y)
> BAREBOX_SOURCE_CONFIG = $(BR2_TARGET_BAREBOX_CUSTOM_CONFIG_FILE)
> endif
>
> define BAREBOX_CONFIGURE_CMDS
> - cp $(BAREBOX_SOURCE_CONFIG) $(@D)/arch/$(BAREBOX_ARCH)/configs/buildroot_defconfig
> - $(TARGET_MAKE_ENV) $(MAKE) $(BAREBOX_MAKE_FLAGS) -C $(@D) buildroot_defconfig
> + cp $(BAREBOX_SOURCE_CONFIG) \
> + $(@D)/arch/$(BAREBOX_ARCH)/configs/buildroot_defconfig
> + $(TARGET_MAKE_ENV) $(MAKE) $(BAREBOX_MAKE_FLAGS) -C $(@D) \
> + buildroot_defconfig
> endef
>
> ifeq ($(BR2_TARGET_BAREBOX_BAREBOXENV),y)
> @@ -68,7 +73,8 @@ endef
> endif
>
> ifeq ($(BR2_TARGET_BAREBOX_CUSTOM_ENV),y)
> -BAREBOX_ENV_NAME = $(notdir $(call qstrip, $(BR2_TARGET_BAREBOX_CUSTOM_ENV_PATH)))
> +BAREBOX_ENV_NAME = $(notdir $(call qstrip,\
> + $(BR2_TARGET_BAREBOX_CUSTOM_ENV_PATH)))
Ditto.
But I'd like the maintainer to Ack this before you resend. I have no
strong opinion about it, I just find it easier to read...
Regards,
Yann E. MORIN.
--
.-----------------.--------------------.------------------.--------------------.
| Yann E. MORIN | Real-Time Embedded | /"\ ASCII RIBBON | Erics' conspiracy: |
| +33 662 376 056 | Software Designer | \ / CAMPAIGN | ___ |
| +33 223 225 172 `------------.-------: X AGAINST | \e/ There is no |
| http://ymorin.is-a-geek.org/ | _/*\_ | / \ HTML MAIL | v conspiracy. |
'------------------------------^-------^------------------^--------------------'
^ permalink raw reply [flat|nested] 25+ messages in thread
* [Buildroot] [PATCH 0/6] Miscellauneus patches
2014-03-11 12:17 [Buildroot] [PATCH 0/6] Miscellauneus patches Fabio Porcedda
` (5 preceding siblings ...)
2014-03-11 12:17 ` [Buildroot] [PATCH 6/6] Makefile: do not add the toolchain target to the TARGETS variable Fabio Porcedda
@ 2014-03-11 17:38 ` Fabio Porcedda
6 siblings, 0 replies; 25+ messages in thread
From: Fabio Porcedda @ 2014-03-11 17:38 UTC (permalink / raw)
To: buildroot
On Tue, Mar 11, 2014 at 1:17 PM, Fabio Porcedda
<fabio.porcedda@gmail.com> wrote:
> Some miscellaneus patches.
>
> v2:
> - Add three patches
> - Remove the already merged patch
>
> Best regards
>
> Fabio Porcedda (6):
> barebox: fix coding style
> Remove "dirs" dependencies
> Makefile: fix coding style
> luajit: needs for 32bit archictectures a 32bit host gcc
> infra: add to luarocks support for top-level parallel make
> Makefile: do not add the toolchain target to the TARGETS variable
>
> Makefile | 190 +++++++++++++++++++++++------------------------
> boot/barebox/barebox.mk | 32 ++++----
> package/luajit/Config.in | 1 +
> package/pkg-luarocks.mk | 8 +-
> package/uclibc/uclibc.mk | 2 +-
> 5 files changed, 120 insertions(+), 113 deletions(-)
>
> --
> 1.8.3.2
>
I've forgotten to add the V2 subfix to the patchset.
Regards
--
Fabio Porcedda
^ permalink raw reply [flat|nested] 25+ messages in thread
* [Buildroot] [PATCH 4/6] luajit: needs for 32bit archictectures a 32bit host gcc
2014-03-11 12:17 ` [Buildroot] [PATCH 4/6] luajit: needs for 32bit archictectures a 32bit host gcc Fabio Porcedda
@ 2014-03-11 19:16 ` François Perrad
0 siblings, 0 replies; 25+ messages in thread
From: François Perrad @ 2014-03-11 19:16 UTC (permalink / raw)
To: buildroot
2014-03-11 13:17 GMT+01:00 Fabio Porcedda <fabio.porcedda@gmail.com>:
> For 32 bit archictectures the luajit package needs a host compiler
> able to generate 32 bit code using the "-m32" option so check if that
> option is supported.
>
> Signed-off-by: Fabio Porcedda <fabio.porcedda@gmail.com>
Acked-by: Francois Perrad <francois.perrad@gadz.org>
> Cc: Yann E. MORIN <yann.morin.1998@free.fr>
> Cc: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
> Cc: Fran?ois Perrad <francois.perrad@gadz.org>
> ---
> package/luajit/Config.in | 1 +
> 1 file changed, 1 insertion(+)
>
> diff --git a/package/luajit/Config.in b/package/luajit/Config.in
> index 9c4ecc3..dd93609 100644
> --- a/package/luajit/Config.in
> +++ b/package/luajit/Config.in
> @@ -4,6 +4,7 @@ config BR2_PACKAGE_LUAJIT
> # Luajit is only available for some target architectures, and
> # has some complexity wrt 32/64. See luajit.mk for details.
> depends on BR2_i386 || (BR2_x86_64 && BR2_HOSTARCH='x86_64') || BR2_powerpc || BR2_arm || BR2_armeb
> + select BR2_HOSTARCH_NEEDS_IA32_COMPILER if !BR2_ARCH_IS_64
> help
> LuaJIT implements the full set of language features defined
> by Lua 5.1. The virtual machine (VM) is API- and
> --
> 1.8.3.2
>
^ permalink raw reply [flat|nested] 25+ messages in thread
* [Buildroot] [PATCH 5/6] infra: add to luarocks support for top-level parallel make
2014-03-11 12:17 ` [Buildroot] [PATCH 5/6] infra: add to luarocks support for top-level parallel make Fabio Porcedda
@ 2014-03-11 19:42 ` François Perrad
2014-04-01 8:39 ` Fabio Porcedda
0 siblings, 1 reply; 25+ messages in thread
From: François Perrad @ 2014-03-11 19:42 UTC (permalink / raw)
To: buildroot
2014-03-11 13:17 GMT+01:00 Fabio Porcedda <fabio.porcedda@gmail.com>:
> The host-luarock dependency is not always satisfied for the extract
> phase because the %-extract target is not anymore in the dependency
> chain.
> To be sure that the dependency is satfied add the dependency to the
typo: satisfied
> stamp file $(%_TARGET_EXTRACT) instead of the %-extract target.
>
> Signed-off-by: Fabio Porcedda <fabio.porcedda@gmail.com>
> Cc: Francois Perrad <fperrad@gmail.com>
> ---
> package/pkg-luarocks.mk | 8 ++++----
> 1 file changed, 4 insertions(+), 4 deletions(-)
>
> diff --git a/package/pkg-luarocks.mk b/package/pkg-luarocks.mk
> index bdda022..7010381 100644
> --- a/package/pkg-luarocks.mk
> +++ b/package/pkg-luarocks.mk
> @@ -43,10 +43,6 @@ $(2)_SITE ?= $(call qstrip,$(BR2_LUAROCKS_MIRROR))
> # a target package, and can just add the required dependencies
> $(2)_DEPENDENCIES += host-luarocks luainterpreter
>
> -# $(2)_DEPENDENCIES are handled for configure step (too late)
> -# but host-luarocks is required to do the extract
> -$(1)-extract: host-luarocks
> -
> #
> # Extract step
> #
> @@ -71,6 +67,10 @@ endif
> # make targets
> $(call inner-generic-package,$(1),$(2),$(3),$(4))
>
> +# $(2)_DEPENDENCIES are handled for configure step (too late)
> +# but host-luarocks is required to do the extract
> +$$($(2)_TARGET_EXTRACT): | host-luarocks
> +
> endef
>
> ################################################################################
> --
> 1.8.3.2
>
> _______________________________________________
> buildroot mailing list
> buildroot at busybox.net
> http://lists.busybox.net/mailman/listinfo/buildroot
^ permalink raw reply [flat|nested] 25+ messages in thread
* [Buildroot] [PATCH 1/6] barebox: fix coding style
2014-03-11 17:33 ` Yann E. MORIN
@ 2014-03-12 6:45 ` Arnout Vandecappelle
2014-03-13 16:35 ` Fabio Porcedda
0 siblings, 1 reply; 25+ messages in thread
From: Arnout Vandecappelle @ 2014-03-12 6:45 UTC (permalink / raw)
To: buildroot
On 03/11/14 18:33, Yann E. MORIN wrote:
> Fabio, All,
>
> On 2014-03-11 13:17 +0100, Fabio Porcedda spake thusly:
>> Break long lines.
> [--SNIP--]
>> -BAREBOX_MAKE_FLAGS = ARCH=$(BAREBOX_ARCH) CROSS_COMPILE="$(CCACHE) $(TARGET_CROSS)"
>> +BAREBOX_MAKE_FLAGS = ARCH=$(BAREBOX_ARCH) CROSS_COMPILE="$(CCACHE) \
>> + $(TARGET_CROSS)"
Splitting a line between quotes is evil.
>
> Although we have no written rule about thus, I'd rather that folded-lines
> assignments continue after the '=' sign, like:
>
> BAREBOX_MAKE_FLAGS = ARCH=$(BAREBOX_ARCH) CROSS_COMPILE="$(CCACHE) \
> $(TARGET_CROSS)"
>
> It makes it easier to see the assignment.
Or better yet (and this is the unwritten rule that we tend to follow):
BAREBOX_MAKE_FLAGS = \
ARCH=$(BAREBOX_ARCH) \
CROSS_COMPILE="$(CCACHE) $(TARGET_CROSS)"
>
>> ifeq ($(BR2_TARGET_BAREBOX_USE_DEFCONFIG),y)
>> -BAREBOX_SOURCE_CONFIG = $(@D)/arch/$(BAREBOX_ARCH)/configs/$(call qstrip,$(BR2_TARGET_BAREBOX_BOARD_DEFCONFIG))_defconfig
>> +BAREBOX_SOURCE_CONFIG = $(@D)/arch/$(BAREBOX_ARCH)/configs/$(call qstrip,\
>> + $(BR2_TARGET_BAREBOX_BOARD_DEFCONFIG))_defconfig
Splitting a single path is also evil. We do usually keep the long lines
in such a case.
>
> Ditto.
>
>> else ifeq ($(BR2_TARGET_BAREBOX_USE_CUSTOM_CONFIG),y)
>> BAREBOX_SOURCE_CONFIG = $(BR2_TARGET_BAREBOX_CUSTOM_CONFIG_FILE)
>> endif
>>
>> define BAREBOX_CONFIGURE_CMDS
>> - cp $(BAREBOX_SOURCE_CONFIG) $(@D)/arch/$(BAREBOX_ARCH)/configs/buildroot_defconfig
>> - $(TARGET_MAKE_ENV) $(MAKE) $(BAREBOX_MAKE_FLAGS) -C $(@D) buildroot_defconfig
>> + cp $(BAREBOX_SOURCE_CONFIG) \
>> + $(@D)/arch/$(BAREBOX_ARCH)/configs/buildroot_defconfig
>> + $(TARGET_MAKE_ENV) $(MAKE) $(BAREBOX_MAKE_FLAGS) -C $(@D) \
>> + buildroot_defconfig
>> endef
>>
>> ifeq ($(BR2_TARGET_BAREBOX_BAREBOXENV),y)
>> @@ -68,7 +73,8 @@ endef
>> endif
>>
>> ifeq ($(BR2_TARGET_BAREBOX_CUSTOM_ENV),y)
>> -BAREBOX_ENV_NAME = $(notdir $(call qstrip, $(BR2_TARGET_BAREBOX_CUSTOM_ENV_PATH)))
>> +BAREBOX_ENV_NAME = $(notdir $(call qstrip,\
>> + $(BR2_TARGET_BAREBOX_CUSTOM_ENV_PATH)))
This one is probably OK :-)
Regards,
Arnout
>
> Ditto.
>
> But I'd like the maintainer to Ack this before you resend. I have no
> strong opinion about it, I just find it easier to read...
>
> Regards,
> Yann E. MORIN.
>
--
Arnout Vandecappelle arnout at mind be
Senior Embedded Software Architect +32-16-286500
Essensium/Mind http://www.mind.be
G.Geenslaan 9, 3001 Leuven, Belgium BE 872 984 063 RPR Leuven
LinkedIn profile: http://www.linkedin.com/in/arnoutvandecappelle
GPG fingerprint: 7CB5 E4CC 6C2E EFD4 6E3D A754 F963 ECAB 2450 2F1F
^ permalink raw reply [flat|nested] 25+ messages in thread
* [Buildroot] [PATCH 2/6] Remove "dirs" dependencies
2014-03-11 12:17 ` [Buildroot] [PATCH 2/6] Remove "dirs" dependencies Fabio Porcedda
@ 2014-03-12 7:09 ` Arnout Vandecappelle
0 siblings, 0 replies; 25+ messages in thread
From: Arnout Vandecappelle @ 2014-03-12 7:09 UTC (permalink / raw)
To: buildroot
On 03/11/14 13:17, Fabio Porcedda wrote:
> The package infrastructure add automatically the "dirs" dependency so
> remove it when the package infrastructure is being used.
>
> Signed-off-by: Fabio Porcedda <fabio.porcedda@gmail.com>
Acked-by: Arnout Vandecappelle (Essensium/Mind) <arnout@mind.be>
> ---
> Makefile | 2 +-
> package/uclibc/uclibc.mk | 2 +-
> 2 files changed, 2 insertions(+), 2 deletions(-)
>
> diff --git a/Makefile b/Makefile
> index 665865b..30d56d0 100644
> --- a/Makefile
> +++ b/Makefile
> @@ -625,7 +625,7 @@ target-post-image: $(TARGETS_ROOTFS) target-finalize
> toolchain-eclipse-register:
> ./support/scripts/eclipse-register-toolchain `readlink -f $(O)` $(notdir $(TARGET_CROSS)) $(BR2_ARCH)
>
> -source: dirs $(TARGETS_SOURCE) $(HOST_SOURCE)
> +source: $(TARGETS_SOURCE) $(HOST_SOURCE)
>
> external-deps:
> @$(MAKE1) -Bs DL_MODE=SHOW_EXTERNAL_DEPS $(EXTRAMAKEARGS) source | sort -u
> diff --git a/package/uclibc/uclibc.mk b/package/uclibc/uclibc.mk
> index f0fb53a..020e218 100644
> --- a/package/uclibc/uclibc.mk
> +++ b/package/uclibc/uclibc.mk
> @@ -542,7 +542,7 @@ define UCLIBC_INSTALL_STAGING_CMDS
> $(UCLIBC_INSTALL_UTILS_STAGING)
> endef
>
> -uclibc-menuconfig: dirs uclibc-patch
> +uclibc-menuconfig: uclibc-patch
> $(MAKE1) -C $(UCLIBC_DIR) \
> $(UCLIBC_MAKE_FLAGS) \
> PREFIX=$(STAGING_DIR) \
>
--
Arnout Vandecappelle arnout at mind be
Senior Embedded Software Architect +32-16-286500
Essensium/Mind http://www.mind.be
G.Geenslaan 9, 3001 Leuven, Belgium BE 872 984 063 RPR Leuven
LinkedIn profile: http://www.linkedin.com/in/arnoutvandecappelle
GPG fingerprint: 7CB5 E4CC 6C2E EFD4 6E3D A754 F963 ECAB 2450 2F1F
^ permalink raw reply [flat|nested] 25+ messages in thread
* [Buildroot] [PATCH 3/6] Makefile: fix coding style
2014-03-11 12:17 ` [Buildroot] [PATCH 3/6] Makefile: fix coding style Fabio Porcedda
@ 2014-03-12 7:55 ` Arnout Vandecappelle
2014-04-09 9:21 ` Fabio Porcedda
0 siblings, 1 reply; 25+ messages in thread
From: Arnout Vandecappelle @ 2014-03-12 7:55 UTC (permalink / raw)
To: buildroot
On 03/11/14 13:17, Fabio Porcedda wrote:
> As stated in the buildroot user manual add just a single space before
> and after a '=' sign.
>
> Signed-off-by: Fabio Porcedda <fabio.porcedda@gmail.com>
Acked-by: Arnout Vandecappelle (Essensium/Mind) <arnout@mind.be>
Reviewing this patch leads to a few more opportunities, though. So these
are commented below.
> ---
> Makefile | 188 +++++++++++++++++++++++++++++++--------------------------------
> 1 file changed, 94 insertions(+), 94 deletions(-)
>
> diff --git a/Makefile b/Makefile
> index 30d56d0..0420364 100644
> --- a/Makefile
> +++ b/Makefile
> @@ -25,10 +25,10 @@
> #--------------------------------------------------------------
>
> # Set and export the version string
> -export BR2_VERSION:=2014.05-git
> +export BR2_VERSION := 2014.05-git
No reason for := here.
>
> # Check for minimal make version (note: this check will break at make 10.x)
> -MIN_MAKE_VERSION=3.81
> +MIN_MAKE_VERSION = 3.81
> ifneq ($(firstword $(sort $(MAKE_VERSION) $(MIN_MAKE_VERSION))),$(MIN_MAKE_VERSION))
> $(error You have make '$(MAKE_VERSION)' installed. GNU make >= $(MIN_MAKE_VERSION) is required)
> endif
> @@ -59,33 +59,33 @@ export HOSTARCH := $(shell uname -m | \
> # make BR2_JLEVEL= -j$((`getconf _NPROCESSORS_ONLN`+1))
>
> # absolute path
> -TOPDIR:=$(shell pwd)
> -CONFIG_CONFIG_IN=Config.in
> -CONFIG=support/kconfig
> -DATE:=$(shell date +%Y%m%d)
> +TOPDIR := $(shell pwd)
> +CONFIG_CONFIG_IN = Config.in
> +CONFIG = support/kconfig
Actually, this is used in just one place so perhaps it can be removed.
> +DATE := $(shell date +%Y%m%d)
Same here.
>
> # Compute the full local version string so packages can use it as-is
> # Need to export it, so it can be got from environment in children (eg. mconf)
> -export BR2_VERSION_FULL:=$(BR2_VERSION)$(shell $(TOPDIR)/support/scripts/setlocalversion)
> +export BR2_VERSION_FULL := $(BR2_VERSION)$(shell $(TOPDIR)/support/scripts/setlocalversion)
>
> -noconfig_targets:=menuconfig nconfig gconfig xconfig config oldconfig randconfig \
> +noconfig_targets := menuconfig nconfig gconfig xconfig config oldconfig randconfig \
> defconfig %_defconfig allyesconfig allnoconfig silentoldconfig release \
> randpackageconfig allyespackageconfig allnopackageconfig \
> source-check print-version olddefconfig
>
> # Strip quotes and then whitespaces
> -qstrip=$(strip $(subst ",,$(1)))
> +qstrip = $(strip $(subst ",,$(1)))
> #"))
>
> # Variables for use in Make constructs
> -comma:=,
> -empty:=
> -space:=$(empty) $(empty)
> +comma := ,
> +empty :=
> +space := $(empty) $(empty)
>
> ifneq ("$(origin O)", "command line")
> -O:=output
> -CONFIG_DIR:=$(TOPDIR)
> -NEED_WRAPPER=
> +O := output
> +CONFIG_DIR := $(TOPDIR)
> +NEED_WRAPPER =
No need to define NEED_WRAPPER to empty.
> else
> # other packages might also support Linux-style out of tree builds
> # with the O=<dir> syntax (E.G. Busybox does). As make automatically
> @@ -97,18 +97,18 @@ MAKEOVERRIDES =
> # of the origin function (command line -> environment).
> # Unfortunately some packages don't look at origin (E.G. uClibc 0.9.31+)
> # To really make O go away, we have to override it.
> -override O:=$(O)
> -CONFIG_DIR:=$(O)
> +override O := $(O)
> +CONFIG_DIR := $(O)
> # we need to pass O= everywhere we call back into the toplevel makefile
> EXTRAMAKEARGS = O=$(O)
> -NEED_WRAPPER=y
> +NEED_WRAPPER = y
> endif
>
> # bash prints the name of the directory on 'cd <dir>' if CDPATH is
> # set, so unset it here to not cause problems. Notice that the export
> # line doesn't affect the environment of $(shell ..) calls, so
> # explictly throw away any output from 'cd' here.
> -export CDPATH:=
> +export CDPATH :=
> BASE_DIR := $(shell mkdir -p $(O) && cd $(O) >/dev/null && pwd)
> $(if $(BASE_DIR),, $(error output directory "$(O)" does not exist))
>
> @@ -150,27 +150,27 @@ endif
> # Avoids doing the $(or...) everytime
> _BR2_GRAPH_OUT := $(or $(BR2_GRAPH_OUT),pdf)
>
> -BUILD_DIR:=$(BASE_DIR)/build
> -STAMP_DIR:=$(BASE_DIR)/stamps
> -BINARIES_DIR:=$(BASE_DIR)/images
> -TARGET_DIR:=$(BASE_DIR)/target
> +BUILD_DIR := $(BASE_DIR)/build
> +STAMP_DIR := $(BASE_DIR)/stamps
> +BINARIES_DIR := $(BASE_DIR)/images
> +TARGET_DIR := $(BASE_DIR)/target
All these don't need :=
> # initial definition so that 'make clean' works for most users, even without
> # .config. HOST_DIR will be overwritten later when .config is included.
> -HOST_DIR:=$(BASE_DIR)/host
> -
> -LEGAL_INFO_DIR=$(BASE_DIR)/legal-info
> -REDIST_SOURCES_DIR_TARGET=$(LEGAL_INFO_DIR)/sources
> -REDIST_SOURCES_DIR_HOST=$(LEGAL_INFO_DIR)/host-sources
> -LICENSE_FILES_DIR_TARGET=$(LEGAL_INFO_DIR)/licenses
> -LICENSE_FILES_DIR_HOST=$(LEGAL_INFO_DIR)/host-licenses
> -LEGAL_MANIFEST_CSV_TARGET=$(LEGAL_INFO_DIR)/manifest.csv
> -LEGAL_MANIFEST_CSV_HOST=$(LEGAL_INFO_DIR)/host-manifest.csv
> -LEGAL_LICENSES_TXT_TARGET=$(LEGAL_INFO_DIR)/licenses.txt
> -LEGAL_LICENSES_TXT_HOST=$(LEGAL_INFO_DIR)/host-licenses.txt
> -LEGAL_WARNINGS=$(LEGAL_INFO_DIR)/.warnings
> -LEGAL_REPORT=$(LEGAL_INFO_DIR)/README
> -
> -BR2_CONFIG=$(CONFIG_DIR)/.config
> +HOST_DIR := $(BASE_DIR)/host
Neither does this one.
> +
> +LEGAL_INFO_DIR = $(BASE_DIR)/legal-info
> +REDIST_SOURCES_DIR_TARGET = $(LEGAL_INFO_DIR)/sources
> +REDIST_SOURCES_DIR_HOST = $(LEGAL_INFO_DIR)/host-sources
> +LICENSE_FILES_DIR_TARGET = $(LEGAL_INFO_DIR)/licenses
> +LICENSE_FILES_DIR_HOST = $(LEGAL_INFO_DIR)/host-licenses
> +LEGAL_MANIFEST_CSV_TARGET = $(LEGAL_INFO_DIR)/manifest.csv
> +LEGAL_MANIFEST_CSV_HOST = $(LEGAL_INFO_DIR)/host-manifest.csv
> +LEGAL_LICENSES_TXT_TARGET = $(LEGAL_INFO_DIR)/licenses.txt
> +LEGAL_LICENSES_TXT_HOST = $(LEGAL_INFO_DIR)/host-licenses.txt
> +LEGAL_WARNINGS = $(LEGAL_INFO_DIR)/.warnings
> +LEGAL_REPORT = $(LEGAL_INFO_DIR)/README
> +
> +BR2_CONFIG = $(CONFIG_DIR)/.config
>
> # Pull in the user's configuration file
> ifeq ($(filter $(noconfig_targets),$(MAKECMDGOALS)),)
> @@ -181,22 +181,22 @@ endif
> # Use 'make V=1' to see the full commands
> ifdef V
> ifeq ("$(origin V)", "command line")
> - KBUILD_VERBOSE=$(V)
> + KBUILD_VERBOSE = $(V)
> endif
> endif
> ifndef KBUILD_VERBOSE
> - KBUILD_VERBOSE=0
> + KBUILD_VERBOSE = 0
> endif
>
> ifeq ($(KBUILD_VERBOSE),1)
> - quiet=
> - Q=
> + quiet =
> + Q =
These are not needed.
> ifndef VERBOSE
> - VERBOSE=1
> + VERBOSE = 1
> endif
> else
> - quiet=quiet_
> - Q=@
> + quiet = quiet_
quiet is not used. It is exported though, which is probably a bad idea
anyway.
> + Q = @
> endif
>
> # we want bash as shell
> @@ -205,56 +205,56 @@ SHELL:=$(shell if [ -x "$$BASH" ]; then echo $$BASH; \
> else echo sh; fi; fi)
>
> # kconfig uses CONFIG_SHELL
> -CONFIG_SHELL:=$(SHELL)
> +CONFIG_SHELL := $(SHELL)
>
> export SHELL CONFIG_SHELL quiet Q KBUILD_VERBOSE VERBOSE
CONFIG_SHELL should be passed with the rest of the kconfig environment,
not exported.
>
> ifndef HOSTAR
> -HOSTAR:=ar
> +HOSTAR := ar
No := needed.
> endif
> ifndef HOSTAS
> HOSTAS:=as
Same here.
> endif
> ifndef HOSTCC
> -HOSTCC:=gcc
> -HOSTCC:=$(shell which $(HOSTCC) || type -p $(HOSTCC) || echo gcc)
> +HOSTCC := gcc
> +HOSTCC := $(shell which $(HOSTCC) || type -p $(HOSTCC) || echo gcc)
> endif
> HOSTCC_NOCCACHE:=$(HOSTCC)
> ifndef HOSTCXX
> -HOSTCXX:=g++
> -HOSTCXX:=$(shell which $(HOSTCXX) || type -p $(HOSTCXX) || echo g++)
> +HOSTCXX := g++
> +HOSTCXX := $(shell which $(HOSTCXX) || type -p $(HOSTCXX) || echo g++)
> endif
> -HOSTCXX_NOCCACHE:=$(HOSTCXX)
> +HOSTCXX_NOCCACHE := $(HOSTCXX)
Here := is needed!
> ifndef HOSTFC
> -HOSTFC:=gfortran
> +HOSTFC := gfortran
No :=
> endif
> ifndef HOSTCPP
> HOSTCPP:=cpp
Idem.
> endif
> ifndef HOSTLD
> -HOSTLD:=ld
> +HOSTLD := ld
Idem. Etc. etc.
> endif
> ifndef HOSTLN
> -HOSTLN:=ln
> +HOSTLN := ln
> endif
> ifndef HOSTNM
> -HOSTNM:=nm
> +HOSTNM := nm
> endif
> ifndef HOSTOBJCOPY
> -HOSTOBJCOPY:=objcopy
> +HOSTOBJCOPY := objcopy
> endif
> ifndef HOSTRANLIB
> -HOSTRANLIB:=ranlib
> -endif
> -HOSTAR:=$(shell which $(HOSTAR) || type -p $(HOSTAR) || echo ar)
> -HOSTAS:=$(shell which $(HOSTAS) || type -p $(HOSTAS) || echo as)
> -HOSTFC:=$(shell which $(HOSTLD) || type -p $(HOSTLD) || echo || which g77 || type -p g77 || echo gfortran)
> -HOSTCPP:=$(shell which $(HOSTCPP) || type -p $(HOSTCPP) || echo cpp)
> -HOSTLD:=$(shell which $(HOSTLD) || type -p $(HOSTLD) || echo ld)
> -HOSTLN:=$(shell which $(HOSTLN) || type -p $(HOSTLN) || echo ln)
> -HOSTNM:=$(shell which $(HOSTNM) || type -p $(HOSTNM) || echo nm)
> -HOSTOBJCOPY:=$(shell which $(HOSTOBJCOPY) || type -p $(HOSTOBJCOPY) || echo objcopy)
> -HOSTRANLIB:=$(shell which $(HOSTRANLIB) || type -p $(HOSTRANLIB) || echo ranlib)
> +HOSTRANLIB := ranlib
> +endif
> +HOSTAR := $(shell which $(HOSTAR) || type -p $(HOSTAR) || echo ar)
> +HOSTAS := $(shell which $(HOSTAS) || type -p $(HOSTAS) || echo as)
> +HOSTFC := $(shell which $(HOSTLD) || type -p $(HOSTLD) || echo || which g77 || type -p g77 || echo gfortran)
> +HOSTCPP := $(shell which $(HOSTCPP) || type -p $(HOSTCPP) || echo cpp)
> +HOSTLD := $(shell which $(HOSTLD) || type -p $(HOSTLD) || echo ld)
> +HOSTLN := $(shell which $(HOSTLN) || type -p $(HOSTLN) || echo ln)
> +HOSTNM := $(shell which $(HOSTNM) || type -p $(HOSTNM) || echo nm)
> +HOSTOBJCOPY := $(shell which $(HOSTOBJCOPY) || type -p $(HOSTOBJCOPY) || echo objcopy)
> +HOSTRANLIB := $(shell which $(HOSTRANLIB) || type -p $(HOSTRANLIB) || echo ranlib)
>
> export HOSTAR HOSTAS HOSTCC HOSTCXX HOSTFC HOSTLD
> export HOSTCC_NOCCACHE HOSTCXX_NOCCACHE
> @@ -291,7 +291,7 @@ unexport CONFIG_SITE
> unexport QMAKESPEC
> unexport TERMINFO
>
> -GNU_HOST_NAME:=$(shell support/gnuconfig/config.guess)
> +GNU_HOST_NAME := $(shell support/gnuconfig/config.guess)
>
> ################################################################################
> #
> @@ -300,15 +300,15 @@ GNU_HOST_NAME:=$(shell support/gnuconfig/config.guess)
> #
> ################################################################################
>
> -TARGETS:= toolchain
> +TARGETS := toolchain
Since TARGETS is only updated with +=, no := is needed here either.
>
> # silent mode requested?
> -QUIET:=$(if $(findstring s,$(MAKEFLAGS)),-q)
> +QUIET := $(if $(findstring s,$(MAKEFLAGS)),-q)
>
> # Strip off the annoying quoting
This comment is redundant.
> -ARCH:=$(call qstrip,$(BR2_ARCH))
> +ARCH := $(call qstrip,$(BR2_ARCH))
No :=
>
> -KERNEL_ARCH:=$(shell echo "$(ARCH)" | sed -e "s/-.*//" \
> +KERNEL_ARCH := $(shell echo "$(ARCH)" | sed -e "s/-.*//" \
> -e s/i.86/i386/ -e s/sun4u/sparc64/ \
> -e s/arcle/arc/ \
> -e s/arceb/arc/ \
> @@ -320,28 +320,28 @@ KERNEL_ARCH:=$(shell echo "$(ARCH)" | sed -e "s/-.*//" \
> -e s/ppc.*/powerpc/ -e s/mips.*/mips/ \
> -e s/sh.*/sh/)
>
> -ZCAT:=$(call qstrip,$(BR2_ZCAT))
> -BZCAT:=$(call qstrip,$(BR2_BZCAT))
> -XZCAT:=$(call qstrip,$(BR2_XZCAT))
> -TAR_OPTIONS=$(call qstrip,$(BR2_TAR_OPTIONS)) -xf
> +ZCAT := $(call qstrip,$(BR2_ZCAT))
> +BZCAT := $(call qstrip,$(BR2_BZCAT))
> +XZCAT := $(call qstrip,$(BR2_XZCAT))
Dito.
> +TAR_OPTIONS = $(call qstrip,$(BR2_TAR_OPTIONS)) -xf
>
> # packages compiled for the host go here
> -HOST_DIR:=$(call qstrip,$(BR2_HOST_DIR))
> +HOST_DIR := $(call qstrip,$(BR2_HOST_DIR))
Dito
>
> # locales to generate
> -GENERATE_LOCALE=$(call qstrip,$(BR2_GENERATE_LOCALE))
> +GENERATE_LOCALE = $(call qstrip,$(BR2_GENERATE_LOCALE))
>
> -TARGET_SKELETON=$(TOPDIR)/system/skeleton
> +TARGET_SKELETON = $(TOPDIR)/system/skeleton
>
> # Location of a file giving a big fat warning that output/target
> # should not be used as the root filesystem.
> -TARGET_DIR_WARNING_FILE=$(TARGET_DIR)/THIS_IS_NOT_YOUR_ROOT_FILESYSTEM
> +TARGET_DIR_WARNING_FILE = $(TARGET_DIR)/THIS_IS_NOT_YOUR_ROOT_FILESYSTEM
>
> ifeq ($(BR2_CCACHE),y)
> -CCACHE:=$(HOST_DIR)/usr/bin/ccache
> +CCACHE := $(HOST_DIR)/usr/bin/ccache
> BR_CACHE_DIR = $(call qstrip,$(BR2_CCACHE_DIR))
> export BR_CACHE_DIR
> -HOSTCC := $(CCACHE) $(HOSTCC)
> +HOSTCC := $(CCACHE) $(HOSTCC)
> HOSTCXX := $(CCACHE) $(HOSTCXX)
> endif
>
> @@ -394,23 +394,23 @@ include system/system.mk
> include $(BR2_EXTERNAL)/external.mk
>
> ifeq ($(BR2_ENABLE_LOCALE_PURGE),y)
> -TARGETS+=target-purgelocales
> +TARGETS += target-purgelocales
> endif
>
> ifeq ($(BR2_TOOLCHAIN_USES_GLIBC),y)
> ifneq ($(GENERATE_LOCALE),)
> -TARGETS+=target-generatelocales
> +TARGETS += target-generatelocales
> endif
> endif
>
> ifeq ($(BR2_ECLIPSE_REGISTER),y)
> -TARGETS+=toolchain-eclipse-register
> +TARGETS += toolchain-eclipse-register
> endif
>
> include fs/common.mk
>
> -TARGETS_SOURCE:=$(patsubst %,%-source,$(TARGETS))
> -TARGETS_DIRCLEAN:=$(patsubst %,%-dirclean,$(TARGETS))
> +TARGETS_SOURCE := $(patsubst %,%-source,$(TARGETS))
> +TARGETS_DIRCLEAN := $(patsubst %,%-dirclean,$(TARGETS))
No need for :=
>
> # host-* dependencies have to be handled specially, as those aren't
> # visible in Kconfig and hence not added to a variable like TARGETS.
> @@ -430,7 +430,7 @@ HOST_DEPS = $(sort $(foreach dep,\
> $($(dep))))
> HOST_SOURCE += $(addsuffix -source,$(sort $(TARGETS_HOST_DEPS) $(HOST_DEPS)))
>
> -TARGETS_LEGAL_INFO:=$(patsubst %,%-legal-info,\
> +TARGETS_LEGAL_INFO := $(patsubst %,%-legal-info,\
> $(TARGETS) $(TARGETS_HOST_DEPS) $(HOST_DEPS))))
Dito.
>
> dirs: $(BUILD_DIR) $(STAGING_DIR) $(TARGET_DIR) \
> @@ -483,7 +483,7 @@ $(STAGING_DIR):
> @ln -snf $(STAGING_DIR) $(BASE_DIR)/staging
>
> ifeq ($(BR2_ROOTFS_SKELETON_CUSTOM),y)
> -TARGET_SKELETON=$(BR2_ROOTFS_SKELETON_CUSTOM_PATH)
> +TARGET_SKELETON = $(BR2_ROOTFS_SKELETON_CUSTOM_PATH)
Missing qstrip.
Regards,
Arnout
> endif
>
> RSYNC_VCS_EXCLUSIONS = \
> @@ -577,8 +577,8 @@ endif
> $(USER_HOOKS_EXTRA_ENV) $(s) $(TARGET_DIR) $(call qstrip,$(BR2_ROOTFS_POST_SCRIPT_ARGS))$(sep))
>
> ifeq ($(BR2_ENABLE_LOCALE_PURGE),y)
> -LOCALE_WHITELIST=$(BUILD_DIR)/locales.nopurge
> -LOCALE_NOPURGE=$(call qstrip,$(BR2_ENABLE_LOCALE_WHITELIST))
> +LOCALE_WHITELIST = $(BUILD_DIR)/locales.nopurge
> +LOCALE_NOPURGE = $(call qstrip,$(BR2_ENABLE_LOCALE_WHITELIST))
>
> target-purgelocales:
> rm -f $(LOCALE_WHITELIST)
> @@ -682,7 +682,7 @@ endif # ifeq ($(BR2_HAVE_DOT_CONFIG),y)
> # configuration
> # ---------------------------------------------------------------------------
>
> -HOSTCFLAGS=$(CFLAGS_FOR_BUILD)
> +HOSTCFLAGS = $(CFLAGS_FOR_BUILD)
> export HOSTCFLAGS
>
> $(BUILD_DIR)/buildroot-config/%onf:
> @@ -911,7 +911,7 @@ endif
> @echo 'See docs/README, or generate the Buildroot manual for further details'
> @echo
>
> -release: OUT=buildroot-$(BR2_VERSION)
> +release: OUT = buildroot-$(BR2_VERSION)
>
> # Create release tarballs. We need to fiddle a bit to add the generated
> # documentation to the git output
>
--
Arnout Vandecappelle arnout at mind be
Senior Embedded Software Architect +32-16-286500
Essensium/Mind http://www.mind.be
G.Geenslaan 9, 3001 Leuven, Belgium BE 872 984 063 RPR Leuven
LinkedIn profile: http://www.linkedin.com/in/arnoutvandecappelle
GPG fingerprint: 7CB5 E4CC 6C2E EFD4 6E3D A754 F963 ECAB 2450 2F1F
^ permalink raw reply [flat|nested] 25+ messages in thread
* [Buildroot] [PATCH 1/6] barebox: fix coding style
2014-03-12 6:45 ` Arnout Vandecappelle
@ 2014-03-13 16:35 ` Fabio Porcedda
2014-03-17 6:20 ` Arnout Vandecappelle
0 siblings, 1 reply; 25+ messages in thread
From: Fabio Porcedda @ 2014-03-13 16:35 UTC (permalink / raw)
To: buildroot
Hi Arnout and Yann,
thanks for reviewing the patch.
On Wed, Mar 12, 2014 at 7:45 AM, Arnout Vandecappelle <arnout@mind.be> wrote:
> On 03/11/14 18:33, Yann E. MORIN wrote:
>> Fabio, All,
>>
>> On 2014-03-11 13:17 +0100, Fabio Porcedda spake thusly:
>>> Break long lines.
>> [--SNIP--]
>>> -BAREBOX_MAKE_FLAGS = ARCH=$(BAREBOX_ARCH) CROSS_COMPILE="$(CCACHE) $(TARGET_CROSS)"
>>> +BAREBOX_MAKE_FLAGS = ARCH=$(BAREBOX_ARCH) CROSS_COMPILE="$(CCACHE) \
>>> + $(TARGET_CROSS)"
>
> Splitting a line between quotes is evil.
It's a matter of code style because it works fine, doesn't it?
>>
>> Although we have no written rule about thus, I'd rather that folded-lines
>> assignments continue after the '=' sign, like:
>>
>> BAREBOX_MAKE_FLAGS = ARCH=$(BAREBOX_ARCH) CROSS_COMPILE="$(CCACHE) \
>> $(TARGET_CROSS)"
>>
>> It makes it easier to see the assignment.
I don't have a strong opinion about this, i'd like also to be
consistent to the style used in buildroot and i was unable to find any
code that follow that rule.
> Or better yet (and this is the unwritten rule that we tend to follow):
>
> BAREBOX_MAKE_FLAGS = \
> ARCH=$(BAREBOX_ARCH) \
> CROSS_COMPILE="$(CCACHE) $(TARGET_CROSS)"
It's nice, i will do like that.
>
>>
>>> ifeq ($(BR2_TARGET_BAREBOX_USE_DEFCONFIG),y)
>>> -BAREBOX_SOURCE_CONFIG = $(@D)/arch/$(BAREBOX_ARCH)/configs/$(call qstrip,$(BR2_TARGET_BAREBOX_BOARD_DEFCONFIG))_defconfig
>>> +BAREBOX_SOURCE_CONFIG = $(@D)/arch/$(BAREBOX_ARCH)/configs/$(call qstrip,\
>>> + $(BR2_TARGET_BAREBOX_BOARD_DEFCONFIG))_defconfig
>
> Splitting a single path is also evil. We do usually keep the long lines
> in such a case.
This time too it's a matter of code style, isn't it?
>
>>
>> Ditto.
>>
>>> else ifeq ($(BR2_TARGET_BAREBOX_USE_CUSTOM_CONFIG),y)
>>> BAREBOX_SOURCE_CONFIG = $(BR2_TARGET_BAREBOX_CUSTOM_CONFIG_FILE)
>>> endif
>>>
>>> define BAREBOX_CONFIGURE_CMDS
>>> - cp $(BAREBOX_SOURCE_CONFIG) $(@D)/arch/$(BAREBOX_ARCH)/configs/buildroot_defconfig
>>> - $(TARGET_MAKE_ENV) $(MAKE) $(BAREBOX_MAKE_FLAGS) -C $(@D) buildroot_defconfig
>>> + cp $(BAREBOX_SOURCE_CONFIG) \
>>> + $(@D)/arch/$(BAREBOX_ARCH)/configs/buildroot_defconfig
>>> + $(TARGET_MAKE_ENV) $(MAKE) $(BAREBOX_MAKE_FLAGS) -C $(@D) \
>>> + buildroot_defconfig
>>> endef
>>>
>>> ifeq ($(BR2_TARGET_BAREBOX_BAREBOXENV),y)
>>> @@ -68,7 +73,8 @@ endef
>>> endif
>>>
>>> ifeq ($(BR2_TARGET_BAREBOX_CUSTOM_ENV),y)
>>> -BAREBOX_ENV_NAME = $(notdir $(call qstrip, $(BR2_TARGET_BAREBOX_CUSTOM_ENV_PATH)))
>>> +BAREBOX_ENV_NAME = $(notdir $(call qstrip,\
>>> + $(BR2_TARGET_BAREBOX_CUSTOM_ENV_PATH)))
>
> This one is probably OK :-)
>
>
> Regards,
> Arnout
>
>>
>> Ditto.
>>
>> But I'd like the maintainer to Ack this before you resend. I have no
>> strong opinion about it, I just find it easier to read...
>>
>> Regards,
>> Yann E. MORIN.
Thanks
--
Fabio Porcedda
^ permalink raw reply [flat|nested] 25+ messages in thread
* [Buildroot] [PATCH 1/6] barebox: fix coding style
2014-03-13 16:35 ` Fabio Porcedda
@ 2014-03-17 6:20 ` Arnout Vandecappelle
0 siblings, 0 replies; 25+ messages in thread
From: Arnout Vandecappelle @ 2014-03-17 6:20 UTC (permalink / raw)
To: buildroot
On 03/13/14 17:35, Fabio Porcedda wrote:
> Hi Arnout and Yann,
> thanks for reviewing the patch.
>
> On Wed, Mar 12, 2014 at 7:45 AM, Arnout Vandecappelle <arnout@mind.be> wrote:
>> On 03/11/14 18:33, Yann E. MORIN wrote:
>>> Fabio, All,
>>>
>>> On 2014-03-11 13:17 +0100, Fabio Porcedda spake thusly:
>>>> Break long lines.
>>> [--SNIP--]
>>>> -BAREBOX_MAKE_FLAGS = ARCH=$(BAREBOX_ARCH) CROSS_COMPILE="$(CCACHE) $(TARGET_CROSS)"
>>>> +BAREBOX_MAKE_FLAGS = ARCH=$(BAREBOX_ARCH) CROSS_COMPILE="$(CCACHE) \
>>>> + $(TARGET_CROSS)"
>>
>> Splitting a line between quotes is evil.
>
> It's a matter of code style because it works fine, doesn't it?
Yes. It's evil in the sense of: it will come out to bite the programmer
later on.
>
>>>
>>> Although we have no written rule about thus, I'd rather that folded-lines
>>> assignments continue after the '=' sign, like:
>>>
>>> BAREBOX_MAKE_FLAGS = ARCH=$(BAREBOX_ARCH) CROSS_COMPILE="$(CCACHE) \
>>> $(TARGET_CROSS)"
>>>
>>> It makes it easier to see the assignment.
>
> I don't have a strong opinion about this, i'd like also to be
> consistent to the style used in buildroot and i was unable to find any
> code that follow that rule.
>
>> Or better yet (and this is the unwritten rule that we tend to follow):
>>
>> BAREBOX_MAKE_FLAGS = \
>> ARCH=$(BAREBOX_ARCH) \
>> CROSS_COMPILE="$(CCACHE) $(TARGET_CROSS)"
>
> It's nice, i will do like that.
>
>>
>>>
>>>> ifeq ($(BR2_TARGET_BAREBOX_USE_DEFCONFIG),y)
>>>> -BAREBOX_SOURCE_CONFIG = $(@D)/arch/$(BAREBOX_ARCH)/configs/$(call qstrip,$(BR2_TARGET_BAREBOX_BOARD_DEFCONFIG))_defconfig
>>>> +BAREBOX_SOURCE_CONFIG = $(@D)/arch/$(BAREBOX_ARCH)/configs/$(call qstrip,\
>>>> + $(BR2_TARGET_BAREBOX_BOARD_DEFCONFIG))_defconfig
>>
>> Splitting a single path is also evil. We do usually keep the long lines
>> in such a case.
>
> This time too it's a matter of code style, isn't it?
Yes, but this time I exaggerated - splitting a path like that is not
really evil, it's just something I would rather not see.
>
>>
>>>
>>> Ditto.
>>>
>>>> else ifeq ($(BR2_TARGET_BAREBOX_USE_CUSTOM_CONFIG),y)
>>>> BAREBOX_SOURCE_CONFIG = $(BR2_TARGET_BAREBOX_CUSTOM_CONFIG_FILE)
>>>> endif
>>>>
>>>> define BAREBOX_CONFIGURE_CMDS
>>>> - cp $(BAREBOX_SOURCE_CONFIG) $(@D)/arch/$(BAREBOX_ARCH)/configs/buildroot_defconfig
>>>> - $(TARGET_MAKE_ENV) $(MAKE) $(BAREBOX_MAKE_FLAGS) -C $(@D) buildroot_defconfig
>>>> + cp $(BAREBOX_SOURCE_CONFIG) \
>>>> + $(@D)/arch/$(BAREBOX_ARCH)/configs/buildroot_defconfig
>>>> + $(TARGET_MAKE_ENV) $(MAKE) $(BAREBOX_MAKE_FLAGS) -C $(@D) \
>>>> + buildroot_defconfig
>>>> endef
>>>>
>>>> ifeq ($(BR2_TARGET_BAREBOX_BAREBOXENV),y)
>>>> @@ -68,7 +73,8 @@ endef
>>>> endif
>>>>
>>>> ifeq ($(BR2_TARGET_BAREBOX_CUSTOM_ENV),y)
>>>> -BAREBOX_ENV_NAME = $(notdir $(call qstrip, $(BR2_TARGET_BAREBOX_CUSTOM_ENV_PATH)))
>>>> +BAREBOX_ENV_NAME = $(notdir $(call qstrip,\
>>>> + $(BR2_TARGET_BAREBOX_CUSTOM_ENV_PATH)))
>>
>> This one is probably OK :-)
>>
>>
>> Regards,
>> Arnout
>>
>>>
>>> Ditto.
>>>
>>> But I'd like the maintainer to Ack this before you resend. I have no
>>> strong opinion about it, I just find it easier to read...
That statement is still true BTW.
Regards,
Arnout
>>>
>>> Regards,
>>> Yann E. MORIN.
>
>
> Thanks
>
--
Arnout Vandecappelle arnout at mind be
Senior Embedded Software Architect +32-16-286500
Essensium/Mind http://www.mind.be
G.Geenslaan 9, 3001 Leuven, Belgium BE 872 984 063 RPR Leuven
LinkedIn profile: http://www.linkedin.com/in/arnoutvandecappelle
GPG fingerprint: 7CB5 E4CC 6C2E EFD4 6E3D A754 F963 ECAB 2450 2F1F
^ permalink raw reply [flat|nested] 25+ messages in thread
* [Buildroot] [PATCH 6/6] Makefile: do not add the toolchain target to the TARGETS variable
2014-03-11 12:17 ` [Buildroot] [PATCH 6/6] Makefile: do not add the toolchain target to the TARGETS variable Fabio Porcedda
@ 2014-03-17 7:42 ` Arnout Vandecappelle
2014-03-19 11:10 ` Fabio Porcedda
0 siblings, 1 reply; 25+ messages in thread
From: Arnout Vandecappelle @ 2014-03-17 7:42 UTC (permalink / raw)
To: buildroot
On 03/11/14 13:17, Fabio Porcedda wrote:
> Do not add the toolchain target to the TARGETS variable because now the
> toolchain target is a dependency added automatically so it is not
> necessary to add it anymore.
I disagree with this one. When you run make, you expect buildroot to
build the toolchain even if no target package is selected. One use case I
can think of: when preparing an internal toolchain for use as an external
toolchain in later builds.
Regards,
Arnout
>
> Signed-off-by: Fabio Porcedda <fabio.porcedda@gmail.com>
> ---
> Makefile | 2 +-
> 1 file changed, 1 insertion(+), 1 deletion(-)
>
> diff --git a/Makefile b/Makefile
> index 0420364..481f779 100644
> --- a/Makefile
> +++ b/Makefile
> @@ -300,7 +300,7 @@ GNU_HOST_NAME := $(shell support/gnuconfig/config.guess)
> #
> ################################################################################
>
> -TARGETS := toolchain
> +TARGETS :=
>
> # silent mode requested?
> QUIET := $(if $(findstring s,$(MAKEFLAGS)),-q)
>
--
Arnout Vandecappelle arnout at mind be
Senior Embedded Software Architect +32-16-286500
Essensium/Mind http://www.mind.be
G.Geenslaan 9, 3001 Leuven, Belgium BE 872 984 063 RPR Leuven
LinkedIn profile: http://www.linkedin.com/in/arnoutvandecappelle
GPG fingerprint: 7CB5 E4CC 6C2E EFD4 6E3D A754 F963 ECAB 2450 2F1F
^ permalink raw reply [flat|nested] 25+ messages in thread
* [Buildroot] [PATCH 6/6] Makefile: do not add the toolchain target to the TARGETS variable
2014-03-17 7:42 ` Arnout Vandecappelle
@ 2014-03-19 11:10 ` Fabio Porcedda
2014-03-19 11:46 ` Arnout Vandecappelle
0 siblings, 1 reply; 25+ messages in thread
From: Fabio Porcedda @ 2014-03-19 11:10 UTC (permalink / raw)
To: buildroot
On Mon, Mar 17, 2014 at 8:42 AM, Arnout Vandecappelle <arnout@mind.be> wrote:
> On 03/11/14 13:17, Fabio Porcedda wrote:
>> Do not add the toolchain target to the TARGETS variable because now the
>> toolchain target is a dependency added automatically so it is not
>> necessary to add it anymore.
>
> I disagree with this one. When you run make, you expect buildroot to
> build the toolchain even if no target package is selected. One use case I
> can think of: when preparing an internal toolchain for use as an external
> toolchain in later builds.
Take in account that the "toolchain" target is always built because is
a dependency of the "busybox" package that is always build and cannot
be disabled and
the "toolchain-buildroot" and "toolchain-external" are always enabled
in the Config.in.
I was thinking that the "toolchain" target is a package that uses tha
package infrastructure, what about using the Config.in:
diff --git a/toolchain/Config.in b/toolchain/Config.in
index 44f3ac6..94a0c7d 100644
--- a/toolchain/Config.in
+++ b/toolchain/Config.in
@@ -1,5 +1,9 @@
menu "Toolchain"
+config BR2_TOOLCHAIN
+ bool
+ default y
+
# Should be selected for glibc or eglibc
config BR2_TOOLCHAIN_USES_GLIBC
bool
diff --git a/Makefile b/Makefile
index 384693a..3df9144 100644
--- a/Makefile
+++ b/Makefile
@@ -299,7 +299,7 @@ GNU_HOST_NAME:=$(shell support/gnuconfig/config.guess)
#
################################################################################
-TARGETS:= toolchain
+TARGETS :=
# silent mode requested?
QUIET:=$(if $(findstring s,$(MAKEFLAGS)),-q)
I think this is more coherent to other always enabled packages like
busybox and toolchain-*.
Best regards
--
Fabio Porcedda
^ permalink raw reply related [flat|nested] 25+ messages in thread
* [Buildroot] [PATCH 6/6] Makefile: do not add the toolchain target to the TARGETS variable
2014-03-19 11:10 ` Fabio Porcedda
@ 2014-03-19 11:46 ` Arnout Vandecappelle
2014-03-19 18:35 ` Yann E. MORIN
2014-03-20 9:38 ` Fabio Porcedda
0 siblings, 2 replies; 25+ messages in thread
From: Arnout Vandecappelle @ 2014-03-19 11:46 UTC (permalink / raw)
To: buildroot
On 19/03/14 12:10, Fabio Porcedda wrote:
> On Mon, Mar 17, 2014 at 8:42 AM, Arnout Vandecappelle <arnout@mind.be> wrote:
>> On 03/11/14 13:17, Fabio Porcedda wrote:
>>> Do not add the toolchain target to the TARGETS variable because now the
>>> toolchain target is a dependency added automatically so it is not
>>> necessary to add it anymore.
>>
>> I disagree with this one. When you run make, you expect buildroot to
>> build the toolchain even if no target package is selected. One use case I
>> can think of: when preparing an internal toolchain for use as an external
>> toolchain in later builds.
>
> Take in account that the "toolchain" target is always built because is
> a dependency of the "busybox" package that is always build and cannot
> be disabled and
> the "toolchain-buildroot" and "toolchain-external" are always enabled
> in the Config.in.
busybox can be disabled (if you set the init system to "none").
toolchain, toolchain-buildroot and toolchain-external are not added to
TARGETS because BR2_PACKAGE_TOOLCHAIN... is not defined.
>
> I was thinking that the "toolchain" target is a package that uses tha
> package infrastructure, what about using the Config.in:
>
> diff --git a/toolchain/Config.in b/toolchain/Config.in
> index 44f3ac6..94a0c7d 100644
> --- a/toolchain/Config.in
> +++ b/toolchain/Config.in
> @@ -1,5 +1,9 @@
> menu "Toolchain"
>
> +config BR2_TOOLCHAIN
> + bool
> + default y
That would indeed be an option (it would have to be
BR2_PACKAGE_TOOLCHAIN, but that's a minor detail). I'm not sure, however,
if this is better than TARGETS := toolchain in the Makefile.
Actually, I am in favour of adding blind options for everything that
uses the package infrastructure. That will allow us to do things like
checking select/DEPENDENCIES consistency, and generally makes things more
consistent.
Regards,
Arnout
> +
> # Should be selected for glibc or eglibc
> config BR2_TOOLCHAIN_USES_GLIBC
> bool
> diff --git a/Makefile b/Makefile
> index 384693a..3df9144 100644
> --- a/Makefile
> +++ b/Makefile
> @@ -299,7 +299,7 @@ GNU_HOST_NAME:=$(shell support/gnuconfig/config.guess)
> #
> ################################################################################
>
> -TARGETS:= toolchain
> +TARGETS :=
>
> # silent mode requested?
> QUIET:=$(if $(findstring s,$(MAKEFLAGS)),-q)
>
>
> I think this is more coherent to other always enabled packages like
> busybox and toolchain-*.
>
> Best regards
>
--
Arnout Vandecappelle arnout at mind be
Senior Embedded Software Architect +32-16-286500
Essensium/Mind http://www.mind.be
G.Geenslaan 9, 3001 Leuven, Belgium BE 872 984 063 RPR Leuven
LinkedIn profile: http://www.linkedin.com/in/arnoutvandecappelle
GPG fingerprint: 7CB5 E4CC 6C2E EFD4 6E3D A754 F963 ECAB 2450 2F1F
^ permalink raw reply [flat|nested] 25+ messages in thread
* [Buildroot] [PATCH 6/6] Makefile: do not add the toolchain target to the TARGETS variable
2014-03-19 11:46 ` Arnout Vandecappelle
@ 2014-03-19 18:35 ` Yann E. MORIN
2014-03-20 10:01 ` Fabio Porcedda
2014-03-20 9:38 ` Fabio Porcedda
1 sibling, 1 reply; 25+ messages in thread
From: Yann E. MORIN @ 2014-03-19 18:35 UTC (permalink / raw)
To: buildroot
Fabio, Arnout, All,
On 2014-03-19 12:46 +0100, Arnout Vandecappelle spake thusly:
> On 19/03/14 12:10, Fabio Porcedda wrote:
[--SNIP--]
> > Take in account that the "toolchain" target is always built because is
> > a dependency of the "busybox" package that is always build and cannot
> > be disabled and
> > the "toolchain-buildroot" and "toolchain-external" are always enabled
> > in the Config.in.
>
> busybox can be disabled (if you set the init system to "none").
Indeed, and I very often uses that when I want to just test a single
package I'm adding.
Regards,
Yann E. MORIN.
--
.-----------------.--------------------.------------------.--------------------.
| Yann E. MORIN | Real-Time Embedded | /"\ ASCII RIBBON | Erics' conspiracy: |
| +33 662 376 056 | Software Designer | \ / CAMPAIGN | ___ |
| +33 223 225 172 `------------.-------: X AGAINST | \e/ There is no |
| http://ymorin.is-a-geek.org/ | _/*\_ | / \ HTML MAIL | v conspiracy. |
'------------------------------^-------^------------------^--------------------'
^ permalink raw reply [flat|nested] 25+ messages in thread
* [Buildroot] [PATCH 6/6] Makefile: do not add the toolchain target to the TARGETS variable
2014-03-19 11:46 ` Arnout Vandecappelle
2014-03-19 18:35 ` Yann E. MORIN
@ 2014-03-20 9:38 ` Fabio Porcedda
2014-03-20 10:13 ` Arnout Vandecappelle
1 sibling, 1 reply; 25+ messages in thread
From: Fabio Porcedda @ 2014-03-20 9:38 UTC (permalink / raw)
To: buildroot
On Wed, Mar 19, 2014 at 12:46 PM, Arnout Vandecappelle <arnout@mind.be> wrote:
> On 19/03/14 12:10, Fabio Porcedda wrote:
>> On Mon, Mar 17, 2014 at 8:42 AM, Arnout Vandecappelle <arnout@mind.be> wrote:
>>> On 03/11/14 13:17, Fabio Porcedda wrote:
>>>> Do not add the toolchain target to the TARGETS variable because now the
>>>> toolchain target is a dependency added automatically so it is not
>>>> necessary to add it anymore.
>>>
>>> I disagree with this one. When you run make, you expect buildroot to
>>> build the toolchain even if no target package is selected. One use case I
>>> can think of: when preparing an internal toolchain for use as an external
>>> toolchain in later builds.
>>
>> Take in account that the "toolchain" target is always built because is
>> a dependency of the "busybox" package that is always build and cannot
>> be disabled and
>> the "toolchain-buildroot" and "toolchain-external" are always enabled
>> in the Config.in.
>
> busybox can be disabled (if you set the init system to "none").
I didn't know that, great!
> toolchain, toolchain-buildroot and toolchain-external are not added to
> TARGETS because BR2_PACKAGE_TOOLCHAIN... is not defined.
They are added to targets, just use this command to check it:
$ make defconfig && make show-targets
toolchain-buildroot toolchain busybox target-generic-securetty
target-generic-hostname target-generic-issue target-root-passwd
target-generic-getty-busybox target-generic-do-remount-rw rootfs-tar
>>
>> I was thinking that the "toolchain" target is a package that uses tha
>> package infrastructure, what about using the Config.in:
>>
>> diff --git a/toolchain/Config.in b/toolchain/Config.in
>> index 44f3ac6..94a0c7d 100644
>> --- a/toolchain/Config.in
>> +++ b/toolchain/Config.in
>> @@ -1,5 +1,9 @@
>> menu "Toolchain"
>>
>> +config BR2_TOOLCHAIN
>> + bool
>> + default y
>
> That would indeed be an option (it would have to be
> BR2_PACKAGE_TOOLCHAIN, but that's a minor detail). I'm not sure, however,
> if this is better than TARGETS := toolchain in the Makefile.
I've not used the PACKAGE prefix because it's not used at all for the
toolchain config options, like the BR2_TOOLCHAIN_BUILDROOT option.
>
> Actually, I am in favour of adding blind options for everything that
> uses the package infrastructure. That will allow us to do things like
> checking select/DEPENDENCIES consistency, and generally makes things more
> consistent.
In next revision of the patch i will send the proposed patch.
Thanks and regards
--
Fabio Porcedda
^ permalink raw reply [flat|nested] 25+ messages in thread
* [Buildroot] [PATCH 6/6] Makefile: do not add the toolchain target to the TARGETS variable
2014-03-19 18:35 ` Yann E. MORIN
@ 2014-03-20 10:01 ` Fabio Porcedda
0 siblings, 0 replies; 25+ messages in thread
From: Fabio Porcedda @ 2014-03-20 10:01 UTC (permalink / raw)
To: buildroot
On Wed, Mar 19, 2014 at 7:35 PM, Yann E. MORIN <yann.morin.1998@free.fr> wrote:
> Fabio, Arnout, All,
>
> On 2014-03-19 12:46 +0100, Arnout Vandecappelle spake thusly:
>> On 19/03/14 12:10, Fabio Porcedda wrote:
> [--SNIP--]
>> > Take in account that the "toolchain" target is always built because is
>> > a dependency of the "busybox" package that is always build and cannot
>> > be disabled and
>> > the "toolchain-buildroot" and "toolchain-external" are always enabled
>> > in the Config.in.
>>
>> busybox can be disabled (if you set the init system to "none").
>
> Indeed, and I very often uses that when I want to just test a single
> package I'm adding.
Good idea, next time i will test a package i will do that.
Thanks
--
Fabio Porcedda
^ permalink raw reply [flat|nested] 25+ messages in thread
* [Buildroot] [PATCH 6/6] Makefile: do not add the toolchain target to the TARGETS variable
2014-03-20 9:38 ` Fabio Porcedda
@ 2014-03-20 10:13 ` Arnout Vandecappelle
0 siblings, 0 replies; 25+ messages in thread
From: Arnout Vandecappelle @ 2014-03-20 10:13 UTC (permalink / raw)
To: buildroot
On 20/03/14 10:38, Fabio Porcedda wrote:
> On Wed, Mar 19, 2014 at 12:46 PM, Arnout Vandecappelle <arnout@mind.be> wrote:
[snip]
>> toolchain, toolchain-buildroot and toolchain-external are not added to
>> TARGETS because BR2_PACKAGE_TOOLCHAIN... is not defined.
>
> They are added to targets, just use this command to check it:
>
> $ make defconfig && make show-targets
>
> toolchain-buildroot toolchain busybox target-generic-securetty
> target-generic-hostname target-generic-issue target-root-passwd
> target-generic-getty-busybox target-generic-do-remount-rw rootfs-tar
>
>>>
>>> I was thinking that the "toolchain" target is a package that uses tha
>>> package infrastructure, what about using the Config.in:
>>>
>>> diff --git a/toolchain/Config.in b/toolchain/Config.in
>>> index 44f3ac6..94a0c7d 100644
>>> --- a/toolchain/Config.in
>>> +++ b/toolchain/Config.in
>>> @@ -1,5 +1,9 @@
>>> menu "Toolchain"
>>>
>>> +config BR2_TOOLCHAIN
>>> + bool
>>> + default y
>>
>> That would indeed be an option (it would have to be
>> BR2_PACKAGE_TOOLCHAIN, but that's a minor detail). I'm not sure, however,
>> if this is better than TARGETS := toolchain in the Makefile.
>
> I've not used the PACKAGE prefix because it's not used at all for the
> toolchain config options, like the BR2_TOOLCHAIN_BUILDROOT option.
Yeah, I forgot about this condition in pkg-generic.mk:
else ifneq ($(filter toolchain/%,$(pkgdir)),)
$(2)_KCONFIG_VAR = BR2_$(2)
>
>>
>> Actually, I am in favour of adding blind options for everything that
>> uses the package infrastructure. That will allow us to do things like
>> checking select/DEPENDENCIES consistency, and generally makes things more
>> consistent.
>
> In next revision of the patch i will send the proposed patch.
Can you mention in the commit log this second advantage?
But first, Peter, (and other buildroot maintainers as well), do you
agree that it would be a good idea to have blind Kconfig symbols for
everything that uses the package infrastructure?
Regards,
Arnout
--
Arnout Vandecappelle arnout at mind be
Senior Embedded Software Architect +32-16-286500
Essensium/Mind http://www.mind.be
G.Geenslaan 9, 3001 Leuven, Belgium BE 872 984 063 RPR Leuven
LinkedIn profile: http://www.linkedin.com/in/arnoutvandecappelle
GPG fingerprint: 7CB5 E4CC 6C2E EFD4 6E3D A754 F963 ECAB 2450 2F1F
^ permalink raw reply [flat|nested] 25+ messages in thread
* [Buildroot] [PATCH 5/6] infra: add to luarocks support for top-level parallel make
2014-03-11 19:42 ` François Perrad
@ 2014-04-01 8:39 ` Fabio Porcedda
0 siblings, 0 replies; 25+ messages in thread
From: Fabio Porcedda @ 2014-04-01 8:39 UTC (permalink / raw)
To: buildroot
On Tue, Mar 11, 2014 at 8:42 PM, Fran?ois Perrad
<francois.perrad@gadz.org> wrote:
> 2014-03-11 13:17 GMT+01:00 Fabio Porcedda <fabio.porcedda@gmail.com>:
>> The host-luarock dependency is not always satisfied for the extract
>> phase because the %-extract target is not anymore in the dependency
>> chain.
>> To be sure that the dependency is satfied add the dependency to the
>
> typo: satisfied
I've corrected the type, thanks.
Regards
--
Fabio Porcedda
^ permalink raw reply [flat|nested] 25+ messages in thread
* [Buildroot] [PATCH 3/6] Makefile: fix coding style
2014-03-12 7:55 ` Arnout Vandecappelle
@ 2014-04-09 9:21 ` Fabio Porcedda
0 siblings, 0 replies; 25+ messages in thread
From: Fabio Porcedda @ 2014-04-09 9:21 UTC (permalink / raw)
To: buildroot
On Wed, Mar 12, 2014 at 8:55 AM, Arnout Vandecappelle <arnout@mind.be> wrote:
> On 03/11/14 13:17, Fabio Porcedda wrote:
>> As stated in the buildroot user manual add just a single space before
>> and after a '=' sign.
>>
>> Signed-off-by: Fabio Porcedda <fabio.porcedda@gmail.com>
>
> Acked-by: Arnout Vandecappelle (Essensium/Mind) <arnout@mind.be>
>
> Reviewing this patch leads to a few more opportunities, though. So these
> are commented below.
>
>> ---
>> Makefile | 188 +++++++++++++++++++++++++++++++--------------------------------
>> 1 file changed, 94 insertions(+), 94 deletions(-)
>>
>> diff --git a/Makefile b/Makefile
>> index 30d56d0..0420364 100644
>> --- a/Makefile
>> +++ b/Makefile
>> @@ -25,10 +25,10 @@
>> #--------------------------------------------------------------
>>
>> # Set and export the version string
>> -export BR2_VERSION:=2014.05-git
>> +export BR2_VERSION := 2014.05-git
>
> No reason for := here.
>
>>
>> # Check for minimal make version (note: this check will break at make 10.x)
>> -MIN_MAKE_VERSION=3.81
>> +MIN_MAKE_VERSION = 3.81
>> ifneq ($(firstword $(sort $(MAKE_VERSION) $(MIN_MAKE_VERSION))),$(MIN_MAKE_VERSION))
>> $(error You have make '$(MAKE_VERSION)' installed. GNU make >= $(MIN_MAKE_VERSION) is required)
>> endif
>> @@ -59,33 +59,33 @@ export HOSTARCH := $(shell uname -m | \
>> # make BR2_JLEVEL= -j$((`getconf _NPROCESSORS_ONLN`+1))
>>
>> # absolute path
>> -TOPDIR:=$(shell pwd)
>> -CONFIG_CONFIG_IN=Config.in
>> -CONFIG=support/kconfig
>> -DATE:=$(shell date +%Y%m%d)
>> +TOPDIR := $(shell pwd)
>> +CONFIG_CONFIG_IN = Config.in
>> +CONFIG = support/kconfig
>
> Actually, this is used in just one place so perhaps it can be removed.
>
>> +DATE := $(shell date +%Y%m%d)
>
> Same here.
>
>>
>> # Compute the full local version string so packages can use it as-is
>> # Need to export it, so it can be got from environment in children (eg. mconf)
>> -export BR2_VERSION_FULL:=$(BR2_VERSION)$(shell $(TOPDIR)/support/scripts/setlocalversion)
>> +export BR2_VERSION_FULL := $(BR2_VERSION)$(shell $(TOPDIR)/support/scripts/setlocalversion)
>>
>> -noconfig_targets:=menuconfig nconfig gconfig xconfig config oldconfig randconfig \
>> +noconfig_targets := menuconfig nconfig gconfig xconfig config oldconfig randconfig \
>> defconfig %_defconfig allyesconfig allnoconfig silentoldconfig release \
>> randpackageconfig allyespackageconfig allnopackageconfig \
>> source-check print-version olddefconfig
>>
>> # Strip quotes and then whitespaces
>> -qstrip=$(strip $(subst ",,$(1)))
>> +qstrip = $(strip $(subst ",,$(1)))
>> #"))
>>
>> # Variables for use in Make constructs
>> -comma:=,
>> -empty:=
>> -space:=$(empty) $(empty)
>> +comma := ,
>> +empty :=
>> +space := $(empty) $(empty)
>>
>> ifneq ("$(origin O)", "command line")
>> -O:=output
>> -CONFIG_DIR:=$(TOPDIR)
>> -NEED_WRAPPER=
>> +O := output
>> +CONFIG_DIR := $(TOPDIR)
>> +NEED_WRAPPER =
>
> No need to define NEED_WRAPPER to empty.
>
>> else
>> # other packages might also support Linux-style out of tree builds
>> # with the O=<dir> syntax (E.G. Busybox does). As make automatically
>> @@ -97,18 +97,18 @@ MAKEOVERRIDES =
>> # of the origin function (command line -> environment).
>> # Unfortunately some packages don't look at origin (E.G. uClibc 0.9.31+)
>> # To really make O go away, we have to override it.
>> -override O:=$(O)
>> -CONFIG_DIR:=$(O)
>> +override O := $(O)
>> +CONFIG_DIR := $(O)
>> # we need to pass O= everywhere we call back into the toplevel makefile
>> EXTRAMAKEARGS = O=$(O)
>> -NEED_WRAPPER=y
>> +NEED_WRAPPER = y
>> endif
>>
>> # bash prints the name of the directory on 'cd <dir>' if CDPATH is
>> # set, so unset it here to not cause problems. Notice that the export
>> # line doesn't affect the environment of $(shell ..) calls, so
>> # explictly throw away any output from 'cd' here.
>> -export CDPATH:=
>> +export CDPATH :=
>> BASE_DIR := $(shell mkdir -p $(O) && cd $(O) >/dev/null && pwd)
>> $(if $(BASE_DIR),, $(error output directory "$(O)" does not exist))
>>
>> @@ -150,27 +150,27 @@ endif
>> # Avoids doing the $(or...) everytime
>> _BR2_GRAPH_OUT := $(or $(BR2_GRAPH_OUT),pdf)
>>
>> -BUILD_DIR:=$(BASE_DIR)/build
>> -STAMP_DIR:=$(BASE_DIR)/stamps
>> -BINARIES_DIR:=$(BASE_DIR)/images
>> -TARGET_DIR:=$(BASE_DIR)/target
>> +BUILD_DIR := $(BASE_DIR)/build
>> +STAMP_DIR := $(BASE_DIR)/stamps
>> +BINARIES_DIR := $(BASE_DIR)/images
>> +TARGET_DIR := $(BASE_DIR)/target
>
> All these don't need :=
>
>> # initial definition so that 'make clean' works for most users, even without
>> # .config. HOST_DIR will be overwritten later when .config is included.
>> -HOST_DIR:=$(BASE_DIR)/host
>> -
>> -LEGAL_INFO_DIR=$(BASE_DIR)/legal-info
>> -REDIST_SOURCES_DIR_TARGET=$(LEGAL_INFO_DIR)/sources
>> -REDIST_SOURCES_DIR_HOST=$(LEGAL_INFO_DIR)/host-sources
>> -LICENSE_FILES_DIR_TARGET=$(LEGAL_INFO_DIR)/licenses
>> -LICENSE_FILES_DIR_HOST=$(LEGAL_INFO_DIR)/host-licenses
>> -LEGAL_MANIFEST_CSV_TARGET=$(LEGAL_INFO_DIR)/manifest.csv
>> -LEGAL_MANIFEST_CSV_HOST=$(LEGAL_INFO_DIR)/host-manifest.csv
>> -LEGAL_LICENSES_TXT_TARGET=$(LEGAL_INFO_DIR)/licenses.txt
>> -LEGAL_LICENSES_TXT_HOST=$(LEGAL_INFO_DIR)/host-licenses.txt
>> -LEGAL_WARNINGS=$(LEGAL_INFO_DIR)/.warnings
>> -LEGAL_REPORT=$(LEGAL_INFO_DIR)/README
>> -
>> -BR2_CONFIG=$(CONFIG_DIR)/.config
>> +HOST_DIR := $(BASE_DIR)/host
>
> Neither does this one.
>
>> +
>> +LEGAL_INFO_DIR = $(BASE_DIR)/legal-info
>> +REDIST_SOURCES_DIR_TARGET = $(LEGAL_INFO_DIR)/sources
>> +REDIST_SOURCES_DIR_HOST = $(LEGAL_INFO_DIR)/host-sources
>> +LICENSE_FILES_DIR_TARGET = $(LEGAL_INFO_DIR)/licenses
>> +LICENSE_FILES_DIR_HOST = $(LEGAL_INFO_DIR)/host-licenses
>> +LEGAL_MANIFEST_CSV_TARGET = $(LEGAL_INFO_DIR)/manifest.csv
>> +LEGAL_MANIFEST_CSV_HOST = $(LEGAL_INFO_DIR)/host-manifest.csv
>> +LEGAL_LICENSES_TXT_TARGET = $(LEGAL_INFO_DIR)/licenses.txt
>> +LEGAL_LICENSES_TXT_HOST = $(LEGAL_INFO_DIR)/host-licenses.txt
>> +LEGAL_WARNINGS = $(LEGAL_INFO_DIR)/.warnings
>> +LEGAL_REPORT = $(LEGAL_INFO_DIR)/README
>> +
>> +BR2_CONFIG = $(CONFIG_DIR)/.config
>>
>> # Pull in the user's configuration file
>> ifeq ($(filter $(noconfig_targets),$(MAKECMDGOALS)),)
>> @@ -181,22 +181,22 @@ endif
>> # Use 'make V=1' to see the full commands
>> ifdef V
>> ifeq ("$(origin V)", "command line")
>> - KBUILD_VERBOSE=$(V)
>> + KBUILD_VERBOSE = $(V)
>> endif
>> endif
>> ifndef KBUILD_VERBOSE
>> - KBUILD_VERBOSE=0
>> + KBUILD_VERBOSE = 0
>> endif
>>
>> ifeq ($(KBUILD_VERBOSE),1)
>> - quiet=
>> - Q=
>> + quiet =
>> + Q =
>
> These are not needed.
>
>> ifndef VERBOSE
>> - VERBOSE=1
>> + VERBOSE = 1
>> endif
>> else
>> - quiet=quiet_
>> - Q=@
>> + quiet = quiet_
>
> quiet is not used. It is exported though, which is probably a bad idea
> anyway.
>
>> + Q = @
>> endif
>>
>> # we want bash as shell
>> @@ -205,56 +205,56 @@ SHELL:=$(shell if [ -x "$$BASH" ]; then echo $$BASH; \
>> else echo sh; fi; fi)
>>
>> # kconfig uses CONFIG_SHELL
>> -CONFIG_SHELL:=$(SHELL)
>> +CONFIG_SHELL := $(SHELL)
>>
>> export SHELL CONFIG_SHELL quiet Q KBUILD_VERBOSE VERBOSE
>
> CONFIG_SHELL should be passed with the rest of the kconfig environment,
> not exported.
>
>>
>> ifndef HOSTAR
>> -HOSTAR:=ar
>> +HOSTAR := ar
>
> No := needed.
>
>> endif
>> ifndef HOSTAS
>> HOSTAS:=as
>
> Same here.
>
>> endif
>> ifndef HOSTCC
>> -HOSTCC:=gcc
>> -HOSTCC:=$(shell which $(HOSTCC) || type -p $(HOSTCC) || echo gcc)
>> +HOSTCC := gcc
>> +HOSTCC := $(shell which $(HOSTCC) || type -p $(HOSTCC) || echo gcc)
>> endif
>> HOSTCC_NOCCACHE:=$(HOSTCC)
>> ifndef HOSTCXX
>> -HOSTCXX:=g++
>> -HOSTCXX:=$(shell which $(HOSTCXX) || type -p $(HOSTCXX) || echo g++)
>> +HOSTCXX := g++
>> +HOSTCXX := $(shell which $(HOSTCXX) || type -p $(HOSTCXX) || echo g++)
>> endif
>> -HOSTCXX_NOCCACHE:=$(HOSTCXX)
>> +HOSTCXX_NOCCACHE := $(HOSTCXX)
>
> Here := is needed!
>
>> ifndef HOSTFC
>> -HOSTFC:=gfortran
>> +HOSTFC := gfortran
>
> No :=
>
>> endif
>> ifndef HOSTCPP
>> HOSTCPP:=cpp
>
> Idem.
>
>> endif
>> ifndef HOSTLD
>> -HOSTLD:=ld
>> +HOSTLD := ld
>
> Idem. Etc. etc.
>
>> endif
>> ifndef HOSTLN
>> -HOSTLN:=ln
>> +HOSTLN := ln
>> endif
>> ifndef HOSTNM
>> -HOSTNM:=nm
>> +HOSTNM := nm
>> endif
>> ifndef HOSTOBJCOPY
>> -HOSTOBJCOPY:=objcopy
>> +HOSTOBJCOPY := objcopy
>> endif
>> ifndef HOSTRANLIB
>> -HOSTRANLIB:=ranlib
>> -endif
>> -HOSTAR:=$(shell which $(HOSTAR) || type -p $(HOSTAR) || echo ar)
>> -HOSTAS:=$(shell which $(HOSTAS) || type -p $(HOSTAS) || echo as)
>> -HOSTFC:=$(shell which $(HOSTLD) || type -p $(HOSTLD) || echo || which g77 || type -p g77 || echo gfortran)
>> -HOSTCPP:=$(shell which $(HOSTCPP) || type -p $(HOSTCPP) || echo cpp)
>> -HOSTLD:=$(shell which $(HOSTLD) || type -p $(HOSTLD) || echo ld)
>> -HOSTLN:=$(shell which $(HOSTLN) || type -p $(HOSTLN) || echo ln)
>> -HOSTNM:=$(shell which $(HOSTNM) || type -p $(HOSTNM) || echo nm)
>> -HOSTOBJCOPY:=$(shell which $(HOSTOBJCOPY) || type -p $(HOSTOBJCOPY) || echo objcopy)
>> -HOSTRANLIB:=$(shell which $(HOSTRANLIB) || type -p $(HOSTRANLIB) || echo ranlib)
>> +HOSTRANLIB := ranlib
>> +endif
>> +HOSTAR := $(shell which $(HOSTAR) || type -p $(HOSTAR) || echo ar)
>> +HOSTAS := $(shell which $(HOSTAS) || type -p $(HOSTAS) || echo as)
>> +HOSTFC := $(shell which $(HOSTLD) || type -p $(HOSTLD) || echo || which g77 || type -p g77 || echo gfortran)
>> +HOSTCPP := $(shell which $(HOSTCPP) || type -p $(HOSTCPP) || echo cpp)
>> +HOSTLD := $(shell which $(HOSTLD) || type -p $(HOSTLD) || echo ld)
>> +HOSTLN := $(shell which $(HOSTLN) || type -p $(HOSTLN) || echo ln)
>> +HOSTNM := $(shell which $(HOSTNM) || type -p $(HOSTNM) || echo nm)
>> +HOSTOBJCOPY := $(shell which $(HOSTOBJCOPY) || type -p $(HOSTOBJCOPY) || echo objcopy)
>> +HOSTRANLIB := $(shell which $(HOSTRANLIB) || type -p $(HOSTRANLIB) || echo ranlib)
>>
>> export HOSTAR HOSTAS HOSTCC HOSTCXX HOSTFC HOSTLD
>> export HOSTCC_NOCCACHE HOSTCXX_NOCCACHE
>> @@ -291,7 +291,7 @@ unexport CONFIG_SITE
>> unexport QMAKESPEC
>> unexport TERMINFO
>>
>> -GNU_HOST_NAME:=$(shell support/gnuconfig/config.guess)
>> +GNU_HOST_NAME := $(shell support/gnuconfig/config.guess)
>>
>> ################################################################################
>> #
>> @@ -300,15 +300,15 @@ GNU_HOST_NAME:=$(shell support/gnuconfig/config.guess)
>> #
>> ################################################################################
>>
>> -TARGETS:= toolchain
>> +TARGETS := toolchain
>
> Since TARGETS is only updated with +=, no := is needed here either.
>
>>
>> # silent mode requested?
>> -QUIET:=$(if $(findstring s,$(MAKEFLAGS)),-q)
>> +QUIET := $(if $(findstring s,$(MAKEFLAGS)),-q)
>>
>> # Strip off the annoying quoting
>
> This comment is redundant.
>
>> -ARCH:=$(call qstrip,$(BR2_ARCH))
>> +ARCH := $(call qstrip,$(BR2_ARCH))
>
> No :=
>
>>
>> -KERNEL_ARCH:=$(shell echo "$(ARCH)" | sed -e "s/-.*//" \
>> +KERNEL_ARCH := $(shell echo "$(ARCH)" | sed -e "s/-.*//" \
>> -e s/i.86/i386/ -e s/sun4u/sparc64/ \
>> -e s/arcle/arc/ \
>> -e s/arceb/arc/ \
>> @@ -320,28 +320,28 @@ KERNEL_ARCH:=$(shell echo "$(ARCH)" | sed -e "s/-.*//" \
>> -e s/ppc.*/powerpc/ -e s/mips.*/mips/ \
>> -e s/sh.*/sh/)
>>
>> -ZCAT:=$(call qstrip,$(BR2_ZCAT))
>> -BZCAT:=$(call qstrip,$(BR2_BZCAT))
>> -XZCAT:=$(call qstrip,$(BR2_XZCAT))
>> -TAR_OPTIONS=$(call qstrip,$(BR2_TAR_OPTIONS)) -xf
>> +ZCAT := $(call qstrip,$(BR2_ZCAT))
>> +BZCAT := $(call qstrip,$(BR2_BZCAT))
>> +XZCAT := $(call qstrip,$(BR2_XZCAT))
>
> Dito.
>
>> +TAR_OPTIONS = $(call qstrip,$(BR2_TAR_OPTIONS)) -xf
>>
>> # packages compiled for the host go here
>> -HOST_DIR:=$(call qstrip,$(BR2_HOST_DIR))
>> +HOST_DIR := $(call qstrip,$(BR2_HOST_DIR))
>
> Dito
>
>>
>> # locales to generate
>> -GENERATE_LOCALE=$(call qstrip,$(BR2_GENERATE_LOCALE))
>> +GENERATE_LOCALE = $(call qstrip,$(BR2_GENERATE_LOCALE))
>>
>> -TARGET_SKELETON=$(TOPDIR)/system/skeleton
>> +TARGET_SKELETON = $(TOPDIR)/system/skeleton
>>
>> # Location of a file giving a big fat warning that output/target
>> # should not be used as the root filesystem.
>> -TARGET_DIR_WARNING_FILE=$(TARGET_DIR)/THIS_IS_NOT_YOUR_ROOT_FILESYSTEM
>> +TARGET_DIR_WARNING_FILE = $(TARGET_DIR)/THIS_IS_NOT_YOUR_ROOT_FILESYSTEM
>>
>> ifeq ($(BR2_CCACHE),y)
>> -CCACHE:=$(HOST_DIR)/usr/bin/ccache
>> +CCACHE := $(HOST_DIR)/usr/bin/ccache
>> BR_CACHE_DIR = $(call qstrip,$(BR2_CCACHE_DIR))
>> export BR_CACHE_DIR
>> -HOSTCC := $(CCACHE) $(HOSTCC)
>> +HOSTCC := $(CCACHE) $(HOSTCC)
>> HOSTCXX := $(CCACHE) $(HOSTCXX)
>> endif
>>
>> @@ -394,23 +394,23 @@ include system/system.mk
>> include $(BR2_EXTERNAL)/external.mk
>>
>> ifeq ($(BR2_ENABLE_LOCALE_PURGE),y)
>> -TARGETS+=target-purgelocales
>> +TARGETS += target-purgelocales
>> endif
>>
>> ifeq ($(BR2_TOOLCHAIN_USES_GLIBC),y)
>> ifneq ($(GENERATE_LOCALE),)
>> -TARGETS+=target-generatelocales
>> +TARGETS += target-generatelocales
>> endif
>> endif
>>
>> ifeq ($(BR2_ECLIPSE_REGISTER),y)
>> -TARGETS+=toolchain-eclipse-register
>> +TARGETS += toolchain-eclipse-register
>> endif
>>
>> include fs/common.mk
>>
>> -TARGETS_SOURCE:=$(patsubst %,%-source,$(TARGETS))
>> -TARGETS_DIRCLEAN:=$(patsubst %,%-dirclean,$(TARGETS))
>> +TARGETS_SOURCE := $(patsubst %,%-source,$(TARGETS))
>> +TARGETS_DIRCLEAN := $(patsubst %,%-dirclean,$(TARGETS))
>
> No need for :=
>
>>
>> # host-* dependencies have to be handled specially, as those aren't
>> # visible in Kconfig and hence not added to a variable like TARGETS.
>> @@ -430,7 +430,7 @@ HOST_DEPS = $(sort $(foreach dep,\
>> $($(dep))))
>> HOST_SOURCE += $(addsuffix -source,$(sort $(TARGETS_HOST_DEPS) $(HOST_DEPS)))
>>
>> -TARGETS_LEGAL_INFO:=$(patsubst %,%-legal-info,\
>> +TARGETS_LEGAL_INFO := $(patsubst %,%-legal-info,\
>> $(TARGETS) $(TARGETS_HOST_DEPS) $(HOST_DEPS))))
>
> Dito.
>
>>
>> dirs: $(BUILD_DIR) $(STAGING_DIR) $(TARGET_DIR) \
>> @@ -483,7 +483,7 @@ $(STAGING_DIR):
>> @ln -snf $(STAGING_DIR) $(BASE_DIR)/staging
>>
>> ifeq ($(BR2_ROOTFS_SKELETON_CUSTOM),y)
>> -TARGET_SKELETON=$(BR2_ROOTFS_SKELETON_CUSTOM_PATH)
>> +TARGET_SKELETON = $(BR2_ROOTFS_SKELETON_CUSTOM_PATH)
>
> Missing qstrip.
>
>
>
> Regards,
> Arnout
>
>
>> endif
>>
>> RSYNC_VCS_EXCLUSIONS = \
>> @@ -577,8 +577,8 @@ endif
>> $(USER_HOOKS_EXTRA_ENV) $(s) $(TARGET_DIR) $(call qstrip,$(BR2_ROOTFS_POST_SCRIPT_ARGS))$(sep))
>>
>> ifeq ($(BR2_ENABLE_LOCALE_PURGE),y)
>> -LOCALE_WHITELIST=$(BUILD_DIR)/locales.nopurge
>> -LOCALE_NOPURGE=$(call qstrip,$(BR2_ENABLE_LOCALE_WHITELIST))
>> +LOCALE_WHITELIST = $(BUILD_DIR)/locales.nopurge
>> +LOCALE_NOPURGE = $(call qstrip,$(BR2_ENABLE_LOCALE_WHITELIST))
>>
>> target-purgelocales:
>> rm -f $(LOCALE_WHITELIST)
>> @@ -682,7 +682,7 @@ endif # ifeq ($(BR2_HAVE_DOT_CONFIG),y)
>> # configuration
>> # ---------------------------------------------------------------------------
>>
>> -HOSTCFLAGS=$(CFLAGS_FOR_BUILD)
>> +HOSTCFLAGS = $(CFLAGS_FOR_BUILD)
>> export HOSTCFLAGS
>>
>> $(BUILD_DIR)/buildroot-config/%onf:
>> @@ -911,7 +911,7 @@ endif
>> @echo 'See docs/README, or generate the Buildroot manual for further details'
>> @echo
>>
>> -release: OUT=buildroot-$(BR2_VERSION)
>> +release: OUT = buildroot-$(BR2_VERSION)
>>
>> # Create release tarballs. We need to fiddle a bit to add the generated
>> # documentation to the git output
>>
Hi Arnout,
thanks for reviewing.
I will work on your suggestions after this patch is merged because if
possible i want to avoid the pain to rebase endless other patches over
this one.
Hi Peter,
any chance for this patch to being merged?
it's already acked and it's one month old.
The rebased patch is:
http://patchwork.ozlabs.org/patch/337436/
Thanks and best regards
--
Fabio Porcedda
^ permalink raw reply [flat|nested] 25+ messages in thread
end of thread, other threads:[~2014-04-09 9:21 UTC | newest]
Thread overview: 25+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2014-03-11 12:17 [Buildroot] [PATCH 0/6] Miscellauneus patches Fabio Porcedda
2014-03-11 12:17 ` [Buildroot] [PATCH 1/6] barebox: fix coding style Fabio Porcedda
2014-03-11 17:33 ` Yann E. MORIN
2014-03-12 6:45 ` Arnout Vandecappelle
2014-03-13 16:35 ` Fabio Porcedda
2014-03-17 6:20 ` Arnout Vandecappelle
2014-03-11 12:17 ` [Buildroot] [PATCH 2/6] Remove "dirs" dependencies Fabio Porcedda
2014-03-12 7:09 ` Arnout Vandecappelle
2014-03-11 12:17 ` [Buildroot] [PATCH 3/6] Makefile: fix coding style Fabio Porcedda
2014-03-12 7:55 ` Arnout Vandecappelle
2014-04-09 9:21 ` Fabio Porcedda
2014-03-11 12:17 ` [Buildroot] [PATCH 4/6] luajit: needs for 32bit archictectures a 32bit host gcc Fabio Porcedda
2014-03-11 19:16 ` François Perrad
2014-03-11 12:17 ` [Buildroot] [PATCH 5/6] infra: add to luarocks support for top-level parallel make Fabio Porcedda
2014-03-11 19:42 ` François Perrad
2014-04-01 8:39 ` Fabio Porcedda
2014-03-11 12:17 ` [Buildroot] [PATCH 6/6] Makefile: do not add the toolchain target to the TARGETS variable Fabio Porcedda
2014-03-17 7:42 ` Arnout Vandecappelle
2014-03-19 11:10 ` Fabio Porcedda
2014-03-19 11:46 ` Arnout Vandecappelle
2014-03-19 18:35 ` Yann E. MORIN
2014-03-20 10:01 ` Fabio Porcedda
2014-03-20 9:38 ` Fabio Porcedda
2014-03-20 10:13 ` Arnout Vandecappelle
2014-03-11 17:38 ` [Buildroot] [PATCH 0/6] Miscellauneus patches Fabio Porcedda
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.