Date   

[meta-python][PATCH] python3-traitlets: Upgrade to 5.2.1

Khem Raj
 

Fix build with latest setuptools while here.

Signed-off-by: Khem Raj <raj.khem@...>
---
.../dynamic_description.patch | 36 +++++++++++++++++++
...ts_5.2.0.bb => python3-traitlets_5.2.1.bb} | 3 +-
2 files changed, 38 insertions(+), 1 deletion(-)
create mode 100644 meta-python/recipes-devtools/python/python3-traitlets/dynamic_description.patch
rename meta-python/recipes-devtools/python/{python3-traitlets_5.2.0.bb => python3-traitlets_5.2.1.bb} (74%)

diff --git a/meta-python/recipes-devtools/python/python3-traitlets/dynamic_description.patch b/meta-python/recipes-devtools/python/python3-traitlets/dynamic_description.patch
new file mode 100644
index 0000000000..6d8e4b1f50
--- /dev/null
+++ b/meta-python/recipes-devtools/python/python3-traitlets/dynamic_description.patch
@@ -0,0 +1,36 @@
+New setuptools turns on autodiscovery of modules which ends up in funny errors like
+
+error: Multiple top-level packages discovered in a flat-layout: ['patches', 'traitlets'].
+
+To avoid accidental inclusion of unwanted files or directories,
+setuptools will not proceed with this build.
+
+
+this is becasue patches/ folder is created by quilt. Secondly, define description and version
+statically since new setuptools complain about it.
+
+Upstream-Status: Pending
+
+Signed-off-by: Khem Raj <raj.khem@...>
+--- a/pyproject.toml
++++ b/pyproject.toml
+@@ -4,6 +4,8 @@ build-backend = "hatchling.build"
+
+ [project]
+ name = "traitlets"
++version = "5.2.1"
++description = "A lightweight Traits like module"
+ authors = [{name = "IPython Development Team", email = "ipython-dev@..."}]
+ license = {file = "COPYING.md"}
+ readme = "README.md"
+@@ -18,7 +20,9 @@ classifiers = [
+ ]
+ urls = {Homepage = "https://github.com/ipython/traitlets"}
+ requires-python = ">=3.7"
+-dynamic = ["description", "version"]
++
++[tool.setuptools]
++py-modules = []
+
+ [project.optional-dependencies]
+ test = ["pytest", "pre-commit"]
diff --git a/meta-python/recipes-devtools/python/python3-traitlets_5.2.0.bb b/meta-python/recipes-devtools/python/python3-traitlets_5.2.1.bb
similarity index 74%
rename from meta-python/recipes-devtools/python/python3-traitlets_5.2.0.bb
rename to meta-python/recipes-devtools/python/python3-traitlets_5.2.1.bb
index 56ebaac675..588bddbd74 100644
--- a/meta-python/recipes-devtools/python/python3-traitlets_5.2.0.bb
+++ b/meta-python/recipes-devtools/python/python3-traitlets_5.2.1.bb
@@ -6,7 +6,8 @@ LIC_FILES_CHKSUM = "file://COPYING.md;md5=9c125dfc5ff5364d40b5f56f02cd9de3"

PYPI_PACKAGE = "traitlets"

-SRC_URI[sha256sum] = "60474f39bf1d39a11e0233090b99af3acee93bbc2281777e61dd8c87da8a0014"
+SRC_URI += "file://dynamic_description.patch"
+SRC_URI[sha256sum] = "a415578cde1985f1b773faefe49e9f078d345f38665ce3e9e914ec7b41150ce9"

RDEPENDS:${PN} = "\
${PYTHON_PN}-ipython-genutils \
--
2.36.1


[meta-filesystems][PATCH v2] overlayfs-tools: add new recipe

Vyacheslav Yurkov
 

From: Vyacheslav Yurkov <Vyacheslav.Yurkov@...>

This package provides maintenance tools for OverlayFS, such as vacuum,
diff, merge, and deref

Signed-off-by: Vyacheslav Yurkov <Vyacheslav.Yurkov@...>
---
...-so-that-it-compiles-on-Ubuntu-20.04.patch | 41 +++++++++++++++++++
.../0002-makefile-fix-linking-flags.patch | 31 ++++++++++++++
.../overlayfs/overlayfs-tools_git.bb | 34 +++++++++++++++
3 files changed, 106 insertions(+)
create mode 100644 meta-filesystems/recipes-utils/overlayfs/overlayfs-tools/0001-Fixed-includes-so-that-it-compiles-on-Ubuntu-20.04.patch
create mode 100644 meta-filesystems/recipes-utils/overlayfs/overlayfs-tools/0002-makefile-fix-linking-flags.patch
create mode 100644 meta-filesystems/recipes-utils/overlayfs/overlayfs-tools_git.bb

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
new file mode 100644
index 000000000..f7490ebce
--- /dev/null
+++ b/meta-filesystems/recipes-utils/overlayfs/overlayfs-tools/0001-Fixed-includes-so-that-it-compiles-on-Ubuntu-20.04.patch
@@ -0,0 +1,41 @@
+From 81b4fbb5f52044cb348534c23f10b3884972b09b Mon Sep 17 00:00:00 2001
+From: Beat Schaer <beat.schaer@...>
+Date: Fri, 19 Mar 2021 08:18:58 +0100
+Subject: [PATCH] Fixed includes so that it compiles on Ubuntu 20.04
+
+---
+ 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
new file mode 100644
index 000000000..cf4de18a7
--- /dev/null
+++ b/meta-filesystems/recipes-utils/overlayfs/overlayfs-tools/0002-makefile-fix-linking-flags.patch
@@ -0,0 +1,31 @@
+From b4ff5886797e72d1c21da43261ca7648412f3186 Mon Sep 17 00:00:00 2001
+From: Vyacheslav Yurkov <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 <Vyacheslav.Yurkov@...>
+---
+ 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
new file mode 100644
index 000000000..eb6e4963a
--- /dev/null
+++ b/meta-filesystems/recipes-utils/overlayfs/overlayfs-tools_git.bb
@@ -0,0 +1,34 @@
+DESCRIPTION = "Maintenance tools for OverlayFS"
+HOMEPAGE = "https://github.com/kmxz/overlayfs-tools"
+LICENSE = "WTFPL"
+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"
+
+S = "${WORKDIR}/git"
+B = "${S}"
+
+DEPENDS += "attr"
+# Required to have the fts.h header for musl
+DEPENDS:append:libc-musl = " fts"
+
+EXTRA_OEMAKE += "'CC=${CC} -O2'"
+# Fix the missing fts libs when using musl
+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}
+}
--
2.25.1


