aboutsummaryrefslogtreecommitdiffstats
path: root/package
diff options
context:
space:
mode:
authorMagnus Kroken <mkroken@gmail.com>2020-07-24 14:15:17 +0200
committerAdrian Schmutzler <freifunk@adrianschmutzler.de>2020-08-12 11:10:16 +0200
commite754e0a143643d2d0460aec193fc20b6ca457614 (patch)
treef2e549b0192f36a89c46c13631c0698e40ae4687 /package
parent72878e3244ebaf9a24d8196079194c2432010be0 (diff)
downloadupstream-e754e0a143643d2d0460aec193fc20b6ca457614.tar.gz
upstream-e754e0a143643d2d0460aec193fc20b6ca457614.tar.bz2
upstream-e754e0a143643d2d0460aec193fc20b6ca457614.zip
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 <mkroken@gmail.com> [bump PKG_RELEASE] Signed-off-by: Adrian Schmutzler <freifunk@adrianschmutzler.de> (cherry picked from commit 4165232c45df224f32a94f43b9938d13d643b2a8)
Diffstat (limited to 'package')
-rw-r--r--package/utils/busybox/Makefile2
-rw-r--r--package/utils/busybox/patches/130-mconf_missing_sigwinch.patch13
2 files changed, 1 insertions, 14 deletions
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"
-