* [Buildroot] [PATCH 1 of 8 v2] xstroke: remove deprecated package
2014-02-05 13:50 [Buildroot] [PATCH 0 of 8 v2] Remove remaining deprecated packages for 2014.02 Thomas De Schampheleire
@ 2014-02-05 13:50 ` Thomas De Schampheleire
2014-02-05 13:50 ` [Buildroot] [PATCH 2 of 8 v2] autoconf: remove deprecated target package Thomas De Schampheleire
` (7 subsequent siblings)
8 siblings, 0 replies; 10+ messages in thread
From: Thomas De Schampheleire @ 2014-02-05 13:50 UTC (permalink / raw)
To: buildroot
xstroke has been deprecated since 2013.02 and thus can be removed in
2014.02.
Signed-off-by: Thomas De Schampheleire <thomas.de.schampheleire@gmail.com>
---
v2: no changes
Config.in.legacy | 7 ++++
package/Config.in | 1 -
package/xstroke/Config.in | 14 ---------
package/xstroke/xstroke-fix-link-issues.patch | 35 -----------------------
package/xstroke/xstroke.mk | 13 --------
5 files changed, 7 insertions(+), 63 deletions(-)
diff --git a/Config.in.legacy b/Config.in.legacy
--- a/Config.in.legacy
+++ b/Config.in.legacy
@@ -101,6 +101,13 @@ endif
###############################################################################
comment "Legacy options removed in 2014.02"
+config BR2_PACKAGE_XSTROKE
+ bool "xstroke has been removed"
+ select BR2_LEGACY
+ help
+ The 'xstroke' package has been removed since it has been
+ deprecated for more than four buildroot releases.
+
config BR2_PACKAGE_LZMA
bool "lzma target package has been removed"
select BR2_LEGACY
diff --git a/package/Config.in b/package/Config.in
--- a/package/Config.in
+++ b/package/Config.in
@@ -235,7 +235,6 @@ source "package/torsmo/Config.in"
source "package/wmctrl/Config.in"
source "package/x11vnc/Config.in"
source "package/xscreensaver/Config.in"
-source "package/xstroke/Config.in"
source "package/xterm/Config.in"
source "package/xvkbd/Config.in"
diff --git a/package/xstroke/Config.in b/package/xstroke/Config.in
deleted file mode 100644
--- a/package/xstroke/Config.in
+++ /dev/null
@@ -1,14 +0,0 @@
-config BR2_PACKAGE_XSTROKE
- bool "xstroke"
- depends on BR2_PACKAGE_XORG7
- # dead upstream, probably not many users
- depends on BR2_DEPRECATED_SINCE_2013_02
- select BR2_PACKAGE_XLIB_LIBXFT
- select BR2_PACKAGE_XLIB_LIBXTST
- select BR2_PACKAGE_XLIB_LIBXPM
- select BR2_PACKAGE_XLIB_LIBXRENDER
- select BR2_PACKAGE_XLIB_LIBXEXT
- help
- Handwriting recognition for X
-
- http://mirror.egtvedt.no/avr32linux.org/twiki/pub/Main/XStroke
diff --git a/package/xstroke/xstroke-fix-link-issues.patch b/package/xstroke/xstroke-fix-link-issues.patch
deleted file mode 100644
--- a/package/xstroke/xstroke-fix-link-issues.patch
+++ /dev/null
@@ -1,35 +0,0 @@
-Fix link issues by linking against all needed libraries
-
-Since gcc 4.6, all libraries that are directly used must be explicitly
-passed on the command line. In the case of xstroke, linking against
-Xrender, Xext and dl was missing. For the first two, they are added
-through addition PKG_CHECK_MODULES() checks, for the latter, it is
-added next to -lm and -lpthread in Makefile.am.
-
-Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
-Index: b/Makefile.am
-===================================================================
---- a/Makefile.am
-+++ b/Makefile.am
-@@ -40,7 +40,7 @@
- BUILT_SOURCES = rec_parse.h rec_lex.h rec_lex.c
- AM_YFLAGS = -d
-
--xstroke_LDADD = @XSTROKE_LIBS@ -lm -lpthread $(X_LIBS) -lXpm -lXtst
-+xstroke_LDADD = @XSTROKE_LIBS@ -ldl -lm -lpthread $(X_LIBS) -lXpm -lXtst
- AM_CFLAGS = @XSTROKE_CFLAGS@ -DXSTROKE_CONF_DIR='"$(sysconfdir)/xstroke"' $(X_CFLAGS)
-
- EXTRA_DIST = xstroke_active.xpm xstroke_inactive.xpm etc/alphabet
-Index: b/configure.ac
-===================================================================
---- a/configure.ac
-+++ b/configure.ac
-@@ -26,7 +26,7 @@
- AC_CHECK_FUNCS([gettimeofday localtime_r])
-
- AC_PATH_XTRA
--PKG_CHECK_MODULES(XSTROKE, xft)
-+PKG_CHECK_MODULES(XSTROKE, [xft xrender xext])
-
- AC_CONFIG_FILES([Makefile])
- AC_OUTPUT
diff --git a/package/xstroke/xstroke.mk b/package/xstroke/xstroke.mk
deleted file mode 100644
--- a/package/xstroke/xstroke.mk
+++ /dev/null
@@ -1,13 +0,0 @@
-################################################################################
-#
-# xstroke
-#
-################################################################################
-
-XSTROKE_VERSION = 0.6
-XSTROKE_SITE = http://mirror.egtvedt.no/avr32linux.org/twiki/pub/Main/XStroke
-
-XSTROKE_DEPENDENCIES = xlib_libXft xlib_libXtst xlib_libXpm xlib_libXrender xlib_libXext
-XSTROKE_AUTORECONF = YES
-
-$(eval $(autotools-package))
^ permalink raw reply [flat|nested] 10+ messages in thread* [Buildroot] [PATCH 2 of 8 v2] autoconf: remove deprecated target package
2014-02-05 13:50 [Buildroot] [PATCH 0 of 8 v2] Remove remaining deprecated packages for 2014.02 Thomas De Schampheleire
2014-02-05 13:50 ` [Buildroot] [PATCH 1 of 8 v2] xstroke: remove deprecated package Thomas De Schampheleire
@ 2014-02-05 13:50 ` Thomas De Schampheleire
2014-02-05 13:50 ` [Buildroot] [PATCH 3 of 8 v2] automake: " Thomas De Schampheleire
` (6 subsequent siblings)
8 siblings, 0 replies; 10+ messages in thread
From: Thomas De Schampheleire @ 2014-02-05 13:50 UTC (permalink / raw)
To: buildroot
The autoconf support on target has been deprecated for more than four
buildroot releases and thus can be removed. This doesn't change anything
about the host autoconf support.
Signed-off-by: Thomas De Schampheleire <thomas.de.schampheleire@gmail.com>
---
v2: no changes
Config.in.legacy | 8 ++++++++
package/Config.in | 1 -
package/autoconf/Config.in | 10 ----------
package/autoconf/autoconf.mk | 6 ------
4 files changed, 8 insertions(+), 17 deletions(-)
diff --git a/Config.in.legacy b/Config.in.legacy
--- a/Config.in.legacy
+++ b/Config.in.legacy
@@ -101,6 +101,14 @@ endif
###############################################################################
comment "Legacy options removed in 2014.02"
+config BR2_PACKAGE_AUTOCONF
+ bool "autoconf target package has been removed"
+ select BR2_LEGACY
+ help
+ The 'autoconf' target package has been removed since it has been
+ deprecated for more than four buildroot releases.
+ Note: the host autoconf still exists.
+
config BR2_PACKAGE_XSTROKE
bool "xstroke has been removed"
select BR2_LEGACY
diff --git a/package/Config.in b/package/Config.in
--- a/package/Config.in
+++ b/package/Config.in
@@ -81,7 +81,6 @@ source "package/whetstone/Config.in"
endmenu
menu "Development tools"
-source "package/autoconf/Config.in"
source "package/automake/Config.in"
source "package/binutils/Config.in"
source "package/bison/Config.in"
diff --git a/package/autoconf/Config.in b/package/autoconf/Config.in
deleted file mode 100644
--- a/package/autoconf/Config.in
+++ /dev/null
@@ -1,10 +0,0 @@
-config BR2_PACKAGE_AUTOCONF
- bool "autoconf"
- # We no longer support a toolchain on the target
- depends on BR2_DEPRECATED_SINCE_2012_11
- select BR2_PACKAGE_PERL
- help
- Extensible program for developing configure scripts. These
- scripts handle all the mundane system/feature detection.
-
- http://www.gnu.org/software/autoconf/
diff --git a/package/autoconf/autoconf.mk b/package/autoconf/autoconf.mk
--- a/package/autoconf/autoconf.mk
+++ b/package/autoconf/autoconf.mk
@@ -11,17 +11,11 @@ AUTOCONF_SITE = $(BR2_GNU_MIRROR)/autoco
AUTOCONF_LICENSE = GPLv3+ with exceptions
AUTOCONF_LICENSE_FILES = COPYINGv3 COPYING.EXCEPTION
-AUTOCONF_CONF_ENV = EMACS="no" ac_cv_path_M4=$(HOST_DIR)/usr/bin/m4 \
- ac_cv_prog_gnu_m4_gnu=no
-
-AUTOCONF_DEPENDENCIES = host-m4 perl
-
HOST_AUTOCONF_CONF_ENV = EMACS="no" ac_cv_path_M4=$(HOST_DIR)/usr/bin/m4 \
ac_cv_prog_gnu_m4_gnu=no
HOST_AUTOCONF_DEPENDENCIES = host-m4 host-libtool
-$(eval $(autotools-package))
$(eval $(host-autotools-package))
# variables used by other packages
^ permalink raw reply [flat|nested] 10+ messages in thread* [Buildroot] [PATCH 3 of 8 v2] automake: remove deprecated target package
2014-02-05 13:50 [Buildroot] [PATCH 0 of 8 v2] Remove remaining deprecated packages for 2014.02 Thomas De Schampheleire
2014-02-05 13:50 ` [Buildroot] [PATCH 1 of 8 v2] xstroke: remove deprecated package Thomas De Schampheleire
2014-02-05 13:50 ` [Buildroot] [PATCH 2 of 8 v2] autoconf: remove deprecated target package Thomas De Schampheleire
@ 2014-02-05 13:50 ` Thomas De Schampheleire
2014-02-05 13:50 ` [Buildroot] [PATCH 4 of 8 v2] packages: remove support for documentation on target Thomas De Schampheleire
` (5 subsequent siblings)
8 siblings, 0 replies; 10+ messages in thread
From: Thomas De Schampheleire @ 2014-02-05 13:50 UTC (permalink / raw)
To: buildroot
The automake support on target has been deprecated for more than four
buildroot releases and thus can be removed. This doesn't change anything
about the host automake support.
Signed-off-by: Thomas De Schampheleire <thomas.de.schampheleire@gmail.com>
---
v2: no changes
Config.in.legacy | 8 ++++++++
package/Config.in | 1 -
package/automake/Config.in | 11 -----------
package/automake/automake.mk | 3 ---
4 files changed, 8 insertions(+), 15 deletions(-)
diff --git a/Config.in.legacy b/Config.in.legacy
--- a/Config.in.legacy
+++ b/Config.in.legacy
@@ -101,6 +101,14 @@ endif
###############################################################################
comment "Legacy options removed in 2014.02"
+config BR2_PACKAGE_AUTOMAKE
+ bool "automake target package has been removed"
+ select BR2_LEGACY
+ help
+ The 'automake' target package has been removed since it has been
+ deprecated for more than four buildroot releases.
+ Note: the host automake still exists.
+
config BR2_PACKAGE_AUTOCONF
bool "autoconf target package has been removed"
select BR2_LEGACY
diff --git a/package/Config.in b/package/Config.in
--- a/package/Config.in
+++ b/package/Config.in
@@ -81,7 +81,6 @@ source "package/whetstone/Config.in"
endmenu
menu "Development tools"
-source "package/automake/Config.in"
source "package/binutils/Config.in"
source "package/bison/Config.in"
source "package/bsdiff/Config.in"
diff --git a/package/automake/Config.in b/package/automake/Config.in
deleted file mode 100644
--- a/package/automake/Config.in
+++ /dev/null
@@ -1,11 +0,0 @@
-config BR2_PACKAGE_AUTOMAKE
- bool "automake"
- # We no longer support a toolchain on the target
- depends on BR2_DEPRECATED_SINCE_2012_11
- select BR2_PACKAGE_AUTOCONF
- select BR2_PACKAGE_PERL
- help
- Tool for automatically generating Makefile's for input to
- configure scripts (made by autoconf).
-
- http://www.gnu.org/software/automake/
diff --git a/package/automake/automake.mk b/package/automake/automake.mk
--- a/package/automake/automake.mk
+++ b/package/automake/automake.mk
@@ -10,8 +10,6 @@ AUTOMAKE_SITE = $(BR2_GNU_MIRROR)/automa
AUTOMAKE_LICENSE = GPLv2+
AUTOMAKE_LICENSE_FILES = COPYING
-AUTOMAKE_DEPENDENCIES = host-autoconf autoconf perl
-
HOST_AUTOMAKE_DEPENDENCIES = host-autoconf
define GTK_DOC_M4_INSTALL
@@ -26,7 +24,6 @@ endef
HOST_AUTOMAKE_POST_INSTALL_HOOKS += GTK_DOC_M4_INSTALL
HOST_AUTOMAKE_POST_INSTALL_HOOKS += HOST_AUTOMAKE_MAKE_ACLOCAL
-$(eval $(autotools-package))
$(eval $(host-autotools-package))
# variables used by other packages
^ permalink raw reply [flat|nested] 10+ messages in thread* [Buildroot] [PATCH 4 of 8 v2] packages: remove support for documentation on target
2014-02-05 13:50 [Buildroot] [PATCH 0 of 8 v2] Remove remaining deprecated packages for 2014.02 Thomas De Schampheleire
` (2 preceding siblings ...)
2014-02-05 13:50 ` [Buildroot] [PATCH 3 of 8 v2] automake: " Thomas De Schampheleire
@ 2014-02-05 13:50 ` Thomas De Schampheleire
2014-02-05 13:50 ` [Buildroot] [PATCH 5 of 8 v2] ccache: remove deprecated target package Thomas De Schampheleire
` (4 subsequent siblings)
8 siblings, 0 replies; 10+ messages in thread
From: Thomas De Schampheleire @ 2014-02-05 13:50 UTC (permalink / raw)
To: buildroot
This patch removes deprecated symbol BR2_HAVE_DOCUMENTATION and all its
usage. Additionally, it removes the now unused BR2_DEPRECATED_SINCE_2012_11.
Signed-off-by: Thomas De Schampheleire <thomas.de.schampheleire@gmail.com>
---
v2: avoid separate assignments to disable documentation (ThomasP)
Config.in | 14 --------------
Config.in.legacy | 7 +++++++
Makefile | 2 --
package/Makefile.in | 2 --
package/avahi/avahi.mk | 2 +-
package/berkeleydb/berkeleydb.mk | 4 ----
package/enlightenment/enlightenment.mk | 2 --
package/ffmpeg/ffmpeg.mk | 2 +-
package/hdparm/hdparm.mk | 7 -------
package/kmod/kmod.mk | 10 +++-------
package/libbsd/libbsd.mk | 6 ------
package/logsurfer/logsurfer.mk | 13 -------------
package/ncurses/ncurses.mk | 2 +-
package/netsnmp/netsnmp.mk | 7 +++----
package/opencv/opencv.mk | 4 +---
package/perl/perl.mk | 4 ----
package/pppd/pppd.mk | 10 ----------
package/pulseaudio/pulseaudio.mk | 2 +-
package/python-pygame/python-pygame.mk | 2 --
package/samba/samba.mk | 2 --
package/udisks/udisks.mk | 3 +--
package/vala/vala.mk | 10 ++--------
package/vim/vim.mk | 2 --
package/x11r7/xproto_xcmiscproto/xproto_xcmiscproto.mk | 2 +-
package/x11r7/xproto_xextproto/xproto_xextproto.mk | 2 +-
25 files changed, 23 insertions(+), 100 deletions(-)
diff --git a/Config.in b/Config.in
--- a/Config.in
+++ b/Config.in
@@ -264,10 +264,6 @@ config BR2_DEPRECATED
if BR2_DEPRECATED
-config BR2_DEPRECATED_SINCE_2012_11
- bool
- default y
-
config BR2_DEPRECATED_SINCE_2013_02
bool
default y
@@ -476,16 +472,6 @@ config BR2_PREFER_STATIC_LIB
WARNING: This is highly experimental at the moment.
-config BR2_HAVE_DOCUMENTATION
- bool "documentation on the target"
- # We no longer want to support a toolchain on the target
- depends on BR2_DEPRECATED_SINCE_2012_11
- help
- Install the documentation, including manual pages and info
- pages, on the target.
- If you say n here, your target will not contain any
- documentation.
-
config BR2_PACKAGE_OVERRIDE_FILE
string "location of a package override file"
default "$(TOPDIR)/local.mk"
diff --git a/Config.in.legacy b/Config.in.legacy
--- a/Config.in.legacy
+++ b/Config.in.legacy
@@ -101,6 +101,13 @@ endif
###############################################################################
comment "Legacy options removed in 2014.02"
+config BR2_HAVE_DOCUMENTATION
+ bool "support for documentation on target has been removed"
+ select BR2_LEGACY
+ help
+ Support for documentation on target has been removed since it has
+ been deprecated for more than four buildroot releases.
+
config BR2_PACKAGE_AUTOMAKE
bool "automake target package has been removed"
select BR2_LEGACY
diff --git a/Makefile b/Makefile
--- a/Makefile
+++ b/Makefile
@@ -500,13 +500,11 @@ target-finalize:
ifneq ($(BR2_PACKAGE_GDB),y)
rm -rf $(TARGET_DIR)/usr/share/gdb
endif
-ifneq ($(BR2_HAVE_DOCUMENTATION),y)
rm -rf $(TARGET_DIR)/usr/man $(TARGET_DIR)/usr/share/man
rm -rf $(TARGET_DIR)/usr/info $(TARGET_DIR)/usr/share/info
rm -rf $(TARGET_DIR)/usr/doc $(TARGET_DIR)/usr/share/doc
rm -rf $(TARGET_DIR)/usr/share/gtk-doc
-rmdir $(TARGET_DIR)/usr/share 2>/dev/null
-endif
ifeq ($(BR2_PACKAGE_PYTHON_PY_ONLY),y)
find $(TARGET_DIR)/usr/lib/ -name '*.pyc' -print0 | xargs -0 rm -f
endif
diff --git a/package/Makefile.in b/package/Makefile.in
--- a/package/Makefile.in
+++ b/package/Makefile.in
@@ -332,7 +332,6 @@ ifneq ($(BR2_LARGEFILE),y)
DISABLE_LARGEFILE= --disable-largefile
endif
-ifneq ($(BR2_HAVE_DOCUMENTATION),y)
# The configure option varies, but since unknown options are ignored
# we can pass all of them.
DISABLE_DOCUMENTATION = \
@@ -342,7 +341,6 @@ DISABLE_DOCUMENTATION = \
--disable-documentation \
--with-xmlto=no \
--with-fop=no
-endif
ifeq ($(BR2_INET_IPV6),y)
DISABLE_IPV6= --enable-ipv6
diff --git a/package/avahi/avahi.mk b/package/avahi/avahi.mk
--- a/package/avahi/avahi.mk
+++ b/package/avahi/avahi.mk
@@ -78,7 +78,7 @@ AVAHI_CONF_OPT = --localstatedir=/var \
--disable-monodoc \
--disable-stack-protector \
--with-distro=none \
- $(if $(BR2_HAVE_DOCUMENTATION),--enable,--disable)-manpages \
+ --disable-manpages \
$(if $(BR2_PACKAGE_AVAHI_AUTOIPD),--enable,--disable)-autoipd \
--with-avahi-user=default \
--with-avahi-group=default \
diff --git a/package/berkeleydb/berkeleydb.mk b/package/berkeleydb/berkeleydb.mk
--- a/package/berkeleydb/berkeleydb.mk
+++ b/package/berkeleydb/berkeleydb.mk
@@ -54,14 +54,10 @@ BERKELEYDB_POST_INSTALL_TARGET_HOOKS +=
endif
-ifneq ($(BR2_HAVE_DOCUMENTATION),y)
-
define BERKELEYDB_REMOVE_DOCS
rm -rf $(TARGET_DIR)/usr/docs
endef
BERKELEYDB_POST_INSTALL_TARGET_HOOKS += BERKELEYDB_REMOVE_DOCS
-endif
-
$(eval $(autotools-package))
diff --git a/package/enlightenment/enlightenment.mk b/package/enlightenment/enlightenment.mk
--- a/package/enlightenment/enlightenment.mk
+++ b/package/enlightenment/enlightenment.mk
@@ -35,13 +35,11 @@ else
ENLIGHTENMENT_CONF_ENV += enable_alsa=no
endif
-ifeq ($(BR2_HAVE_DOCUMENTATION),)
define ENLIGHTENMENT_REMOVE_DOCUMENTATION
rm -rf $(TARGET_DIR)/usr/share/enlightenment/doc/
rm -f $(TARGET_DIR)/usr/share/enlightenment/COPYING
rm -f $(TARGET_DIR)/usr/share/enlightenment/AUTHORS
endef
ENLIGHTENMENT_POST_INSTALL_TARGET_HOOKS += ENLIGHTENMENT_REMOVE_DOCUMENTATION
-endif
$(eval $(autotools-package))
diff --git a/package/ffmpeg/ffmpeg.mk b/package/ffmpeg/ffmpeg.mk
--- a/package/ffmpeg/ffmpeg.mk
+++ b/package/ffmpeg/ffmpeg.mk
@@ -69,7 +69,7 @@ FFMPEG_CONF_OPT = \
--disable-vis \
--disable-sram \
--disable-symver \
- $(if $(BR2_HAVE_DOCUMENTATION),,--disable-doc)
+ --disable-doc
FFMPEG_DEPENDENCIES += $(if $(BR2_PACKAGE_LIBICONV),libiconv)
diff --git a/package/hdparm/hdparm.mk b/package/hdparm/hdparm.mk
--- a/package/hdparm/hdparm.mk
+++ b/package/hdparm/hdparm.mk
@@ -15,15 +15,8 @@ define HDPARM_BUILD_CMDS
LDFLAGS="$(TARGET_LDFLAGS)"
endef
-ifeq ($(BR2_HAVE_DOCUMENTATION),y)
-define HDPARM_INSTALL_DOCUMENTATION
- $(INSTALL) -D $(@D)/hdparm.8 $(TARGET_DIR)/usr/share/man/man8/hdparm.8
-endef
-endif
-
define HDPARM_INSTALL_TARGET_CMDS
$(INSTALL) -D -m 0755 $(@D)/hdparm $(TARGET_DIR)/sbin/hdparm
- $(HDPARM_INSTALL_DOCUMENTATION)
endef
$(eval $(generic-package))
diff --git a/package/kmod/kmod.mk b/package/kmod/kmod.mk
--- a/package/kmod/kmod.mk
+++ b/package/kmod/kmod.mk
@@ -15,17 +15,13 @@ HOST_KMOD_DEPENDENCIES = host-pkgconf
KMOD_LICENSE = LGPLv2.1+
KMOD_LICENSE_FILES = libkmod/COPYING
+KMOD_CONF_OPT += --disable-manpages
+HOST_KMOD_CONF_OPT = --disable-manpages
+
# static linking not supported, see
# https://git.kernel.org/cgit/utils/kernel/kmod/kmod.git/commit/?id=b7016153ec8
KMOD_CONF_OPT = --disable-static --enable-shared
-# manpages not installed to host and needs xsltproc
-HOST_KMOD_CONF_OPT = --disable-manpages
-
-ifneq ($(BR2_HAVE_DOCUMENTATION),y)
-KMOD_CONF_OPT += --disable-manpages
-endif
-
ifeq ($(BR2_PACKAGE_ZLIB),y)
KMOD_DEPENDENCIES += zlib
KMOD_CONF_OPT += --with-zlib
diff --git a/package/libbsd/libbsd.mk b/package/libbsd/libbsd.mk
--- a/package/libbsd/libbsd.mk
+++ b/package/libbsd/libbsd.mk
@@ -9,12 +9,6 @@ LIBBSD_SITE = http://libbsd.f
LIBBSD_LICENSE = BSD-3c MIT
LIBBSD_LICENSE_FILES = COPYING
-# man-pages are BSD-4c, so that license only matters
-# if doc is kept in the target rootfs
-ifeq ($(BR2_HAVE_DOCUMENTATION),y)
-LIBBSD_LICENSE += (libraries), BSD-4c (documentation)
-endif
-
LIBBSD_INSTALL_STAGING = YES
$(eval $(autotools-package))
diff --git a/package/logsurfer/logsurfer.mk b/package/logsurfer/logsurfer.mk
--- a/package/logsurfer/logsurfer.mk
+++ b/package/logsurfer/logsurfer.mk
@@ -12,17 +12,4 @@ define LOGSURFER_INSTALL_TARGET_CMDS
$(TARGET_DIR)/usr/bin/logsurfer
endef
-ifeq ($(BR2_HAVE_DOCUMENTATION),y)
-
-define LOGSURFER_INSTALL_TARGET_MAN
- $(INSTALL) -D -m 0644 $(@D)/man/logsurfer.1 \
- $(TARGET_DIR)/usr/man/man1/logsurfer.1
- $(INSTALL) -D -m 0644 $(@D)/man/logsurfer.conf.4 \
- $(TARGET_DIR)/usr/man/man4/logsurfer.conf.4
-endef
-
-LOGSURFER_POST_INSTALL_TARGET_HOOKS += LOGSURFER_INSTALL_TARGET_MAN
-
-endif
-
$(eval $(autotools-package))
diff --git a/package/ncurses/ncurses.mk b/package/ncurses/ncurses.mk
--- a/package/ncurses/ncurses.mk
+++ b/package/ncurses/ncurses.mk
@@ -29,7 +29,7 @@ NCURSES_CONF_OPT = \
--enable-overwrite \
--enable-pc-files \
$(if $(BR2_PACKAGE_NCURSES_TARGET_PROGS),,--without-progs) \
- $(if $(BR2_HAVE_DOCUMENTATION),,--without-manpages)
+ --without-manpages
# Install after busybox for the full-blown versions
ifeq ($(BR2_PACKAGE_BUSYBOX),y)
diff --git a/package/netsnmp/netsnmp.mk b/package/netsnmp/netsnmp.mk
--- a/package/netsnmp/netsnmp.mk
+++ b/package/netsnmp/netsnmp.mk
@@ -22,7 +22,8 @@ NETSNMP_CONF_OPT = --with-persistent-dir
--with-sys-location="Unknown" \
--with-mib-modules="$(call qstrip,$(BR2_PACKAGE_NETSNMP_WITH_MIB_MODULES))" \
--with-out-mib-modules="$(call qstrip,$(BR2_PACKAGE_NETSNMP_WITHOUT_MIB_MODULES))" \
- --with-out-transports="Unix"
+ --with-out-transports="Unix" \
+ --disable-manuals
NETSNMP_MAKE = $(MAKE1)
NETSNMP_CONFIG_SCRIPTS = net-snmp-config
@@ -44,9 +45,7 @@ else
endif
# Docs
-ifneq ($(BR2_HAVE_DOCUMENTATION),y)
- NETSNMP_CONF_OPT += --disable-manuals
-endif
+NETSNMP_CONF_OPT += --disable-manuals
ifneq ($(BR2_PACKAGE_NETSNMP_ENABLE_MIBS),y)
NETSNMP_CONF_OPT += --disable-mib-loading
diff --git a/package/opencv/opencv.mk b/package/opencv/opencv.mk
--- a/package/opencv/opencv.mk
+++ b/package/opencv/opencv.mk
@@ -12,7 +12,7 @@ OPENCV_INSTALL_STAGING = YES
OPENCV_CONF_OPT += \
-DCMAKE_BUILD_TYPE=$(if $(BR2_ENABLE_DEBUG),Debug,Release) \
-DBUILD_WITH_STATIC_CRT=OFF \
- -DBUILD_DOCS=$(if $(BR2_HAVE_DOCUMENTATION),ON,OFF) \
+ -DBUILD_DOCS=OFF \
-DBUILD_EXAMPLES=OFF \
-DBUILD_PACKAGE=OFF \
-DBUILD_TESTS=$(if $(BR2_PACKAGE_OPENCV_BUILD_TESTS),ON,OFF) \
@@ -161,12 +161,10 @@ OPENCV_CONF_OPT += -DWITH_V4L=OFF
endif
# Installation hooks:
-ifneq ($(BR2_HAVE_DOCUMENTATION),y)
define OPENCV_CLEAN_INSTALL_DOC
$(RM) -fr $(TARGET_DIR)/usr/share/OpenCV/doc
endef
OPENCV_POST_INSTALL_TARGET_HOOKS += OPENCV_CLEAN_INSTALL_DOC
-endif
define OPENCV_CLEAN_INSTALL_CMAKE
$(RM) -f $(TARGET_DIR)/usr/share/OpenCV/OpenCVConfig*.cmake
diff --git a/package/perl/perl.mk b/package/perl/perl.mk
--- a/package/perl/perl.mk
+++ b/package/perl/perl.mk
@@ -91,10 +91,6 @@ define PERL_INSTALL_STAGING_CMDS
endef
PERL_INSTALL_TARGET_GOALS = install.perl
-ifeq ($(BR2_HAVE_DOCUMENTATION),y)
-PERL_INSTALL_TARGET_GOALS += install.man
-endif
-
define PERL_INSTALL_TARGET_CMDS
$(MAKE1) -C $(@D) DESTDIR="$(TARGET_DIR)" $(PERL_INSTALL_TARGET_GOALS)
diff --git a/package/pppd/pppd.mk b/package/pppd/pppd.mk
--- a/package/pppd/pppd.mk
+++ b/package/pppd/pppd.mk
@@ -12,8 +12,6 @@ PPPD_LICENSE_FILES = pppd/tdb.c pppd/plu
pppdump/bsd-comp.c pppd/ccp.c pppd/plugins/passprompt.c
PPPD_TARGET_BINS = chat pppd pppdump pppstats
-PPPD_MANPAGES = $(if $(BR2_HAVE_DOCUMENTATION),chat pppd pppdump pppstats)
-PPPD_RADIUS_MANPAGES = $(if $(BR2_HAVE_DOCUMENTATION),pppd-radattr pppd-radius)
PPPD_RADIUS_CONF = dictionary dictionary.ascend dictionary.compat \
dictionary.merit dictionary.microsoft \
issue port-id-map realms server radiusclient.conf
@@ -65,10 +63,6 @@ define PPPD_INSTALL_RADIUS
$(TARGET_DIR)/etc/ppp/radius/radiusclient.conf
$(SED) 's:/etc/radiusclient:/etc/ppp/radius:g' \
$(TARGET_DIR)/etc/ppp/radius/*
- for m in $(PPPD_RADIUS_MANPAGES); do \
- $(INSTALL) -m 644 -D $(PPPD_DIR)/pppd/plugins/radius/$$m.8 \
- $(TARGET_DIR)/usr/share/man/man8/$$m.8; \
- done
endef
endif
@@ -96,10 +90,6 @@ define PPPD_INSTALL_TARGET_CMDS
$(INSTALL) -D $(PPPD_DIR)/pppd/plugins/pppol2tp/pppol2tp.so \
$(TARGET_DIR)/usr/lib/pppd/$(PPPD_VERSION)/pppol2tp.so
$(PPPD_INSTALL_RADIUS)
- for m in $(PPPD_MANPAGES); do \
- $(INSTALL) -m 644 -D $(PPPD_DIR)/$$m/$$m.8 \
- $(TARGET_DIR)/usr/share/man/man8/$$m.8; \
- done
endef
$(eval $(generic-package))
diff --git a/package/pulseaudio/pulseaudio.mk b/package/pulseaudio/pulseaudio.mk
--- a/package/pulseaudio/pulseaudio.mk
+++ b/package/pulseaudio/pulseaudio.mk
@@ -15,7 +15,7 @@ PULSEAUDIO_CONF_OPT = \
--disable-default-build-tests \
--disable-legacy-runtime-dir \
--disable-legacy-database-entry-format \
- $(if $(BR2_HAVE_DOCUMENTATION),,--disable-manpages)
+ --disable-manpages
PULSEAUDIO_DEPENDENCIES = \
host-pkgconf libtool json-c libsndfile speex host-intltool \
diff --git a/package/python-pygame/python-pygame.mk b/package/python-pygame/python-pygame.mk
--- a/package/python-pygame/python-pygame.mk
+++ b/package/python-pygame/python-pygame.mk
@@ -82,13 +82,11 @@ define PYTHON_PYGAME_CONFIGURE_CMDS
$(PYTHON_PYGAME_UNCONFIGURE_SCRAP)
endef
-ifneq ($(BR2_HAVE_DOCUMENTATION),y)
define PYTHON_PYGAME_REMOVE_DOC
rm -rf $(TARGET_DIR)/usr/lib/python*/site-packages/pygame/docs
endef
PYTHON_PYGAME_POST_INSTALL_TARGET_HOOKS += PYTHON_PYGAME_REMOVE_DOC
-endif
define PYTHON_PYGAME_REMOVE_TESTS
rm -rf $(TARGET_DIR)/usr/lib/python*/site-packages/pygame/tests
diff --git a/package/samba/samba.mk b/package/samba/samba.mk
--- a/package/samba/samba.mk
+++ b/package/samba/samba.mk
@@ -157,10 +157,8 @@ endif
SAMBA_CONF_OPT += CFLAGS="$(TARGET_CFLAGS) -DMAX_DEBUG_LEVEL=$(BR2_PACKAGE_SAMBA_MAX_DEBUGLEVEL)"
ifeq ($(BR2_PACKAGE_SAMBA_SWAT),y)
-ifneq ($(BR2_HAVE_DOCUMENTATION),y)
SAMBA_POST_INSTALL_TARGET_HOOKS += SAMBA_REMOVE_SWAT_DOCUMENTATION
endif
-endif
define SAMBA_INSTALL_INITSCRIPTS_CONFIG
# install start/stop script
diff --git a/package/udisks/udisks.mk b/package/udisks/udisks.mk
--- a/package/udisks/udisks.mk
+++ b/package/udisks/udisks.mk
@@ -20,8 +20,7 @@ UDISKS_DEPENDENCIES = \
lvm2 \
libatasmart
-UDISKS_CONF_OPT = --disable-remote-access \
- $(if $(BR2_HAVE_DOCUMENTATION),,--disable-man-pages)
+UDISKS_CONF_OPT = --disable-remote-access --disable-man-pages
ifeq ($(BR2_PACKAGE_UDISKS_LVM2),y)
UDISKS_CONF_OPT += --enable-lvm2
diff --git a/package/vala/vala.mk b/package/vala/vala.mk
--- a/package/vala/vala.mk
+++ b/package/vala/vala.mk
@@ -15,15 +15,9 @@ VALA_LICENSE_FILES = COPYING
VALA_DEPENDENCIES = host-flex host-bison libglib2 \
$(if $(BR2_NEEDS_GETTEXT_IF_LOCALE),gettext)
-# If we want the documentation, then xsltproc is needed. If we don't
-# want the documentation, force Vala to not use the host xsltproc even
-# if available, because it may or may not work with Vala documentation
-# (some versions of xsltproc segfault)
-ifeq ($(BR2_HAVE_DOCUMENTATION),y)
-VALA_DEPENDENCIES += host-libxslt
-else
+# Force Vala to not use the host xsltproc even if available, because it may or
+# may not work with Vala documentation (some versions of xsltproc segfault)
VALA_CONF_ENV = ac_cv_path_XSLTPROC=:
-endif
HOST_VALA_DEPENDENCIES = host-flex host-libglib2
# Yes, the autoconf script understands ':' as "xsltproc is not
diff --git a/package/vim/vim.mk b/package/vim/vim.mk
--- a/package/vim/vim.mk
+++ b/package/vim/vim.mk
@@ -42,9 +42,7 @@ endef
ifeq ($(BR2_PACKAGE_VIM_RUNTIME),y)
VIM_POST_INSTALL_TARGET_HOOKS += VIM_INSTALL_RUNTIME_CMDS
-ifneq ($(BR2_HAVE_DOCUMENTATION),y)
VIM_POST_INSTALL_TARGET_HOOKS += VIM_REMOVE_DOCS
endif
-endif
$(eval $(autotools-package))
diff --git a/package/x11r7/xproto_xcmiscproto/xproto_xcmiscproto.mk b/package/x11r7/xproto_xcmiscproto/xproto_xcmiscproto.mk
--- a/package/x11r7/xproto_xcmiscproto/xproto_xcmiscproto.mk
+++ b/package/x11r7/xproto_xcmiscproto/xproto_xcmiscproto.mk
@@ -10,7 +10,7 @@ XPROTO_XCMISCPROTO_SITE = http://xorg.fr
XPROTO_XCMISCPROTO_LICENSE = MIT
XPROTO_XCMISCPROTO_LICENSE_FILES = COPYING
XPROTO_XCMISCPROTO_INSTALL_STAGING = YES
-XPROTO_XCMISCPROTO_CONF_OPT = $(if $(BR2_HAVE_DOCUMENTATION),,--disable-specs)
+XPROTO_XCMISCPROTO_CONF_OPT = --disable-specs
HOST_XPROTO_XCMISCPROTO_CONF_OPT = --disable-specs
$(eval $(autotools-package))
diff --git a/package/x11r7/xproto_xextproto/xproto_xextproto.mk b/package/x11r7/xproto_xextproto/xproto_xextproto.mk
--- a/package/x11r7/xproto_xextproto/xproto_xextproto.mk
+++ b/package/x11r7/xproto_xextproto/xproto_xextproto.mk
@@ -10,7 +10,7 @@ XPROTO_XEXTPROTO_SITE = http://xorg.free
XPROTO_XEXTPROTO_LICENSE = MIT
XPROTO_XEXTPROTO_LICENSE_FILES = COPYING
XPROTO_XEXTPROTO_INSTALL_STAGING = YES
-XPROTO_XEXTPROTO_CONF_OPT = $(if $(BR2_HAVE_DOCUMENTATION),,--disable-specs)
+XPROTO_XEXTPROTO_CONF_OPT = --disable-specs
HOST_XPROTO_XEXTPROTO_CONF_OPT = --disable-specs
$(eval $(autotools-package))
^ permalink raw reply [flat|nested] 10+ messages in thread* [Buildroot] [PATCH 5 of 8 v2] ccache: remove deprecated target package
2014-02-05 13:50 [Buildroot] [PATCH 0 of 8 v2] Remove remaining deprecated packages for 2014.02 Thomas De Schampheleire
` (3 preceding siblings ...)
2014-02-05 13:50 ` [Buildroot] [PATCH 4 of 8 v2] packages: remove support for documentation on target Thomas De Schampheleire
@ 2014-02-05 13:50 ` Thomas De Schampheleire
2014-02-05 13:50 ` [Buildroot] [PATCH 6 of 8 v2] gdb: remove deprecated versions 7.2.x and 7.3.x Thomas De Schampheleire
` (3 subsequent siblings)
8 siblings, 0 replies; 10+ messages in thread
From: Thomas De Schampheleire @ 2014-02-05 13:50 UTC (permalink / raw)
To: buildroot
The ccache target package has been deprecated since 2013.02 and thus can be
removed in 2014.02. This does not change anything about host ccache (used
for speeding up builds).
Signed-off-by: Thomas De Schampheleire <thomas.de.schampheleire@gmail.com>
---
v2: no changes
Config.in.legacy | 8 ++++++++
package/Config.in | 1 -
package/ccache/Config.in | 12 ------------
package/ccache/ccache.mk | 1 -
4 files changed, 8 insertions(+), 14 deletions(-)
diff --git a/Config.in.legacy b/Config.in.legacy
--- a/Config.in.legacy
+++ b/Config.in.legacy
@@ -101,6 +101,14 @@ endif
###############################################################################
comment "Legacy options removed in 2014.02"
+config BR2_PACKAGE_CCACHE
+ bool "ccache target package has been removed"
+ select BR2_LEGACY
+ help
+ The 'ccache' target package has been removed since it has been
+ deprecated for more than four buildroot releases.
+ Note: using ccache for speeding up builds is still supported.
+
config BR2_HAVE_DOCUMENTATION
bool "support for documentation on target has been removed"
select BR2_LEGACY
diff --git a/package/Config.in b/package/Config.in
--- a/package/Config.in
+++ b/package/Config.in
@@ -85,7 +85,6 @@ source "package/binutils/Config.in"
source "package/bison/Config.in"
source "package/bsdiff/Config.in"
source "package/bustle/Config.in"
-source "package/ccache/Config.in"
source "package/cvs/Config.in"
if BR2_PACKAGE_BUSYBOX_SHOW_OTHERS
source "package/diffutils/Config.in"
diff --git a/package/ccache/Config.in b/package/ccache/Config.in
deleted file mode 100644
--- a/package/ccache/Config.in
+++ /dev/null
@@ -1,12 +0,0 @@
-config BR2_PACKAGE_CCACHE
- bool "ccache"
- # needs fork()
- depends on BR2_USE_MMU
- # We no longer support a toolchain on the target
- depends on BR2_DEPRECATED_SINCE_2013_02
- help
- ccache is a compiler cache. It speeds up recompilation by
- caching previous compilations and detecting when the same
- compilation is being done again
-
- http://ccache.samba.org
diff --git a/package/ccache/ccache.mk b/package/ccache/ccache.mk
--- a/package/ccache/ccache.mk
+++ b/package/ccache/ccache.mk
@@ -38,7 +38,6 @@ endef
HOST_CCACHE_POST_CONFIGURE_HOOKS += \
HOST_CCACHE_PATCH_CONFIGURATION
-$(eval $(autotools-package))
$(eval $(host-autotools-package))
ifeq ($(BR2_CCACHE),y)
^ permalink raw reply [flat|nested] 10+ messages in thread* [Buildroot] [PATCH 6 of 8 v2] gdb: remove deprecated versions 7.2.x and 7.3.x
2014-02-05 13:50 [Buildroot] [PATCH 0 of 8 v2] Remove remaining deprecated packages for 2014.02 Thomas De Schampheleire
` (4 preceding siblings ...)
2014-02-05 13:50 ` [Buildroot] [PATCH 5 of 8 v2] ccache: remove deprecated target package Thomas De Schampheleire
@ 2014-02-05 13:50 ` Thomas De Schampheleire
2014-02-05 13:50 ` [Buildroot] [PATCH 7 of 8 v2] kernel-headers: remove deprecated versions 3.1, 3.3, 3.5 Thomas De Schampheleire
` (2 subsequent siblings)
8 siblings, 0 replies; 10+ messages in thread
From: Thomas De Schampheleire @ 2014-02-05 13:50 UTC (permalink / raw)
To: buildroot
Gdb versions 7.2.x and 7.3.x have been deprecated since 2013.02 and thus can
be removed in 2014.02.
For legacy handling, version 7.5.x is automatically selected.
Signed-off-by: Thomas De Schampheleire <thomas.de.schampheleire@gmail.com>
---
v2: no changes
Config.in.legacy | 18 ++++++++++++++++++
package/gdb/Config.in.host | 12 ------------
2 files changed, 18 insertions(+), 12 deletions(-)
diff --git a/Config.in.legacy b/Config.in.legacy
--- a/Config.in.legacy
+++ b/Config.in.legacy
@@ -101,6 +101,24 @@ endif
###############################################################################
comment "Legacy options removed in 2014.02"
+config BR2_GDB_VERSION_7_2
+ bool "gdb 7.2.x is no longer supported"
+ select BR2_GDB_VERSION_7_5
+ select BR2_LEGACY
+ help
+ Version 7.2.x of gdb has been deprecated for more than four
+ buildroot releases and is now removed. As an alternative, gdb
+ 7.5.x has been automatically selected in your configuration.
+
+config BR2_GDB_VERSION_7_3
+ bool "gdb 7.3.x is no longer supported"
+ select BR2_GDB_VERSION_7_5
+ select BR2_LEGACY
+ help
+ Version 7.3.x of gdb has been deprecated for more than four
+ buildroot releases and is now removed. As an alternative, gdb
+ 7.5.x has been automatically selected in your configuration.
+
config BR2_PACKAGE_CCACHE
bool "ccache target package has been removed"
select BR2_LEGACY
diff --git a/package/gdb/Config.in.host b/package/gdb/Config.in.host
--- a/package/gdb/Config.in.host
+++ b/package/gdb/Config.in.host
@@ -31,16 +31,6 @@ choice
depends on BR2_avr32
bool "gdb 6.7.1-avr32-2.1.5"
- config BR2_GDB_VERSION_7_2
- bool "gdb 7.2.x"
- depends on !BR2_bfin
- depends on BR2_DEPRECATED_SINCE_2013_02
-
- config BR2_GDB_VERSION_7_3
- bool "gdb 7.3.x"
- depends on !BR2_bfin
- depends on BR2_DEPRECATED_SINCE_2013_02
-
config BR2_GDB_VERSION_7_4
bool "gdb 7.4.x"
depends on !BR2_bfin
@@ -55,8 +45,6 @@ config BR2_GDB_VERSION
string
default "6.6a" if BR2_GDB_VERSION_6_6
default "6.7.1-avr32-2.1.5" if BR2_GDB_VERSION_6_7_1_AVR32_2_1_5
- default "7.2a" if BR2_GDB_VERSION_7_2
- default "7.3.1" if BR2_GDB_VERSION_7_3
default "7.4.1" if BR2_GDB_VERSION_7_4
default "7.5.1" if BR2_GDB_VERSION_7_5
default "f25a1952afd054205f9471e449c1f7ca5b271b7c" if BR2_arc
^ permalink raw reply [flat|nested] 10+ messages in thread* [Buildroot] [PATCH 7 of 8 v2] kernel-headers: remove deprecated versions 3.1, 3.3, 3.5
2014-02-05 13:50 [Buildroot] [PATCH 0 of 8 v2] Remove remaining deprecated packages for 2014.02 Thomas De Schampheleire
` (5 preceding siblings ...)
2014-02-05 13:50 ` [Buildroot] [PATCH 6 of 8 v2] gdb: remove deprecated versions 7.2.x and 7.3.x Thomas De Schampheleire
@ 2014-02-05 13:50 ` Thomas De Schampheleire
2014-02-05 13:51 ` [Buildroot] [PATCH 8 of 8 v2] infra: remove separate definition of DISABLE_DOCUMENTATION Thomas De Schampheleire
2014-02-08 22:45 ` [Buildroot] [PATCH 0 of 8 v2] Remove remaining deprecated packages for 2014.02 Peter Korsgaard
8 siblings, 0 replies; 10+ messages in thread
From: Thomas De Schampheleire @ 2014-02-05 13:50 UTC (permalink / raw)
To: buildroot
The Linux kernel headers versions 3.1, 3.3, and 3.5 have been deprecated
since 2013.02 and thus can be removed in 2014.02.
For legacy handling, we automatically select versions 3.2, 3.4, and 3.6,
respectively.
Additionally, this patch removes the now unused symbol
BR2_DEPRECATED_SINCE_2013_02.
Signed-off-by: Thomas De Schampheleire <thomas.de.schampheleire@gmail.com>
---
v2: no changes
Config.in | 4 ----
Config.in.legacy | 30 ++++++++++++++++++++++++++++++
| 15 ---------------
3 files changed, 30 insertions(+), 19 deletions(-)
diff --git a/Config.in b/Config.in
--- a/Config.in
+++ b/Config.in
@@ -264,10 +264,6 @@ config BR2_DEPRECATED
if BR2_DEPRECATED
-config BR2_DEPRECATED_SINCE_2013_02
- bool
- default y
-
config BR2_DEPRECATED_SINCE_2013_05
bool
default y
diff --git a/Config.in.legacy b/Config.in.legacy
--- a/Config.in.legacy
+++ b/Config.in.legacy
@@ -101,6 +101,36 @@ endif
###############################################################################
comment "Legacy options removed in 2014.02"
+config BR2_KERNEL_HEADERS_3_1
+ bool "kernel headers version 3.1.x are no longer supported"
+ select BR2_KERNEL_HEADERS_3_2
+ select BR2_LEGACY
+ help
+ Version 3.1.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_3
+ bool "kernel headers version 3.3.x are no longer supported"
+ select BR2_KERNEL_HEADERS_3_4
+ select BR2_LEGACY
+ help
+ Version 3.3.x of the Linux kernel headers have been deprecated
+ for more than four buildroot releases and are now removed.
+ As an alternative, version 3.4.x of the headers have been
+ automatically selected in your configuration.
+
+config BR2_KERNEL_HEADERS_3_5
+ bool "kernel headers version 3.5.x are no longer supported"
+ select BR2_KERNEL_HEADERS_3_6
+ 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.6.x of the headers have been
+ automatically selected in your configuration.
+
config BR2_GDB_VERSION_7_2
bool "gdb 7.2.x is no longer supported"
select BR2_GDB_VERSION_7_5
diff --git a/package/linux-headers/Config.in.host b/package/linux-headers/Config.in.host
--- a/package/linux-headers/Config.in.host
+++ b/package/linux-headers/Config.in.host
@@ -18,26 +18,14 @@ choice
bool "Linux 3.0.x kernel headers"
depends on !BR2_arc
- config BR2_KERNEL_HEADERS_3_1
- bool "Linux 3.1.x kernel headers"
- depends on BR2_DEPRECATED_SINCE_2013_02 && !BR2_arc
-
config BR2_KERNEL_HEADERS_3_2
bool "Linux 3.2.x kernel headers"
depends on !BR2_arc
- config BR2_KERNEL_HEADERS_3_3
- bool "Linux 3.3.x kernel headers"
- depends on BR2_DEPRECATED_SINCE_2013_02 && !BR2_arc
-
config BR2_KERNEL_HEADERS_3_4
bool "Linux 3.4.x kernel headers"
depends on !BR2_arc
- config BR2_KERNEL_HEADERS_3_5
- bool "Linux 3.5.x kernel headers"
- depends on BR2_DEPRECATED_SINCE_2013_02 && !BR2_arc
-
config BR2_KERNEL_HEADERS_3_6
bool "Linux 3.6.x kernel headers"
depends on BR2_DEPRECATED_SINCE_2013_05 && !BR2_arc
@@ -83,11 +71,8 @@ config BR2_DEFAULT_KERNEL_VERSION
config BR2_DEFAULT_KERNEL_HEADERS
string
default "3.0.101" if BR2_KERNEL_HEADERS_3_0
- default "3.1.10" if BR2_KERNEL_HEADERS_3_1
default "3.2.54" if BR2_KERNEL_HEADERS_3_2
- default "3.3.8" if BR2_KERNEL_HEADERS_3_3
default "3.4.78" if BR2_KERNEL_HEADERS_3_4
- default "3.5.7" if BR2_KERNEL_HEADERS_3_5
default "3.6.11" if BR2_KERNEL_HEADERS_3_6
default "3.7.10" if BR2_KERNEL_HEADERS_3_7
default "3.8.13" if BR2_KERNEL_HEADERS_3_8
^ permalink raw reply [flat|nested] 10+ messages in thread* [Buildroot] [PATCH 8 of 8 v2] infra: remove separate definition of DISABLE_DOCUMENTATION
2014-02-05 13:50 [Buildroot] [PATCH 0 of 8 v2] Remove remaining deprecated packages for 2014.02 Thomas De Schampheleire
` (6 preceding siblings ...)
2014-02-05 13:50 ` [Buildroot] [PATCH 7 of 8 v2] kernel-headers: remove deprecated versions 3.1, 3.3, 3.5 Thomas De Schampheleire
@ 2014-02-05 13:51 ` Thomas De Schampheleire
2014-02-08 22:45 ` [Buildroot] [PATCH 0 of 8 v2] Remove remaining deprecated packages for 2014.02 Peter Korsgaard
8 siblings, 0 replies; 10+ messages in thread
From: Thomas De Schampheleire @ 2014-02-05 13:51 UTC (permalink / raw)
To: buildroot
Since we now always disable documentation on target, there is no need to
have a separate variable DISABLE_DOCUMENTATION anymore.
Suggested-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
Signed-off-by: Thomas De Schampheleire <thomas.de.schampheleire@gmail.com>
---
v2: new patch
Note: I'm not 100% convinced by this patch, but I post it to ignite the
discussion. The advantage of the separate variable is the grouping of the
options. Without it, it is not so clear that --with-fop is related to
documentation, unless you already know what fop is. Also, there is no clear
place to put the comment regarding passing multiple options, so I just
removed it (losing some information).
Both problems could be solved by keeping the variable but moving it to
autotools.mk, but this is then no longer consistent with the other
DISABLE_xxx variables.
diff --git a/package/Makefile.in b/package/Makefile.in
--- a/package/Makefile.in
+++ b/package/Makefile.in
@@ -332,16 +332,6 @@ ifneq ($(BR2_LARGEFILE),y)
DISABLE_LARGEFILE= --disable-largefile
endif
-# The configure option varies, but since unknown options are ignored
-# we can pass all of them.
-DISABLE_DOCUMENTATION = \
- --disable-gtk-doc \
- --disable-doc \
- --disable-docs \
- --disable-documentation \
- --with-xmlto=no \
- --with-fop=no
-
ifeq ($(BR2_INET_IPV6),y)
DISABLE_IPV6= --enable-ipv6
else
diff --git a/package/pkg-autotools.mk b/package/pkg-autotools.mk
--- a/package/pkg-autotools.mk
+++ b/package/pkg-autotools.mk
@@ -110,7 +110,12 @@ define $(2)_CONFIGURE_CMDS
--exec-prefix=/usr \
--sysconfdir=/etc \
--program-prefix="" \
- $$(DISABLE_DOCUMENTATION) \
+ --disable-gtk-doc \
+ --disable-doc \
+ --disable-docs \
+ --disable-documentation \
+ --with-xmlto=no \
+ --with-fop=no
$$(DISABLE_NLS) \
$$(DISABLE_LARGEFILE) \
$$(DISABLE_IPV6) \
^ permalink raw reply [flat|nested] 10+ messages in thread* [Buildroot] [PATCH 0 of 8 v2] Remove remaining deprecated packages for 2014.02
2014-02-05 13:50 [Buildroot] [PATCH 0 of 8 v2] Remove remaining deprecated packages for 2014.02 Thomas De Schampheleire
` (7 preceding siblings ...)
2014-02-05 13:51 ` [Buildroot] [PATCH 8 of 8 v2] infra: remove separate definition of DISABLE_DOCUMENTATION Thomas De Schampheleire
@ 2014-02-08 22:45 ` Peter Korsgaard
8 siblings, 0 replies; 10+ messages in thread
From: Peter Korsgaard @ 2014-02-08 22:45 UTC (permalink / raw)
To: buildroot
>>>>> "Thomas" == Thomas De Schampheleire <patrickdepinguin@gmail.com> writes:
> This patch series removes all deprecated packages/features that we are
> allowed to remove for 2014.02 (deprecated since 2013.02 or earlier).
> Signed-off-by: Thomas De Schampheleire <thomas.de.schampheleire@gmail.com>
> ---
> v2:
> - update BR2_HAVE_DOCUMENTATION patch with comments from ThomasP.
> - new tentative patch removing DISABLE_DOCUMENTATION
Committed series, thanks.
--
Bye, Peter Korsgaard
^ permalink raw reply [flat|nested] 10+ messages in thread