Remove BR2_HAVE_DEVFILES

This finally removes the BR2_HAVE_DEVFILES option, that was used to
install/keep development files on target. With the recent migration of
the internal backend to the package infrastructure, we had anyway lost
the ability to build gcc for the target, and install the uClibc
development files on the target.

[Peter: also remove support/scripts/copy.sh]
Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>

diff --git a/Config.in b/Config.in
index bbb9885ef30ea1d0bba3d1570ad581b0174f1685..78dea3be02ad154460c277afc4844ae68d7ecf60 100644 (file)
--- a/Config.in
+++ b/Config.in
@@ -419,14 +419,6 @@ config BR2_HAVE_DOCUMENTATION
          If you say n here, your target will not contain any
          documentation.
 
-config BR2_HAVE_DEVFILES
-       bool "development files in target filesystem"
-       # We no longer want to support a toolchain on the target
-       depends on BR2_DEPRECATED
-       help
-         Install headers and static libraries in the
-         target filesystem
-
 config BR2_PACKAGE_OVERRIDE_FILE
        string "location of a package override file"
        default "$(TOPDIR)/local.mk"

diff --git a/Makefile b/Makefile
index 7a4602c7d930e8038ef48d8ebd87a31b466371e0..fe9bde7291de2068936948b129fa3f6c8d3913af 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -450,16 +450,12 @@ STRIP_FIND_CMD += -type f -perm +111
 STRIP_FIND_CMD += -not \( $(call findfileclauses,libpthread*.so* $(call qstrip,$(BR2_STRIP_EXCLUDE_FILES))) \) -print
 
 target-finalize:
-ifeq ($(BR2_HAVE_DEVFILES),y)
-       ( support/scripts/copy.sh $(STAGING_DIR) $(TARGET_DIR) )
-else
        rm -rf $(TARGET_DIR)/usr/include $(TARGET_DIR)/usr/share/aclocal \
                $(TARGET_DIR)/usr/lib/pkgconfig $(TARGET_DIR)/usr/share/pkgconfig \
                $(TARGET_DIR)/usr/lib/cmake $(TARGET_DIR)/usr/share/cmake
        find $(TARGET_DIR)/usr/{lib,share}/ -name '*.cmake' -print0 | xargs -0 rm -f
        find $(TARGET_DIR)/lib \( -name '*.a' -o -name '*.la' \) -print0 | xargs -0 rm -f
        find $(TARGET_DIR)/usr/lib \( -name '*.a' -o -name '*.la' \) -print0 | xargs -0 rm -f
-endif
 ifneq ($(BR2_PACKAGE_GDB),y)
        rm -rf $(TARGET_DIR)/usr/share/gdb
 endif

diff --git a/package/dbus/dbus.mk b/package/dbus/dbus.mk
index 57274a0cd9dc7f4e5533149db697cfd6c8b0cc52..7fbfb4c1790246aa524e6b7d5292568f14ce0469 100644 (file)
--- a/package/dbus/dbus.mk
+++ b/package/dbus/dbus.mk
@@ -61,9 +61,7 @@ define DBUS_REMOVE_DEVFILES
        rm -rf $(TARGET_DIR)/usr/lib/dbus-1.0
 endef
 
-ifneq ($(BR2_HAVE_DEVFILES),y)
 DBUS_POST_INSTALL_TARGET_HOOKS += DBUS_REMOVE_DEVFILES
-endif
 
 define DBUS_INSTALL_TARGET_FIXUP
        mkdir -p $(TARGET_DIR)/var/lib

diff --git a/package/libdnet/libdnet.mk b/package/libdnet/libdnet.mk
index 78f0ae01fa743af9756df63bcc7b516a3fb2f8a6..ea10251044abdf2dd9a7d178d958e34b144b3f92 100644 (file)
--- a/package/libdnet/libdnet.mk
+++ b/package/libdnet/libdnet.mk
@@ -34,8 +34,6 @@ define LIBDNET_REMOVE_CONFIG_SCRIPT
        $(RM) -f $(TARGET_DIR)/usr/bin/dnet-config
 endef
 
