mirror of
https://github.com/openembedded/meta-openembedded.git
synced 2026-06-12 05:11:59 +00:00
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>
This commit is contained in:
-43
@@ -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
|
|
||||||
|
|
||||||
+1
-5
@@ -4,7 +4,7 @@ SECTION = "otherosfs"
|
|||||||
LICENSE = "GPLv3 & LGPLv3"
|
LICENSE = "GPLv3 & LGPLv3"
|
||||||
LIC_FILES_CHKSUM = "file://COPYING;md5=d32239bcb673463ab874e80d47fae504"
|
LIC_FILES_CHKSUM = "file://COPYING;md5=d32239bcb673463ab874e80d47fae504"
|
||||||
|
|
||||||
SRCREV = "ded4e81796a18cde73329e838357f084aa05720f"
|
SRCREV = "73008e3292e4d46fde3eab5d5f618886210ec4a1"
|
||||||
SRC_URI = "git://git.samba.org/cifs-utils.git"
|
SRC_URI = "git://git.samba.org/cifs-utils.git"
|
||||||
|
|
||||||
S = "${WORKDIR}/git"
|
S = "${WORKDIR}/git"
|
||||||
@@ -20,10 +20,6 @@ PACKAGECONFIG[cifsidmap] = "--enable-cifsidmap,--disable-cifsidmap,keyutils samb
|
|||||||
PACKAGECONFIG[cifsacl] = "--enable-cifsacl,--disable-cifsacl,samba"
|
PACKAGECONFIG[cifsacl] = "--enable-cifsacl,--disable-cifsacl,samba"
|
||||||
PACKAGECONFIG[pam] = "--enable-pam --with-pamdir=${base_libdir}/security,--disable-pam,libpam keyutils"
|
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
|
inherit autotools pkgconfig
|
||||||
|
|
||||||
do_install_append() {
|
do_install_append() {
|
||||||
Reference in New Issue
Block a user