From patchwork Fri Sep 29 13:37:22 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Vyacheslav Yurkov X-Patchwork-Id: 31365 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from aws-us-west-2-korg-lkml-1.web.codeaurora.org (localhost.localdomain [127.0.0.1]) by smtp.lore.kernel.org (Postfix) with ESMTP id B6251E71D37 for ; Fri, 29 Sep 2023 13:38:58 +0000 (UTC) Received: from mail-ej1-f42.google.com (mail-ej1-f42.google.com [209.85.218.42]) by mx.groups.io with SMTP id smtpd.web10.17425.1695994731310794783 for ; Fri, 29 Sep 2023 06:38:51 -0700 Authentication-Results: mx.groups.io; dkim=pass header.i=@gmail.com header.s=20230601 header.b=nWW+zd4p; spf=pass (domain: gmail.com, ip: 209.85.218.42, mailfrom: uvv.mail@gmail.com) Received: by mail-ej1-f42.google.com with SMTP id a640c23a62f3a-9b2a3fd5764so934037066b.3 for ; Fri, 29 Sep 2023 06:38:51 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1695994729; x=1696599529; darn=lists.openembedded.org; h=content-transfer-encoding:mime-version:message-id:date:subject:cc :to:from:from:to:cc:subject:date:message-id:reply-to; bh=dThlM2DCE9fwg5VzpxXIzqH4QzJ4KMu2XbESaW12TXE=; b=nWW+zd4pavp8ortwX/HYC8xfuiieW5QKsQOEENQdUy9zV20QDqj0LF064+O1JPzc6s e0i7I3AmnVU2zlBfY1yTE4KTQg6KPQltB0/zFjfzF6DwqBRdbUakz+tJhzq7JiXTA2cG PAWtr5md6WuF/8L5M9OTMFSVPLfWkmApoqhss0KbRXir/TjEIljb81+moT8Vsuz9KPiz lFq8R8Z682rVcxVVBFr9yqFDga1Llax9ySZeSWQICH6PP41rekRaPntqXJ3eCXs0IyVo AcHsqQigGJ3S2AVYPzVDJ/8jVlC5dqqSRIZ87T1dRrjXtR7h1G0M64G67VLJnFVOU9SW zvcQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1695994729; x=1696599529; h=content-transfer-encoding:mime-version:message-id:date:subject:cc :to:from:x-gm-message-state:from:to:cc:subject:date:message-id :reply-to; bh=dThlM2DCE9fwg5VzpxXIzqH4QzJ4KMu2XbESaW12TXE=; b=YhpQn8ORhSVgJowGu/FrLIMk2ugdqefkVIbOWc5uX/zuhqDmMiPM+DMXB1WCESRbXY jOigQLRq/6dzwt/S6pYIy+bMKYMAFylWe4vzQmCn/qlWL70gahSIUmbEBUVTae6fQSZe CJgZvsJwnx+hSQFdgKNk2+RwX2QJVSy7EaO73vTtzgYUI3YhpRuQpQ6/wI89n/TDAizo iohypzI8E2QWVYuKTGBx3ILQ3/4jfNJztN8kxqp25ZdkSDOCuK7Q+saYyd1t1rdnPJKf OqcV4USO0Za5jMYk2XFEJN5CgTGBJZQGvocfoMnhHRyS3zhyKt6TW4+O5szrtuYz9eaN Vn9A== X-Gm-Message-State: AOJu0YxrtUPlWWd3Y4fCBVvZAP2cmjz0BWgPSpxIdukceJJUb+hwY3Qk vxk7FVgNwuNWbWXCFrUMKJBzsS0046Sbgq1WNQ4= X-Google-Smtp-Source: AGHT+IHxKN3cHP9URgAadA/S28wubteQdt1H7ysvdSP8/HsDtWACTg6RIrzOOMyXg5dPp38WEYhyLg== X-Received: by 2002:a17:906:3150:b0:9ae:696c:2c43 with SMTP id e16-20020a170906315000b009ae696c2c43mr3844590eje.28.1695994729292; Fri, 29 Sep 2023 06:38:49 -0700 (PDT) Received: from slackware.local ([89.249.73.142]) by smtp.gmail.com with ESMTPSA id zg22-20020a170907249600b009a5f1d15642sm12431287ejb.158.2023.09.29.06.38.48 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 29 Sep 2023 06:38:49 -0700 (PDT) From: Vyacheslav Yurkov To: openembedded-devel@lists.openembedded.org Cc: Vyacheslav Yurkov Subject: [meta-filesystems][PATCH 1/3] overlayfs-tools: Drop unneeded dependency Date: Fri, 29 Sep 2023 15:37:22 +0200 Message-Id: <20230929133724.56928-1-uvv.mail@gmail.com> X-Mailer: git-send-email 2.35.1 MIME-Version: 1.0 List-Id: X-Webhook-Received: from li982-79.members.linode.com [45.33.32.79] by aws-us-west-2-korg-lkml-1.web.codeaurora.org with HTTPS for ; Fri, 29 Sep 2023 13:38:58 -0000 X-Groupsio-URL: https://lists.openembedded.org/g/openembedded-devel/message/105243 Signed-off-by: Vyacheslav Yurkov --- meta-filesystems/recipes-utils/overlayfs/overlayfs-tools_git.bb | 1 - 1 file changed, 1 deletion(-) diff --git a/meta-filesystems/recipes-utils/overlayfs/overlayfs-tools_git.bb b/meta-filesystems/recipes-utils/overlayfs/overlayfs-tools_git.bb index eb6e4963a..c638be9af 100644 --- a/meta-filesystems/recipes-utils/overlayfs/overlayfs-tools_git.bb +++ b/meta-filesystems/recipes-utils/overlayfs/overlayfs-tools_git.bb @@ -15,7 +15,6 @@ SRCREV = "291c7f4a3fb548d06c572700650c2e3bccb0cd27" S = "${WORKDIR}/git" B = "${S}" -DEPENDS += "attr" # Required to have the fts.h header for musl DEPENDS:append:libc-musl = " fts" From patchwork Fri Sep 29 13:37:23 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Vyacheslav Yurkov X-Patchwork-Id: 31363 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from aws-us-west-2-korg-lkml-1.web.codeaurora.org (localhost.localdomain [127.0.0.1]) by smtp.lore.kernel.org (Postfix) with ESMTP id AFEB7E71D38 for ; Fri, 29 Sep 2023 13:38:58 +0000 (UTC) Received: from mail-ej1-f44.google.com (mail-ej1-f44.google.com [209.85.218.44]) by mx.groups.io with SMTP id smtpd.web10.17426.1695994732564021262 for ; Fri, 29 Sep 2023 06:38:52 -0700 Authentication-Results: mx.groups.io; dkim=pass header.i=@gmail.com header.s=20230601 header.b=IFHaW7Qa; spf=pass (domain: gmail.com, ip: 209.85.218.44, mailfrom: uvv.mail@gmail.com) Received: by mail-ej1-f44.google.com with SMTP id a640c23a62f3a-99bf3f59905so1875794966b.3 for ; Fri, 29 Sep 2023 06:38:52 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1695994731; x=1696599531; darn=lists.openembedded.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=6PidK8aMZmgsLdEjG3L9Ga4rdG+CsUVUe0qcU8TeUK0=; b=IFHaW7QaAP0fvD5HNJjszxzPEdO/I8tviZaIfthf4El/GI4bFGWkFroPE2P7MTdyQL FRAoTKnwYNR7ule9j5Z5w87L8uUWW37pES/riOtLCrIZHUINrNFapGCraLT5TSQCUGBr 3WUt/pmViZHR+jEfoPngvJcHXMrqC95gXfTUwDLTJlaePpTDoSPFb6w9AdtEQ4pKbcj5 Tp3YGpWaCSW4PYmdgXiBlFI9b9ledDuIWS9KADb/SfGo0hajQtdlOafD7hV9szDs+fZt S5HO9c6UiGFFrBjZ6trSoob1dHnN379//hP14LSa9Qt1c0wgJcD6VbyFA7w/RMd7yFh1 F2iw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1695994731; x=1696599531; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=6PidK8aMZmgsLdEjG3L9Ga4rdG+CsUVUe0qcU8TeUK0=; b=GbzLRLajAo39b6g4mQzoZyAEkYfXusp0HSXZLqjhScCqK15g0ydxe4SOZ0apYgSVdJ xNMK2pqYfUEWVUsxd0L15TB4A3BmA8F/IyKDFcYlw0EsjgpMnbXrDGDUBBmgHkwc1Ksw OIi2NPp/o8HJsLSZ3oEwsWsOXEIOtELDqLfTirI3njdoeD0a3f6hndHQr77nHde7qczE 7QKj6g0uN89q6PUYWY+XwWbLC45DQzsDptXAfq/OHboY+6vm37UHhu2Dx/qEQUGhBxHg 05/qjynco0huDgsvddVx7qGjdGyi5x8+gKb6ftjDv4aFiWFA/THWRO618G1n2JeEJrJA 8Btg== X-Gm-Message-State: AOJu0YzIQkiC9U2EzPPUCVvI3EhtZRpilsTWm5b6pW8La2og5j7WVbz1 S9VR8yOPDEo7Yx3Na5evms9fnNSQP/pnwQYjH9Q= X-Google-Smtp-Source: AGHT+IGq6zamhVm/B0oDUdpITM2hJzHgwTNcF8diGpVUlCZtAHUIMILmqVYqSjzXyPpqs14GvdryWA== X-Received: by 2002:a17:906:3e52:b0:9b2:a798:8565 with SMTP id t18-20020a1709063e5200b009b2a7988565mr4140661eji.26.1695994730672; Fri, 29 Sep 2023 06:38:50 -0700 (PDT) Received: from slackware.local ([89.249.73.142]) by smtp.gmail.com with ESMTPSA id zg22-20020a170907249600b009a5f1d15642sm12431287ejb.158.2023.09.29.06.38.49 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 29 Sep 2023 06:38:50 -0700 (PDT) From: Vyacheslav Yurkov To: openembedded-devel@lists.openembedded.org Cc: Vyacheslav Yurkov Subject: [meta-filesystems][PATCH 2/3] overlayfs-tools: Bump up the version Date: Fri, 29 Sep 2023 15:37:23 +0200 Message-Id: <20230929133724.56928-2-uvv.mail@gmail.com> X-Mailer: git-send-email 2.35.1 In-Reply-To: <20230929133724.56928-1-uvv.mail@gmail.com> References: <20230929133724.56928-1-uvv.mail@gmail.com> MIME-Version: 1.0 List-Id: X-Webhook-Received: from li982-79.members.linode.com [45.33.32.79] by aws-us-west-2-korg-lkml-1.web.codeaurora.org with HTTPS for ; Fri, 29 Sep 2023 13:38:58 -0000 X-Groupsio-URL: https://lists.openembedded.org/g/openembedded-devel/message/105244 Drop the patches, they have been merged upstream. Signed-off-by: Vyacheslav Yurkov --- ...-so-that-it-compiles-on-Ubuntu-20.04.patch | 43 ------------------- .../0002-makefile-fix-linking-flags.patch | 33 -------------- .../overlayfs/overlayfs-tools_git.bb | 4 +- 3 files changed, 1 insertion(+), 79 deletions(-) delete mode 100644 meta-filesystems/recipes-utils/overlayfs/overlayfs-tools/0001-Fixed-includes-so-that-it-compiles-on-Ubuntu-20.04.patch delete mode 100644 meta-filesystems/recipes-utils/overlayfs/overlayfs-tools/0002-makefile-fix-linking-flags.patch diff --git a/meta-filesystems/recipes-utils/overlayfs/overlayfs-tools/0001-Fixed-includes-so-that-it-compiles-on-Ubuntu-20.04.patch b/meta-filesystems/recipes-utils/overlayfs/overlayfs-tools/0001-Fixed-includes-so-that-it-compiles-on-Ubuntu-20.04.patch deleted file mode 100644 index ed84d92c7..000000000 --- a/meta-filesystems/recipes-utils/overlayfs/overlayfs-tools/0001-Fixed-includes-so-that-it-compiles-on-Ubuntu-20.04.patch +++ /dev/null @@ -1,43 +0,0 @@ -From 81b4fbb5f52044cb348534c23f10b3884972b09b Mon Sep 17 00:00:00 2001 -From: Beat Schaer -Date: Fri, 19 Mar 2021 08:18:58 +0100 -Subject: [PATCH] Fixed includes so that it compiles on Ubuntu 20.04 - ---- -Upstream-Status: Pending - - logic.c | 3 +-- - main.c | 3 ++- - 2 files changed, 3 insertions(+), 3 deletions(-) - -diff --git a/logic.c b/logic.c -index 97767f5..47ebfaa 100644 ---- a/logic.c -+++ b/logic.c -@@ -7,8 +7,7 @@ - #include - #include - #include --#include --#include -+#include - #include - #include - #include "logic.h" -diff --git a/main.c b/main.c -index aa11239..f462b98 100644 ---- a/main.c -+++ b/main.c -@@ -12,7 +12,8 @@ - #include - #include - #include --#include -+#include -+#include - #ifndef _SYS_STAT_H - #include - #endif --- -2.25.1 - diff --git a/meta-filesystems/recipes-utils/overlayfs/overlayfs-tools/0002-makefile-fix-linking-flags.patch b/meta-filesystems/recipes-utils/overlayfs/overlayfs-tools/0002-makefile-fix-linking-flags.patch deleted file mode 100644 index 8fbb250f0..000000000 --- a/meta-filesystems/recipes-utils/overlayfs/overlayfs-tools/0002-makefile-fix-linking-flags.patch +++ /dev/null @@ -1,33 +0,0 @@ -From b4ff5886797e72d1c21da43261ca7648412f3186 Mon Sep 17 00:00:00 2001 -From: Vyacheslav Yurkov -Date: Mon, 23 May 2022 19:53:21 +0200 -Subject: [PATCH] makefile: fix linking flags - -LDLIBS should be placed at the end according to -https://www.gnu.org/software/make/manual/html_node/Catalogue-of-Rules.html - -Signed-off-by: Vyacheslav Yurkov ---- -Upstream-Status: Pending - - makefile | 4 ++-- - 1 file changed, 2 insertions(+), 2 deletions(-) - -diff --git a/makefile b/makefile -index fb1bed4..038c7ce 100644 ---- a/makefile -+++ b/makefile -@@ -1,11 +1,11 @@ - CFLAGS = -Wall -std=c99 --LFLAGS = -lm -+LDLIBS = -lm - CC = gcc - - all: overlay - - overlay: main.o logic.o sh.o -- $(CC) $(LFLAGS) main.o logic.o sh.o -o overlay -+ $(CC) main.o logic.o sh.o -o overlay $(LDLIBS) - - main.o: main.c logic.h - $(CC) $(CFLAGS) -c main.c diff --git a/meta-filesystems/recipes-utils/overlayfs/overlayfs-tools_git.bb b/meta-filesystems/recipes-utils/overlayfs/overlayfs-tools_git.bb index c638be9af..de5155133 100644 --- a/meta-filesystems/recipes-utils/overlayfs/overlayfs-tools_git.bb +++ b/meta-filesystems/recipes-utils/overlayfs/overlayfs-tools_git.bb @@ -5,12 +5,10 @@ LIC_FILES_CHKSUM = "file://LICENSE.txt;md5=f312a7c4d02230e8f2b537295d375c69" SRC_URI = "\ git://github.com/kmxz/overlayfs-tools.git;protocol=https;branch=master \ - file://0001-Fixed-includes-so-that-it-compiles-on-Ubuntu-20.04.patch \ - file://0002-makefile-fix-linking-flags.patch \ " PV = "1.0+git${SRCPV}" -SRCREV = "291c7f4a3fb548d06c572700650c2e3bccb0cd27" +SRCREV = "b5e5a829895ac98ccfe4629fbfbd8b819262bd00" S = "${WORKDIR}/git" B = "${S}" From patchwork Fri Sep 29 13:37:24 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Vyacheslav Yurkov X-Patchwork-Id: 31364 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from aws-us-west-2-korg-lkml-1.web.codeaurora.org (localhost.localdomain [127.0.0.1]) by smtp.lore.kernel.org (Postfix) with ESMTP id B0F77E71D3A for ; Fri, 29 Sep 2023 13:38:58 +0000 (UTC) Received: from mail-ed1-f49.google.com (mail-ed1-f49.google.com [209.85.208.49]) by mx.groups.io with SMTP id smtpd.web10.17427.1695994734594112793 for ; Fri, 29 Sep 2023 06:38:54 -0700 Authentication-Results: mx.groups.io; dkim=pass header.i=@gmail.com header.s=20230601 header.b=jnuoyN2l; spf=pass (domain: gmail.com, ip: 209.85.208.49, mailfrom: uvv.mail@gmail.com) Received: by mail-ed1-f49.google.com with SMTP id 4fb4d7f45d1cf-53627feca49so3048441a12.1 for ; Fri, 29 Sep 2023 06:38:54 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1695994732; x=1696599532; darn=lists.openembedded.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=Sas3JVRrLEhvz6zYF61YHf/cRSu+tElDyGWCDvYAq/s=; b=jnuoyN2lrG5sAtKPtgIKztK8Ysvgm+OYCJlBKnT4t9VxotyGx57iVQnbFL/oedR6/U +WH8pvnTVi+DgKutZtNvP6Rieeb9C4pB1CL7XQzrHoPEYiwbCO+fS3xse1b7ltkxeNSz X5qVsY4QACvMaVX7LHTB8inh+C/2tsZ3D6Qp2Jda1S3pWE6hYjov6fURGb0Z9w5vQG2F 8LpS1/2f5GWTnlta2r8ypzZYsi7zCQ+G2JB8wyj+6xuMNdc1CeldrRnNoTwpwgftWSnb H3M+pogv1tQ1M95uK4S66NRJy0g8E4zDULbZH2Y7aQOUMEdUIEX+5f94djnanp7V5WIg FDcQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1695994732; x=1696599532; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=Sas3JVRrLEhvz6zYF61YHf/cRSu+tElDyGWCDvYAq/s=; b=ckyi+5LL7vgAdh3nilBndbMSsyouYZmAjlw9ZQLzQi8sU49JohexW+SoSALcuh2j3a mb3poMyW2E1RmlxEPq4ke2CJ56HeNLl0Ud2frNF5lcKanHJxFAfBokiHUQ2w3XMz0pEE Am6q3GLqv2CCZpCjaX1UUJBWh4Q3hR3XINAZs3AHJaWNESSWN4d3DR3PqPMg8R5t3CtH xglIacU3vRNSKqU2X1cFhKEd48zi5TKlKu1Gn+vPdW2bilJy3vbN1ycJPCA3nQCLxGqz YthCByoCX4rdFhjYiuBJ42ZvzTuG8ayZ7UA37jQFLG9PAVPB+9XIr2prfZR/azwPv1uq h+9g== X-Gm-Message-State: AOJu0Yws03KOnnQmN3T0as8IzETB5XWzposSq7h1wMjf3rqRr9eyfZtk IRJM5Q1bmLEJqh2Bm02XXsfI4mw0MHdSYyD0myE= X-Google-Smtp-Source: AGHT+IHb40yt2rQK46I3TYkfbGjs7KYDhmSabqUeJHtFORuvjsFfpR2kacq6LOw0SI2kNFVnV5/Ydw== X-Received: by 2002:a17:906:3287:b0:9ad:8a29:f26a with SMTP id 7-20020a170906328700b009ad8a29f26amr3643245ejw.63.1695994732144; Fri, 29 Sep 2023 06:38:52 -0700 (PDT) Received: from slackware.local ([89.249.73.142]) by smtp.gmail.com with ESMTPSA id zg22-20020a170907249600b009a5f1d15642sm12431287ejb.158.2023.09.29.06.38.50 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 29 Sep 2023 06:38:51 -0700 (PDT) From: Vyacheslav Yurkov To: openembedded-devel@lists.openembedded.org Cc: Vyacheslav Yurkov Subject: [meta-filesystems][PATCH 3/3] overlayfs-tools: Install fsck binary Date: Fri, 29 Sep 2023 15:37:24 +0200 Message-Id: <20230929133724.56928-3-uvv.mail@gmail.com> X-Mailer: git-send-email 2.35.1 In-Reply-To: <20230929133724.56928-1-uvv.mail@gmail.com> References: <20230929133724.56928-1-uvv.mail@gmail.com> MIME-Version: 1.0 List-Id: X-Webhook-Received: from li982-79.members.linode.com [45.33.32.79] by aws-us-west-2-korg-lkml-1.web.codeaurora.org with HTTPS for ; Fri, 29 Sep 2023 13:38:58 -0000 X-Groupsio-URL: https://lists.openembedded.org/g/openembedded-devel/message/105245 Two projects, overlayfs-tools and overlayfs-progs, were combined upstream. Signed-off-by: Vyacheslav Yurkov --- ...-Makefile-proper-location-of-LDFLAGS.patch | 32 ------------------- .../overlayfs/overlayfs-progs_git.bb | 32 ------------------- .../overlayfs/overlayfs-tools_git.bb | 5 +-- 3 files changed, 1 insertion(+), 68 deletions(-) delete mode 100644 meta-filesystems/recipes-utils/overlayfs/overlayfs-progs/0001-Makefile-proper-location-of-LDFLAGS.patch delete mode 100644 meta-filesystems/recipes-utils/overlayfs/overlayfs-progs_git.bb diff --git a/meta-filesystems/recipes-utils/overlayfs/overlayfs-progs/0001-Makefile-proper-location-of-LDFLAGS.patch b/meta-filesystems/recipes-utils/overlayfs/overlayfs-progs/0001-Makefile-proper-location-of-LDFLAGS.patch deleted file mode 100644 index 2c001834b..000000000 --- a/meta-filesystems/recipes-utils/overlayfs/overlayfs-progs/0001-Makefile-proper-location-of-LDFLAGS.patch +++ /dev/null @@ -1,32 +0,0 @@ -From 8eeaee82dcfdf47f16ad880e416b722827f41bdb Mon Sep 17 00:00:00 2001 -From: Vyacheslav Yurkov -Date: Mon, 23 May 2022 19:37:32 +0200 -Subject: [PATCH] Makefile: proper location of LDFLAGS - -Signed-off-by: Vyacheslav Yurkov ---- -Upstream-Status: Pending - - Makefile | 4 ++-- - 1 file changed, 2 insertions(+), 2 deletions(-) - -diff --git a/Makefile b/Makefile -index e3c5207..14b155e 100644 ---- a/Makefile -+++ b/Makefile -@@ -1,5 +1,5 @@ - CFLAGS = -Wall -g --LFLAGS = -lm -+LDFLAGS = -lm - CC = gcc - - all: overlay -@@ -7,7 +7,7 @@ all: overlay - objects = fsck.o common.o lib.o check.o mount.o path.o overlayfs.o - - overlay: $(objects) -- $(CC) $(LFLAGS) $(objects) -o fsck.overlay -+ $(CC) $(objects) -o fsck.overlay $(LDFLAGS) - - .c.o: - $(CC) $(CFLAGS) -c $< diff --git a/meta-filesystems/recipes-utils/overlayfs/overlayfs-progs_git.bb b/meta-filesystems/recipes-utils/overlayfs/overlayfs-progs_git.bb deleted file mode 100644 index 9d58b9a63..000000000 --- a/meta-filesystems/recipes-utils/overlayfs/overlayfs-progs_git.bb +++ /dev/null @@ -1,32 +0,0 @@ -SUMMARY = "File system check utility for OverlayFS" -HOMEPAGE = "https://github.com/hisilicon/overlayfs-progs" -LICENSE = "PD" -LIC_FILES_CHKSUM = "file://${COREBASE}/meta/files/common-licenses/PD;md5=b3597d12946881e13cb3b548d1173851" - -SRC_URI = "\ - git://github.com/hisilicon/overlayfs-progs.git;protocol=https;branch=master \ - file://0001-Makefile-proper-location-of-LDFLAGS.patch \ -" - -PV = "1.0+git${SRCPV}" -SRCREV = "e10ef686570d9c7eff42f52461593a5c15da56bd" - -S = "${WORKDIR}/git" -B = "${S}" - -# Required to have the fts.h header for musl -DEPENDS:append:libc-musl = " fts" -# Fix the missing fts libs when using musl -EXTRA_OEMAKE:append:libc-musl = " LDFLAGS='-lfts'" - -EXTRA_OEMAKE += "'CC=${CC} -O2' " -TARGET_CC_ARCH += "${LDFLAGS}" - -do_compile () { - oe_runmake -} - -do_install () { - install -d ${D}${bindir} - install -m 0755 ${B}/fsck.overlay ${D}${bindir} -} diff --git a/meta-filesystems/recipes-utils/overlayfs/overlayfs-tools_git.bb b/meta-filesystems/recipes-utils/overlayfs/overlayfs-tools_git.bb index de5155133..ca2ec9cc4 100644 --- a/meta-filesystems/recipes-utils/overlayfs/overlayfs-tools_git.bb +++ b/meta-filesystems/recipes-utils/overlayfs/overlayfs-tools_git.bb @@ -21,11 +21,8 @@ EXTRA_OEMAKE += "'CC=${CC} -O2'" EXTRA_OEMAKE:append:libc-musl = " LDLIBS=-lfts" TARGET_CC_ARCH += "${LDFLAGS}" -do_compile () { - oe_runmake -} - do_install () { install -d ${D}${bindir} install -m 0755 ${B}/overlay ${D}${bindir} + install -m 0755 ${B}/fsck.overlay ${D}${bindir} }