Revert "libnl: handle all installed libraries"

This reverts commit 61901bd74a622450139358ea0c0f37d4568ad570.

Turns out the libnl splitup is only needed for the not-released-yet v2.0.

Conflicts:

	CHANGES

diff --git a/CHANGES b/CHANGES
index b35a12114f1c9c76d24596d84486f63155e49e7c..2ec699b26b4c86c2397fc8b3b2c1f4a12fb06b7d 100644 (file)
--- a/CHANGES
+++ b/CHANGES
@@ -6,7 +6,7 @@
        Updated/fixed packages: autoconf, busybox, directfb, dnsmasq,
        e2fsprogs, festival, gstreamer, gst-plugins-bad, gst-plugins-base,
        gst-plugins-good, imagemagick, iptables, kernel-headers, kismet,
-       libelf, libevent, libglib2, liblockfile, libmad, libnl, libupnp,
+       libelf, libevent, libglib2, liblockfile, libmad, libupnp,
        libuuid, ltrace, lua, lzma, mdadm, ncftp, ncurses, netkittelnet,
        netsnmp, ntfs-3g, openssl, php, python, quagga, radvd, rsync, samba,
        sawman, shared-mime-info, speech-tools, sqlite, squashfs, syslinux,

diff --git a/package/libnl/libnl.mk b/package/libnl/libnl.mk
index 04bac2dcae7d2e034faf79f8a5ad1af7b7e2800c..1a667468d74e2543804540df90f4b5ffbbb4eb11 100644 (file)
--- a/package/libnl/libnl.mk
+++ b/package/libnl/libnl.mk
@@ -13,14 +13,10 @@ LIBNL_INSTALL_TARGET_OPT = DESTDIR=$(TARGET_DIR) install
 $(eval $(call AUTOTARGETS,package,libnl))
 
 $(LIBNL_HOOK_POST_INSTALL): $(LIBNL_TARGET_INSTALL_TARGET)
-ifneq ($(BR2_ENABLE_DEBUG),y)
        $(STRIPCMD) $(STRIP_STRIP_UNNEEDED) $(TARGET_DIR)/usr/lib/libnl.so*
-       $(STRIPCMD) $(STRIP_STRIP_UNNEEDED) $(TARGET_DIR)/usr/lib/libnl-*.so*
-endif
        touch $@
 
 $(LIBNL_TARGET_UNINSTALL):
        $(call MESSAGE,"Uninstalling")
        rm -f $(TARGET_DIR)/usr/lib/libnl.so*
-       rm -f $(TARGET_DIR)/usr/lib/libnl-*.so*
        rm -f $(LIBNL_TARGET_INSTALL_TARGET) $(LIBNL_HOOK_POST_INSTALL)