[meta-filesystems][PATCH v3] overlayfs-progs: add new recipe

Vyacheslav Yurkov
 

From: Vyacheslav Yurkov <Vyacheslav.Yurkov@...>

overlayfs-progs contains fsck.overlay, which is used to check and optionally
repair underlying directories of overlay-filesystem.

Signed-off-by: Vyacheslav Yurkov <Vyacheslav.Yurkov@...>
---
...-Makefile-proper-location-of-LDFLAGS.patch | 30 +++++++++++++++++
.../overlayfs/overlayfs-progs_git.bb | 32 +++++++++++++++++++
2 files changed, 62 insertions(+)
create mode 100644 meta-filesystems/recipes-utils/overlayfs/overlayfs-progs/0001-Makefile-proper-location-of-LDFLAGS.patch
create 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
new file mode 100644
index 000000000..d9f285d94
--- /dev/null
+++ b/meta-filesystems/recipes-utils/overlayfs/overlayfs-progs/0001-Makefile-proper-location-of-LDFLAGS.patch
@@ -0,0 +1,30 @@
+From 8eeaee82dcfdf47f16ad880e416b722827f41bdb Mon Sep 17 00:00:00 2001
+From: Vyacheslav Yurkov <Vyacheslav.Yurkov@...>
+Date: Mon, 23 May 2022 19:37:32 +0200
+Subject: [PATCH] Makefile: proper location of LDFLAGS
+
+Signed-off-by: Vyacheslav Yurkov <Vyacheslav.Yurkov@...>
+---
+ 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
new file mode 100644
index 000000000..9d58b9a63
--- /dev/null
+++ b/meta-filesystems/recipes-utils/overlayfs/overlayfs-progs_git.bb
@@ -0,0 +1,32 @@
+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}
+}
--
2.25.1


[meta-filesystems][PATCH v2] overlayfs-progs: add new recipe

Vyacheslav Yurkov
 

From: Vyacheslav Yurkov <Vyacheslav.Yurkov@...>

overlayfs-progs contains fsck.overlay, which is used to check and optionally
repair underlying directories of overlay-filesystem.

Signed-off-by: Vyacheslav Yurkov <Vyacheslav.Yurkov@...>
---
...-Makefile-proper-location-of-LDFLAGS.patch | 30 +++++++++++++++++
.../overlayfs/overlayfs-progs_git.bb | 33 +++++++++++++++++++
2 files changed, 63 insertions(+)
create mode 100644 meta-filesystems/recipes-utils/overlayfs/overlayfs-progs/0001-Makefile-proper-location-of-LDFLAGS.patch
create 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
new file mode 100644
index 000000000..d9f285d94
--- /dev/null
+++ b/meta-filesystems/recipes-utils/overlayfs/overlayfs-progs/0001-Makefile-proper-location-of-LDFLAGS.patch
@@ -0,0 +1,30 @@
+From 8eeaee82dcfdf47f16ad880e416b722827f41bdb Mon Sep 17 00:00:00 2001
+From: Vyacheslav Yurkov <Vyacheslav.Yurkov@...>
+Date: Mon, 23 May 2022 19:37:32 +0200
+Subject: [PATCH] Makefile: proper location of LDFLAGS
+
+Signed-off-by: Vyacheslav Yurkov <Vyacheslav.Yurkov@...>
+---
+ 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
new file mode 100644
index 000000000..bc3cc64e7
--- /dev/null
+++ b/meta-filesystems/recipes-utils/overlayfs/overlayfs-progs_git.bb
@@ -0,0 +1,33 @@
+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'"
+#LDLIBS:append:libc-musl = " -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}
+}
--
2.25.1


Re: kirkstone merge request: May 23rd

Khem Raj
 

merged thanks.

On Mon, May 23, 2022 at 7:42 AM akuster808 <akuster808@...> wrote:

The following changes since commit 166ef8dbb14ad98b2094a77fcf352f6c63d5abf2:

minidlna: fix obsolete license warning (2022-05-17 05:57:10 -0700)

are available in the Git repository at:

https://git.openembedded.org/meta-openembedded kirkstone-next

for you to fetch changes up to 0b78362654262145415df8211052442823b9ec9b:

bats: upgrade 1.6.0 -> 1.6.1 (2022-05-23 07:39:02 -0700)

----------------------------------------------------------------
Diego Sueiro (1):
bats: upgrade 1.6.0 -> 1.6.1

Kai Kang (1):
conntrack-tools: fix postinst script

Martin Jansa (1):
ostree: prevent ostree-native depending on target virtual/kernel
to provide kernel-module-overlay

