| Message ID | 20251230095729.175372-1-m-shah@ti.com |
|---|---|
| State | New |
| Headers | show |
| Series | [master] cifs-utils: Remove bbappend and patches | expand |
meta-arago / na / 20251230095729.175372-1-m-shah PRC Results: PASS ========================================================= check-yocto-patches: PASS ========================================================= Patches ---------------------------------------- All patches passed ========================================================= apply-yocto-patch: PASS ========================================================= master ===================== Summary: - Patch Series: [master][PATCH] cifs-utils: Remove bbappend and patches - Submitter: From: Moteen Shah <m-shah@ti.com> -From: Daniel Parks <danielrparks@ti.com> - Date: Date: Tue, 30 Dec 2025 15:27:29 +0530 -Date: Fri, 3 Jun 2022 15:34:59 -0500 - Num Patches: 1 - Mailing List (public inbox) Commit SHA: 7cf564950369206e93238f9e2bc8f34c19e9026c Applied to: - Repository: lcpd-prc-meta-arago - Base Branch: master-next - Commit Author: LCPD Automation Script <lcpdbld@list.ti.com> - Commit Subject: CI/CD Auto-Merger: cicd.master.202512191404 - Commit SHA: c38be2eb3b16b176476f04572877129f82a0dff4 Patches ---------------------------------------- All patches applied ========================================================= check-yocto-repo: PASS ========================================================= master ===================== PASS ========================================================= yocto-check-layers: PASS ========================================================= master - PASS ===================== All checks passed
Hey Chirag, On 30/12/25 16:15, Chirag Shilwant wrote: > Hi Moteen, > > On 30/12/25 15:27, Moteen Shah wrote: >> 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 >> > > > better to switch the above reference to [0]?, as the above link may be > broken once this patch is merged. > > > [0] - > https://git.ti.com/cgit/arago-project/meta-arago/commit?id=80145206de6c81efc0d0ac6ddbeeb5abf3b52581 > > > -- > Chirag Oh thanks for catching, will respin with an updated link Regards, Moteen > > >> >> [1]https://github.com/piastry/cifs-utils/commit/25d6552c7d8b9fe2ca9dbf85c74c9330e4dd7770 >> >> >> Signed-off-by: Moteen Shah <m-shah@ti.com> >> --- >> .../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 <danielrparks@ti.com> >> -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 <danielrparks@ti.com> >> ---- >> - 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}
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 <danielrparks@ti.com> -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 <danielrparks@ti.com> ---- - 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}
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 <m-shah@ti.com> --- .../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