From patchwork Mon Oct 19 20:45:26 2015 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: =?utf-8?q?J=C3=B6rg_Krause?= X-Patchwork-Id: 532542 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from whitealder.osuosl.org (smtp1.osuosl.org [140.211.166.138]) by ozlabs.org (Postfix) with ESMTP id AEF72140281 for ; Tue, 20 Oct 2015 07:45:56 +1100 (AEDT) Authentication-Results: ozlabs.org; dkim=fail reason="key not found in DNS" (0-bit key; unprotected) header.d=embedded.rocks header.i=@embedded.rocks header.b=isazj++P; dkim-atps=neutral Received: from localhost (localhost [127.0.0.1]) by whitealder.osuosl.org (Postfix) with ESMTP id EAAC58A154; Mon, 19 Oct 2015 20:45:55 +0000 (UTC) X-Virus-Scanned: amavisd-new at osuosl.org Received: from whitealder.osuosl.org ([127.0.0.1]) by localhost (.osuosl.org [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id yNJlA19OJ1vn; Mon, 19 Oct 2015 20:45:53 +0000 (UTC) Received: from ash.osuosl.org (ash.osuosl.org [140.211.166.34]) by whitealder.osuosl.org (Postfix) with ESMTP id 208F58872C; Mon, 19 Oct 2015 20:45:53 +0000 (UTC) X-Original-To: buildroot@lists.busybox.net Delivered-To: buildroot@osuosl.org Received: from hemlock.osuosl.org (smtp2.osuosl.org [140.211.166.133]) by ash.osuosl.org (Postfix) with ESMTP id 242AF1C44B8 for ; Mon, 19 Oct 2015 20:45:52 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by hemlock.osuosl.org (Postfix) with ESMTP id 1CB3387A52 for ; Mon, 19 Oct 2015 20:45:52 +0000 (UTC) X-Virus-Scanned: amavisd-new at osuosl.org Received: from hemlock.osuosl.org ([127.0.0.1]) by localhost (.osuosl.org [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id 4KR90RGK48cn for ; Mon, 19 Oct 2015 20:45:50 +0000 (UTC) X-Greylist: from auto-whitelisted by SQLgrey-1.7.6 Received: from mout01.posteo.de (mout01.posteo.de [185.67.36.65]) by hemlock.osuosl.org (Postfix) with ESMTPS id 9F50A8778D for ; Mon, 19 Oct 2015 20:45:50 +0000 (UTC) Received: from dovecot03.posteo.de (dovecot03.posteo.de [172.16.0.13]) by mout01.posteo.de (Postfix) with ESMTPS id 7F93920A6E for ; Mon, 19 Oct 2015 22:45:48 +0200 (CEST) Received: from mail.posteo.de (localhost [127.0.0.1]) by dovecot03.posteo.de (Postfix) with ESMTPSA id 3nfqqJ2BWcz5vN9; Mon, 19 Oct 2015 22:45:48 +0200 (CEST) Received: from localhost (localhost [127.0.0.1]) by mail.embedded.rocks (Postfix) with ESMTP id D80C6EE0C59; Mon, 19 Oct 2015 22:45:47 +0200 (CEST) Authentication-Results: mail.embedded.rocks (amavisd-new); dkim=pass reason="pass (just generated, assumed good)" header.d=embedded.rocks DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=embedded.rocks; h=content-transfer-encoding:content-type:content-type :mime-version:references:in-reply-to:x-mailer:message-id:date :date:subject:subject:from:from:received:received; s=default; t= 1445287535; x=1445892336; bh=QDMaDSdf7CtKwYBsLnvFGDg9qTJSPX+lArQ gnOtAGDA=; b=isazj++PQMb5uYuNxDT7NNEo6h4xa60gOumccswMrCO2+58Dv88 NE+d7WTlUieGgxuoKGHPYMCNZTiNuimGAoesgCpd92KtUvzr4G4rEtNoqN9xRoC6 3rk3y3VNiU32TQPmu4d4ynM6tgStmOAzVPCzgyKBYAfWtwy+wbzx9uhB3Vlr7MFK HEy9SH2QhVycjSKyWn0idj86eXx6aIIHLmwN5FZq05xQUCwBwjxAaNwralnkoAva PjOpL5AueUwjsAMztjqK4sKuu5x+35DxSNQRcDgsSGBdSdqhPwscMDgBbjyhDs0f FFIUVW0C9No3UHCn7Qwz5HUYLytWpjZ8Hdg== X-Virus-Scanned: Debian amavisd-new at mail.embedded.rocks Received: from mail.embedded.rocks ([127.0.0.1]) by localhost (mail.embedded.rocks [127.0.0.1]) (amavisd-new, port 10025) with ESMTP id kDFA7o78k4uz; Mon, 19 Oct 2015 22:45:35 +0200 (CEST) Received: from nzxt.fritz.box (x2f77d40.dyn.telefonica.de [2.247.125.64]) (Authenticated sender: joerg.krause@embedded.rocks) by mail.embedded.rocks (Postfix) with ESMTPSA; Mon, 19 Oct 2015 22:45:35 +0200 (CEST) From: =?UTF-8?q?J=C3=B6rg=20Krause?= To: buildroot@buildroot.org Date: Mon, 19 Oct 2015 22:45:26 +0200 Message-Id: <1445287527-30196-2-git-send-email-joerg.krause@embedded.rocks> X-Mailer: git-send-email 2.6.1 In-Reply-To: <1445287527-30196-1-git-send-email-joerg.krause@embedded.rocks> References: <1445287527-30196-1-git-send-email-joerg.krause@embedded.rocks> MIME-Version: 1.0 Subject: [Buildroot] [PATCH 2/3] package/swupdate: add patch to fix build issue with some toolchains X-BeenThere: buildroot@busybox.net X-Mailman-Version: 2.1.18-1 Precedence: list List-Id: Discussion and development of buildroot List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: buildroot-bounces@busybox.net Sender: "buildroot" Some toolchains used in Buildroot (x86-64 and mips64) have a problem to compile a set of object files into one object file as it is done for the `builtin-target` declared in swupdate's Kbuild Makefile.build. This target collects all object files from every subdirectory declared in `objs-dir` and compiles them into a single object file named `build-in.o` using the linker ld. For the addressed toolchains the default emulation of ld is not the correct one leading to different kind of relocation errors: /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. or /usr/bin/mips-linux-gnu-ld: handlers/raw_handler.o: endianness incompatible with that of the selected emulation or /usr/bin/mips64el-linux-ld: core/swupdate.o: ABI is incompatible with that of the selected As there is no need to have single object file `built-in.o` to be compiled for the subdirectories core and handlers we can easily allow swupdate to be built with these toolchains by compiling the source files from core and handlers with the `lib-target` target by assigning them to the `libs-y` variable as it is done for all other subdirectories. The `lib-target` compiles a set of object files into one archive file. With this target we avoid using the ld linker and use the ar archiver instead. Add a patch from upstream to fix a whole bunch of autobuild errors. 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. Signed-off-by: Jörg Krause --- package/swupdate/swupdate.hash | 1 + package/swupdate/swupdate.mk | 1 + 2 files changed, 2 insertions(+) diff --git a/package/swupdate/swupdate.hash b/package/swupdate/swupdate.hash index 6d69d66..057cf84 100644 --- a/package/swupdate/swupdate.hash +++ b/package/swupdate/swupdate.hash @@ -1,2 +1,3 @@ # Locally calculated sha256 1410f8967aad0f4d3b4561110dbfb2c1f8e337bdc332f6b120f4995762c8bf6b swupdate-2015.07.tar.gz +sha256 ec633171e6a893506fad6b96fb2b258d60a023c03be5520b968a1d5cc6bafe6e c3467290925b2a833a68d9db12c198fdca752e32.patch diff --git a/package/swupdate/swupdate.mk b/package/swupdate/swupdate.mk index 9338fc8..8a20193 100644 --- a/package/swupdate/swupdate.mk +++ b/package/swupdate/swupdate.mk @@ -8,6 +8,7 @@ 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/c3467290925b2a833a68d9db12c198fdca752e32.patch # swupdate bundles its own version of mongoose (version 3.8) and # lsqlite3 (version 0.8)