Commit 7164a326 authored by Thomas De Schampheleire's avatar Thomas De Schampheleire Committed by Peter Korsgaard
Browse files

packages: remove support for documentation on target 



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: default avatarThomas De Schampheleire <thomas.de.schampheleire@gmail.com>
Signed-off-by: default avatarPeter Korsgaard <peter@korsgaard.com>
parent f75245d9

Config.in

+0 −14
Original line number Diff line number Diff line
@@ -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"

Config.in.legacy

+7 −0
Original line number Diff line number Diff line
@@ -119,6 +119,13 @@ config BR2_sh3eb 
	  Due to an inexistent user base and generally poor Linux

	  support, the support for the SH3eb architecture was removed.



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

Makefile

+0 −2
Original line number Diff line number Diff line
@@ -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

package/Makefile.in

+0 −2
Original line number Diff line number Diff line
@@ -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

package/avahi/avahi.mk

+1 −1
Original line number Diff line number Diff line
@@ -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 \