-ifneq ($(BR2_HAVE_DEVFILES),y)
 LIBDNET_POST_INSTALL_TARGET_HOOKS += LIBDNET_REMOVE_CONFIG_SCRIPT
-endif
 
 $(eval $(autotools-package))

diff --git a/package/libglib2/libglib2.mk b/package/libglib2/libglib2.mk
index 178d1378070f7984ca9b6405b230508ed893c47b..b07b2c6877a142f656da68550a50be0fdeeb7cbc 100644 (file)
--- a/package/libglib2/libglib2.mk
+++ b/package/libglib2/libglib2.mk
@@ -103,9 +103,7 @@ define LIBGLIB2_REMOVE_DEV_FILES
        rm -f $(addprefix $(TARGET_DIR)/usr/bin/,glib-genmarshal glib-gettextize glib-mkenums gobject-query gtester gtester-report)
 endef
 
-ifneq ($(BR2_HAVE_DEVFILES),y)
 LIBGLIB2_POST_INSTALL_TARGET_HOOKS += LIBGLIB2_REMOVE_DEV_FILES
-endif
 
 define LIBGLIB2_REMOVE_GDB_FILES
        rm -rf $(TARGET_DIR)/usr/share/glib-2.0/gdb

diff --git a/package/lua/lua.mk b/package/lua/lua.mk
index ac75fe6d56dceb970d9d16a4ed09e31d5436bfe6..904ca523bcb0b4d1705745710ac2b58492da000f 100644 (file)
--- a/package/lua/lua.mk
+++ b/package/lua/lua.mk
@@ -64,18 +64,6 @@ define LUA_INSTALL_STAGING_CMDS
        $(INSTALL) -m 0644 -D $(@D)/src/lauxlib.h $(STAGING_DIR)/usr/include/lauxlib.h
 endef
 
-ifeq ($(BR2_HAVE_DEVFILES),y)
-define LUA_INSTALL_DEVFILES
-       $(INSTALL) -m 0644 -D $(@D)/etc/lua.pc \
-               $(TARGET_DIR)/usr/lib/pkgconfig/lua.pc
-       $(INSTALL) -m 0644 -D $(@D)/src/lua.h $(TARGET_DIR)/usr/include/lua.h
-       $(INSTALL) -m 0644 -D $(@D)/src/luaconf.h $(TARGET_DIR)/usr/include/luaconf.h
-       $(INSTALL) -m 0644 -D $(@D)/src/lualib.h $(TARGET_DIR)/usr/include/lualib.h
-       $(INSTALL) -m 0644 -D $(@D)/src/lauxlib.h $(TARGET_DIR)/usr/include/lauxlib.h
-endef
-endif
-
-
 define LUA_INSTALL_TARGET_CMDS
        $(INSTALL) -m 0755 -D $(@D)/src/lua $(TARGET_DIR)/usr/bin/lua
        $(INSTALL) -m 0755 -D $(@D)/src/luac $(TARGET_DIR)/usr/bin/luac
@@ -83,7 +71,6 @@ define LUA_INSTALL_TARGET_CMDS
                $(TARGET_DIR)/usr/lib/liblua.so.$(LUA_VERSION)
        ln -sf liblua.so.$(LUA_VERSION) $(TARGET_DIR)/usr/lib/liblua.so
        $(INSTALL) -m 0644 -D $(@D)/src/liblua.a $(TARGET_DIR)/usr/lib/liblua.a
-       $(LUA_INSTALL_DEVFILES)
 endef
 
 define HOST_LUA_INSTALL_CMDS

diff --git a/package/multimedia/mpg123/mpg123.mk b/package/multimedia/mpg123/mpg123.mk
index f55404388ce079a6fda4807ea8b2e284c7824712..e9d074fc75d603fc663e77e3fd7992373018d527 100644 (file)
--- a/package/multimedia/mpg123/mpg123.mk
+++ b/package/multimedia/mpg123/mpg123.mk
@@ -61,8 +61,7 @@ MPG123_CONF_OPT += --with-audio=$(shell echo $(MPG123_AUDIO) | tr ' ' ,)
 
 ifeq ($(BR2_PACKAGE_LIBTOOL),y)
 MPG123_DEPENDENCIES += libtool
