From patchwork Tue May 21 20:45:56 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: 'Darko Komljenovic' via swupdate X-Patchwork-Id: 1103010 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=pass (mailfrom) smtp.mailfrom=googlegroups.com (client-ip=2a00:1450:4864:20::43f; helo=mail-wr1-x43f.google.com; envelope-from=swupdate+bncbdsmnwxtyuprb3whshtqkgqeiyc4mai@googlegroups.com; receiver=) Authentication-Results: ozlabs.org; dmarc=pass (p=none dis=none) header.from=googlegroups.com Authentication-Results: ozlabs.org; dkim=pass (2048-bit key; unprotected) header.d=googlegroups.com header.i=@googlegroups.com header.b="iJwGofgk"; dkim-atps=neutral Received: from mail-wr1-x43f.google.com (mail-wr1-x43f.google.com [IPv6:2a00:1450:4864:20::43f]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 457nry30Kjz9s9T for ; Wed, 22 May 2019 06:47:45 +1000 (AEST) Received: by mail-wr1-x43f.google.com with SMTP id e14sf53682wrx.7 for ; Tue, 21 May 2019 13:47:45 -0700 (PDT) ARC-Seal: i=2; a=rsa-sha256; t=1558471662; cv=pass; d=google.com; s=arc-20160816; b=ngfrz87yIQbp/UQenzok6S6DS05Wgh4TWthZJ95aKWw1Dgoyb1rJasF23odMUbLh6k jqDLPCdRQb9dvH0zm0USLCn7BrQe2AvmhY3wY6/4NppA2BqZPC5NRVYlHLwxJAKLVPRs Q0JB0Fh0O0BMKDbm/9BiPClZMeZLem2UoMO6SeqJtehi+9SoRooKR3KJtonWGtyIRxyD N0aSKrH2ESEpDn/oKZzKuLPO85e+YgPWf19PVljKu8q9HRhMLT9K1Hkm9xKPS/UOK7O7 xU1PUW9zE3XQAfvYDfR1RN1xm/E5Nq/Z7RsbAaVuhuTDjkPC3QVYj0B6BJEM7BUrjVij 1Njw== ARC-Message-Signature: i=2; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-unsubscribe:list-subscribe:list-archive:list-help:list-post :list-id:mailing-list:precedence:reply-to:content-transfer-encoding :mime-version:references:in-reply-to:message-id:date:subject:cc:to :from:dkim-signature; bh=e9PvjTdmufV6AufXb+rPTyj0THtGY8jyilStGLEEQeU=; b=cy4oJ2KqnSjWCOO4XeOrBHp18GzoQMTrWcpk0+A+qr+Id7+kA9kQVRjq+yoF6vjsZ8 oOkDa16LaZzZdjyKoiH6rKv4LIamRvBfH6wIdm+5Mv7wpJnpp6hT+6a8l+gNKfFHN5+1 gN56R+w+su298M+9nQQm9tNkZLGdtO9exrIHwobT6su+RyO6dJWaUIXjB6qKnPCbER+B 6O8FGS6j4ODU4GNhrNNy0IMgPJ9VuBs4jUE9UDrUNKYBQM/AaCGJnLUMn1SjHkOs5txP KJcDuWyIUtWjW4ZlI9K8mvwauR9jvZEeDohd+GVuyja27sIDPFscpzxGVnwOnvxnGn9f Nlmw== ARC-Authentication-Results: i=2; gmr-mx.google.com; dkim=pass header.i=@koncepto.io header.s=default header.b=SB7B2CKH; spf=pass (google.com: domain of pjtexier@koncepto.io designates 195.154.119.111 as permitted sender) smtp.mailfrom=pjtexier@koncepto.io; dmarc=pass (p=QUARANTINE sp=QUARANTINE dis=NONE) header.from=koncepto.io DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=googlegroups.com; s=20161025; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding:x-original-sender :x-original-authentication-results:reply-to:precedence:mailing-list :list-id:list-post:list-help:list-archive:list-subscribe :list-unsubscribe; bh=e9PvjTdmufV6AufXb+rPTyj0THtGY8jyilStGLEEQeU=; b=iJwGofgkRr4SCJYvI2RAnaUBdecKJtyhT7xBhHEc9ODahT26fRmOGkgjuFbDDOMAzM E7H+7J+idgLCZeo8xsu/ek2h/zLmtnvfvflUjO4FUMR8z9HAZh4Iwu9whdyXg8OstjmT 87u+C9IMO/ugZbYJiSc128ESByKarG3yXb25aTYXKqGLRjxcVGUIiQA6GTR78HvFH/JE ESAFUt06BYbT8em45jk/DddVq8RPKHRug7UnfkOWZyCp8qaMD4aWZ8wHbFZ8yaup/gh0 q1dsOzozX7FDeXWsgdlTw/Z/MrsaKJi4u4gn/MvVI0gY9oY9XbJm/b8+ugreH3dW4n7I Yw1w== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding:x-original-sender :x-original-authentication-results:reply-to:precedence:mailing-list :list-id:x-spam-checked-in-group:list-post:list-help:list-archive :list-subscribe:list-unsubscribe; bh=e9PvjTdmufV6AufXb+rPTyj0THtGY8jyilStGLEEQeU=; b=kqlFz+GrijhUsJnO1tq+oVqn397o+8eRCWTmuTiIeKLfSCE+WDr2kRbgQaSMYU1GU1 /nhMVnycdTkEyZtHtv585rkvqb3RrQCRmaHVnp0ShL8UD1SHvc0+TA7acE+Oqxl5w3UP Zsrnbz0L2QqJ63kF0woeCMJ7qHF6QkmhFoUgn3WiMOq2H/UKzZjBAEpAar/XHptd3rbq oF+eldSSf8FlFEElnAoU/JP+rFPDi4K8bpc3b6hncdHMzRbUDrMgZWzKc2Liuc4fZBAS DRXp4/hnI3HymSj9qkFcYm3eog0uoO/bj1ey93fo6vPGTkEZ5SpK9CeGvdev1Rv46dkR ywAw== X-Gm-Message-State: APjAAAX9NkQsUHBPZgP+uW/8ptQrQh80XMdhsmeQu8fyoswN+5BrFIFE hN8rEf+6AkW1GPhmc1CRGGA= X-Google-Smtp-Source: APXvYqyWsEgGO6qBgzFPMyrvookTbZjylKhZmrV09GHzNpBfSZdWK3HXIHMtsqQQ8V9IalAgmcmpzQ== X-Received: by 2002:a1c:9c02:: with SMTP id f2mr4864223wme.8.1558471662368; Tue, 21 May 2019 13:47:42 -0700 (PDT) X-BeenThere: swupdate@googlegroups.com Received: by 2002:adf:97ca:: with SMTP id t10ls48272wrb.10.gmail; Tue, 21 May 2019 13:47:41 -0700 (PDT) X-Received: by 2002:adf:b446:: with SMTP id v6mr51682425wrd.30.1558471661977; Tue, 21 May 2019 13:47:41 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1558471661; cv=none; d=google.com; s=arc-20160816; b=OUN50QzvtZBZMSpWNfxRUmKQxbzA3dGvXj3CvTIBxs2LWpStJJomEGjg3aDgNl3QLe uOW9Bo81J8sm6RF7TGG2/UN1YIPG4qrO2Xf+xMjayzWUanAL1DOmYNElC1f0Nn2LiG7Q lCL/RrFsG+lywMXgC+H6rC5m4yTiSIDUp55KTFBAGdzrpZFJJfNRFk1bGVPhbSxmbsB6 JJzYhHotbvErRnRoVdcYehPJjWILcSHCxhg76in2wtzj/Cmm3bTLG4g8xOntn0l08DLe lbO0PYU6SenSSBjIfN03YmTX6NhpBFUafoYy0xDWiXO8Qisjm3zhhAhw4oQyhRmLa12l uLBw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:dkim-signature; bh=Ys7Ysi91hTvQImpVMyO+lT3BBLjg/aL0EbCwIIsxb/U=; b=iCfWaEpbn6mYtOAWcBCBsCGQQmi898q1vaDToAy9dGxoBdvAtfJo96pCMF4s09Wgag 15UiOFYjOMcGX6m6WzMC0dKm+166AcAvQ30ZYR8aA48cMSeVuGT9+MgxXlZqCteqHRA+ jH2z1LRk2pNbXQeaxD53vj4LsiW9PDovc9WPUywyikW4eEtqhYAnC0WIbXH61aJia/dP hxrxZTW5RtUfI/H0xszsV3t0nsVUA8pVdaUHEa008/fgrHLp0n0WYEvHY2/OtW6raCOz 2J6FvgIi+z9bFmcz/XbNFtZCzpQPtI1pfYD86oiWvUi6lzYiK7vd3rAdnwofsMMRNY0p 4LGQ== ARC-Authentication-Results: i=1; gmr-mx.google.com; dkim=pass header.i=@koncepto.io header.s=default header.b=SB7B2CKH; spf=pass (google.com: domain of pjtexier@koncepto.io designates 195.154.119.111 as permitted sender) smtp.mailfrom=pjtexier@koncepto.io; dmarc=pass (p=QUARANTINE sp=QUARANTINE dis=NONE) header.from=koncepto.io Received: from koncepto.io (koncepto.io. [195.154.119.111]) by gmr-mx.google.com with ESMTPS id f18si210077wrm.0.2019.05.21.13.47.41 for (version=TLS1_2 cipher=ECDHE-RSA-CHACHA20-POLY1305 bits=256/256); Tue, 21 May 2019 13:47:41 -0700 (PDT) Received-SPF: pass (google.com: domain of pjtexier@koncepto.io designates 195.154.119.111 as permitted sender) client-ip=195.154.119.111; Received: from localhost.localdomain (lfbn-1-8938-37.w193-250.abo.wanadoo.fr [193.250.79.37]) by koncepto.io (Postfix) with ESMTPSA id 9FA7B60050; Tue, 21 May 2019 22:47:41 +0200 (CEST) X-Patchwork-Original-From: "'Pierre-Jean Texier' via swupdate" From: 'Darko Komljenovic' via swupdate To: swupdate@googlegroups.com Cc: Pierre-Jean Texier Subject: [swupdate] [libubootenv][PATCH 2/2] uboot_env: fix compilation for glibc version >= 2.28 Date: Tue, 21 May 2019 22:45:56 +0200 Message-Id: <1558471556-13127-2-git-send-email-pjtexier@koncepto.io> X-Mailer: git-send-email 2.7.4 In-Reply-To: <1558471556-13127-1-git-send-email-pjtexier@koncepto.io> References: <1558471556-13127-1-git-send-email-pjtexier@koncepto.io> MIME-Version: 1.0 X-Original-Sender: pjtexier@koncepto.io X-Original-Authentication-Results: gmr-mx.google.com; dkim=pass header.i=@koncepto.io header.s=default header.b=SB7B2CKH; spf=pass (google.com: domain of pjtexier@koncepto.io designates 195.154.119.111 as permitted sender) smtp.mailfrom=pjtexier@koncepto.io; dmarc=pass (p=QUARANTINE sp=QUARANTINE dis=NONE) header.from=koncepto.io X-Original-From: Pierre-Jean Texier Reply-To: Pierre-Jean Texier Precedence: list Mailing-list: list swupdate@googlegroups.com; contact swupdate+owners@googlegroups.com List-ID: X-Spam-Checked-In-Group: swupdate@googlegroups.com X-Google-Group-Id: 605343134186 List-Post: , List-Help: , List-Archive: , List-Unsubscribe: , Starting with glibc 2.28, include file sys/stat.h will have a definition for struct statx, in which case include file linux/stat.h should be avoided, in order to prevent a duplicate definition. This commit fixes (if _GNU_SOURCE is defined): /usr/include/linux/stat.h:56:8: error: redefinition of ‘struct statx_timestamp’ struct statx_timestamp { ^~~~~~~~~~~~~~~ Signed-off-by: Pierre-Jean Texier --- src/uboot_env.c | 1 - 1 file changed, 1 deletion(-) diff --git a/src/uboot_env.c b/src/uboot_env.c index a0f977c..e8483bf 100644 --- a/src/uboot_env.c +++ b/src/uboot_env.c @@ -32,7 +32,6 @@ #include #include #include -#include #include #include