Message ID | 1383387986-9508-1-git-send-email-thomas.petazzoni@free-electrons.com |
---|---|
State | Accepted |
Commit | 250af24dbd8c6902c0b92c95daa5b8cced947806 |
Headers | show |
Thomas, All, On 2013-11-02 11:26 +0100, Thomas Petazzoni spake thusly: > The libnl configure script has a --{enable,disable}-cli options that > allows to enable or disable the compilation of the libnl tools. Use > this option instead of compiling everything and then removing the > installed programs. > > Note that we also get rid of the uninstall command, which is planned > to be globally removed in Buildroot. > > Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com> Acked-by: "Yann E. MORIN" <yann.morin.1998@free.fr> > --- > package/libnl/libnl.mk | 19 ++++--------------- > 1 file changed, 4 insertions(+), 15 deletions(-) > > diff --git a/package/libnl/libnl.mk b/package/libnl/libnl.mk > index 5c884d7..3b56bc8 100644 > --- a/package/libnl/libnl.mk > +++ b/package/libnl/libnl.mk > @@ -10,22 +10,11 @@ LIBNL_LICENSE = LGPLv2.1+ > LIBNL_LICENSE_FILES = COPYING > LIBNL_INSTALL_STAGING = YES > LIBNL_DEPENDENCIES = host-bison host-flex > -LIBNL_BINARIES = class-add class-delete class-list classid-lookup cls-add \ > - cls-delete cls-list link-list pktloc-lookup qdisc-add qdisc-delete \ > - qdisc-list > > -define LIBNL_UNINSTALL_TARGET_CMDS > - rm -r $(TARGET_DIR)/usr/lib/libnl.* $(TARGET_DIR)/usr/lib/libnl-*.* > - rm -rf $(TARGET_DIR)/usr/lib/libnl > -endef > - > -define LIBNL_REMOVE_TOOLS > - rm -rf $(addprefix $(TARGET_DIR)/usr/sbin/nl-, $(LIBNL_BINARIES)) > - rm -rf $(TARGET_DIR)/usr/sbin/genl-ctrl-list > -endef > - > -ifneq ($(BR2_PACKAGE_LIBNL_TOOLS),y) > -LIBNL_POST_INSTALL_TARGET_HOOKS += LIBNL_REMOVE_TOOLS > +ifeq ($(BR2_PACKAGE_LIBNL_TOOLS),y) > +LIBNL_CONF_OPT += --enable-cli > +else > +LIBNL_CONF_OPT += --disable-cli > endif > > $(eval $(autotools-package)) > -- > 1.8.1.2 > > _______________________________________________ > buildroot mailing list > buildroot@busybox.net > http://lists.busybox.net/mailman/listinfo/buildroot
2013/11/2 Thomas Petazzoni <thomas.petazzoni@free-electrons.com> > The libnl configure script has a --{enable,disable}-cli options that > allows to enable or disable the compilation of the libnl tools. Use > this option instead of compiling everything and then removing the > installed programs. > > Note that we also get rid of the uninstall command, which is planned > to be globally removed in Buildroot. > > Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com> > Reviewed-by: Samuel Martin <s.martin49@gmail.com> Regards,
Dear Thomas Petazzoni, On Sat, 2 Nov 2013 11:26:25 +0100, Thomas Petazzoni wrote: > The libnl configure script has a --{enable,disable}-cli options that > allows to enable or disable the compilation of the libnl tools. Use > this option instead of compiling everything and then removing the > installed programs. > > Note that we also get rid of the uninstall command, which is planned > to be globally removed in Buildroot. > > Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com> > --- > package/libnl/libnl.mk | 19 ++++--------------- > 1 file changed, 4 insertions(+), 15 deletions(-) Committed both patches to for-peter-2013.11, thanks! Thomas
diff --git a/package/libnl/libnl.mk b/package/libnl/libnl.mk index 5c884d7..3b56bc8 100644 --- a/package/libnl/libnl.mk +++ b/package/libnl/libnl.mk @@ -10,22 +10,11 @@ LIBNL_LICENSE = LGPLv2.1+ LIBNL_LICENSE_FILES = COPYING LIBNL_INSTALL_STAGING = YES LIBNL_DEPENDENCIES = host-bison host-flex -LIBNL_BINARIES = class-add class-delete class-list classid-lookup cls-add \ - cls-delete cls-list link-list pktloc-lookup qdisc-add qdisc-delete \ - qdisc-list -define LIBNL_UNINSTALL_TARGET_CMDS - rm -r $(TARGET_DIR)/usr/lib/libnl.* $(TARGET_DIR)/usr/lib/libnl-*.* - rm -rf $(TARGET_DIR)/usr/lib/libnl -endef - -define LIBNL_REMOVE_TOOLS - rm -rf $(addprefix $(TARGET_DIR)/usr/sbin/nl-, $(LIBNL_BINARIES)) - rm -rf $(TARGET_DIR)/usr/sbin/genl-ctrl-list -endef - -ifneq ($(BR2_PACKAGE_LIBNL_TOOLS),y) -LIBNL_POST_INSTALL_TARGET_HOOKS += LIBNL_REMOVE_TOOLS +ifeq ($(BR2_PACKAGE_LIBNL_TOOLS),y) +LIBNL_CONF_OPT += --enable-cli +else +LIBNL_CONF_OPT += --disable-cli endif $(eval $(autotools-package))
The libnl configure script has a --{enable,disable}-cli options that allows to enable or disable the compilation of the libnl tools. Use this option instead of compiling everything and then removing the installed programs. Note that we also get rid of the uninstall command, which is planned to be globally removed in Buildroot. Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com> --- package/libnl/libnl.mk | 19 ++++--------------- 1 file changed, 4 insertions(+), 15 deletions(-)