9eca4b9f84
Add patch from upstream to fix build issue with some toolchains.
For some toolchains used in Buildroot (x86_64 and mips64) partial linking using
'ld' directly doesn't work well, as the 'ld' default emulation may not
necessarily be the correct one. Note, that the default emulation depends upon
how the linker was configured at build time. The leads to different kind of
build errors, like:
* /usr/bin/i686-pc-linux-gnu-ld: Relocatable linking with relocations from
format elf64-x86-64 (core/swupdate.o) to format elf32-i386 (core/built-in.o)
is not supported.
* /usr/bin/mips-linux-gnu-ld: handlers/raw_handler.o: endianness incompatible
with that of the selected emulation
* /usr/bin/mips64el-linux-ld: core/swupdate.o: ABI is incompatible with that
of the selected
Linking with gcc will pass all the appropriate linker flags to the linker.
'-nostdlib' has to be added to ldflags-y to link properly without pulling in GCC
libs during partial linking. Note, for Kbuild ldflags-y is prefered over the
deprecated EXTRA_LDFLAGS.
Build config for x86_64:
BR2_x86_64=y
BR2_x86_corei7=y
BR2_TOOLCHAIN_EXTERNAL=y
BR2_TOOLCHAIN_EXTERNAL_CODESOURCERY_X86_201209=y
Runtime test:
$ output/build/swupdate-2015.07/swupdate -v
Swupdate v2015.07.0
Licensed under GPLv2. See source distribution for detailed copyright notices.
Registered handlers:
rawfile
raw
Note, that a previous patch [1] had to be reverted [2] because ld does not take
gcc's constructor functions into account and so none of the handlers have been
registered at runtime.
Fixes:
http://autobuild.buildroot.net/results/de9/de920298075d32f3de83a0cfb7417846eb833425/
http://autobuild.buildroot.net/results/975/975915aa33005806e78260bae385cd4b3e359ca8/
http://autobuild.buildroot.net/results/c54/c54e7a2ea353d95d41a1e966de0dffa7b6ac432e/
http://autobuild.buildroot.net/results/019/0198596ebfed05ab86552b628da2274d55bf42ae/
and many more.
[1] https://patchwork.ozlabs.org/patch/532542/
[2] https://patchwork.ozlabs.org/patch/535408/
Cc: Bjørn Forsman <bjorn.forsman@gmail.com>
Cc: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
Cc: Yann E. MORIN <yann.morin.1998@free.fr>
Signed-off-by: Jörg Krause <joerg.krause@embedded.rocks>
Reviewed-by: "Yann E. MORIN" <yann.morin.1998@free.fr>
Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
118 lines
3.2 KiB
Makefile
118 lines
3.2 KiB
Makefile
################################################################################
|
|
#
|
|
# swupdate
|
|
#
|
|
################################################################################
|
|
|
|
SWUPDATE_VERSION = 2015.07
|
|
SWUPDATE_SITE = $(call github,sbabic,swupdate,$(SWUPDATE_VERSION))
|
|
SWUPDATE_LICENSE = GPLv2+, MIT, Public Domain
|
|
SWUPDATE_LICENSE_FILES = COPYING
|
|
SWUPDATE_PATCH = \
|
|
https://github.com/sbabic/swupdate/commit/5a5ef5909f5da5b2070d58ffaee924bb8e6a51e1.patch \
|
|
https://github.com/sbabic/swupdate/commit/f26577423eb65728fcd10f78f9978dd07d51dcb9.patch
|
|
|
|
# swupdate bundles its own version of mongoose (version 3.8) and
|
|
# lsqlite3 (version 0.8)
|
|
|
|
ifeq ($(BR2_PACKAGE_JSON_C),y)
|
|
SWUPDATE_DEPENDENCIES += json-c
|
|
SWUPDATE_MAKE_ENV += HAVE_JSON_C=y
|
|
else
|
|
SWUPDATE_MAKE_ENV += HAVE_JSON_C=n
|
|
endif
|
|
|
|
ifeq ($(BR2_PACKAGE_LIBCONFIG),y)
|
|
SWUPDATE_DEPENDENCIES += libconfig
|
|
SWUPDATE_MAKE_ENV += HAVE_LIBCONFIG=y
|
|
else
|
|
SWUPDATE_MAKE_ENV += HAVE_LIBCONFIG=n
|
|
endif
|
|
|
|
ifeq ($(BR2_PACKAGE_LIBCURL),y)
|
|
SWUPDATE_DEPENDENCIES += libcurl
|
|
SWUPDATE_MAKE_ENV += HAVE_LIBCURL=y
|
|
else
|
|
SWUPDATE_MAKE_ENV += HAVE_LIBCURL=n
|
|
endif
|
|
|
|
ifeq ($(BR2_PACKAGE_LUA_5_2),y)
|
|
SWUPDATE_DEPENDENCIES += lua
|
|
SWUPDATE_MAKE_ENV += HAVE_LUA=y
|
|
else
|
|
SWUPDATE_MAKE_ENV += HAVE_LUA=n
|
|
endif
|
|
|
|
ifeq ($(BR2_PACKAGE_MTD),y)
|
|
SWUPDATE_DEPENDENCIES += mtd
|
|
SWUPDATE_MAKE_ENV += HAVE_LIBMTD=y
|
|
SWUPDATE_MAKE_ENV += HAVE_LIBUBI=y
|
|
else
|
|
SWUPDATE_MAKE_ENV += HAVE_LIBMTD=n
|
|
SWUPDATE_MAKE_ENV += HAVE_LIBUBI=n
|
|
endif
|
|
|
|
ifeq ($(BR2_PACKAGE_OPENSSL),y)
|
|
SWUPDATE_DEPENDENCIES += openssl
|
|
SWUPDATE_MAKE_ENV += HAVE_LIBSSL=y
|
|
SWUPDATE_MAKE_ENV += HAVE_LIBCRYPTO=y
|
|
else
|
|
SWUPDATE_MAKE_ENV += HAVE_LIBSSL=n
|
|
SWUPDATE_MAKE_ENV += HAVE_LIBCRYPTO=n
|
|
endif
|
|
|
|
ifeq ($(BR2_PACKAGE_ZLIB),y)
|
|
SWUPDATE_DEPENDENCIES += zlib
|
|
SWUPDATE_MAKE_ENV += HAVE_ZLIB=y
|
|
else
|
|
SWUPDATE_MAKE_ENV += HAVE_ZLIB=n
|
|
endif
|
|
|
|
SWUPDATE_BUILD_CONFIG = $(@D)/.config
|
|
|
|
SWUPDATE_KCONFIG_FILE = $(call qstrip,$(BR2_PACKAGE_SWUPDATE_CONFIG))
|
|
SWUPDATE_KCONFIG_EDITORS = menuconfig xconfig gconfig nconfig
|
|
|
|
ifeq ($(BR2_PREFER_STATIC_LIB),y)
|
|
define SWUPDATE_PREFER_STATIC
|
|
$(call KCONFIG_ENABLE_OPT,CONFIG_STATIC,$(SWUPDATE_BUILD_CONFIG))
|
|
endef
|
|
endif
|
|
|
|
define SWUPDATE_SET_BUILD_OPTIONS
|
|
$(call KCONFIG_SET_OPT,CONFIG_CROSS_COMPILE,"$(TARGET_CROSS)", \
|
|
$(SWUPDATE_BUILD_CONFIG))
|
|
$(call KCONFIG_SET_OPT,CONFIG_SYSROOT,"$(STAGING_DIR)", \
|
|
$(SWUPDATE_BUILD_CONFIG))
|
|
$(call KCONFIG_SET_OPT,CONFIG_EXTRA_CFLAGS,"$(TARGET_CFLAGS)", \
|
|
$(SWUPDATE_BUILD_CONFIG))
|
|
$(call KCONFIG_SET_OPT,CONFIG_EXTRA_LDFLAGS,"$(TARGET_LDFLAGS)", \
|
|
$(SWUPDATE_BUILD_CONFIG))
|
|
endef
|
|
|
|
define SWUPDATE_KCONFIG_FIXUP_CMDS
|
|
$(SWUPDATE_PREFER_STATIC)
|
|
$(SWUPDATE_SET_BUILD_OPTIONS)
|
|
endef
|
|
|
|
define SWUPDATE_BUILD_CMDS
|
|
$(TARGET_MAKE_ENV) $(SWUPDATE_MAKE_ENV) $(MAKE) -C $(@D)
|
|
endef
|
|
|
|
define SWUPDATE_INSTALL_TARGET_CMDS
|
|
$(INSTALL) -D -m 0755 $(@D)/swupdate $(TARGET_DIR)/usr/bin/swupdate
|
|
$(if $(BR2_PACKAGE_SWUPDATE_INSTALL_WEBSITE), \
|
|
mkdir -p $(TARGET_DIR)/var/www/swupdate; \
|
|
cp -dpf $(@D)/www/* $(TARGET_DIR)/var/www/swupdate)
|
|
endef
|
|
|
|
# Checks to give errors that the user can understand
|
|
# Must be before we call to kconfig-package
|
|
ifeq ($(BR2_PACKAGE_SWUPDATE)$(BR_BUILDING),yy)
|
|
ifeq ($(call qstrip,$(BR2_PACKAGE_SWUPDATE_CONFIG)),)
|
|
$(error No Swupdate configuration file specified, check your BR2_PACKAGE_SWUPDATE_CONFIG setting)
|
|
endif
|
|
endif
|
|
|
|
$(eval $(kconfig-package))
|