-# .la files gets stripped unless HAVE_DEVFILES is enabled, so directly
-# load .so files rather than .la
+# .la files gets stripped , so directly load .so files rather than .la
 MPG123_CONF_OPT += --with-modules --with-module-suffix=.so
 endif
 

diff --git a/package/ncurses/ncurses.mk b/package/ncurses/ncurses.mk
index 5381bd18d6273f89dfaf41422e1d01ab999c190a..dbb514e78c75e95de0ec9f9a0811832b8e2c9db9 100644 (file)
--- a/package/ncurses/ncurses.mk
+++ b/package/ncurses/ncurses.mk
@@ -38,25 +38,6 @@ define NCURSES_BUILD_CMDS
        $(MAKE1) -C $(@D) DESTDIR=$(STAGING_DIR)
 endef
 
-ifeq ($(BR2_HAVE_DEVFILES),y)
-define NCURSES_INSTALL_TARGET_DEVFILES
-       mkdir -p $(TARGET_DIR)/usr/include
-       cp -dpf $(NCURSES_DIR)/include/curses.h $(TARGET_DIR)/usr/include/curses.h
-       cp -dpf $(NCURSES_DIR)/include/ncurses_dll.h $(TARGET_DIR)/usr/include/ncurses_dll.h
-       cp -dpf $(NCURSES_DIR)/include/term.h $(TARGET_DIR)/usr/include/
-       cp -dpf $(NCURSES_DIR)/include/unctrl.h $(TARGET_DIR)/usr/include/
-       cp -dpf $(NCURSES_DIR)/include/termcap.h $(TARGET_DIR)/usr/include/
-       cp -dpf $(NCURSES_DIR)/lib/libncurses.a $(TARGET_DIR)/usr/lib/
-       (cd $(TARGET_DIR)/usr/lib; \
-        ln -fs libncurses.a libcurses.a; \
-        ln -fs libncurses.a libtermcap.a; \
-       )
-       (cd $(TARGET_DIR)/usr/include; ln -fs curses.h ncurses.h)
-       rm -f $(TARGET_DIR)/usr/lib/libncurses.so
-       (cd $(TARGET_DIR)/usr/lib; ln -fs libncurses.so.$(NCURSES_VERSION) libncurses.so)
-endef
-endif
-
 ifneq ($(BR2_PREFER_STATIC_LIB),y)
 
 ifeq ($(BR2_PACKAGE_NCURSES_TARGET_PANEL),y)
@@ -101,7 +82,6 @@ define NCURSES_INSTALL_TARGET_CMDS
        cp -dpf $(STAGING_DIR)/usr/share/terminfo/l/linux $(TARGET_DIR)/usr/share/terminfo/l
        mkdir -p $(TARGET_DIR)/usr/share/terminfo/s
        cp -dpf $(STAGING_DIR)/usr/share/terminfo/s/screen $(TARGET_DIR)/usr/share/terminfo/s
-       $(NCURSES_INSTALL_TARGET_DEVFILES)
 endef # NCURSES_INSTALL_TARGET_CMDS
 
 #

diff --git a/package/opencv/opencv.mk b/package/opencv/opencv.mk
index 3bf7ee9e22c054fee37970d9663567b855f68b18..b9ed8cbc86f29993915cd5b6b21ed522082c70b7 100644 (file)
--- a/package/opencv/opencv.mk
+++ b/package/opencv/opencv.mk
@@ -169,12 +169,10 @@ endef
 OPENCV_POST_INSTALL_TARGET_HOOKS += OPENCV_CLEAN_INSTALL_DOC
 endif
 
