Skip to contentSkip to conversation

linux-headers: remove deprecated versions 3.{0, 11, 13, 15}

PATCH New Gustavo Zacarias 2 participants 5 messages Sep 1, 2015 – Sep 13, 2015

lore
Share & tools
lore
#0 lore raw

PATCH 1/2 linux-headers: remove deprecated versions 3.{0, 11, 13, 15}

Remove for the upcoming 2015.11 release, they've been deprecated for a year now.
Also remove some previously forgotten selection removals in legacy.

---
 Config.in.legacy                     | 58 +++++++++++++++++++++++++++++++-----
 package/linux-headers/Config.in.host | 28 -----------------
 2 files changed, 50 insertions(+), 36 deletions(-)
Config.in.legacy +50 -8
index 3330566..8016b53 100644
@@ -105,6 +105,48 @@ comment "----------------------------------------------------"
 endif
 
 ###############################################################################
+comment "Legacy options removed in 2015.11"
+
+config BR2_KERNEL_HEADERS_3_0
+	bool "kernel headers version 3.0.x are no longer supported"
+	select BR2_KERNEL_HEADERS_3_2
+	select BR2_LEGACY
+	help
+	  Version 3.0.x of the Linux kernel headers have been deprecated
+	  for more than four buildroot releases and are now removed.
+	  As an alternative, version 3.2.x of the headers have been
+	  automatically selected in your configuration.
+
+config BR2_KERNEL_HEADERS_3_11
+	bool "kernel headers version 3.11.x are no longer supported"
+	select BR2_KERNEL_HEADERS_3_12
+	select BR2_LEGACY
+	help
+	  Version 3.11.x of the Linux kernel headers have been deprecated
+	  for more than four buildroot releases and are now removed.
+	  As an alternative, version 3.12.x of the headers have been
+	  automatically selected in your configuration.
+
+config BR2_KERNEL_HEADERS_3_13
+	bool "kernel headers version 3.13.x are no longer supported"
+	select BR2_KERNEL_HEADERS_3_14
+	select BR2_LEGACY
+	help
+	  Version 3.13.x of the Linux kernel headers have been deprecated
+	  for more than four buildroot releases and are now removed.
+	  As an alternative, version 3.14.x of the headers have been
+	  automatically selected in your configuration.
+
+config BR2_KERNEL_HEADERS_3_15
+	bool "kernel headers version 3.15.x are no longer supported"
+	select BR2_KERNEL_HEADERS_3_18
+	select BR2_LEGACY
+	help
+	  Version 3.15.x of the Linux kernel headers have been deprecated
+	  for more than four buildroot releases and are now removed.
+	  As an alternative, version 3.18.x of the headers have been
+	  automatically selected in your configuration.
+
 comment "Legacy options removed in 2015.08"
 
 config BR2_PACKAGE_KODI_PVR_ADDONS
@@ -630,12 +672,12 @@ config BR2_PACKAGE_LIBELF
 
 config BR2_KERNEL_HEADERS_3_8
 	bool "kernel headers version 3.8.x are no longer supported"
-	select BR2_KERNEL_HEADERS_3_9
+	select BR2_KERNEL_HEADERS_3_10
 	select BR2_LEGACY
 	help
 	  Version 3.8.x of the Linux kernel headers have been deprecated
 	  for more than four buildroot releases and are now removed.
-	  As an alternative, version 3.9.x of the headers have been
+	  As an alternative, version 3.10.x of the headers have been
 	  automatically selected in your configuration.
 
 config BR2_PACKAGE_GETTEXT_TOOLS
@@ -788,22 +830,22 @@ config BR2_PACKAGE_EVTEST_CAPTURE
 
 config BR2_KERNEL_HEADERS_3_6
 	bool "kernel headers version 3.6.x are no longer supported"
-	select BR2_KERNEL_HEADERS_3_9
+	select BR2_KERNEL_HEADERS_3_10
 	select BR2_LEGACY
 	help
 	  Version 3.6.x of the Linux kernel headers have been deprecated
 	  for more than four buildroot releases and are now removed.
-	  As an alternative, version 3.8.x of the headers have been
+	  As an alternative, version 3.10.x of the headers have been
 	  automatically selected in your configuration.
 
 config BR2_KERNEL_HEADERS_3_7
 	bool "kernel headers version 3.7.x are no longer supported"
-	select BR2_KERNEL_HEADERS_3_9
+	select BR2_KERNEL_HEADERS_3_10
 	select BR2_LEGACY
 	help
 	  Version 3.7.x of the Linux kernel headers have been deprecated
 	  for more than four buildroot releases and are now removed.
-	  As an alternative, version 3.8.x of the headers have been
+	  As an alternative, version 3.10.x of the headers have been
 	  automatically selected in your configuration.
 
 config BR2_PACKAGE_VALA
