diff mbox series

[meta-filesystems,3/3] overlayfs-tools: Install fsck binary

Message ID 20230929133724.56928-3-uvv.mail@gmail.com
State Under Review
Headers show
Series [meta-filesystems,1/3] overlayfs-tools: Drop unneeded dependency | expand

Commit Message

Vyacheslav Yurkov Sept. 29, 2023, 1:37 p.m. UTC 
Two projects, overlayfs-tools and overlayfs-progs, were combined
upstream.

Signed-off-by: Vyacheslav Yurkov <uvv.mail@gmail.com>
---
 ...-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

Comments

Khem Raj Sept. 29, 2023, 4:21 p.m. UTC | #1 
On Fri, Sep 29, 2023 at 6:38 AM Vyacheslav Yurkov <uvv.mail@gmail.com> wrote:
>
> Two projects, overlayfs-tools and overlayfs-progs, were combined
> upstream.

Merging into one is fine however there are dependencies on
overlayfs-progs so perhaps we need to add
RPROVIDES = "overlayfs-progs" to overlayfs-tools_git.bb and then
update the recipes e.g. xftests to depend on overayfs-tools

>
> Signed-off-by: Vyacheslav Yurkov <uvv.mail@gmail.com>
> ---
>  ...-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 <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 $<
> 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}
>  }
> --
> 2.35.1
>
>
> -=-=-=-=-=-=-=-=-=-=-=-
> Links: You receive all messages sent to this group.
> View/Reply Online (#105245): https://lists.openembedded.org/g/openembedded-devel/message/105245
> Mute This Topic: https://lists.openembedded.org/mt/101657502/1997914
> Group Owner: openembedded-devel+owner@lists.openembedded.org
> Unsubscribe: https://lists.openembedded.org/g/openembedded-devel/unsub [raj.khem@gmail.com]
> -=-=-=-=-=-=-=-=-=-=-=-
>
Vyacheslav Yurkov Sept. 29, 2023, 5:48 p.m. UTC | #2 
Thanks for catching this. I'd rather change the dependency in V2.

Slava

On Fri, Sep 29, 2023, 10:22 Khem Raj <raj.khem@gmail.com> wrote:

> On Fri, Sep 29, 2023 at 6:38 AM Vyacheslav Yurkov <uvv.mail@gmail.com>
> wrote:
> >
> > Two projects, overlayfs-tools and overlayfs-progs, were combined
> > upstream.
>
> Merging into one is fine however there are dependencies on
> overlayfs-progs so perhaps we need to add
> RPROVIDES = "overlayfs-progs" to overlayfs-tools_git.bb and then
> update the recipes e.g. xftests to depend on overayfs-tools
>
> >
> > Signed-off-by: Vyacheslav Yurkov <uvv.mail@gmail.com>
> > ---
> >  ...-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 <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 $<
> > 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}
> >  }
> > --
> > 2.35.1
> >
> >
> > -=-=-=-=-=-=-=-=-=-=-=-
> > Links: You receive all messages sent to this group.
> > View/Reply Online (#105245):
> https://lists.openembedded.org/g/openembedded-devel/message/105245
> > Mute This Topic: https://lists.openembedded.org/mt/101657502/1997914
> > Group Owner: openembedded-devel+owner@lists.openembedded.org
> > Unsubscribe: https://lists.openembedded.org/g/openembedded-devel/unsub [
> raj.khem@gmail.com]
> > -=-=-=-=-=-=-=-=-=-=-=-
> >
>
diff mbox series

Patch

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 <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 $<
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}
 }