From: Magnus Kroken Date: Fri, 24 Jul 2020 12:15:17 +0000 (+0200) Subject: busybox: delete redundant patch X-Git-Tag: v19.07.4~28 X-Git-Url: http://git.cdn.openwrt.org/?a=commitdiff_plain;h=e754e0a143643d2d0460aec193fc20b6ca457614;p=openwrt%2Fstaging%2Fhauke.git busybox: delete redundant patch This problem has been fixed in upstream commit 6b6a3d9339f1c08efaa18a7fb7357e20b48bdc95. This patch now (harmlessly) adds the same definition a second time. Signed-off-by: Magnus Kroken [bump PKG_RELEASE] Signed-off-by: Adrian Schmutzler (cherry picked from commit 4165232c45df224f32a94f43b9938d13d643b2a8) --- diff --git a/package/utils/busybox/Makefile b/package/utils/busybox/Makefile index 9b80ed1f5e..23dd5498a1 100644 --- a/package/utils/busybox/Makefile +++ b/package/utils/busybox/Makefile @@ -9,7 +9,7 @@ include $(TOPDIR)/rules.mk PKG_NAME:=busybox PKG_VERSION:=1.30.1 -PKG_RELEASE:=5 +PKG_RELEASE:=6 PKG_FLAGS:=essential PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.bz2 diff --git a/package/utils/busybox/patches/130-mconf_missing_sigwinch.patch b/package/utils/busybox/patches/130-mconf_missing_sigwinch.patch deleted file mode 100644 index b8ca2122b8..0000000000 --- a/package/utils/busybox/patches/130-mconf_missing_sigwinch.patch +++ /dev/null @@ -1,13 +0,0 @@ ---- a/scripts/kconfig/mconf.c -+++ b/scripts/kconfig/mconf.c -@@ -31,6 +31,10 @@ - #define SIGWINCH 28 - #endif - -+#ifndef SIGWINCH -+#define SIGWINCH 28 -+#endif -+ - #define LKC_DIRECT_LINK - #include "lkc.h" -