mirror of
https://github.com/openembedded/meta-openembedded.git
synced 2026-06-10 04:30:00 +00:00
overlayfs-tools: Install fsck binary
Two projects, overlayfs-tools and overlayfs-progs, were combined 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
ae8faf8529
commit
c63a101cf9
-32
@@ -1,32 +0,0 @@
|
|||||||
From 8eeaee82dcfdf47f16ad880e416b722827f41bdb Mon Sep 17 00:00:00 2001
|
|
||||||
From: Vyacheslav Yurkov <Vyacheslav.Yurkov@bruker.com>
|
|
||||||
Date: Mon, 23 May 2022 19:37:32 +0200
|
|
||||||
Subject: [PATCH] Makefile: proper location of LDFLAGS
|
|
||||||
|
|
||||||
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 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 $<
|
|
||||||
@@ -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}
|
|
||||||
}
|
|
||||||
@@ -21,11 +21,8 @@ EXTRA_OEMAKE += "'CC=${CC} -O2'"
|
|||||||
EXTRA_OEMAKE:append:libc-musl = " LDLIBS=-lfts"
|
EXTRA_OEMAKE:append:libc-musl = " LDLIBS=-lfts"
|
||||||
TARGET_CC_ARCH += "${LDFLAGS}"
|
TARGET_CC_ARCH += "${LDFLAGS}"
|
||||||
|
|
||||||
do_compile () {
|
|
||||||
oe_runmake
|
|
||||||
}
|
|
||||||
|
|
||||||
do_install () {
|
do_install () {
|
||||||
install -d ${D}${bindir}
|
install -d ${D}${bindir}
|
||||||
install -m 0755 ${B}/overlay ${D}${bindir}
|
install -m 0755 ${B}/overlay ${D}${bindir}
|
||||||
|
install -m 0755 ${B}/fsck.overlay ${D}${bindir}
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -28,7 +28,7 @@ RDEPENDS:${PN} += "\
|
|||||||
e2fsprogs-resize2fs \
|
e2fsprogs-resize2fs \
|
||||||
libaio \
|
libaio \
|
||||||
libcap-bin \
|
libcap-bin \
|
||||||
overlayfs-progs \
|
overlayfs-tools \
|
||||||
perl \
|
perl \
|
||||||
python3 \
|
python3 \
|
||||||
python3-core \
|
python3-core \
|
||||||
|
|||||||
Reference in New Issue
Block a user