mirror of
https://github.com/MiyooCFW/buildroot.git
synced 2025-09-27 22:24:19 +03:00
Merge from bittboy/buildroot@26c91a9
This commit is contained in:
@@ -4,15 +4,15 @@
|
||||
#
|
||||
################################################################################
|
||||
|
||||
SAMBA4_VERSION = 4.10.7
|
||||
SAMBA4_VERSION = 4.11.13
|
||||
SAMBA4_SITE = https://download.samba.org/pub/samba/stable
|
||||
SAMBA4_SOURCE = samba-$(SAMBA4_VERSION).tar.gz
|
||||
SAMBA4_INSTALL_STAGING = YES
|
||||
SAMBA4_LICENSE = GPL-3.0+
|
||||
SAMBA4_LICENSE_FILES = COPYING
|
||||
SAMBA4_DEPENDENCIES = \
|
||||
host-e2fsprogs host-heimdal host-nfs-utils \
|
||||
cmocka e2fsprogs popt zlib \
|
||||
host-e2fsprogs host-heimdal host-nfs-utils host-python3 \
|
||||
cmocka e2fsprogs gnutls popt zlib \
|
||||
$(if $(BR2_PACKAGE_LIBAIO),libaio) \
|
||||
$(if $(BR2_PACKAGE_LIBCAP),libcap) \
|
||||
$(if $(BR2_PACKAGE_READLINE),readline) \
|
||||
@@ -25,16 +25,12 @@ SAMBA4_CONF_ENV = \
|
||||
XSLTPROC=false \
|
||||
WAF_NO_PREFORK=1
|
||||
|
||||
SAMBA4_PYTHON = PYTHON="$(HOST_DIR)/bin/python3"
|
||||
ifeq ($(BR2_PACKAGE_PYTHON3),y)
|
||||
SAMBA4_PYTHON = \
|
||||
PYTHON="$(HOST_DIR)/bin/python3" \
|
||||
PYTHON_CONFIG="$(STAGING_DIR)/usr/bin/python3-config"
|
||||
SAMBA4_DEPENDENCIES += host-python3 python3
|
||||
SAMBA4_PYTHON += PYTHON_CONFIG="$(STAGING_DIR)/usr/bin/python3-config"
|
||||
SAMBA4_DEPENDENCIES += python3
|
||||
else
|
||||
SAMBA4_PYTHON = \
|
||||
PYTHON="$(HOST_DIR)/bin/python2" \
|
||||
PYTHON_CONFIG="$(STAGING_DIR)/usr/bin/python-config"
|
||||
SAMBA4_DEPENDENCIES += host-python python
|
||||
SAMBA4_CONF_OPTS += --disable-python
|
||||
endif
|
||||
|
||||
ifeq ($(BR2_PACKAGE_LIBTIRPC),y)
|
||||
@@ -76,13 +72,6 @@ else
|
||||
SAMBA4_CONF_OPTS += --without-fam
|
||||
endif
|
||||
|
||||
ifeq ($(BR2_PACKAGE_GNUTLS),y)
|
||||
SAMBA4_CONF_OPTS += --enable-gnutls
|
||||
SAMBA4_DEPENDENCIES += gnutls
|
||||
else
|
||||
SAMBA4_CONF_OPTS += --disable-gnutls
|
||||
endif
|
||||
|
||||
ifeq ($(BR2_PACKAGE_LIBARCHIVE),y)
|
||||
SAMBA4_CONF_OPTS += --with-libarchive
|
||||
SAMBA4_DEPENDENCIES += libarchive
|
||||
@@ -181,13 +170,6 @@ SAMBA4_DEPENDENCIES += systemd
|
||||
endif
|
||||
|
||||
define SAMBA4_INSTALL_INIT_SYSTEMD
|
||||
mkdir -p $(TARGET_DIR)/etc/systemd/system/multi-user.target.wants
|
||||
ln -sf ../../../../usr/lib/systemd/system/nmb.service \
|
||||
$(TARGET_DIR)/etc/systemd/system/multi-user.target.wants/nmb.service
|
||||
ln -sf ../../../../usr/lib/systemd/system/smb.service \
|
||||
$(TARGET_DIR)/etc/systemd/system/multi-user.target.wants/smb.service
|
||||
ln -sf ../../../../usr/lib/systemd/system/winbind.service \
|
||||
$(TARGET_DIR)/etc/systemd/system/multi-user.target.wants/winbind.service
|
||||
$(INSTALL) -D -m 644 $(@D)/packaging/systemd/samba.conf.tmp \
|
||||
$(TARGET_DIR)/usr/lib/tmpfiles.d/samba.conf
|
||||
printf "d /var/log/samba 755 root root\n" >>$(TARGET_DIR)/usr/lib/tmpfiles.d/samba.conf
|
||||
|
||||
Reference in New Issue
Block a user