From 08e547f9439423be3a0f40007b63909a32464d3a Mon Sep 17 00:00:00 2001 From: Hannu Nyman Date: Mon, 30 Apr 2018 00:22:03 +0300 Subject: [PATCH] usbip: remove upstreamed musl compatibility patch (#5983) Remove musl compatibility patch that is now included in the upstream Linux kernel and backported to stable kernels. Commit in 4.4: https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux-stable.git/commit/tools/usb/usbip?h=linux-4.4.y&id=6638091f1b1623db8b2338ef5a5f26d9ec870444 Signed-off-by: Hannu Nyman --- net/usbip/Makefile | 2 +- net/usbip/patches-2.0/100-musl-compat.patch | 11 ----------- 2 files changed, 1 insertion(+), 12 deletions(-) delete mode 100644 net/usbip/patches-2.0/100-musl-compat.patch diff --git a/net/usbip/Makefile b/net/usbip/Makefile index 3148514fa8..4d0a9b7b67 100644 --- a/net/usbip/Makefile +++ b/net/usbip/Makefile @@ -9,7 +9,7 @@ include $(TOPDIR)/rules.mk include $(INCLUDE_DIR)/kernel.mk PKG_NAME:=usbip -PKG_RELEASE:=5 +PKG_RELEASE:=6 PKG_LICENSE:=GPL-2.0 # Since kernel 2.6.39.1 userspace tools are inside the kernel tree diff --git a/net/usbip/patches-2.0/100-musl-compat.patch b/net/usbip/patches-2.0/100-musl-compat.patch deleted file mode 100644 index a64678cb89..0000000000 --- a/net/usbip/patches-2.0/100-musl-compat.patch +++ /dev/null @@ -1,11 +0,0 @@ ---- a/src/usbipd.c -+++ b/src/usbipd.c -@@ -453,7 +453,7 @@ static void set_signal(void) - sigaction(SIGTERM, &act, NULL); - sigaction(SIGINT, &act, NULL); - act.sa_handler = SIG_IGN; -- sigaction(SIGCLD, &act, NULL); -+ sigaction(SIGCHLD, &act, NULL); - } - - static const char *pid_file; -- 2.30.2