@@ -983,12 +1025,12 @@ config BR2_KERNEL_HEADERS_3_3
 
 config BR2_KERNEL_HEADERS_3_5
 	bool "kernel headers version 3.5.x are no longer supported"
-	select BR2_KERNEL_HEADERS_3_9
+	select BR2_KERNEL_HEADERS_3_10
 	select BR2_LEGACY
 	help
 	  Version 3.5.x of the Linux kernel headers have been deprecated
 	  for more than four buildroot releases and are now removed.
-	  As an alternative, version 3.8.x of the headers have been
+	  As an alternative, version 3.10.x of the headers have been
 	  automatically selected in your configuration.
 
 config BR2_GDB_VERSION_7_2
package/linux-headers/Config.in.host +0 -28
index 3a9603e..49a8dc2 100644
@@ -11,12 +11,6 @@ choice
 	  You must select the correct set of header files to match
 	  the kernel you intend to use on your target system.
 
-	config BR2_KERNEL_HEADERS_3_0
-		bool "Linux 3.0.x kernel headers"
-		depends on BR2_DEPRECATED_SINCE_2014_08
-		depends on !BR2_arc && !BR2_nios2
-		select BR2_TOOLCHAIN_HEADERS_AT_LEAST_3_0
-
 	config BR2_KERNEL_HEADERS_3_2
 		bool "Linux 3.2.x kernel headers"
 		depends on !BR2_arc && !BR2_nios2
@@ -32,34 +26,16 @@ choice
 		depends on !BR2_nios2
 		select BR2_TOOLCHAIN_HEADERS_AT_LEAST_3_10
 
-	config BR2_KERNEL_HEADERS_3_11
-		bool "Linux 3.11.x kernel headers"
-		depends on BR2_DEPRECATED_SINCE_2014_08
-		depends on !BR2_nios2
-		select BR2_TOOLCHAIN_HEADERS_AT_LEAST_3_11
-
 	config BR2_KERNEL_HEADERS_3_12
 		bool "Linux 3.12.x kernel headers"
 		depends on !BR2_nios2
 		select BR2_TOOLCHAIN_HEADERS_AT_LEAST_3_12
 
-	config BR2_KERNEL_HEADERS_3_13
-		bool "Linux 3.13.x kernel headers"
-		depends on BR2_DEPRECATED_SINCE_2014_08
-		depends on !BR2_nios2
-		select BR2_TOOLCHAIN_HEADERS_AT_LEAST_3_13
-
 	config BR2_KERNEL_HEADERS_3_14
 		bool "Linux 3.14.x kernel headers"
 		depends on !BR2_nios2
 		select BR2_TOOLCHAIN_HEADERS_AT_LEAST_3_14
 
-	config BR2_KERNEL_HEADERS_3_15
-		bool "Linux 3.15.x kernel headers"
-		depends on BR2_DEPRECATED_SINCE_2014_08
-		depends on !BR2_nios2
-		select BR2_TOOLCHAIN_HEADERS_AT_LEAST_3_15
-
 	config BR2_KERNEL_HEADERS_3_16
 		bool "Linux 3.16.x kernel headers"
 		depends on BR2_DEPRECATED_SINCE_2015_02
@@ -215,15 +191,11 @@ endchoice
 
 config BR2_DEFAULT_KERNEL_HEADERS
 	string
-	default "3.0.101"	if BR2_KERNEL_HEADERS_3_0
 	default "3.2.71"	if BR2_KERNEL_HEADERS_3_2
 	default "3.4.108"	if BR2_KERNEL_HEADERS_3_4
 	default "3.10.87"	if BR2_KERNEL_HEADERS_3_10
-	default "3.11.10"	if BR2_KERNEL_HEADERS_3_11
 	default "3.12.47"	if BR2_KERNEL_HEADERS_3_12
-	default "3.13.11"	if BR2_KERNEL_HEADERS_3_13
 	default "3.14.51"	if BR2_KERNEL_HEADERS_3_14
-	default "3.15.10"	if BR2_KERNEL_HEADERS_3_15
 	default "3.16.7"	if BR2_KERNEL_HEADERS_3_16
 	default "3.17.8"	if BR2_KERNEL_HEADERS_3_17
 	default "3.18.20"	if BR2_KERNEL_HEADERS_3_18
Signature · 1 line
2.4.6
#1 lore raw

PATCH 2/2 blackbox: remove deprecated package

Also update legacy as well.
And remove the BR2_DEPRECATED_SINCE_2014_08 symbol since it's unused now.

