meta-arago maintained a downstream patch to modify the build configuration in cifs-utils [0]. This change has since been upstreamed and merged into the cifs-utils repository [1].
With the patch now in upstream, the bbappend and associated files are obsolete. We can rely on the cifs-utils recipe from meta-openembedded without local changes. [0]https://git.ti.com/cgit/arago-project/meta-arago/tree/meta-arago-distro/recipes-support/cifs/cifs-utils/0001-cifs-utils-Make-automake-treat-sbin-as-exec-not-data.patch [1]https://github.com/piastry/cifs-utils/commit/25d6552c7d8b9fe2ca9dbf85c74c9330e4dd7770 Signed-off-by: Moteen Shah <[email protected]> --- .../recipes-support/cifs/cifs-utils-arago.inc | 4 --- ...automake-treat-sbin-as-exec-not-data.patch | 35 ------------------- .../cifs/cifs-utils_7.0.bbappend | 4 --- 3 files changed, 43 deletions(-) delete mode 100644 meta-arago-distro/recipes-support/cifs/cifs-utils-arago.inc delete mode 100644 meta-arago-distro/recipes-support/cifs/cifs-utils/0001-cifs-utils-Make-automake-treat-sbin-as-exec-not-data.patch delete mode 100644 meta-arago-distro/recipes-support/cifs/cifs-utils_7.0.bbappend diff --git a/meta-arago-distro/recipes-support/cifs/cifs-utils-arago.inc b/meta-arago-distro/recipes-support/cifs/cifs-utils-arago.inc deleted file mode 100644 index 87b49cc6..00000000 --- a/meta-arago-distro/recipes-support/cifs/cifs-utils-arago.inc +++ /dev/null @@ -1,4 +0,0 @@ -FILESEXTRAPATHS:prepend := "${THISDIR}/cifs-utils:" - -SRC_URI += "file://0001-cifs-utils-Make-automake-treat-sbin-as-exec-not-data.patch" - diff --git a/meta-arago-distro/recipes-support/cifs/cifs-utils/0001-cifs-utils-Make-automake-treat-sbin-as-exec-not-data.patch b/meta-arago-distro/recipes-support/cifs/cifs-utils/0001-cifs-utils-Make-automake-treat-sbin-as-exec-not-data.patch deleted file mode 100644 index dd9c7958..00000000 --- a/meta-arago-distro/recipes-support/cifs/cifs-utils/0001-cifs-utils-Make-automake-treat-sbin-as-exec-not-data.patch +++ /dev/null @@ -1,35 +0,0 @@ -From fd5f395514256572c451127006a68483106cf2b8 Mon Sep 17 00:00:00 2001 -From: Daniel Parks <[email protected]> -Date: Fri, 3 Jun 2022 15:34:59 -0500 -Subject: [PATCH] cifs-utils: Make automake treat /sbin as exec, not data - -Otherwise, $(DESTDIR)/sbin doesn't get created until install-data on a --j1 build and install-exec-hook can fail because it might not exist. - -Steps to reproduce this bug: -$ autoreconf -i -$ ./configure -$ mkdir image -$ make DESTDIR=image install -j1 - -Upstream-Status: Pending -Signed-off-by: Daniel Parks <[email protected]> ---- - Makefile.am | 4 ++-- - 1 file changed, 2 insertions(+), 2 deletions(-) - -diff --git a/Makefile.am b/Makefile.am -index e9be6b3..edb1b7f 100644 ---- a/Makefile.am -+++ b/Makefile.am -@@ -1,8 +1,8 @@ - AM_CFLAGS = -Wall -Wextra -D_FORTIFY_SOURCE=2 $(PIE_CFLAGS) $(RELRO_CFLAGS) - ACLOCAL_AMFLAGS = -I aclocal - --root_sbindir = $(ROOTSBINDIR) --root_sbin_PROGRAMS = mount.cifs -+root_exec_sbindir = $(ROOTSBINDIR) -+root_exec_sbin_PROGRAMS = mount.cifs - mount_cifs_SOURCES = mount.cifs.c mtab.c resolve_host.c util.c - mount_cifs_LDADD = $(LIBCAP) $(CAPNG_LDADD) $(RT_LDADD) - include_HEADERS = cifsidmap.h diff --git a/meta-arago-distro/recipes-support/cifs/cifs-utils_7.0.bbappend b/meta-arago-distro/recipes-support/cifs/cifs-utils_7.0.bbappend deleted file mode 100644 index 4c9ce8db..00000000 --- a/meta-arago-distro/recipes-support/cifs/cifs-utils_7.0.bbappend +++ /dev/null @@ -1,4 +0,0 @@ -CIFS_UTILS_ARAGO = "" -CIFS_UTILS_ARAGO:arago = "cifs-utils-arago.inc" - -require ${CIFS_UTILS_ARAGO} -- 2.34.1 -=-=-=-=-=-=-=-=-=-=-=- Links: You receive all messages sent to this group. View/Reply Online (#16903): https://lists.yoctoproject.org/g/meta-arago/message/16903 Mute This Topic: https://lists.yoctoproject.org/mt/116996030/21656 Group Owner: [email protected] Unsubscribe: https://lists.yoctoproject.org/g/meta-arago/unsub [[email protected]] -=-=-=-=-=-=-=-=-=-=-=-
