mirror of
https://github.com/openembedded/meta-openembedded.git
synced 2026-07-26 07:37:14 +00:00
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>
This commit is contained in:
committed by
Khem Raj
parent
ba46d91d39
commit
ae8faf8529
-43
@@ -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
|
|
||||||
|
|
||||||
-33
@@ -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
|
|
||||||
@@ -5,12 +5,10 @@ LIC_FILES_CHKSUM = "file://LICENSE.txt;md5=f312a7c4d02230e8f2b537295d375c69"
|
|||||||
|
|
||||||
SRC_URI = "\
|
SRC_URI = "\
|
||||||
git://github.com/kmxz/overlayfs-tools.git;protocol=https;branch=master \
|
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}"
|
PV = "1.0+git${SRCPV}"
|
||||||
SRCREV = "291c7f4a3fb548d06c572700650c2e3bccb0cd27"
|
SRCREV = "b5e5a829895ac98ccfe4629fbfbd8b819262bd00"
|
||||||
|
|
||||||
S = "${WORKDIR}/git"
|
S = "${WORKDIR}/git"
|
||||||
B = "${S}"
|
B = "${S}"
|
||||||
|
|||||||
Reference in New Issue
Block a user