From 45e78b34a7f53801c216bd59aec7af8ab927b70a Mon Sep 17 00:00:00 2001 From: Andy Walsh Date: Sat, 20 Jun 2020 19:26:12 +0200 Subject: [PATCH] Revert "ksmbd: update to 3.2.0, ksmbd-tools: update to 3.2.6" Signed-off-by: Andy Walsh This reverts commit d88405ba84d397a1ccecee5077bba25d33c4c21e. --- kernel/ksmbd/Makefile | 8 ++++---- kernel/ksmbd/patches/01-keep_kmod_metadata.patch | 5 ++--- net/ksmbd-tools/Makefile | 6 +++--- 3 files changed, 9 insertions(+), 10 deletions(-) diff --git a/kernel/ksmbd/Makefile b/kernel/ksmbd/Makefile index f1b039a630..1d288c30bf 100644 --- a/kernel/ksmbd/Makefile +++ b/kernel/ksmbd/Makefile @@ -1,12 +1,12 @@ include $(TOPDIR)/rules.mk PKG_NAME:=ksmbd -PKG_VERSION:=3.2.0 +PKG_VERSION:=3.1.3 PKG_RELEASE:=1 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz -PKG_SOURCE_URL:=https://codeload.github.com/cifsd-team/cifsd/tar.gz/$(PKG_VERSION)? -PKG_HASH:=063474f48f9481ff4a5acf978bd9b31fae39ccecfb232df4aac8c247a2a28b04 +PKG_SOURCE_URL:=https://github.com/cifsd-team/cifsd/archive/$(PKG_VERSION)/ +PKG_HASH:=c3c4531d3806117218d23e0552edfe883f978a00b7293180dd2919694102fcb9 PKG_MAINTAINER:=Andy Walsh PKG_LICENSE:=GPL-2.0-or-later @@ -59,7 +59,7 @@ EXTRA_CFLAGS += -DCONFIG_SMB_INSECURE_SERVER=1 endif define Build/Compile - $(KERNEL_MAKE) M="$(PKG_BUILD_DIR)" \ + $(KERNEL_MAKE) SUBDIRS="$(PKG_BUILD_DIR)" \ EXTRA_CFLAGS="$(EXTRA_CFLAGS)" \ $(PKG_EXTRA_KCONFIG) \ CONFIG_SMB_SERVER=m \ diff --git a/kernel/ksmbd/patches/01-keep_kmod_metadata.patch b/kernel/ksmbd/patches/01-keep_kmod_metadata.patch index a705529935..9fc547f2a6 100644 --- a/kernel/ksmbd/patches/01-keep_kmod_metadata.patch +++ b/kernel/ksmbd/patches/01-keep_kmod_metadata.patch @@ -1,5 +1,5 @@ ---- a/glob.h -+++ b/glob.h +--- a/glob.h 2019-12-08 ++++ b/glob.h 2019-12-08 @@ -7,6 +7,8 @@ #ifndef __KSMBD_GLOB_H #define __KSMBD_GLOB_H @@ -8,4 +8,3 @@ + #include #include - diff --git a/net/ksmbd-tools/Makefile b/net/ksmbd-tools/Makefile index 86b5aafc31..e7a677e4bf 100644 --- a/net/ksmbd-tools/Makefile +++ b/net/ksmbd-tools/Makefile @@ -1,12 +1,12 @@ include $(TOPDIR)/rules.mk PKG_NAME:=ksmbd-tools -PKG_VERSION:=3.2.6 +PKG_VERSION:=3.2.1 PKG_RELEASE:=1 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz -PKG_SOURCE_URL:=https://codeload.github.com/cifsd-team/ksmbd-tools/tar.gz/$(PKG_VERSION)? -PKG_HASH:=595029adb899fd8b4c49bea75bce4e3c3466811ef7089b2a55960174e720d919 +PKG_SOURCE_URL:=https://github.com/cifsd-team/cifsd-tools/archive/$(PKG_VERSION)/ +PKG_HASH:=acb4d97cbb0b22ad42ed1536bdd2c28af2a3c698664c058da59a644d5e6df599 PKG_MAINTAINER:=Andy Walsh PKG_LICENSE:=GPL-2.0-or-later -- 2.30.2