From patchwork Fri Sep 29 22:26:57 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Vyacheslav Yurkov X-Patchwork-Id: 31443 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 0392DE77343 for ; Fri, 29 Sep 2023 22:28:30 +0000 (UTC) Received: from mail-ej1-f45.google.com (mail-ej1-f45.google.com [209.85.218.45]) by mx.groups.io with SMTP id smtpd.web10.30977.1696026505450706287 for ; Fri, 29 Sep 2023 15:28:25 -0700 Authentication-Results: mx.groups.io; dkim=pass header.i=@gmail.com header.s=20230601 header.b=be2s90mv; spf=pass (domain: gmail.com, ip: 209.85.218.45, mailfrom: uvv.mail@gmail.com) Received: by mail-ej1-f45.google.com with SMTP id a640c23a62f3a-9ad810be221so2006216066b.2 for ; Fri, 29 Sep 2023 15:28:25 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1696026504; x=1696631304; 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=be2s90mvvq+j+bb0POnTDxGvpL1gI/BCQq4kKgrK/AcNUQopPrCRcXjF2WL21oSl74 4WMPPNYxsdXBuwJtlGXXV4W0yoNmDqQnKAL24Ttd7mzsm+q9hR2mIxK+pxahfdZeVz1C KJdXpZXlaPxpSc7DNZ0rjUMjdBOQRvlHjXj1HwNGG+E6LBIXE+suCfHZlwObfFwYLYta nmO9+5/6ABOw6GccwW3OYml+VhGwdMIyvcmfp+NLz6kUs+bQIvcKs/MEsH8dPRdFYoqq ZAtNUTa8qQ5FJi0gi35UZffkF6c1UpcL+D1oM4z1XMi/CflU3c4cfXDQ3o9GnyMTypV9 GCAw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1696026504; x=1696631304; 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=dRzyjU8t8zvlVZ+M3x8DCBN1qoOaE5rX07oBEaoSf/qEeysDfLRaGlncCrwNkuy3Pu Lkt6vF1665dLKUcZlo4UsX5Oh04pk/kONUklkWIjJ7jwSoNLkNvcyW2wOOCPgB34wEer JkpAdMZ6aDgTa0JFG7SYRMSX9bHyRAGNFWQb8nnIUP8avyautdFBvhDuLluA11DmdZvm u7TDIRoDHz3SG2pE/xy5MAYX4asO2rOi+puKyhYbv+eQzyh0cReRZt3ZSQLKjAaOxBd+ HubyaZ5WnenfN2SKIJlgNYKDNB4Yb13+rb9w0bs+bs1voIcnCB4EzO+W9e5wvWlWRQUi 6qkg== X-Gm-Message-State: AOJu0Yy9EszU+Nn0vDHKAe0aMxxUXTDWkftauLfIyvcqpoCicAr28NE3 zS6hD/vE5bqFFiS0EE60vECbIajdVu15mdHK X-Google-Smtp-Source: AGHT+IHOL8QKdlkGXsno2PIaShat/eQAaKe/tP9TkcLZKSWaf5r2YS73c3WA3I3Z4C2SYrpszPCscg== X-Received: by 2002:a17:907:1dca:b0:9ae:43be:e5f5 with SMTP id og10-20020a1709071dca00b009ae43bee5f5mr5224884ejc.4.1696026503493; Fri, 29 Sep 2023 15:28:23 -0700 (PDT) Received: from slackware.local ([89.249.73.138]) by smtp.gmail.com with ESMTPSA id a19-20020a170906275300b0099290e2c163sm12953660ejd.204.2023.09.29.15.28.21 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 29 Sep 2023 15:28:23 -0700 (PDT) From: Vyacheslav Yurkov To: openembedded-devel@lists.openembedded.org Cc: Vyacheslav Yurkov Subject: [meta-filesystems][PATCH v2 1/3] overlayfs-tools: Drop unneeded dependency Date: Sat, 30 Sep 2023 00:26:57 +0200 Message-Id: <20230929222659.57046-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 22:28:30 -0000 X-Groupsio-URL: https://lists.openembedded.org/g/openembedded-devel/message/105277 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 22:26:58 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Vyacheslav Yurkov X-Patchwork-Id: 31442 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 F08FAE77347 for ; Fri, 29 Sep 2023 22:28:29 +0000 (UTC) Received: from mail-ej1-f43.google.com (mail-ej1-f43.google.com [209.85.218.43]) by mx.groups.io with SMTP id smtpd.web11.30820.1696026507027471970 for ; Fri, 29 Sep 2023 15:28:27 -0700 Authentication-Results: mx.groups.io; dkim=pass header.i=@gmail.com header.s=20230601 header.b=cYNuidRl; spf=pass (domain: gmail.com, ip: 209.85.218.43, mailfrom: uvv.mail@gmail.com) Received: by mail-ej1-f43.google.com with SMTP id a640c23a62f3a-99de884ad25so1990264266b.3 for ; Fri, 29 Sep 2023 15:28:26 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1696026505; x=1696631305; 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=cYNuidRlCSOWIvVk1CPb3eMHzIqxGSPsrYlJDYevMvxbYlaRQntGqA4d1cG97nA+Ey xNR0hFA5tdzvyzJSD8qDwN+QVrVU2S9fWINiOg7C8HBn8i/2elZsj6Y4d+MK7m50E6Z+ rGDSwjyefMifZJacaZs8aTB0BqyrwggV0c4Kq26ntMTnqxI4fdQoXcdk/f50iAwzA9b2 Fl2KUuZ4NsyRpgArqBtYMFH0cjxvcxFg++lNEvD/yk1gVznds5k20V2vVSS4lkTbUgRF SkNuMZ1PeuEyuH/7UsK55NSCzEzRObxmcisGdjw3BWtJ3ki1a1M2hZZgNVUGLTWwy9Fz B3Gw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1696026505; x=1696631305; 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=ls7TLl1LNl+m2GtVONXdexROkE4U8HoKW5DtJChjAEh8a7F6FLhA5KLPt0jTeI5Q65 kDu0d3kU0J16mC2KHR2uBj8a3bn6KDnZv0KGsaQs34WiOdzFyuT0ZuJPlkgukfqdnG/F Mp4uIwGGf6soPEFd7RqZ/Ji35GB5DwYxV1SuB/0Gu6Mf0c23RmPefiHNjK5Y1ZZUz/zZ jm05gP/s027DhJ1DNjUEr3eTHh6BbMB1lI52Id3daoJmtu7yYCtgTmIH8mX6mfCR5kaE 6TYqLSTjHoIlzMxRcpmrQwClIxcmQBn87Zc8S5eF000++O3mr7398oPdOFlsV3ir/xQJ rFKw== X-Gm-Message-State: AOJu0Yy+5KUraF6mOCeYZJSWcQrtfSuM09G7Hp4PeVfG0jsWNNuWrF6p KMnR7/6ochFjjLPr3GIfX/yAT0bpYtDunsd5 X-Google-Smtp-Source: AGHT+IGvgenN7FmgjyL6/RynoXfb2olpxesORFl3q0CY0kMSYz0JDk2iS9pKjqk45rnYhU97xFXX8Q== X-Received: by 2002:a17:907:7804:b0:9b2:b7f2:bc7a with SMTP id la4-20020a170907780400b009b2b7f2bc7amr5164491ejc.34.1696026505293; Fri, 29 Sep 2023 15:28:25 -0700 (PDT) Received: from slackware.local ([89.249.73.138]) by smtp.gmail.com with ESMTPSA id a19-20020a170906275300b0099290e2c163sm12953660ejd.204.2023.09.29.15.28.23 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 29 Sep 2023 15:28:24 -0700 (PDT) From: Vyacheslav Yurkov To: openembedded-devel@lists.openembedded.org Cc: Vyacheslav Yurkov Subject: [meta-filesystems][PATCH v2 2/3] overlayfs-tools: Bump up the version Date: Sat, 30 Sep 2023 00:26:58 +0200 Message-Id: <20230929222659.57046-2-uvv.mail@gmail.com> X-Mailer: git-send-email 2.35.1 In-Reply-To: <20230929222659.57046-1-uvv.mail@gmail.com> References: <20230929222659.57046-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 22:28:29 -0000 X-Groupsio-URL: https://lists.openembedded.org/g/openembedded-devel/message/105278 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 22:26:59 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Vyacheslav Yurkov X-Patchwork-Id: 31441 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 F2D57E7734A for ; Fri, 29 Sep 2023 22:28:29 +0000 (UTC) Received: from mail-ej1-f50.google.com (mail-ej1-f50.google.com [209.85.218.50]) by mx.groups.io with SMTP id smtpd.web10.30981.1696026508798451974 for ; Fri, 29 Sep 2023 15:28:29 -0700 Authentication-Results: mx.groups.io; dkim=pass header.i=@gmail.com header.s=20230601 header.b=mpmA2KrW; spf=pass (domain: gmail.com, ip: 209.85.218.50, mailfrom: uvv.mail@gmail.com) Received: by mail-ej1-f50.google.com with SMTP id a640c23a62f3a-99357737980so1966431266b.2 for ; Fri, 29 Sep 2023 15:28:28 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1696026507; x=1696631307; 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=X3EradFfn8n4y+y4Dv3a8fg7j98kENNmaeAsZXpwIB0=; b=mpmA2KrWDA8Ep558DCnTcZebt5wHr83SqBe1SvZp7cBmv3OUyN171jya7JN+HW7I1I 7woZEPRlGDdFJl3cg719S7WMsZtL0mq3SoQy7ZN5BcX3qlTAPKkG0kKrNNx0DLPSNg8b Zigr4LlMx/WYnej2Z9ZaJIRLGgKbD4CeuRH8Z1VWUKBStfooWa4SW+gGmzZ+M80tDCao khlzo2yQHM3L9H/VYAMryGp0uM51qVZEGUGYdKf+JGaGCRYpRjI7T2tuLigXoefAt5uW b7h4ksQGz/w5CJJe78AW5wZhZbBgmEAe6mbTqEecQE0Nyl2Ak/WcfKxZ0HzuCkZw/hmx f8VA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1696026507; x=1696631307; 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=X3EradFfn8n4y+y4Dv3a8fg7j98kENNmaeAsZXpwIB0=; b=pa57myLzF0VN5LeAfDq0nTDTQ5pKEa8W/FM7Dn+85sE3J50pHY3+wibXGFJzKXTEFI Lhu4hOEXa5GR98qrYQ4oIzTBGoccN99kmWKrzyXtKfhenJnTZXWhZFW/39dSxGJ0aG8n UiighIzLDCxsLkApuuvZIZFQChnFQhGzk77Ma3cKU5DCKphiTa60nJ6KDOcvwWD3ZYjN PbzFd8cn3aRyORWBztgeti6j25yKfRdDWt813Rf+LM6mrp6wCD08sIUO1JGGFDnkW0Lx WD+RvSpbk2EzJl6DR9P1DzFUo6Mrjhq/m5hNqqUC2Ojtvk+32Ogg55IZsJ7cj9UYXlhS jHoQ== X-Gm-Message-State: AOJu0YyGzLA4uTfGCu58PuADUw89K2tYIxp6H/O5ZX5/5avMNlETkmi/ jMHHIBYDDZhum/n0UrGU/tj6T3DNG7iP7gSo X-Google-Smtp-Source: AGHT+IHSsjcLiLwivxKmCWXPZRAHZsnpcmPjD6gf5u1fSfdVDsYS8BlhZfJHRPVY4O0bTOctFOh70A== X-Received: by 2002:a17:906:c801:b0:994:555a:e49f with SMTP id cx1-20020a170906c80100b00994555ae49fmr4527708ejb.31.1696026507035; Fri, 29 Sep 2023 15:28:27 -0700 (PDT) Received: from slackware.local ([89.249.73.138]) by smtp.gmail.com with ESMTPSA id a19-20020a170906275300b0099290e2c163sm12953660ejd.204.2023.09.29.15.28.25 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 29 Sep 2023 15:28:26 -0700 (PDT) From: Vyacheslav Yurkov To: openembedded-devel@lists.openembedded.org Cc: Vyacheslav Yurkov Subject: [meta-filesystems][PATCH v2 3/3] overlayfs-tools: Install fsck binary Date: Sat, 30 Sep 2023 00:26:59 +0200 Message-Id: <20230929222659.57046-3-uvv.mail@gmail.com> X-Mailer: git-send-email 2.35.1 In-Reply-To: <20230929222659.57046-1-uvv.mail@gmail.com> References: <20230929222659.57046-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 22:28:29 -0000 X-Groupsio-URL: https://lists.openembedded.org/g/openembedded-devel/message/105279 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 +-- .../xfstests/xfstests_2023.03.05.bb | 2 +- 4 files changed, 2 insertions(+), 69 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} } diff --git a/meta-filesystems/recipes-utils/xfstests/xfstests_2023.03.05.bb b/meta-filesystems/recipes-utils/xfstests/xfstests_2023.03.05.bb index fdfe04574..cfb6e4fd8 100644 --- a/meta-filesystems/recipes-utils/xfstests/xfstests_2023.03.05.bb +++ b/meta-filesystems/recipes-utils/xfstests/xfstests_2023.03.05.bb @@ -28,7 +28,7 @@ RDEPENDS:${PN} += "\ e2fsprogs-resize2fs \ libaio \ libcap-bin \ - overlayfs-progs \ + overlayfs-tools \ perl \ python3 \ python3-core \