-ifneq ($(BR2_HAVE_DEVFILES),y)
 define OPENCV_CLEAN_INSTALL_CMAKE
        $(RM) -f $(TARGET_DIR)/usr/share/OpenCV/OpenCVConfig*.cmake
 endef
 OPENCV_POST_INSTALL_TARGET_HOOKS += OPENCV_CLEAN_INSTALL_CMAKE
-endif
 
 ifneq ($(BR2_PACKAGE_OPENCV_INSTALL_DATA),y)
 define OPENCV_CLEAN_INSTALL_DATA

diff --git a/package/openssl/openssl.mk b/package/openssl/openssl.mk
index e16c91ff8dc810163e77ed134a9b407bbd470e87..a0e103b3ac403d7eccffb9c28a27dc6370a9a5f0 100644 (file)
--- a/package/openssl/openssl.mk
+++ b/package/openssl/openssl.mk
@@ -105,22 +105,10 @@ endef
 
 define OPENSSL_INSTALL_TARGET_CMDS
        $(MAKE1) -C $(@D) INSTALL_PREFIX=$(TARGET_DIR) install
-endef
-
-define OPENSSL_REMOVE_DEV_FILES
        rm -rf $(TARGET_DIR)/usr/lib/ssl
-endef
-
-ifneq ($(BR2_HAVE_DEVFILES),y)
-OPENSSL_POST_INSTALL_TARGET_HOOKS += OPENSSL_REMOVE_DEV_FILES
-endif
-
-define OPENSSL_INSTALL_FIXUPS
        rm -f $(TARGET_DIR)/usr/bin/c_rehash
 endef
 
-OPENSSL_POST_INSTALL_TARGET_HOOKS += OPENSSL_INSTALL_FIXUPS
-
 ifneq ($(BR2_PREFER_STATIC_LIB),y)
 
 # libraries gets installed read only, so strip fails

diff --git a/package/orc/orc.mk b/package/orc/orc.mk
index 9d9921a26bcc5e8c017e2a2d674d16b0dab9dcc2..dc93882ab316669d6a2797c58be20517785f91ee 100644 (file)
--- a/package/orc/orc.mk
+++ b/package/orc/orc.mk
@@ -20,10 +20,7 @@ define ORC_REMOVE_DEVFILES
 endef
 
 ORC_POST_INSTALL_TARGET_HOOKS += ORC_REMOVE_BUGREPORT
-
-ifneq ($(BR2_HAVE_DEVFILES),y)
 ORC_POST_INSTALL_TARGET_HOOKS += ORC_REMOVE_DEVFILES
-endif
 
 $(eval $(autotools-package))
 $(eval $(host-autotools-package))

diff --git a/package/pkg-generic.mk b/package/pkg-generic.mk
index 56fca6be85e6ef8ffdc821d04ca2b749249b3199..668f011b372504dc0f4b656de12e4a9048e3339b 100644 (file)
--- a/package/pkg-generic.mk
+++ b/package/pkg-generic.mk
@@ -153,11 +153,9 @@ $(BUILD_DIR)/%/.stamp_target_installed:
                $($(PKG)_INSTALL_INIT_SYSV))
        $($(PKG)_INSTALL_TARGET_CMDS)
        $(foreach hook,$($(PKG)_POST_INSTALL_TARGET_HOOKS),$(call $(hook))$(sep))
-ifeq ($(BR2_HAVE_DEVFILES),)
        $(Q)if test -n "$($(PKG)_CONFIG_SCRIPTS)" ; then \
                $(RM) -f $(addprefix $(TARGET_DIR)/usr/bin/,$($(PKG)_CONFIG_SCRIPTS)) ; \
        fi
-endif
        $(Q)touch $@
 
 # Clean package

diff --git a/package/python/python.mk b/package/python/python.mk
index 363513dc3e59c856e4c76c4fdeca03707ad4d3c3..975d6f40c0d6d77eba76a471b4589259036c07bb 100644 (file)
--- a/package/python/python.mk
+++ b/package/python/python.mk
@@ -150,24 +150,14 @@ endef
 
 PYTHON_POST_INSTALL_TARGET_HOOKS += PYTHON_REMOVE_SMTPD
 
