diff options
| author | Michael Olbrich <m.olbrich@pengutronix.de> | 2021-03-09 15:07:58 +0100 |
|---|---|---|
| committer | Michael Olbrich <m.olbrich@pengutronix.de> | 2021-03-12 13:29:50 +0100 |
| commit | 7b601010ec76bf977b08762680a0f82d14667d85 (patch) | |
| tree | 4be3028fee99ce9876f52fe9e9e44d6b0df416be | |
| parent | 6bba0d786ba030952918508c8da9e5fbd22301b4 (diff) | |
| download | ptxdist-7b601010ec76bf977b08762680a0f82d14667d85.tar.gz ptxdist-7b601010ec76bf977b08762680a0f82d14667d85.tar.xz | |
cifs-utils: add option for cifs.upcall
Signed-off-by: Michael Olbrich <m.olbrich@pengutronix.de>
| -rw-r--r-- | rules/cifs-utils.in | 15 | ||||
| -rw-r--r-- | rules/cifs-utils.make | 14 |
2 files changed, 24 insertions, 5 deletions
diff --git a/rules/cifs-utils.in b/rules/cifs-utils.in index 236383e2f..190863985 100644 --- a/rules/cifs-utils.in +++ b/rules/cifs-utils.in @@ -1,7 +1,18 @@ ## SECTION=disk_and_file -config CIFS_UTILS +menuconfig CIFS_UTILS tristate - prompt "cifs-utils" + select TALLOC if CIFS_UTILS_UPCALL + select KRB5 if CIFS_UTILS_UPCALL + select KEYUTILS if CIFS_UTILS_UPCALL + prompt "cifs-utils " help Userspace tools for the CIFS filesystem, such as mount.cifs + +if CIFS_UTILS + +config CIFS_UTILS_UPCALL + bool + prompt "install cifs.upcall" + +endif diff --git a/rules/cifs-utils.make b/rules/cifs-utils.make index 02cf948cb..6bac34a83 100644 --- a/rules/cifs-utils.make +++ b/rules/cifs-utils.make @@ -14,8 +14,8 @@ PACKAGES-$(PTXCONF_CIFS_UTILS) += cifs-utils # # Paths and names # -CIFS_UTILS_VERSION := 6.8 -CIFS_UTILS_MD5 := a385d60293e6f9e4cb0d4ac2093990d8 +CIFS_UTILS_VERSION := 6.12 +CIFS_UTILS_MD5 := b49b10692bcae7f28669173a472077dd CIFS_UTILS := cifs-utils-$(CIFS_UTILS_VERSION) CIFS_UTILS_SUFFIX := tar.bz2 CIFS_UTILS_URL := https://ftp.samba.org/pub/linux-cifs/cifs-utils/$(CIFS_UTILS).$(CIFS_UTILS_SUFFIX) @@ -26,16 +26,21 @@ CIFS_UTILS_LICENSE_FILES := \ file://COPYING;md5=d32239bcb673463ab874e80d47fae504 \ file://mount.cifs.c;startline=1;endline=19;md5=2f09dc7eb71007249fb0c485abdae60f +# ---------------------------------------------------------------------------- +# Prepare +# ---------------------------------------------------------------------------- + # # autoconf # CIFS_UTILS_CONF_TOOL := autoconf CIFS_UTILS_CONF_OPT := \ $(CROSS_AUTOCONF_USR) \ - --disable-cifsupcall \ + --$(call ptx/endis, PTXCONF_CIFS_UTILS_UPCALL)-cifsupcall \ --disable-cifscreds \ --disable-cifsidmap \ --disable-cifsacl \ + --disable-smbinfo \ --disable-pam \ --disable-systemd \ --disable-man \ @@ -59,6 +64,9 @@ $(STATEDIR)/cifs-utils.targetinstall: @$(call install_fixup, cifs-utils,DESCRIPTION,missing) @$(call install_copy, cifs-utils, 0, 0, 0755, -, /usr/sbin/mount.cifs) +ifdef PTXCONF_CIFS_UTILS_UPCALL + @$(call install_copy, cifs-utils, 0, 0, 0755, -, /usr/sbin/cifs.upcall) +endif @$(call install_finish, cifs-utils) |