* [Buildroot] [PATCH 1/3] Convert net-snmp to autotargets
2010-07-27 22:46 [Buildroot] [pull request] Pull request for branch various-things Thomas Petazzoni
@ 2010-07-27 22:46 ` Thomas Petazzoni
2010-07-27 22:46 ` [Buildroot] [PATCH 2/3] Remove unused X11_PREFIX option Thomas Petazzoni
` (2 subsequent siblings)
3 siblings, 0 replies; 5+ messages in thread
From: Thomas Petazzoni @ 2010-07-27 22:46 UTC (permalink / raw)
To: buildroot
From: Gustavo Zacarias <gustavo@zacarias.com.ar>
Signed-off-by: Gustavo Zacarias <gustavo@zacarias.com.ar>
---
package/netsnmp/Config.in | 5 --
package/netsnmp/netsnmp.mk | 172 ++++++++++----------------------------------
2 files changed, 38 insertions(+), 139 deletions(-)
diff --git a/package/netsnmp/Config.in b/package/netsnmp/Config.in
index 810b654..5a3e9aa 100644
--- a/package/netsnmp/Config.in
+++ b/package/netsnmp/Config.in
@@ -1,13 +1,8 @@
config BR2_PACKAGE_NETSNMP
bool "netsnmp"
- # Build with external toolchains is broken, libtool strips
- # --sysroot at link time
- depends on !BR2_TOOLCHAIN_EXTERNAL
help
Suite of applications used to implement SNMP v1, SNMP v2c, and
SNMP v3 using both IPv4 and IPv6.
http://net-snmp.sourceforge.net/
-comment "lmbench is broken with external toolchains"
- depends on BR2_TOOLCHAIN_EXTERNAL
diff --git a/package/netsnmp/netsnmp.mk b/package/netsnmp/netsnmp.mk
index c5232c7..8f8bc76 100644
--- a/package/netsnmp/netsnmp.mk
+++ b/package/netsnmp/netsnmp.mk
@@ -3,150 +3,54 @@
# netsnmp
#
#############################################################
-NETSNMP_VERSION:=5.5
-NETSNMP_SITE:=http://$(BR2_SOURCEFORGE_MIRROR).dl.sourceforge.net/sourceforge/net-snmp/
-NETSNMP_DIR:=$(BUILD_DIR)/net-snmp-$(NETSNMP_VERSION)
-NETSNMP_SOURCE:=net-snmp-$(NETSNMP_VERSION).tar.gz
-NETSNMP_WO_TRANSPORT:=
-ifneq ($(BR2_INET_IPX),y)
-NETSNMP_WO_TRANSPORT+= IPX
-endif
-ifneq ($(BR2_INET_IPV6),y)
-NETSNMP_WO_TRANSPORT+= UDPIPv6 TCPIPv6
-endif
-
-$(DL_DIR)/$(NETSNMP_SOURCE):
- $(call DOWNLOAD,$(NETSNMP_SITE),$(NETSNMP_SOURCE))
-
-$(NETSNMP_DIR)/.unpacked: $(DL_DIR)/$(NETSNMP_SOURCE)
- $(ZCAT) $(DL_DIR)/$(NETSNMP_SOURCE) | tar -C $(BUILD_DIR) $(TAR_OPTIONS) -
- toolchain/patch-kernel.sh $(NETSNMP_DIR) package/netsnmp/ \*$(NETSNMP_VERSION)\*.patch
- $(CONFIG_UPDATE) $(@D)
- touch $@
+NETSNMP_VERSION = 5.5
+NETSNMP_SITE = http://$(BR2_SOURCEFORGE_MIRROR).dl.sourceforge.net/sourceforge/net-snmp
+NETSNMP_SOURCE = net-snmp-$(NETSNMP_VERSION).tar.gz
+NETSNMP_INSTALL_STAGING = YES
+NETSNMP_INSTALL_TARGET_OPT = DESTDIR=$(TARGET_DIR) install
+NETSNMP_LIBTOOL_PATCH = NO
+NETSNMP_CONF_ENV = ac_cv_NETSNMP_CAN_USE_SYSCTL=yes
+NETSNMP_CONF_OPT = --with-persistent-directory=/var/lib/snmp --disable-static \
+ --with-defaults --enable-mini-agent --without-rpm \
+ --with-logfile=none --without-kmem-usage $(DISABLE_IPV6) \
+ --enable-as-needed --disable-debugging --without-perl-modules \
+ --disable-embedded-perl --disable-perl-cc-checks \
+ --with-sys-contact="root at unknown" \
+ --with-sys-location="Unknown" \
+ --with-mib-modules="host smux ucd-snmp/dlmod"
ifeq ($(BR2_ENDIAN),"BIG")
-NETSNMP_ENDIAN=big
+ NETSNMP_CONF_OPT += --with-endianness=big
else
-NETSNMP_ENDIAN=little
-endif
-
-ifeq ($(BR2_HAVE_PERL),y)
-NETSNMP_CONFIGURE_PERL_ENV:=\
- PERLCC="$(TARGET_CC)"
-NETSNMP_CONFIGURE_PERL:=\
- --disable-embedded-perl \
- --disable-perl-cc-checks \
- --enable-as-needed
-else
-NETSNMP_CONFIGURE_PERL_ENV:=
-NETSNMP_CONFIGURE_PERL:=\
- --disable-embedded-perl \
- --disable-perl-cc-checks \
- --without-perl-modules
+ NETSNMP_CONF_OPT += --with-endianness=little
endif
+# OpenSSL
ifeq ($(BR2_PACKAGE_OPENSSL),y)
-NETSNMP_CONFIGURE_OPENSSL:=--with-openssl=$(STAGING_DIR)/usr/include/openssl
+ NETSNMP_CONF_OPT += \
+ --with-openssl=$(STAGING_DIR)/usr/include/openssl
else
-NETSNMP_CONFIGURE_OPENSSL:=--without-openssl
+ NETSNMP_CONF_OPT += --without-openssl
endif
+# Docs
ifneq ($(BR2_HAVE_DOCUMENTATION),y)
-NETSNMP_DOCS:=--disable-manuals
+ NETSNMP_CONF_OPT += --disable-manuals
endif
-$(NETSNMP_DIR)/.configured: $(NETSNMP_DIR)/.unpacked
- (cd $(NETSNMP_DIR); rm -f config.cache; \
- $(AUTOCONF) && \
- ac_cv_NETSNMP_CAN_USE_SYSCTL=yes \
- $(NETSNMP_CONFIGURE_PERL_ENV) \
- $(TARGET_CONFIGURE_OPTS) \
- $(TARGET_CONFIGURE_ARGS) \
- ./configure $(QUIET) \
- --target=$(GNU_TARGET_NAME) \
- --host=$(GNU_TARGET_NAME) \
- --build=$(GNU_HOST_NAME) \
- --with-cc=$(TARGET_CROSS)gcc \
- --with-linkcc=$(TARGET_CROSS)gcc \
- --with-ar=$(TARGET_CROSS)ar \
- --with-cflags="$(TARGET_CFLAGS)" \
- --with-ldflags="$(TARGET_LDFLAGS)" \
- --with-endianness=$(NETSNMP_ENDIAN) \
- --with-persistent-directory=/var/lib/snmp \
- --enable-ucd-snmp-compatibility \
- --enable-shared \
- --disable-static \
- --with-logfile=none \
- --without-rpm \
- $(NETSNMP_CONFIGURE_OPENSSL) \
- $(NETSNMP_DOCS) \
- $(NETSNMP_CONFIGURE_PERL) \
- --without-dmalloc \
- --without-efence \
- --without-rsaref \
- --with-sys-contact="root" \
- --with-sys-location="Unknown" \
- --with-mib-modules="host smux ucd-snmp/dlmod" \
- --with-out-transports="$(NETSNMP_WO_TRANSPORT)" \
- --with-defaults \
- --disable-debugging \
- --prefix=/usr \
- --sysconfdir=/etc \
- --enable-mini-agent \
- --without-kmem-usage \
- $(DISABLE_IPV6) \
- )
- touch $@
-
-$(NETSNMP_DIR)/agent/snmpd: $(NETSNMP_DIR)/.configured
- $(MAKE1) -C $(NETSNMP_DIR)
- touch -c $@
-
-$(TARGET_DIR)/usr/sbin/snmpd: $(NETSNMP_DIR)/agent/snmpd
- $(MAKE) PREFIX=$(TARGET_DIR)/usr \
- prefix=$(TARGET_DIR)/usr \
- exec_prefix=$(TARGET_DIR)/usr \
- persistentdir=$(TARGET_DIR)/var/lib/snmp \
- includedir=$(STAGING_DIR)/usr/include/net-snmp \
- ucdincludedir=$(STAGING_DIR)/usr/include/ucd-snmp \
- -C $(NETSNMP_DIR) install
- # Copy the .conf files.
- $(INSTALL) -D -m 0644 $(NETSNMP_DIR)/EXAMPLE.conf $(TARGET_DIR)/etc/snmp/snmpd.conf
- -mv $(TARGET_DIR)/usr/share/snmp/mib2c*.conf $(TARGET_DIR)/etc/snmp
- # Remove the unsupported snmpcheck program
- rm -f $(TARGET_DIR)/usr/bin/snmpcheck
- # Install the "broken" headers
- $(INSTALL) -D -m 0644 $(NETSNMP_DIR)/agent/mibgroup/struct.h $(STAGING_DIR)/usr/include/net-snmp/agent/struct.h
- $(INSTALL) -D -m 0644 $(NETSNMP_DIR)/agent/mibgroup/util_funcs.h $(STAGING_DIR)/usr/include/net-snmp/util_funcs.h
- $(INSTALL) -D -m 0644 $(NETSNMP_DIR)/agent/mibgroup/mibincl.h $(STAGING_DIR)/usr/include/net-snmp/library/mibincl.h
- $(INSTALL) -D -m 0644 $(NETSNMP_DIR)/agent/mibgroup/header_complex.h $(STAGING_DIR)/usr/include/net-snmp/agent/header_complex.h
- $(INSTALL) -D -m 0755 package/netsnmp/S59snmpd $(TARGET_DIR)/etc/init.d/S59snmpd
-
-netsnmp: host-autoconf $(if $(BR2_PACKAGE_OPENSSL),openssl) $(TARGET_DIR)/usr/sbin/snmpd
-
-netsnmp-headers: $(TARGET_DIR)/usr/include/net-snmp/net-snmp-config.h
- $(INSTALL) -d $(TARGET_DIR)/usr/include/net-snmp
- cp -a $(STAGING_DIR)/usr/include/net-snmp $(TARGET_DIR)/usr/include/net-snmp
- cp -a $(STAGING_DIR)/usr/include/ucd-snmp $(TARGET_DIR)/usr/include/net-snmp
-
-netsnmp-source: $(DL_DIR)/$(NETSNMP_SOURCE)
-
-netsnmp-clean:
- -$(MAKE) PREFIX=$(TARGET_DIR) INSTALL_PREFIX=$(TARGET_DIR) DESTDIR=$(TARGET_DIR) CC="$(TARGET_CC)" -C $(NETSNMP_DIR) uninstall
- -$(MAKE) -C $(NETSNMP_DIR) clean
- -rm -rf $(TARGET_DIR)/etc/snmp/{snmpd{,trapd},mib2c*}.conf \
- $(TARGET_DIR)/etc/default/snmpd \
- $(TARGET_DIR)/usr/include/net-snmp
-
-netsnmp-dirclean:
- rm -rf $(NETSNMP_DIR)
-
-#############################################################
-#
-# Toplevel Makefile options
-#
-#############################################################
-ifeq ($(BR2_PACKAGE_NETSNMP),y)
-TARGETS+=netsnmp
-endif
+define NETSNMP_INSTALL_TARGET_CMDS
+ $(TARGET_MAKE_ENV) $(MAKE) -C $(@D) \
+ DESTDIR=$(TARGET_DIR) install
+ $(INSTALL) -D -m 0755 package/netsnmp/S59snmpd \
+ $(TARGET_DIR)/etc/init.d/S59snmpd
+endef
+
+define NETSNMP_UNINSTALL_TARGET_CMDS
+ $(TARGET_MAKE_ENV) $(MAKE) -C $(@D) \
+ DESTDIR=$(TARGET_DIR) uninstall
+ rm -f $(TARGET_DIR)/etc/init.d/S59snmpd
+ rm -f $(TARGET_DIR)/usr/lib/libnetsnmp*
+endef
+
+$(eval $(call AUTOTARGETS,package,netsnmp))
--
1.7.0.4
^ permalink raw reply related [flat|nested] 5+ messages in thread* [Buildroot] [PATCH 2/3] Remove unused X11_PREFIX option
2010-07-27 22:46 [Buildroot] [pull request] Pull request for branch various-things Thomas Petazzoni
2010-07-27 22:46 ` [Buildroot] [PATCH 1/3] Convert net-snmp to autotargets Thomas Petazzoni
@ 2010-07-27 22:46 ` Thomas Petazzoni
2010-07-27 22:46 ` [Buildroot] [PATCH 3/3] Bump samba to 3.3.13 [CVE-2010-2063] Thomas Petazzoni
2010-07-28 15:21 ` [Buildroot] [pull request] Pull request for branch various-things Peter Korsgaard
3 siblings, 0 replies; 5+ messages in thread
From: Thomas Petazzoni @ 2010-07-27 22:46 UTC (permalink / raw)
To: buildroot
Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
---
configs/kb9202_defconfig | 1 -
configs/v100sc2_defconfig | 1 -
package/Makefile.in | 4 ----
package/x11r7/Config.in | 7 -------
4 files changed, 0 insertions(+), 13 deletions(-)
diff --git a/configs/kb9202_defconfig b/configs/kb9202_defconfig
index 2895d8a..40c6d18 100644
--- a/configs/kb9202_defconfig
+++ b/configs/kb9202_defconfig
@@ -551,7 +551,6 @@ BR2_PACKAGE_XSERVER_none=y
# BR2_PACKAGE_XSERVER_x11r7 is not set
# BR2_PACKAGE_XSERVER_xorg is not set
# BR2_PACKAGE_XSERVER_tinyx is not set
-BR2_X11_PREFIX="/usr"
#
# X libraries and helper libraries
diff --git a/configs/v100sc2_defconfig b/configs/v100sc2_defconfig
index 80f194a..ca261ee 100644
--- a/configs/v100sc2_defconfig
+++ b/configs/v100sc2_defconfig
@@ -568,7 +568,6 @@ BR2_PACKAGE_QT_OPENSSL=y
# BR2_PACKAGE_XSERVER_none is not set
# BR2_PACKAGE_XSERVER_xorg is not set
# BR2_PACKAGE_XSERVER_tinyx is not set
-BR2_X11_PREFIX="/usr"
# BR2_PACKAGE_XORG7 is not set
#
diff --git a/package/Makefile.in b/package/Makefile.in
index fc53a1b..36f2f24 100644
--- a/package/Makefile.in
+++ b/package/Makefile.in
@@ -292,9 +292,5 @@ else
ENABLE_DEBUG:=
endif
-# X Windowing system
-
-X11_PREFIX:=$(call qstrip,$(BR2_X11_PREFIX))
-
include package/Makefile.autotools.in
include package/Makefile.package.in
diff --git a/package/x11r7/Config.in b/package/x11r7/Config.in
index b93cc90..c0c0043 100644
--- a/package/x11r7/Config.in
+++ b/package/x11r7/Config.in
@@ -29,13 +29,6 @@ config BR2_PACKAGE_XSERVER_tinyx
endchoice
-config BR2_X11_PREFIX
- string
- default "/usr/X11R6" if BR2_PACKAGE_XSERVER_xorg
- default "/usr" if BR2_PACKAGE_XSERVER_tinyx
- help
- X11 apps root location
-
menu "X11R7 Servers"
source package/x11r7/xserver_xorg-server/Config.in
endmenu
--
1.7.0.4
^ permalink raw reply related [flat|nested] 5+ messages in thread
* [Buildroot] [PATCH 3/3] Bump samba to 3.3.13 [CVE-2010-2063]
2010-07-27 22:46 [Buildroot] [pull request] Pull request for branch various-things Thomas Petazzoni
2010-07-27 22:46 ` [Buildroot] [PATCH 1/3] Convert net-snmp to autotargets Thomas Petazzoni
2010-07-27 22:46 ` [Buildroot] [PATCH 2/3] Remove unused X11_PREFIX option Thomas Petazzoni
@ 2010-07-27 22:46 ` Thomas Petazzoni
2010-07-28 15:21 ` [Buildroot] [pull request] Pull request for branch various-things Peter Korsgaard
3 siblings, 0 replies; 5+ messages in thread
From: Thomas Petazzoni @ 2010-07-27 22:46 UTC (permalink / raw)
To: buildroot
From: Gustavo Zacarias <gustavo@zacarias.com.ar>
Signed-off-by: Gustavo Zacarias <gustavo@zacarias.com.ar>
---
package/samba/samba.mk | 2 +-
1 files changed, 1 insertions(+), 1 deletions(-)
diff --git a/package/samba/samba.mk b/package/samba/samba.mk
index 39968a9..1c59070 100644
--- a/package/samba/samba.mk
+++ b/package/samba/samba.mk
@@ -3,7 +3,7 @@
# samba
#
#############################################################
-SAMBA_VERSION:=3.3.12
+SAMBA_VERSION:=3.3.13
SAMBA_SOURCE:=samba-$(SAMBA_VERSION).tar.gz
SAMBA_SITE:=http://samba.org/samba/ftp/stable/
--
1.7.0.4
^ permalink raw reply related [flat|nested] 5+ messages in thread
* [Buildroot] [pull request] Pull request for branch various-things
2010-07-27 22:46 [Buildroot] [pull request] Pull request for branch various-things Thomas Petazzoni
` (2 preceding siblings ...)
2010-07-27 22:46 ` [Buildroot] [PATCH 3/3] Bump samba to 3.3.13 [CVE-2010-2063] Thomas Petazzoni
@ 2010-07-28 15:21 ` Peter Korsgaard
3 siblings, 0 replies; 5+ messages in thread
From: Peter Korsgaard @ 2010-07-28 15:21 UTC (permalink / raw)
To: buildroot
>>>>> "Thomas" == Thomas Petazzoni <thomas.petazzoni@free-electrons.com> writes:
Thomas> The following changes since commit d47c73ee9ba3ab9a5f6a113047e3a4aae1afd278:
Thomas> Paul Jones (1):
Thomas> zlib: Bump to 1.2.5
Thomas> are available in the git repository at:
Thomas> git://git.busybox.net/~tpetazzoni/git/buildroot various-things
Pulled and pushed, thanks!
--
Bye, Peter Korsgaard
^ permalink raw reply [flat|nested] 5+ messages in thread