-#
-# Development files removal
-#
-define PYTHON_REMOVE_DEVFILES
-       rm -f $(TARGET_DIR)/usr/bin/python$(PYTHON_VERSION_MAJOR)-config
-       rm -f $(TARGET_DIR)/usr/bin/python2-config
-       rm -f $(TARGET_DIR)/usr/bin/python-config
-endef
-
-ifneq ($(BR2_HAVE_DEVFILES),y)
-PYTHON_POST_INSTALL_TARGET_HOOKS += PYTHON_REMOVE_DEVFILES
-endif
-
 #
 # Remove useless files. In the config/ directory, only the Makefile
 # and the pyconfig.h files are needed at runtime.
 #
 define PYTHON_REMOVE_USELESS_FILES
+       rm -f $(TARGET_DIR)/usr/bin/python$(PYTHON_VERSION_MAJOR)-config
+       rm -f $(TARGET_DIR)/usr/bin/python2-config
+       rm -f $(TARGET_DIR)/usr/bin/python-config
        for i in `find $(TARGET_DIR)/usr/lib/python$(PYTHON_VERSION_MAJOR)/config/ \
                -type f -not -name pyconfig.h -a -not -name Makefile` ; do \
                rm -f $$i ; \

diff --git a/package/python3/python3.mk b/package/python3/python3.mk
index 39202ff1b7a77133be9cc29916b5eb7aa066e57f..ed79f8e3eaa3bb64da805fb36fde02943e60fb62 100644 (file)
--- a/package/python3/python3.mk
+++ b/package/python3/python3.mk
@@ -133,24 +133,14 @@ endef
 
 PYTHON3_POST_INSTALL_STAGING_HOOKS += PYTHON3_FIXUP_LIBDIR
 
-#
-# Development files removal
-#
-define PYTHON3_REMOVE_DEVFILES
-       rm -f $(TARGET_DIR)/usr/bin/python$(PYTHON3_VERSION_MAJOR)-config
-       rm -f $(TARGET_DIR)/usr/bin/python$(PYTHON3_VERSION_MAJOR)m-config
-       rm -f $(TARGET_DIR)/usr/bin/python3-config
-endef
-
-ifneq ($(BR2_HAVE_DEVFILES),y)
-PYTHON3_POST_INSTALL_TARGET_HOOKS += PYTHON3_REMOVE_DEVFILES
-endif
-
 #
 # Remove useless files. In the config/ directory, only the Makefile
 # and the pyconfig.h files are needed at runtime.
 #
 define PYTHON3_REMOVE_USELESS_FILES
+       rm -f $(TARGET_DIR)/usr/bin/python$(PYTHON3_VERSION_MAJOR)-config
+       rm -f $(TARGET_DIR)/usr/bin/python$(PYTHON3_VERSION_MAJOR)m-config
+       rm -f $(TARGET_DIR)/usr/bin/python3-config
        for i in `find $(TARGET_DIR)/usr/lib/python$(PYTHON3_VERSION_MAJOR)/config-3.3m/ \
                -type f -not -name pyconfig.h -a -not -name Makefile` ; do \
                rm -f $$i ; \

diff --git a/package/sdl_sound/sdl_sound.mk b/package/sdl_sound/sdl_sound.mk
index ae449aea51edad163ca73025bc7519b1cf3316a5..cd1ed3e9986b031037a77b0cb9d42855a62b2480 100644 (file)
--- a/package/sdl_sound/sdl_sound.mk
+++ b/package/sdl_sound/sdl_sound.mk
@@ -48,7 +48,7 @@ SDL_SOUND_POST_INSTALL_TARGET_HOOKS += SDL_SOUND_REMOVE_PLAYSOUND
 endif
 
 # target shared libs doesn't get removed by make uninstall if the .la
-# files are removed (E.G. if BR2_HAVE_DEVFILES isn't set)
+# files are removed
 define SDL_SOUND_UNINSTALL_TARGET_CMDS
        $(MAKE) DESTDIR=$(TARGET_DIR) uninstall -C $(@D)
        rm -f $(TARGET_DIR)/usr/lib/libSDL_sound*so*