Nicolas Dechesne (1):
imlib2: update SRC_URI

Richard Neill (1):
bats: Add patch to fix false-negatives caused by teardown code

meta-networking/recipes-filter/conntrack-tools/conntrack-tools_1.4.6.bb | 4 ++--
meta-oe/recipes-extended/ostree/ostree_2021.6.bb | 2 +-
meta-oe/recipes-graphics/imlib2/imlib2_git.bb | 2 +-
meta-oe/recipes-test/bats/{bats_1.6.0.bb =>
bats_1.6.1.bb} | 9 ++++++---
4 files changed, 10 insertions(+), 7 deletions(-)
rename meta-oe/recipes-test/bats/{bats_1.6.0.bb => bats_1.6.1.bb} (85%)


Re: [meta-filesystems][PATCH] overlayfs-progs: add new recipe

Khem Raj
 

On Sun, May 22, 2022 at 1:45 PM Vyacheslav Yurkov <uvv.mail@...> wrote:

From: Vyacheslav Yurkov <Vyacheslav.Yurkov@...>

overlayfs-progs contains fsck.overlay, which is used to check and optionally
repair underlying directories of overlay-filesystem.

Signed-off-by: Vyacheslav Yurkov <Vyacheslav.Yurkov@...>
---
.../overlayfs/overlayfs-progs_git.bb | 24 +++++++++++++++++++
1 file changed, 24 insertions(+)
create mode 100644 meta-filesystems/recipes-utils/overlayfs/overlayfs-progs_git.bb

diff --git a/meta-filesystems/recipes-utils/overlayfs/overlayfs-progs_git.bb b/meta-filesystems/recipes-utils/overlayfs/overlayfs-progs_git.bb
new file mode 100644
index 000000000..2f173b259
--- /dev/null
+++ b/meta-filesystems/recipes-utils/overlayfs/overlayfs-progs_git.bb
@@ -0,0 +1,24 @@
+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"
+
+PV = "1.0+git${SRCPV}"
+SRCREV = "e10ef686570d9c7eff42f52461593a5c15da56bd"
+
+S = "${WORKDIR}/git"
+B = "${S}"
+
+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}
+}
--
2.25.1




Re: [meta-filesystems][PATCH] overlayfs-tools: add new recipe

Khem Raj
 

On Sun, May 22, 2022 at 1:42 PM Vyacheslav Yurkov <uvv.mail@...> wrote:

From: Vyacheslav Yurkov <Vyacheslav.Yurkov@...>

This package provides maintenance tools for OverlayFS, such as vacuum,
diff, merge, and deref

Signed-off-by: Vyacheslav Yurkov <Vyacheslav.Yurkov@...>
---
...-so-that-it-compiles-on-Ubuntu-20.04.patch | 41 +++++++++++++++++++
.../overlayfs/overlayfs-tools_git.bb | 28 +++++++++++++
2 files changed, 69 insertions(+)
create mode 100644 meta-filesystems/recipes-utils/overlayfs/files/0001-Fixed-includes-so-that-it-compiles-on-Ubuntu-20.04.patch
create mode 100644 meta-filesystems/recipes-utils/overlayfs/overlayfs-tools_git.bb

diff --git a/meta-filesystems/recipes-utils/overlayfs/files/0001-Fixed-includes-so-that-it-compiles-on-Ubuntu-20.04.patch b/meta-filesystems/recipes-utils/overlayfs/files/0001-Fixed-includes-so-that-it-compiles-on-Ubuntu-20.04.patch
new file mode 100644
index 000000000..f7490ebce
--- /dev/null
+++ b/meta-filesystems/recipes-utils/overlayfs/files/0001-Fixed-includes-so-that-it-compiles-on-Ubuntu-20.04.patch
@@ -0,0 +1,41 @@
+From 81b4fbb5f52044cb348534c23f10b3884972b09b Mon Sep 17 00:00:00 2001
+From: Beat Schaer <beat.schaer@...>
+Date: Fri, 19 Mar 2021 08:18:58 +0100
+Subject: [PATCH] Fixed includes so that it compiles on Ubuntu 20.04
+
+---
+ 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_git.bb b/meta-filesystems/recipes-utils/overlayfs/overlayfs-tools_git.bb
new file mode 100644
index 000000000..b0406fbae
--- /dev/null
+++ b/meta-filesystems/recipes-utils/overlayfs/overlayfs-tools_git.bb
@@ -0,0 +1,28 @@
+DESCRIPTION = "Maintenance tools for OverlayFS"
+HOMEPAGE = "https://github.com/kmxz/overlayfs-tools"
+LICENSE = "WTFPL"
+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 \
+"
+
+PV = "1.0+git${SRCPV}"
+SRCREV = "291c7f4a3fb548d06c572700650c2e3bccb0cd27"
+
+S = "${WORKDIR}/git"
+B = "${S}"
+
+DEPENDS += "attr"
+EXTRA_OEMAKE += "'CC=${CC} -O2'"
+TARGET_CC_ARCH += "${LDFLAGS}"
+
+do_compile () {
+ oe_runmake
+}
+
+do_install () {
+ install -d ${D}${bindir}
+ install -m 0755 ${B}/overlay ${D}${bindir}
+}
--
2.25.1




kirkstone merge request: May 23rd

Armin Kuster
 

The following changes since commit 166ef8dbb14ad98b2094a77fcf352f6c63d5abf2:

  minidlna: fix obsolete license warning (2022-05-17 05:57:10 -0700)

are available in the Git repository at:

  https://git.openembedded.org/meta-openembedded kirkstone-next

