diff options
| author |   Zheng Ruoqin <zhengrq.fnst@cn.fujitsu.com> | 2021-01-12 14:49:19 +0800 |
|---|---|---|
| committer |   Khem Raj <raj.khem@gmail.com> | 2021-01-12 00:54:53 -0800 |
| commit | 3055f59683df8909ee3c10d140c3ea9da9f3d77f (patch) | |
| tree | 76529874029faadbea325d02f7d4e00e16505ed6 /meta-networking/recipes-support/cifs | |
| parent | e64c674ce28fe72b536c0b4c59571069a32667f5 (diff) | |
| download | meta-openembedded-contrib-3055f59683df8909ee3c10d140c3ea9da9f3d77f.tar.gz | |
cifs-utils: upgrade 6.11 -> 6.12
0001-Bugfix-Modify-the-dir-of-install-exec-hook-and.patch
Removed since this is included in 6.12.
Signed-off-by: Zheng Ruoqin <zhengrq.fnst@cn.fujitsu.com>
Signed-off-by: Khem Raj <raj.khem@gmail.com>
Diffstat (limited to 'meta-networking/recipes-support/cifs')
| -rw-r--r-- | meta-networking/recipes-support/cifs/cifs-utils/0001-Bugfix-Modify-the-dir-of-install-exec-hook-and.patch | 43 | ||||
| -rw-r--r-- | meta-networking/recipes-support/cifs/cifs-utils_6.12.bb (renamed from meta-networking/recipes-support/cifs/cifs-utils_6.11.bb) | 6 |
2 files changed, 1 insertions, 48 deletions
diff --git a/meta-networking/recipes-support/cifs/cifs-utils/0001-Bugfix-Modify-the-dir-of-install-exec-hook-and.patch b/meta-networking/recipes-support/cifs/cifs-utils/0001-Bugfix-Modify-the-dir-of-install-exec-hook-and.patch deleted file mode 100644 index 233ae40ce0..0000000000 --- a/meta-networking/recipes-support/cifs/cifs-utils/0001-Bugfix-Modify-the-dir-of-install-exec-hook-and.patch +++ /dev/null @@ -1,43 +0,0 @@ -From f61f5f8a328207867b5c523b1c6bef6aaecaab88 Mon Sep 17 00:00:00 2001 -From: Wang Mingyu <wangmy@cn.fujitsu.com> -Date: Sat, 15 Feb 2020 16:05:58 +0800 -Subject: [PATCH] Bugfix: Modify the dir of install-exec-hook and - install-data-hook - -Error message: -(cd /sbin && ln -sf mount.cifs mount.smb3) - /yocto/work001/fnst/wangmy/build/tmp/hosttools/install -c mount.cifs -'/yocto/work001/fnst/wangmy/build/tmp/work/core2-64-poky-linux/cifs-utils/6.10-r0/image/sbin' -make install-data-hook -ln: failed to create symbolic link 'mount.smb3': Permission denied - -Upstream-Status: Pending - -Signed-off-by: Wang Mingyu <wangmy@cn.fujitsu.com> ---- - Makefile.am | 8 ++++---- - 1 file changed, 4 insertions(+), 4 deletions(-) - -diff --git a/Makefile.am b/Makefile.am -index fe9cd34..e9be6b3 100644 ---- a/Makefile.am -+++ b/Makefile.am -@@ -119,11 +119,11 @@ endif - SUBDIRS = contrib - - install-exec-hook: -- (cd $(ROOTSBINDIR) && ln -sf mount.cifs mount.smb3) -+ (cd $(DESTDIR)$(ROOTSBINDIR) && ln -sf mount.cifs mount.smb3) - - install-data-hook: -- (cd $(man8dir) && ln -sf mount.cifs.8 mount.smb3.8) -+ (test -n "$(man_MANS)" || exit 0; cd $(DESTDIR)$(man8dir) && ln -sf mount.cifs.8 mount.smb3.8) - - uninstall-hook: -- (cd $(ROOTSBINDIR) && rm -f $(ROOTSBINDIR)/mount.smb3) -- (cd $(man8dir) && rm -f $(man8dir)/mount.smb3.8) -+ (cd $(DESTDIR)$(ROOTSBINDIR) && rm -f $(DESTDIR)$(ROOTSBINDIR)/mount.smb3) -+ (test -n "$(man_MANS)" || exit 0; cd $(DESTDIR)$(man8dir) && rm -f $(DESTDIR)$(man8dir)/mount.smb3.8) --- -2.17.1 - diff --git a/meta-networking/recipes-support/cifs/cifs-utils_6.11.bb b/meta-networking/recipes-support/cifs/cifs-utils_6.12.bb index de3fbb0947..c68b474cc6 100644 --- a/meta-networking/recipes-support/cifs/cifs-utils_6.11.bb +++ b/meta-networking/recipes-support/cifs/cifs-utils_6.12.bb @@ -4,7 +4,7 @@ SECTION = "otherosfs" LICENSE = "GPLv3 & LGPLv3" LIC_FILES_CHKSUM = "file://COPYING;md5=d32239bcb673463ab874e80d47fae504" -SRCREV = "ded4e81796a18cde73329e838357f084aa05720f" +SRCREV = "73008e3292e4d46fde3eab5d5f618886210ec4a1" SRC_URI = "git://git.samba.org/cifs-utils.git" S = "${WORKDIR}/git" @@ -20,10 +20,6 @@ PACKAGECONFIG[cifsidmap] = "--enable-cifsidmap,--disable-cifsidmap,keyutils samb PACKAGECONFIG[cifsacl] = "--enable-cifsacl,--disable-cifsacl,samba" PACKAGECONFIG[pam] = "--enable-pam --with-pamdir=${base_libdir}/security,--disable-pam,libpam keyutils" -SRC_URI += " \ - file://0001-Bugfix-Modify-the-dir-of-install-exec-hook-and.patch \ - " - inherit autotools pkgconfig do_install_append() { |