---
 Config.in                                          |   4 -
 Config.in.legacy                                   |   7 ++
 package/Config.in                                  |   1 -
 package/blackbox/0001-Fix-configure-ac.patch       |  34 -------
 package/blackbox/0002-gcc43.patch                  | 106 ---------------------
 .../blackbox/0003-gcc46-textpropertytostring.patch |  34 -------
 package/blackbox/Config.in                         |  18 ----
 package/blackbox/blackbox.hash                     |   2 -
 package/blackbox/blackbox.mk                       |  23 -----
 9 files changed, 7 insertions(+), 222 deletions(-)
 delete mode 100644 package/blackbox/0001-Fix-configure-ac.patch
 delete mode 100644 package/blackbox/0002-gcc43.patch
 delete mode 100644 package/blackbox/0003-gcc46-textpropertytostring.patch
 delete mode 100644 package/blackbox/Config.in
 delete mode 100644 package/blackbox/blackbox.hash
 delete mode 100644 package/blackbox/blackbox.mk
Config.in +0 -4
index 8b1bd8d..74aeb46 100644
@@ -296,10 +296,6 @@ config BR2_DEPRECATED
 
 if BR2_DEPRECATED
 
-config BR2_DEPRECATED_SINCE_2014_08
-	bool
-	default y
-
 config BR2_DEPRECATED_SINCE_2015_02
 	bool
 	default y
Config.in.legacy +7 -0
index 8016b53..8c8b5d5 100644
@@ -107,6 +107,13 @@ endif
 ###############################################################################
 comment "Legacy options removed in 2015.11"
 
+config BR2_PACKAGE_BLACKBOX
+	bool "blackbox package has been removed"
+	select BR2_LEGACY
+	help
+	  Upstream is dead and the package has been deprecated for
+	  some time. There are other alternative maintained WMs.
+
 config BR2_KERNEL_HEADERS_3_0
 	bool "kernel headers version 3.0.x are no longer supported"
 	select BR2_KERNEL_HEADERS_3_2
package/Config.in +0 -1
index 901ff96..15b994b 100644
@@ -299,7 +299,6 @@ comment "X libraries and helper libraries"
 	source "package/x11r7/xkeyboard-config/Config.in"
 
 comment "X window managers"
-	source "package/blackbox/Config.in"
 	source "package/enlightenment/Config.in"
 	source "package/fluxbox/Config.in"
 	source "package/matchbox/Config.in"