for you to fetch changes up to 0b78362654262145415df8211052442823b9ec9b:

  bats: upgrade 1.6.0 -> 1.6.1 (2022-05-23 07:39:02 -0700)

----------------------------------------------------------------
Diego Sueiro (1):
      bats: upgrade 1.6.0 -> 1.6.1

Kai Kang (1):
      conntrack-tools: fix postinst script

Martin Jansa (1):
      ostree: prevent ostree-native depending on target virtual/kernel to provide kernel-module-overlay

Nicolas Dechesne (1):
      imlib2: update SRC_URI

Richard Neill (1):
      bats: Add patch to fix false-negatives caused by teardown code

 meta-networking/recipes-filter/conntrack-tools/conntrack-tools_1.4.6.bb | 4 ++--
 meta-oe/recipes-extended/ostree/ostree_2021.6.bb | 2 +-
 meta-oe/recipes-graphics/imlib2/imlib2_git.bb | 2 +-
 meta-oe/recipes-test/bats/{bats_1.6.0.bb => bats_1.6.1.bb}              | 9 ++++++---
 4 files changed, 10 insertions(+), 7 deletions(-)
 rename meta-oe/recipes-test/bats/{bats_1.6.0.bb => bats_1.6.1.bb} (85%)


[meta-oe][PATCH] mm-common: package the files from ${PN} in ${PN}-dev and use allarch

Martin Jansa
 

* based on this bbappend from 2012:
https://github.com/openwebos/meta-webos/commit/f4745112438a5ba1913708b6b6ac30234ec8076e
time to finally get rid of it

Signed-off-by: Martin Jansa <Martin.Jansa@...>
---
.../recipes-core/mm-common/mm-common_1.0.4.bb | 16 ++++++++++++++++
1 file changed, 16 insertions(+)

diff --git a/meta-oe/recipes-core/mm-common/mm-common_1.0.4.bb b/meta-oe/recipes-core/mm-common/mm-common_1.0.4.bb
index 33969ff7a2..1ffdcfd045 100644
--- a/meta-oe/recipes-core/mm-common/mm-common_1.0.4.bb
+++ b/meta-oe/recipes-core/mm-common/mm-common_1.0.4.bb
@@ -6,7 +6,23 @@ GNOMEBASEBUILDCLASS = "meson"

inherit gnomebase

+# All the recipe does is stage python and shell script, some autotools files; nothing is compiled.
+inherit allarch
+
SRC_URI[archive.sha256sum] = "e954c09b4309a7ef93e13b69260acdc5738c907477eb381b78bb1e414ee6dbd8"
SRC_URI += "file://0001-meson.build-do-not-ask-for-python-installation-versi.patch"

BBCLASSEXTEND = "native"
+
+# These files aren't very usefull on target image, package them all in nnPN-dev
+FILES:${PN} = ""
+
+FILES:${PN}-dev += " \
+ ${datadir}/${BPN}/build \
+ ${datadir}/${BPN}/doctags \
+ ${datadir}/${BPN}/doctool \
+ ${bindir}/mm-common-get \
+ ${bindir}/mm-common-prepare \
+"
+# ${PN} package is empty, remove the default dependency on it
+RDEPENDS:${PN}-dev = ""
--
2.35.1


[meta-oe] [PATCH] opencl-headers: upgrade 2022.01.04 -> 2022.05.18

wangmy
 

