jeans/motioneyeos
jeans/motioneyeos
1
0
Fork 0
mirror of https://github.com/motioneye-project/motioneyeos.git synced 2025-07-28 21:56:31 +00:00
Code Issues Packages Projects Releases Wiki Activity

barebox: introduce barebox-package function

Browse Source 
No functional changes: Introduces a barebox-package function towards
re-use by a 2nd config build.

Because the function is meant to be called from within a $(eval), all
instances of '$' has to be escaped. I.e. rename '$' -> '$$'.

Signed-off-by: Pieter Smith <pieter@boesman.nl>
Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
This commit is contained in:
Pieter Smith 2016-04-24 11:18:44 +02:00 committed by Thomas Petazzoni
parent cb8b5a7321
commit 4a6c4c8897
1 changed files with 72 additions and 53 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

125
boot/barebox/barebox.mk
View File

@ -4,23 +4,31 @@
# #
################################################################################ ################################################################################
BAREBOX_VERSION = $(call qstrip,$(BR2_TARGET_BAREBOX_VERSION)) ################################################################################
# inner-barebox-package -- generates the KConfig logic and make targets needed
# to support a barebox package. All barebox packages are built from the same
# source (origin, version and patches).
################################################################################
ifeq ($(BAREBOX_VERSION),custom) define inner-barebox-package
BAREBOX_VERSION = $$(call qstrip,$$(BR2_TARGET_BAREBOX_VERSION))
ifeq ($$(BAREBOX_VERSION),custom)
# Handle custom Barebox tarballs as specified by the configuration # Handle custom Barebox tarballs as specified by the configuration
BAREBOX_TARBALL = $(call qstrip,$(BR2_TARGET_BAREBOX_CUSTOM_TARBALL_LOCATION)) BAREBOX_TARBALL = $$(call qstrip,$$(BR2_TARGET_BAREBOX_CUSTOM_TARBALL_LOCATION))
BAREBOX_SITE = $(patsubst %/,%,$(dir $(BAREBOX_TARBALL))) BAREBOX_SITE = $$(patsubst %/,%,$$(dir $$(BAREBOX_TARBALL)))
BAREBOX_SOURCE = $(notdir $(BAREBOX_TARBALL)) BAREBOX_SOURCE = $$(notdir $$(BAREBOX_TARBALL))
BR_NO_CHECK_HASH_FOR += $(BAREBOX_SOURCE) BR_NO_CHECK_HASH_FOR += $$(BAREBOX_SOURCE)
else ifeq ($(BR2_TARGET_BAREBOX_CUSTOM_GIT),y) 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 BAREBOX_SITE_METHOD = git
else else
# Handle stable official Barebox versions # Handle stable official Barebox versions
BAREBOX_SOURCE = barebox-$(BAREBOX_VERSION).tar.bz2 BAREBOX_SOURCE = barebox-$$(BAREBOX_VERSION).tar.bz2
BAREBOX_SITE = http://www.barebox.org/download BAREBOX_SITE = http://www.barebox.org/download
ifeq ($(BR2_TARGET_BAREBOX_CUSTOM_VERSION),y) ifeq ($$(BR2_TARGET_BAREBOX_CUSTOM_VERSION),y)
BR_NO_CHECK_HASH_FOR += $(BAREBOX_SOURCE) BR_NO_CHECK_HASH_FOR += $$(BAREBOX_SOURCE)
endif endif
endif endif
@ -28,97 +36,108 @@ BAREBOX_DEPENDENCIES = host-lzop
BAREBOX_LICENSE = GPLv2 with exceptions BAREBOX_LICENSE = GPLv2 with exceptions
BAREBOX_LICENSE_FILES = COPYING BAREBOX_LICENSE_FILES = COPYING
ifneq ($(call qstrip,$(BR2_TARGET_BAREBOX_CUSTOM_PATCH_DIR)),) ifneq ($$(call qstrip,$$(BR2_TARGET_BAREBOX_CUSTOM_PATCH_DIR)),)
define BAREBOX_APPLY_CUSTOM_PATCHES define BAREBOX_APPLY_CUSTOM_PATCHES
$(APPLY_PATCHES) $(@D) \ $$(APPLY_PATCHES) $$(@D) \
$(BR2_TARGET_BAREBOX_CUSTOM_PATCH_DIR) \*.patch $$(BR2_TARGET_BAREBOX_CUSTOM_PATCH_DIR) \*.patch
endef endef
BAREBOX_POST_PATCH_HOOKS += BAREBOX_APPLY_CUSTOM_PATCHES BAREBOX_POST_PATCH_HOOKS += BAREBOX_APPLY_CUSTOM_PATCHES
endif endif
BAREBOX_INSTALL_IMAGES = YES BAREBOX_INSTALL_IMAGES = YES
ifneq ($(BR2_TARGET_BAREBOX_BAREBOXENV),y) ifneq ($$(BR2_TARGET_BAREBOX_BAREBOXENV),y)
BAREBOX_INSTALL_TARGET = NO BAREBOX_INSTALL_TARGET = NO
endif endif
ifeq ($(KERNEL_ARCH),i386) ifeq ($$(KERNEL_ARCH),i386)
BAREBOX_ARCH = x86 BAREBOX_ARCH = x86
else ifeq ($(KERNEL_ARCH),x86_64) else ifeq ($$(KERNEL_ARCH),x86_64)
BAREBOX_ARCH = x86 BAREBOX_ARCH = x86
else ifeq ($(KERNEL_ARCH),powerpc) else ifeq ($$(KERNEL_ARCH),powerpc)
BAREBOX_ARCH = ppc BAREBOX_ARCH = ppc
else else
BAREBOX_ARCH = $(KERNEL_ARCH) BAREBOX_ARCH = $$(KERNEL_ARCH)
endif endif
BAREBOX_MAKE_FLAGS = ARCH=$(BAREBOX_ARCH) CROSS_COMPILE="$(TARGET_CROSS)" BAREBOX_MAKE_FLAGS = ARCH=$$(BAREBOX_ARCH) CROSS_COMPILE="$$(TARGET_CROSS)"
BAREBOX_MAKE_ENV = $(TARGET_MAKE_ENV) BAREBOX_MAKE_ENV = $$(TARGET_MAKE_ENV)
ifeq ($(BR2_TARGET_BAREBOX_USE_DEFCONFIG),y) ifeq ($$(BR2_TARGET_BAREBOX_USE_DEFCONFIG),y)
BAREBOX_KCONFIG_DEFCONFIG = $(call qstrip,$(BR2_TARGET_BAREBOX_BOARD_DEFCONFIG))_defconfig BAREBOX_KCONFIG_DEFCONFIG = $$(call qstrip,$$(BR2_TARGET_BAREBOX_BOARD_DEFCONFIG))_defconfig
else ifeq ($(BR2_TARGET_BAREBOX_USE_CUSTOM_CONFIG),y) else ifeq ($$(BR2_TARGET_BAREBOX_USE_CUSTOM_CONFIG),y)
BAREBOX_KCONFIG_FILE = $(call qstrip,$(BR2_TARGET_BAREBOX_CUSTOM_CONFIG_FILE)) BAREBOX_KCONFIG_FILE = $$(call qstrip,$$(BR2_TARGET_BAREBOX_CUSTOM_CONFIG_FILE))
endif endif
BAREBOX_KCONFIG_FRAGMENT_FILES = $(call qstrip,$(BR2_TARGET_BAREBOX_CONFIG_FRAGMENT_FILES)) BAREBOX_KCONFIG_FRAGMENT_FILES = $$(call qstrip,$$(BR2_TARGET_BAREBOX_CONFIG_FRAGMENT_FILES))
BAREBOX_KCONFIG_EDITORS = menuconfig xconfig gconfig nconfig BAREBOX_KCONFIG_EDITORS = menuconfig xconfig gconfig nconfig
BAREBOX_KCONFIG_OPTS = $(BAREBOX_MAKE_FLAGS) BAREBOX_KCONFIG_OPTS = $$(BAREBOX_MAKE_FLAGS)
ifeq ($(BR2_TARGET_BAREBOX_BAREBOXENV),y) ifeq ($$(BR2_TARGET_BAREBOX_BAREBOXENV),y)
define BAREBOX_BUILD_BAREBOXENV_CMDS define BAREBOX_BUILD_BAREBOXENV_CMDS
$(TARGET_CC) $(TARGET_CFLAGS) $(TARGET_LDFLAGS) -o $(@D)/bareboxenv \ $$(TARGET_CC) $$(TARGET_CFLAGS) $$(TARGET_LDFLAGS) -o $$(@D)/bareboxenv \
$(@D)/scripts/bareboxenv.c $$(@D)/scripts/bareboxenv.c
endef endef
endif endif
ifeq ($(BR2_TARGET_BAREBOX_CUSTOM_ENV),y) ifeq ($$(BR2_TARGET_BAREBOX_CUSTOM_ENV),y)
BAREBOX_ENV_NAME = $(notdir $(call qstrip,\ BAREBOX_ENV_NAME = $$(notdir $$(call qstrip,\
$(BR2_TARGET_BAREBOX_CUSTOM_ENV_PATH))) $$(BR2_TARGET_BAREBOX_CUSTOM_ENV_PATH)))
define BAREBOX_BUILD_CUSTOM_ENV define BAREBOX_BUILD_CUSTOM_ENV
$(@D)/scripts/bareboxenv -s \ $$(@D)/scripts/bareboxenv -s \
$(call qstrip, $(BR2_TARGET_BAREBOX_CUSTOM_ENV_PATH)) \ $$(call qstrip, $$(BR2_TARGET_BAREBOX_CUSTOM_ENV_PATH)) \
$(@D)/$(BAREBOX_ENV_NAME) $$(@D)/$$(BAREBOX_ENV_NAME)
endef endef
define BAREBOX_INSTALL_CUSTOM_ENV define BAREBOX_INSTALL_CUSTOM_ENV
cp $(@D)/$(BAREBOX_ENV_NAME) $(BINARIES_DIR) cp $$(@D)/$$(BAREBOX_ENV_NAME) $$(BINARIES_DIR)
endef endef
endif endif
define BAREBOX_BUILD_CMDS define BAREBOX_BUILD_CMDS
$(BAREBOX_BUILD_BAREBOXENV_CMDS) $$(BAREBOX_BUILD_BAREBOXENV_CMDS)
$(TARGET_MAKE_ENV) $(MAKE) $(BAREBOX_MAKE_FLAGS) -C $(@D) $$(TARGET_MAKE_ENV) $$(MAKE) $$(BAREBOX_MAKE_FLAGS) -C $$(@D)
$(BAREBOX_BUILD_CUSTOM_ENV) $$(BAREBOX_BUILD_CUSTOM_ENV)
endef endef
BAREBOX_IMAGE_FILE = $(call qstrip,$(BR2_TARGET_BAREBOX_IMAGE_FILE)) BAREBOX_IMAGE_FILE = $$(call qstrip,$$(BR2_TARGET_BAREBOX_IMAGE_FILE))
define BAREBOX_INSTALL_IMAGES_CMDS define BAREBOX_INSTALL_IMAGES_CMDS
if test -n "$(BAREBOX_IMAGE_FILE)"; then \ if test -n "$$(BAREBOX_IMAGE_FILE)"; then \
cp -L $(@D)/$(BAREBOX_IMAGE_FILE) $(BINARIES_DIR) ; \ cp -L $$(@D)/$$(BAREBOX_IMAGE_FILE) $$(BINARIES_DIR) ; \
elif test -h $(@D)/barebox-flash-image ; then \ elif test -h $$(@D)/barebox-flash-image ; then \
cp -L $(@D)/barebox-flash-image $(BINARIES_DIR)/barebox.bin ; \ cp -L $$(@D)/barebox-flash-image $$(BINARIES_DIR)/barebox.bin ; \
else \ else \
cp $(@D)/barebox.bin $(BINARIES_DIR);\ cp $$(@D)/barebox.bin $$(BINARIES_DIR);\
fi fi
$(BAREBOX_INSTALL_CUSTOM_ENV) $$(BAREBOX_INSTALL_CUSTOM_ENV)
endef endef
ifeq ($(BR2_TARGET_BAREBOX_BAREBOXENV),y) ifeq ($$(BR2_TARGET_BAREBOX_BAREBOXENV),y)
define BAREBOX_INSTALL_TARGET_CMDS define BAREBOX_INSTALL_TARGET_CMDS
cp $(@D)/bareboxenv $(TARGET_DIR)/usr/bin cp $$(@D)/bareboxenv $$(TARGET_DIR)/usr/bin
endef endef
endif endif
# Checks to give errors that the user can understand # Checks to give errors that the user can understand
# Must be before we call to kconfig-package # Must be before we call to kconfig-package
ifeq ($(BR2_TARGET_BAREBOX)$(BR_BUILDING),yy) ifeq ($$(BR2_TARGET_BAREBOX)$$(BR_BUILDING),yy)
# We must use the user-supplied kconfig value, because # We must use the user-supplied kconfig value, because
# BAREBOX_KCONFIG_DEFCONFIG will at least contain the # BAREBOX_KCONFIG_DEFCONFIG will at least contain the
# trailing _defconfig # trailing _defconfig
ifeq ($(or $(BAREBOX_KCONFIG_FILE),$(call qstrip,$(BR2_TARGET_BAREBOX_BOARD_DEFCONFIG))),) ifeq ($$(or $$(BAREBOX_KCONFIG_FILE),$$(call qstrip,$$(BR2_TARGET_BAREBOX_BOARD_DEFCONFIG))),)
$(error No Barebox config. Check your BR2_TARGET_BAREBOX_BOARD_DEFCONFIG or BR2_TARGET_BAREBOX_CUSTOM_CONFIG_FILE settings) $$(error No Barebox config. Check your BR2_TARGET_BAREBOX_BOARD_DEFCONFIG or BR2_TARGET_BAREBOX_CUSTOM_CONFIG_FILE settings)
endif endif
endif endif
$(eval $(kconfig-package)) $$(eval $$(kconfig-package))
endef
################################################################################
# barebox-package -- the target generator macro for barebox packages
################################################################################
barebox-package=$(call inner-barebox-package)
# instantiate this barebox package
$(eval $(barebox-package))