jeans/motioneyeos
jeans/motioneyeos
1
0
Fork 0
mirror of https://github.com/motioneye-project/motioneyeos.git synced 2025-07-27 13:16:35 +00:00
Code Issues Packages Projects Releases Wiki Activity

barebox: extract package name argument

Browse Source 
No functional changes: Extracts an argument to the inner-barebox-package
function to automatically determine the uppercase package name. This is needed
to support a 2nd config build. This results in the following renaming:
  'BAREBOX' -> '$(1)'

All barebox packages are meant to be built from the same sources, so related
KConfig variables (origin, version and patch directory) are not extracted.

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:45 +02:00 committed by Thomas Petazzoni
parent 4a6c4c8897
commit 66bdd08a82
1 changed files with 62 additions and 59 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

121
boot/barebox/barebox.mk
View File

@ -7,125 +7,128 @@
################################################################################ ################################################################################
# inner-barebox-package -- generates the KConfig logic and make targets needed # inner-barebox-package -- generates the KConfig logic and make targets needed
# to support a barebox package. All barebox packages are built from the same # to support a barebox package. All barebox packages are built from the same
# source (origin, version and patches). # source (origin, version and patches). The remainder of the package
# configuration is unique to each barebox package.
#
# argument 1 is the uppercase package name (used for variable name-space)
################################################################################ ################################################################################
define inner-barebox-package define inner-barebox-package
BAREBOX_VERSION = $$(call qstrip,$$(BR2_TARGET_BAREBOX_VERSION)) $(1)_VERSION = $$(call qstrip,$$(BR2_TARGET_BAREBOX_VERSION))
ifeq ($$(BAREBOX_VERSION),custom) ifeq ($$($(1)_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)) $(1)_TARBALL = $$(call qstrip,$$(BR2_TARGET_BAREBOX_CUSTOM_TARBALL_LOCATION))
BAREBOX_SITE = $$(patsubst %/,%,$$(dir $$(BAREBOX_TARBALL))) $(1)_SITE = $$(patsubst %/,%,$$(dir $$($(1)_TARBALL)))
BAREBOX_SOURCE = $$(notdir $$(BAREBOX_TARBALL)) $(1)_SOURCE = $$(notdir $$($(1)_TARBALL))
BR_NO_CHECK_HASH_FOR += $$(BAREBOX_SOURCE) BR_NO_CHECK_HASH_FOR += $$($(1)_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)) $(1)_SITE = $$(call qstrip,$$(BR2_TARGET_BAREBOX_CUSTOM_GIT_REPO_URL))
BAREBOX_SITE_METHOD = git $(1)_SITE_METHOD = git
else else
# Handle stable official Barebox versions # Handle stable official Barebox versions
BAREBOX_SOURCE = barebox-$$(BAREBOX_VERSION).tar.bz2 $(1)_SOURCE = barebox-$$($(1)_VERSION).tar.bz2
BAREBOX_SITE = http://www.barebox.org/download $(1)_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 += $$($(1)_SOURCE)
endif endif
endif endif
BAREBOX_DEPENDENCIES = host-lzop $(1)_DEPENDENCIES = host-lzop
BAREBOX_LICENSE = GPLv2 with exceptions $(1)_LICENSE = GPLv2 with exceptions
BAREBOX_LICENSE_FILES = COPYING $(1)_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 $(1)_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 $(1)_POST_PATCH_HOOKS += $(1)_APPLY_CUSTOM_PATCHES
endif endif
BAREBOX_INSTALL_IMAGES = YES $(1)_INSTALL_IMAGES = YES
ifneq ($$(BR2_TARGET_BAREBOX_BAREBOXENV),y) ifneq ($$(BR2_TARGET_$(1)_BAREBOXENV),y)
BAREBOX_INSTALL_TARGET = NO $(1)_INSTALL_TARGET = NO
endif endif
ifeq ($$(KERNEL_ARCH),i386) ifeq ($$(KERNEL_ARCH),i386)
BAREBOX_ARCH = x86 $(1)_ARCH = x86
else ifeq ($$(KERNEL_ARCH),x86_64) else ifeq ($$(KERNEL_ARCH),x86_64)
BAREBOX_ARCH = x86 $(1)_ARCH = x86
else ifeq ($$(KERNEL_ARCH),powerpc) else ifeq ($$(KERNEL_ARCH),powerpc)
BAREBOX_ARCH = ppc $(1)_ARCH = ppc
else else
BAREBOX_ARCH = $$(KERNEL_ARCH) $(1)_ARCH = $$(KERNEL_ARCH)
endif endif
BAREBOX_MAKE_FLAGS = ARCH=$$(BAREBOX_ARCH) CROSS_COMPILE="$$(TARGET_CROSS)" $(1)_MAKE_FLAGS = ARCH=$$($(1)_ARCH) CROSS_COMPILE="$$(TARGET_CROSS)"
BAREBOX_MAKE_ENV = $$(TARGET_MAKE_ENV) $(1)_MAKE_ENV = $$(TARGET_MAKE_ENV)
ifeq ($$(BR2_TARGET_BAREBOX_USE_DEFCONFIG),y) ifeq ($$(BR2_TARGET_$(1)_USE_DEFCONFIG),y)
BAREBOX_KCONFIG_DEFCONFIG = $$(call qstrip,$$(BR2_TARGET_BAREBOX_BOARD_DEFCONFIG))_defconfig $(1)_KCONFIG_DEFCONFIG = $$(call qstrip,$$(BR2_TARGET_$(1)_BOARD_DEFCONFIG))_defconfig
else ifeq ($$(BR2_TARGET_BAREBOX_USE_CUSTOM_CONFIG),y) else ifeq ($$(BR2_TARGET_$(1)_USE_CUSTOM_CONFIG),y)
BAREBOX_KCONFIG_FILE = $$(call qstrip,$$(BR2_TARGET_BAREBOX_CUSTOM_CONFIG_FILE)) $(1)_KCONFIG_FILE = $$(call qstrip,$$(BR2_TARGET_$(1)_CUSTOM_CONFIG_FILE))
endif endif
BAREBOX_KCONFIG_FRAGMENT_FILES = $$(call qstrip,$$(BR2_TARGET_BAREBOX_CONFIG_FRAGMENT_FILES)) $(1)_KCONFIG_FRAGMENT_FILES = $$(call qstrip,$$(BR2_TARGET_$(1)_CONFIG_FRAGMENT_FILES))
BAREBOX_KCONFIG_EDITORS = menuconfig xconfig gconfig nconfig $(1)_KCONFIG_EDITORS = menuconfig xconfig gconfig nconfig
BAREBOX_KCONFIG_OPTS = $$(BAREBOX_MAKE_FLAGS) $(1)_KCONFIG_OPTS = $$($(1)_MAKE_FLAGS)
ifeq ($$(BR2_TARGET_BAREBOX_BAREBOXENV),y) ifeq ($$(BR2_TARGET_$(1)_BAREBOXENV),y)
define BAREBOX_BUILD_BAREBOXENV_CMDS define $(1)_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_$(1)_CUSTOM_ENV),y)
BAREBOX_ENV_NAME = $$(notdir $$(call qstrip,\ $(1)_ENV_NAME = $$(notdir $$(call qstrip,\
$$(BR2_TARGET_BAREBOX_CUSTOM_ENV_PATH))) $$(BR2_TARGET_$(1)_CUSTOM_ENV_PATH)))
define BAREBOX_BUILD_CUSTOM_ENV define $(1)_BUILD_CUSTOM_ENV
$$(@D)/scripts/bareboxenv -s \ $$(@D)/scripts/bareboxenv -s \
$$(call qstrip, $$(BR2_TARGET_BAREBOX_CUSTOM_ENV_PATH)) \ $$(call qstrip, $$(BR2_TARGET_$(1)_CUSTOM_ENV_PATH)) \
$$(@D)/$$(BAREBOX_ENV_NAME) $$(@D)/$$($(1)_ENV_NAME)
endef endef
define BAREBOX_INSTALL_CUSTOM_ENV define $(1)_INSTALL_CUSTOM_ENV
cp $$(@D)/$$(BAREBOX_ENV_NAME) $$(BINARIES_DIR) cp $$(@D)/$$($(1)_ENV_NAME) $$(BINARIES_DIR)
endef endef
endif endif
define BAREBOX_BUILD_CMDS define $(1)_BUILD_CMDS
$$(BAREBOX_BUILD_BAREBOXENV_CMDS) $$($(1)_BUILD_BAREBOXENV_CMDS)
$$(TARGET_MAKE_ENV) $$(MAKE) $$(BAREBOX_MAKE_FLAGS) -C $$(@D) $$(TARGET_MAKE_ENV) $$(MAKE) $$($(1)_MAKE_FLAGS) -C $$(@D)
$$(BAREBOX_BUILD_CUSTOM_ENV) $$($(1)_BUILD_CUSTOM_ENV)
endef endef
BAREBOX_IMAGE_FILE = $$(call qstrip,$$(BR2_TARGET_BAREBOX_IMAGE_FILE)) $(1)_IMAGE_FILE = $$(call qstrip,$$(BR2_TARGET_$(1)_IMAGE_FILE))
define BAREBOX_INSTALL_IMAGES_CMDS define $(1)_INSTALL_IMAGES_CMDS
if test -n "$$(BAREBOX_IMAGE_FILE)"; then \ if test -n "$$($(1)_IMAGE_FILE)"; then \
cp -L $$(@D)/$$(BAREBOX_IMAGE_FILE) $$(BINARIES_DIR) ; \ cp -L $$(@D)/$$($(1)_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) $$($(1)_INSTALL_CUSTOM_ENV)
endef endef
ifeq ($$(BR2_TARGET_BAREBOX_BAREBOXENV),y) ifeq ($$(BR2_TARGET_$(1)_BAREBOXENV),y)
define BAREBOX_INSTALL_TARGET_CMDS define $(1)_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_$(1))$$(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 # $(1)_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 $$($(1)_KCONFIG_FILE),$$(call qstrip,$$(BR2_TARGET_$(1)_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_$(1)_BOARD_DEFCONFIG or BR2_TARGET_$(1)_CUSTOM_CONFIG_FILE settings)
endif endif
endif endif
@ -137,7 +140,7 @@ endef
# barebox-package -- the target generator macro for barebox packages # barebox-package -- the target generator macro for barebox packages
################################################################################ ################################################################################
barebox-package=$(call inner-barebox-package) barebox-package=$(call inner-barebox-package,$(call UPPERCASE,$(pkgname)))
# instantiate this barebox package # instantiate this barebox package
$(eval $(barebox-package)) $(eval $(barebox-package))