From patchwork Sat Dec 15 11:50:27 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Fabrice Fontaine X-Patchwork-Id: 1013877 Return-Path: X-Original-To: incoming-buildroot@patchwork.ozlabs.org Delivered-To: patchwork-incoming-buildroot@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=pass (mailfrom) smtp.mailfrom=busybox.net (client-ip=140.211.166.133; helo=hemlock.osuosl.org; envelope-from=buildroot-bounces@busybox.net; receiver=) Authentication-Results: ozlabs.org; dmarc=fail (p=none dis=none) header.from=gmail.com Authentication-Results: ozlabs.org; dkim=fail reason="signature verification failed" (2048-bit key; unprotected) header.d=gmail.com header.i=@gmail.com header.b="vEIYAnJ7"; dkim-atps=neutral Received: from hemlock.osuosl.org (smtp2.osuosl.org [140.211.166.133]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 43H5NF1Pptz9s3Z for ; Sat, 15 Dec 2018 22:51:06 +1100 (AEDT) Received: from localhost (localhost [127.0.0.1]) by hemlock.osuosl.org (Postfix) with ESMTP id 76BAA87EA8; Sat, 15 Dec 2018 11:51:02 +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 J5KrXakUwnqK; Sat, 15 Dec 2018 11:51:00 +0000 (UTC) Received: from ash.osuosl.org (ash.osuosl.org [140.211.166.34]) by hemlock.osuosl.org (Postfix) with ESMTP id 651EA86244; Sat, 15 Dec 2018 11:51:00 +0000 (UTC) X-Original-To: buildroot@lists.busybox.net Delivered-To: buildroot@osuosl.org Received: from whitealder.osuosl.org (smtp1.osuosl.org [140.211.166.138]) by ash.osuosl.org (Postfix) with ESMTP id EE43E1C158B for ; Sat, 15 Dec 2018 11:50:58 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by whitealder.osuosl.org (Postfix) with ESMTP id EAB3F8543B for ; Sat, 15 Dec 2018 11:50:58 +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 OTU46oStQ6w2 for ; Sat, 15 Dec 2018 11:50:58 +0000 (UTC) X-Greylist: domain auto-whitelisted by SQLgrey-1.7.6 Received: from mail-wr1-f68.google.com (mail-wr1-f68.google.com [209.85.221.68]) by whitealder.osuosl.org (Postfix) with ESMTPS id EB38184DFD for ; Sat, 15 Dec 2018 11:50:57 +0000 (UTC) Received: by mail-wr1-f68.google.com with SMTP id c14so7853401wrr.0 for ; Sat, 15 Dec 2018 03:50:57 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id; bh=3PWv545/bXKQHmQv8g+qNAN9xND/65bzfye2MfOst48=; b=vEIYAnJ7jtoVLLR6J6Lz1ln8oLjRRZNIVqFj+JjJsJsdhSk+TCsmNr5brufwPmoeFK doeJJ4bPoK2dYmOYbaG2XQqtVvJatUFPvkaYq+0wk5EMV9+IDdkQeOEY0244WVn1gC2U K/s7utOaEIFirVb/8pukV9UFsHWSVbrKL7SjELmnbTLxhhOaAsb+KOvwXNivwIgu8YDx 3fVhFkTUNvcufduCbfdAOsrAjzs21yRbk+jltnlD4dRo1RCX9CT82J1fH+YnLeTK8R5N nz1unQ9A2/BIF/55+RQ/dB5t2iMz/7YTR3LbkMjCrS0x6zD7jfZ7j4AFPi45DdlxRY7P 78Ag== 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; bh=3PWv545/bXKQHmQv8g+qNAN9xND/65bzfye2MfOst48=; b=BFYQEYFuwpCEgFYh0/GDj9s1Yl/2UJQkgOTvXpBwtoGfZjz4X0gMhEk80uObAN5Eqr 0wik+8XUqUD/087Ztn4x+Hxrif9ItiuniCoNtUUd0mBTmNzNH+d0Jsx/d9mKwUBUOtYH 8LlQwzAjvwOe/7SGvWRRPpaPMSYz1tvSrJEQNGrpT3+umdj9CzwgJE5WYU8oReBv3Vcp BtDmhwo4h0HZ0uCg8+4dXaHARe6FxoAsUXimt7URrHeYlZ7bbXrNkrhOjSaxebB554PK U6YI+OJ6YpPo16dqr6Z4bB2wHftoz2gHT0GS5jyE7b0lLHi4QXfYksqY2bfPEnG7vEZK J5IQ== X-Gm-Message-State: AA+aEWbogUIP9MVf0+nLiSi3dYlkaBpPZ9U3+j/2+Mx7XlrzDvXNh/Re U/oMNsJZ8NrYjpUcZVryyhXkiQNa X-Google-Smtp-Source: AFSGD/VnYLjhKwrTQeLJWDPgfHHy9u4uafQ0SQGUaQv7A3mhrr26BK76rNG+5CbLUMnYxVCF4wOWHQ== X-Received: by 2002:adf:e3d0:: with SMTP id k16mr5624559wrm.223.1544874656157; Sat, 15 Dec 2018 03:50:56 -0800 (PST) Received: from localhost.localdomain (arennes-656-1-356-67.w86-214.abo.wanadoo.fr. [86.214.196.67]) by smtp.gmail.com with ESMTPSA id j33sm10333627wre.91.2018.12.15.03.50.54 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Sat, 15 Dec 2018 03:50:55 -0800 (PST) From: Fabrice Fontaine To: buildroot@buildroot.org Date: Sat, 15 Dec 2018 12:50:27 +0100 Message-Id: <20181215115027.32307-1-fontaine.fabrice@gmail.com> X-Mailer: git-send-email 2.14.1 Subject: [Buildroot] [PATCH 1/1] cryptsetup: fix systemd build wih pkgconf 1.5.3 X-BeenThere: buildroot@busybox.net X-Mailman-Version: 2.1.29 Precedence: list List-Id: Discussion and development of buildroot List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Fabrice Fontaine MIME-Version: 1.0 Errors-To: buildroot-bounces@busybox.net Sender: "buildroot" Since the bump to 1.5.3, pkgconf prepends the sysroot to all absolute paths found in the .pc file. This is correct when the paths refer to something in STAGING_DIR (e.g. libdir, includedir), but not when it refers to something used for the target. cryptsetup uses the tmpfilesdir variable from systemd.pc to decide where to install things. Since DESTDIR is prepended to the install destination, this will end up in the wrong location. Until a better solution is found in pkgconf, pass the tmpfilesdir to use explicitly instead of relying on systemd.pc. Fixes: - http://autobuild.buildroot.org/results/930dcd3e408106e01fa519058cd2677c867b73dd Signed-off-by: Fabrice Fontaine --- package/cryptsetup/cryptsetup.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package/cryptsetup/cryptsetup.mk b/package/cryptsetup/cryptsetup.mk index dd1ef2e9e0..5987038af9 100644 --- a/package/cryptsetup/cryptsetup.mk +++ b/package/cryptsetup/cryptsetup.mk @@ -14,7 +14,7 @@ CRYPTSETUP_LICENSE = GPL-2.0+ (programs), LGPL-2.1+ (library) CRYPTSETUP_LICENSE_FILES = COPYING COPYING.LGPL CRYPTSETUP_INSTALL_STAGING = YES CRYPTSETUP_CONF_ENV += LDFLAGS="$(TARGET_LDFLAGS) $(TARGET_NLS_LIBS)" -CRYPTSETUP_CONF_OPTS += --enable-blkid +CRYPTSETUP_CONF_OPTS += --enable-blkid --with-tmpfilesdir=/usr/lib/tmpfiles.d # cryptsetup uses libgcrypt by default, but can be configured to use OpenSSL # or kernel crypto modules instead