From patchwork Tue Dec 19 15:21:13 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Joshua Watt X-Patchwork-Id: 1878026 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@legolas.ozlabs.org Authentication-Results: legolas.ozlabs.org; dkim=pass (2048-bit key; unprotected) header.d=googlegroups.com header.i=@googlegroups.com header.a=rsa-sha256 header.s=20230601 header.b=Y4vGLpjk; dkim=pass (2048-bit key; unprotected) header.d=gmail.com header.i=@gmail.com header.a=rsa-sha256 header.s=20230601 header.b=HoNfqq6i; dkim-atps=neutral Authentication-Results: legolas.ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=googlegroups.com (client-ip=2607:f8b0:4864:20::103c; helo=mail-pj1-x103c.google.com; envelope-from=swupdate+bncbcz3hh5gu4jbb3xjq2wamgqeajeykii@googlegroups.com; receiver=patchwork.ozlabs.org) Received: from mail-pj1-x103c.google.com (mail-pj1-x103c.google.com [IPv6:2607:f8b0:4864:20::103c]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature ECDSA (secp384r1) server-digest SHA384) (No client certificate requested) by legolas.ozlabs.org (Postfix) with ESMTPS id 4SvgQD0z32z1ydc for ; Wed, 20 Dec 2023 02:21:22 +1100 (AEDT) Received: by mail-pj1-x103c.google.com with SMTP id 98e67ed59e1d1-28b7adf8ef6sf2459481a91.1 for ; Tue, 19 Dec 2023 07:21:22 -0800 (PST) ARC-Seal: i=2; a=rsa-sha256; t=1702999279; cv=pass; d=google.com; s=arc-20160816; b=n/EB9EpNm1xqu0jXQN22/3+2kBK03MRMqE2aKmp59WcfS/mEhRRlFgbxEIyVUL+zT1 FN8W8t/nyZNcdM8JiaxSYbJXYE37yP/2jvU+VZ0IVuAWi9a85e1P/lPEdGBq6B4Ej1Ay fEuNkHe/k4QeBmB/E6VlVpl7zmUdffExTEQYuIbVGyVBcsk85Zs69o9ANXzQRhK/V1gv nGP6dJvaeM5y5jh6dxK0X+HtYmMWUQ4AuKU1X+1KOtyogSQnB4bMwrSj4TkRYut1wFy8 15wmcYI/GOBLrmMT8bKsTHZ1gjrInN9EjHU9Ri3CbeyeoSc1EFb3+gVitOH6n/pEMbcF ameg== 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:mime-version:message-id:date :subject:cc:to:from:sender:dkim-signature:dkim-signature; bh=Hi7ZmgonsNyxjLhsjNbpyEokJnP5EursJT7HLXFRDNs=; fh=TxbsToQuwxobR/ROjbph9hOxC4JjEiYhj/N8AZraaVs=; b=XS9zCB4x6zLvcO25aH+GnLTrxF3oRdcCp6Gf67XEiuwfbb81I4Oyw1s3n2FUv9ne4S shTgXCSPrt3nuLe7hk5muEIdffrDbpxoJh7lDyxF29Av29w40zizpZt6/ATfvmpV3lUj 0cpucnBhlw3F3hlSykukf6y5ydeLErHFhvLT+Bg1pibvmItXTj9hVzm/WJYTEeVwS/hZ eLMY6MFSX7dRS8ZFHjD5/2aCQbgTlHIcpdC/I9B7KZXOUPmEEMzSokcHP8G5G2+bLeyc yLL7yQ+JP8wJ9amfxsBpEDz2i1PzY5F9k9WaRxN9WO16owZsrUfiLeoTfxiV5AIScBoR u7tA== ARC-Authentication-Results: i=2; gmr-mx.google.com; dkim=pass header.i=@gmail.com header.s=20230601 header.b=RJ6OPEUd; spf=pass (google.com: domain of jpewhacker@gmail.com designates 2607:f8b0:4864:20::c2c as permitted sender) smtp.mailfrom=jpewhacker@gmail.com; dmarc=pass (p=NONE sp=QUARANTINE dis=NONE) header.from=gmail.com DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=googlegroups.com; s=20230601; t=1702999279; x=1703604079; darn=patchwork.ozlabs.org; h=list-unsubscribe:list-subscribe:list-archive:list-help:list-post :list-id:mailing-list:precedence:x-original-authentication-results :x-original-sender:mime-version:message-id:date:subject:cc:to:from :sender:from:to:cc:subject:date:message-id:reply-to; bh=Hi7ZmgonsNyxjLhsjNbpyEokJnP5EursJT7HLXFRDNs=; b=Y4vGLpjkUiTs13GA3LAvxHCdSWyZWkeDr3EtRSxOthqjsNYKAVczpD7nIat0sF9KAb WNKkjlYLcn+qGbd4fTB6aePWC5naXBxmeQj9tjZrBSp3CuPmM2fDXgqp6utLgJkAM4Zc LjZUU5l2w7k/oGjI/9XAFMWospC3zVZuqc/wQdayY8FN2AnS73AbsnIbgV1H8sqHg3aZ 73cRnW3sz/oS7ThKCM5hTMJkW6SYQqlrECvNEdkv06br4LObWBuZEUP6LYrYA9CJByoq X0zghu/bImM2wL4vI/GA/kFqFlE+NlsbBi4HfQFkU8DE+y/rB0acoAOEIwVgoJDmdpy4 f+rQ== DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1702999279; x=1703604079; darn=patchwork.ozlabs.org; h=list-unsubscribe:list-subscribe:list-archive:list-help:list-post :list-id:mailing-list:precedence:x-original-authentication-results :x-original-sender:mime-version:message-id:date:subject:cc:to:from :from:to:cc:subject:date:message-id:reply-to; bh=Hi7ZmgonsNyxjLhsjNbpyEokJnP5EursJT7HLXFRDNs=; b=HoNfqq6i1nGQojNIoPOUbJpovfhC21tYTIpVj711j+9xlS9cYOF4WFFpMbQLI9Xzo2 ht022tXN4S4RL6M8dAlwgelOBei1LiPQL26bLRCShSFSyoB0cJJQBZrGrQfWhNe2J14F s0XLFerIgdIgdzWrHVpMaOyAnYWlGgvGKjm00x1ezMmaUi8JpQkQxXWNXeUr9o4EfLqV mFHPgONaV2CWea7zoL8Flt/b6hf1WMGip2M2eT9vsUENgwQGoJC6lLNO+hHgzUrFU6Ya MuBvwtkg8ipKHIcktnB3fxaOka/c0mJPB2ATETE63rHb0qg6MxO+GM+gD1RstvaqDlCE gttA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1702999279; x=1703604079; h=list-unsubscribe:list-subscribe:list-archive:list-help:list-post :x-spam-checked-in-group:list-id:mailing-list:precedence :x-original-authentication-results:x-original-sender:mime-version :message-id:date:subject:cc:to:from:x-beenthere:x-gm-message-state :sender:from:to:cc:subject:date:message-id:reply-to; bh=Hi7ZmgonsNyxjLhsjNbpyEokJnP5EursJT7HLXFRDNs=; b=NYNeVaq+r3sFzJksEOrp6vvR+hpjLUzwcwmLywqosB2VP0ZsYIKKsoW+p/RdVhMnKI rt0i+/NYf8NPTuhydRNCwrStG1tIeKYsGp7XpsEGmZbZi3pgZNtbUBJRTn3nHpj46tUB 4AUfH9uHV8WYPUo6oGsHuj5sa6exYj5cOj11KlG6FiMzQhsIdRE2uFysbiEvb6iMqrCl BL3igciNMpLMCRH3QRG3KCk/wkT60s/cesEH/+674fRjSHD434INjHRpRgyO0rlpL2IJ 67ZeVRM3iJNvexuTikEx8BXbJW27GBmlZM51PI4RNLpjFF2TwANh541GYVZ9VlArh26T OYDA== Sender: swupdate@googlegroups.com X-Gm-Message-State: AOJu0YyGNfpBGLXd/VdioUmw+PR9WqpfIZoUprqCX4sa8BR7cLTeeWqU QWr5UnFKJqN7aAMZmatXj1M= X-Google-Smtp-Source: AGHT+IEcm1LjjS0OOskiGDNtoltxUo0ezYdsIr+FMQlGNjCITfS3UQ5Mb2d8tGQuaAHZLn+670e0WQ== X-Received: by 2002:a17:90a:ea8c:b0:28b:c702:bdbd with SMTP id h12-20020a17090aea8c00b0028bc702bdbdmr282885pjz.51.1702999278613; Tue, 19 Dec 2023 07:21:18 -0800 (PST) X-BeenThere: swupdate@googlegroups.com Received: by 2002:a17:90b:1e0f:b0:28b:3346:94e7 with SMTP id pg15-20020a17090b1e0f00b0028b334694e7ls3443169pjb.0.-pod-prod-06-us; Tue, 19 Dec 2023 07:21:17 -0800 (PST) X-Received: by 2002:a05:6a20:5656:b0:187:7761:6155 with SMTP id is22-20020a056a20565600b0018777616155mr20942532pzc.55.1702999277206; Tue, 19 Dec 2023 07:21:17 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1702999277; cv=none; d=google.com; s=arc-20160816; b=cYg7PChV5i0noqfTzwDUhlLrzuVBEbheB3SeoidpGRfRvNpqN/Xrp/97GSkIY+0Qlv ZxllCiLFitBJqhfaRHKrl5mRMWCqP7dCjWYfTVo6l9SUVGsZmyeyyUaRfQrs8rds0r2H 6ssfwzDzGEb68GPhvx52g0TdhHhNFpuhV/T9baWUdl3m+QjNfrQ0Kv4AWDGKQKuv1WGq apruZmXyWLUux4ANMLkUz2Lz2GXw+VZii3kMrH1ZXauVVW16y8BbcdvNosOeGbpUDg8u ty88uoA46hgVGOp5Vf0taYVp7Fe+U5/TAbQsVHvsDxcBZkSfccSZzaLpvuPifSa2tjp1 sBuQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=content-transfer-encoding:mime-version:message-id:date:subject:cc :to:from:dkim-signature; bh=VK9KcXwFJxhLB4kidCLKNu60s+BJQUxrBYGh1kZ70Wo=; fh=TxbsToQuwxobR/ROjbph9hOxC4JjEiYhj/N8AZraaVs=; b=aBzM/B+K5TouuifKZLwc8s7RO30y563GZs1TUalMcyz6El8txTkgPvsM2AE5xF2G8M vrOspgQTdojphznTw6r4+F4BoC6xoA+EG8sly6u8vS6n/r29lDvBAvHXVYfu0n4roYWd MnSU7S4CTDw5XNACALcMxHXG/gRqZysVc6iuP2uCNEIHU3zjOQ53lAPQOnyicm2UmFnj ptKzOjWeZBpEDBH/bsBMGFpg5iYVKkCE5eBjnm0qobfFSBm/cyognq35WeOIbp4rZCUQ Zg6AoDMXHhBIIESvuWmYBvDuNGkmK+8ivvADOHYyKSw0ZML7qQm+Aj89tZTp7VSkI7Tt 4k0g== ARC-Authentication-Results: i=1; gmr-mx.google.com; dkim=pass header.i=@gmail.com header.s=20230601 header.b=RJ6OPEUd; spf=pass (google.com: domain of jpewhacker@gmail.com designates 2607:f8b0:4864:20::c2c as permitted sender) smtp.mailfrom=jpewhacker@gmail.com; dmarc=pass (p=NONE sp=QUARANTINE dis=NONE) header.from=gmail.com Received: from mail-oo1-xc2c.google.com (mail-oo1-xc2c.google.com. [2607:f8b0:4864:20::c2c]) by gmr-mx.google.com with ESMTPS id c12-20020aa78e0c000000b006d2691fdd92si871795pfr.6.2023.12.19.07.21.17 for (version=TLS1_3 cipher=TLS_AES_128_GCM_SHA256 bits=128/128); Tue, 19 Dec 2023 07:21:17 -0800 (PST) Received-SPF: pass (google.com: domain of jpewhacker@gmail.com designates 2607:f8b0:4864:20::c2c as permitted sender) client-ip=2607:f8b0:4864:20::c2c; Received: by mail-oo1-xc2c.google.com with SMTP id 006d021491bc7-5906988ab8dso1924142eaf.0 for ; Tue, 19 Dec 2023 07:21:17 -0800 (PST) X-Received: by 2002:a05:6820:2293:b0:58d:6e28:853f with SMTP id ck19-20020a056820229300b0058d6e28853fmr12479515oob.9.1702999275912; Tue, 19 Dec 2023 07:21:15 -0800 (PST) Received: from localhost.localdomain ([2601:282:4300:19e0::d6e0]) by smtp.gmail.com with ESMTPSA id o14-20020a4aabce000000b00591c8fa01ccsm1212798oon.25.2023.12.19.07.21.14 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 19 Dec 2023 07:21:15 -0800 (PST) From: Joshua Watt To: swupdate@googlegroups.com Cc: Joshua Watt Subject: [swupdate] [meta-swupdate][PATCH] luafilesystem: Correctly handle usrmerge Date: Tue, 19 Dec 2023 08:21:13 -0700 Message-Id: <20231219152113.3105945-1-JPEWhacker@gmail.com> X-Mailer: git-send-email 2.34.1 MIME-Version: 1.0 X-Original-Sender: JPEWhacker@gmail.com X-Original-Authentication-Results: gmr-mx.google.com; dkim=pass header.i=@gmail.com header.s=20230601 header.b=RJ6OPEUd; spf=pass (google.com: domain of jpewhacker@gmail.com designates 2607:f8b0:4864:20::c2c as permitted sender) smtp.mailfrom=jpewhacker@gmail.com; dmarc=pass (p=NONE sp=QUARANTINE dis=NONE) header.from=gmail.com 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: , Fixes the recipe to correctly install when the usrmerge DISTRO_FEATURE is active. In this case, base_libdir=/usr/lib, so it should not be specified as an argument. Also correctly use the ${prefix} variable for the install prefix Signed-off-by: Joshua Watt Signed-off-by: Joshua Watt --- recipes-lua/luafilesystem/luafilesystem_git.bb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/recipes-lua/luafilesystem/luafilesystem_git.bb b/recipes-lua/luafilesystem/luafilesystem_git.bb index 1778c04..10e6db8 100644 --- a/recipes-lua/luafilesystem/luafilesystem_git.bb +++ b/recipes-lua/luafilesystem/luafilesystem_git.bb @@ -15,7 +15,7 @@ inherit pkgconfig S = "${WORKDIR}/git" -EXTRA_OEMAKE = 'PREFIX=${D}/usr BASELIB=${base_libdir} CROSS_COMPILE=${TARGET_PREFIX} CC="${CC} -fpic" LDFLAGS="${LDFLAGS}"' +EXTRA_OEMAKE = 'PREFIX=${D}/${prefix} CROSS_COMPILE=${TARGET_PREFIX} CC="${CC} -fpic" LDFLAGS="${LDFLAGS}"' # NOTE: this is a Makefile-only piece of software, so we cannot generate much of the # recipe automatically - you will need to examine the Makefile yourself and ensure