Changelog:
Add cl_ext_image_from_buffer extension definition
(https://github.com/KhronosGroup/OpenCL-Headers/pull/196)

Signed-off-by: Wang Mingyu <wangmy@...>
---
meta-oe/recipes-core/opencl/opencl-headers_git.bb | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/meta-oe/recipes-core/opencl/opencl-headers_git.bb b/meta-oe/recipes-core/opencl/opencl-headers_git.bb
index 5e8e6f07f..4ecb8fc7d 100644
--- a/meta-oe/recipes-core/opencl/opencl-headers_git.bb
+++ b/meta-oe/recipes-core/opencl/opencl-headers_git.bb
@@ -5,8 +5,8 @@ LIC_FILES_CHKSUM = "file://LICENSE;md5=3b83ef96387f14655fc854ddc3c6bd57"
SECTION = "base"

S = "${WORKDIR}/git"
-PV = "v2022.01.04+git${SRCPV}"
-SRCREV = "59ac4dc2f282286d8db83143686cfe37ec658b84"
+PV = "2022.05.18"
+SRCREV = "def8be9d35fda35492b72f54a94515f7df8d1e9f"
SRC_URI = "git://github.com/KhronosGroup/OpenCL-Headers.git;branch=main;protocol=https"

do_configure[noexec] = "1"
--
2.25.1


[meta-oe] [PATCH] thingsboard-gateway: upgrade 2.9 -> 3.1

wangmy
 

Changelog:
https://github.com/thingsboard/thingsboard-gateway/releases/tag/3.1

Signed-off-by: Wang Mingyu <wangmy@...>
---
.../{thingsboard-gateway_2.9.bb => thingsboard-gateway_3.1.bb} | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
rename meta-oe/dynamic-layers/meta-python/recipes-connectivity/thingsboard-gateway/{thingsboard-gateway_2.9.bb => thingsboard-gateway_3.1.bb} (95%)

diff --git a/meta-oe/dynamic-layers/meta-python/recipes-connectivity/thingsboard-gateway/thingsboard-gateway_2.9.bb b/meta-oe/dynamic-layers/meta-python/recipes-connectivity/thingsboard-gateway/thingsboard-gateway_3.1.bb
similarity index 95%
rename from meta-oe/dynamic-layers/meta-python/recipes-connectivity/thingsboard-gateway/thingsboard-gateway_2.9.bb
rename to meta-oe/dynamic-layers/meta-python/recipes-connectivity/thingsboard-gateway/thingsboard-gateway_3.1.bb
index 82d515dfe..ec2830d37 100644
--- a/meta-oe/dynamic-layers/meta-python/recipes-connectivity/thingsboard-gateway/thingsboard-gateway_2.9.bb
+++ b/meta-oe/dynamic-layers/meta-python/recipes-connectivity/thingsboard-gateway/thingsboard-gateway_3.1.bb
@@ -7,7 +7,7 @@ HOMEPAGE = "https://thingsboard.io/"
LICENSE = "Apache-2.0"
LIC_FILES_CHKSUM = "file://${COMMON_LICENSE_DIR}/Apache-2.0;md5=89aea4e17d99a7cacdbeed46a0096b10"

-SRC_URI[sha256sum] = "3341188a386726a5feb87e5fa04edb999de69e38ee8b4ea5b7d59165729ba0be"
+SRC_URI[sha256sum] = "1a563e062ba734d1cc6e6cbaf8016af5cfb8c2921cb06e1e7af98153af1d121c"

inherit pypi setuptools3

--
2.25.1


[meta-networking] [PATCH] nbdkit: upgrade 1.31.5 -> 1.31.7

wangmy
 

Signed-off-by: Wang Mingyu <wangmy@...>
---
.../nbdkit/{nbdkit_1.31.5.bb => nbdkit_1.31.7.bb} | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
rename meta-networking/recipes-support/nbdkit/{nbdkit_1.31.5.bb => nbdkit_1.31.7.bb} (95%)

diff --git a/meta-networking/recipes-support/nbdkit/nbdkit_1.31.5.bb b/meta-networking/recipes-support/nbdkit/nbdkit_1.31.7.bb
similarity index 95%
rename from meta-networking/recipes-support/nbdkit/nbdkit_1.31.5.bb
rename to meta-networking/recipes-support/nbdkit/nbdkit_1.31.7.bb
index 79b0001b5..2de32cc1e 100644
--- a/meta-networking/recipes-support/nbdkit/nbdkit_1.31.5.bb
+++ b/meta-networking/recipes-support/nbdkit/nbdkit_1.31.7.bb
@@ -12,7 +12,7 @@ LIC_FILES_CHKSUM = "file://LICENSE;md5=f9dcc2d8acdde215fa4bd6ac12bb14f0"
SRC_URI = "git://github.com/libguestfs/nbdkit.git;protocol=https;branch=master \
"

-SRCREV = "a671de5017546149ef38bfdbdae95c675538b93b"
+SRCREV = "7c0e2d19d30eb0bd2e079febb5a2c31f65e5023d"

S = "${WORKDIR}/git"

--
2.25.1


[meta-oe] [PATCH] smarty: upgrade 4.1.0 -> 4.1.1

wangmy
 

Changelog:
==========
Security
--------
Prevent PHP injection through malicious block name or include file name. This addresses CVE-2022-29221

Fixed
-------
Exclude docs and demo from export and composer #751
PHP 8.1 deprecation notices in demo/plugins/cacheresource.pdo.php #706
PHP 8.1 deprecation notices in truncate modifier #699
Math equation max(x, y) didn't work anymore #721
Fix PHP 8.1 deprecated warning when calling rtrim #743
PHP 8.1: fix deprecation in escape modifier #727


Signed-off-by: Wang Mingyu <wangmy@...>
---
.../recipes-support/smarty/{smarty_4.1.0.bb => smarty_4.1.1.bb} | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
rename meta-oe/recipes-support/smarty/{smarty_4.1.0.bb => smarty_4.1.1.bb} (94%)

diff --git a/meta-oe/recipes-support/smarty/smarty_4.1.0.bb b/meta-oe/recipes-support/smarty/smarty_4.1.1.bb
similarity index 94%
rename from meta-oe/recipes-support/smarty/smarty_4.1.0.bb
rename to meta-oe/recipes-support/smarty/smarty_4.1.1.bb
index 18753db2b..df441e8db 100644
--- a/meta-oe/recipes-support/smarty/smarty_4.1.0.bb
+++ b/meta-oe/recipes-support/smarty/smarty_4.1.1.bb
@@ -9,7 +9,7 @@ DEPENDS += "php"

SRC_URI = "git://github.com/smarty-php/smarty.git;protocol=https;branch=master"

-SRCREV = "9e0536de18b53ba193364291ef0303b0ab9903e1"
+SRCREV = "71036be8be02bf93735c47b0b745f722efbc729f"

S = "${WORKDIR}/git"

--
2.25.1


[meta-oe] [PATCH] evtest: upgrade 1.34 -> 1.35

wangmy
 

0001-Fix-build-on-32bit-arches-with-64bit-time_t.patch
refreshed for new version.

add_missing_limits_h_include.patch
removed since it's included in 1.35.

Signed-off-by: Wang Mingyu <wangmy@...>
---
...ld-on-32bit-arches-with-64bit-time_t.patch | 24 ++++--------
.../evtest/add_missing_limits_h_include.patch | 37 -------------------
.../evtest/{evtest_1.34.bb => evtest_1.35.bb} | 3 +-
3 files changed, 9 insertions(+), 55 deletions(-)
delete mode 100644 meta-oe/recipes-test/evtest/evtest/add_missing_limits_h_include.patch
rename meta-oe/recipes-test/evtest/{evtest_1.34.bb => evtest_1.35.bb} (83%)

diff --git a/meta-oe/recipes-test/evtest/evtest/0001-Fix-build-on-32bit-arches-with-64bit-time_t.patch b/meta-oe/recipes-test/evtest/evtest/0001-Fix-build-on-32bit-arches-with-64bit-time_t.patch
index aa49a0629..595b0296e 100644
--- a/meta-oe/recipes-test/evtest/evtest/0001-Fix-build-on-32bit-arches-with-64bit-time_t.patch
+++ b/meta-oe/recipes-test/evtest/evtest/0001-Fix-build-on-32bit-arches-with-64bit-time_t.patch
@@ -1,4 +1,4 @@
-From fa57c78c33d26084f85f1a6b4c29378631dc9395 Mon Sep 17 00:00:00 2001
+From 490f5b6cd788692d989f07180a5714c76872911e Mon Sep 17 00:00:00 2001
From: Khem Raj <raj.khem@...>
Date: Sat, 30 Nov 2019 11:58:58 -0800
Subject: [PATCH] Fix build on 32bit arches with 64bit time_t
@@ -10,17 +10,18 @@ input.h [1]

Upstream-Status: Submitted [https://gitlab.freedesktop.org/libevdev/evtest/merge_requests/6]
Signed-off-by: Khem Raj <raj.khem@...>
+
---
- evtest.c | 7 ++++++-
- 1 file changed, 6 insertions(+), 1 deletion(-)
+ evtest.c | 5 +++++
+ 1 file changed, 5 insertions(+)

diff --git a/evtest.c b/evtest.c
-index 548c203..93063cd 100644
+index ba7a161..8fc2e5a 100644
--- a/evtest.c
+++ b/evtest.c
-@@ -61,6 +61,11 @@
- #include <sys/types.h>
- #include <unistd.h>
+@@ -63,6 +63,11 @@
+ #define input_event_usec time.tv_usec
+ #endif

+#ifndef input_event_sec
+#define input_event_sec time.tv_sec
@@ -30,12 +31,3 @@ index 548c203..93063cd 100644
#define BITS_PER_LONG (sizeof(long) * 8)
#define NBITS(x) ((((x)-1)/BITS_PER_LONG)+1)
#define OFF(x) ((x)%BITS_PER_LONG)
-@@ -1140,7 +1145,7 @@ static int print_events(int fd)
- type = ev[i].type;
- code = ev[i].code;
-
-- printf("Event: time %ld.%06ld, ", ev[i].time.tv_sec, ev[i].time.tv_usec);
-+ printf("Event: time %ld.%06ld, ", ev[i].input_event_sec, ev[i].input_event_usec);
-
- if (type == EV_SYN) {
- if (code == SYN_MT_REPORT)
diff --git a/meta-oe/recipes-test/evtest/evtest/add_missing_limits_h_include.patch b/meta-oe/recipes-test/evtest/evtest/add_missing_limits_h_include.patch
deleted file mode 100644
index b2bf94fd5..000000000
--- a/meta-oe/recipes-test/evtest/evtest/add_missing_limits_h_include.patch
+++ /dev/null
@@ -1,37 +0,0 @@
-From 5eb4ab1c139ea38ebe6bb4acba08b09ee7d77d3c Mon Sep 17 00:00:00 2001
-From: Baruch Siach <baruch@...>
-Date: Sun, 18 Aug 2019 10:01:06 +0300
-Subject: Add missing limits.h include
-MIME-Version: 1.0
-Content-Type: text/plain; charset=UTF-8
-Content-Transfer-Encoding: 8bit
-
-Fixes build with musl libc that does not include limits.h indirectly via
-other headers.
-
-evtest.c: In function ‘scan_devices’:
-evtest.c:886:14: error: ‘PATH_MAX’ undeclared (first use in this function); did you mean INT8_MAX’?
- char fname[PATH_MAX];
- ^~~~~~~~
-
-Signed-off-by: Baruch Siach <baruch@...>
-Signed-off-by: Peter Hutterer <peter.hutterer@...>
----
- evtest.c | 1 +
- 1 file changed, 1 insertion(+)
-
-diff --git a/evtest.c b/evtest.c
-index 37d4f85..548c203 100644
---- a/evtest.c
-+++ b/evtest.c
-@@ -56,6 +56,7 @@
- #include <getopt.h>
- #include <ctype.h>
- #include <signal.h>
-+#include <limits.h>
- #include <sys/time.h>
- #include <sys/types.h>
- #include <unistd.h>
---
-cgit v1.1
-
diff --git a/meta-oe/recipes-test/evtest/evtest_1.34.bb b/meta-oe/recipes-test/evtest/evtest_1.35.bb
similarity index 83%
rename from meta-oe/recipes-test/evtest/evtest_1.34.bb
rename to meta-oe/recipes-test/evtest/evtest_1.35.bb
index daf9dc383..51af9997f 100644
--- a/meta-oe/recipes-test/evtest/evtest_1.34.bb
+++ b/meta-oe/recipes-test/evtest/evtest_1.35.bb
@@ -7,9 +7,8 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=751419260aa954499f7abaabaa882bbe"

DEPENDS = "libxml2"

-SRCREV = "16e5104127a620686bdddc4a9ad62881134d6c69"
+SRCREV = "da347a8f88d2e5729dd12d61ee9743f902065b55"
SRC_URI = "git://gitlab.freedesktop.org/libevdev/evtest.git;protocol=https;branch=master \
- file://add_missing_limits_h_include.patch \
file://0001-Fix-build-on-32bit-arches-with-64bit-time_t.patch \
"

--
2.25.1


[meta-oe] [PATCH] libbpf: upgrade 0.7.0 -> 0.8.0

wangmy
 

Changelog:
https://github.com/libbpf/libbpf/releases/tag/v0.8.0

Signed-off-by: Wang Mingyu <wangmy@...>
---
.../recipes-kernel/libbpf/{libbpf_0.7.0.bb => libbpf_0.8.0.bb} | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
rename meta-oe/recipes-kernel/libbpf/{libbpf_0.7.0.bb => libbpf_0.8.0.bb} (92%)

diff --git a/meta-oe/recipes-kernel/libbpf/libbpf_0.7.0.bb b/meta-oe/recipes-kernel/libbpf/libbpf_0.8.0.bb
similarity index 92%
rename from meta-oe/recipes-kernel/libbpf/libbpf_0.7.0.bb
rename to meta-oe/recipes-kernel/libbpf/libbpf_0.8.0.bb
index 461e6b05e..76fd86214 100644
--- a/meta-oe/recipes-kernel/libbpf/libbpf_0.7.0.bb
+++ b/meta-oe/recipes-kernel/libbpf/libbpf_0.8.0.bb
@@ -9,7 +9,7 @@ LIC_FILES_CHKSUM = "file://../LICENSE.LGPL-2.1;md5=b370887980db5dd40659b50909238
DEPENDS = "zlib elfutils"

SRC_URI = "git://github.com/libbpf/libbpf.git;protocol=https;branch=master"
-SRCREV = "2cd2d03f63242c048a896179398c68d2dbefe3d6"
+SRCREV = "86eb09863c1c0177e99c2c703092042d3cdba910"

PACKAGE_ARCH = "${MACHINE_ARCH}"
COMPATIBLE_HOST = "(x86_64|i.86|aarch64|riscv64|powerpc64).*-linux"
--
2.25.1


[meta-oe] [PATCH] ctags: upgrade 5.9.20220508.0 -> 5.9.20220515.0

wangmy
 

Changelog:
==========
Merge pull request #3383(https://github.com/universal-ctags/ctags/pull/3383)

Signed-off-by: Wang Mingyu <wangmy@...>
---
.../ctags/{ctags_5.9.20220508.0.bb => ctags_5.9.20220515.0.bb} | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
rename meta-oe/recipes-devtools/ctags/{ctags_5.9.20220508.0.bb => ctags_5.9.20220515.0.bb} (95%)

diff --git a/meta-oe/recipes-devtools/ctags/ctags_5.9.20220508.0.bb b/meta-oe/recipes-devtools/ctags/ctags_5.9.20220515.0.bb
similarity index 95%
rename from meta-oe/recipes-devtools/ctags/ctags_5.9.20220508.0.bb
rename to meta-oe/recipes-devtools/ctags/ctags_5.9.20220515.0.bb
index 02f01cc60..231deec44 100644
--- a/meta-oe/recipes-devtools/ctags/ctags_5.9.20220508.0.bb
+++ b/meta-oe/recipes-devtools/ctags/ctags_5.9.20220515.0.bb
@@ -14,7 +14,7 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=0636e73ff0215e8d672dc4c32c317bb3"

inherit autotools-brokensep pkgconfig manpages

-SRCREV = "3f9e162a2a2d49920550bddb6de9da46a8340a41"
+SRCREV = "62bf9fcbf17eb4a3027cf9e97d6dbf5199817c38"
SRC_URI = "git://github.com/universal-ctags/ctags;branch=master;protocol=https"

S = "${WORKDIR}/git"
--
2.25.1


[meta-networking] [PATCH] babeld: upgrade 1.12 -> 1.12.1

wangmy
 

18 May 2022: babeld-1.12.1

* Implement separate PC values for unicast and multicast, which avoids
dropping packets protected by MAC when WiFi powersave is active.
* Schedule an interface check just after adding an interface.

Signed-off-by: Wang Mingyu <wangmy@...>
---
.../babeld/{babeld_1.12.bb => babeld_1.12.1.bb} | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
rename meta-networking/recipes-protocols/babeld/{babeld_1.12.bb => babeld_1.12.1.bb} (94%)

diff --git a/meta-networking/recipes-protocols/babeld/babeld_1.12.bb b/meta-networking/recipes-protocols/babeld/babeld_1.12.1.bb
similarity index 94%
rename from meta-networking/recipes-protocols/babeld/babeld_1.12.bb
rename to meta-networking/recipes-protocols/babeld/babeld_1.12.1.bb
index 747c16cb7..71bd93785 100644
--- a/meta-networking/recipes-protocols/babeld/babeld_1.12.bb
+++ b/meta-networking/recipes-protocols/babeld/babeld_1.12.1.bb
@@ -13,7 +13,7 @@ LICENSE = "MIT"
LIC_FILES_CHKSUM = "file://LICENCE;md5=411a48ac3c2e9e0911b8dd9aed26f754"

SRC_URI = "gitsm://github.com/jech/babeld.git;protocol=https;branch=master"
-SRCREV = "420a7087b7d6350084edfd7d1aef8a62209cbf04"
+SRCREV = "916d3d9aa65683ddf8b96f7f0b466b24cb9d7087"

UPSTREAM_CHECK_GITTAGREGEX = "babeld-(?P<pver>\d+(\.\d+)+)"

--
2.25.1


[meta-filesystems][PATCH] overlayfs-progs: add new recipe

Vyacheslav Yurkov
 

From: Vyacheslav Yurkov <Vyacheslav.Yurkov@...>

overlayfs-progs contains fsck.overlay, which is used to check and optionally
repair underlying directories of overlay-filesystem.

Signed-off-by: Vyacheslav Yurkov <Vyacheslav.Yurkov@...>
---
.../overlayfs/overlayfs-progs_git.bb | 24 +++++++++++++++++++
1 file changed, 24 insertions(+)
create mode 100644 meta-filesystems/recipes-utils/overlayfs/overlayfs-progs_git.bb

diff --git a/meta-filesystems/recipes-utils/overlayfs/overlayfs-progs_git.bb b/meta-filesystems/recipes-utils/overlayfs/overlayfs-progs_git.bb
new file mode 100644
index 000000000..2f173b259
--- /dev/null
+++ b/meta-filesystems/recipes-utils/overlayfs/overlayfs-progs_git.bb
@@ -0,0 +1,24 @@
+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"
+
+PV = "1.0+git${SRCPV}"
+SRCREV = "e10ef686570d9c7eff42f52461593a5c15da56bd"
+
+S = "${WORKDIR}/git"
+B = "${S}"
+
+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}
+}
--
2.25.1


[meta-filesystems][PATCH] overlayfs-tools: add new recipe

Vyacheslav Yurkov
 

From: Vyacheslav Yurkov <Vyacheslav.Yurkov@...>

This package provides maintenance tools for OverlayFS, such as vacuum,
diff, merge, and deref

Signed-off-by: Vyacheslav Yurkov <Vyacheslav.Yurkov@...>
---
...-so-that-it-compiles-on-Ubuntu-20.04.patch | 41 +++++++++++++++++++
.../overlayfs/overlayfs-tools_git.bb | 28 +++++++++++++
2 files changed, 69 insertions(+)
create mode 100644 meta-filesystems/recipes-utils/overlayfs/files/0001-Fixed-includes-so-that-it-compiles-on-Ubuntu-20.04.patch
create mode 100644 meta-filesystems/recipes-utils/overlayfs/overlayfs-tools_git.bb

diff --git a/meta-filesystems/recipes-utils/overlayfs/files/0001-Fixed-includes-so-that-it-compiles-on-Ubuntu-20.04.patch b/meta-filesystems/recipes-utils/overlayfs/files/0001-Fixed-includes-so-that-it-compiles-on-Ubuntu-20.04.patch
new file mode 100644
index 000000000..f7490ebce
--- /dev/null
+++ b/meta-filesystems/recipes-utils/overlayfs/files/0001-Fixed-includes-so-that-it-compiles-on-Ubuntu-20.04.patch
@@ -0,0 +1,41 @@
+From 81b4fbb5f52044cb348534c23f10b3884972b09b Mon Sep 17 00:00:00 2001
+From: Beat Schaer <beat.schaer@...>
+Date: Fri, 19 Mar 2021 08:18:58 +0100
+Subject: [PATCH] Fixed includes so that it compiles on Ubuntu 20.04
+
+---
+ 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_git.bb b/meta-filesystems/recipes-utils/overlayfs/overlayfs-tools_git.bb
new file mode 100644
index 000000000..b0406fbae
--- /dev/null
+++ b/meta-filesystems/recipes-utils/overlayfs/overlayfs-tools_git.bb
@@ -0,0 +1,28 @@
+DESCRIPTION = "Maintenance tools for OverlayFS"
+HOMEPAGE = "https://github.com/kmxz/overlayfs-tools"
+LICENSE = "WTFPL"
+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 \
+"
+
+PV = "1.0+git${SRCPV}"
+SRCREV = "291c7f4a3fb548d06c572700650c2e3bccb0cd27"
+
+S = "${WORKDIR}/git"
+B = "${S}"
+
+DEPENDS += "attr"
+EXTRA_OEMAKE += "'CC=${CC} -O2'"
+TARGET_CC_ARCH += "${LDFLAGS}"
+
+do_compile () {
+ oe_runmake
+}
+
+do_install () {
+ install -d ${D}${bindir}
+ install -m 0755 ${B}/overlay ${D}${bindir}
+}
--
2.25.1


[meta-filesystems][PATCH] packagegroup-meta-filesystems: fix build issue

Vyacheslav Yurkov
 

From: Vyacheslav Yurkov <Vyacheslav.Yurkov@...>

The packagegroup has to be arch dependent to address build failure:
ERROR: packagegroup-meta-filesystems-1.0-r0 do_package_write_rpm: An allarch packagegroup shouldn't depend on packages which are dynamically renamed (fuse to libfuse2)
ERROR: packagegroup-meta-filesystems-1.0-r0 do_package_write_rpm: An allarch packagegroup shouldn't depend on packages which are dynamically renamed (fuse-dev to libfuse-dev)

Signed-off-by: Vyacheslav Yurkov <Vyacheslav.Yurkov@...>
---
.../packageconfigs/packagegroup-meta-filesystems.bb | 1 +
1 file changed, 1 insertion(+)

diff --git a/meta-filesystems/recipes-filesystems/packageconfigs/packagegroup-meta-filesystems.bb b/meta-filesystems/recipes-filesystems/packageconfigs/packagegroup-meta-filesystems.bb
index 75591c31f..1954b5979 100644
--- a/meta-filesystems/recipes-filesystems/packageconfigs/packagegroup-meta-filesystems.bb
+++ b/meta-filesystems/recipes-filesystems/packageconfigs/packagegroup-meta-filesystems.bb
@@ -1,5 +1,6 @@
SUMMARY = "Meta-filesystem packagegroups"

+PACKAGE_ARCH = "${TUNE_PKGARCH}"
inherit packagegroup

PROVIDES = "${PACKAGES}"
--
2.25.1

1761 - 1780 of 98996