diff --git a/package/taglib/taglib.mk b/package/taglib/taglib.mk
index 82602933c9b0f9b4c63f750b543e82186987c3aa..75e8e679f0ad5ce809ceaee388f84524241724fe 100644 (file)
--- a/package/taglib/taglib.mk
+++ b/package/taglib/taglib.mk
@@ -22,8 +22,6 @@ define TAGLIB_REMOVE_DEVFILE
        rm -f $(TARGET_DIR)/usr/bin/taglib-config
 endef
 
-ifneq ($(BR2_HAVE_DEVFILES),y)
 TAGLIB_POST_INSTALL_TARGET_HOOKS += TAGLIB_REMOVE_DEVFILE
-endif
 
 $(eval $(cmake-package))

diff --git a/package/usbutils/usbutils.mk b/package/usbutils/usbutils.mk
index e679b26abb3e951ff0ed88a3ddbc1acc4489c8ad..c56702b60059a1ca175795b6bc85fdd5665fbb5a 100644 (file)
--- a/package/usbutils/usbutils.mk
+++ b/package/usbutils/usbutils.mk
@@ -51,8 +51,6 @@ define USBUTILS_REMOVE_DEVFILES
        rm -f $(TARGET_DIR)/usr/bin/libusb-config
 endef
 
-ifneq ($(BR2_HAVE_DEVFILES),y)
 USBUTILS_POST_INSTALL_TARGET_HOOKS += USBUTILS_REMOVE_DEVFILES
-endif
 
 $(eval $(autotools-package))

diff --git a/package/xenomai/xenomai.mk b/package/xenomai/xenomai.mk
index 14c616e82d6781706f084894b97237499aa8d832..859895319f19affcdea9c56433d0fb727d6cfe9e 100644 (file)
--- a/package/xenomai/xenomai.mk
+++ b/package/xenomai/xenomai.mk
@@ -19,7 +19,6 @@ XENOMAI_INSTALL_STAGING = YES
 
 XENOMAI_CONF_OPT += --includedir=/usr/include/xenomai/
 
-ifeq ($(BR2_HAVE_DEVFILES),)
 define XENOMAI_REMOVE_DEVFILES
        for i in xeno-config xeno-info wrap-link.sh ; do \
                rm -f $(TARGET_DIR)/usr/bin/$$i ; \
@@ -27,7 +26,6 @@ define XENOMAI_REMOVE_DEVFILES
 endef
 
 XENOMAI_POST_INSTALL_TARGET_HOOKS += XENOMAI_REMOVE_DEVFILES
-endif
 
 ifeq ($(BR2_PACKAGE_XENOMAI_TESTSUITE),)
 define XENOMAI_REMOVE_TESTSUITE

diff --git a/support/scripts/copy.sh b/support/scripts/copy.sh
deleted file mode 100755 (executable)
index 508ed56..0000000
--- a/support/scripts/copy.sh
+++ /dev/null
@@ -1,20 +0,0 @@
-#!/bin/sh
-
-STAGING_DIR=$1
-TARGET_DIR=$2
-
-echo "Copying development files to target..."
-
-cp -af ${STAGING_DIR}/usr/include ${TARGET_DIR}/usr
-
-for LIBSDIR in /lib /usr/lib; do
-       for WILDCARD in *.a *.la; do
-               for FILE_PATH in `find ${STAGING_DIR}${LIBSDIR} -name ${WILDCARD}`; do
-                       STAGING_STRIPPED=${FILE_PATH##${STAGING_DIR}}
-                       EXTENDED_DIR=${STAGING_STRIPPED%/${WILDCARD}}
-                       mkdir -p ${TARGET_DIR}${EXTENDED_DIR}
-                       cp -fa ${FILE_PATH} ${TARGET_DIR}${STAGING_STRIPPED}
-                       #echo ${TARGET_DIR}${STAGING_STRIPPED}
-               done
-       done
-done