d-two/operating-system
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Update buildroot to 2021.02.2 (#1370)

Browse Source
This commit is contained in:
Stefan Agner
2021-05-19 22:20:50 +02:00
committed by GitHub
parent 111018b911
commit c1c6a6ce21
247 changed files with 1386 additions and 1257 deletions
Download Patch File Download Diff File Expand all files Collapse all files

41
buildroot/package/cifs-utils/0001-Use-DESTDIR-when-installing-mount.smb3-and-optionall.patch
View File

@@ -1,41 +0,0 @@
From dbb4452787cb966cc74b2015689961875fd5d668 Mon Sep 17 00:00:00 2001
From: Ryan Barnett <ryanbarnett3@gmail.com>
Date: Mon, 27 Apr 2020 22:03:25 -0500
Subject: [PATCH] Use DESTDIR when installing mount.smb3 and optionally install
man page
Properly create mount.smb3 symlink by using DESTDIR. Also use
CONFIG_MAN to optionally install manpage for mount.smb3.
Signed-off-by: Ryan Barnett <ryanbarnett3@gmail.com>
---
Upstream: https://marc.info/?l=linux-cifs&m=158804444725745&w=2
---
Makefile.am | 10 ++++++----
1 file changed, 6 insertions(+), 4 deletions(-)
diff --git a/Makefile.am b/Makefile.am
index fe9cd34..e0587f1 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -119,11 +119,13 @@ endif
SUBDIRS = contrib
install-exec-hook:
- (cd $(ROOTSBINDIR) && ln -sf mount.cifs mount.smb3)
+ (cd $(DESTDIR)$(ROOTSBINDIR) && ln -sf mount.cifs mount.smb3)
+if CONFIG_MAN
install-data-hook:
- (cd $(man8dir) && ln -sf mount.cifs.8 mount.smb3.8)
+ (cd $(DESTDIR)$(man8dir) && ln -sf mount.cifs.8 mount.smb3.8)
+endif
uninstall-hook:
- (cd $(ROOTSBINDIR) && rm -f $(ROOTSBINDIR)/mount.smb3)
- (cd $(man8dir) && rm -f $(man8dir)/mount.smb3.8)
+ rm -f $(DESTDIR)$(ROOTSBINDIR)/mount.smb3
+ rm -f $(DESTDIR)$(man8dir)/mount.smb3.8
--
2.17.1

18
buildroot/package/cifs-utils/Config.in
View File

@@ -13,3 +13,21 @@ config BR2_PACKAGE_CIFS_UTILS
split them off into their own package.
http://wiki.samba.org/index.php/LinuxCIFS_utils
if BR2_PACKAGE_CIFS_UTILS
config BR2_PACKAGE_CIFS_UTILS_SMBTOOLS
bool "smbtools"
depends on BR2_USE_WCHAR # python3
depends on BR2_TOOLCHAIN_HAS_THREADS # python3
depends on !BR2_STATIC_LIBS # python3
select BR2_PACKAGE_PYTHON3 if !BR2_PACKAGE_PYTHON # runtime
help
Install the smb tools smbinfo and smb2-quota (python
implementations).
comment "smbtools needs a toolchain w/ wchar, threads, dynamic library"
depends on !BR2_USE_WCHAR || !BR2_TOOLCHAIN_HAS_THREADS || \
BR2_STATIC_LIBS
endif

2
buildroot/package/cifs-utils/cifs-utils.hash
View File

@@ -1,5 +1,5 @@
# Locally calculated after checking pgp signature
sha256 b859239a3f204f8220d3e54ed43bf8109e1ef202042dd87ba87492f8878728d9 cifs-utils-6.11.tar.bz2
sha256 43d8786c8613caccfa84913081c1d62bc2409575854cf895b05b48af0863d056 cifs-utils-6.13.tar.bz2
# Hash for license file:
sha256 8ceb4b9ee5adedde47b31e975c1d90c73ad27b6b165a1dcd80c7c545eb65b903 COPYING

12
buildroot/package/cifs-utils/cifs-utils.mk
View File

@@ -4,13 +4,13 @@
#
################################################################################
CIFS_UTILS_VERSION = 6.11
CIFS_UTILS_VERSION = 6.13
CIFS_UTILS_SOURCE = cifs-utils-$(CIFS_UTILS_VERSION).tar.bz2
CIFS_UTILS_SITE = http://ftp.samba.org/pub/linux-cifs/cifs-utils
CIFS_UTILS_LICENSE = GPL-3.0+
CIFS_UTILS_LICENSE_FILES = COPYING
CIFS_UTILS_CPE_ID_VENDOR = samba
# Missing install-sh in release tarball and patching Makefile.am
# Missing install-sh in release tarball
CIFS_UTILS_AUTORECONF = YES
CIFS_UTILS_DEPENDENCIES = host-pkgconf
@@ -31,4 +31,12 @@ endef
CIFS_UTILS_POST_PATCH_HOOKS += CIFS_UTILS_NO_WERROR
ifeq ($(BR2_PACKAGE_CIFS_UTILS_SMBTOOLS),)
define CIFS_UTILS_REMOVE_SMBTOOLS
rm -f $(TARGET_DIR)/usr/bin/smbinfo
rm -f $(TARGET_DIR)/usr/bin/smb2-quota
endef
CIFS_UTILS_POST_INSTALL_TARGET_HOOKS += CIFS_UTILS_REMOVE_SMBTOOLS
endif
$(eval $(autotools-package))