diff options
author | Vyacheslav Yurkov <uvv.mail@gmail.com> | 2023-09-30 00:26:58 +0200 |
---|---|---|
committer | Armin Kuster <akuster808@gmail.com> | 2023-10-04 07:52:49 -0700 |
commit | 81a9041eb18a4805335466f087385cd65384a90d (patch) | |
tree | 1d7e9561f50cdba4123fdbda8f58a8612b44b9a5 | |
parent | 6c480d224ebfb7fcdfc1c919d13d92dc086bf29e (diff) | |
download | meta-openembedded-contrib-81a9041eb18a4805335466f087385cd65384a90d.tar.gz |
overlayfs-tools: Bump up the version
Drop the patches, they have been merged upstream.
Signed-off-by: Vyacheslav Yurkov <uvv.mail@gmail.com>
Signed-off-by: Khem Raj <raj.khem@gmail.com>
(cherry picked from commit ae8faf852988cfed875e8bc73c911b89f3d052ad)
Signed-off-by: Armin Kuster <akuster808@gmail.com>
3 files changed, 1 insertions, 79 deletions
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 ed84d92c7c..0000000000 --- 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 <beat.schaer@wabtec.com> -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 <string.h> - #include <errno.h> - #include <unistd.h> --#include <attr/xattr.h> --#include <attr/attributes.h> -+#include <sys/xattr.h> - #include <fts.h> - #include <libgen.h> - #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 <linux/limits.h> - #include <stdbool.h> - #include <sys/stat.h> --#include <attr/xattr.h> -+#include <sys/xattr.h> -+#include <errno.h> - #ifndef _SYS_STAT_H - #include <linux/stat.h> - #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 8fbb250f04..0000000000 --- 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 <Vyacheslav.Yurkov@bruker.com> -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 <Vyacheslav.Yurkov@bruker.com> ---- -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 c638be9af6..de51551337 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}" |