package/blackbox/0001-Fix-configure-ac.patch deleted +0 -34
deleted file mode 100644
index 1804473..0000000
@@ -1,34 +0,0 @@
-blackbox: merge existing patch and fix lpthread
-
-Merge the current configure patch into this one so it will patch 
-configure.ac instead. Also add pthread to libs to fix a linkage problem.
-
-Signed-off-by: Vicente Olivert Riera <[email protected]>
---- blackbox-0.70.1/configure.ac.orig	2013-12-17 11:02:38.799055141 +0000
-+++ blackbox-0.70.1/configure.ac	2013-12-17 11:09:08.421204545 +0000
-@@ -8,14 +8,6 @@ AC_CONFIG_SRCDIR([src/blackbox.cc])
- dnl Determine default prefix
- test "x$prefix" = "xNONE" && prefix="$ac_default_prefix"
- 
--dnl Look in the most logical places for external libraries
--CPPFLAGS="$CPPFLAGS -I$prefix/include"
--LDFLAGS="$LDFLAGS -L$prefix/lib"
--if test "x$prefix" != "x/usr/local"; then
--  CPPFLAGS="$CPPFLAGS -I/usr/local/include"
--  LDFLAGS="$LDFLAGS -L/usr/local/lib"
--fi
--
- dnl Locate required external software
- AC_PROG_CC
- 
-@@ -128,6 +120,10 @@ int main(int, char **)
-                   [AC_MSG_RESULT([no])]
-                  )
- 
-+dnl required pthread
-+AC_CHECK_LIB([pthread],
-+	     [pthread_cancel],
-+	     [LIBS="$LIBS -lpthread"])
- dnl needed for some X11 libs
- AC_CHECK_LIB([nsl],
-              [t_open],
package/blackbox/0002-gcc43.patch deleted +0 -106

106 lines not on this page · raw message

package/blackbox/0003-gcc46-textpropertytostring.patch deleted +0 -34
deleted file mode 100644
index af03be4..0000000
@@ -1,34 +0,0 @@
-[PATCH] fix build issue with gcc 4.6+
-
-Debian patch from http://patch-tracker.debian.org/patch/series/dl/blackbox/0.70.1-13/textpropertytostring-unconditional.diff
-
-Signed-off-by: Peter Korsgaard <[email protected]>
-
-Description: Declare bt::textPropertyToString unconditionally.
-Author: Jakub Wilk <[email protected]>
-Forwarded: no
-Bug-Debian: http://bugs.debian.org/614468
-Last-Update: 2011-03-12
-
---- a/lib/Util.hh
-+++ b/lib/Util.hh
-@@ -25,6 +25,8 @@
- #ifndef __Util_hh
- #define __Util_hh
- 
-+#include <X11/Xutil.h>
-+
- #include <limits.h>
- #include <string>
- 
-@@ -94,10 +96,8 @@
- 
-   std::string tolower(const std::string &string);
- 
--#ifdef _XUTIL_H_
-   std::string textPropertyToString(::Display *display,
-                                    ::XTextProperty& text_prop);
--#endif
- 
- } // namespace bt
- 
package/blackbox/Config.in deleted +0 -18
deleted file mode 100644
index 8b61c73..0000000
@@ -1,18 +0,0 @@
-config BR2_PACKAGE_BLACKBOX
-	bool "blackbox"
-	depends on BR2_PACKAGE_XORG7
-	depends on BR2_INSTALL_LIBSTDCPP
-	depends on BR2_USE_MMU # fork()
-	# upstream dead since 2005
-	depends on BR2_DEPRECATED_SINCE_2014_08
-	select BR2_PACKAGE_LIBICONV if !BR2_ENABLE_LOCALE
-	select BR2_PACKAGE_XLIB_LIBX11
-	help
-	  Blackbox is a fast, lightweight window manager for the X
-	  Window System.
-
-	  http://blackboxwm.sourceforge.net/
-
-comment "blackbox needs a toolchain w/ C++"
-	depends on BR2_PACKAGE_XORG7 && BR2_USE_MMU
-	depends on !BR2_INSTALL_LIBSTDCPP
package/blackbox/blackbox.hash deleted +0 -2
deleted file mode 100644
index 5aae1a9..0000000
@@ -1,2 +0,0 @@
-# Locally computed:
-sha256  92c2be347253f29b10063d579b4267a21516cb322a41b5e83d770fa6d44afd21  blackbox-0.70.1.tar.bz2
package/blackbox/blackbox.mk deleted +0 -23
deleted file mode 100644
index a73bc5b..0000000
@@ -1,23 +0,0 @@
-################################################################################
-#
-# blackbox
-#
-################################################################################
-
-BLACKBOX_VERSION = 0.70.1
-BLACKBOX_SOURCE = blackbox-$(BLACKBOX_VERSION).tar.bz2
-BLACKBOX_SITE = http://downloads.sourceforge.net/project/blackboxwm/blackboxwm/Blackbox%20$(BLACKBOX_VERSION)
-BLACKBOX_CONF_OPTS = \
-	--x-includes=$(STAGING_DIR)/usr/include/X11 \
-	--x-libraries=$(STAGING_DIR)/usr/lib
-BLACKBOX_DEPENDENCIES = xlib_libX11
-BLACKBOX_LICENSE = MIT
-BLACKBOX_LICENSE_FILES = LICENSE
-
-ifneq ($(BR2_ENABLE_LOCALE),y)
-BLACKBOX_DEPENDENCIES += libiconv
-endif
-
-BLACKBOX_AUTORECONF = YES
-
-$(eval $(autotools-package))
Signature · 1 line
2.4.6
#2 lore raw

PATCH 2/2 blackbox: remove deprecated package

Quoted 7 lines
Quoted 1 line
Quoted 1 line
Quoted 1 line
Quoted 1 line

"Gustavo" == Gustavo Zacarias <[email protected]> writes:

Also update legacy as well.
And remove the BR2_DEPRECATED_SINCE_2014_08 symbol since it's unused now.

Committed, thanks.

Signature · 1 line
Bye, Peter Korsgaard
#3 lore raw

PATCH 1/2 linux-headers: remove deprecated versions 3.{0, 11, 13, 15}

In reply to Gustavo Zacarias
Quoted 7 lines
Quoted 1 line
Quoted 1 line
Quoted 1 line
Quoted 1 line

"Gustavo" == Gustavo Zacarias <[email protected]> writes:

Remove for the upcoming 2015.11 release, they've been deprecated for a year now.
Also remove some previously forgotten selection removals in legacy.

Committed, thanks.

Signature · 1 line
Bye, Peter Korsgaard
#4 lore raw

PATCH 1/2 linux-headers: remove deprecated versions 3.{0, 11, 13, 15}

In reply to Gustavo Zacarias
Quoted 10 lines
Quoted 1 line
Quoted 1 line
Quoted 1 line
Quoted 1 line

"Gustavo" == Gustavo Zacarias <[email protected]> writes:

Remove for the upcoming 2015.11 release, they've been deprecated for a year now.
Also remove some previously forgotten selection removals in legacy.

---
 Config.in.legacy                     | 58 +++++++++++++++++++++++++++++++-----
 package/linux-headers/Config.in.host | 28 -----------------

You forgot to remove our 3.0.x kernel patch. I've done so now.

Signature · 1 line
Bye, Peter Korsgaard