From 7d6449bb165c8708652bbc3e0373cc6d70299afe Mon Sep 17 00:00:00 2001 From: Gustavo Zacarias Date: Tue, 7 May 2013 06:39:44 +0000 Subject: ptpd: new package Add the new ptpd package, loosely based on the one from bug #2305. This one handles the IEEE 1588-2002 spec. [Peter: mark init script as executable] Signed-off-by: Gustavo Zacarias Signed-off-by: Peter Korsgaard --- package/Config.in | 1 + package/ptpd/Config.in | 7 +++++++ package/ptpd/S65ptpd | 29 +++++++++++++++++++++++++++++ package/ptpd/ptpd.mk | 25 +++++++++++++++++++++++++ 4 files changed, 62 insertions(+) create mode 100644 package/ptpd/Config.in create mode 100755 package/ptpd/S65ptpd create mode 100644 package/ptpd/ptpd.mk diff --git a/package/Config.in b/package/Config.in index d98087128..544a43125 100644 --- a/package/Config.in +++ b/package/Config.in @@ -751,6 +751,7 @@ source "package/pppd/Config.in" source "package/pptp-linux/Config.in" source "package/proftpd/Config.in" source "package/proxychains-ng/Config.in" +source "package/ptpd/Config.in" source "package/quagga/Config.in" source "package/radvd/Config.in" source "package/rp-pppoe/Config.in" diff --git a/package/ptpd/Config.in b/package/ptpd/Config.in new file mode 100644 index 000000000..2d87ca31b --- /dev/null +++ b/package/ptpd/Config.in @@ -0,0 +1,7 @@ +config BR2_PACKAGE_PTPD + bool "ptpd" + help + The PTP daemon (PTPd) implements the Precision Time protocol + (PTP) as defined by the IEEE-1588-2002. + + http://ptpd.sourceforge.net/ diff --git a/package/ptpd/S65ptpd b/package/ptpd/S65ptpd new file mode 100755 index 000000000..4206c5e0c --- /dev/null +++ b/package/ptpd/S65ptpd @@ -0,0 +1,29 @@ +#!/bin/sh +# +# Start ptpd +# + +case "$1" in + start) + echo -n "Starting ptpd: " + start-stop-daemon -S -q -x /usr/sbin/ptpd -- -S + if [ $? != 0 ]; then + echo "FAILED" + exit 1 + else + echo "OK" + fi + ;; + stop) + echo -n "Stopping ptpd: " + start-stop-daemon -K -q -x /usr/sbin/ptpd + echo "OK" + ;; + restart|reload) + ;; + *) + echo "Usage: $0 {start|stop|restart}" + exit 1 +esac + +exit $? diff --git a/package/ptpd/ptpd.mk b/package/ptpd/ptpd.mk new file mode 100644 index 000000000..481a64eef --- /dev/null +++ b/package/ptpd/ptpd.mk @@ -0,0 +1,25 @@ +############################################################# +# +# ptpd +# +############################################################# + +PTPD_VERSION = 1.1.0 +PTPD_SITE = http://downloads.sourceforge.net/project/ptpd/ptpd/$(PTPD_VERSION) +PTPD_LICENSE = BSD +PTPD_LICENSE_FILES = COPYRIGHT + +define PTPD_BUILD_CMDS + $(TARGET_CONFIGURE_OPTS) $(MAKE) -C $(@D)/src +endef + +define PTPD_INSTALL_TARGET_CMDS + $(INSTALL) -m 755 -D $(@D)/src/ptpd $(TARGET_DIR)/usr/sbin/ptpd +endef + +define PTPD_INSTALL_INIT_SYSV + $(INSTALL) -m 755 -D package/ptpd/S65ptpd \ + $(TARGET_DIR)/etc/init.d/S65ptpd +endef + +$(eval $(generic-package)) -- cgit v1.2.3 From 5b190e6b6d2f98dae54fb92191000fa9a66dd79e Mon Sep 17 00:00:00 2001 From: Gustavo Zacarias Date: Tue, 7 May 2013 06:39:45 +0000 Subject: ptpd2: new package Add the ptpd2 package, handles the IEEE 1588-2008 spec which is not backward compatible to IEEE 1588-2002. [Peter: mark init script as executable] Signed-off-by: Gustavo Zacarias Signed-off-by: Peter Korsgaard --- package/Config.in | 1 + package/ptpd2/Config.in | 7 +++++++ package/ptpd2/S65ptpd2 | 29 +++++++++++++++++++++++++++++ package/ptpd2/ptpd2.mk | 26 ++++++++++++++++++++++++++ 4 files changed, 63 insertions(+) create mode 100644 package/ptpd2/Config.in create mode 100755 package/ptpd2/S65ptpd2 create mode 100644 package/ptpd2/ptpd2.mk diff --git a/package/Config.in b/package/Config.in index 544a43125..bbacd5c54 100644 --- a/package/Config.in +++ b/package/Config.in @@ -752,6 +752,7 @@ source "package/pptp-linux/Config.in" source "package/proftpd/Config.in" source "package/proxychains-ng/Config.in" source "package/ptpd/Config.in" +source "package/ptpd2/Config.in" source "package/quagga/Config.in" source "package/radvd/Config.in" source "package/rp-pppoe/Config.in" diff --git a/package/ptpd2/Config.in b/package/ptpd2/Config.in new file mode 100644 index 000000000..bf26453c5 --- /dev/null +++ b/package/ptpd2/Config.in @@ -0,0 +1,7 @@ +config BR2_PACKAGE_PTPD2 + bool "ptpd2" + help + The PTP daemon (PTPd) implements the Precision Time protocol + (PTP) as defined by the IEEE-1588-2008. + + http://ptpd.sourceforge.net/ diff --git a/package/ptpd2/S65ptpd2 b/package/ptpd2/S65ptpd2 new file mode 100755 index 000000000..7d4ee7f4b --- /dev/null +++ b/package/ptpd2/S65ptpd2 @@ -0,0 +1,29 @@ +#!/bin/sh +# +# Start ptpd2 +# + +case "$1" in + start) + echo -n "Starting ptpd2: " + start-stop-daemon -S -q -x /usr/sbin/ptpd2 -- -g + if [ $? != 0 ]; then + echo "FAILED" + exit 1 + else + echo "OK" + fi + ;; + stop) + echo -n "Stopping ptpd2: " + start-stop-daemon -K -q -x /usr/sbin/ptpd2 + echo "OK" + ;; + restart|reload) + ;; + *) + echo "Usage: $0 {start|stop|restart}" + exit 1 +esac + +exit $? diff --git a/package/ptpd2/ptpd2.mk b/package/ptpd2/ptpd2.mk new file mode 100644 index 000000000..04a0070dc --- /dev/null +++ b/package/ptpd2/ptpd2.mk @@ -0,0 +1,26 @@ +############################################################# +# +# ptpd2 +# +############################################################# + +PTPD2_VERSION = 2.2.2 +PTPD2_SITE = http://downloads.sourceforge.net/project/ptpd/ptpd/$(PTPD2_VERSION) +PTPD2_SOURCE = ptpd-$(PTPD2_VERSION).tar.gz +PTPD2_LICENSE = BSD-2c +PTPD2_LICENSE_FILES = COPYRIGHT + +define PTPD2_BUILD_CMDS + $(TARGET_CONFIGURE_OPTS) $(MAKE) -C $(@D)/src +endef + +define PTPD2_INSTALL_TARGET_CMDS + $(INSTALL) -m 755 -D $(@D)/src/ptpd2 $(TARGET_DIR)/usr/sbin/ptpd2 +endef + +define PTPD2_INSTALL_INIT_SYSV + $(INSTALL) -m 755 -D package/ptpd2/S65ptpd2 \ + $(TARGET_DIR)/etc/init.d/S65ptpd2 +endef + +$(eval $(generic-package)) -- cgit v1.2.3 From 3a19a70b2e11676a02adecd245ef5acc28de57c1 Mon Sep 17 00:00:00 2001 From: Francois Perrad Date: Wed, 8 May 2013 22:45:05 +0000 Subject: luafilesystem: bump to version 1.6.2 Signed-off-by: Francois Perrad Signed-off-by: Peter Korsgaard --- package/luafilesystem/luafilesystem.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package/luafilesystem/luafilesystem.mk b/package/luafilesystem/luafilesystem.mk index 855321298..d23fbce47 100644 --- a/package/luafilesystem/luafilesystem.mk +++ b/package/luafilesystem/luafilesystem.mk @@ -4,7 +4,7 @@ # ############################################################# -LUAFILESYSTEM_VERSION = 1.5.0 +LUAFILESYSTEM_VERSION = 1.6.2 LUAFILESYSTEM_SITE = http://github.com/downloads/keplerproject/luafilesystem LUAFILESYSTEM_DEPENDENCIES = lua LUAFILESYSTEM_LICENSE = MIT -- cgit v1.2.3 From c9a2aa3b3845ebdae5bc33ee7064062bb3477b25 Mon Sep 17 00:00:00 2001 From: Thomas Petazzoni Date: Fri, 10 May 2013 06:29:23 +0000 Subject: libcgicc: handle cgicc-config script Signed-off-by: Thomas Petazzoni Signed-off-by: Peter Korsgaard --- package/libcgicc/libcgicc.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package/libcgicc/libcgicc.mk b/package/libcgicc/libcgicc.mk index 80e921368..4c5664fdf 100644 --- a/package/libcgicc/libcgicc.mk +++ b/package/libcgicc/libcgicc.mk @@ -9,7 +9,7 @@ LIBCGICC_SOURCE=cgicc-$(LIBCGICC_VERSION).tar.gz LIBCGICC_LICENSE=LGPLv3+ LIBCGICC_INSTALL_STAGING=YES LIBCGICC_AUTORECONF=YES - +LIBCGICC_CONFIG_SCRIPTS = cgicc-config LIBCGICC_CONF_OPT = \ --disable-demos \ --disable-doc -- cgit v1.2.3 From 7a47372789ee50b5edb7073fe88af1432701af8b Mon Sep 17 00:00:00 2001 From: Thomas Petazzoni Date: Fri, 10 May 2013 06:29:24 +0000 Subject: fltk: handle fltk-config script Signed-off-by: Thomas Petazzoni Signed-off-by: Peter Korsgaard --- package/fltk/fltk.mk | 1 + 1 file changed, 1 insertion(+) diff --git a/package/fltk/fltk.mk b/package/fltk/fltk.mk index 3f192cdb4..697eb91d2 100644 --- a/package/fltk/fltk.mk +++ b/package/fltk/fltk.mk @@ -12,5 +12,6 @@ FLTK_INSTALL_STAGING_OPT = DESTDIR=$(STAGING_DIR) STRIP=$(TARGET_STRIP) install FLTK_INSTALL_TARGET_OPT = DESTDIR=$(TARGET_DIR) STRIP=$(TARGET_STRIP) install FLTK_CONF_OPT = --enable-threads --with-x FLTK_DEPENDENCIES = xlib_libX11 xlib_libXext xlib_libXt +FLTK_CONFIG_SCRIPTS = fltk-config $(eval $(autotools-package)) -- cgit v1.2.3 From 3a91b976b7c12a46536f12b430b3af4335556a09 Mon Sep 17 00:00:00 2001 From: Thomas Petazzoni Date: Fri, 10 May 2013 06:29:25 +0000 Subject: gsl: handle gsl-config script Signed-off-by: Thomas Petazzoni Signed-off-by: Peter Korsgaard --- package/gsl/gsl.mk | 1 + 1 file changed, 1 insertion(+) diff --git a/package/gsl/gsl.mk b/package/gsl/gsl.mk index 65915916c..ef426cff3 100644 --- a/package/gsl/gsl.mk +++ b/package/gsl/gsl.mk @@ -9,6 +9,7 @@ GSL_SITE = $(BR2_GNU_MIRROR)/gsl GSL_INSTALL_STAGING = YES GSL_LICENSE = GPLv3 GSL_LICENSE_FILES = COPYING +GSL_CONFIG_SCRIPTS = gsl-config # uClibc pretends to have fenv support as it installs , but in # practice, it only implements it for i386. Problem reported upstream -- cgit v1.2.3 From 24b950f76f5f88817991bb9238356325dc43bba6 Mon Sep 17 00:00:00 2001 From: Thomas Petazzoni Date: Fri, 10 May 2013 06:29:26 +0000 Subject: imlib2: handle imlib2-config script Signed-off-by: Thomas Petazzoni Signed-off-by: Peter Korsgaard --- package/imlib2/imlib2.mk | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/package/imlib2/imlib2.mk b/package/imlib2/imlib2.mk index c7029aeb6..cec67066b 100644 --- a/package/imlib2/imlib2.mk +++ b/package/imlib2/imlib2.mk @@ -12,6 +12,7 @@ IMLIB2_LICENSE_FILES = COPYING IMLIB2_INSTALL_STAGING = YES IMLIB2_DEPENDENCIES = host-pkgconf freetype IMLIB2_CONF_OPT = --with-freetype-config=$(STAGING_DIR)/usr/bin/freetype-config +IMLIB2_CONFIG_SCRIPTS = imlib2-config ifeq ($(BR2_PACKAGE_IMLIB2_X),y) IMLIB2_CONF_OPT += --with-x @@ -57,10 +58,7 @@ endif # drop -L from linker flags define IMLIB2_FIXUP_IMLIB2_CONFIG - $(SED) "s,^prefix=.*,prefix=\'$(STAGING_DIR)/usr\',g" \ - -e "s,^exec_prefix=.*,exec_prefix=\'$(STAGING_DIR)/usr\',g" \ - -e 's/-L[^ ]*//g' \ - $(STAGING_DIR)/usr/bin/imlib2-config + $(SED) 's/-L[^ ]*//g' $(STAGING_DIR)/usr/bin/imlib2-config endef IMLIB2_POST_INSTALL_STAGING_HOOKS += IMLIB2_FIXUP_IMLIB2_CONFIG -- cgit v1.2.3 From e62d01535ab78e8ff80b730e9b2df903f0747d0c Mon Sep 17 00:00:00 2001 From: Thomas Petazzoni Date: Fri, 10 May 2013 06:29:27 +0000 Subject: libart: handle libart2-config script Signed-off-by: Thomas Petazzoni Signed-off-by: Peter Korsgaard --- package/libart/libart.mk | 1 + 1 file changed, 1 insertion(+) diff --git a/package/libart/libart.mk b/package/libart/libart.mk index 0505ff5a0..822dbf1b5 100644 --- a/package/libart/libart.mk +++ b/package/libart/libart.mk @@ -9,5 +9,6 @@ LIBART_SOURCE = libart_lgpl-$(LIBART_VERSION).tar.gz LIBART_SITE = http://ftp.gnome.org/pub/gnome/sources/libart_lgpl/2.3/ LIBART_AUTORECONF = YES LIBART_INSTALL_STAGING = YES +LIBART_CONFIG_SCRIPTS = libart2-config $(eval $(autotools-package)) -- cgit v1.2.3 From 7fb8e6a55636a2161dbf9a3fc41a0d0d24b74591 Mon Sep 17 00:00:00 2001 From: Thomas Petazzoni Date: Fri, 10 May 2013 06:29:28 +0000 Subject: libcdaudio: handle libcdaudio-config script Signed-off-by: Thomas Petazzoni Signed-off-by: Peter Korsgaard --- package/libcdaudio/libcdaudio.mk | 1 + 1 file changed, 1 insertion(+) diff --git a/package/libcdaudio/libcdaudio.mk b/package/libcdaudio/libcdaudio.mk index 203a8aa57..92efabcfd 100644 --- a/package/libcdaudio/libcdaudio.mk +++ b/package/libcdaudio/libcdaudio.mk @@ -10,5 +10,6 @@ LIBCDAUDIO_SITE = http://downloads.sourceforge.net/project/libcdaudio/libcdaudio LIBCDAUDIO_AUTORECONF = YES LIBCDAUDIO_LIBTOOL_PATCH = YES LIBCDAUDIO_INSTALL_STAGING = YES +LIBCDAUDIO_CONFIG_SCRIPTS = libcdaudio-config $(eval $(autotools-package)) -- cgit v1.2.3 From 52f00e24fedd44969a7681ae1aa68c75dd305310 Mon Sep 17 00:00:00 2001 From: Thomas Petazzoni Date: Fri, 10 May 2013 06:29:29 +0000 Subject: libesmtp: handle libesmtp-config script Signed-off-by: Thomas Petazzoni Signed-off-by: Peter Korsgaard --- package/libesmtp/libesmtp.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package/libesmtp/libesmtp.mk b/package/libesmtp/libesmtp.mk index 078a729a0..baa0d6467 100644 --- a/package/libesmtp/libesmtp.mk +++ b/package/libesmtp/libesmtp.mk @@ -7,7 +7,7 @@ LIBESMTP_VERSION = 1.0.6 LIBESMTP_SOURCE = libesmtp-$(LIBESMTP_VERSION).tar.bz2 LIBESMTP_SITE = http://www.stafford.uklinux.net/libesmtp LIBESMTP_INSTALL_STAGING = YES - +LIBESMTP_CONFIG_SCRIPTS = libesmtp-config LIBESMTP_DEPENDENCIES = $(if $(BR2_PACKAGE_OPENSSL),openssl) $(eval $(autotools-package)) -- cgit v1.2.3 From 4cfe29abf8603798c5389aa6bdb5c9a41b55ff28 Mon Sep 17 00:00:00 2001 From: Thomas Petazzoni Date: Fri, 10 May 2013 06:29:30 +0000 Subject: libftdi: handle libftdi-config script Signed-off-by: Thomas Petazzoni Signed-off-by: Peter Korsgaard --- package/libftdi/libftdi.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package/libftdi/libftdi.mk b/package/libftdi/libftdi.mk index d0f5ef6aa..c5590bade 100644 --- a/package/libftdi/libftdi.mk +++ b/package/libftdi/libftdi.mk @@ -8,7 +8,7 @@ LIBFTDI_SOURCE = libftdi-$(LIBFTDI_VERSION).tar.gz LIBFTDI_SITE = http://www.intra2net.com/en/developer/libftdi/download/ LIBFTDI_DEPENDENCIES = libusb-compat libusb LIBFTDI_INSTALL_STAGING = YES - +LIBFTDI_CONFIG_SCRIPTS = libftdi-config LIBFTDI_AUTORECONF = YES LIBFDTI_CONF_OPT = --without-examples -- cgit v1.2.3 From 726413103b8f5023b3035640f19fcdfc61f823c7 Mon Sep 17 00:00:00 2001 From: Thomas Petazzoni Date: Fri, 10 May 2013 06:29:31 +0000 Subject: libvncserver: handle libvncserver-config script Signed-off-by: Thomas Petazzoni Signed-off-by: Peter Korsgaard --- package/libvncserver/libvncserver.mk | 1 + 1 file changed, 1 insertion(+) diff --git a/package/libvncserver/libvncserver.mk b/package/libvncserver/libvncserver.mk index 550abc473..a45063224 100644 --- a/package/libvncserver/libvncserver.mk +++ b/package/libvncserver/libvncserver.mk @@ -10,6 +10,7 @@ LIBVNCSERVER_SITE = http://downloads.sourceforge.net/project/libvncserver/libvnc LIBVNCSERVER_LICENSE = GPLv2+ LIBVNCSERVER_LICENSE_FILES = COPYING LIBVNCSERVER_INSTALL_STAGING = YES +LIBVNCSERVER_CONFIG_SCRIPTS = libvncserver-config # only used for examples LIBVNCSERVER_CONF_OPT += --with-sdl-config=/bin/false -- cgit v1.2.3 From 4b0542d46254fd1c9966e783f5c56bd468f05e16 Mon Sep 17 00:00:00 2001 From: Thomas Petazzoni Date: Fri, 10 May 2013 06:29:32 +0000 Subject: netatalk: handle netatalk-config script Signed-off-by: Thomas Petazzoni Signed-off-by: Peter Korsgaard --- package/netatalk/netatalk.mk | 1 + 1 file changed, 1 insertion(+) diff --git a/package/netatalk/netatalk.mk b/package/netatalk/netatalk.mk index 243d3f721..a366644a1 100644 --- a/package/netatalk/netatalk.mk +++ b/package/netatalk/netatalk.mk @@ -8,6 +8,7 @@ NETATALK_SITE = http://downloads.sourceforge.net/project/netatalk/netatalk/$(NET NETATALK_SOURCE = netatalk-$(NETATALK_VERSION).tar.bz2 NETATALK_AUTORECONF = YES +NETATALK_CONFIG_SCRIPTS = netatalk-config NETATALK_DEPENDENCIES = host-pkgconf openssl berkeleydb libgcrypt libgpg-error NETATALK_CONF_ENV += CC="$(TARGET_CC) -std=gnu99" -- cgit v1.2.3 From 1deff2b17e30f4722c9e3a913d66ef403b816d6d Mon Sep 17 00:00:00 2001 From: Thomas Petazzoni Date: Fri, 10 May 2013 06:29:33 +0000 Subject: netsnmp: handle net-snmp-config script Signed-off-by: Thomas Petazzoni Signed-off-by: Peter Korsgaard --- package/netsnmp/netsnmp.mk | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/package/netsnmp/netsnmp.mk b/package/netsnmp/netsnmp.mk index a6912e5c9..6a72da74d 100644 --- a/package/netsnmp/netsnmp.mk +++ b/package/netsnmp/netsnmp.mk @@ -24,6 +24,8 @@ NETSNMP_CONF_OPT = --with-persistent-directory=/var/lib/snmp --disable-static \ --with-out-mib-modules="$(call qstrip,$(BR2_PACKAGE_NETSNMP_WITHOUT_MIB_MODULES))" \ --with-out-transports="Unix" NETSNMP_MAKE = $(MAKE1) +NETSNMP_CONFIG_SCRIPTS = net-snmp-config + NETSNMP_BLOAT_MIBS = BRIDGE DISMAN-EVENT DISMAN-SCHEDULE DISMAN-SCRIPT EtherLike RFC-1215 RFC1155-SMI RFC1213 SCTP SMUX ifeq ($(BR2_ENDIAN),"BIG") @@ -81,9 +83,7 @@ define NETSNMP_UNINSTALL_TARGET_CMDS endef define NETSNMP_STAGING_NETSNMP_CONFIG_FIXUP - $(SED) "s,^prefix=.*,prefix=\'$(STAGING_DIR)/usr\',g" \ - -e "s,^exec_prefix=.*,exec_prefix=\'$(STAGING_DIR)/usr\',g" \ - -e "s,^includedir=.*,includedir=\'$(STAGING_DIR)/usr/include\',g" \ + $(SED) "s,^includedir=.*,includedir=\'$(STAGING_DIR)/usr/include\',g" \ -e "s,^libdir=.*,libdir=\'$(STAGING_DIR)/usr/lib\',g" \ $(STAGING_DIR)/usr/bin/net-snmp-config endef -- cgit v1.2.3 From f5058411423de4e250253809549e54151fdb6667 Mon Sep 17 00:00:00 2001 From: Thomas Petazzoni Date: Fri, 10 May 2013 06:29:34 +0000 Subject: liblog4c-localtime: remove whitespace at beginning of lines Signed-off-by: Thomas Petazzoni Signed-off-by: Peter Korsgaard --- package/liblog4c-localtime/liblog4c-localtime.mk | 20 ++++++++++---------- 1 file changed, 10 insertions(+), 10 deletions(-) diff --git a/package/liblog4c-localtime/liblog4c-localtime.mk b/package/liblog4c-localtime/liblog4c-localtime.mk index 3b1642cf1..492c6ef13 100644 --- a/package/liblog4c-localtime/liblog4c-localtime.mk +++ b/package/liblog4c-localtime/liblog4c-localtime.mk @@ -1,13 +1,13 @@ - ############################################################# - # - # liblog4c - # - ############################################################# - LIBLOG4C_LOCALTIME_VERSION = 1.0 - LIBLOG4C_LOCALTIME_SITE = https://github.com/rcmadruga/log4c-localtime/tarball/v$(LIBLOG4C_LOCALTIME_VERSION) - LIBLOG4C_LOCALTIME_INSTALL_STAGING = YES - LIBLOG4C_LOCALTIME_CONF_OPT = --disable-expattest - LIBLOG4C_LOCALTIME_DEPENDENCIES = expat +############################################################# +# +# liblog4c +# +############################################################# +LIBLOG4C_LOCALTIME_VERSION = 1.0 +LIBLOG4C_LOCALTIME_SITE = https://github.com/rcmadruga/log4c-localtime/tarball/v$(LIBLOG4C_LOCALTIME_VERSION) +LIBLOG4C_LOCALTIME_INSTALL_STAGING = YES +LIBLOG4C_LOCALTIME_CONF_OPT = --disable-expattest +LIBLOG4C_LOCALTIME_DEPENDENCIES = expat define LIBLOG4C_LOCALTIME_FIX_CONFIGURE_PERMS chmod +x $(@D)/configure -- cgit v1.2.3 From 4af6818109bf94ea809c0cb7f39f86527bb907d7 Mon Sep 17 00:00:00 2001 From: Thomas Petazzoni Date: Fri, 10 May 2013 06:29:35 +0000 Subject: liblog4c-localtime: handle log4c-config script Signed-off-by: Thomas Petazzoni Signed-off-by: Peter Korsgaard --- package/liblog4c-localtime/liblog4c-localtime.mk | 1 + 1 file changed, 1 insertion(+) diff --git a/package/liblog4c-localtime/liblog4c-localtime.mk b/package/liblog4c-localtime/liblog4c-localtime.mk index 492c6ef13..3701cca65 100644 --- a/package/liblog4c-localtime/liblog4c-localtime.mk +++ b/package/liblog4c-localtime/liblog4c-localtime.mk @@ -8,6 +8,7 @@ LIBLOG4C_LOCALTIME_SITE = https://github.com/rcmadruga/log4c-localtime/tarbal LIBLOG4C_LOCALTIME_INSTALL_STAGING = YES LIBLOG4C_LOCALTIME_CONF_OPT = --disable-expattest LIBLOG4C_LOCALTIME_DEPENDENCIES = expat +LIBLOG4C_LOCALTIME_CONFIG_SCRIPTS = log4c-config define LIBLOG4C_LOCALTIME_FIX_CONFIGURE_PERMS chmod +x $(@D)/configure -- cgit v1.2.3 From 85c798b88b56dbf79caba55226e0ebf12817caf2 Mon Sep 17 00:00:00 2001 From: Thomas Petazzoni Date: Fri, 10 May 2013 06:29:36 +0000 Subject: python: remove stale python2-config symbolic link We already remove python2.7-config and the symbolic link python-config, but we forgot to remove the python2-config symbolic link. Note that we can't use the _CONFIG_SCRIPTS mechanism here because python2.7-config is written in... Python, and doesn't follow the usual syntax of -config scripts. It takes the paths directly from distutils.sysconfig. Signed-off-by: Thomas Petazzoni Signed-off-by: Peter Korsgaard --- package/python/python.mk | 1 + 1 file changed, 1 insertion(+) diff --git a/package/python/python.mk b/package/python/python.mk index b94285499..801c6692d 100644 --- a/package/python/python.mk +++ b/package/python/python.mk @@ -154,6 +154,7 @@ PYTHON_POST_INSTALL_TARGET_HOOKS += PYTHON_REMOVE_SMTPD # 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 -- cgit v1.2.3 From fd8f39653a9939a5d5e1043c874e4b26f412c388 Mon Sep 17 00:00:00 2001 From: Thomas Petazzoni Date: Fri, 10 May 2013 06:29:37 +0000 Subject: python3: remove another config script Signed-off-by: Thomas Petazzoni Signed-off-by: Peter Korsgaard --- package/python3/python3.mk | 1 + 1 file changed, 1 insertion(+) diff --git a/package/python3/python3.mk b/package/python3/python3.mk index 7551a7b5a..239ac8f63 100644 --- a/package/python3/python3.mk +++ b/package/python3/python3.mk @@ -130,6 +130,7 @@ PYTHON3_POST_INSTALL_STAGING_HOOKS += PYTHON3_FIXUP_LIBDIR # 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 -- cgit v1.2.3 From 971d3f1fbc620277eb8a5108cd825b497bcd3870 Mon Sep 17 00:00:00 2001 From: Thomas Petazzoni Date: Fri, 10 May 2013 06:29:38 +0000 Subject: sane-backends: handle sane-config script Signed-off-by: Thomas Petazzoni Signed-off-by: Peter Korsgaard --- package/sane-backends/sane-backends.mk | 1 + 1 file changed, 1 insertion(+) diff --git a/package/sane-backends/sane-backends.mk b/package/sane-backends/sane-backends.mk index 496dca4da..902284509 100644 --- a/package/sane-backends/sane-backends.mk +++ b/package/sane-backends/sane-backends.mk @@ -6,6 +6,7 @@ SANE_BACKENDS_VERSION = 1.0.22 SANE_BACKENDS_SOURCE = sane-backends-$(SANE_BACKENDS_VERSION).tar.gz SANE_BACKENDS_SITE = https://alioth.debian.org/frs/download.php/3503 +SANE_BACKENDS_CONFIG_SCRIPTS = sane-config ifeq ($(BR2_PACKAGE_LIBUSB),y) SANE_BACKENDS_DEPENDENCIES += libusb -- cgit v1.2.3 From 98b5cc3eb4d4103b2149325b98a5e93e68c68dd8 Mon Sep 17 00:00:00 2001 From: Raúl Sánchez Siles Date: Sat, 11 May 2013 01:40:36 +0000 Subject: Choose xz compressed tarball for linux kernel. MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Prefer xz compressed tarball so some bandwidth is saved for kernel headers and kernel itself downloads. Signed-off-by: Raúl Sánchez Siles Reviewed-by: Thomas Petazzoni Signed-off-by: Peter Korsgaard --- linux/linux.mk | 2 +- toolchain/kernel-headers/kernel-headers.mk | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/linux/linux.mk b/linux/linux.mk index d375cf032..31155642d 100644 --- a/linux/linux.mk +++ b/linux/linux.mk @@ -16,7 +16,7 @@ else ifeq ($(BR2_LINUX_KERNEL_CUSTOM_GIT),y) LINUX_SITE = $(call qstrip,$(BR2_LINUX_KERNEL_CUSTOM_GIT_REPO_URL)) LINUX_SITE_METHOD = git else -LINUX_SOURCE = linux-$(LINUX_VERSION).tar.bz2 +LINUX_SOURCE = linux-$(LINUX_VERSION).tar.xz # In X.Y.Z, get X and Y. We replace dots and dashes by spaces in order # to use the $(word) function. We support versions such as 3.1, # 2.6.32, 2.6.32-rc1, 3.0-rc6, etc. diff --git a/toolchain/kernel-headers/kernel-headers.mk b/toolchain/kernel-headers/kernel-headers.mk index adf7bc45f..b5ae3227e 100644 --- a/toolchain/kernel-headers/kernel-headers.mk +++ b/toolchain/kernel-headers/kernel-headers.mk @@ -31,8 +31,8 @@ LINUX_HEADERS_SITE:=$(BR2_KERNEL_MIRROR:/=)/linux/kernel/v2.6/ else LINUX_HEADERS_SITE:=$(BR2_KERNEL_MIRROR:/=)/linux/kernel/v3.x/ endif -LINUX_HEADERS_SOURCE:=linux-$(LINUX_HEADERS_VERSION).tar.bz2 -LINUX_HEADERS_CAT:=$(BZCAT) +LINUX_HEADERS_SOURCE:=linux-$(LINUX_HEADERS_VERSION).tar.xz +LINUX_HEADERS_CAT:=$(XZCAT) LINUX_HEADERS_UNPACK_DIR:=$(TOOLCHAIN_DIR)/linux-$(LINUX_HEADERS_VERSION) LINUX_HEADERS_DIR:=$(TOOLCHAIN_DIR)/linux -- cgit v1.2.3 From 2d1580cbe9c8e4238107fabc2ffe69956d191a27 Mon Sep 17 00:00:00 2001 From: Gustavo Zacarias Date: Sun, 12 May 2013 03:53:49 +0000 Subject: samba: bump to version 3.6.15 Signed-off-by: Gustavo Zacarias Signed-off-by: Peter Korsgaard --- package/samba/samba.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package/samba/samba.mk b/package/samba/samba.mk index 683c7b2e0..55fc94dc9 100644 --- a/package/samba/samba.mk +++ b/package/samba/samba.mk @@ -4,7 +4,7 @@ # ############################################################# -SAMBA_VERSION = 3.6.14 +SAMBA_VERSION = 3.6.15 SAMBA_SITE = http://ftp.samba.org/pub/samba/stable SAMBA_SUBDIR = source3 SAMBA_INSTALL_STAGING = YES -- cgit v1.2.3 From 2db1e84e28b308c85b0919bd015c36ed4fc3590d Mon Sep 17 00:00:00 2001 From: Gustavo Zacarias Date: Sun, 12 May 2013 03:53:50 +0000 Subject: ipset: bump to version 6.19 Signed-off-by: Gustavo Zacarias Signed-off-by: Peter Korsgaard --- package/ipset/ipset.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package/ipset/ipset.mk b/package/ipset/ipset.mk index 50915ef49..daadc9eb9 100644 --- a/package/ipset/ipset.mk +++ b/package/ipset/ipset.mk @@ -4,7 +4,7 @@ # ############################################################# -IPSET_VERSION = 6.18 +IPSET_VERSION = 6.19 IPSET_SOURCE = ipset-$(IPSET_VERSION).tar.bz2 IPSET_SITE = http://ipset.netfilter.org IPSET_DEPENDENCIES = libmnl host-pkgconf -- cgit v1.2.3 From 7893840d16419e5795bd6b8cbc3adf5a99d9298f Mon Sep 17 00:00:00 2001 From: Gustavo Zacarias Date: Sun, 12 May 2013 03:53:51 +0000 Subject: fftw: bump to version 3.3.3 Signed-off-by: Gustavo Zacarias Signed-off-by: Peter Korsgaard --- package/fftw/fftw.mk | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/package/fftw/fftw.mk b/package/fftw/fftw.mk index 74a5e11fe..d0af75268 100644 --- a/package/fftw/fftw.mk +++ b/package/fftw/fftw.mk @@ -4,8 +4,10 @@ # ################################################################################ -FFTW_VERSION = 3.3.2 +FFTW_VERSION = 3.3.3 FFTW_SITE = http://www.fftw.org FFTW_INSTALL_STAGING = YES +FFTW_LICENSE = GPLv2+ +FFTW_LICENSE_FILES = COPYING $(eval $(autotools-package)) -- cgit v1.2.3 From a2f30cacd95d7d850a22a6824ec748e448b1e772 Mon Sep 17 00:00:00 2001 From: Gustavo Zacarias Date: Sun, 12 May 2013 03:53:52 +0000 Subject: httping: bump to version 2.2.1 Signed-off-by: Gustavo Zacarias Signed-off-by: Peter Korsgaard --- package/httping/httping.mk | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/package/httping/httping.mk b/package/httping/httping.mk index 2ebc75e61..8f7cb97ec 100644 --- a/package/httping/httping.mk +++ b/package/httping/httping.mk @@ -4,13 +4,18 @@ # ############################################################# -HTTPING_VERSION = 1.6 +HTTPING_VERSION = 2.2.1 HTTPING_SOURCE = httping-$(HTTPING_VERSION).tgz HTTPING_SITE = http://www.vanheusden.com/httping HTTPING_LICENSE = GPLv2 HTTPING_LICENSE_FILES = license.txt -HTTPING_DEPENDENCIES = $(if $(BR2_PACKAGE_OPENSSL),openssl) +HTTPING_DEPENDENCIES = \ + $(if $(BR2_PACKAGE_OPENSSL),openssl) \ + $(if $(BR2_PACKAGE_NCURSES),ncurses) \ + $(if $(BR2_PACKAGE_FFTW),fftw) HTTPING_MAKE_OPT = $(TARGET_CONFIGURE_OPTS) \ + FW=$(if $(BR2_PACKAGE_FFTW),yes,no) \ + NC=$(if $(BR2_PACKAGE_NCURSES),yes,no) \ SSL=$(if $(BR2_PACKAGE_OPENSSL),yes,no) \ TFO=$(if $(BR2_PACKAGE_HTTPING_TFO),yes,no) -- cgit v1.2.3 From 8f8d23f1918091a307ae957dd9f32d1596819a51 Mon Sep 17 00:00:00 2001 From: Gustavo Zacarias Date: Sun, 12 May 2013 03:55:22 +0000 Subject: less: bump to version 458 Signed-off-by: Gustavo Zacarias Signed-off-by: Peter Korsgaard --- package/less/less.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package/less/less.mk b/package/less/less.mk index 72449c3c1..f8117332a 100644 --- a/package/less/less.mk +++ b/package/less/less.mk @@ -4,7 +4,7 @@ # ############################################################# -LESS_VERSION = 451 +LESS_VERSION = 458 LESS_SITE = http://www.greenwoodsoftware.com/less LESS_LICENSE = GPLv3+ LESS_LICENSE_FILES = COPYING -- cgit v1.2.3 From 87c6b15c7d354ab52cb1f7b785b233293800eca1 Mon Sep 17 00:00:00 2001 From: Gustavo Zacarias Date: Sun, 12 May 2013 03:55:23 +0000 Subject: dnsmasq: bump to version 2.66 Signed-off-by: Gustavo Zacarias Signed-off-by: Peter Korsgaard --- .../dnsmasq-01-fix-wrong-size-in-memset-call.patch | 27 ++++ ...-number-zero-in-encapsulated-dhcp-options.patch | 143 +++++++++++++++++++++ package/dnsmasq/dnsmasq.mk | 2 +- 3 files changed, 171 insertions(+), 1 deletion(-) create mode 100644 package/dnsmasq/dnsmasq-01-fix-wrong-size-in-memset-call.patch create mode 100644 package/dnsmasq/dnsmasq-02-allow-option-number-zero-in-encapsulated-dhcp-options.patch diff --git a/package/dnsmasq/dnsmasq-01-fix-wrong-size-in-memset-call.patch b/package/dnsmasq/dnsmasq-01-fix-wrong-size-in-memset-call.patch new file mode 100644 index 000000000..536552a60 --- /dev/null +++ b/package/dnsmasq/dnsmasq-01-fix-wrong-size-in-memset-call.patch @@ -0,0 +1,27 @@ +From 4582c0efe7d7af93517b1f3bcc7af67685ab3e5c Mon Sep 17 00:00:00 2001 +From: Dave Reisner +Date: Thu, 18 Apr 2013 09:47:49 +0100 +Subject: [PATCH] Fix wrong size in memset() call. + +Thanks to Dave Reisner. + +Signed-off-by: Gustavo Zacarias +--- + src/ipset.c | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/src/ipset.c b/src/ipset.c +index a34ed96..f175fa4 100644 +--- a/src/ipset.c ++++ b/src/ipset.c +@@ -110,7 +110,7 @@ static int new_add_to_ipset(const char *setname, const struct all_addr *ipaddr, + return -1; + } + +- memset(buffer, 0, sizeof(buffer)); ++ memset(buffer, 0, BUFF_SZ); + + nlh = (struct nlmsghdr *)buffer; + nlh->nlmsg_len = NL_ALIGN(sizeof(struct nlmsghdr)); +-- +1.8.1.5 diff --git a/package/dnsmasq/dnsmasq-02-allow-option-number-zero-in-encapsulated-dhcp-options.patch b/package/dnsmasq/dnsmasq-02-allow-option-number-zero-in-encapsulated-dhcp-options.patch new file mode 100644 index 000000000..79f57bf8f --- /dev/null +++ b/package/dnsmasq/dnsmasq-02-allow-option-number-zero-in-encapsulated-dhcp-options.patch @@ -0,0 +1,143 @@ +From bd08ae67f9a0cae2ce15be885254cad9449d4551 Mon Sep 17 00:00:00 2001 +From: Simon Kelley +Date: Fri, 19 Apr 2013 10:22:06 +0100 +Subject: [PATCH] Allow option number zero in encapsulated DHCP options. + + +Signed-off-by: Gustavo Zacarias +--- + src/dhcp-common.c | 6 +++--- + src/dnsmasq.h | 4 ++-- + src/option.c | 33 ++++++++++++++++++++------------- + 3 files changed, 25 insertions(+), 18 deletions(-) + +diff --git a/src/dhcp-common.c b/src/dhcp-common.c +index f4fd088..8de4268 100644 +--- a/src/dhcp-common.c ++++ b/src/dhcp-common.c +@@ -512,7 +512,7 @@ void display_opts6(void) + } + #endif + +-u16 lookup_dhcp_opt(int prot, char *name) ++int lookup_dhcp_opt(int prot, char *name) + { + const struct opttab_t *t; + int i; +@@ -528,10 +528,10 @@ u16 lookup_dhcp_opt(int prot, char *name) + if (strcasecmp(t[i].name, name) == 0) + return t[i].val; + +- return 0; ++ return -1; + } + +-u16 lookup_dhcp_len(int prot, u16 val) ++int lookup_dhcp_len(int prot, int val) + { + const struct opttab_t *t; + int i; +diff --git a/src/dnsmasq.h b/src/dnsmasq.h +index 69ae7a7..41e2798 100644 +--- a/src/dnsmasq.h ++++ b/src/dnsmasq.h +@@ -1216,8 +1216,8 @@ void log_tags(struct dhcp_netid *netid, u32 xid); + int match_bytes(struct dhcp_opt *o, unsigned char *p, int len); + void dhcp_update_configs(struct dhcp_config *configs); + void display_opts(void); +-u16 lookup_dhcp_opt(int prot, char *name); +-u16 lookup_dhcp_len(int prot, u16 val); ++int lookup_dhcp_opt(int prot, char *name); ++int lookup_dhcp_len(int prot, int val); + char *option_string(int prot, unsigned int opt, unsigned char *val, + int opt_len, char *buf, int buf_len); + #ifdef HAVE_LINUX_NETWORK +diff --git a/src/option.c b/src/option.c +index b2596ec..2a61017 100644 +--- a/src/option.c ++++ b/src/option.c +@@ -750,6 +750,7 @@ static int parse_dhcp_opt(char *errstr, char *arg, int flags) + struct dhcp_netid *np = NULL; + u16 opt_len = 0; + int is6 = 0; ++ int option_ok = 0; + + new->len = 0; + new->flags = flags; +@@ -769,16 +770,19 @@ static int parse_dhcp_opt(char *errstr, char *arg, int flags) + { + new->opt = atoi(arg); + opt_len = 0; ++ option_ok = 1; + break; + } + + if (strstr(arg, "option:") == arg) + { +- new->opt = lookup_dhcp_opt(AF_INET, arg+7); +- opt_len = lookup_dhcp_len(AF_INET, new->opt); +- /* option: must follow tag and vendor string. */ +- if ((opt_len & OT_INTERNAL) && flags != DHOPT_MATCH) +- new->opt = 0; ++ if ((new->opt = lookup_dhcp_opt(AF_INET, arg+7)) != -1) ++ { ++ opt_len = lookup_dhcp_len(AF_INET, new->opt); ++ /* option: must follow tag and vendor string. */ ++ if (!(opt_len & OT_INTERNAL) || flags == DHOPT_MATCH) ++ option_ok = 1; ++ } + break; + } + #ifdef HAVE_DHCP6 +@@ -792,13 +796,16 @@ static int parse_dhcp_opt(char *errstr, char *arg, int flags) + { + new->opt = atoi(arg+8); + opt_len = 0; ++ option_ok = 1; + } + else + { +- new->opt = lookup_dhcp_opt(AF_INET6, arg+8); +- opt_len = lookup_dhcp_len(AF_INET6, new->opt); +- if ((opt_len & OT_INTERNAL) && flags != DHOPT_MATCH) +- new->opt = 0; ++ if ((new->opt = lookup_dhcp_opt(AF_INET6, arg+8)) != -1) ++ { ++ opt_len = lookup_dhcp_len(AF_INET6, new->opt); ++ if (!(opt_len & OT_INTERNAL) || flags == DHOPT_MATCH) ++ option_ok = 1; ++ } + } + /* option6:| must follow tag and vendor string. */ + is6 = 1; +@@ -821,7 +828,7 @@ static int parse_dhcp_opt(char *errstr, char *arg, int flags) + new->flags |= DHOPT_RFC3925; + if (flags == DHOPT_MATCH) + { +- new->opt = 1; /* avoid error below */ ++ option_ok = 1; + break; + } + } +@@ -848,16 +855,16 @@ static int parse_dhcp_opt(char *errstr, char *arg, int flags) + + if (opt_len == 0 && + !(new->flags & DHOPT_RFC3925)) +- opt_len = lookup_dhcp_len(AF_INET6 ,new->opt); ++ opt_len = lookup_dhcp_len(AF_INET6, new->opt); + } + else + #endif + if (opt_len == 0 && + !(new->flags & (DHOPT_VENDOR | DHOPT_ENCAPSULATE | DHOPT_RFC3925))) +- opt_len = lookup_dhcp_len(AF_INET ,new->opt); ++ opt_len = lookup_dhcp_len(AF_INET, new->opt); + + /* option may be missing with rfc3925 match */ +- if (new->opt == 0) ++ if (!option_ok) + ret_err(_("bad dhcp-option")); + + if (comma) +-- +1.8.1.5 diff --git a/package/dnsmasq/dnsmasq.mk b/package/dnsmasq/dnsmasq.mk index 8fb1fb194..04e3630c2 100644 --- a/package/dnsmasq/dnsmasq.mk +++ b/package/dnsmasq/dnsmasq.mk @@ -4,7 +4,7 @@ # ############################################################# -DNSMASQ_VERSION = 2.65 +DNSMASQ_VERSION = 2.66 DNSMASQ_SITE = http://thekelleys.org.uk/dnsmasq DNSMASQ_MAKE_ENV = $(TARGET_MAKE_ENV) CC="$(TARGET_CC)" DNSMASQ_MAKE_OPT = COPTS="$(DNSMASQ_COPTS)" PREFIX=/usr CFLAGS="$(TARGET_CFLAGS)" -- cgit v1.2.3 From 6b7b2b617cc03159fca36f1bb01250fc430e086a Mon Sep 17 00:00:00 2001 From: Gustavo Zacarias Date: Sun, 12 May 2013 04:01:41 +0000 Subject: gawk: bump to version 4.1.0 Signed-off-by: Gustavo Zacarias Signed-off-by: Peter Korsgaard --- package/gawk/Config.in | 2 ++ package/gawk/gawk-01-no-versioned.patch | 26 ++++++++++++++++++++++++++ package/gawk/gawk-no-versioned.patch | 26 -------------------------- package/gawk/gawk.mk | 20 ++++++++++---------- 4 files changed, 38 insertions(+), 36 deletions(-) create mode 100644 package/gawk/gawk-01-no-versioned.patch delete mode 100644 package/gawk/gawk-no-versioned.patch diff --git a/package/gawk/Config.in b/package/gawk/Config.in index 82c970f1d..6889777c0 100644 --- a/package/gawk/Config.in +++ b/package/gawk/Config.in @@ -1,6 +1,8 @@ config BR2_PACKAGE_GAWK bool "gawk" depends on BR2_USE_WCHAR + depends on BR2_USE_MMU # fork() + depends on !BR2_PREFER_STATIC_LIB help A special-purpose programming language which is data driven rather than procedural. Allows for simple data-reformatting jobs diff --git a/package/gawk/gawk-01-no-versioned.patch b/package/gawk/gawk-01-no-versioned.patch new file mode 100644 index 000000000..ff28581ea --- /dev/null +++ b/package/gawk/gawk-01-no-versioned.patch @@ -0,0 +1,26 @@ +Disabled versioned installation of binaries to save space. +Also use symlinks where it's appropiate. + +Signed-off-by: Gustavo Zacarias +--- + +diff -Nura gawk-4.0.0.orig/Makefile.in gawk-4.0.0/Makefile.in +--- gawk-4.0.0.orig/Makefile.in 2011-06-24 05:16:13.000000000 -0300 ++++ gawk-4.0.0/Makefile.in 2011-11-11 15:31:16.429577288 -0300 +@@ -403,7 +403,7 @@ + MAINTAINERCLEANFILES = version.c + + # We want hard links for install-exec-hook, below +-LN = ln ++LN = $(LN_S) + all: config.h + $(MAKE) $(AM_MAKEFLAGS) all-recursive + +@@ -1011,6 +1011,7 @@ + # (This is done universally, which may not always be right, but + # there's no easy way to distinguish GNU from non-GNU systems.) + install-exec-hook: ++foo: + (cd $(DESTDIR)$(bindir); \ + $(LN) gawk$(EXEEXT) gawk-$(VERSION)$(EXEEXT) 2>/dev/null ; \ + $(LN) pgawk$(EXEEXT) pgawk-$(VERSION)$(EXEEXT) 2>/dev/null ; \ diff --git a/package/gawk/gawk-no-versioned.patch b/package/gawk/gawk-no-versioned.patch deleted file mode 100644 index ff28581ea..000000000 --- a/package/gawk/gawk-no-versioned.patch +++ /dev/null @@ -1,26 +0,0 @@ -Disabled versioned installation of binaries to save space. -Also use symlinks where it's appropiate. - -Signed-off-by: Gustavo Zacarias ---- - -diff -Nura gawk-4.0.0.orig/Makefile.in gawk-4.0.0/Makefile.in ---- gawk-4.0.0.orig/Makefile.in 2011-06-24 05:16:13.000000000 -0300 -+++ gawk-4.0.0/Makefile.in 2011-11-11 15:31:16.429577288 -0300 -@@ -403,7 +403,7 @@ - MAINTAINERCLEANFILES = version.c - - # We want hard links for install-exec-hook, below --LN = ln -+LN = $(LN_S) - all: config.h - $(MAKE) $(AM_MAKEFLAGS) all-recursive - -@@ -1011,6 +1011,7 @@ - # (This is done universally, which may not always be right, but - # there's no easy way to distinguish GNU from non-GNU systems.) - install-exec-hook: -+foo: - (cd $(DESTDIR)$(bindir); \ - $(LN) gawk$(EXEEXT) gawk-$(VERSION)$(EXEEXT) 2>/dev/null ; \ - $(LN) pgawk$(EXEEXT) pgawk-$(VERSION)$(EXEEXT) 2>/dev/null ; \ diff --git a/package/gawk/gawk.mk b/package/gawk/gawk.mk index 366dea78f..b26430e57 100644 --- a/package/gawk/gawk.mk +++ b/package/gawk/gawk.mk @@ -4,10 +4,10 @@ # ############################################################# -GAWK_VERSION = 4.0.1 +GAWK_VERSION = 4.1.0 GAWK_SITE = $(BR2_GNU_MIRROR)/gawk -GAWK_TARGET_BINS = awk gawk igawk pgawk -GAWK_LICENSE = GPLv3 +GAWK_DEPENDENCIES = host-gawk $(if $(BR2_PACKAGE_MPFR),mpfr) +GAWK_LICENSE = GPLv3+ GAWK_LICENSE_FILES = COPYING # Prefer full-blown gawk over busybox awk @@ -15,7 +15,7 @@ ifeq ($(BR2_PACKAGE_BUSYBOX),y) GAWK_DEPENDENCIES += busybox endif -# we don't have a host-busybox +# We don't have a host-busybox HOST_GAWK_DEPENDENCIES = define GAWK_CREATE_SYMLINK @@ -24,13 +24,13 @@ endef GAWK_POST_INSTALL_TARGET_HOOKS += GAWK_CREATE_SYMLINK -define GAWK_UNINSTALL_TARGET_CMDS - rm -f $(addprefix $(TARGET_DIR)/usr/bin/, $(GAWK_TARGET_BINS)) - rm -f $(TARGET_DIR)/usr/share/info/gawk*.info - rm -f $(TARGET_DIR)/usr/share/man/man*/*gawk.1 - rm -rf $(TARGET_DIR)/usr/libexec/awk - rm -rf $(TARGET_DIR)/usr/share/awk +# Assume we support shared libs +# The check isn't cross-compile friendly and it's mandatory anyway +define GAWK_DISABLE_SHARED_CHECK + $(SED) 's/ check-for-shared-lib-support//' $(@D)/extension/Makefile.in endef +GAWK_POST_PATCH_HOOKS += GAWK_DISABLE_SHARED_CHECK + $(eval $(autotools-package)) $(eval $(host-autotools-package)) -- cgit v1.2.3 From 0af22c755b45d8b04ca148ff0b58e460c835e337 Mon Sep 17 00:00:00 2001 From: "Yann E. MORIN" Date: Thu, 9 May 2013 12:22:54 +0000 Subject: package/pmake: add host pmake pmake is the make command used by the BSD. It will used to build BSD-related packages, coming later. Signed-off-by: "Yann E. MORIN" Cc: Arnout Vandecappelle Cc: Thomas Petazzoni Signed-off-by: Peter Korsgaard --- package/pmake/pmake.mk | 47 +++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 47 insertions(+) create mode 100644 package/pmake/pmake.mk diff --git a/package/pmake/pmake.mk b/package/pmake/pmake.mk new file mode 100644 index 000000000..7b2e5a6ef --- /dev/null +++ b/package/pmake/pmake.mk @@ -0,0 +1,47 @@ +############################################################# +# +# pmake +# +############################################################## + +PMAKE_VERSION = 1.111 +PMAKE_SOURCE = pmake_$(PMAKE_VERSION).orig.tar.gz +PMAKE_SITE = http://snapshot.debian.org/archive/debian/20120601T033558Z/pool/main/p/pmake +PMAKE_LICENSE = BSD-3c BSD-4c +# No license file. License texts are spread in the boilerplates +# of each individual source files; some are BSD-3c, some BSD-4c. + +# Vampirise patches from Debian +PMAKE_PATCH = pmake_1.111-3.2.debian.tar.gz + +# CFLAGS vampirised from Debian's rules, adapted to buildroot variables +HOST_PMAKE_CFLAGS = -O2 -g -Wall -D__COPYRIGHT\(x\)= -D__RCSID\(x\)= -I. \ + -DMACHINE=\\\"buildroot\\\" \ + -DMACHINE_ARCH=\\\"$(ARCH)\\\" -DMACHINE_MULTIARCH=\\\"\\\" \ + -DHAVE_SETENV -DHAVE_STRERROR -DHAVE_STRDUP -DHAVE_STRFTIME \ + -DHAVE_VSNPRINTF -D_GNU_SOURCE -Wno-unused + +define HOST_PMAKE_BUILD_CMDS + $(MAKE) -C $(@D) -f Makefile.boot CFLAGS="$(HOST_PMAKE_CFLAGS)" +endef + +# The generated file is named bmake, but we want pmake; but: +# - pmake uses support files (in mk/) +# - it's not possible to tell pmake, at build-time, where to expect +# these support files, and pmake expects them in /usr/share/mk/ +# - but pmake has an option to override that search path at runtime +# - so we install bmake as bmake +# - and we install a wrapper named pmake that calls pmake with the +# appropriate search path +define HOST_PMAKE_INSTALL_CMDS + $(INSTALL) -m 0755 $(@D)/bmake $(HOST_DIR)/usr/bin/bmake + $(INSTALL) -d -m 0755 $(HOST_DIR)/usr/share/pmake/mk + for mk in $(@D)/mk/*; do \ + $(INSTALL) -m 0644 $${mk} $(HOST_DIR)/usr/share/pmake/mk; \ + done + printf '#!/bin/sh\nexec $${0%%/*}/bmake -m $${0%%/pmake}/../../usr/share/pmake/mk "$$@"\n' \ + >$(HOST_DIR)/usr/bin/pmake + chmod 0755 $(HOST_DIR)/usr/bin/pmake +endef + +$(eval $(host-generic-package)) -- cgit v1.2.3 From 4ae47d82649d38de6896270a6b6945d2467b7047 Mon Sep 17 00:00:00 2001 From: "Yann E. MORIN" Date: Thu, 9 May 2013 12:22:55 +0000 Subject: package/libbsd: new package Signed-off-by: "Yann E. MORIN" Cc: Thomas Petazzoni Acked-by: Nathan Lynch Signed-off-by: Peter Korsgaard --- package/Config.in | 1 + package/libbsd/Config.in | 10 ++++++++++ package/libbsd/libbsd.mk | 21 +++++++++++++++++++++ 3 files changed, 32 insertions(+) create mode 100644 package/libbsd/Config.in create mode 100644 package/libbsd/libbsd.mk diff --git a/package/Config.in b/package/Config.in index bbacd5c54..55a38b9bf 100644 --- a/package/Config.in +++ b/package/Config.in @@ -578,6 +578,7 @@ source "package/gmp/Config.in" source "package/gsl/Config.in" source "package/gtest/Config.in" source "package/libatomic_ops/Config.in" +source "package/libbsd/Config.in" source "package/libcap/Config.in" source "package/libcap-ng/Config.in" source "package/libdaemon/Config.in" diff --git a/package/libbsd/Config.in b/package/libbsd/Config.in new file mode 100644 index 000000000..0ed9dac9a --- /dev/null +++ b/package/libbsd/Config.in @@ -0,0 +1,10 @@ +config BR2_PACKAGE_LIBBSD + bool "libbsd" + help + This library provides useful functions commonly found on BSD + systems, and lacking on others like GNU systems, thus making + it easier to port projects with strong BSD origins, without + needing to embed the same code over and over again on each + project. + + http://libbsd.freedesktop.org/ diff --git a/package/libbsd/libbsd.mk b/package/libbsd/libbsd.mk new file mode 100644 index 000000000..3af1002d6 --- /dev/null +++ b/package/libbsd/libbsd.mk @@ -0,0 +1,21 @@ +############################################################# +# +# libbsd +# +############################################################# + +LIBBSD_VERSION = 0.4.2 +LIBBSD_SOURCE = libbsd-$(LIBBSD_VERSION).tar.gz +LIBBSD_SITE = http://libbsd.freedesktop.org/releases +LIBBSD_LICENSE = BSD-3c MIT +LIBBSD_LICENSE_FILES = LICENSE + +# man-pages are BSD-4c, so that license only matters +# if doc is kept in the target rootfs +ifeq ($(BR2_HAVE_DOCUMENTATION),y) +LIBBSD_LICENSE += (libraries), BSD-4c (documentation) +endif + +LIBBSD_INSTALL_STAGING = YES + +$(eval $(autotools-package)) -- cgit v1.2.3 From 47f578e3c2db53caf51fad9ec24e71ff1606c862 Mon Sep 17 00:00:00 2001 From: "Yann E. MORIN" Date: Thu, 9 May 2013 12:22:58 +0000 Subject: package/dtc: new package dtc is the Device Tree Compiler, and manipulates device trees. Signed-off-by: "Yann E. MORIN" Cc: Arnout Vandecappelle Signed-off-by: Peter Korsgaard --- package/Config.in | 1 + package/dtc/Config.in | 9 ++++++++ package/dtc/dtc-extra_cflags.patch | 28 +++++++++++++++++++++++++ package/dtc/dtc-separate-lib-install.patch | 28 +++++++++++++++++++++++++ package/dtc/dtc.mk | 33 ++++++++++++++++++++++++++++++ 5 files changed, 99 insertions(+) create mode 100644 package/dtc/Config.in create mode 100644 package/dtc/dtc-extra_cflags.patch create mode 100644 package/dtc/dtc-separate-lib-install.patch create mode 100644 package/dtc/dtc.mk diff --git a/package/Config.in b/package/Config.in index 55a38b9bf..1dee2ab2e 100644 --- a/package/Config.in +++ b/package/Config.in @@ -459,6 +459,7 @@ endmenu menu "Hardware handling" source "package/ccid/Config.in" +source "package/dtc/Config.in" source "package/imx-lib/Config.in" source "package/lcdapi/Config.in" source "package/libaio/Config.in" diff --git a/package/dtc/Config.in b/package/dtc/Config.in new file mode 100644 index 000000000..e1f6e86de --- /dev/null +++ b/package/dtc/Config.in @@ -0,0 +1,9 @@ +config BR2_PACKAGE_DTC + bool "dtc" + help + The Device Tree Compiler, dtc, takes as input a device-tree in + a given format and outputs a device-tree in another format. + + Note that only the library is installed for now. + + http://git.jdl.com/gitweb/?p=dtc.git (no home page) diff --git a/package/dtc/dtc-extra_cflags.patch b/package/dtc/dtc-extra_cflags.patch new file mode 100644 index 000000000..3ce699b5d --- /dev/null +++ b/package/dtc/dtc-extra_cflags.patch @@ -0,0 +1,28 @@ +Makefile: append the CFLAGS to existing ones + +Allow the user to pass custom CFLAGS (eg. optimisation flags). + +Do not use EXTRA_CFLAGS, append to existing CFLAGS with += (Arnout) + +Signed-off-by: "Yann E. MORIN" +Cc: Arnout Vandecappelle + +--- +Patch not sent upstream. + +Although not specific to buildroot, I am not sure this is the best +way to handle user-supplied CFLAGS. + +diff -durN dtc-e4b497f367a3b2ae99cc52089a14a221b13a76ef.orig/Makefile dtc-e4b497f367a3b2ae99cc52089a14a221b13a76ef/Makefile +--- dtc-e4b497f367a3b2ae99cc52089a14a221b13a76ef.orig/Makefile 2012-10-22 22:02:47.541240846 +0200 ++++ dtc-e4b497f367a3b2ae99cc52089a14a221b13a76ef/Makefile 2012-10-22 22:03:21.151047833 +0200 +@@ -18,7 +18,8 @@ + CPPFLAGS = -I libfdt -I . + WARNINGS = -Werror -Wall -Wpointer-arith -Wcast-qual -Wnested-externs \ + -Wstrict-prototypes -Wmissing-prototypes -Wredundant-decls +-CFLAGS = -g -Os -fPIC -Werror $(WARNINGS) ++CFLAGS ?= -g -Os ++CFLAGS += -fPIC $(WARNINGS) + + BISON = bison + LEX = flex diff --git a/package/dtc/dtc-separate-lib-install.patch b/package/dtc/dtc-separate-lib-install.patch new file mode 100644 index 000000000..c86d587a1 --- /dev/null +++ b/package/dtc/dtc-separate-lib-install.patch @@ -0,0 +1,28 @@ +Makefile: add a rule to only install libfdt + +Signed-off-by: "Yann E. MORIN" + +--- +Patch not sent upstream. + +It's really specific to buildroot, and is probably not +good (aka generic) enough to be pushed upstream. + +diff --git a/Makefile b/Makefile +index 1169e6c..39e7190 100644 +--- a/Makefile ++++ b/Makefile +@@ -160,10 +160,12 @@ endif + # intermediate target and building them again "for real" + .SECONDARY: $(DTC_GEN_SRCS) $(CONVERT_GEN_SRCS) + +-install: all $(SCRIPTS) ++install: all $(SCRIPTS) libfdt_install + @$(VECHO) INSTALL + $(INSTALL) -d $(DESTDIR)$(BINDIR) + $(INSTALL) $(BIN) $(SCRIPTS) $(DESTDIR)$(BINDIR) ++ ++libfdt_install: libfdt + $(INSTALL) -d $(DESTDIR)$(LIBDIR) + $(INSTALL) $(LIBFDT_lib) $(DESTDIR)$(LIBDIR) + ln -sf $(notdir $(LIBFDT_lib)) $(DESTDIR)$(LIBDIR)/$(LIBFDT_soname) diff --git a/package/dtc/dtc.mk b/package/dtc/dtc.mk new file mode 100644 index 000000000..f05b09de2 --- /dev/null +++ b/package/dtc/dtc.mk @@ -0,0 +1,33 @@ +############################################################# +# +# dtc +# +############################################################# + +DTC_VERSION = e4b497f367a3b2ae99cc52089a14a221b13a76ef +DTC_SITE = git://git.jdl.com/software/dtc.git +DTC_LICENSE = GPLv2+/BSD-2c +DTC_LICENSE_FILES = README.license GPL +# Note: the dual-license only applies to the library. +# The DT compiler (dtc) is GPLv2+, but we do not install it. +DTC_INSTALL_STAGING = YES + +define DTC_BUILD_CMDS + $(TARGET_CONFIGURE_OPTS) \ + $(MAKE) -C $(@D) PREFIX=/usr libfdt +endef + +# libfdt_install is our own install rule added by our patch +define DTC_INSTALL_STAGING_CMDS + $(MAKE) -C $(@D) DESTDIR=$(STAGING_DIR) PREFIX=/usr libfdt_install +endef + +define DTC_INSTALL_TARGET_CMDS + $(MAKE) -C $(@D) DESTDIR=$(TARGET_DIR) PREFIX=/usr libfdt_install +endef + +define DTC_CLEAN_CMDS + $(MAKE) -C $(@D) libfdt_clean +endef + +$(eval $(generic-package)) -- cgit v1.2.3 From 257e1f4f4388b9cdb734dc55b35e70ff731d0492 Mon Sep 17 00:00:00 2001 From: "Yann E. MORIN" Date: Thu, 9 May 2013 12:22:59 +0000 Subject: package/dtc: add option to install programs By default, we only install the libfdt library. As suggested by Arnout, add an option that also installs the few dtc programs. Signed-off-by: "Yann E. MORIN" Cc: Thomas Petazzoni Cc: Arnout Vandecappelle Signed-off-by: Peter Korsgaard --- package/dtc/Config.in | 28 ++++++++++++++++++++++++++-- package/dtc/dtc.mk | 35 +++++++++++++++++++++++++++++------ 2 files changed, 55 insertions(+), 8 deletions(-) diff --git a/package/dtc/Config.in b/package/dtc/Config.in index e1f6e86de..fac6ab2ea 100644 --- a/package/dtc/Config.in +++ b/package/dtc/Config.in @@ -1,9 +1,33 @@ config BR2_PACKAGE_DTC - bool "dtc" + bool "dtc (libfdt)" help The Device Tree Compiler, dtc, takes as input a device-tree in a given format and outputs a device-tree in another format. - Note that only the library is installed for now. + Note that only the library is installed. + If you want the programs, say 'y' here, and to "dtc programs", below. http://git.jdl.com/gitweb/?p=dtc.git (no home page) + +if BR2_PACKAGE_DTC + +config BR2_PACKAGE_DTC_PROGRAMS + bool "dtc programs" + help + Say 'y' here if you also want the programs on the target: + - convert-dtsv0 convert from version 0 to version 1 + - dtc the device tree compiler + - dtdiff compare two device trees (needs bash) + - fdtdump print a readable version of a flat device tree + - fdtget read values from device tree + - fdtput write a property value to a device tree + + Note: dtdiff requires bash, so if bash is not selected, dtdiff will + be removed from the target file system. Enable bash if you + need dtdiff on the target. + +comment "dtdiff will not be installed: it requires bash" + depends on BR2_PACKAGE_DTC_PROGRAMS + depends on !BR2_PACKAGE_BASH + +endif diff --git a/package/dtc/dtc.mk b/package/dtc/dtc.mk index f05b09de2..76ff3617c 100644 --- a/package/dtc/dtc.mk +++ b/package/dtc/dtc.mk @@ -8,26 +8,49 @@ DTC_VERSION = e4b497f367a3b2ae99cc52089a14a221b13a76ef DTC_SITE = git://git.jdl.com/software/dtc.git DTC_LICENSE = GPLv2+/BSD-2c DTC_LICENSE_FILES = README.license GPL -# Note: the dual-license only applies to the library. -# The DT compiler (dtc) is GPLv2+, but we do not install it. DTC_INSTALL_STAGING = YES +define DTC_POST_INSTALL_TARGET_RM_DTDIFF + rm -f $(TARGET_DIR)/usr/bin/dtdiff +endef + +ifeq ($(BR2_PACKAGE_DTC_PROGRAMS),y) + +DTC_LICENSE += (for the library), GPLv2+ (for the executables) +# Use default goal to build everything +DTC_BUILD_GOAL = +DTC_INSTALL_GOAL = install +DTC_CLEAN_GOAL = clean +ifeq ($(BR2_PACKAGE_BASH),) +DTC_POST_INSTALL_TARGET_HOOKS += DTC_POST_INSTALL_TARGET_RM_DTDIFF +endif + +else # $(BR2_PACKAGE_DTC_PROGRAMS) != y + +DTC_BUILD_GOAL = libfdt +# libfdt_install is our own install rule added by our patch +DTC_INSTALL_GOAL = libfdt_install +DTC_CLEAN_GOAL = libfdt_clean + +endif # $(BR2_PACKAGE_DTC_PROGRAMS) != y + define DTC_BUILD_CMDS $(TARGET_CONFIGURE_OPTS) \ - $(MAKE) -C $(@D) PREFIX=/usr libfdt + CFLAGS="$(TARGET_CFLAGS)" \ + $(MAKE) -C $(@D) PREFIX=/usr $(DTC_BUILD_GOAL) endef -# libfdt_install is our own install rule added by our patch +# For staging, only the library is needed define DTC_INSTALL_STAGING_CMDS $(MAKE) -C $(@D) DESTDIR=$(STAGING_DIR) PREFIX=/usr libfdt_install endef define DTC_INSTALL_TARGET_CMDS - $(MAKE) -C $(@D) DESTDIR=$(TARGET_DIR) PREFIX=/usr libfdt_install + $(MAKE) -C $(@D) DESTDIR=$(TARGET_DIR) PREFIX=/usr $(DTC_INSTALL_GOAL) endef define DTC_CLEAN_CMDS - $(MAKE) -C $(@D) libfdt_clean + $(MAKE) -C $(@D) $(DTC_CLEAN_GOAL) endef $(eval $(generic-package)) -- cgit v1.2.3 From 0012b7dcdb7f5cb5e6f22f08fcc6124979c1c9ea Mon Sep 17 00:00:00 2001 From: Anders Darander Date: Tue, 14 May 2013 10:09:50 +0000 Subject: beaglebone: update to linux 3.8 As the beaglebone support is mainlined, there's no support for the old board setup files, and the only supported run-time configuration is through the device tree. We're also setting the kernel headers to follow the 3.8 series. Signed-off-by: Anders Darander Signed-off-by: Peter Korsgaard --- board/beaglebone/linux-3.2.9.config | 252 ------------------------------------ board/beaglebone/linux-3.8.config | 201 ++++++++++++++++++++++++++++ configs/beaglebone_defconfig | 10 +- 3 files changed, 207 insertions(+), 256 deletions(-) delete mode 100644 board/beaglebone/linux-3.2.9.config create mode 100644 board/beaglebone/linux-3.8.config diff --git a/board/beaglebone/linux-3.2.9.config b/board/beaglebone/linux-3.2.9.config deleted file mode 100644 index 4052f6e3a..000000000 --- a/board/beaglebone/linux-3.2.9.config +++ /dev/null @@ -1,252 +0,0 @@ -CONFIG_EXPERIMENTAL=y -# CONFIG_LOCALVERSION_AUTO is not set -CONFIG_DEFAULT_HOSTNAME="beaglebone" -CONFIG_SYSVIPC=y -CONFIG_POSIX_MQUEUE=y -CONFIG_BSD_PROCESS_ACCT=y -CONFIG_BSD_PROCESS_ACCT_V3=y -CONFIG_FHANDLE=y -CONFIG_SPARSE_IRQ=y -CONFIG_IKCONFIG=y -CONFIG_IKCONFIG_PROC=y -CONFIG_NAMESPACES=y -CONFIG_BLK_DEV_INITRD=y -CONFIG_CC_OPTIMIZE_FOR_SIZE=y -CONFIG_SYSCTL_SYSCALL=y -CONFIG_KALLSYMS_ALL=y -CONFIG_EMBEDDED=y -CONFIG_SLAB=y -CONFIG_PROFILING=y -CONFIG_OPROFILE=m -CONFIG_MODULES=y -CONFIG_MODULE_FORCE_LOAD=y -CONFIG_MODULE_UNLOAD=y -CONFIG_MODULE_FORCE_UNLOAD=y -CONFIG_MODVERSIONS=y -CONFIG_BLK_DEV_INTEGRITY=y -CONFIG_ARCH_OMAP=y -CONFIG_OMAP_MUX_DEBUG=y -CONFIG_OMAP_MBOX_FWK=y -# CONFIG_OMAP_32K_TIMER is not set -# CONFIG_MACH_OMAP_GENERIC is not set -# CONFIG_ARCH_OMAP2 is not set -# CONFIG_ARCH_OMAP4 is not set -# CONFIG_SOC_OMAP3430 is not set -# CONFIG_MACH_OMAP3_BEAGLE is not set -# CONFIG_MACH_DEVKIT8000 is not set -# CONFIG_MACH_OMAP_LDP is not set -# CONFIG_MACH_OMAP3530_LV_SOM is not set -# CONFIG_MACH_OMAP3_TORPEDO is not set -# CONFIG_MACH_ENCORE is not set -# CONFIG_MACH_OVERO is not set -# CONFIG_MACH_OMAP3EVM is not set -# CONFIG_MACH_OMAP3517EVM is not set -# CONFIG_MACH_OMAP3_PANDORA is not set -# CONFIG_MACH_OMAP3_TOUCHBOOK is not set -# CONFIG_MACH_OMAP_3430SDP is not set -# CONFIG_MACH_NOKIA_RM680 is not set -# CONFIG_MACH_NOKIA_RX51 is not set -# CONFIG_MACH_OMAP_ZOOM2 is not set -# CONFIG_MACH_OMAP_ZOOM3 is not set -# CONFIG_MACH_CM_T35 is not set -# CONFIG_MACH_CM_T3517 is not set -# CONFIG_MACH_IGEP0020 is not set -# CONFIG_MACH_IGEP0030 is not set -# CONFIG_MACH_SBC3530 is not set -# CONFIG_MACH_OMAP_3630SDP is not set -# CONFIG_MACH_TI8168EVM is not set -# CONFIG_MACH_TI8148EVM is not set -# CONFIG_MACH_AM335XIAEVM is not set -CONFIG_OMAP3_EDMA=y -CONFIG_ARM_THUMBEE=y -CONFIG_ARM_ERRATA_430973=y -CONFIG_NO_HZ=y -CONFIG_HIGH_RES_TIMERS=y -CONFIG_THUMB2_KERNEL=y -CONFIG_ZBOOT_ROM_TEXT=0x0 -CONFIG_ZBOOT_ROM_BSS=0x0 -CONFIG_CMDLINE=" debug " -CONFIG_AUTO_ZRELADDR=y -CONFIG_CPU_FREQ=y -CONFIG_CPU_FREQ_STAT_DETAILS=y -CONFIG_CPU_FREQ_DEFAULT_GOV_USERSPACE=y -CONFIG_CPU_FREQ_GOV_POWERSAVE=y -CONFIG_CPU_FREQ_GOV_ONDEMAND=y -CONFIG_CPU_FREQ_GOV_CONSERVATIVE=y -CONFIG_BINFMT_MISC=y -# CONFIG_SUSPEND is not set -CONFIG_PM_DEBUG=y -CONFIG_NET=y -CONFIG_PACKET=y -CONFIG_UNIX=y -CONFIG_XFRM_USER=y -CONFIG_NET_KEY=y -CONFIG_INET=y -CONFIG_IP_MULTICAST=y -# CONFIG_INET_XFRM_MODE_TRANSPORT is not set -# CONFIG_INET_XFRM_MODE_TUNNEL is not set -# CONFIG_INET_XFRM_MODE_BEET is not set -# CONFIG_INET_LRO is not set -# CONFIG_INET_DIAG is not set -# CONFIG_IPV6 is not set -# CONFIG_WIRELESS is not set -CONFIG_RFKILL_REGULATOR=m -CONFIG_DEVTMPFS=y -CONFIG_DEVTMPFS_MOUNT=y -CONFIG_CONNECTOR=y -CONFIG_BLK_DEV_LOOP=y -CONFIG_BLK_DEV_RAM=y -CONFIG_BLK_DEV_RAM_COUNT=2 -CONFIG_BLK_DEV_RAM_SIZE=65536 -CONFIG_MISC_DEVICES=y -CONFIG_BMP085=m -CONFIG_EEPROM_AT24=y -CONFIG_EEPROM_93CX6=m -CONFIG_SENSORS_LIS3_I2C=y -CONFIG_NETDEVICES=y -CONFIG_MII=y -# CONFIG_NET_VENDOR_BROADCOM is not set -# CONFIG_NET_VENDOR_CHELSIO is not set -# CONFIG_NET_VENDOR_FARADAY is not set -# CONFIG_NET_VENDOR_INTEL is not set -# CONFIG_NET_VENDOR_MARVELL is not set -# CONFIG_NET_VENDOR_MICREL is not set -# CONFIG_NET_VENDOR_MICROCHIP is not set -# CONFIG_NET_VENDOR_NATSEMI is not set -# CONFIG_NET_VENDOR_SEEQ is not set -# CONFIG_NET_VENDOR_SMSC is not set -# CONFIG_NET_VENDOR_STMICRO is not set -CONFIG_TI_CPSW=y -CONFIG_SMSC_PHY=y -# CONFIG_WLAN is not set -# CONFIG_INPUT_MOUSEDEV is not set -CONFIG_INPUT_EVDEV=y -# CONFIG_KEYBOARD_ATKBD is not set -CONFIG_KEYBOARD_GPIO=y -# CONFIG_MOUSE_PS2 is not set -CONFIG_INPUT_MISC=y -CONFIG_INPUT_AD714X=m -CONFIG_INPUT_BMA150=m -CONFIG_INPUT_MMA8450=m -CONFIG_INPUT_MPU3050=m -CONFIG_INPUT_ATI_REMOTE2=m -CONFIG_INPUT_KEYSPAN_REMOTE=m -CONFIG_INPUT_KXTJ9=m -CONFIG_INPUT_POWERMATE=m -CONFIG_INPUT_YEALINK=m -CONFIG_INPUT_CM109=m -CONFIG_INPUT_TWL4030_PWRBUTTON=y -CONFIG_INPUT_TWL4030_VIBRA=m -CONFIG_INPUT_TWL6040_VIBRA=m -CONFIG_INPUT_UINPUT=m -CONFIG_INPUT_PCF8574=m -CONFIG_INPUT_GPIO_ROTARY_ENCODER=m -CONFIG_INPUT_ADXL34X=m -CONFIG_INPUT_CMA3000=m -CONFIG_INPUT_CMA3000_I2C=m -# CONFIG_SERIO is not set -CONFIG_VT_HW_CONSOLE_BINDING=y -# CONFIG_LEGACY_PTYS is not set -CONFIG_SERIAL_8250=y -CONFIG_SERIAL_8250_CONSOLE=y -CONFIG_SERIAL_8250_NR_UARTS=32 -CONFIG_SERIAL_8250_EXTENDED=y -CONFIG_SERIAL_8250_MANY_PORTS=y -CONFIG_SERIAL_8250_SHARE_IRQ=y -CONFIG_SERIAL_8250_DETECT_IRQ=y -CONFIG_SERIAL_8250_RSA=y -CONFIG_HW_RANDOM=y -CONFIG_RAW_DRIVER=m -CONFIG_I2C_CHARDEV=y -CONFIG_SPI=y -CONFIG_SPI_GPIO=m -CONFIG_SPI_OMAP24XX=y -CONFIG_SPI_SPIDEV=m -CONFIG_DEBUG_GPIO=y -CONFIG_GPIO_SYSFS=y -CONFIG_GPIO_TWL4030=y -CONFIG_GENERIC_PWM=y -CONFIG_DAVINCI_EHRPWM=y -CONFIG_ECAP_PWM=y -CONFIG_POWER_SUPPLY=y -# CONFIG_HWMON is not set -CONFIG_WATCHDOG=y -CONFIG_OMAP_WATCHDOG=y -CONFIG_TWL4030_WATCHDOG=y -CONFIG_MFD_TPS65217=y -CONFIG_REGULATOR_DUMMY=y -CONFIG_REGULATOR_FIXED_VOLTAGE=y -CONFIG_REGULATOR_VIRTUAL_CONSUMER=y -CONFIG_REGULATOR_USERSPACE_CONSUMER=y -CONFIG_REGULATOR_GPIO=y -CONFIG_REGULATOR_TWL4030=y -CONFIG_REGULATOR_TPS65023=y -CONFIG_REGULATOR_TPS6507X=y -CONFIG_REGULATOR_TPS65217=y -CONFIG_DISPLAY_SUPPORT=y -CONFIG_HIDRAW=y -CONFIG_USB=y -CONFIG_USB_ANNOUNCE_NEW_DEVICES=y -CONFIG_USB_DEVICEFS=y -CONFIG_USB_MUSB_HDRC=y -CONFIG_USB_MUSB_TI81XX_GLUE=y -CONFIG_USB_TI_CPPI41_DMA_HW=y -CONFIG_USB_ACM=y -CONFIG_USB_LIBUSUAL=y -CONFIG_USB_GADGET=y -CONFIG_USB_GADGET_MUSB_HDRC=y -CONFIG_USB_ETH=m -CONFIG_USB_MASS_STORAGE=m -CONFIG_USB_G_SERIAL=m -CONFIG_USB_CDC_COMPOSITE=m -CONFIG_USB_G_MULTI=m -CONFIG_USB_G_HID=m -CONFIG_MMC=y -CONFIG_MMC_UNSAFE_RESUME=y -CONFIG_MMC_OMAP_HS=y -CONFIG_NEW_LEDS=y -CONFIG_LEDS_CLASS=y -CONFIG_LEDS_GPIO=y -CONFIG_LEDS_TRIGGERS=y -CONFIG_LEDS_TRIGGER_TIMER=y -CONFIG_LEDS_TRIGGER_HEARTBEAT=y -CONFIG_LEDS_TRIGGER_BACKLIGHT=y -CONFIG_LEDS_TRIGGER_GPIO=y -CONFIG_LEDS_TRIGGER_DEFAULT_ON=y -CONFIG_UIO=m -CONFIG_UIO_PDRV=m -CONFIG_UIO_PDRV_GENIRQ=m -CONFIG_UIO_PRUSS=m -CONFIG_STAGING=y -CONFIG_IIO=y -CONFIG_IIO_BUFFER=y -CONFIG_IIO_SW_RING=y -CONFIG_IIO_KFIFO_BUF=y -# CONFIG_IOMMU_SUPPORT is not set -CONFIG_PM_DEVFREQ=y -CONFIG_DEVFREQ_GOV_USERSPACE=y -CONFIG_EXT2_FS=y -CONFIG_EXT4_FS=y -CONFIG_EXT4_FS_POSIX_ACL=y -CONFIG_FANOTIFY=y -CONFIG_MSDOS_FS=y -CONFIG_VFAT_FS=y -CONFIG_TMPFS=y -CONFIG_TMPFS_POSIX_ACL=y -# CONFIG_NETWORK_FILESYSTEMS is not set -CONFIG_NLS_CODEPAGE_437=y -CONFIG_NLS_ISO8859_1=y -CONFIG_NLS_UTF8=y -CONFIG_PRINTK_TIME=y -CONFIG_MAGIC_SYSRQ=y -CONFIG_DEBUG_FS=y -CONFIG_DETECT_HUNG_TASK=y -CONFIG_SCHEDSTATS=y -CONFIG_TIMER_STATS=y -# CONFIG_DEBUG_BUGVERBOSE is not set -# CONFIG_FTRACE is not set -CONFIG_DEBUG_LL=y -CONFIG_EARLY_PRINTK=y -CONFIG_DEBUG_JTAG_ENABLE=y -# CONFIG_CRYPTO_ANSI_CPRNG is not set -# CONFIG_CRYPTO_HW is not set diff --git a/board/beaglebone/linux-3.8.config b/board/beaglebone/linux-3.8.config new file mode 100644 index 000000000..c083c7091 --- /dev/null +++ b/board/beaglebone/linux-3.8.config @@ -0,0 +1,201 @@ +CONFIG_EXPERIMENTAL=y +CONFIG_DEFAULT_HOSTNAME="beaglebone" +CONFIG_SYSVIPC=y +CONFIG_POSIX_MQUEUE=y +CONFIG_NO_HZ=y +CONFIG_HIGH_RES_TIMERS=y +CONFIG_BSD_PROCESS_ACCT=y +CONFIG_IKCONFIG=y +CONFIG_IKCONFIG_PROC=y +CONFIG_LOG_BUF_SHIFT=16 +CONFIG_BLK_DEV_INITRD=y +CONFIG_CC_OPTIMIZE_FOR_SIZE=y +CONFIG_EMBEDDED=y +CONFIG_SLAB=y +CONFIG_PROFILING=y +CONFIG_OPROFILE=m +CONFIG_KPROBES=y +CONFIG_MODULES=y +CONFIG_MODULE_FORCE_LOAD=y +CONFIG_MODULE_UNLOAD=y +CONFIG_MODULE_FORCE_UNLOAD=y +CONFIG_MODVERSIONS=y +# CONFIG_BLK_DEV_BSG is not set +CONFIG_ARCH_OMAP=y +CONFIG_OMAP_RESET_CLOCKS=y +CONFIG_OMAP_MUX_DEBUG=y +# CONFIG_ARCH_OMAP2 is not set +# CONFIG_ARCH_OMAP3 is not set +# CONFIG_ARCH_OMAP4 is not set +CONFIG_ARM_THUMBEE=y +CONFIG_ARM_ERRATA_720789=y +CONFIG_ARM_ARCH_TIMER=y +CONFIG_ZBOOT_ROM_TEXT=0x0 +CONFIG_ZBOOT_ROM_BSS=0x0 +CONFIG_CMDLINE="root=/dev/mmcblk0p2 rootwait console=ttyO2,115200" +CONFIG_KEXEC=y +CONFIG_AUTO_ZRELADDR=y +CONFIG_CPU_FREQ=y +CONFIG_CPU_FREQ_DEFAULT_GOV_ONDEMAND=y +CONFIG_CPU_FREQ_GOV_POWERSAVE=y +CONFIG_CPU_FREQ_GOV_USERSPACE=y +CONFIG_CPU_FREQ_GOV_CONSERVATIVE=y +CONFIG_NEON=y +CONFIG_BINFMT_MISC=y +CONFIG_PM_DEBUG=y +CONFIG_NET=y +CONFIG_PACKET=y +CONFIG_UNIX=y +CONFIG_XFRM_USER=y +CONFIG_NET_KEY=y +CONFIG_NET_KEY_MIGRATE=y +CONFIG_INET=y +CONFIG_IP_MULTICAST=y +CONFIG_IP_PNP=y +CONFIG_IP_PNP_DHCP=y +CONFIG_IP_PNP_BOOTP=y +CONFIG_IP_PNP_RARP=y +# CONFIG_INET_LRO is not set +# CONFIG_IPV6 is not set +# CONFIG_WIRELESS is not set +CONFIG_DEVTMPFS=y +CONFIG_DEVTMPFS_MOUNT=y +CONFIG_OMAP_OCP2SCP=y +CONFIG_OMAP_INTERCONNECT=y +CONFIG_CONNECTOR=y +CONFIG_BLK_DEV_LOOP=y +CONFIG_BLK_DEV_RAM=y +CONFIG_BLK_DEV_RAM_SIZE=16384 +CONFIG_EEPROM_93CX6=y +CONFIG_BLK_DEV_SD=y +CONFIG_SCSI_MULTI_LUN=y +CONFIG_SCSI_SCAN_ASYNC=y +CONFIG_ATA=y +# CONFIG_SATA_PMP is not set +CONFIG_SATA_AHCI_PLATFORM=m +# CONFIG_ATA_SFF is not set +CONFIG_NETDEVICES=y +CONFIG_MII=y +# CONFIG_NET_VENDOR_BROADCOM is not set +# CONFIG_NET_VENDOR_CIRRUS is not set +# CONFIG_NET_VENDOR_FARADAY is not set +# CONFIG_NET_VENDOR_INTEL is not set +# CONFIG_NET_VENDOR_MARVELL is not set +# CONFIG_NET_VENDOR_MICREL is not set +# CONFIG_NET_VENDOR_MICROCHIP is not set +# CONFIG_NET_VENDOR_NATSEMI is not set +# CONFIG_NET_VENDOR_SEEQ is not set +# CONFIG_NET_VENDOR_SMSC is not set +# CONFIG_NET_VENDOR_STMICRO is not set +CONFIG_TI_CPSW=y +# CONFIG_NET_VENDOR_WIZNET is not set +CONFIG_SMSC_PHY=y +# CONFIG_WLAN is not set +CONFIG_INPUT_POLLDEV=m +# CONFIG_INPUT_MOUSEDEV is not set +# CONFIG_INPUT_KEYBOARD is not set +# CONFIG_INPUT_MOUSE is not set +CONFIG_INPUT_MISC=y +CONFIG_VT_HW_CONSOLE_BINDING=y +# CONFIG_LEGACY_PTYS is not set +CONFIG_SERIAL_8250=y +CONFIG_SERIAL_8250_CONSOLE=y +CONFIG_SERIAL_8250_NR_UARTS=32 +CONFIG_SERIAL_8250_EXTENDED=y +CONFIG_SERIAL_8250_MANY_PORTS=y +CONFIG_SERIAL_8250_SHARE_IRQ=y +CONFIG_SERIAL_8250_DETECT_IRQ=y +CONFIG_SERIAL_8250_RSA=y +CONFIG_HW_RANDOM=y +CONFIG_I2C_CHARDEV=y +CONFIG_SPI=y +CONFIG_SPI_OMAP24XX=y +CONFIG_DEBUG_PINCTRL=y +CONFIG_PINCTRL_SINGLE=y +CONFIG_DEBUG_GPIO=y +CONFIG_GPIO_SYSFS=y +CONFIG_W1=y +CONFIG_POWER_SUPPLY=y +CONFIG_THERMAL=y +CONFIG_THERMAL_GOV_FAIR_SHARE=y +CONFIG_THERMAL_GOV_USER_SPACE=y +CONFIG_CPU_THERMAL=y +CONFIG_WATCHDOG=y +CONFIG_OMAP_WATCHDOG=y +CONFIG_MFD_TPS65217=y +CONFIG_REGULATOR_FIXED_VOLTAGE=y +CONFIG_REGULATOR_TPS65023=y +CONFIG_REGULATOR_TPS6507X=y +CONFIG_REGULATOR_TPS65217=y +CONFIG_USB=y +CONFIG_USB_ANNOUNCE_NEW_DEVICES=y +CONFIG_USB_SUSPEND=y +CONFIG_USB_MON=y +CONFIG_USB_MUSB_HDRC=m +CONFIG_USB_MUSB_AM35X=m +CONFIG_USB_STORAGE=y +CONFIG_USB_TEST=y +CONFIG_OMAP_USB2=m +CONFIG_OMAP_USB3=m +CONFIG_OMAP_CONTROL_USB=y +CONFIG_USB_GADGET=y +CONFIG_USB_GADGET_DEBUG=y +CONFIG_USB_GADGET_DEBUG_FILES=y +CONFIG_USB_GADGET_DEBUG_FS=y +CONFIG_USB_ZERO=m +CONFIG_USB_ETH=m +CONFIG_USB_ETH_EEM=y +CONFIG_USB_MASS_STORAGE=m +CONFIG_USB_G_MULTI=m +CONFIG_USB_G_MULTI_CDC=y +CONFIG_MMC=y +CONFIG_MMC_UNSAFE_RESUME=y +CONFIG_SDIO_UART=y +CONFIG_MMC_OMAP=y +CONFIG_NEW_LEDS=y +CONFIG_LEDS_CLASS=y +CONFIG_LEDS_GPIO=y +CONFIG_LEDS_TRIGGERS=y +CONFIG_LEDS_TRIGGER_TIMER=y +CONFIG_LEDS_TRIGGER_ONESHOT=y +CONFIG_LEDS_TRIGGER_HEARTBEAT=y +CONFIG_LEDS_TRIGGER_BACKLIGHT=y +CONFIG_LEDS_TRIGGER_CPU=y +CONFIG_LEDS_TRIGGER_GPIO=y +CONFIG_LEDS_TRIGGER_DEFAULT_ON=y +CONFIG_RTC_CLASS=y +CONFIG_RTC_DRV_OMAP=y +CONFIG_DMADEVICES=y +CONFIG_TI_EDMA=y +CONFIG_DMA_OMAP=y +CONFIG_STAGING=y +CONFIG_EXT2_FS=y +CONFIG_EXT3_FS=y +# CONFIG_EXT3_FS_XATTR is not set +CONFIG_EXT4_FS=y +CONFIG_QUOTA=y +CONFIG_QFMT_V2=y +CONFIG_MSDOS_FS=y +CONFIG_VFAT_FS=y +CONFIG_TMPFS=y +# CONFIG_MISC_FILESYSTEMS is not set +CONFIG_NLS_CODEPAGE_437=y +CONFIG_NLS_ISO8859_1=y +CONFIG_PRINTK_TIME=y +CONFIG_MAGIC_SYSRQ=y +CONFIG_SCHEDSTATS=y +CONFIG_TIMER_STATS=y +CONFIG_PROVE_LOCKING=y +# CONFIG_DEBUG_BUGVERBOSE is not set +CONFIG_DEBUG_INFO=y +CONFIG_CRYPTO_MANAGER=m +CONFIG_CRYPTO_SHA256=m +CONFIG_CRYPTO_DEFLATE=y +CONFIG_CRYPTO_LZO=y +# CONFIG_CRYPTO_ANSI_CPRNG is not set +CONFIG_CRC_CCITT=y +CONFIG_CRC_T10DIF=y +CONFIG_CRC_ITU_T=y +CONFIG_CRC7=y +CONFIG_LIBCRC32C=y +CONFIG_AVERAGE=y diff --git a/configs/beaglebone_defconfig b/configs/beaglebone_defconfig index 21770685e..38a63a17c 100644 --- a/configs/beaglebone_defconfig +++ b/configs/beaglebone_defconfig @@ -16,7 +16,7 @@ BR2_TARGET_ROOTFS_EXT2=y # lock down headers to avoid breaking with new defaults BR2_KERNEL_HEADERS_VERSION=y -BR2_DEFAULT_KERNEL_VERSION="3.2.9" +BR2_DEFAULT_KERNEL_VERSION="3.8.12" # bootloader BR2_TARGET_UBOOT=y @@ -30,7 +30,9 @@ BR2_TARGET_UBOOT_SPL_NAME="MLO" # kernel BR2_LINUX_KERNEL=y BR2_LINUX_KERNEL_CUSTOM_GIT=y -BR2_LINUX_KERNEL_CUSTOM_GIT_REPO_URL="git://github.com/koenkooi/linux.git" -BR2_LINUX_KERNEL_CUSTOM_GIT_VERSION="linux-ti33x-psp-3.2-r5a+gitr09e9651bcf2ee8d86685f2a8075bc6557b1d3b91" +BR2_LINUX_KERNEL_CUSTOM_GIT_REPO_URL="git://git.ti.com/ti-linux-kernel/ti-linux-kernel.git" +BR2_LINUX_KERNEL_CUSTOM_GIT_VERSION="935f6c2f82056d538b528272e2bdbb5c08d69a58" BR2_LINUX_KERNEL_USE_CUSTOM_CONFIG=y -BR2_LINUX_KERNEL_CUSTOM_CONFIG_FILE="board/beaglebone/linux-3.2.9.config" +BR2_LINUX_KERNEL_CUSTOM_CONFIG_FILE="board/beaglebone/linux-3.8.config" +BR2_LINUX_KERNEL_DTS_SUPPORT=y +BR2_LINUX_KERNEL_INTREE_DTS_NAME="am335x-bone" -- cgit v1.2.3 From 97fbd80efe6dd29b5d8d5393ea0a4cbc314dcfc6 Mon Sep 17 00:00:00 2001 From: Anders Darander Date: Tue, 14 May 2013 10:09:51 +0000 Subject: am33x-cm3: add FW for suspend/resume Without this firmware, the beaglebone won't be able to suspend/resume correctly. [Peter: tweak Config.in, rename init script, wrap long lines] Signed-off-by: Anders Darander Signed-off-by: Peter Korsgaard --- package/Config.in | 1 + package/am33x-cm3/Config.in | 7 +++++++ package/am33x-cm3/S93-am335x-pm-firmware-load | 6 ++++++ package/am33x-cm3/am33x-cm3.mk | 30 +++++++++++++++++++++++++++ 4 files changed, 44 insertions(+) create mode 100644 package/am33x-cm3/Config.in create mode 100755 package/am33x-cm3/S93-am335x-pm-firmware-load create mode 100644 package/am33x-cm3/am33x-cm3.mk diff --git a/package/Config.in b/package/Config.in index 1dee2ab2e..6b6ce9d10 100644 --- a/package/Config.in +++ b/package/Config.in @@ -213,6 +213,7 @@ endmenu menu "Hardware handling" menu "Misc devices firmwares" +source "package/am33x-cm3/Config.in" source "package/b43-firmware/Config.in" source "package/firmware-imx/Config.in" source "package/linux-firmware/Config.in" diff --git a/package/am33x-cm3/Config.in b/package/am33x-cm3/Config.in new file mode 100644 index 000000000..060d0efc8 --- /dev/null +++ b/package/am33x-cm3/Config.in @@ -0,0 +1,7 @@ +config BR2_PACKAGE_AM33X_CM3 + bool "am33x-cm3" + depends on BR2_arm # only relevant for TI am335x + help + Cortex-M3 binary blob for suspend-resume on am335x + + http://arago-project.org/git/projects/am33x-cm3.git diff --git a/package/am33x-cm3/S93-am335x-pm-firmware-load b/package/am33x-cm3/S93-am335x-pm-firmware-load new file mode 100755 index 000000000..56c17b334 --- /dev/null +++ b/package/am33x-cm3/S93-am335x-pm-firmware-load @@ -0,0 +1,6 @@ +#!/bin/sh + +# Load the PM CM3 firmware +echo 1 > /sys/devices/ocp.2/44d00000.wkup_m3/firmware/am335x-pm-firmware.bin/loading +cat /lib/firmware/am335x-pm-firmware.bin > /sys/devices/ocp.2/44d00000.wkup_m3/firmware/am335x-pm-firmware.bin/data +echo 0 > /sys/devices/ocp.2/44d00000.wkup_m3/firmware/am335x-pm-firmware.bin/loading diff --git a/package/am33x-cm3/am33x-cm3.mk b/package/am33x-cm3/am33x-cm3.mk new file mode 100644 index 000000000..3805c8022 --- /dev/null +++ b/package/am33x-cm3/am33x-cm3.mk @@ -0,0 +1,30 @@ +############################################################# +# +# am33x-cm3 +# +############################################################# + +AM33X_CM3_VERSION = AM335xPSP_04.06.00.10-rc1 +AM33X_CM3_SITE = http://arago-project.org/git/projects/am33x-cm3.git +AM33X_CM3_SITE_METHOD = git +AM33X_CM3_LICENSE = TI Publicly Available Software License +AM33X_CM3_LICENSE_FILES = License.txt + +# The build command below will use the standard cross-compiler (normally +# build for Cortex-A8, to build the FW for the Cortex-M3. +define AM33X_CM3_BUILD_CMDS + $(MAKE) CC="$(TARGET_CC)" CROSS_COMPILE="$(TARGET_CROSS)" -C $(@D) all +endef + +# Not all of the firmware files are used +define AM33X_CM3_INSTALL_TARGET_CMDS + $(INSTALL) -m 0644 -D $(@D)/bin/am335x-pm-firmware.bin \ + $(TARGET_DIR)/lib/firmware/am335x-pm-firmware.bin +endef + +define AM33X_CM3_INSTALL_INIT_SYSV + $(INSTALL) -m 0755 -D package/am33x-cm3/S93-am335x-pm-firmware-load \ + $(TARGET_DIR)/etc/init.d/S93-am335x-pm-firmware-load +endef + +$(eval $(generic-package)) -- cgit v1.2.3 From 0399249b76bc02e4cb1cad2edc3812f4f992ce7a Mon Sep 17 00:00:00 2001 From: Anders Darander Date: Tue, 14 May 2013 10:09:52 +0000 Subject: beaglebone: add am33x-cm3 to the build Add the FW needed for the Cortex M3 on the beaglebone. This is required for working power management. Signed-off-by: Anders Darander Signed-off-by: Peter Korsgaard --- configs/beaglebone_defconfig | 1 + 1 file changed, 1 insertion(+) diff --git a/configs/beaglebone_defconfig b/configs/beaglebone_defconfig index 38a63a17c..a14132025 100644 --- a/configs/beaglebone_defconfig +++ b/configs/beaglebone_defconfig @@ -11,6 +11,7 @@ BR2_TARGET_GENERIC_GETTY_PORT="ttyO0" # BR2_TARGET_GENERIC_REMOUNT_ROOTFS_RW is not set # filesystem +BR2_PACKAGE_AM33X_CM3=y BR2_TARGET_ROOTFS_EXT2=y # BR2_TARGET_ROOTFS_TAR is not set -- cgit v1.2.3 From 594f07e85221fcf7bf7228804e9c7499a69fd5f0 Mon Sep 17 00:00:00 2001 From: Anders Darander Date: Tue, 14 May 2013 10:09:53 +0000 Subject: beaglebone: enable NFS root support Signed-off-by: Anders Darander Signed-off-by: Peter Korsgaard --- board/beaglebone/linux-3.8.config | 2 ++ 1 file changed, 2 insertions(+) diff --git a/board/beaglebone/linux-3.8.config b/board/beaglebone/linux-3.8.config index c083c7091..42427716a 100644 --- a/board/beaglebone/linux-3.8.config +++ b/board/beaglebone/linux-3.8.config @@ -179,6 +179,8 @@ CONFIG_MSDOS_FS=y CONFIG_VFAT_FS=y CONFIG_TMPFS=y # CONFIG_MISC_FILESYSTEMS is not set +CONFIG_NFS_FS=y +CONFIG_ROOT_NFS=y CONFIG_NLS_CODEPAGE_437=y CONFIG_NLS_ISO8859_1=y CONFIG_PRINTK_TIME=y -- cgit v1.2.3 From 686d4f433b4acb7846cd8d881a03803b911d418c Mon Sep 17 00:00:00 2001 From: Markos Chandras Date: Wed, 15 May 2013 01:30:01 +0000 Subject: pixman: Version bump to 0.30.0 Signed-off-by: Markos Chandras Signed-off-by: Peter Korsgaard --- package/pixman/pixman.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package/pixman/pixman.mk b/package/pixman/pixman.mk index 607f82ef1..326f9ebb2 100644 --- a/package/pixman/pixman.mk +++ b/package/pixman/pixman.mk @@ -3,7 +3,7 @@ # pixman # ################################################################################ -PIXMAN_VERSION = 0.28.2 +PIXMAN_VERSION = 0.30.0 PIXMAN_SITE = http://xorg.freedesktop.org/releases/individual/lib PIXMAN_INSTALL_STAGING = YES PIXMAN_DEPENDENCIES = host-pkgconf -- cgit v1.2.3 From 1287492fd7d4b4fc61678e684c2adddde93a1bbc Mon Sep 17 00:00:00 2001 From: Markos Chandras Date: Sun, 19 May 2013 23:37:00 +0000 Subject: pixman: Apply upstream patch to fix compilation on MIPS Fixes: http://autobuild.buildroot.net/results/38aa4f2a2269b80226b910c46e0c9abe7dc38ff8/ Signed-off-by: Markos Chandras Signed-off-by: Peter Korsgaard --- package/pixman/pixman-loongson-cflags.patch | 38 +++++++++++++++++++++++++++++ package/pixman/pixman.mk | 2 ++ 2 files changed, 40 insertions(+) create mode 100644 package/pixman/pixman-loongson-cflags.patch diff --git a/package/pixman/pixman-loongson-cflags.patch b/package/pixman/pixman-loongson-cflags.patch new file mode 100644 index 000000000..fc53be234 --- /dev/null +++ b/package/pixman/pixman-loongson-cflags.patch @@ -0,0 +1,38 @@ +configure.ac: Verify that the Loongson MMI code can link + +The Loongson MMI code modifies -march and as a result it breaks linking +when the rest of the code is built with a different -match/-mtune. +This patch fixes the problem by trying to link the code instead of just +compiling it. This patch is already committed upstream. + +Signed-off-by: Markos Chandras + +From d77d75cc6e5de14d027d22b70389a4d0c71048b9 Mon Sep 17 00:00:00 2001 +From: Markos Chandras +Date: Wed, 15 May 2013 16:51:20 +0000 +Subject: Use AC_LINK_IFELSE to check if the Loongson MMI code can link + +The Loongson code is compiled with -march=loongson2f to enable the MMI +instructions, but binutils refuses to link object code compiled with +different -march settings, leading to link failures later in the +compile. This avoids that problem by checking if we can link code +compiled for Loongson. + +Reviewed-by: Matt Turner +Signed-off-by: Markos Chandras +--- +diff --git a/configure.ac b/configure.ac +index c43a0d2..221179f 100644 +--- a/configure.ac ++++ b/configure.ac +@@ -279,7 +279,7 @@ AC_MSG_CHECKING(whether to use Loongson MMI assembler) + + xserver_save_CFLAGS=$CFLAGS + CFLAGS=" $LS_CFLAGS $CFLAGS -I$srcdir" +-AC_COMPILE_IFELSE([AC_LANG_SOURCE([[ ++AC_LINK_IFELSE([AC_LANG_SOURCE([[ + #ifndef __mips_loongson_vector_rev + #error "Loongson Multimedia Instructions are only available on Loongson" + #endif +-- +cgit v0.9.0.2-2-gbebe diff --git a/package/pixman/pixman.mk b/package/pixman/pixman.mk index 326f9ebb2..8b35ef190 100644 --- a/package/pixman/pixman.mk +++ b/package/pixman/pixman.mk @@ -7,6 +7,8 @@ PIXMAN_VERSION = 0.30.0 PIXMAN_SITE = http://xorg.freedesktop.org/releases/individual/lib PIXMAN_INSTALL_STAGING = YES PIXMAN_DEPENDENCIES = host-pkgconf +PIXMAN_AUTORECONF = YES + # don't build gtk based demos PIXMAN_CONF_OPT = --disable-gtk -- cgit v1.2.3 From 67f4c10ce36b1a3e50d8ff8c83c72b87bd1ed683 Mon Sep 17 00:00:00 2001 From: Will Newton Date: Thu, 23 May 2013 14:12:47 +0100 Subject: udpcast: Bump version to 20120424. Signed-off-by: Will Newton Signed-off-by: Peter Korsgaard --- package/udpcast/udpcast.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package/udpcast/udpcast.mk b/package/udpcast/udpcast.mk index f900b924e..54051b942 100644 --- a/package/udpcast/udpcast.mk +++ b/package/udpcast/udpcast.mk @@ -4,7 +4,7 @@ # ############################################################# -UDPCAST_VERSION = 20071228 +UDPCAST_VERSION = 20120424 UDPCAST_SOURCE = udpcast-$(UDPCAST_VERSION).tar.gz UDPCAST_SITE = http://www.udpcast.linux.lu/download UDPCAST_CONF_ENV = $(if $(BR_LARGEFILE),ac_cv_type_stat64=yes,ac_cv_type_stat64=no) -- cgit v1.2.3 From c096b5985ab5f29a051da3645eda5aa43231bdc0 Mon Sep 17 00:00:00 2001 From: Will Newton Date: Thu, 23 May 2013 14:13:20 +0100 Subject: udpcast: Add udpcast-select-h.patch. This patch fixes the build on AArch64 (and potentially others). The patch has been submitted upstream. Signed-off-by: Will Newton Signed-off-by: Peter Korsgaard --- package/udpcast/udpcast-select-h.patch | 11 +++++++++++ 1 file changed, 11 insertions(+) create mode 100644 package/udpcast/udpcast-select-h.patch diff --git a/package/udpcast/udpcast-select-h.patch b/package/udpcast/udpcast-select-h.patch new file mode 100644 index 000000000..9a8cfc9d5 --- /dev/null +++ b/package/udpcast/udpcast-select-h.patch @@ -0,0 +1,11 @@ +--- udpcast-20120424/console.h 2005-12-22 22:59:18.000000000 +0000 ++++ udpcast-20120424.mod/console.h 2013-05-22 22:22:19.835474140 +0100 +@@ -6,6 +6,8 @@ + #include + #endif /* __MINGW32__ */ + ++#include ++ + #define prepareConsole udpc_prepareConsole + #define getConsoleFd udpc_getConsoleFd + #define restoreConsole udpc_restoreConsole -- cgit v1.2.3 From b4e7acbfdfae3c454ab8f87e630fe19d591f8a45 Mon Sep 17 00:00:00 2001 From: Markos Chandras Date: Tue, 21 May 2013 04:15:08 +0000 Subject: libsigsegv: Version bump to 2.10 Signed-off-by: Markos Chandras Signed-off-by: Peter Korsgaard --- package/libsigsegv/libsigsegv.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package/libsigsegv/libsigsegv.mk b/package/libsigsegv/libsigsegv.mk index b8f84da8d..a4be0b6da 100644 --- a/package/libsigsegv/libsigsegv.mk +++ b/package/libsigsegv/libsigsegv.mk @@ -4,7 +4,7 @@ # ############################################################# -LIBSIGSEGV_VERSION = 2.6 +LIBSIGSEGV_VERSION = 2.10 LIBSIGSEGV_SITE = $(BR2_GNU_MIRROR)/libsigsegv LIBSIGSEGV_INSTALL_STAGING = YES LIBSIGSEGV_LICENSE = GPLv2+ -- cgit v1.2.3 From 4cef036b20d10802fb939218532897195c1ad52e Mon Sep 17 00:00:00 2001 From: Will Newton Date: Tue, 21 May 2013 16:05:36 +0100 Subject: libnspr: Bump version to 4.9.6. This fixes the build for aarch64. Signed-off-by: Will Newton Signed-off-by: Peter Korsgaard --- package/libnspr/libnspr.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package/libnspr/libnspr.mk b/package/libnspr/libnspr.mk index 5b1333dc8..e934281a9 100644 --- a/package/libnspr/libnspr.mk +++ b/package/libnspr/libnspr.mk @@ -3,7 +3,7 @@ # libnspr # ############################################################# -LIBNSPR_VERSION = 4.9.2 +LIBNSPR_VERSION = 4.9.6 LIBNSPR_SOURCE = nspr-$(LIBNSPR_VERSION).tar.gz LIBNSPR_SITE = https://ftp.mozilla.org/pub/mozilla.org/nspr/releases/v$(LIBNSPR_VERSION)/src/ LIBNSPR_SUBDIR = mozilla/nsprpub -- cgit v1.2.3 From 2a37b625e2d89cf64674f320de39d743db080c03 Mon Sep 17 00:00:00 2001 From: Markos Chandras Date: Mon, 20 May 2013 22:52:04 +0000 Subject: ed: Convert to generic package infrastructure The package uses custom configure and Makefile files. Signed-off-by: Markos Chandras Signed-off-by: Peter Korsgaard --- package/ed/ed.mk | 18 +++++++++++++++++- 1 file changed, 17 insertions(+), 1 deletion(-) diff --git a/package/ed/ed.mk b/package/ed/ed.mk index 2bb8e0e28..52ae1f094 100644 --- a/package/ed/ed.mk +++ b/package/ed/ed.mk @@ -11,4 +11,20 @@ ED_CONF_OPT = CC="$(TARGET_CC)" CFLAGS="$(TARGET_CFLAGS)" \ ED_LICENSE = GPLv3+ ED_LICENSE_FILES = COPYING -$(eval $(autotools-package)) +define ED_CONFIGURE_CMDS + (cd $(@D); \ + ./configure \ + --prefix=/usr \ + $(TARGET_CONFIGURE_OPTS) \ + ) +endef + +define ED_BUILD_CMDS + $(MAKE) -C $(@D) +endef + +define ED_INSTALL_TARGET_CMDS + $(MAKE) -C $(@D) DESTDIR="$(TARGET_DIR)" install +endef + +$(eval $(generic-package)) -- cgit v1.2.3 From 14eb60e2912bc458c842d7d0110b05f0aacdc095 Mon Sep 17 00:00:00 2001 From: Peter Korsgaard Date: Sun, 26 May 2013 22:12:03 +0200 Subject: libnspr: add license info Signed-off-by: Peter Korsgaard --- package/libnspr/libnspr.mk | 2 ++ 1 file changed, 2 insertions(+) diff --git a/package/libnspr/libnspr.mk b/package/libnspr/libnspr.mk index e934281a9..71b64b94d 100644 --- a/package/libnspr/libnspr.mk +++ b/package/libnspr/libnspr.mk @@ -9,6 +9,8 @@ LIBNSPR_SITE = https://ftp.mozilla.org/pub/mozilla.org/nspr/releases/v$(LIBNSPR_ LIBNSPR_SUBDIR = mozilla/nsprpub LIBNSPR_INSTALL_STAGING = YES LIBNSPR_CONFIG_SCRIPTS = nspr-config +LIBNSPR_LICENSE = MPLv2.0 +LIBNSPR_LICENSE_FILES = mozilla/nsprpub/LICENSE # Set the host CFLAGS and LDFLAGS so NSPR does not guess wrongly LIBNSPR_CONF_ENV = HOST_CFLAGS="-g -O2" \ -- cgit v1.2.3 From 9d63d3dc3644ec65dbb0280af8d7a1854e5c4d33 Mon Sep 17 00:00:00 2001 From: Gustavo Zacarias Date: Mon, 13 May 2013 06:40:56 +0000 Subject: libnss: bump to version 3.14.3 Signed-off-by: Gustavo Zacarias Signed-off-by: Peter Korsgaard --- package/libnss/libnss.mk | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/package/libnss/libnss.mk b/package/libnss/libnss.mk index 96faf370b..8bb46e2ff 100644 --- a/package/libnss/libnss.mk +++ b/package/libnss/libnss.mk @@ -3,14 +3,17 @@ # libnss # ############################################################# -LIBNSS_VERSION = 3.12.9 + +LIBNSS_VERSION = 3.14.3 LIBNSS_SOURCE = nss-$(LIBNSS_VERSION).tar.gz LIBNSS_SITE_VERSION = $(subst .,_,$(LIBNSS_VERSION)) -LIBNSS_SITE = https://ftp.mozilla.org/pub/mozilla.org/security/nss/releases/NSS_$(LIBNSS_SITE_VERSION)_RTM/src/ +LIBNSS_SITE = https://ftp.mozilla.org/pub/mozilla.org/security/nss/releases/NSS_$(LIBNSS_SITE_VERSION)_RTM/src LIBNSS_SUBDIR = mozilla/security LIBNSS_DISTDIR = mozilla/dist LIBNSS_INSTALL_STAGING = YES LIBNSS_DEPENDENCIES = libnspr sqlite zlib +LIBNSS_LICENSE = MPLv2.0 +LIBNSS_LICENSE_FILES = mozilla/security/nss/COPYING LIBNSS_BUILD_VARS = MOZILLA_CLIENT=1 \ NSPR_INCLUDE_DIR=$(STAGING_DIR)/usr/include/nspr \ -- cgit v1.2.3 From a1b9256d376dd74ec7441d701510995cde3e0042 Mon Sep 17 00:00:00 2001 From: Patrick Ziegler Date: Wed, 15 May 2013 00:43:51 +0000 Subject: aespipe: new package Signed-off-by: Patrick Ziegler Signed-off-by: Peter Korsgaard --- package/Config.in | 1 + package/aespipe/Config.in | 9 +++++++++ package/aespipe/aespipe.mk | 12 ++++++++++++ 3 files changed, 22 insertions(+) create mode 100644 package/aespipe/Config.in create mode 100644 package/aespipe/aespipe.mk diff --git a/package/Config.in b/package/Config.in index 6b6ce9d10..de84d46cd 100644 --- a/package/Config.in +++ b/package/Config.in @@ -652,6 +652,7 @@ endmenu endmenu menu "Miscellaneous" +source "package/aespipe/Config.in" source "package/collectd/Config.in" source "package/empty/Config.in" source "package/googlefontdirectory/Config.in" diff --git a/package/aespipe/Config.in b/package/aespipe/Config.in new file mode 100644 index 000000000..ccc94c2a0 --- /dev/null +++ b/package/aespipe/Config.in @@ -0,0 +1,9 @@ +config BR2_PACKAGE_AESPIPE + bool "aespipe" + help + aespipe program is AES encrypting or decrypting pipe. It reads from + standard input and writes to standard output. It can be used to + create and restore encrypted tar or cpio archives. It can be used to + encrypt and decrypt loop-AES compatible encrypted disk images. + + http://koti.tnnet.fi/jari.ruusu/linux/ diff --git a/package/aespipe/aespipe.mk b/package/aespipe/aespipe.mk new file mode 100644 index 000000000..c901708c4 --- /dev/null +++ b/package/aespipe/aespipe.mk @@ -0,0 +1,12 @@ +############################################################# +# +# aespipe +# +############################################################# + +AESPIPE_VERSION = 2.4c +AESPIPE_SOURCE = aespipe-v$(AESPIPE_VERSION).tar.bz2 +AESPIPE_SITE = http://loop-aes.sourceforge.net/aespipe/ +AESPIPE_LICENSE = GPL + +$(eval $(autotools-package)) -- cgit v1.2.3 From 8cb59e6585b6d1f87e3418418796f15dfdbdbce3 Mon Sep 17 00:00:00 2001 From: Simon Dawson Date: Sun, 19 May 2013 09:58:12 +0000 Subject: Remove spurious POST_UNINSTALL hook usage A couple of patches make use of XXX_POST_UNINSTALL_TARGET_HOOKS, which is not a hook set that Buildroot actually supports. Signed-off-by: Simon Dawson Signed-off-by: Peter Korsgaard --- package/ccid/ccid.mk | 7 ------- package/xenomai/xenomai.mk | 10 ---------- 2 files changed, 17 deletions(-) diff --git a/package/ccid/ccid.mk b/package/ccid/ccid.mk index a9e58d17e..51c3887fa 100644 --- a/package/ccid/ccid.mk +++ b/package/ccid/ccid.mk @@ -19,11 +19,4 @@ endef CCID_POST_INSTALL_TARGET_HOOKS += CCID_INSTALL_UDEV_RULES endif -define CCID_REMOVE_UDEV_RULES - if test -d $(TARGET_DIR)/etc/udev/rules.d ; then \ - rm -f $(TARGET_DIR)/etc/udev/rules.d/92_pcscd_ccid.rules ; \ - fi; -endef -CCID_POST_UNINSTALL_TARGET_HOOKS += CCID_REMOVE_UDEV_RULES - $(eval $(autotools-package)) diff --git a/package/xenomai/xenomai.mk b/package/xenomai/xenomai.mk index fbf20b5a5..720b22d57 100644 --- a/package/xenomai/xenomai.mk +++ b/package/xenomai/xenomai.mk @@ -108,14 +108,4 @@ endef XENOMAI_POST_INSTALL_TARGET_HOOKS += XENOMAI_INSTALL_UDEV_RULES endif # udev -define XENOMAI_REMOVE_UDEV_RULES - if test -d $(TARGET_DIR)/etc/udev/rules.d ; then \ - for f in $(@D)/ksrc/nucleus/udev/*.rules ; do \ - rm -f $(TARGET_DIR)/etc/udev/rules.d/$$f ; \ - done ; \ - fi; -endef - -XENOMAI_POST_UNINSTALL_TARGET_HOOKS += XENOMAI_REMOVE_UDEV_RULES - $(eval $(autotools-package)) -- cgit v1.2.3 From d67b3a54af65ab4818a891458d2d59f91f239f99 Mon Sep 17 00:00:00 2001 From: Tzu-Jung Lee Date: Sun, 26 May 2013 10:40:25 +0000 Subject: skeleton: add default login port to /etc/securetty We ran into a "Login incorrect" problem when running the same rootfs image across platforms with different loging ports ttyS0/1/2/3. Simply assignning "console" to BR2_TARGET_GENERIC_GETTY_PORT, which in turn modifies the /etc/inittab, is not enough because the "console" device was missing in the /etc/securetty. While current securetty has enumerated a lot of ttys, this patch should save some efforts to enumerate more. [Peter: guard with single quotes] Signed-off-by: Tzu-Jung Lee Signed-off-by: Spenser Gilliland Acked-by: Arnout Vandecappelle (Essensium/Mind) Signed-off-by: Peter Korsgaard --- support/scripts/graph-depends | 1 + system/system.mk | 8 ++++++++ 2 files changed, 9 insertions(+) diff --git a/support/scripts/graph-depends b/support/scripts/graph-depends index 180c81d94..3bab725cd 100755 --- a/support/scripts/graph-depends +++ b/support/scripts/graph-depends @@ -161,6 +161,7 @@ def remove_redundant_deps(deps): return newdeps TARGET_EXCEPTIONS = [ + "target-generic-securetty", "target-generic-issue", "target-generic-getty-busybox", "target-generic-do-remount-rw", diff --git a/system/system.mk b/system/system.mk index 44a33ae61..50c86ad60 100644 --- a/system/system.mk +++ b/system/system.mk @@ -9,6 +9,10 @@ TARGET_GENERIC_GETTY:=$(call qstrip,$(BR2_TARGET_GENERIC_GETTY_PORT)) TARGET_GENERIC_GETTY_BAUDRATE:=$(call qstrip,$(BR2_TARGET_GENERIC_GETTY_BAUDRATE)) TARGET_GENERIC_GETTY_TERM:=$(call qstrip,$(BR2_TARGET_GENERIC_GETTY_TERM)) +target-generic-securetty: + grep -q '^$(TARGET_GENERIC_GETTY)$$' $(TARGET_DIR)/etc/securetty || \ + echo '$(TARGET_GENERIC_GETTY)' >> $(TARGET_DIR)/etc/securetty + target-generic-hostname: mkdir -p $(TARGET_DIR)/etc echo "$(TARGET_GENERIC_HOSTNAME)" > $(TARGET_DIR)/etc/hostname @@ -40,6 +44,10 @@ target-generic-do-remount-rw: target-generic-dont-remount-rw: $(SED) '/^[^#].*# REMOUNT_ROOTFS_RW$$/s~^~#~' $(TARGET_DIR)/etc/inittab +ifneq ($(TARGET_GENERIC_GETTY),) +TARGETS += target-generic-securetty +endif + ifneq ($(TARGET_GENERIC_HOSTNAME),) TARGETS += target-generic-hostname endif -- cgit v1.2.3 From 6c183aed401f7228ba6667e170c0642d86706e0f Mon Sep 17 00:00:00 2001 From: Sagaert Johan Date: Sun, 26 May 2013 09:38:32 +0000 Subject: git: new package [Peter: needs largefile, fix license info] Signed-off-by: Sagaert Johan Signed-off-by: Spenser Gilliland Signed-off-by: Peter Korsgaard --- package/Config.in | 1 + package/git/Config.in | 11 +++++++++ package/git/git.mk | 63 +++++++++++++++++++++++++++++++++++++++++++++++++++ 3 files changed, 75 insertions(+) create mode 100644 package/git/Config.in create mode 100644 package/git/git.mk diff --git a/package/Config.in b/package/Config.in index de84d46cd..52a073520 100644 --- a/package/Config.in +++ b/package/Config.in @@ -74,6 +74,7 @@ source "package/gawk/Config.in" endif source "toolchain/gcc/Config.in.2" source "package/gettext/Config.in" +source "package/git/Config.in" source "package/gperf/Config.in" if BR2_PACKAGE_BUSYBOX_SHOW_OTHERS source "package/grep/Config.in" diff --git a/package/git/Config.in b/package/git/Config.in new file mode 100644 index 000000000..31e5ffe5d --- /dev/null +++ b/package/git/Config.in @@ -0,0 +1,11 @@ +config BR2_PACKAGE_GIT + bool "git" + depends on BR2_LARGEFILE + help + Git is a free and open source distributed version control system + designed to handle everything from small to very large projects. + + http://git-scm.com + +comment "git requires a toolchain with LARGEFILE support" + depends on !BR2_LARGEFILE diff --git a/package/git/git.mk b/package/git/git.mk new file mode 100644 index 000000000..408456bc9 --- /dev/null +++ b/package/git/git.mk @@ -0,0 +1,63 @@ +############################################################# +# +# git +# +############################################################# + +GIT_VERSION = 1.8.3 +GIT_SITE = http://git-core.googlecode.com/files/ +GIT_LICENSE = GPLv2 LGPLv2.1+ +GIT_LICENSE_FILES = COPYING LGPL-2.1 + +ifeq ($(BR2_PACKAGE_ZLIB),y) + GIT_DEPENDENCIES += zlib +endif + +ifeq ($(BR2_PACKAGE_OPENSSL),y) + GIT_DEPENDENCIES += openssl + GIT_CONF_OPT += --with-openssl +else + GIT_CONF_OPT += --without-openssl +endif + +ifeq ($(BR2_PACKAGE_PERL),y) + GIT_DEPENDENCIES += perl + GIT_CONF_OPT += --with-libpcre +else + GIT_CONF_OPT += --without-libpcre +endif + +ifeq ($(BR2_PACKAGE_CURL),y) + GIT_DEPENDENCIES += curl + GIT_CONF_OPT += --with-curl +else + GIT_CONF_OPT += --without-curl +endif + +ifeq ($(BR2_PACKAGE_EXPAT),y) + GIT_DEPENDENCIES += expat + GIT_CONF_OPT += --with-expat +else + GIT_CONF_OPT += --without-expat +endif + +ifeq ($(BR2_PACKAGE_LIBICONV),y) + GIT_DEPENDENCIES += libiconv + GIT_CONF_OPT += --with-iconv=/usr/lib +else + GIT_CONF_OPT += --without-iconv +endif + +ifeq ($(BR2_PACKAGE_TCL),y) + GIT_DEPENDENCIES += tcl + GIT_CONF_OPT += --with-tcltk +else + GIT_CONF_OPT += --without-tcltk +endif + +# assume yes for these tests, configure will bail out otherwise +# saying error: cannot run test program while cross compiling +GIT_CONF_ENV = ac_cv_fread_reads_directories=yes \ + ac_cv_snprintf_returns_bogus=yes + +$(eval $(autotools-package)) -- cgit v1.2.3 From b05e74ff92b6728369e1540fc0a2bd60025f2146 Mon Sep 17 00:00:00 2001 From: Will Newton Date: Sun, 26 May 2013 12:08:11 +0000 Subject: numactl: new package [Thomas: updated to 2.0.8, restricted to supported architectures, added licensing informations, updated to latest Buildroot package infrastructure] [Peter: Fix LICENSE_FILES typo, needs largefile support in toolchain] Signed-off-by: Will Newton Signed-off-by: Thomas Petazzoni Signed-off-by: Peter Korsgaard --- package/Config.in | 1 + package/numactl/Config.in | 16 ++++++++++++++++ package/numactl/numactl.mk | 21 +++++++++++++++++++++ 3 files changed, 38 insertions(+) create mode 100644 package/numactl/Config.in create mode 100644 package/numactl/numactl.mk diff --git a/package/Config.in b/package/Config.in index 52a073520..8bf1652cb 100644 --- a/package/Config.in +++ b/package/Config.in @@ -859,6 +859,7 @@ source "package/module-init-tools/Config.in" endif source "package/monit/Config.in" source "package/ncdu/Config.in" +source "package/numactl/Config.in" source "package/polkit/Config.in" if BR2_PACKAGE_BUSYBOX_SHOW_OTHERS source "package/procps/Config.in" diff --git a/package/numactl/Config.in b/package/numactl/Config.in new file mode 100644 index 000000000..21e76fb99 --- /dev/null +++ b/package/numactl/Config.in @@ -0,0 +1,16 @@ +config BR2_PACKAGE_NUMACTL + bool "numactl" + # numactl uses some system calls that are not available on all + # architectures. + depends on BR2_LARGEFILE + depends on BR2_i386 || BR2_mips || BR2_mipsel || \ + BR2_mips64 || BR2_mips64el || BR2_powerpc || BR2_x86_64 + help + numactl allows you to run your application on specific cpus + and memory nodes. It does this by supplying a NUMA memory + policy to the operating system before running your program. + + http://oss.sgi.com/projects/libnuma/ + +comment "numactl requires a toolchain with LARGEFILE support" + depends on !BR2_LARGEFILE diff --git a/package/numactl/numactl.mk b/package/numactl/numactl.mk new file mode 100644 index 000000000..fe6f23f74 --- /dev/null +++ b/package/numactl/numactl.mk @@ -0,0 +1,21 @@ +############################################################# +# +# numactl +# +############################################################# + +NUMACTL_VERSION = 2.0.8 +NUMACTL_SOURCE = numactl-$(NUMACTL_VERSION).tar.gz +NUMACTL_SITE = ftp://oss.sgi.com/www/projects/libnuma/download/ +NUMACTL_LICENSE = LGPLv2.1 (libnuma), GPLv2 (programs) +NUMACTL_LICENSE_FILES = README + +define NUMACTL_BUILD_CMDS + $(MAKE) $(TARGET_CONFIGURE_OPTS) -C $(@D) +endef + +define NUMACTL_INSTALL_TARGET_CMDS + $(MAKE) prefix=$(TARGET_DIR) libdir=$(TARGET_DIR)/lib -C $(@D) install +endef + +$(eval $(generic-package)) -- cgit v1.2.3 From a5ee03b252906f4a3533566dad170a16d9d6125f Mon Sep 17 00:00:00 2001 From: Thomas Petazzoni Date: Sun, 26 May 2013 12:08:12 +0000 Subject: dropbear: factorize the 'depends on BR2_PACKAGE_DROPBEAR' Enclose all dropbear sub-options into a 'if BR2_PACKAGE_DROPBEAR' ... 'endif' block rather than having 'depends on BR2_PACKAGE_DROPBEAR' for each option. Signed-off-by: Thomas Petazzoni Signed-off-by: Peter Korsgaard --- package/dropbear/Config.in | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/package/dropbear/Config.in b/package/dropbear/Config.in index 0903ad160..68c3b71aa 100644 --- a/package/dropbear/Config.in +++ b/package/dropbear/Config.in @@ -6,9 +6,10 @@ config BR2_PACKAGE_DROPBEAR http://matt.ucc.asn.au/dropbear/dropbear.html +if BR2_PACKAGE_DROPBEAR + config BR2_PACKAGE_DROPBEAR_DISABLE_REVERSEDNS bool "disable reverse DNS lookups" - depends on BR2_PACKAGE_DROPBEAR help Disable reverse DNS lookups on connection. This can be handy on systems without working DNS, as connections otherwise @@ -17,7 +18,6 @@ config BR2_PACKAGE_DROPBEAR_DISABLE_REVERSEDNS config BR2_PACKAGE_DROPBEAR_SMALL bool "optimize for size" default y - depends on BR2_PACKAGE_DROPBEAR help Compile dropbear for the smallest possible binary size. @@ -26,14 +26,14 @@ config BR2_PACKAGE_DROPBEAR_SMALL config BR2_PACKAGE_DROPBEAR_WTMP bool "log dropbear access to wtmp" - depends on BR2_PACKAGE_DROPBEAR help Enable logging of dropbear access to wtmp. Notice that Buildroot does not generate wtmp by default. config BR2_PACKAGE_DROPBEAR_LASTLOG bool "log dropbear access to lastlog" - depends on BR2_PACKAGE_DROPBEAR help Enable logging of dropbear access to lastlog. Notice that Buildroot does not generate lastlog by default. + +endif -- cgit v1.2.3 From 786700eebea40147b88a4d96bd56504bf51241b2 Mon Sep 17 00:00:00 2001 From: Fabio Porcedda Date: Sun, 26 May 2013 12:08:19 +0000 Subject: toolchain-external: add support for 'Sourcery CodeBench ARM 2013.05' Signed-off-by: Fabio Porcedda Signed-off-by: Thomas Petazzoni Signed-off-by: Peter Korsgaard --- toolchain/toolchain-external/Config.in | 25 +++++++++++++++++++++++++ toolchain/toolchain-external/ext-tool.mk | 3 +++ 2 files changed, 28 insertions(+) diff --git a/toolchain/toolchain-external/Config.in b/toolchain/toolchain-external/Config.in index a93ada32e..5fdd27b7a 100644 --- a/toolchain/toolchain-external/Config.in +++ b/toolchain/toolchain-external/Config.in @@ -64,6 +64,30 @@ comment "Linaro toolchains available for Cortex-A{5,8,9,15}" depends on BR2_arm depends on !BR2_cortex_a5 && !BR2_cortex_a8 && !BR2_cortex_a9 && !BR2_cortex_a15 +config BR2_TOOLCHAIN_EXTERNAL_CODESOURCERY_ARM201305 + bool "Sourcery CodeBench ARM 2013.05" + depends on BR2_arm + depends on BR2_HOSTARCH = "x86_64" || BR2_HOSTARCH = "x86" + select BR2_TOOLCHAIN_EXTERNAL_GLIBC + select BR2_TOOLCHAIN_HAS_NATIVE_RPC + select BR2_INSTALL_LIBSTDCPP + select BR2_HOSTARCH_NEEDS_IA32_LIBS + help + Sourcery CodeBench toolchain for the ARM architecture, from + Mentor Graphics. It uses gcc 4.7.3, binutils 2.23.52, glibc + 2.17 and gdb 7.4.50, kernel headers 3.8.2. It has support + for the following variants: + - ARMv5TE, little endian, soft-float, glibc + Select ARM926T, ARM10T, XScale or another ARMv5 core + Select BR2_SOFT_FLOAT + - ARMv4T, little endian, soft-float, glibc + Select ARM720T, ARM920T, ARM922T or another ARMv4 core + Select BR2_SOFT_FLOAT + - ARMv7-A, Thumb 2, little endian, soft-float, glibc + Select Cortex-A8, Cortex-A9 or another ARMv7-A core + Select BR2_SOFT_FLOAT + Set BR2_TARGET_OPTIMIZATION to -mthumb + config BR2_TOOLCHAIN_EXTERNAL_CODESOURCERY_ARM201203 bool "Sourcery CodeBench ARM 2012.03" depends on BR2_arm @@ -764,6 +788,7 @@ config BR2_TOOLCHAIN_EXTERNAL_PREFIX default "arm-none-linux-gnueabi" if BR2_TOOLCHAIN_EXTERNAL_CODESOURCERY_ARM201103 default "arm-none-linux-gnueabi" if BR2_TOOLCHAIN_EXTERNAL_CODESOURCERY_ARM201109 default "arm-none-linux-gnueabi" if BR2_TOOLCHAIN_EXTERNAL_CODESOURCERY_ARM201203 + default "arm-none-linux-gnueabi" if BR2_TOOLCHAIN_EXTERNAL_CODESOURCERY_ARM201305 default "aarch64-linux-gnu" if BR2_TOOLCHAIN_EXTERNAL_LINARO_AARCH64_13_03 default "aarch64-linux-gnu" if BR2_TOOLCHAIN_EXTERNAL_LINARO_AARCH64_13_02 default "aarch64-linux-gnu" if BR2_TOOLCHAIN_EXTERNAL_LINARO_AARCH64_13_01 diff --git a/toolchain/toolchain-external/ext-tool.mk b/toolchain/toolchain-external/ext-tool.mk index bf2bee868..b6532fcf5 100644 --- a/toolchain/toolchain-external/ext-tool.mk +++ b/toolchain/toolchain-external/ext-tool.mk @@ -200,6 +200,9 @@ TOOLCHAIN_EXTERNAL_SOURCE=arm-2011.09-70-arm-none-linux-gnueabi-i686-pc-linux-gn else ifeq ($(BR2_TOOLCHAIN_EXTERNAL_CODESOURCERY_ARM201203),y) TOOLCHAIN_EXTERNAL_SITE=http://sourcery.mentor.com/public/gnu_toolchain/arm-none-linux-gnueabi/ TOOLCHAIN_EXTERNAL_SOURCE=arm-2012.03-57-arm-none-linux-gnueabi-i686-pc-linux-gnu.tar.bz2 +else ifeq ($(BR2_TOOLCHAIN_EXTERNAL_CODESOURCERY_ARM201305),y) +TOOLCHAIN_EXTERNAL_SITE=http://sourcery.mentor.com/public/gnu_toolchain/arm-none-linux-gnueabi/ +TOOLCHAIN_EXTERNAL_SOURCE=arm-2013.05-24-arm-none-linux-gnueabi-i686-pc-linux-gnu.tar.bz2 else ifeq ($(BR2_TOOLCHAIN_EXTERNAL_LINARO_2013_01),y) TOOLCHAIN_EXTERNAL_SITE=https://launchpad.net/linaro-toolchain-binaries/trunk/2013.01/+download/ TOOLCHAIN_EXTERNAL_SOURCE=gcc-linaro-arm-linux-gnueabihf-4.7-2013.01-20130125_linux.tar.bz2 -- cgit v1.2.3 From 9af20485d4f91263f2197fa9e3cac05d67ccdf92 Mon Sep 17 00:00:00 2001 From: Fabio Porcedda Date: Sun, 26 May 2013 12:08:20 +0000 Subject: toolchain-external: remove support for 'Sourcery CodeBench ARM 2011.03' Signed-off-by: Fabio Porcedda Signed-off-by: Thomas Petazzoni Signed-off-by: Peter Korsgaard --- toolchain/toolchain-external/Config.in | 25 ------------------------- toolchain/toolchain-external/ext-tool.mk | 5 +---- 2 files changed, 1 insertion(+), 29 deletions(-) diff --git a/toolchain/toolchain-external/Config.in b/toolchain/toolchain-external/Config.in index 5fdd27b7a..515c08674 100644 --- a/toolchain/toolchain-external/Config.in +++ b/toolchain/toolchain-external/Config.in @@ -276,30 +276,6 @@ config BR2_TOOLCHAIN_EXTERNAL_CODESOURCERY_MIPS201203 - MIPS32 little endian soft float uclibc Not usable in Buildroot yet. -config BR2_TOOLCHAIN_EXTERNAL_CODESOURCERY_ARM201103 - bool "Sourcery CodeBench ARM 2011.03" - depends on BR2_arm - depends on BR2_HOSTARCH = "x86_64" || BR2_HOSTARCH = "x86" - select BR2_TOOLCHAIN_EXTERNAL_GLIBC - select BR2_TOOLCHAIN_HAS_NATIVE_RPC - select BR2_INSTALL_LIBSTDCPP - select BR2_HOSTARCH_NEEDS_IA32_LIBS - help - Sourcery CodeBench toolchain for the ARM architecture, from - Mentor Graphics. It uses gcc 4.5.2, binutils 2.20.51, glibc - 2.13 and gdb 7.2.50, kernel headers 2.6.38. It has support - for the following variants: - - ARMv5TE, little endian, soft-float, glibc - Select ARM926T, ARM10T, XScale or another ARMv5 core - Select BR2_SOFT_FLOAT - - ARMv4T, little endian, soft-float, glibc - Select ARM720T, ARM920T, ARM922T or another ARMv4 core - Select BR2_SOFT_FLOAT - - ARMv7-A, Thumb 2, little endian, soft-float, glibc - Select Cortex-A8, Cortex-A9 or another ARMv7-A core - Select BR2_SOFT_FLOAT - Set BR2_TARGET_OPTIMIZATION to -mthumb - config BR2_TOOLCHAIN_EXTERNAL_CODESOURCERY_MIPS201109 bool "Sourcery CodeBench MIPS 2011.09" depends on BR2_mips || BR2_mipsel @@ -785,7 +761,6 @@ config BR2_TOOLCHAIN_EXTERNAL_PREFIX default "arm-linux-gnueabihf" if BR2_TOOLCHAIN_EXTERNAL_LINARO_2013_03 default "arm-linux-gnueabihf" if BR2_TOOLCHAIN_EXTERNAL_LINARO_2013_02 default "arm-linux-gnueabihf" if BR2_TOOLCHAIN_EXTERNAL_LINARO_2013_01 - default "arm-none-linux-gnueabi" if BR2_TOOLCHAIN_EXTERNAL_CODESOURCERY_ARM201103 default "arm-none-linux-gnueabi" if BR2_TOOLCHAIN_EXTERNAL_CODESOURCERY_ARM201109 default "arm-none-linux-gnueabi" if BR2_TOOLCHAIN_EXTERNAL_CODESOURCERY_ARM201203 default "arm-none-linux-gnueabi" if BR2_TOOLCHAIN_EXTERNAL_CODESOURCERY_ARM201305 diff --git a/toolchain/toolchain-external/ext-tool.mk b/toolchain/toolchain-external/ext-tool.mk index b6532fcf5..b18f9adb5 100644 --- a/toolchain/toolchain-external/ext-tool.mk +++ b/toolchain/toolchain-external/ext-tool.mk @@ -191,10 +191,7 @@ ifeq ($(BR2_TOOLCHAIN_EXTERNAL_DOWNLOAD),y) TOOLCHAIN_EXTERNAL_DEPENDENCIES = $(TOOLCHAIN_EXTERNAL_DIR)/.extracted endif -ifeq ($(BR2_TOOLCHAIN_EXTERNAL_CODESOURCERY_ARM201103),y) -TOOLCHAIN_EXTERNAL_SITE=http://sourcery.mentor.com/public/gnu_toolchain/arm-none-linux-gnueabi/ -TOOLCHAIN_EXTERNAL_SOURCE=arm-2011.03-41-arm-none-linux-gnueabi-i686-pc-linux-gnu.tar.bz2 -else ifeq ($(BR2_TOOLCHAIN_EXTERNAL_CODESOURCERY_ARM201109),y) +ifeq ($(BR2_TOOLCHAIN_EXTERNAL_CODESOURCERY_ARM201109),y) TOOLCHAIN_EXTERNAL_SITE=http://sourcery.mentor.com/public/gnu_toolchain/arm-none-linux-gnueabi/ TOOLCHAIN_EXTERNAL_SOURCE=arm-2011.09-70-arm-none-linux-gnueabi-i686-pc-linux-gnu.tar.bz2 else ifeq ($(BR2_TOOLCHAIN_EXTERNAL_CODESOURCERY_ARM201203),y) -- cgit v1.2.3 From e76dadc86ef9b7c80ae763d26d62e0bd42a24bd2 Mon Sep 17 00:00:00 2001 From: Carlo Caione Date: Sun, 26 May 2013 12:08:21 +0000 Subject: sunxi-tools: new host/target package [Peter: Fix Config.in wordwrap and trailing lines] Signed-off-by: Carlo Caione Signed-off-by: Thomas Petazzoni Signed-off-by: Peter Korsgaard --- package/Config.in | 1 + package/Config.in.host | 1 + package/sunxi-tools/Config.in | 9 +++++++++ package/sunxi-tools/Config.in.host | 12 ++++++++++++ package/sunxi-tools/sunxi-tools.mk | 37 +++++++++++++++++++++++++++++++++++++ 5 files changed, 60 insertions(+) create mode 100644 package/sunxi-tools/Config.in create mode 100644 package/sunxi-tools/Config.in.host create mode 100644 package/sunxi-tools/sunxi-tools.mk diff --git a/package/Config.in b/package/Config.in index 8bf1652cb..28c2c5c9c 100644 --- a/package/Config.in +++ b/package/Config.in @@ -208,6 +208,7 @@ source "package/ntfs-3g/Config.in" source "package/squashfs/Config.in" source "package/squashfs3/Config.in" source "package/sshfs/Config.in" +source "package/sunxi-tools/Config.in" source "package/unionfs/Config.in" source "package/xfsprogs/Config.in" endmenu diff --git a/package/Config.in.host b/package/Config.in.host index 7c0dd201f..54178ea4f 100644 --- a/package/Config.in.host +++ b/package/Config.in.host @@ -10,6 +10,7 @@ source "package/mtools/Config.in.host" source "package/omap-u-boot-utils/Config.in.host" source "package/openocd/Config.in.host" source "package/sam-ba/Config.in.host" +source "package/sunxi-tools/Config.in.host" source "package/uboot-tools/Config.in.host" endmenu diff --git a/package/sunxi-tools/Config.in b/package/sunxi-tools/Config.in new file mode 100644 index 000000000..16bf2dc57 --- /dev/null +++ b/package/sunxi-tools/Config.in @@ -0,0 +1,9 @@ +config BR2_PACKAGE_SUNXI_TOOLS + bool "sunxi nand-part" + depends on BR2_arm + help + nand-part is part of sunxi-tools for Allwinner A10 (aka sun4i) and + A13 (aka sun5i) based devices. It is a tool to repartition the + internal NAND on sunxi devices. + + http://linux-sunxi.org/Sunxi-tools diff --git a/package/sunxi-tools/Config.in.host b/package/sunxi-tools/Config.in.host new file mode 100644 index 000000000..5fab5e6ff --- /dev/null +++ b/package/sunxi-tools/Config.in.host @@ -0,0 +1,12 @@ +config BR2_PACKAGE_HOST_SUNXI_TOOLS + bool "host sunxi-tools" + depends on BR2_arm + help + Tools for Allwinner A10 (aka sun4i) and A13 (aka sun5i) + based devices. This includes fex2bin which can be used to + compile .fex board definition files to the binary script.bin + format required by the linux-sunxi kernel. These tools are + specific for linux-sunxi kernel and do not apply to the + mainline Linux kernel version. + + http://linux-sunxi.org/Sunxi-tools diff --git a/package/sunxi-tools/sunxi-tools.mk b/package/sunxi-tools/sunxi-tools.mk new file mode 100644 index 000000000..a97dfcbb0 --- /dev/null +++ b/package/sunxi-tools/sunxi-tools.mk @@ -0,0 +1,37 @@ +############################################################# +# +# sunxi-tools +# +############################################################# + +SUNXI_TOOLS_VERSION = 3a94e721dd8d1e13d0b25da0a83463891e8e9ee0 +SUNXI_TOOLS_SITE = http://github.com/linux-sunxi/sunxi-tools/tarball/master +SUNXI_TOOLS_LICENSE = GPLv2+ +SUNXI_TOOLS_LICENSE_FILES = COPYING +HOST_SUNXI_TOOLS_DEPENDENCIES = host-libusb +FEX2BIN = $(HOST_DIR)/usr/bin/fex2bin + +define HOST_SUNXI_TOOLS_BUILD_CMDS + $(HOST_MAKE_ENV) $(MAKE) $(HOST_CONFIGURE_OPTS) \ + CFLAGS="$(HOST_CFLAGS) -std=c99 -D_POSIX_C_SOURCE=200112L -Iinclude/" \ + -C $(@D) +endef + +define HOST_SUNXI_TOOLS_INSTALL_CMDS + for i in fexc bin2fex fex2bin bootinfo fel pio; do \ + $(INSTALL) -D -m 0755 $(@D)/$$i $(HOST_DIR)/usr/bin/$$i ; \ + done +endef + +define SUNXI_TOOLS_BUILD_CMDS + $(TARGET_MAKE_ENV) $(MAKE) $(TARGET_CONFIGURE_OPTS) \ + CFLAGS="$(TARGET_CFLAGS) -std=c99 -D_POSIX_C_SOURCE=200112L -Iinclude/" \ + -C $(@D) nand-part +endef + +define SUNXI_TOOLS_INSTALL_TARGET_CMDS + $(INSTALL) -D -m 0755 $(@D)/nand-part $(TARGET_DIR)/usr/bin/nand-part +endef + +$(eval $(generic-package)) +$(eval $(host-generic-package)) -- cgit v1.2.3 From 2296afed5bf433836b17491aca474622aa9f5420 Mon Sep 17 00:00:00 2001 From: Jerzy Grzegorek Date: Tue, 28 May 2013 00:55:42 +0000 Subject: acl: bump to version 2.2.52 Signed-off-by: Jerzy Grzegorek Signed-off-by: Peter Korsgaard --- package/acl/acl.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package/acl/acl.mk b/package/acl/acl.mk index e7a654c4d..f2b282892 100644 --- a/package/acl/acl.mk +++ b/package/acl/acl.mk @@ -4,7 +4,7 @@ # ############################################################# -ACL_VERSION = 2.2.51 +ACL_VERSION = 2.2.52 ACL_SOURCE = acl-$(ACL_VERSION).src.tar.gz ACL_SITE = http://download.savannah.gnu.org/releases/acl ACL_INSTALL_STAGING = YES -- cgit v1.2.3 From fee470d0d3e236b78f7cd0cfbccb40e4ab0e0a48 Mon Sep 17 00:00:00 2001 From: Jerzy Grzegorek Date: Tue, 28 May 2013 02:01:18 +0000 Subject: attr: bump to version 2.4.47 The attr-0001-attr-Fix-static-build-installation.patch has been integrated in the new upstream version. Signed-off-by: Jerzy Grzegorek Signed-off-by: Peter Korsgaard --- ...r-0001-attr-Fix-static-build-installation.patch | 30 ---------------------- package/attr/attr.mk | 2 +- 2 files changed, 1 insertion(+), 31 deletions(-) delete mode 100644 package/attr/attr-0001-attr-Fix-static-build-installation.patch diff --git a/package/attr/attr-0001-attr-Fix-static-build-installation.patch b/package/attr/attr-0001-attr-Fix-static-build-installation.patch deleted file mode 100644 index ed51dbb4d..000000000 --- a/package/attr/attr-0001-attr-Fix-static-build-installation.patch +++ /dev/null @@ -1,30 +0,0 @@ -From 1d510e6049e7c7cb7ed4e87780b2c1a997d47b64 Mon Sep 17 00:00:00 2001 -From: Thomas Petazzoni -Date: Sat, 17 Nov 2012 19:36:39 +0100 -Subject: [PATCH] attr: Fix static build installation - -When doing a static build the .lai file is not created, so do not try -to install it. - -Signed-off-by: Thomas Petazzoni ---- - include/buildmacros | 3 +-- - 1 file changed, 1 insertion(+), 2 deletions(-) - -diff --git a/include/buildmacros b/include/buildmacros -index ab89182..d81e62b 100644 ---- a/include/buildmacros -+++ b/include/buildmacros -@@ -98,8 +98,7 @@ endif - - INSTALL_LTLIB_STATIC = \ - cd $(TOPDIR)/$(LIBNAME)/.libs; \ -- ../$(INSTALL) -m 755 -d $(PKG_DEVLIB_DIR); \ -- ../$(INSTALL) -m 644 -T old_lib $(LIBNAME).lai $(PKG_DEVLIB_DIR) -+ ../$(INSTALL) -m 755 -d $(PKG_DEVLIB_DIR); - - INSTALL_MAN = \ - @for d in $(MAN_PAGES); do \ --- -1.7.9.5 - diff --git a/package/attr/attr.mk b/package/attr/attr.mk index 288052d35..2b670101d 100644 --- a/package/attr/attr.mk +++ b/package/attr/attr.mk @@ -4,7 +4,7 @@ # ############################################################# -ATTR_VERSION = 2.4.46 +ATTR_VERSION = 2.4.47 ATTR_SOURCE = attr-$(ATTR_VERSION).src.tar.gz ATTR_SITE = http://download.savannah.gnu.org/releases/attr ATTR_INSTALL_STAGING = YES -- cgit v1.2.3 From adaff0dfeac2964c8cc15d9d9b900d7f69abc23c Mon Sep 17 00:00:00 2001 From: Thomas Petazzoni Date: Mon, 27 May 2013 13:03:45 +0000 Subject: gdb: apply post-patch hook on both the host and target builds When a Xtensa specific patch needs to be applied, it should be applied both when doing the target and the host build. This change is part of the effort to remove the differences between host and target post-extract and post-patch hooks, that are problematic for the out-of-tree support. Signed-off-by: Thomas Petazzoni Signed-off-by: Peter Korsgaard --- package/gdb/gdb.mk | 1 + 1 file changed, 1 insertion(+) diff --git a/package/gdb/gdb.mk b/package/gdb/gdb.mk index 398ef7bbe..5f4a7534f 100644 --- a/package/gdb/gdb.mk +++ b/package/gdb/gdb.mk @@ -48,6 +48,7 @@ define GDB_XTENSA_PRE_PATCH tar xf $(BR2_XTENSA_OVERLAY_DIR)/xtensa_$(XTENSA_CORE_NAME).tar \ -C $(@D) --strip-components=1 gdb endef +GDB_PRE_PATCH_HOOKS += GDB_XTENSA_PRE_PATCH HOST_GDB_PRE_PATCH_HOOKS += GDB_XTENSA_PRE_PATCH endif -- cgit v1.2.3 From 28cae90247bb2ce164eda37cd5cef41dd9e80108 Mon Sep 17 00:00:00 2001 From: Thomas Petazzoni Date: Mon, 27 May 2013 13:00:59 +0000 Subject: bzip2: improve the packaging Instead of doing some nasty SED tricks, use a patch that modifies the bzip2 build system to make it a little bit nicer. Those SEDs were made differently for the host and target packages, which is contrary to the logic of not having any difference in the source tree between the host build and the target build. This commit also makes sure that bzip2.mk behaves properly in a BR2_PREFER_STATIC_LIB=y context. Signed-off-by: Thomas Petazzoni Signed-off-by: Peter Korsgaard --- package/bzip2/bzip2-improve-build-system.patch | 84 +++++++++++++++++++++++ package/bzip2/bzip2.mk | 92 +++++++++----------------- 2 files changed, 115 insertions(+), 61 deletions(-) create mode 100644 package/bzip2/bzip2-improve-build-system.patch diff --git a/package/bzip2/bzip2-improve-build-system.patch b/package/bzip2/bzip2-improve-build-system.patch new file mode 100644 index 000000000..90099aa28 --- /dev/null +++ b/package/bzip2/bzip2-improve-build-system.patch @@ -0,0 +1,84 @@ +Improve bzip2 build system + +This patch makes a number of improvements to the bzip2 build system: + + * Remove the BIGFILE variable that was used to force largefile + support. Now, the user of the Makefile is supposed to pass + -D_FILE_OFFSET_BITS=64 when largefile support is desired. + + * Use override CFLAGS += so that additional CFLAGS can be passed on + the command line. + + * Removed "forced" CFLAGS -O2, -g and -Winline. We don't want them by + default, and want the build system to use its own ones. + + * When creating the symbolic links bzegrep, bzfgrep, bzless and + bzcmp, don't link them to an absolute path, or they'll point to + some path on the build machine. + + * Provide an install target for the shared library, which creates the + appropriate symbolic links. + +Signed-off-by: Thomas Petazzoni + +Index: b/Makefile +=================================================================== +--- a/Makefile ++++ b/Makefile +@@ -20,8 +20,7 @@ + RANLIB=ranlib + LDFLAGS= + +-BIGFILES=-D_FILE_OFFSET_BITS=64 +-CFLAGS=-Wall -Winline -O2 -g $(BIGFILES) ++override CFLAGS += -Wall + + # Where you want it installed when you do 'make install' + PREFIX=/usr/local +@@ -90,14 +89,14 @@ + cp -f libbz2.a $(PREFIX)/lib + chmod a+r $(PREFIX)/lib/libbz2.a + cp -f bzgrep $(PREFIX)/bin/bzgrep +- ln -s -f $(PREFIX)/bin/bzgrep $(PREFIX)/bin/bzegrep +- ln -s -f $(PREFIX)/bin/bzgrep $(PREFIX)/bin/bzfgrep ++ ln -s -f bzgrep $(PREFIX)/bin/bzegrep ++ ln -s -f bzgrep $(PREFIX)/bin/bzfgrep + chmod a+x $(PREFIX)/bin/bzgrep + cp -f bzmore $(PREFIX)/bin/bzmore +- ln -s -f $(PREFIX)/bin/bzmore $(PREFIX)/bin/bzless ++ ln -s -f bzmore $(PREFIX)/bin/bzless + chmod a+x $(PREFIX)/bin/bzmore + cp -f bzdiff $(PREFIX)/bin/bzdiff +- ln -s -f $(PREFIX)/bin/bzdiff $(PREFIX)/bin/bzcmp ++ ln -s -f bzdiff $(PREFIX)/bin/bzcmp + chmod a+x $(PREFIX)/bin/bzdiff + cp -f bzgrep.1 bzmore.1 bzdiff.1 $(PREFIX)/man/man1 + chmod a+r $(PREFIX)/man/man1/bzgrep.1 +Index: b/Makefile-libbz2_so +=================================================================== +--- a/Makefile-libbz2_so ++++ b/Makefile-libbz2_so +@@ -23,8 +23,7 @@ + + SHELL=/bin/sh + CC=gcc +-BIGFILES=-D_FILE_OFFSET_BITS=64 +-CFLAGS=-fpic -fPIC -Wall -Winline -O2 -g $(BIGFILES) ++override CFLAGS += -fpic -fPIC -Wall + + OBJS= blocksort.o \ + huffman.o \ +@@ -37,8 +36,11 @@ + all: $(OBJS) + $(CC) -shared -Wl,-soname -Wl,libbz2.so.1.0 -o libbz2.so.1.0.6 $(OBJS) + $(CC) $(CFLAGS) -o bzip2-shared bzip2.c libbz2.so.1.0.6 +- rm -f libbz2.so.1.0 +- ln -s libbz2.so.1.0.6 libbz2.so.1.0 ++ ++install: ++ install -m 0755 -D libbz2.so.1.0.6 $(PREFIX)/lib/libbz2.so.1.0.6 ++ ln -sf libbz2.so.1.0.6 $(PREFIX)/lib/libbz2.so ++ ln -sf libbz2.so.1.0.6 $(PREFIX)/lib/libbz2.so.1.0 + + clean: + rm -f $(OBJS) bzip2.o libbz2.so.1.0.6 libbz2.so.1.0 bzip2-shared diff --git a/package/bzip2/bzip2.mk b/package/bzip2/bzip2.mk index b3e4ad34a..5f8c35ef3 100644 --- a/package/bzip2/bzip2.mk +++ b/package/bzip2/bzip2.mk @@ -10,67 +10,45 @@ BZIP2_INSTALL_STAGING = YES BZIP2_LICENSE = bzip2 license BZIP2_LICENSE_FILES = LICENSE -define BZIP2_FIX_MAKEFILE - $(SED) "s,ln \$$(,ln -snf \$$(,g" $(@D)/Makefile - $(SED) "s,ln -s (lib.*),ln -snf \$$1; ln -snf libbz2.so.$(BZIP2_VERSION)) \ - libbz2.so,g" $(@D)/Makefile-libbz2_so - $(SED) "s:-O2:$(TARGET_CFLAGS):" $(@D)/Makefile - $(SED) "s:-O2:$(TARGET_CFLAGS):" $(@D)/Makefile-libbz2_so +ifeq ($(BR2_PREFER_STATIC_LIB),) +define BZIP2_BUILD_SHARED_CMDS + $(TARGET_MAKE_ENV) + $(MAKE) -C $(@D) -f Makefile-libbz2_so $(TARGET_CONFIGURE_OPTS) endef +endif -BZIP2_POST_PATCH_HOOKS += BZIP2_FIX_MAKEFILE - -define BZIP2_NOLARGEFILE_FIX_MAKEFILE - $(SED) "s,^BIGFILES,#BIGFILES,g" $(@D)/Makefile - $(SED) "s,^BIGFILES,#BIGFILES,g" $(@D)/Makefile-libbz2_so +define BZIP2_BUILD_CMDS + $(TARGET_MAKE_ENV) + $(MAKE) -C $(@D) libbz2.a bzip2 bzip2recover $(TARGET_CONFIGURE_OPTS) + $(BZIP2_BUILD_SHARED_CMDS) endef -ifneq ($(BR2_LARGEFILE),y) -BZIP2_POST_PATCH_HOOKS += BZIP2_NOLARGEFILE_FIX_MAKEFILE +ifeq ($(BR2_PREFER_STATIC_LIB),) +define BZIP2_INSTALL_STAGING_SHARED_CMDS + $(TARGET_MAKE_ENV) $(MAKE) \ + -f Makefile-libbz2_so PREFIX=$(STAGING_DIR)/usr -C $(@D) install +endef endif -define BZIP2_BUILD_CMDS - $(TARGET_MAKE_ENV) \ - $(MAKE) -C $(@D) -f Makefile-libbz2_so \ - CC="$(TARGET_CC)" RANLIB="$(TARGET_RANLIB)" AR="$(TARGET_AR)" - $(TARGET_MAKE_ENV) \ - $(MAKE) -C $(@D) \ - CC="$(TARGET_CC)" RANLIB="$(TARGET_RANLIB)" AR="$(TARGET_AR)" \ - libbz2.a bzip2 bzip2recover +define BZIP2_INSTALL_STAGING_CMDS + $(TARGET_MAKE_ENV) $(MAKE) \ + PREFIX=$(STAGING_DIR)/usr -C $(@D) install + $(BZIP2_INSTALL_STAGING_SHARED_CMDS) endef -define BZIP2_INSTALL_STAGING_CMDS - $(TARGET_MAKE_ENV) $(TARGET_CONFIGURE_OPTS) \ - $(MAKE) PREFIX=$(STAGING_DIR)/usr -C $(@D) install - $(INSTALL) -m 0755 -d $(STAGING_DIR)/usr/lib - cp $(@D)/libbz2.so.$(BZIP2_VERSION) $(STAGING_DIR)/usr/lib/ - cp $(@D)/libbz2.a $(STAGING_DIR)/usr/lib/ - (cd $(STAGING_DIR)/usr/lib/; \ - ln -snf libbz2.so.$(BZIP2_VERSION) libbz2.so; \ - ln -snf libbz2.so.$(BZIP2_VERSION) libbz2.so.1.0; \ - ln -snf libbz2.so.$(BZIP2_VERSION) libbz2.so.1; \ - ) +ifeq ($(BR2_PREFER_STATIC_LIB),) +define BZIP2_INSTALL_TARGET_SHARED_CMDS + $(TARGET_MAKE_ENV) $(MAKE) \ + -f Makefile-libbz2_so PREFIX=$(TARGET_DIR)/usr -C $(@D) install endef +endif # make sure busybox doesn't get overwritten by make install define BZIP2_INSTALL_TARGET_CMDS rm -f $(addprefix $(TARGET_DIR)/usr/bin/,bzip2 bunzip2 bzcat) - $(TARGET_MAKE_ENV) $(TARGET_CONFIGURE_OPTS) \ - $(MAKE) PREFIX=$(TARGET_DIR)/usr -C $(@D) install - cp $(@D)/libbz2.so.$(BZIP2_VERSION) $(TARGET_DIR)/usr/lib/ - (cd $(TARGET_DIR)/usr/lib; \ - ln -snf libbz2.so.$(BZIP2_VERSION) libbz2.so.1.0; \ - ln -snf libbz2.so.$(BZIP2_VERSION) libbz2.so.1; \ - ln -snf libbz2.so.$(BZIP2_VERSION) libbz2.so; \ - ) - (cd $(TARGET_DIR)/usr/bin; \ - ln -snf bzip2 bunzip2; \ - ln -snf bzip2 bzcat; \ - ln -snf bzdiff bzcmp; \ - ln -snf bzmore bzless; \ - ln -snf bzgrep bzegrep; \ - ln -snf bzgrep bzfgrep; \ - ) + $(TARGET_MAKE_ENV) $(MAKE) \ + PREFIX=$(TARGET_DIR)/usr -C $(@D) install + $(BZIP2_INSTALL_TARGET_SHARED_CMDS) endef define BZIP2_CLEAN_CMDS @@ -83,24 +61,16 @@ define BZIP2_CLEAN_CMDS -$(MAKE) -C $(@D) clean endef -define HOST_BZIP2_FIX_MAKEFILE - $(SED) "s,ln \$$(,ln -snf \$$(,g" $(@D)/Makefile - $(SED) "s,ln -s (lib.*),ln -snf \$$1; ln -snf libbz2.so.$(BZIP2_VERSION) \ - libbz2.so,g" $(@D)/Makefile-libbz2_so - $(SED) "s:-O2:$(HOST_CFLAGS):" $(@D)/Makefile - $(SED) "s:-O2:$(HOST_CFLAGS):" $(@D)/Makefile-libbz2_so -endef - -HOST_BZIP2_POST_PATCH_HOOKS += HOST_BZIP2_FIX_MAKEFILE - define HOST_BZIP2_BUILD_CMDS - $(HOST_MAKE_ENV) $(MAKE) -C $(@D) -f Makefile-libbz2_so - $(HOST_MAKE_ENV) $(MAKE) -C $(@D) libbz2.a bzip2 bzip2recover + $(HOST_MAKE_ENV) $(HOST_CONFIGURE_OPTS) \ + $(MAKE) -C $(@D) -f Makefile-libbz2_so + $(HOST_MAKE_ENV) $(HOST_CONFIGURE_OPTS) \ + $(MAKE) -C $(@D) libbz2.a bzip2 bzip2recover endef define HOST_BZIP2_INSTALL_CMDS $(HOST_MAKE_ENV) \ - $(MAKE) PREFIX=$(HOST_DIR)/usr -C $(@D) install + $(MAKE) PREFIX=$(HOST_DIR)/usr -C $(@D) install endef $(eval $(generic-package)) -- cgit v1.2.3 From fc40219173997b87d46ef53f497f0496bbf60cac Mon Sep 17 00:00:00 2001 From: Carlo Caione Date: Sun, 26 May 2013 12:08:22 +0000 Subject: sunxi-boards: new package [Peter: depend on arm, wrap help, change to _FEX_FILE option, error on empty] Signed-off-by: Carlo Caione Signed-off-by: Thomas Petazzoni Signed-off-by: Peter Korsgaard --- package/Config.in | 1 + package/sunxi-boards/Config.in | 25 +++++++++++++++++++++++++ package/sunxi-boards/sunxi-boards.mk | 28 ++++++++++++++++++++++++++++ 3 files changed, 54 insertions(+) create mode 100644 package/sunxi-boards/Config.in create mode 100644 package/sunxi-boards/sunxi-boards.mk diff --git a/package/Config.in b/package/Config.in index 28c2c5c9c..7bf7dd022 100644 --- a/package/Config.in +++ b/package/Config.in @@ -220,6 +220,7 @@ source "package/b43-firmware/Config.in" source "package/firmware-imx/Config.in" source "package/linux-firmware/Config.in" source "package/rpi-firmware/Config.in" +source "package/sunxi-boards/Config.in" source "package/ux500-firmware/Config.in" source "package/zd1211-firmware/Config.in" endmenu diff --git a/package/sunxi-boards/Config.in b/package/sunxi-boards/Config.in new file mode 100644 index 000000000..d9fd8529f --- /dev/null +++ b/package/sunxi-boards/Config.in @@ -0,0 +1,25 @@ +config BR2_PACKAGE_SUNXI_BOARDS + bool "sunxi script.bin board file" + depends on BR2_arm + select BR2_PACKAGE_HOST_SUNXI_TOOLS + help + Sunxi-boards requires a compiled .fex files for hardware + description, used by the kernel during boot for hardware + initialization. This package is specific for linux-sunxi + kernel and it is useless for mainline kernel versions. + + https://github.com/linux-sunxi/sunxi-boards + +if BR2_PACKAGE_SUNXI_BOARDS +config BR2_PACKAGE_SUNXI_BOARDS_FEX_FILE + string ".fex file to compile" + help + This field defines the name of the .fex file for which the + .bin file should be generated. + + This should be the path of the .fex file relative to the + sys_config/ directory, and including the .fex extension. + + See inside sys_config/ directory in sunxi-boards source code + to see the list of valid .fex files. +endif diff --git a/package/sunxi-boards/sunxi-boards.mk b/package/sunxi-boards/sunxi-boards.mk new file mode 100644 index 000000000..38fc3e1fb --- /dev/null +++ b/package/sunxi-boards/sunxi-boards.mk @@ -0,0 +1,28 @@ +############################################################# +# +# sunxi-boards +# +############################################################# + +SUNXI_BOARDS_VERSION = 88d663db44f65b73ef65c4148a28c6fa3665d2b6 +SUNXI_BOARDS_SITE = https://github.com/linux-sunxi/sunxi-boards/tarball/master +SUNXI_BOARDS_DEPENDENCIES = host-sunxi-tools +SUNXI_BOARDS_INSTALL_IMAGES = YES +SUNXI_BOARDS_INSTALL_TARGET = NO +SUNXI_BOARDS_FEX_FILE = $(call qstrip,$(BR2_PACKAGE_SUNXI_BOARDS_FEX_FILE)) + +define SUNXI_BOARDS_INSTALL_IMAGES_CMDS + $(FEX2BIN) $(@D)/sys_config/$(SUNXI_BOARDS_FEX_FILE) \ + $(BINARIES_DIR)/script.bin +endef + +ifeq ($(BR2_PACKAGE_SUNXI_BOARDS),y) +# we NEED a board name +ifeq ($(filter source,$(MAKECMDGOALS)),) +ifeq ($(SUNXI_BOARDS_FEX_FILE),) +$(error No sunxi .fex file specified. Check your BR2_PACKAGE_SUNXI_BOARDS_FEX_FILE settings) +endif +endif +endif + +$(eval $(generic-package)) -- cgit v1.2.3 From c50d85d7d44e7d46cc9280c9dc2aef8122463d2a Mon Sep 17 00:00:00 2001 From: Gustavo Zacarias Date: Tue, 28 May 2013 02:17:30 +0000 Subject: gmp: bump to version 5.1.2 Signed-off-by: Gustavo Zacarias Signed-off-by: Peter Korsgaard --- package/gmp/gmp.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package/gmp/gmp.mk b/package/gmp/gmp.mk index e895a485f..cf5c310a2 100644 --- a/package/gmp/gmp.mk +++ b/package/gmp/gmp.mk @@ -4,7 +4,7 @@ # ############################################################# -GMP_VERSION = 5.1.1 +GMP_VERSION = 5.1.2 GMP_SITE = ftp://ftp.gmplib.org/pub/gmp-$(GMP_VERSION) GMP_SOURCE = gmp-$(GMP_VERSION).tar.bz2 GMP_INSTALL_STAGING = YES -- cgit v1.2.3 From 5a85d57f24bf42adea4b7d4431866709f6534df4 Mon Sep 17 00:00:00 2001 From: Gustavo Zacarias Date: Tue, 28 May 2013 02:17:31 +0000 Subject: mpg123: bump to version 1.15.4 Signed-off-by: Gustavo Zacarias Signed-off-by: Peter Korsgaard --- package/multimedia/mpg123/mpg123.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package/multimedia/mpg123/mpg123.mk b/package/multimedia/mpg123/mpg123.mk index c65920fc7..8796392fd 100644 --- a/package/multimedia/mpg123/mpg123.mk +++ b/package/multimedia/mpg123/mpg123.mk @@ -4,7 +4,7 @@ # ############################################################# -MPG123_VERSION = 1.15.3 +MPG123_VERSION = 1.15.4 MPG123_SOURCE = mpg123-$(MPG123_VERSION).tar.bz2 MPG123_SITE = http://downloads.sourceforge.net/project/mpg123/mpg123/$(MPG123_VERSION) MPG123_CONF_OPT = --with-optimization=0 --disable-lfs-alias -- cgit v1.2.3 From 316f991729c423c9a49a955d3747ff31ad7a0068 Mon Sep 17 00:00:00 2001 From: Gustavo Zacarias Date: Tue, 28 May 2013 02:17:32 +0000 Subject: sqlite: bump to version 3.7.17 Signed-off-by: Gustavo Zacarias Signed-off-by: Peter Korsgaard --- .../sqlite/sqlite-dont-force-posix-fallocate.patch | 23 ++++++++++++++++++++++ package/sqlite/sqlite.mk | 4 ++-- 2 files changed, 25 insertions(+), 2 deletions(-) create mode 100644 package/sqlite/sqlite-dont-force-posix-fallocate.patch diff --git a/package/sqlite/sqlite-dont-force-posix-fallocate.patch b/package/sqlite/sqlite-dont-force-posix-fallocate.patch new file mode 100644 index 000000000..118001bfd --- /dev/null +++ b/package/sqlite/sqlite-dont-force-posix-fallocate.patch @@ -0,0 +1,23 @@ +This is checked by configure and passed as a define directive when building. +There's no need to check again and potentially override a failed check +(uClibc <= 0.9.33.2 for example lacks posix_fallocate). + +Signed-off-by: Gustavo Zacarias + +diff -Nura sqlite-autoconf-3071700.orig/sqlite3.c sqlite-autoconf-3071700/sqlite3.c +--- sqlite-autoconf-3071700.orig/sqlite3.c 2013-05-23 03:17:27.170459400 -0300 ++++ sqlite-autoconf-3071700/sqlite3.c 2013-05-23 03:25:01.839227616 -0300 +@@ -22931,13 +22931,6 @@ + */ + #if SQLITE_OS_UNIX /* This file is used on unix only */ + +-/* Use posix_fallocate() if it is available +-*/ +-#if !defined(HAVE_POSIX_FALLOCATE) \ +- && (_XOPEN_SOURCE >= 600 || _POSIX_C_SOURCE >= 200112L) +-# define HAVE_POSIX_FALLOCATE 1 +-#endif +- + /* + ** There are various methods for file locking used for concurrency + ** control: diff --git a/package/sqlite/sqlite.mk b/package/sqlite/sqlite.mk index 8eb6b2f76..39a39d0c5 100644 --- a/package/sqlite/sqlite.mk +++ b/package/sqlite/sqlite.mk @@ -4,9 +4,9 @@ # ############################################################# -SQLITE_VERSION = 3071401 +SQLITE_VERSION = 3071700 SQLITE_SOURCE = sqlite-autoconf-$(SQLITE_VERSION).tar.gz -SQLITE_SITE = http://www.sqlite.org +SQLITE_SITE = http://www.sqlite.org/2013 SQLITE_LICENSE = Public domain SQLITE_INSTALL_STAGING = YES -- cgit v1.2.3 From 3496b8b5c81ca2368520f48c58f55edde61ffa15 Mon Sep 17 00:00:00 2001 From: Carlo Caione Date: Sun, 26 May 2013 12:08:23 +0000 Subject: cubieboard: add support [Peter: adjust for _FEX_FILE] Signed-off-by: Carlo Caione Signed-off-by: Thomas Petazzoni Signed-off-by: Peter Korsgaard --- board/cubietech/cubieboard/boot.cmd | 4 + board/cubietech/cubieboard/mkcubiecard.sh | 119 ++++++++++++++++++++++++++++++ board/cubietech/cubieboard/post-build.sh | 14 ++++ board/cubietech/cubieboard/readme.txt | 59 +++++++++++++++ configs/cubieboard_defconfig | 39 ++++++++++ 5 files changed, 235 insertions(+) create mode 100644 board/cubietech/cubieboard/boot.cmd create mode 100755 board/cubietech/cubieboard/mkcubiecard.sh create mode 100755 board/cubietech/cubieboard/post-build.sh create mode 100644 board/cubietech/cubieboard/readme.txt create mode 100644 configs/cubieboard_defconfig diff --git a/board/cubietech/cubieboard/boot.cmd b/board/cubietech/cubieboard/boot.cmd new file mode 100644 index 000000000..849ed0071 --- /dev/null +++ b/board/cubietech/cubieboard/boot.cmd @@ -0,0 +1,4 @@ +setenv bootargs console=ttyS0,115200 root=/dev/mmcblk0p2 rootwait panic=10 ${extra} +fatload mmc 0 0x43000000 script.bin +fatload mmc 0 0x48000000 uImage +bootm 0x48000000 diff --git a/board/cubietech/cubieboard/mkcubiecard.sh b/board/cubietech/cubieboard/mkcubiecard.sh new file mode 100755 index 000000000..4ffb22304 --- /dev/null +++ b/board/cubietech/cubieboard/mkcubiecard.sh @@ -0,0 +1,119 @@ +#! /bin/sh +# mkCubieCard.sh v0.1: +# 2013, Carlo Caione +# heavely based on : +# mkA10card.sh v0.1 +# 2012, Jason Plum +# loosely based on : +# mkcard.sh v0.5 +# (c) Copyright 2009 Graeme Gregory +# Licensed under terms of GPLv2 +# +# Parts of the procudure base on the work of Denys Dmytriyenko +# http://wiki.omap.com/index.php/MMC_Boot_Format + +IMAGES_DIR=$1 +SPL_IMG=$IMAGES_DIR/sunxi-spl.bin +UBOOT_IMG=$IMAGES_DIR/u-boot.bin +UIMAGE=$IMAGES_DIR/uImage +BIN_BOARD_FILE=$IMAGES_DIR/script.bin +ROOTFS=$IMAGES_DIR/rootfs.tar +BOOT_CMD_H=$IMAGES_DIR/boot.scr + +export LC_ALL=C + +if [ $# -ne 2 ]; then + echo "Usage: $0 " + exit 1; +fi + +if [ $EUID -ne 0 ]; then + echo "This script must be run as root" 1>&2 + exit 1 +fi + +if [ ! -f $SPL_IMG ] || + [ ! -f $UBOOT_IMG ] || + [ ! -f $UIMAGE ] || + [ ! -f $BIN_BOARD_FILE ] || + [ ! -f $ROOTFS ] || + [ ! -f $BOOT_CMD_H ]; then + echo "File(s) missing." + exit 1 +fi + +DRIVE=$2 +P1=`mktemp -d` +P2=`mktemp -d` + +dd if=/dev/zero of=$DRIVE bs=1M count=3 + +SIZE=`fdisk -l $DRIVE | grep Disk | grep bytes | awk '{print $5}'` + +echo DISK SIZE - $SIZE bytes + + +# ~2048, 16MB, FAT, bootable +# ~rest of drive, Ext4 +{ +echo 32,512,0x0C,* +echo 544,,,- +} | sfdisk -D $DRIVE + +sleep 1 + +if [ -b ${DRIVE}1 ]; then + D1=${DRIVE}1 + umount ${DRIVE}1 + mkfs.vfat -n "boot" ${DRIVE}1 +else + if [ -b ${DRIVE}p1 ]; then + D1=${DRIVE}p1 + umount ${DRIVE}p1 + mkfs.vfat -n "boot" ${DRIVE}p1 + else + echo "Cant find boot partition in /dev" + exit 1 + fi +fi + + +if [ -b ${DRIVE}2 ]; then + D2=${DRIVE}2 + umount ${DRIVE}2 + mkfs.ext4 -L "Cubie" ${DRIVE}2 +else + if [ -b ${DRIVE}p2 ]; then + D2=${DRIVE}p2 + umount ${DRIVE}p2 + mkfs.ext4 -L "Cubie" ${DRIVE}p2 + else + echo "Cant find rootfs partition in /dev" + exit 1 + fi +fi + +mount $D1 $P1 +mount $D2 $P2 + +# write uImage +cp $UIMAGE $P1 +# write board file +cp $BIN_BOARD_FILE $P1 +# write u-boot script +cp $BOOT_CMD_H $P1 +# write rootfs +tar -C $P2 -xvf $ROOTFS + +sync + +umount $D1 +umount $D2 + +rm -fr $P1 +rm -fr $P2 + +# write SPL +dd if=$SPL_IMG of=$DRIVE bs=1024 seek=8 +# write mele u-boot +dd if=$UBOOT_IMG of=$DRIVE bs=1024 seek=32 diff --git a/board/cubietech/cubieboard/post-build.sh b/board/cubietech/cubieboard/post-build.sh new file mode 100755 index 000000000..1b0258c55 --- /dev/null +++ b/board/cubietech/cubieboard/post-build.sh @@ -0,0 +1,14 @@ +#!/bin/sh +# post-build.sh for CubieBoard +# 2013, Carlo Caione + +BOARD_DIR="$(dirname $0)" +MKIMAGE=$HOST_DIR/usr/bin/mkimage +BOOT_CMD=$BOARD_DIR/boot.cmd +BOOT_CMD_H=$BINARIES_DIR/boot.scr + +# U-Boot script +if [ -e $MKIMAGE -a -e $BOOT_CMD ]; +then + $MKIMAGE -C none -A arm -T script -d $BOOT_CMD $BOOT_CMD_H +fi diff --git a/board/cubietech/cubieboard/readme.txt b/board/cubietech/cubieboard/readme.txt new file mode 100644 index 000000000..1c4711767 --- /dev/null +++ b/board/cubietech/cubieboard/readme.txt @@ -0,0 +1,59 @@ +cubieboard + +----- +Intro +----- + +To be able to use your cubieboard board with the images generated by +Buildroot you have to correctly setup the SD card. + +For more information, please see http://linux-sunxi.org/FirstSteps + +--------------- +How to build it +--------------- + +You need to use the cubieboard_defconfig, to do so: + * make cubieboard_defconfig + +And to compile: + * make + +----------------- +What is generated +----------------- + +After building, you should obtain this tree: + + output/images/ + +-- rootfs.tar + +-- boot.scr + +-- script.bin + +-- sunxi-spl.bin + +-- u-boot.bin + `-- uImage + +-------------------------- +How setting up the SD card +-------------------------- + +Depending on the rootfs size, you might want to use a 2GB or larger SD-card. +The script mkcubiecard.sh will take care of partitioning and formatting +the SD-card. + +BEWARE! This process will erase your SD card. + +Use dmesg to find out where the SD card is attached in the /dev tree +() and then: + +# sudo ./mkcubiecard.sh + +where: + - is the directory containing the generated files (usually + output/images) + - is the device file of the SD card (usually /dev/sdX) + + + +-- +Carlo Caione diff --git a/configs/cubieboard_defconfig b/configs/cubieboard_defconfig new file mode 100644 index 000000000..933c1a2eb --- /dev/null +++ b/configs/cubieboard_defconfig @@ -0,0 +1,39 @@ +# Architecture +BR2_arm=y +BR2_cortex_a8=y + +# System configuration +BR2_TARGET_GENERIC_HOSTNAME="Cubieboard" +BR2_TARGET_GENERIC_ISSUE="Welcome to use Cubieboard!" +BR2_TARGET_GENERIC_GETTY=y +BR2_TARGET_GENERIC_GETTY_PORT="ttyS0" +BR2_ROOTFS_POST_IMAGE_SCRIPT="board/cubietech/cubieboard/post-build.sh" + +# Additional tools +BR2_PACKAGE_HOST_SUNXI_TOOLS=y +BR2_PACKAGE_HOST_UBOOT_TOOLS=y +BR2_PACKAGE_SUNXI_TOOLS=y +BR2_PACKAGE_SUNXI_BOARDS=y +BR2_PACKAGE_SUNXI_BOARDS_FEX_FILE="a10/cubieboard.fex" + +# Kernel headers +BR2_KERNEL_HEADERS_3_4=y + +# Kernel +BR2_LINUX_KERNEL=y +BR2_LINUX_KERNEL_CUSTOM_GIT=y +BR2_LINUX_KERNEL_CUSTOM_GIT_REPO_URL="https://github.com/linux-sunxi/linux-sunxi.git" +BR2_LINUX_KERNEL_CUSTOM_GIT_VERSION="274a66a7bfcbaabb88d63e4eba161965383cc416" +BR2_LINUX_KERNEL_VERSION="sunxi-3.4" +BR2_LINUX_KERNEL_DEFCONFIG="sun4i" + +# Bootloaders +BR2_TARGET_UBOOT=y +BR2_TARGET_UBOOT_BOARDNAME="cubieboard" +BR2_TARGET_UBOOT_CUSTOM_GIT=y +BR2_TARGET_UBOOT_VERSION="sunxi" +BR2_TARGET_UBOOT_CUSTOM_GIT_REPO_URL="https://github.com/linux-sunxi/u-boot-sunxi.git" +BR2_TARGET_UBOOT_CUSTOM_GIT_VERSION="1a8ac55429f7f8cc9f100c1cf2dc0195cf81e76f" +BR2_TARGET_UBOOT_FORMAT_BIN=y +BR2_TARGET_UBOOT_SPL=y +BR2_TARGET_UBOOT_SPL_NAME="spl/sunxi-spl.bin" -- cgit v1.2.3 From e2e33e2cb56d7cdb04259366ba076cd168576cbe Mon Sep 17 00:00:00 2001 From: Henk Fijnvandraat Date: Sun, 26 May 2013 12:08:24 +0000 Subject: freescale-imx: new package directory The freescale-imx directory is intended to contain all freescale i.MXyy related packages, together with their download site and version info Signed-off-by: Henk Fijnvandraat Signed-off-by: Thomas Petazzoni Signed-off-by: Peter Korsgaard --- package/Config.in | 1 + package/freescale-imx/Config.in | 4 ++++ package/freescale-imx/freescale-imx.mk | 13 +++++++++++++ 3 files changed, 18 insertions(+) create mode 100644 package/freescale-imx/Config.in create mode 100644 package/freescale-imx/freescale-imx.mk diff --git a/package/Config.in b/package/Config.in index 7bf7dd022..dee118074 100644 --- a/package/Config.in +++ b/package/Config.in @@ -224,6 +224,7 @@ source "package/sunxi-boards/Config.in" source "package/ux500-firmware/Config.in" source "package/zd1211-firmware/Config.in" endmenu +source "package/freescale-imx/Config.in" source "package/acpid/Config.in" source "package/cdrkit/Config.in" source "package/dbus/Config.in" diff --git a/package/freescale-imx/Config.in b/package/freescale-imx/Config.in new file mode 100644 index 000000000..389bcc6b2 --- /dev/null +++ b/package/freescale-imx/Config.in @@ -0,0 +1,4 @@ +menu "Freescale i.MX libraries" + depends on BR2_arm + +endmenu diff --git a/package/freescale-imx/freescale-imx.mk b/package/freescale-imx/freescale-imx.mk new file mode 100644 index 000000000..0d5400b64 --- /dev/null +++ b/package/freescale-imx/freescale-imx.mk @@ -0,0 +1,13 @@ +############################################################# +# +# freescale-imx +# +############################################################# + +FREESCALE_IMX_VERSION = 12.09.01 + +# No official download site from freescale, just this mirror +FREESCALE_IMX_MIRROR_SITE = http://download.ossystems.com.br/bsp/freescale/source + +include package/freescale-imx/*/*.mk + -- cgit v1.2.3 From d0fb7b8f817dc35359de011e72b8236ff349494a Mon Sep 17 00:00:00 2001 From: Henk Fijnvandraat Date: Sun, 26 May 2013 12:08:25 +0000 Subject: imx-lib: move to the freescale-imx directory This commit moves the imx-lib package to the newly introduced freescale-imx/ directory, and uses the new variables provided by freescale-imx/freescale-imx.mk. Signed-off-by: Henk Fijnvandraat Signed-off-by: Thomas Petazzoni Signed-off-by: Peter Korsgaard --- package/Config.in | 1 - package/freescale-imx/Config.in | 2 ++ package/freescale-imx/imx-lib/Config.in | 53 ++++++++++++++++++++++++++++++++ package/freescale-imx/imx-lib/imx-lib.mk | 40 ++++++++++++++++++++++++ package/imx-lib/Config.in | 53 -------------------------------- package/imx-lib/imx-lib.mk | 41 ------------------------ 6 files changed, 95 insertions(+), 95 deletions(-) create mode 100644 package/freescale-imx/imx-lib/Config.in create mode 100644 package/freescale-imx/imx-lib/imx-lib.mk delete mode 100644 package/imx-lib/Config.in delete mode 100644 package/imx-lib/imx-lib.mk diff --git a/package/Config.in b/package/Config.in index dee118074..6e7335b5b 100644 --- a/package/Config.in +++ b/package/Config.in @@ -465,7 +465,6 @@ endmenu menu "Hardware handling" source "package/ccid/Config.in" source "package/dtc/Config.in" -source "package/imx-lib/Config.in" source "package/lcdapi/Config.in" source "package/libaio/Config.in" source "package/libatasmart/Config.in" diff --git a/package/freescale-imx/Config.in b/package/freescale-imx/Config.in index 389bcc6b2..edc9ab53f 100644 --- a/package/freescale-imx/Config.in +++ b/package/freescale-imx/Config.in @@ -1,4 +1,6 @@ menu "Freescale i.MX libraries" depends on BR2_arm +source "package/freescale-imx/imx-lib/Config.in" + endmenu diff --git a/package/freescale-imx/imx-lib/Config.in b/package/freescale-imx/imx-lib/Config.in new file mode 100644 index 000000000..161700985 --- /dev/null +++ b/package/freescale-imx/imx-lib/Config.in @@ -0,0 +1,53 @@ +comment "imx-lib needs an imx-specific kernel to be built" + depends on BR2_arm && !BR2_LINUX_KERNEL + +config BR2_PACKAGE_IMX_LIB + bool "imx-lib" + depends on BR2_LINUX_KERNEL + depends on BR2_arm # Only relevant for i.MX + help + Library of userspace helpers specific for the Freescale i.MX + platform. It wraps the kernel interfaces for some i.MX platform + specific drivers. It requires a kernel that includes the i.MX + specific headers to be built. + + This library is provided by Freescale as-is and doesn't have + an upstream. + +if BR2_PACKAGE_IMX_LIB +choice + prompt "i.MX platform" + +config BR2_PACKAGE_IMX_LIB_PLATFORM_IMX25_3STACK + bool "imx25-3stack" + +config BR2_PACKAGE_IMX_LIB_PLATFORM_IMX27ADS + bool "imx27ads" + +config BR2_PACKAGE_IMX_LIB_PLATFORM_IMX37_3STACK + bool "imx37-3stack" + +config BR2_PACKAGE_IMX_LIB_PLATFORM_IMX50 + bool "imx50" + +config BR2_PACKAGE_IMX_LIB_PLATFORM_IMX51 + bool "imx51" + +config BR2_PACKAGE_IMX_LIB_PLATFORM_IMX53 + bool "imx53" + +config BR2_PACKAGE_IMX_LIB_PLATFORM_IMX6Q + bool "imx6q" + +endchoice + +config BR2_PACKAGE_IMX_LIB_PLATFORM + string + default "IMX25_3STACK" if BR2_PACKAGE_IMX_LIB_PLATFORM_IMX25_3STACK + default "IMX27ADS" if BR2_PACKAGE_IMX_LIB_PLATFORM_IMX27ADS + default "IMX37_3STACK" if BR2_PACKAGE_IMX_LIB_PLATFORM_IMX37_3STACK + default "IMX50" if BR2_PACKAGE_IMX_LIB_PLATFORM_IMX50 + default "IMX51" if BR2_PACKAGE_IMX_LIB_PLATFORM_IMX51 + default "IMX53" if BR2_PACKAGE_IMX_LIB_PLATFORM_IMX53 + default "IMX6Q" if BR2_PACKAGE_IMX_LIB_PLATFORM_IMX6Q +endif diff --git a/package/freescale-imx/imx-lib/imx-lib.mk b/package/freescale-imx/imx-lib/imx-lib.mk new file mode 100644 index 000000000..67e8db3e0 --- /dev/null +++ b/package/freescale-imx/imx-lib/imx-lib.mk @@ -0,0 +1,40 @@ +############################################################# +# +# imx-lib +# +############################################################# + +IMX_LIB_VERSION = $(FREESCALE_IMX_VERSION) +IMX_LIB_SITE = $(FREESCALE_IMX_MIRROR_SITE) +IMX_LIB_LICENSE = LGPLv2.1+ +# No license file included + +IMX_LIB_INSTALL_STAGING = YES + +# imx-lib needs access to imx-specific kernel headers +IMX_LIB_DEPENDENCIES += linux +IMX_LIB_INCLUDE = \ + -I$(LINUX_DIR)/drivers/mxc/security/rng/include \ + -I$(LINUX_DIR)/drivers/mxc/security/sahara2/include \ + -idirafter $(LINUX_DIR)/include + +IMX_LIB_MAKE_ENV = \ + $(TARGET_MAKE_ENV) \ + $(TARGET_CONFIGURE_OPTS) \ + CROSS_COMPILE="$(CCACHE) $(TARGET_CROSS)" \ + PLATFORM=$(BR2_PACKAGE_IMX_LIB_PLATFORM) \ + INCLUDE="$(IMX_LIB_INCLUDE)" + +define IMX_LIB_BUILD_CMDS + $(IMX_LIB_MAKE_ENV) $(MAKE1) -C $(@D) +endef + +define IMX_LIB_INSTALL_STAGING_CMDS + $(IMX_LIB_MAKE_ENV) $(MAKE1) -C $(@D) DEST_DIR=$(STAGING_DIR) install +endef + +define IMX_LIB_INSTALL_TARGET_CMDS + $(IMX_LIB_MAKE_ENV) $(MAKE1) -C $(@D) DEST_DIR=$(TARGET_DIR) install +endef + +$(eval $(generic-package)) diff --git a/package/imx-lib/Config.in b/package/imx-lib/Config.in deleted file mode 100644 index 161700985..000000000 --- a/package/imx-lib/Config.in +++ /dev/null @@ -1,53 +0,0 @@ -comment "imx-lib needs an imx-specific kernel to be built" - depends on BR2_arm && !BR2_LINUX_KERNEL - -config BR2_PACKAGE_IMX_LIB - bool "imx-lib" - depends on BR2_LINUX_KERNEL - depends on BR2_arm # Only relevant for i.MX - help - Library of userspace helpers specific for the Freescale i.MX - platform. It wraps the kernel interfaces for some i.MX platform - specific drivers. It requires a kernel that includes the i.MX - specific headers to be built. - - This library is provided by Freescale as-is and doesn't have - an upstream. - -if BR2_PACKAGE_IMX_LIB -choice - prompt "i.MX platform" - -config BR2_PACKAGE_IMX_LIB_PLATFORM_IMX25_3STACK - bool "imx25-3stack" - -config BR2_PACKAGE_IMX_LIB_PLATFORM_IMX27ADS - bool "imx27ads" - -config BR2_PACKAGE_IMX_LIB_PLATFORM_IMX37_3STACK - bool "imx37-3stack" - -config BR2_PACKAGE_IMX_LIB_PLATFORM_IMX50 - bool "imx50" - -config BR2_PACKAGE_IMX_LIB_PLATFORM_IMX51 - bool "imx51" - -config BR2_PACKAGE_IMX_LIB_PLATFORM_IMX53 - bool "imx53" - -config BR2_PACKAGE_IMX_LIB_PLATFORM_IMX6Q - bool "imx6q" - -endchoice - -config BR2_PACKAGE_IMX_LIB_PLATFORM - string - default "IMX25_3STACK" if BR2_PACKAGE_IMX_LIB_PLATFORM_IMX25_3STACK - default "IMX27ADS" if BR2_PACKAGE_IMX_LIB_PLATFORM_IMX27ADS - default "IMX37_3STACK" if BR2_PACKAGE_IMX_LIB_PLATFORM_IMX37_3STACK - default "IMX50" if BR2_PACKAGE_IMX_LIB_PLATFORM_IMX50 - default "IMX51" if BR2_PACKAGE_IMX_LIB_PLATFORM_IMX51 - default "IMX53" if BR2_PACKAGE_IMX_LIB_PLATFORM_IMX53 - default "IMX6Q" if BR2_PACKAGE_IMX_LIB_PLATFORM_IMX6Q -endif diff --git a/package/imx-lib/imx-lib.mk b/package/imx-lib/imx-lib.mk deleted file mode 100644 index c168c80f0..000000000 --- a/package/imx-lib/imx-lib.mk +++ /dev/null @@ -1,41 +0,0 @@ -############################################################# -# -# imx-lib -# -############################################################# - -IMX_LIB_VERSION = 12.09.01 -# No official download site from freescale, just this mirror -IMX_LIB_SITE = http://download.ossystems.com.br/bsp/freescale/source -IMX_LIB_LICENSE = LGPLv2.1+ -# No license file included - -IMX_LIB_INSTALL_STAGING = YES - -# imx-lib needs access to imx-specific kernel headers -IMX_LIB_DEPENDENCIES += linux -IMX_LIB_INCLUDE = \ - -I$(LINUX_DIR)/drivers/mxc/security/rng/include \ - -I$(LINUX_DIR)/drivers/mxc/security/sahara2/include \ - -idirafter $(LINUX_DIR)/include - -IMX_LIB_MAKE_ENV = \ - $(TARGET_MAKE_ENV) \ - $(TARGET_CONFIGURE_OPTS) \ - CROSS_COMPILE="$(CCACHE) $(TARGET_CROSS)" \ - PLATFORM=$(BR2_PACKAGE_IMX_LIB_PLATFORM) \ - INCLUDE="$(IMX_LIB_INCLUDE)" - -define IMX_LIB_BUILD_CMDS - $(IMX_LIB_MAKE_ENV) $(MAKE1) -C $(@D) -endef - -define IMX_LIB_INSTALL_STAGING_CMDS - $(IMX_LIB_MAKE_ENV) $(MAKE1) -C $(@D) DEST_DIR=$(STAGING_DIR) install -endef - -define IMX_LIB_INSTALL_TARGET_CMDS - $(IMX_LIB_MAKE_ENV) $(MAKE1) -C $(@D) DEST_DIR=$(TARGET_DIR) install -endef - -$(eval $(generic-package)) -- cgit v1.2.3 From 7aa425e9034069dfeb91361c90256b9cb831bc67 Mon Sep 17 00:00:00 2001 From: Henk Fijnvandraat Date: Sun, 26 May 2013 12:08:26 +0000 Subject: firmware-imx: move to the freescale-imx directory This commit moves the firmware-imx package to the newly introduced freescale-imx/ directory, and uses the new variables provided by freescale-imx/freescale-imx.mk. Signed-off-by: Henk Fijnvandraat Signed-off-by: Thomas Petazzoni Signed-off-by: Peter Korsgaard --- package/Config.in | 1 - package/firmware-imx/Config.in | 13 -------- package/firmware-imx/firmware-imx.mk | 39 ---------------------- package/freescale-imx/Config.in | 1 + package/freescale-imx/firmware-imx/Config.in | 13 ++++++++ package/freescale-imx/firmware-imx/firmware-imx.mk | 38 +++++++++++++++++++++ 6 files changed, 52 insertions(+), 53 deletions(-) delete mode 100644 package/firmware-imx/Config.in delete mode 100644 package/firmware-imx/firmware-imx.mk create mode 100644 package/freescale-imx/firmware-imx/Config.in create mode 100644 package/freescale-imx/firmware-imx/firmware-imx.mk diff --git a/package/Config.in b/package/Config.in index 6e7335b5b..ab6df09a9 100644 --- a/package/Config.in +++ b/package/Config.in @@ -217,7 +217,6 @@ menu "Hardware handling" menu "Misc devices firmwares" source "package/am33x-cm3/Config.in" source "package/b43-firmware/Config.in" -source "package/firmware-imx/Config.in" source "package/linux-firmware/Config.in" source "package/rpi-firmware/Config.in" source "package/sunxi-boards/Config.in" diff --git a/package/firmware-imx/Config.in b/package/firmware-imx/Config.in deleted file mode 100644 index dd96d8889..000000000 --- a/package/firmware-imx/Config.in +++ /dev/null @@ -1,13 +0,0 @@ -config BR2_PACKAGE_FIRMWARE_IMX - bool "firmware-imx" - depends on BR2_arm # Only relevant for i.MX - help - Firmware blobs for the Freescale i.MX SoCs. - - It contains blobs for Atheros AR6003, SDMA and VPU. - - Note: it also contains a blob for ar3k/30101 but upstream - linux-firmware has that as well. - - This library is provided by Freescale as-is and doesn't have - an upstream. diff --git a/package/firmware-imx/firmware-imx.mk b/package/firmware-imx/firmware-imx.mk deleted file mode 100644 index 3b43bef5c..000000000 --- a/package/firmware-imx/firmware-imx.mk +++ /dev/null @@ -1,39 +0,0 @@ -############################################################# -# -# buildroot makefile for firmware-imx -# -############################################################# - -FIRMWARE_IMX_VERSION = 12.09.01 -# No official download site from freescale, just this mirror -FIRMWARE_IMX_SITE = http://download.ossystems.com.br/bsp/freescale/source -FIRMWARE_IMX_SOURCE = firmware-imx-$(FIRMWARE_IMX_VERSION).bin -FIRMWARE_IMX_LICENSE = Freescale Semiconductor Software License Agreement, \ - Atheros license (ath6k) -FIRMWARE_IMX_LICENSE_FILES = licenses/vpu/EULA licenses/ath6k/AR6102/License.txt -# This is a legal minefield: the EULA specifies that -# the Board Support Package includes software and hardware (sic!) -# for which a separate license is needed... -FIRMWARE_IMX_REDISTRIBUTE = NO - -FIRMWARE_IMX_BLOBS = ath6k sdma vpu - -# The archive is a shell-self-extractor of a bzipped tar. It happens -# to extract in the correct directory (firmware-imx-x.y.z) -# The --force makes sure it doesn't fail if the source dir already exists. -# The --auto-accept skips the license check - not needed for us -# because we have legal-info. -define FIRMWARE_IMX_EXTRACT_CMDS - cd $(BUILD_DIR); \ - sh $(DL_DIR)/$(FIRMWARE_IMX_SOURCE) --force --auto-accept -endef - - -define FIRMWARE_IMX_INSTALL_TARGET_CMDS - mkdir -p $(TARGET_DIR)/lib/firmware - for blobdir in $(FIRMWARE_IMX_BLOBS); do \ - cp -r $(@D)/firmware/$${blobdir} $(TARGET_DIR)/lib/firmware; \ - done -endef - -$(eval $(generic-package)) diff --git a/package/freescale-imx/Config.in b/package/freescale-imx/Config.in index edc9ab53f..840b83b19 100644 --- a/package/freescale-imx/Config.in +++ b/package/freescale-imx/Config.in @@ -2,5 +2,6 @@ menu "Freescale i.MX libraries" depends on BR2_arm source "package/freescale-imx/imx-lib/Config.in" +source "package/freescale-imx/firmware-imx/Config.in" endmenu diff --git a/package/freescale-imx/firmware-imx/Config.in b/package/freescale-imx/firmware-imx/Config.in new file mode 100644 index 000000000..dd96d8889 --- /dev/null +++ b/package/freescale-imx/firmware-imx/Config.in @@ -0,0 +1,13 @@ +config BR2_PACKAGE_FIRMWARE_IMX + bool "firmware-imx" + depends on BR2_arm # Only relevant for i.MX + help + Firmware blobs for the Freescale i.MX SoCs. + + It contains blobs for Atheros AR6003, SDMA and VPU. + + Note: it also contains a blob for ar3k/30101 but upstream + linux-firmware has that as well. + + This library is provided by Freescale as-is and doesn't have + an upstream. diff --git a/package/freescale-imx/firmware-imx/firmware-imx.mk b/package/freescale-imx/firmware-imx/firmware-imx.mk new file mode 100644 index 000000000..85f8dc29d --- /dev/null +++ b/package/freescale-imx/firmware-imx/firmware-imx.mk @@ -0,0 +1,38 @@ +############################################################# +# +# firmware-imx +# +############################################################# + +FIRMWARE_IMX_VERSION = $(FREESCALE_IMX_VERSION) +FIRMWARE_IMX_SITE = $(FREESCALE_IMX_MIRROR_SITE) +FIRMWARE_IMX_SOURCE = firmware-imx-$(FIRMWARE_IMX_VERSION).bin +FIRMWARE_IMX_LICENSE = Freescale Semiconductor Software License Agreement, \ + Atheros license (ath6k) +FIRMWARE_IMX_LICENSE_FILES = licenses/vpu/EULA licenses/ath6k/AR6102/License.txt +# This is a legal minefield: the EULA specifies that +# the Board Support Package includes software and hardware (sic!) +# for which a separate license is needed... +FIRMWARE_IMX_REDISTRIBUTE = NO + +FIRMWARE_IMX_BLOBS = ath6k sdma vpu + +# The archive is a shell-self-extractor of a bzipped tar. It happens +# to extract in the correct directory (firmware-imx-x.y.z) +# The --force makes sure it doesn't fail if the source dir already exists. +# The --auto-accept skips the license check - not needed for us +# because we have legal-info. +define FIRMWARE_IMX_EXTRACT_CMDS + cd $(BUILD_DIR); \ + sh $(DL_DIR)/$(FIRMWARE_IMX_SOURCE) --force --auto-accept +endef + + +define FIRMWARE_IMX_INSTALL_TARGET_CMDS + mkdir -p $(TARGET_DIR)/lib/firmware + for blobdir in $(FIRMWARE_IMX_BLOBS); do \ + cp -r $(@D)/firmware/$${blobdir} $(TARGET_DIR)/lib/firmware; \ + done +endef + +$(eval $(generic-package)) -- cgit v1.2.3 From 41a65bf5be0724e8d36832e330a18a01e3845658 Mon Sep 17 00:00:00 2001 From: Henk Fijnvandraat Date: Sun, 26 May 2013 12:08:27 +0000 Subject: freescale-imx: bump to 1.1.0 This commit bumps both imx-lib and firmware-imx to version 1.1.0. Signed-off-by: Henk Fijnvandraat Signed-off-by: Thomas Petazzoni Signed-off-by: Peter Korsgaard --- package/freescale-imx/freescale-imx.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package/freescale-imx/freescale-imx.mk b/package/freescale-imx/freescale-imx.mk index 0d5400b64..2553f6720 100644 --- a/package/freescale-imx/freescale-imx.mk +++ b/package/freescale-imx/freescale-imx.mk @@ -4,7 +4,7 @@ # ############################################################# -FREESCALE_IMX_VERSION = 12.09.01 +FREESCALE_IMX_VERSION = 1.1.0 # No official download site from freescale, just this mirror FREESCALE_IMX_MIRROR_SITE = http://download.ossystems.com.br/bsp/freescale/source -- cgit v1.2.3 From e1fc11b4fe637aa7ca029447d1963a318d159fb8 Mon Sep 17 00:00:00 2001 From: Henk Fijnvandraat Date: Sun, 26 May 2013 12:08:28 +0000 Subject: gpu-viv-bin-mx6q: new package This patch adds a new package for the OpenGL, OpenVG and EGL proprietary implementations specific to the Vivante GPU of i.MX6 processors. [Peter: show comment on uClibc toolchains, tweak help text] Signed-off-by: Henk Fijnvandraat Signed-off-by: Thomas Petazzoni Signed-off-by: Peter Korsgaard --- package/freescale-imx/Config.in | 1 + package/freescale-imx/gpu-viv-bin-mx6q/Config.in | 35 ++++++++++ ...gpu-viv-bin-mx6q-0001-correct-HAL-include.patch | 16 +++++ .../gpu-viv-bin-mx6q/gpu-viv-bin-mx6q.mk | 79 ++++++++++++++++++++++ 4 files changed, 131 insertions(+) create mode 100644 package/freescale-imx/gpu-viv-bin-mx6q/Config.in create mode 100644 package/freescale-imx/gpu-viv-bin-mx6q/gpu-viv-bin-mx6q-0001-correct-HAL-include.patch create mode 100644 package/freescale-imx/gpu-viv-bin-mx6q/gpu-viv-bin-mx6q.mk diff --git a/package/freescale-imx/Config.in b/package/freescale-imx/Config.in index 840b83b19..7c22f79cf 100644 --- a/package/freescale-imx/Config.in +++ b/package/freescale-imx/Config.in @@ -3,5 +3,6 @@ menu "Freescale i.MX libraries" source "package/freescale-imx/imx-lib/Config.in" source "package/freescale-imx/firmware-imx/Config.in" +source "package/freescale-imx/gpu-viv-bin-mx6q/Config.in" endmenu diff --git a/package/freescale-imx/gpu-viv-bin-mx6q/Config.in b/package/freescale-imx/gpu-viv-bin-mx6q/Config.in new file mode 100644 index 000000000..06544c406 --- /dev/null +++ b/package/freescale-imx/gpu-viv-bin-mx6q/Config.in @@ -0,0 +1,35 @@ +comment "gpu-viv-bin-mx6q requires a glibc toolchain" + depends on !(BR2_TOOLCHAIN_CTNG_glibc || \ + BR2_TOOLCHAIN_CTNG_eglibc || \ + BR2_TOOLCHAIN_EXTERNAL_GLIBC) + +config BR2_PACKAGE_GPU_VIV_BIN_MX6Q + bool "gpu-viv-bin-mx6q" + select BR2_PACKAGE_HAS_OPENGL_EGL + select BR2_PACKAGE_HAS_OPENGL_ES + depends on BR2_arm # Only relevant for i.MX6 + # Library binaries are linked against libc.so.6 + depends on BR2_TOOLCHAIN_CTNG_glibc || \ + BR2_TOOLCHAIN_CTNG_eglibc || \ + BR2_TOOLCHAIN_EXTERNAL_GLIBC + help + Userspace libraries for Vivante GPU on i.MX6 platforms + + It contains libraries and headers for GLES, OpenCL, and + OpenVG. It also contains a DRI plugin for X11. It also + contains a plugin for DirectFB-1.4.0, but that doesn't work + together with buildroot's DirectFB version. + + This library is provided by Freescale as-is and doesn't have + an upstream. + +if BR2_PACKAGE_GPU_VIV_BIN_MX6Q + +config BR2_PACKAGE_GPU_VIV_BIN_MX6Q_EXAMPLES + bool "install examples" + help + Copy the Vivante examples to the target. + + Warning: examples take approximately 150 MB of disk space. + +endif diff --git a/package/freescale-imx/gpu-viv-bin-mx6q/gpu-viv-bin-mx6q-0001-correct-HAL-include.patch b/package/freescale-imx/gpu-viv-bin-mx6q/gpu-viv-bin-mx6q-0001-correct-HAL-include.patch new file mode 100644 index 000000000..c83cd559b --- /dev/null +++ b/package/freescale-imx/gpu-viv-bin-mx6q/gpu-viv-bin-mx6q-0001-correct-HAL-include.patch @@ -0,0 +1,16 @@ +Correct the directory path for gc_hal_eglplatform_type.h + +Signed-off-by: Henk Fijnvandraat + +diff -rup gpu-viv-bin-mx6q-1.1.0-orig/usr/include/gc_vdk_types.h gpu-viv-bin-mx6q-1.1.0/usr/include/gc_vdk_types.h +--- gpu-viv-bin-mx6q-1.1.0-orig/usr/include/gc_vdk_types.h 2012-12-18 10:35:55.000000000 +0100 ++++ gpu-viv-bin-mx6q-1.1.0/usr/include/gc_vdk_types.h 2013-05-09 21:09:28.080138681 +0200 +@@ -39,7 +39,7 @@ extern "C" { + #endif + + #include +-#include "gc_hal_eglplatform_type.h" ++#include + + + /******************************************************************************* diff --git a/package/freescale-imx/gpu-viv-bin-mx6q/gpu-viv-bin-mx6q.mk b/package/freescale-imx/gpu-viv-bin-mx6q/gpu-viv-bin-mx6q.mk new file mode 100644 index 000000000..f988d252a --- /dev/null +++ b/package/freescale-imx/gpu-viv-bin-mx6q/gpu-viv-bin-mx6q.mk @@ -0,0 +1,79 @@ +############################################################# +# +# gpu-viv-bin-mx6q +# +############################################################# + +GPU_VIV_BIN_MX6Q_VERSION = $(FREESCALE_IMX_VERSION) +GPU_VIV_BIN_MX6Q_SITE = $(FREESCALE_IMX_MIRROR_SITE) +GPU_VIV_BIN_MX6Q_SOURCE = gpu-viv-bin-mx6q-$(GPU_VIV_BIN_MX6Q_VERSION).bin + +GPU_VIV_BIN_MX6Q_INSTALL_STAGING = YES + +GPU_VIV_BIN_MX6Q_LICENSE = Freescale Semiconductor Software License Agreement + +# No license file is included in the archive; we could extract it from +# the self-extractor, but that's just too much effort. +# This is a legal minefield: the EULA specifies that +# the Board Support Package includes software and hardware (sic!) +# for which a separate license is needed... +GPU_VIV_BIN_MX6Q_REDISTRIBUTE = NO + +# DirectFB is not supported (wrong version) +ifeq ($(BR2_PACKAGE_XORG7),y) +GPU_VIV_BIN_MX6Q_LIB_TARGET = x11 +else +GPU_VIV_BIN_MX6Q_LIB_TARGET = fb +endif + +# The archive is a shell-self-extractor of a bzipped tar. It happens +# to extract in the correct directory (gpu-viv-bin-mx6q-x.y.z) +# The --force makes sure it doesn't fail if the source dir already exists. +# The --auto-accept skips the license check - not needed for us +# because we have legal-info. +define GPU_VIV_BIN_MX6Q_EXTRACT_CMDS + (cd $(BUILD_DIR); \ + sh $(DL_DIR)/$(GPU_VIV_BIN_MX6Q_SOURCE) --force --auto-accept) +endef + +# Instead of building, we fix up the inconsistencies that exist +# in the upstream archive here. +# Make sure these commands are idempotent. +define GPU_VIV_BIN_MX6Q_BUILD_CMDS + $(SED) 's/defined(LINUX)/defined(__linux__)/g' $(@D)/usr/include/*/*.h + for lib in EGL GAL VIVANTE; do \ + ln -sf lib$${lib}-$(GPU_VIV_BIN_MX6Q_LIB_TARGET).so \ + $(@D)/usr/lib/lib$${lib}.so; \ + done + ln -sf libGL.so.1.2 $(@D)/usr/lib/libGL.so.1 + ln -sf libGL.so.1.2 $(@D)/usr/lib/libGL.so +endef + +define GPU_VIV_BIN_MX6Q_INSTALL_STAGING_CMDS + cp -r $(@D)/usr/* $(STAGING_DIR)/usr +endef + +ifeq ($(BR2_PACKAGE_GPU_VIV_BIN_MX6Q_EXAMPLES),y) +define GPU_VIV_BIN_MX6Q_INSTALL_EXAMPLES + mkdir -p $(TARGET_DIR)/usr/share/examples/ + cp -r $(@D)/opt/* $(TARGET_DIR)/usr/share/examples/ +endef +endif + +# On the target, remove the unused libraries. +# Note that this is _required_, else ldconfig may create symlinks +# to the wrong library +define GPU_VIV_BIN_MX6Q_INSTALL_TARGET_CMDS + $(GPU_VIV_BIN_MX6Q_INSTALL_EXAMPLES) + cp -a $(@D)/usr/lib $(TARGET_DIR)/usr + for lib in EGL GAL VIVANTE; do \ + for f in $(TARGET_DIR)/usr/lib/lib$${lib}-*.so; do \ + case $$f in \ + *-$(GPU_VIV_BIN_MX6Q_LIB_TARGET).so) : ;; \ + *) $(RM) $$f ;; \ + esac; \ + done; \ + done +endef + +$(eval $(generic-package)) -- cgit v1.2.3 From 2db98f63b0140a7dc7e9d9715c072e79cc68c4a0 Mon Sep 17 00:00:00 2001 From: Thomas Petazzoni Date: Sun, 26 May 2013 12:08:29 +0000 Subject: network-manager: use a _VERSION_MAJOR variable Just like we do for many other GNOME-hosted tarballs, use a _VERSION_MAJOR variable for network-manager. Signed-off-by: Thomas Petazzoni Signed-off-by: Peter Korsgaard --- package/network-manager/network-manager.mk | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/package/network-manager/network-manager.mk b/package/network-manager/network-manager.mk index b3715d8df..261f2d3ab 100644 --- a/package/network-manager/network-manager.mk +++ b/package/network-manager/network-manager.mk @@ -3,9 +3,11 @@ # NetworkManager # ############################################################# -NETWORK_MANAGER_VERSION = 0.9.2.0 + +NETWORK_MANAGER_VERSION_MAJOR = 0.9 +NETWORK_MANAGER_VERSION = $(NETWORK_MANAGER_VERSION_MAJOR).2.0 NETWORK_MANAGER_SOURCE = NetworkManager-$(NETWORK_MANAGER_VERSION).tar.bz2 -NETWORK_MANAGER_SITE = http://ftp.gnome.org/pub/GNOME/sources/NetworkManager/0.9/ +NETWORK_MANAGER_SITE = http://ftp.gnome.org/pub/GNOME/sources/NetworkManager/$(NETWORK_MANAGER_VERSION_MAJOR) NETWORK_MANAGER_INSTALL_STAGING = YES NETWORK_MANAGER_DEPENDENCIES = host-pkgconf udev dbus-glib libnl gnutls \ libgcrypt wireless_tools util-linux host-intltool -- cgit v1.2.3 From 52c7f43fdefbe7b5fe65682e3a9618cf741a6787 Mon Sep 17 00:00:00 2001 From: Thomas Petazzoni Date: Sun, 26 May 2013 12:08:30 +0000 Subject: network-manager: bump to 0.9.8.0 This upstream version (the latest available at the time of this writing) contains http://cgit.freedesktop.org/NetworkManager/NetworkManager/commit/?id=6b64e4db2f3c9cfc0e0e240cf0bc58f3b3e90c1f which fixes a build issue of network-manager against recent kernel headers. We also remove our patch against network-manager, because it has been merged upstream as commit cbf72aeb34a6f1fd1bcd7f78ae88985154dc85af. Signed-off-by: Thomas Petazzoni Signed-off-by: Peter Korsgaard --- .../network-manager/network-manager-execinfo.patch | 31 -------------------- package/network-manager/network-manager.mk | 33 +++++++++------------- 2 files changed, 13 insertions(+), 51 deletions(-) delete mode 100644 package/network-manager/network-manager-execinfo.patch diff --git a/package/network-manager/network-manager-execinfo.patch b/package/network-manager/network-manager-execinfo.patch deleted file mode 100644 index 8dc83f0bf..000000000 --- a/package/network-manager/network-manager-execinfo.patch +++ /dev/null @@ -1,31 +0,0 @@ -From ff9471b7d83545614100a270e2d85b7b272abe97 Mon Sep 17 00:00:00 2001 -From: Peter Korsgaard -Date: Mon, 2 Jan 2012 14:45:16 +0100 -Subject: [PATCH] [PATCH] only include execinfo.h if crashtrace support is - enabled - -On systems without backtrace suport (E.G. uClibc depending on config), -execinfo.h might not be available, breaking the build. - -Fix it by only including it if enabled. - -Signed-off-by: Peter Korsgaard ---- - src/logging/nm-logging.c | 1 - - 1 files changed, 0 insertions(+), 1 deletions(-) - -diff --git a/src/logging/nm-logging.c b/src/logging/nm-logging.c -index ca6a709..26c8670 100644 ---- a/src/logging/nm-logging.c -+++ b/src/logging/nm-logging.c -@@ -23,7 +23,6 @@ - - #include - #include --#include - #include - #include - #include --- -1.7.7.1 - diff --git a/package/network-manager/network-manager.mk b/package/network-manager/network-manager.mk index 261f2d3ab..9be624cb1 100644 --- a/package/network-manager/network-manager.mk +++ b/package/network-manager/network-manager.mk @@ -5,49 +5,42 @@ ############################################################# NETWORK_MANAGER_VERSION_MAJOR = 0.9 -NETWORK_MANAGER_VERSION = $(NETWORK_MANAGER_VERSION_MAJOR).2.0 -NETWORK_MANAGER_SOURCE = NetworkManager-$(NETWORK_MANAGER_VERSION).tar.bz2 +NETWORK_MANAGER_VERSION = $(NETWORK_MANAGER_VERSION_MAJOR).8.0 +NETWORK_MANAGER_SOURCE = NetworkManager-$(NETWORK_MANAGER_VERSION).tar.xz NETWORK_MANAGER_SITE = http://ftp.gnome.org/pub/GNOME/sources/NetworkManager/$(NETWORK_MANAGER_VERSION_MAJOR) NETWORK_MANAGER_INSTALL_STAGING = YES NETWORK_MANAGER_DEPENDENCIES = host-pkgconf udev dbus-glib libnl gnutls \ libgcrypt wireless_tools util-linux host-intltool NETWORK_MANAGER_CONF_ENV = \ - ac_cv_path_LIBGCRYPT_CONFIG=$(STAGING_DIR)/usr/bin/libgcrypt-config + ac_cv_path_LIBGCRYPT_CONFIG=$(STAGING_DIR)/usr/bin/libgcrypt-config \ + ac_cv_file__etc_fedora_release=no \ + ac_cv_file__etc_mandriva_release=no \ + ac_cv_file__etc_debian_version=no \ + ac_cv_file__etc_redhat_release=no \ + ac_cv_file__etc_SuSE_release=no + NETWORK_MANAGER_CONF_OPT = \ --mandir=$(STAGING_DIR)/usr/man/ \ - --with-dbus-user=dbus \ --disable-tests \ --disable-more-warnings \ --without-docs \ --disable-gtk-doc \ - --disable-asserts \ - --enable-abstract-sockets \ - --disable-selinux \ - --disable-xml-docs \ - --disable-doxygen-docs \ - --disable-static \ - --enable-dnotify \ --localstatedir=/var \ --with-crypto=gnutls \ - --with-distro=arch \ --disable-ppp \ - --with-iptables=/usr/sbin/iptables + --with-iptables=/usr/sbin/iptables \ + --disable-ifupdown \ + --disable-ifnet # uClibc by default doesn't have backtrace support, so don't use it ifeq ($(BR2_TOOLCHAIN_BUILDROOT)$(BR2_TOOLCHAIN_EXTERNAL_UCLIBC)$(BR2_TOOLCHAIN_CTNG_uClibc),y) NETWORK_MANAGER_CONF_OPT += --disable-crashtrace endif -# The target was built for the archlinux distribution, so we need -# to move around things after installation -define NETWORK_MANAGER_INSTALL_INITSCRIPT +define NETWORK_MANAGER_INSTALL_INIT_SYSV $(INSTALL) -m 0755 -D package/network-manager/S45network-manager $(TARGET_DIR)/etc/init.d/S45network-manager - rm -f $(TARGET_DIR)/etc/rc.d/networkmanager - rmdir --ignore-fail-on-non-empty $(TARGET_DIR)/etc/rc.d endef -NETWORK_MANAGER_POST_INSTALL_TARGET_HOOKS += NETWORK_MANAGER_INSTALL_INITSCRIPT - $(eval $(autotools-package)) -- cgit v1.2.3 From 9fc981ab3ab04276371b4c4a0125f729323ba82f Mon Sep 17 00:00:00 2001 From: Arn R Date: Wed, 29 May 2013 03:42:17 +0000 Subject: logrotate: Bump version to 3.8.4 The changelog for logrotate indicates some CVE's were fixed in 3.8.0. (changelog at http://svn.fedorahosted.org/svn/logrotate/tags/r3-8-4/CHANGES) Signed-off-by: Arne Rovet Signed-off-by: Peter Korsgaard --- package/logrotate/logrotate.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package/logrotate/logrotate.mk b/package/logrotate/logrotate.mk index da8e4b362..c920b46df 100644 --- a/package/logrotate/logrotate.mk +++ b/package/logrotate/logrotate.mk @@ -3,7 +3,7 @@ # logrotate # ############################################################# -LOGROTATE_VERSION = 3.7.9 +LOGROTATE_VERSION = 3.8.4 LOGROTATE_SOURCE = logrotate-$(LOGROTATE_VERSION).tar.gz LOGROTATE_SITE = https://fedorahosted.org/releases/l/o/logrotate/ LOGROTATE_LICENSE = GPLv2+ -- cgit v1.2.3 From 1ca4ff63f295090eb68afcd4dc0a6d695a89b0a8 Mon Sep 17 00:00:00 2001 From: Gustavo Zacarias Date: Mon, 27 May 2013 06:41:58 +0000 Subject: configs: add sample for olimex mx233 olinuxino Signed-off-by: Gustavo Zacarias Signed-off-by: Peter Korsgaard --- ...x-01-mmc-mxs-mmc-add-cd-inverted-property.patch | 47 ++++++ ...02-mmc-mxs-mmc-add-non-removable-property.patch | 53 ++++++ ...nux-03-mmc-mxs-mmc-add-broken-cd-property.patch | 50 ++++++ ...-imx23-olinuxino-mark-sdcard-cd-as-broken.patch | 28 +++ board/olimex/imx233_olinuxino/linux-3.9.config | 188 +++++++++++++++++++++ .../mxs-bootlets/mxs-bootlets-01-olinuxino.patch | 122 +++++++++++++ board/olimex/imx233_olinuxino/readme.txt | 55 ++++++ configs/olimex_imx233_olinuxino_defconfig | 33 ++++ 8 files changed, 576 insertions(+) create mode 100644 board/olimex/imx233_olinuxino/linux-01-mmc-mxs-mmc-add-cd-inverted-property.patch create mode 100644 board/olimex/imx233_olinuxino/linux-02-mmc-mxs-mmc-add-non-removable-property.patch create mode 100644 board/olimex/imx233_olinuxino/linux-03-mmc-mxs-mmc-add-broken-cd-property.patch create mode 100644 board/olimex/imx233_olinuxino/linux-04-ARM-dts-imx23-olinuxino-mark-sdcard-cd-as-broken.patch create mode 100644 board/olimex/imx233_olinuxino/linux-3.9.config create mode 100644 board/olimex/imx233_olinuxino/mxs-bootlets/mxs-bootlets-01-olinuxino.patch create mode 100644 board/olimex/imx233_olinuxino/readme.txt create mode 100644 configs/olimex_imx233_olinuxino_defconfig diff --git a/board/olimex/imx233_olinuxino/linux-01-mmc-mxs-mmc-add-cd-inverted-property.patch b/board/olimex/imx233_olinuxino/linux-01-mmc-mxs-mmc-add-cd-inverted-property.patch new file mode 100644 index 000000000..6e58c8cd7 --- /dev/null +++ b/board/olimex/imx233_olinuxino/linux-01-mmc-mxs-mmc-add-cd-inverted-property.patch @@ -0,0 +1,47 @@ +From 4c0c9be05004d1eb674b7586216b3d93cc04531c Mon Sep 17 00:00:00 2001 +From: Marc Kleine-Budde +Date: Wed, 10 Apr 2013 11:13:43 +0200 +Subject: [PATCH 1/3] mmc: mxs-mmc: add cd-inverted property + +The card-detect GPIO is inverted on some boards. Handle such case. + +Acked-by: Shawn Guo +Signed-off-by: Marc Kleine-Budde +Signed-off-by: Chris Ball +--- + drivers/mmc/host/mxs-mmc.c | 5 ++++- + 1 file changed, 4 insertions(+), 1 deletion(-) + +diff --git a/drivers/mmc/host/mxs-mmc.c b/drivers/mmc/host/mxs-mmc.c +index 4efe302..0cdf1f6 100644 +--- a/drivers/mmc/host/mxs-mmc.c ++++ b/drivers/mmc/host/mxs-mmc.c +@@ -72,6 +72,7 @@ struct mxs_mmc_host { + int sdio_irq_en; + int wp_gpio; + bool wp_inverted; ++ bool cd_inverted; + }; + + static int mxs_mmc_get_ro(struct mmc_host *mmc) +@@ -96,7 +97,7 @@ static int mxs_mmc_get_cd(struct mmc_host *mmc) + struct mxs_ssp *ssp = &host->ssp; + + return !(readl(ssp->base + HW_SSP_STATUS(ssp)) & +- BM_SSP_STATUS_CARD_DETECT); ++ BM_SSP_STATUS_CARD_DETECT)) ^ host->cd_inverted; + } + + static void mxs_mmc_reset(struct mxs_mmc_host *host) +@@ -691,6 +692,8 @@ static int mxs_mmc_probe(struct platform_device *pdev) + if (flags & OF_GPIO_ACTIVE_LOW) + host->wp_inverted = 1; + ++ host->cd_inverted = of_property_read_bool(np, "cd-inverted"); ++ + mmc->f_min = 400000; + mmc->f_max = 288000000; + mmc->ocr_avail = MMC_VDD_32_33 | MMC_VDD_33_34; +-- +1.8.1.5 + diff --git a/board/olimex/imx233_olinuxino/linux-02-mmc-mxs-mmc-add-non-removable-property.patch b/board/olimex/imx233_olinuxino/linux-02-mmc-mxs-mmc-add-non-removable-property.patch new file mode 100644 index 000000000..f7446cada --- /dev/null +++ b/board/olimex/imx233_olinuxino/linux-02-mmc-mxs-mmc-add-non-removable-property.patch @@ -0,0 +1,53 @@ +From 5086e5f41fd107539911edf62f2d202753ed1980 Mon Sep 17 00:00:00 2001 +From: Marc Kleine-Budde +Date: Wed, 10 Apr 2013 11:13:44 +0200 +Subject: [PATCH 2/3] mmc: mxs-mmc: add non-removable property + +Some boards have non removable cards like eMMC. Handle such case. + +Signed-off-by: Marc Kleine-Budde +Acked-by: Shawn Guo +Signed-off-by: Chris Ball +--- + drivers/mmc/host/mxs-mmc.c | 10 +++++++--- + 1 file changed, 7 insertions(+), 3 deletions(-) + +diff --git a/drivers/mmc/host/mxs-mmc.c b/drivers/mmc/host/mxs-mmc.c +index 0cdf1f6..c231881 100644 +--- a/drivers/mmc/host/mxs-mmc.c ++++ b/drivers/mmc/host/mxs-mmc.c +@@ -73,6 +73,7 @@ struct mxs_mmc_host { + int wp_gpio; + bool wp_inverted; + bool cd_inverted; ++ bool non_removable; + }; + + static int mxs_mmc_get_ro(struct mmc_host *mmc) +@@ -96,8 +97,9 @@ static int mxs_mmc_get_cd(struct mmc_host *mmc) + struct mxs_mmc_host *host = mmc_priv(mmc); + struct mxs_ssp *ssp = &host->ssp; + +- return !(readl(ssp->base + HW_SSP_STATUS(ssp)) & +- BM_SSP_STATUS_CARD_DETECT)) ^ host->cd_inverted; ++ return host->non_removable || ++ !(readl(ssp->base + HW_SSP_STATUS(ssp)) & ++ BM_SSP_STATUS_CARD_DETECT) ^ host->cd_inverted; + } + + static void mxs_mmc_reset(struct mxs_mmc_host *host) +@@ -687,8 +689,10 @@ static int mxs_mmc_probe(struct platform_device *pdev) + mmc->caps |= MMC_CAP_4_BIT_DATA; + else if (bus_width == 8) + mmc->caps |= MMC_CAP_4_BIT_DATA | MMC_CAP_8_BIT_DATA; ++ host->non_removable = of_property_read_bool(np, "non-removable"); ++ if (host->non_removable) ++ mmc->caps |= MMC_CAP_NONREMOVABLE; + host->wp_gpio = of_get_named_gpio_flags(np, "wp-gpios", 0, &flags); +- + if (flags & OF_GPIO_ACTIVE_LOW) + host->wp_inverted = 1; + +-- +1.8.1.5 + diff --git a/board/olimex/imx233_olinuxino/linux-03-mmc-mxs-mmc-add-broken-cd-property.patch b/board/olimex/imx233_olinuxino/linux-03-mmc-mxs-mmc-add-broken-cd-property.patch new file mode 100644 index 000000000..b5ceb0343 --- /dev/null +++ b/board/olimex/imx233_olinuxino/linux-03-mmc-mxs-mmc-add-broken-cd-property.patch @@ -0,0 +1,50 @@ +From 1d53196a0d604fcf636203fac21e944b6a9cf275 Mon Sep 17 00:00:00 2001 +From: Hector Palacios +Date: Wed, 10 Apr 2013 11:13:45 +0200 +Subject: [PATCH 3/3] mmc: mxs-mmc: add broken-cd property + +According to bindings documentation for mmc, the property 'broken-cd' +can be used to indicate card-detection is not available and polling +must be used instead. This patch retrieves this property +and sets a custom flag. On the get_cd() hook, it returns 1 if +the flag is set, to always assume the card is present. + +Signed-off-by: Hector Palacios +Signed-off-by: Marc Kleine-Budde +Signed-off-by: Chris Ball +--- + drivers/mmc/host/mxs-mmc.c | 4 +++- + 1 file changed, 3 insertions(+), 1 deletion(-) + +diff --git a/drivers/mmc/host/mxs-mmc.c b/drivers/mmc/host/mxs-mmc.c +index c231881..146a53b 100644 +--- a/drivers/mmc/host/mxs-mmc.c ++++ b/drivers/mmc/host/mxs-mmc.c +@@ -73,6 +73,7 @@ struct mxs_mmc_host { + int wp_gpio; + bool wp_inverted; + bool cd_inverted; ++ bool broken_cd; + bool non_removable; + }; + +@@ -97,7 +98,7 @@ static int mxs_mmc_get_cd(struct mmc_host *mmc) + struct mxs_mmc_host *host = mmc_priv(mmc); + struct mxs_ssp *ssp = &host->ssp; + +- return host->non_removable || ++ return host->non_removable || host->broken_cd || + !(readl(ssp->base + HW_SSP_STATUS(ssp)) & + BM_SSP_STATUS_CARD_DETECT) ^ host->cd_inverted; + } +@@ -689,6 +690,7 @@ static int mxs_mmc_probe(struct platform_device *pdev) + mmc->caps |= MMC_CAP_4_BIT_DATA; + else if (bus_width == 8) + mmc->caps |= MMC_CAP_4_BIT_DATA | MMC_CAP_8_BIT_DATA; ++ host->broken_cd = of_property_read_bool(np, "broken-cd"); + host->non_removable = of_property_read_bool(np, "non-removable"); + if (host->non_removable) + mmc->caps |= MMC_CAP_NONREMOVABLE; +-- +1.8.1.5 + diff --git a/board/olimex/imx233_olinuxino/linux-04-ARM-dts-imx23-olinuxino-mark-sdcard-cd-as-broken.patch b/board/olimex/imx233_olinuxino/linux-04-ARM-dts-imx23-olinuxino-mark-sdcard-cd-as-broken.patch new file mode 100644 index 000000000..7ce42b902 --- /dev/null +++ b/board/olimex/imx233_olinuxino/linux-04-ARM-dts-imx23-olinuxino-mark-sdcard-cd-as-broken.patch @@ -0,0 +1,28 @@ +From 1897fda94190498573f9d1b72bc6b7b58c720957 Mon Sep 17 00:00:00 2001 +From: Alexandre Pereira da Silva +Date: Sat, 6 Apr 2013 10:42:10 -0300 +Subject: [PATCH 1/1] ARM: dts: imx23-olinuxino: mark sdcard cd as broken + +The imx23-olinuxino sdcard doesn't have card detect. + +Signed-off-by: Alexandre Pereira da Silva +Signed-off-by: Shawn Guo +--- + arch/arm/boot/dts/imx23-olinuxino.dts | 1 + + 1 file changed, 1 insertion(+) + +diff --git a/arch/arm/boot/dts/imx23-olinuxino.dts b/arch/arm/boot/dts/imx23-olinuxino.dts +index e7484e4..d107c4a 100644 +--- a/arch/arm/boot/dts/imx23-olinuxino.dts ++++ b/arch/arm/boot/dts/imx23-olinuxino.dts +@@ -29,6 +29,7 @@ + pinctrl-names = "default"; + pinctrl-0 = <&mmc0_4bit_pins_a &mmc0_pins_fixup>; + bus-width = <4>; ++ broken-cd; + status = "okay"; + }; + +-- +1.8.1.5 + diff --git a/board/olimex/imx233_olinuxino/linux-3.9.config b/board/olimex/imx233_olinuxino/linux-3.9.config new file mode 100644 index 000000000..eceee9838 --- /dev/null +++ b/board/olimex/imx233_olinuxino/linux-3.9.config @@ -0,0 +1,188 @@ +CONFIG_EXPERIMENTAL=y +CONFIG_SYSVIPC=y +CONFIG_NO_HZ=y +CONFIG_HIGH_RES_TIMERS=y +CONFIG_TASKSTATS=y +CONFIG_TASK_DELAY_ACCT=y +CONFIG_TASK_XACCT=y +CONFIG_TASK_IO_ACCOUNTING=y +CONFIG_IKCONFIG=y +CONFIG_IKCONFIG_PROC=y +# CONFIG_UTS_NS is not set +# CONFIG_IPC_NS is not set +# CONFIG_PID_NS is not set +# CONFIG_NET_NS is not set +CONFIG_PERF_EVENTS=y +# CONFIG_COMPAT_BRK is not set +CONFIG_MODULES=y +CONFIG_MODULE_FORCE_LOAD=y +CONFIG_MODULE_UNLOAD=y +CONFIG_MODULE_FORCE_UNLOAD=y +CONFIG_MODVERSIONS=y +CONFIG_BLK_DEV_INTEGRITY=y +# CONFIG_IOSCHED_DEADLINE is not set +# CONFIG_IOSCHED_CFQ is not set +CONFIG_ARCH_MXS=y +CONFIG_MACH_MXS_DT=y +CONFIG_ARM_THUMB=y +CONFIG_PREEMPT_VOLUNTARY=y +CONFIG_AEABI=y +CONFIG_ATAGS=y +CONFIG_CMDLINE="console=ttyAMA0,115200 root=/dev/mmcblk0p2 rw rootwait" +CONFIG_CMDLINE_FROM_BOOTLOADER=y +CONFIG_AUTO_ZRELADDR=y +CONFIG_NET=y +CONFIG_PACKET=y +CONFIG_UNIX=y +CONFIG_INET=y +CONFIG_IP_PNP=y +CONFIG_IP_PNP_DHCP=y +CONFIG_SYN_COOKIES=y +# CONFIG_INET_XFRM_MODE_TRANSPORT is not set +# CONFIG_INET_XFRM_MODE_TUNNEL is not set +# CONFIG_INET_XFRM_MODE_BEET is not set +# CONFIG_INET_LRO is not set +# CONFIG_INET_DIAG is not set +# CONFIG_IPV6 is not set +CONFIG_CAN=m +CONFIG_CAN_RAW=m +CONFIG_CAN_BCM=m +CONFIG_CAN_FLEXCAN=m +# CONFIG_WIRELESS is not set +CONFIG_DEVTMPFS=y +CONFIG_DEVTMPFS_MOUNT=y +# CONFIG_FIRMWARE_IN_KERNEL is not set +CONFIG_MTD=y +CONFIG_MTD_CMDLINE_PARTS=y +CONFIG_MTD_CHAR=y +CONFIG_MTD_BLOCK=y +CONFIG_MTD_DATAFLASH=y +CONFIG_MTD_M25P80=y +# CONFIG_M25PXX_USE_FAST_READ is not set +CONFIG_MTD_SST25L=y +CONFIG_MTD_NAND=y +CONFIG_MTD_NAND_GPMI_NAND=y +CONFIG_MTD_UBI=y +# CONFIG_BLK_DEV is not set +CONFIG_EEPROM_AT24=y +CONFIG_SCSI=y +CONFIG_BLK_DEV_SD=y +CONFIG_NETDEVICES=y +CONFIG_ENC28J60=y +CONFIG_USB_USBNET=y +CONFIG_USB_NET_SMSC95XX=y +CONFIG_SMSC_PHY=y +CONFIG_ICPLUS_PHY=y +CONFIG_REALTEK_PHY=y +CONFIG_MICREL_PHY=y +# CONFIG_WLAN is not set +# CONFIG_INPUT_MOUSEDEV_PSAUX is not set +CONFIG_INPUT_EVDEV=m +# CONFIG_INPUT_KEYBOARD is not set +# CONFIG_INPUT_MOUSE is not set +CONFIG_INPUT_TOUCHSCREEN=y +CONFIG_TOUCHSCREEN_TSC2007=m +# CONFIG_SERIO is not set +CONFIG_VT_HW_CONSOLE_BINDING=y +CONFIG_DEVPTS_MULTIPLE_INSTANCES=y +# CONFIG_LEGACY_PTYS is not set +# CONFIG_DEVKMEM is not set +CONFIG_SERIAL_AMBA_PL011=y +CONFIG_SERIAL_AMBA_PL011_CONSOLE=y +CONFIG_SERIAL_MXS_AUART=y +# CONFIG_HW_RANDOM is not set +CONFIG_I2C=y +# CONFIG_I2C_COMPAT is not set +CONFIG_I2C_CHARDEV=y +CONFIG_I2C_MXS=y +CONFIG_SPI=y +CONFIG_SPI_GPIO=m +CONFIG_SPI_MXS=y +CONFIG_DEBUG_GPIO=y +CONFIG_GPIO_SYSFS=y +# CONFIG_HWMON is not set +CONFIG_REGULATOR=y +CONFIG_REGULATOR_FIXED_VOLTAGE=y +CONFIG_FB=y +CONFIG_FB_MXS=y +CONFIG_BACKLIGHT_LCD_SUPPORT=y +CONFIG_LCD_CLASS_DEVICE=y +CONFIG_BACKLIGHT_CLASS_DEVICE=y +CONFIG_BACKLIGHT_PWM=y +CONFIG_FRAMEBUFFER_CONSOLE=y +CONFIG_FONTS=y +CONFIG_LOGO=y +CONFIG_SOUND=y +CONFIG_SND=y +CONFIG_SND_SOC=y +CONFIG_SND_MXS_SOC=y +CONFIG_SND_SOC_MXS_SGTL5000=y +CONFIG_USB=y +CONFIG_USB_EHCI_HCD=y +CONFIG_USB_CHIPIDEA=y +CONFIG_USB_CHIPIDEA_HOST=y +CONFIG_USB_STORAGE=y +CONFIG_USB_MXS_PHY=y +CONFIG_MMC=y +CONFIG_MMC_MXS=y +CONFIG_NEW_LEDS=y +CONFIG_LEDS_CLASS=y +CONFIG_LEDS_GPIO=y +CONFIG_LEDS_TRIGGERS=y +CONFIG_LEDS_TRIGGER_TIMER=y +CONFIG_LEDS_TRIGGER_ONESHOT=y +CONFIG_LEDS_TRIGGER_HEARTBEAT=y +CONFIG_LEDS_TRIGGER_BACKLIGHT=y +CONFIG_LEDS_TRIGGER_GPIO=y +CONFIG_RTC_CLASS=y +CONFIG_RTC_DRV_DS1307=m +CONFIG_RTC_DRV_STMP=y +CONFIG_DMADEVICES=y +CONFIG_MXS_DMA=y +CONFIG_STAGING=y +CONFIG_MXS_LRADC=y +CONFIG_IIO_SYSFS_TRIGGER=y +CONFIG_COMMON_CLK_DEBUG=y +CONFIG_IIO=y +CONFIG_PWM=y +CONFIG_PWM_MXS=y +CONFIG_EXT2_FS=y +CONFIG_EXT2_FS_XATTR=y +CONFIG_EXT3_FS=y +CONFIG_EXT4_FS=y +# CONFIG_DNOTIFY is not set +CONFIG_FSCACHE=m +CONFIG_FSCACHE_STATS=y +CONFIG_CACHEFILES=m +CONFIG_TMPFS=y +CONFIG_TMPFS_POSIX_ACL=y +CONFIG_JFFS2_FS=y +CONFIG_JFFS2_COMPRESSION_OPTIONS=y +CONFIG_JFFS2_LZO=y +CONFIG_JFFS2_RUBIN=y +CONFIG_UBIFS_FS=y +CONFIG_UBIFS_FS_ADVANCED_COMPR=y +CONFIG_NFS_FS=y +CONFIG_NFS_V3_ACL=y +CONFIG_NFS_V4=y +CONFIG_ROOT_NFS=y +CONFIG_NLS_CODEPAGE_437=y +CONFIG_NLS_CODEPAGE_850=y +CONFIG_NLS_ISO8859_1=y +CONFIG_NLS_ISO8859_15=y +CONFIG_PRINTK_TIME=y +CONFIG_FRAME_WARN=2048 +CONFIG_MAGIC_SYSRQ=y +CONFIG_UNUSED_SYMBOLS=y +CONFIG_DEBUG_KERNEL=y +CONFIG_LOCKUP_DETECTOR=y +CONFIG_TIMER_STATS=y +CONFIG_PROVE_LOCKING=y +CONFIG_DEBUG_INFO=y +CONFIG_BLK_DEV_IO_TRACE=y +CONFIG_STRICT_DEVMEM=y +CONFIG_DEBUG_USER=y +# CONFIG_CRYPTO_ANSI_CPRNG is not set +# CONFIG_CRYPTO_HW is not set +CONFIG_CRC_ITU_T=m +CONFIG_CRC7=m diff --git a/board/olimex/imx233_olinuxino/mxs-bootlets/mxs-bootlets-01-olinuxino.patch b/board/olimex/imx233_olinuxino/mxs-bootlets/mxs-bootlets-01-olinuxino.patch new file mode 100644 index 000000000..91b57c3d7 --- /dev/null +++ b/board/olimex/imx233_olinuxino/mxs-bootlets/mxs-bootlets-01-olinuxino.patch @@ -0,0 +1,122 @@ +Forward-ported patch from https://github.com/koliqi/imx23-olinuxino +for mxs-bootlets-10.12.01 + +Signed-off-by: Gustavo Zacarias + +diff -Nura imx-bootlets-src-10.12.01/linux_prep/board/imx23_olinuxino_dev.c imx-bootlets-src-10.12.01-olinuxino/linux_prep/board/imx23_olinuxino_dev.c +--- imx-bootlets-src-10.12.01/linux_prep/board/imx23_olinuxino_dev.c 1969-12-31 21:00:00.000000000 -0300 ++++ imx-bootlets-src-10.12.01-olinuxino/linux_prep/board/imx23_olinuxino_dev.c 2013-05-17 15:07:33.282961551 -0300 +@@ -0,0 +1,54 @@ ++/* ++ * Platform specific data for the IMX23_OLINUXINO development board ++ * ++ * Fadil Berisha ++ * ++ * Copyright 2008 SigmaTel, Inc ++ * Copyright 2008 Embedded Alley Solutions, Inc ++ * Copyright 2009-2010 Freescale Semiconductor, Inc. All Rights Reserved. ++ * ++ * This file is licensed under the terms of the GNU General Public License ++ * version 2. This program is licensed "as is" without any warranty of any ++ * kind, whether express or implied. ++ * ++ * http://www.opensource.org/licenses/gpl-license.html ++ * http://www.gnu.org/copyleft/gpl.html ++ */ ++#include ++#include ++#include ++ ++/************************************************ ++ * LRADC keyboard data * ++ ************************************************/ ++int lradc_keypad_ch = LRADC_CH0; ++int lradc_vddio_ch = LRADC_CH6; ++ ++struct lradc_keycode lradc_keycodes[] = { ++ { 100, KEY4 }, ++ { 306, KEY5 }, ++ { 601, KEY6 }, ++ { 932, KEY7 }, ++ { 1260, KEY8 }, ++ { 1424, KEY9 }, ++ { 1707, KEY10 }, ++ { 2207, KEY11 }, ++ { 2525, KEY12 }, ++ { 2831, KEY13 }, ++ { 3134, KEY14 }, ++ { -1, 0 }, ++}; ++ ++/************************************************ ++ * Magic key combinations for Armadillo * ++ ************************************************/ ++u32 magic_keys[MAGIC_KEY_NR] = { ++ [MAGIC_KEY1] = KEY4, ++ [MAGIC_KEY2] = KEY6, ++ [MAGIC_KEY3] = KEY10, ++}; ++ ++/************************************************ ++ * Default command line * ++ ************************************************/ ++char cmdline_def[] = "console=ttyAMA0,115200"; +diff -Nura imx-bootlets-src-10.12.01/linux_prep/cmdlines/imx23_olinuxino_dev.txt imx-bootlets-src-10.12.01-olinuxino/linux_prep/cmdlines/imx23_olinuxino_dev.txt +--- imx-bootlets-src-10.12.01/linux_prep/cmdlines/imx23_olinuxino_dev.txt 1969-12-31 21:00:00.000000000 -0300 ++++ imx-bootlets-src-10.12.01-olinuxino/linux_prep/cmdlines/imx23_olinuxino_dev.txt 2013-05-17 15:07:49.663496106 -0300 +@@ -0,0 +1,3 @@ ++noinitrd console=ttyAMA0,115200 root=/dev/mmcblk0p2 rw rootwait ssp1=mmc ++noinitrd console=ttyAMA0,115200 root=/dev/mmcblk0p2 rw rootwait ssp1=mmc ++noinitrd console=ttyAMA0,115200 root=/dev/mmcblk0p2 rw rootwait ssp1=mmc +diff -Nura imx-bootlets-src-10.12.01/linux_prep/core/setup.c imx-bootlets-src-10.12.01-olinuxino/linux_prep/core/setup.c +--- imx-bootlets-src-10.12.01/linux_prep/core/setup.c 2010-11-04 04:35:38.000000000 -0300 ++++ imx-bootlets-src-10.12.01-olinuxino/linux_prep/core/setup.c 2013-05-17 15:08:39.246114205 -0300 +@@ -84,6 +84,8 @@ + #include "../../mach-mx28/includes/registers/regsrtc.h" + #elif defined(STMP378X) + #include "../../mach-mx23/includes/registers/regsrtc.h" ++#elif defined(IMX23_OLINUXINO) ++#include "../../mach-mx23/includes/registers/regsrtc.h" + #endif + + #define NAND_SECONDARY_BOOT 0x00000002 +diff -Nura imx-bootlets-src-10.12.01/linux_prep/include/mx23/platform.h imx-bootlets-src-10.12.01-olinuxino/linux_prep/include/mx23/platform.h +--- imx-bootlets-src-10.12.01/linux_prep/include/mx23/platform.h 2010-11-04 04:35:38.000000000 -0300 ++++ imx-bootlets-src-10.12.01-olinuxino/linux_prep/include/mx23/platform.h 2013-05-17 15:09:21.006476997 -0300 +@@ -19,6 +19,8 @@ + + #if defined (BOARD_STMP378X_DEV) + #define MACHINE_ID 0xa45 ++#elif defined (BOARD_IMX23_OLINUXINO_DEV) ++#define MACHINE_ID 0x1009 + #else + #error "Allocate a machine ID for your board" + #endif +diff -Nura imx-bootlets-src-10.12.01/linux_prep/Makefile imx-bootlets-src-10.12.01-olinuxino/linux_prep/Makefile +--- imx-bootlets-src-10.12.01/linux_prep/Makefile 2010-11-04 04:35:38.000000000 -0300 ++++ imx-bootlets-src-10.12.01-olinuxino/linux_prep/Makefile 2013-05-17 15:09:53.554539143 -0300 +@@ -69,6 +69,11 @@ + HW_OBJS = $(LRADC_OBJS) + CFLAGS += -DMX28 -DBOARD_MX28_EVK + endif ++ifeq ($(BOARD), imx23_olinuxino_dev) ++ARCH = mx23 ++HW_OBJS = $(LRADC_OBJS) ++CFLAGS += -DIMX23_OLINUXINO -DBOARD_IMX23_OLINUXINO_DEV ++endif + + # Generic code + CORE_OBJS = entry.o resume.o cmdlines.o setup.o keys.o +diff -Nura imx-bootlets-src-10.12.01/Makefile imx-bootlets-src-10.12.01-olinuxino/Makefile +--- imx-bootlets-src-10.12.01/Makefile 2010-11-04 04:35:38.000000000 -0300 ++++ imx-bootlets-src-10.12.01-olinuxino/Makefile 2013-05-17 15:23:53.709956619 -0300 +@@ -16,6 +16,9 @@ + ifeq ($(BOARD), iMX28_EVK) + ARCH = mx28 + endif ++ifeq ($(BOARD), imx23_olinuxino_dev) ++ARCH = mx23 ++endif + + all: build_prep gen_bootstream + diff --git a/board/olimex/imx233_olinuxino/readme.txt b/board/olimex/imx233_olinuxino/readme.txt new file mode 100644 index 000000000..fa3f9e15c --- /dev/null +++ b/board/olimex/imx233_olinuxino/readme.txt @@ -0,0 +1,55 @@ +This configuration is intended as a base image, it doesn't have support +for things like WiFi, either in the kernel or packages. + +It also pulls up the console on the serial port, not on TV output. + +You'll need a spare MicroSD card with Freescale's special partition layout. +This is basically two partitions: + +1) Type 53, the bootstrap + bootloader/kernel partition, should be 16MB. +2) Anything you like, for this example an ext2 partition, type 83 (linux). + +Assuming you see your MicroSD card as /dev/sdc you'd need to do, as root +and from the buildroot project top level directory: +(remember to replace /dev/sdc* with the appropiate device name!) + +***** WARNING: Double check that /dev/sdc is your MicroSD card ***** +***** It might be /dev/sdb or some other device name ***** +***** Failure to do so may result in you wiping your hard disk ***** + +1. Unmount the filesystem(s) if they're already mounted, usually... + + # for fs in `grep /dev/sdc /proc/mounts|cut -d ' ' -f 1`;do umount $fs;done + + ...should work + +2. Blank the partition table out + + # dd if=/dev/zero of=/dev/sdc bs=1024 count=1024 + +3. Set up the partitions + + # fdisk /dev/sdc + n + p + 1 + + +16MB + t + 53 + n + p + 2 + + + w + +4. Fill up the first (bootstrap + kernel) partition + # dd if=output/images/imx23_olinuxino_dev_linux.sb bs=512 of=/dev/sdc1 seek=4 + +5. Fill up the second (filesystem) partition + # dd if=output/images/rootfs.ext2 of=/dev/sdc2 bs=512 + +6. Remove the MicroSD card from your linux PC and put it into your olinuxino. + +7. Boot! You're done! diff --git a/configs/olimex_imx233_olinuxino_defconfig b/configs/olimex_imx233_olinuxino_defconfig new file mode 100644 index 000000000..206e46860 --- /dev/null +++ b/configs/olimex_imx233_olinuxino_defconfig @@ -0,0 +1,33 @@ +# Architecture +BR2_arm=y +BR2_arm926t=y + +# Patches (mxs-bootlets) +BR2_GLOBAL_PATCH_DIR="board/olimex/imx233_olinuxino" + +# System +BR2_TARGET_GENERIC_GETTY=y +BR2_TARGET_GENERIC_GETTY_PORT="ttyAMA0" + +# Filesystem +BR2_TARGET_ROOTFS_EXT2=y +# BR2_TARGET_ROOTFS_TAR is not set + +# Lock to 3.9 headers to avoid breaking with newer kernels +BR2_KERNEL_HEADERS_3_9=y + +# Bootloader +BR2_TARGET_MXS_BOOTLETS=y +BR2_TARGET_MXS_BOOTLETS_CUSTOM_PATCH_DIR="board/olimex/imx233_olinuxino" +BR2_TARGET_MXS_BOOTLETS_CUSTOM_BOARD=y +BR2_TARGET_MXS_BOOTLETS_CUSTOM_BOARD_NAME="imx23_olinuxino_dev" + +# Kernel +BR2_LINUX_KERNEL=y +BR2_LINUX_KERNEL_CUSTOM_VERSION=y +BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="3.9.4" +BR2_LINUX_KERNEL_USE_CUSTOM_CONFIG=y +BR2_LINUX_KERNEL_CUSTOM_CONFIG_FILE="board/olimex/imx233_olinuxino/linux-3.9.config" +BR2_LINUX_KERNEL_PATCH="board/olimex/imx233_olinuxino" +BR2_LINUX_KERNEL_APPENDED_ZIMAGE=y +BR2_LINUX_KERNEL_INTREE_DTS_NAME="imx23-olinuxino" -- cgit v1.2.3 From 03bc3c3bdcffbef498b9072e9cd1c079fd0dd26a Mon Sep 17 00:00:00 2001 From: "Yann E. MORIN" Date: Sat, 25 May 2013 10:33:32 +0000 Subject: system/device-table: do not set /home/default stgid Currently, /home/default is mode 2755 which means it is setgid. Since /home/default is not group-writable, it is useless. Signed-off-by: "Yann E. MORIN" Acked-by: Samuel Martin Signed-off-by: Peter Korsgaard --- system/device_table.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/system/device_table.txt b/system/device_table.txt index 421728b08..43c0cfa0b 100644 --- a/system/device_table.txt +++ b/system/device_table.txt @@ -9,7 +9,7 @@ /dev d 755 0 0 - - - - - /tmp d 1777 0 0 - - - - - /etc d 755 0 0 - - - - - -/home/default d 2755 1000 1000 - - - - - +/home/default d 755 1000 1000 - - - - - /var/www d 755 33 33 - - - - - /etc/shadow f 600 0 0 - - - - - /etc/passwd f 644 0 0 - - - - - -- cgit v1.2.3 From 1460245354019df29ffc4c3d76ddd61cb14dfd04 Mon Sep 17 00:00:00 2001 From: Spenser Gilliland Date: Sun, 26 May 2013 12:12:20 -0500 Subject: libvpx: new package libvpx adds webm multimedia support and the VP8 encoder/decoder library. http://www.webmproject.org/ [Peter: strip trailing spaces, wrap help text] Signed-off-by: Spenser Gilliland Signed-off-by: Peter Korsgaard --- package/multimedia/Config.in | 1 + package/multimedia/libvpx/Config.in | 7 +++++ package/multimedia/libvpx/libvpx.mk | 53 +++++++++++++++++++++++++++++++++++++ 3 files changed, 61 insertions(+) create mode 100644 package/multimedia/libvpx/Config.in create mode 100644 package/multimedia/libvpx/libvpx.mk diff --git a/package/multimedia/Config.in b/package/multimedia/Config.in index 931e6d39a..dd74863fd 100644 --- a/package/multimedia/Config.in +++ b/package/multimedia/Config.in @@ -15,6 +15,7 @@ source "package/multimedia/gst-plugins-good/Config.in" source "package/multimedia/gst-plugins-bad/Config.in" source "package/multimedia/gst-plugins-ugly/Config.in" source "package/multimedia/lame/Config.in" +source "package/multimedia/libvpx/Config.in" source "package/multimedia/madplay/Config.in" source "package/multimedia/mpd/Config.in" source "package/multimedia/mpg123/Config.in" diff --git a/package/multimedia/libvpx/Config.in b/package/multimedia/libvpx/Config.in new file mode 100644 index 000000000..1332c564a --- /dev/null +++ b/package/multimedia/libvpx/Config.in @@ -0,0 +1,7 @@ +config BR2_PACKAGE_LIBVPX + bool "libvpx" + help + A high-quality, open video format that's freely available to + everyone. + + http://webmproject.org diff --git a/package/multimedia/libvpx/libvpx.mk b/package/multimedia/libvpx/libvpx.mk new file mode 100644 index 000000000..131fd49fa --- /dev/null +++ b/package/multimedia/libvpx/libvpx.mk @@ -0,0 +1,53 @@ +############################################################# +# +# libvpx +# +############################################################# + +LIBVPX_VERSION = v1.2.0 +LIBVPX_SITE = http://git.chromium.org/webm/libvpx.git +LIBVPX_SITE_METHOD = git + +LIBVPX_LICENSE = BSD-3c +LIBVPX_LICENSE_FILES = LICENSE PATENTS + +LIBVPX_INSTALL_STAGING = YES + +# ld is being used with cc options. therefore, pretend ld is cc. +LIBVPX_CONF_ENV = \ + LD="$(TARGET_CC)" \ + CROSS=$(GNU_TARGET_NAME) + +LIBVPX_CONF_OPT = \ + --disable-examples \ + --disable-docs \ + --disable-unit-tests + +# This is not a true autotools package. It is based on the ffmpeg build system +define LIBVPX_CONFIGURE_CMDS + (cd $(LIBVPX_SRCDIR) && rm -rf config.cache && \ + $(TARGET_CONFIGURE_OPTS) \ + $(TARGET_CONFIGURE_ARGS) \ + $(LIBVPX_CONF_ENV) \ + ./configure \ + --target=generic-gnu \ + --enable-pic \ + --prefix=/usr \ + $(SHARED_STATIC_LIBS_OPTS) \ + $(LIBVPX_CONF_OPT) \ + ) +endef + +define LIBVPX_BUILD_CMDS + $(TARGET_MAKE_ENV) $(LIBVPX_MAKE_ENV) $(MAKE) -C $(@D) all +endef + +define LIBVPX_INSTALL_STAGING_CMDS + $(TARGET_MAKE_ENV) $(LIBVPX_MAKE_ENV) $(MAKE) DESTDIR="$(STAGING_DIR)" -C $(@D) install +endef + +define LIBVPX_INSTALL_TARGET_CMDS + $(TARGET_MAKE_ENV) $(LIBVPX_MAKE_ENV) $(MAKE) DESTDIR="$(TARGET_DIR)" -C $(@D) install +endef + +$(eval $(generic-package)) -- cgit v1.2.3 From 37f6ecd4d02d1e0fdce70fe4a7b404a6e2d06426 Mon Sep 17 00:00:00 2001 From: Spenser Gilliland Date: Thu, 30 May 2013 06:30:36 +0000 Subject: libopenmax: Add libopenmax virtual package this adds the libopenmax virtual package for hardware based video acceleration [Peter: fix openmax-without-any-backends check] Signed-off-by: Spenser Gilliland Signed-off-by: Peter Korsgaard --- package/multimedia/bellagio/Config.in | 1 + package/opengl/Config.in | 3 +++ package/opengl/libopenmax/libopenmax.mk | 24 ++++++++++++++++++++++++ package/rpi-userland/Config.in | 1 + 4 files changed, 29 insertions(+) create mode 100644 package/opengl/libopenmax/libopenmax.mk diff --git a/package/multimedia/bellagio/Config.in b/package/multimedia/bellagio/Config.in index 1458f6370..d918f80ce 100644 --- a/package/multimedia/bellagio/Config.in +++ b/package/multimedia/bellagio/Config.in @@ -1,6 +1,7 @@ config BR2_PACKAGE_BELLAGIO bool "bellagio" depends on BR2_INSTALL_LIBSTDCPP + select BR2_PACKAGE_HAS_OPENMAX help Bellagio is an opensource implementation of the OpenMAX IL API. diff --git a/package/opengl/Config.in b/package/opengl/Config.in index 81616f99f..1636807a8 100644 --- a/package/opengl/Config.in +++ b/package/opengl/Config.in @@ -6,3 +6,6 @@ config BR2_PACKAGE_HAS_OPENGL_ES config BR2_PACKAGE_HAS_OPENVG bool + +config BR2_PACKAGE_HAS_OPENMAX + bool diff --git a/package/opengl/libopenmax/libopenmax.mk b/package/opengl/libopenmax/libopenmax.mk new file mode 100644 index 000000000..430760208 --- /dev/null +++ b/package/opengl/libopenmax/libopenmax.mk @@ -0,0 +1,24 @@ +############################################################# +# +# Virtual package for libopenmax +# +############################################################# + +LIBOPENMAX_SOURCE = + +ifeq ($(BR2_PACKAGE_RPI_USERLAND),y) +LIBOPENMAX_DEPENDENCIES += rpi-userland +endif + +ifeq ($(BR2_PACKAGE_BELLAGIO),y) +LIBOPENMAX_DEPENDENCIES += bellagio +endif + +ifeq ($(LIBOPENMAX_DEPENDENCIES),) +define LIBOPENMAX_CONFIGURE_CMDS + echo "No libopenmax implementation selected. Configuration error." + exit 1 +endef +endif + +$(eval $(generic-package)) diff --git a/package/rpi-userland/Config.in b/package/rpi-userland/Config.in index 2c35fb76c..da5726f2e 100644 --- a/package/rpi-userland/Config.in +++ b/package/rpi-userland/Config.in @@ -6,6 +6,7 @@ config BR2_PACKAGE_RPI_USERLAND select BR2_PACKAGE_HAS_OPENGL_EGL select BR2_PACKAGE_HAS_OPENGL_ES select BR2_PACKAGE_HAS_OPENVG + select BR2_PACKAGE_HAS_OPENMAX help Raspberry Pi Userland contains the necessary library to use the VideoCore driver. -- cgit v1.2.3 From a94650c184f78620eb63d2d25065c4ea3ceec8d8 Mon Sep 17 00:00:00 2001 From: Simon Dawson Date: Sun, 26 May 2013 23:16:55 +0000 Subject: neard: add init script Signed-off-by: Simon Dawson Signed-off-by: Peter Korsgaard --- package/neard/S53neard | 33 +++++++++++++++++++++++++++++++++ package/neard/neard.mk | 9 +++++++++ 2 files changed, 42 insertions(+) create mode 100755 package/neard/S53neard diff --git a/package/neard/S53neard b/package/neard/S53neard new file mode 100755 index 000000000..0a75941e2 --- /dev/null +++ b/package/neard/S53neard @@ -0,0 +1,33 @@ +#!/bin/sh +# +# Starts neard +# + +NAME=neard +DAEMON=/usr/libexec/nfc/$NAME + +# Exit gracefully if the package has been removed +[ -x $DAEMON ] || exit 0 + +case "$1" in + start) + echo -n "Starting $NAME: " + start-stop-daemon -S -q -p /var/run/${NAME}.pid -x $DAEMON -- -d '*' + echo "OK" + ;; + stop) + echo -n "Stopping $NAME: " + start-stop-daemon -K -q -p /var/run/${NAME}.pid + echo "OK" + ;; + restart|reload) + $0 stop + sleep 1 + $0 start + ;; + *) + echo "Usage: $0 {start|stop|restart}" + exit 1 +esac + +exit $? diff --git a/package/neard/neard.mk b/package/neard/neard.mk index cc6aeacae..57a434dd5 100644 --- a/package/neard/neard.mk +++ b/package/neard/neard.mk @@ -17,4 +17,13 @@ ifeq ($(BR2_PACKAGE_NEARD_TOOLS),y) NEARD_CONF_OPT += --enable-tools endif +define NEARD_INSTALL_INIT_SYSV + $(INSTALL) -D -m 0755 package/neard/S53neard \ + $(TARGET_DIR)/etc/init.d/S53neard +endef + +define NEARD_UNINSTALL_INIT_SYSV + $(RM) $(TARGET_DIR)/etc/init.d/S53neard +endef + $(eval $(autotools-package)) -- cgit v1.2.3 From 0d4133edfedd8ca641db39d3eec9dc7146c8fa4e Mon Sep 17 00:00:00 2001 From: Thomas Petazzoni Date: Mon, 27 May 2013 13:01:00 +0000 Subject: gettext: don't patch different the host and target build Until now, the gettext source code was being patched differently for the host and the target build, which is going to be incompatible with out-of-tree build. The difference is that the gettext tools could be disabled in the target build, but are always enabled on the host build. Therefore, this commit switches the gettext package to using proper patches against the relevant configure.ac and Makefile.am files. gettext is now being autoreconfigured. Configuration options are also passed for the host variant, in order to disable the build of a large number of things we don't care about. Finally, the two existing patches are renamed to include a number in their filename. Signed-off-by: Thomas Petazzoni Signed-off-by: Peter Korsgaard --- .../gettext/gettext-01-error_print_progname.patch | 14 + .../gettext/gettext-02-fix_rpl_gettimeofday.patch | 282 +++++++++++++++++++++ .../gettext-03-option-to-disable-tools.patch | 42 +++ .../gettext/gettext-04-remove-examples-tests.patch | 20 ++ package/gettext/gettext-05-use-shell.patch | 25 ++ package/gettext/gettext-error_print_progname.patch | 14 - package/gettext/gettext-fix_rpl_gettimeofday.patch | 282 --------------------- package/gettext/gettext.mk | 26 +- 8 files changed, 397 insertions(+), 308 deletions(-) create mode 100644 package/gettext/gettext-01-error_print_progname.patch create mode 100644 package/gettext/gettext-02-fix_rpl_gettimeofday.patch create mode 100644 package/gettext/gettext-03-option-to-disable-tools.patch create mode 100644 package/gettext/gettext-04-remove-examples-tests.patch create mode 100644 package/gettext/gettext-05-use-shell.patch delete mode 100644 package/gettext/gettext-error_print_progname.patch delete mode 100644 package/gettext/gettext-fix_rpl_gettimeofday.patch diff --git a/package/gettext/gettext-01-error_print_progname.patch b/package/gettext/gettext-01-error_print_progname.patch new file mode 100644 index 000000000..189d28b57 --- /dev/null +++ b/package/gettext/gettext-01-error_print_progname.patch @@ -0,0 +1,14 @@ +--- gettext-0.16.1.oorig/gettext-tools/gnulib-lib/error.h 2006-11-27 18:14:50.000000000 +0100 ++++ gettext-0.16.1/gettext-tools/gnulib-lib/error.h 2007-06-20 13:29:32.000000000 +0200 +@@ -50,7 +50,10 @@ extern void error_at_line (int __status, + /* If NULL, error will flush stdout, then print on stderr the program + name, a colon and a space. Otherwise, error will call this + function without parameters instead. */ +-extern DLL_VARIABLE void (*error_print_progname) (void); ++#ifndef __UCLIBC__ ++extern DLL_VARIABLE ++#endif ++void (*error_print_progname) (void); + + /* This variable is incremented each time `error' is called. */ + extern DLL_VARIABLE unsigned int error_message_count; diff --git a/package/gettext/gettext-02-fix_rpl_gettimeofday.patch b/package/gettext/gettext-02-fix_rpl_gettimeofday.patch new file mode 100644 index 000000000..e97ceb248 --- /dev/null +++ b/package/gettext/gettext-02-fix_rpl_gettimeofday.patch @@ -0,0 +1,282 @@ +Newer sys_time.in.h from gnulib breaks on uClibc with C++ so roll back +to a previous version that's known to work. + +Signed-off-by: Gustavo Zacarias + +diff -Nura gettext-0.18.2.1.orig/gettext-tools/gnulib-lib/sys_time.in.h gettext-0.18.2.1/gettext-tools/gnulib-lib/sys_time.in.h +--- gettext-0.18.2.1.orig/gettext-tools/gnulib-lib/sys_time.in.h 2013-03-12 09:17:10.530475932 -0300 ++++ gettext-0.18.2.1/gettext-tools/gnulib-lib/sys_time.in.h 2013-03-19 12:00:17.557958255 -0300 +@@ -1,6 +1,6 @@ + /* Provide a more complete sys/time.h. + +- Copyright (C) 2007-2013 Free Software Foundation, Inc. ++ Copyright (C) 2007-2012 Free Software Foundation, Inc. + + This program is free software; you can redistribute it and/or modify + it under the terms of the GNU General Public License as published by +@@ -17,34 +17,37 @@ + + /* Written by Paul Eggert. */ + +-#ifndef _@GUARD_PREFIX@_SYS_TIME_H +- + #if __GNUC__ >= 3 + @PRAGMA_SYSTEM_HEADER@ + #endif + @PRAGMA_COLUMNS@ + +-/* The include_next requires a split double-inclusion guard. */ +-#if @HAVE_SYS_TIME_H@ +-# @INCLUDE_NEXT@ @NEXT_SYS_TIME_H@ +-#endif ++#if defined _@GUARD_PREFIX@_SYS_TIME_H + +-#ifndef _@GUARD_PREFIX@_SYS_TIME_H +-#define _@GUARD_PREFIX@_SYS_TIME_H ++/* Simply delegate to the system's header, without adding anything. */ ++# if @HAVE_SYS_TIME_H@ ++# @INCLUDE_NEXT@ @NEXT_SYS_TIME_H@ ++# endif + +-#if ! @HAVE_SYS_TIME_H@ +-# include +-#endif ++#else ++ ++# define _@GUARD_PREFIX@_SYS_TIME_H ++ ++# if @HAVE_SYS_TIME_H@ ++# @INCLUDE_NEXT@ @NEXT_SYS_TIME_H@ ++# else ++# include ++# endif + + /* On native Windows with MSVC, get the 'struct timeval' type. + Also, on native Windows with a 64-bit time_t, where we are overriding the + 'struct timeval' type, get all declarations of system functions whose + signature contains 'struct timeval'. */ +-#if (defined _MSC_VER || @REPLACE_STRUCT_TIMEVAL@) && @HAVE_WINSOCK2_H@ && !defined _GL_INCLUDING_WINSOCK2_H +-# define _GL_INCLUDING_WINSOCK2_H +-# include +-# undef _GL_INCLUDING_WINSOCK2_H +-#endif ++# if (defined _MSC_VER || @REPLACE_STRUCT_TIMEVAL@) && @HAVE_WINSOCK2_H@ && !defined _GL_INCLUDING_WINSOCK2_H ++# define _GL_INCLUDING_WINSOCK2_H ++# include ++# undef _GL_INCLUDING_WINSOCK2_H ++# endif + + /* The definitions of _GL_FUNCDECL_RPL etc. are copied here. */ + +@@ -52,112 +55,112 @@ + + /* The definition of _GL_WARN_ON_USE is copied here. */ + +-#ifdef __cplusplus ++# ifdef __cplusplus + extern "C" { +-#endif ++# endif + +-#if !@HAVE_STRUCT_TIMEVAL@ || @REPLACE_STRUCT_TIMEVAL@ ++# if !@HAVE_STRUCT_TIMEVAL@ || @REPLACE_STRUCT_TIMEVAL@ + +-# if @REPLACE_STRUCT_TIMEVAL@ +-# define timeval rpl_timeval +-# endif ++# if @REPLACE_STRUCT_TIMEVAL@ ++# define timeval rpl_timeval ++# endif + +-# if !GNULIB_defined_struct_timeval ++# if !GNULIB_defined_struct_timeval + struct timeval + { + time_t tv_sec; + long int tv_usec; + }; +-# define GNULIB_defined_struct_timeval 1 +-# endif ++# define GNULIB_defined_struct_timeval 1 ++# endif + +-#endif ++# endif + +-#ifdef __cplusplus ++# ifdef __cplusplus + } +-#endif ++# endif + +-#if @GNULIB_GETTIMEOFDAY@ +-# if @REPLACE_GETTIMEOFDAY@ +-# if !(defined __cplusplus && defined GNULIB_NAMESPACE) +-# undef gettimeofday +-# define gettimeofday rpl_gettimeofday +-# endif ++# if @GNULIB_GETTIMEOFDAY@ ++# if @REPLACE_GETTIMEOFDAY@ ++# if !(defined __cplusplus && defined GNULIB_NAMESPACE) ++# undef gettimeofday ++# define gettimeofday rpl_gettimeofday ++# endif + _GL_FUNCDECL_RPL (gettimeofday, int, +- (struct timeval *restrict, void *restrict) ++ (struct timeval *__restrict, void *__restrict) + _GL_ARG_NONNULL ((1))); + _GL_CXXALIAS_RPL (gettimeofday, int, +- (struct timeval *restrict, void *restrict)); +-# else +-# if !@HAVE_GETTIMEOFDAY@ ++ (struct timeval *__restrict, void *__restrict)); ++# else ++# if !@HAVE_GETTIMEOFDAY@ + _GL_FUNCDECL_SYS (gettimeofday, int, +- (struct timeval *restrict, void *restrict) ++ (struct timeval *__restrict, void *__restrict) + _GL_ARG_NONNULL ((1))); +-# endif ++# endif + /* Need to cast, because on glibc systems, by default, the second argument is + struct timezone *. */ + _GL_CXXALIAS_SYS_CAST (gettimeofday, int, +- (struct timeval *restrict, void *restrict)); +-# endif ++ (struct timeval *__restrict, void *__restrict)); ++# endif + _GL_CXXALIASWARN (gettimeofday); +-#elif defined GNULIB_POSIXCHECK +-# undef gettimeofday +-# if HAVE_RAW_DECL_GETTIMEOFDAY ++# elif defined GNULIB_POSIXCHECK ++# undef gettimeofday ++# if HAVE_RAW_DECL_GETTIMEOFDAY + _GL_WARN_ON_USE (gettimeofday, "gettimeofday is unportable - " + "use gnulib module gettimeofday for portability"); ++# endif + # endif +-#endif + + /* Hide some function declarations from . */ + +-#if defined _MSC_VER && @HAVE_WINSOCK2_H@ +-# if !defined _@GUARD_PREFIX@_UNISTD_H +-# if !(defined __cplusplus && defined GNULIB_NAMESPACE) +-# undef close +-# define close close_used_without_including_unistd_h +-# else ++# if defined _MSC_VER && @HAVE_WINSOCK2_H@ ++# if !defined _@GUARD_PREFIX@_UNISTD_H ++# if !(defined __cplusplus && defined GNULIB_NAMESPACE) ++# undef close ++# define close close_used_without_including_unistd_h ++# else + _GL_WARN_ON_USE (close, + "close() used without including "); +-# endif +-# if !(defined __cplusplus && defined GNULIB_NAMESPACE) +-# undef gethostname +-# define gethostname gethostname_used_without_including_unistd_h +-# else ++# endif ++# if !(defined __cplusplus && defined GNULIB_NAMESPACE) ++# undef gethostname ++# define gethostname gethostname_used_without_including_unistd_h ++# else + _GL_WARN_ON_USE (gethostname, + "gethostname() used without including "); ++# endif + # endif +-# endif +-# if !defined _@GUARD_PREFIX@_SYS_SOCKET_H +-# if !(defined __cplusplus && defined GNULIB_NAMESPACE) +-# undef socket +-# define socket socket_used_without_including_sys_socket_h +-# undef connect +-# define connect connect_used_without_including_sys_socket_h +-# undef accept +-# define accept accept_used_without_including_sys_socket_h +-# undef bind +-# define bind bind_used_without_including_sys_socket_h +-# undef getpeername +-# define getpeername getpeername_used_without_including_sys_socket_h +-# undef getsockname +-# define getsockname getsockname_used_without_including_sys_socket_h +-# undef getsockopt +-# define getsockopt getsockopt_used_without_including_sys_socket_h +-# undef listen +-# define listen listen_used_without_including_sys_socket_h +-# undef recv +-# define recv recv_used_without_including_sys_socket_h +-# undef send +-# define send send_used_without_including_sys_socket_h +-# undef recvfrom +-# define recvfrom recvfrom_used_without_including_sys_socket_h +-# undef sendto +-# define sendto sendto_used_without_including_sys_socket_h +-# undef setsockopt +-# define setsockopt setsockopt_used_without_including_sys_socket_h +-# undef shutdown +-# define shutdown shutdown_used_without_including_sys_socket_h +-# else ++# if !defined _@GUARD_PREFIX@_SYS_SOCKET_H ++# if !(defined __cplusplus && defined GNULIB_NAMESPACE) ++# undef socket ++# define socket socket_used_without_including_sys_socket_h ++# undef connect ++# define connect connect_used_without_including_sys_socket_h ++# undef accept ++# define accept accept_used_without_including_sys_socket_h ++# undef bind ++# define bind bind_used_without_including_sys_socket_h ++# undef getpeername ++# define getpeername getpeername_used_without_including_sys_socket_h ++# undef getsockname ++# define getsockname getsockname_used_without_including_sys_socket_h ++# undef getsockopt ++# define getsockopt getsockopt_used_without_including_sys_socket_h ++# undef listen ++# define listen listen_used_without_including_sys_socket_h ++# undef recv ++# define recv recv_used_without_including_sys_socket_h ++# undef send ++# define send send_used_without_including_sys_socket_h ++# undef recvfrom ++# define recvfrom recvfrom_used_without_including_sys_socket_h ++# undef sendto ++# define sendto sendto_used_without_including_sys_socket_h ++# undef setsockopt ++# define setsockopt setsockopt_used_without_including_sys_socket_h ++# undef shutdown ++# define shutdown shutdown_used_without_including_sys_socket_h ++# else + _GL_WARN_ON_USE (socket, + "socket() used without including "); + _GL_WARN_ON_USE (connect, +@@ -186,18 +189,17 @@ + "setsockopt() used without including "); + _GL_WARN_ON_USE (shutdown, + "shutdown() used without including "); ++# endif + # endif +-# endif +-# if !defined _@GUARD_PREFIX@_SYS_SELECT_H +-# if !(defined __cplusplus && defined GNULIB_NAMESPACE) +-# undef select +-# define select select_used_without_including_sys_select_h +-# else ++# if !defined _@GUARD_PREFIX@_SYS_SELECT_H ++# if !(defined __cplusplus && defined GNULIB_NAMESPACE) ++# undef select ++# define select select_used_without_including_sys_select_h ++# else + _GL_WARN_ON_USE (select, + "select() used without including "); ++# endif + # endif + # endif +-#endif + + #endif /* _@GUARD_PREFIX@_SYS_TIME_H */ +-#endif /* _@GUARD_PREFIX@_SYS_TIME_H */ diff --git a/package/gettext/gettext-03-option-to-disable-tools.patch b/package/gettext/gettext-03-option-to-disable-tools.patch new file mode 100644 index 000000000..24a99965b --- /dev/null +++ b/package/gettext/gettext-03-option-to-disable-tools.patch @@ -0,0 +1,42 @@ +Add a --disable-tools option + +This patch adds a --disable-tools option that allows to disable the +compilation of the gettext tools, which may not be necessary on a +small embedded Linux system. + +Signed-off-by: Thomas Petazzoni + +Index: b/configure.ac +=================================================================== +--- a/configure.ac ++++ b/configure.ac +@@ -37,6 +37,10 @@ + + dnl Checks for library functions. + ++AC_ARG_ENABLE([tools], [--disable-tools do not build tools], ++ [enable_tools=$enableval], [enable_tools=yes]) ++AM_CONDITIONAL([ENABLE_TOOLS], [test "$enable_tools" = "yes"]) ++ + AC_CONFIG_SUBDIRS([gettext-runtime gettext-tools]) + + dnl Ensure that "configure --help" lists all the command line options that +Index: b/Makefile.am +=================================================================== +--- a/Makefile.am ++++ b/Makefile.am +@@ -20,7 +20,13 @@ + ACLOCAL = build-aux/fixaclocal @ACLOCAL@ + ACLOCAL_AMFLAGS = -I m4 + +-SUBDIRS = gnulib-local gettext-runtime gettext-tools ++if ENABLE_TOOLS ++TOOLS_SUBDIR = gettext-tools ++else ++TOOLS_SUBDIR = ++endif ++ ++SUBDIRS = gnulib-local gettext-runtime $(TOOLS_SUBDIR) + + EXTRA_DIST = \ + version.sh DEPENDENCIES PACKAGING HACKING ChangeLog.0 autogen.sh \ diff --git a/package/gettext/gettext-04-remove-examples-tests.patch b/package/gettext/gettext-04-remove-examples-tests.patch new file mode 100644 index 000000000..f7d88d980 --- /dev/null +++ b/package/gettext/gettext-04-remove-examples-tests.patch @@ -0,0 +1,20 @@ +Disable tests and examples + +This patch disables the gettext-tools tests and examples, which are +generally not necessary. + +Signed-off-by: Thomas Petazzoni + +Index: b/gettext-tools/Makefile.am +=================================================================== +--- a/gettext-tools/Makefile.am ++++ b/gettext-tools/Makefile.am +@@ -20,7 +20,7 @@ + ACLOCAL = ../build-aux/fixaclocal @ACLOCAL@ + ACLOCAL_AMFLAGS = -I m4 -I ../gettext-runtime/m4 -I ../m4 -I gnulib-m4 -I libgrep/gnulib-m4 -I libgettextpo/gnulib-m4 + +-SUBDIRS = doc intl gnulib-lib libgrep src libgettextpo po projects styles misc man m4 tests gnulib-tests examples ++SUBDIRS = doc intl gnulib-lib libgrep src libgettextpo po projects styles misc man m4 + + EXTRA_DIST = misc/DISCLAIM + MOSTLYCLEANFILES = core *.stackdump diff --git a/package/gettext/gettext-05-use-shell.patch b/package/gettext/gettext-05-use-shell.patch new file mode 100644 index 000000000..5f6e2c268 --- /dev/null +++ b/package/gettext/gettext-05-use-shell.patch @@ -0,0 +1,25 @@ +gettext-runtime: use @SHELL@ for the SHELL variable definition + +The gettext-runtime/Makefile.in uses an hardcoded SHELL = /bin/sh +variable. This causes problems at build time, because libtool is then +called with the 'sh' shell, which does not support the += construct +that the libtool script is using. + +Instead, this Makefile.in should be definining SHELL = @SHELL@, just +like all other Makefile.in of gettext. + +Signed-off-by: Thomas Petazzoni + +Index: b/gettext-runtime/intl/Makefile.in +=================================================================== +--- a/gettext-runtime/intl/Makefile.in ++++ b/gettext-runtime/intl/Makefile.in +@@ -17,7 +17,7 @@ + PACKAGE = @PACKAGE@ + VERSION = @VERSION@ + +-SHELL = /bin/sh ++SHELL = @SHELL@ + + srcdir = @srcdir@ + top_srcdir = @top_srcdir@ diff --git a/package/gettext/gettext-error_print_progname.patch b/package/gettext/gettext-error_print_progname.patch deleted file mode 100644 index 189d28b57..000000000 --- a/package/gettext/gettext-error_print_progname.patch +++ /dev/null @@ -1,14 +0,0 @@ ---- gettext-0.16.1.oorig/gettext-tools/gnulib-lib/error.h 2006-11-27 18:14:50.000000000 +0100 -+++ gettext-0.16.1/gettext-tools/gnulib-lib/error.h 2007-06-20 13:29:32.000000000 +0200 -@@ -50,7 +50,10 @@ extern void error_at_line (int __status, - /* If NULL, error will flush stdout, then print on stderr the program - name, a colon and a space. Otherwise, error will call this - function without parameters instead. */ --extern DLL_VARIABLE void (*error_print_progname) (void); -+#ifndef __UCLIBC__ -+extern DLL_VARIABLE -+#endif -+void (*error_print_progname) (void); - - /* This variable is incremented each time `error' is called. */ - extern DLL_VARIABLE unsigned int error_message_count; diff --git a/package/gettext/gettext-fix_rpl_gettimeofday.patch b/package/gettext/gettext-fix_rpl_gettimeofday.patch deleted file mode 100644 index e97ceb248..000000000 --- a/package/gettext/gettext-fix_rpl_gettimeofday.patch +++ /dev/null @@ -1,282 +0,0 @@ -Newer sys_time.in.h from gnulib breaks on uClibc with C++ so roll back -to a previous version that's known to work. - -Signed-off-by: Gustavo Zacarias - -diff -Nura gettext-0.18.2.1.orig/gettext-tools/gnulib-lib/sys_time.in.h gettext-0.18.2.1/gettext-tools/gnulib-lib/sys_time.in.h ---- gettext-0.18.2.1.orig/gettext-tools/gnulib-lib/sys_time.in.h 2013-03-12 09:17:10.530475932 -0300 -+++ gettext-0.18.2.1/gettext-tools/gnulib-lib/sys_time.in.h 2013-03-19 12:00:17.557958255 -0300 -@@ -1,6 +1,6 @@ - /* Provide a more complete sys/time.h. - -- Copyright (C) 2007-2013 Free Software Foundation, Inc. -+ Copyright (C) 2007-2012 Free Software Foundation, Inc. - - This program is free software; you can redistribute it and/or modify - it under the terms of the GNU General Public License as published by -@@ -17,34 +17,37 @@ - - /* Written by Paul Eggert. */ - --#ifndef _@GUARD_PREFIX@_SYS_TIME_H -- - #if __GNUC__ >= 3 - @PRAGMA_SYSTEM_HEADER@ - #endif - @PRAGMA_COLUMNS@ - --/* The include_next requires a split double-inclusion guard. */ --#if @HAVE_SYS_TIME_H@ --# @INCLUDE_NEXT@ @NEXT_SYS_TIME_H@ --#endif -+#if defined _@GUARD_PREFIX@_SYS_TIME_H - --#ifndef _@GUARD_PREFIX@_SYS_TIME_H --#define _@GUARD_PREFIX@_SYS_TIME_H -+/* Simply delegate to the system's header, without adding anything. */ -+# if @HAVE_SYS_TIME_H@ -+# @INCLUDE_NEXT@ @NEXT_SYS_TIME_H@ -+# endif - --#if ! @HAVE_SYS_TIME_H@ --# include --#endif -+#else -+ -+# define _@GUARD_PREFIX@_SYS_TIME_H -+ -+# if @HAVE_SYS_TIME_H@ -+# @INCLUDE_NEXT@ @NEXT_SYS_TIME_H@ -+# else -+# include -+# endif - - /* On native Windows with MSVC, get the 'struct timeval' type. - Also, on native Windows with a 64-bit time_t, where we are overriding the - 'struct timeval' type, get all declarations of system functions whose - signature contains 'struct timeval'. */ --#if (defined _MSC_VER || @REPLACE_STRUCT_TIMEVAL@) && @HAVE_WINSOCK2_H@ && !defined _GL_INCLUDING_WINSOCK2_H --# define _GL_INCLUDING_WINSOCK2_H --# include --# undef _GL_INCLUDING_WINSOCK2_H --#endif -+# if (defined _MSC_VER || @REPLACE_STRUCT_TIMEVAL@) && @HAVE_WINSOCK2_H@ && !defined _GL_INCLUDING_WINSOCK2_H -+# define _GL_INCLUDING_WINSOCK2_H -+# include -+# undef _GL_INCLUDING_WINSOCK2_H -+# endif - - /* The definitions of _GL_FUNCDECL_RPL etc. are copied here. */ - -@@ -52,112 +55,112 @@ - - /* The definition of _GL_WARN_ON_USE is copied here. */ - --#ifdef __cplusplus -+# ifdef __cplusplus - extern "C" { --#endif -+# endif - --#if !@HAVE_STRUCT_TIMEVAL@ || @REPLACE_STRUCT_TIMEVAL@ -+# if !@HAVE_STRUCT_TIMEVAL@ || @REPLACE_STRUCT_TIMEVAL@ - --# if @REPLACE_STRUCT_TIMEVAL@ --# define timeval rpl_timeval --# endif -+# if @REPLACE_STRUCT_TIMEVAL@ -+# define timeval rpl_timeval -+# endif - --# if !GNULIB_defined_struct_timeval -+# if !GNULIB_defined_struct_timeval - struct timeval - { - time_t tv_sec; - long int tv_usec; - }; --# define GNULIB_defined_struct_timeval 1 --# endif -+# define GNULIB_defined_struct_timeval 1 -+# endif - --#endif -+# endif - --#ifdef __cplusplus -+# ifdef __cplusplus - } --#endif -+# endif - --#if @GNULIB_GETTIMEOFDAY@ --# if @REPLACE_GETTIMEOFDAY@ --# if !(defined __cplusplus && defined GNULIB_NAMESPACE) --# undef gettimeofday --# define gettimeofday rpl_gettimeofday --# endif -+# if @GNULIB_GETTIMEOFDAY@ -+# if @REPLACE_GETTIMEOFDAY@ -+# if !(defined __cplusplus && defined GNULIB_NAMESPACE) -+# undef gettimeofday -+# define gettimeofday rpl_gettimeofday -+# endif - _GL_FUNCDECL_RPL (gettimeofday, int, -- (struct timeval *restrict, void *restrict) -+ (struct timeval *__restrict, void *__restrict) - _GL_ARG_NONNULL ((1))); - _GL_CXXALIAS_RPL (gettimeofday, int, -- (struct timeval *restrict, void *restrict)); --# else --# if !@HAVE_GETTIMEOFDAY@ -+ (struct timeval *__restrict, void *__restrict)); -+# else -+# if !@HAVE_GETTIMEOFDAY@ - _GL_FUNCDECL_SYS (gettimeofday, int, -- (struct timeval *restrict, void *restrict) -+ (struct timeval *__restrict, void *__restrict) - _GL_ARG_NONNULL ((1))); --# endif -+# endif - /* Need to cast, because on glibc systems, by default, the second argument is - struct timezone *. */ - _GL_CXXALIAS_SYS_CAST (gettimeofday, int, -- (struct timeval *restrict, void *restrict)); --# endif -+ (struct timeval *__restrict, void *__restrict)); -+# endif - _GL_CXXALIASWARN (gettimeofday); --#elif defined GNULIB_POSIXCHECK --# undef gettimeofday --# if HAVE_RAW_DECL_GETTIMEOFDAY -+# elif defined GNULIB_POSIXCHECK -+# undef gettimeofday -+# if HAVE_RAW_DECL_GETTIMEOFDAY - _GL_WARN_ON_USE (gettimeofday, "gettimeofday is unportable - " - "use gnulib module gettimeofday for portability"); -+# endif - # endif --#endif - - /* Hide some function declarations from . */ - --#if defined _MSC_VER && @HAVE_WINSOCK2_H@ --# if !defined _@GUARD_PREFIX@_UNISTD_H --# if !(defined __cplusplus && defined GNULIB_NAMESPACE) --# undef close --# define close close_used_without_including_unistd_h --# else -+# if defined _MSC_VER && @HAVE_WINSOCK2_H@ -+# if !defined _@GUARD_PREFIX@_UNISTD_H -+# if !(defined __cplusplus && defined GNULIB_NAMESPACE) -+# undef close -+# define close close_used_without_including_unistd_h -+# else - _GL_WARN_ON_USE (close, - "close() used without including "); --# endif --# if !(defined __cplusplus && defined GNULIB_NAMESPACE) --# undef gethostname --# define gethostname gethostname_used_without_including_unistd_h --# else -+# endif -+# if !(defined __cplusplus && defined GNULIB_NAMESPACE) -+# undef gethostname -+# define gethostname gethostname_used_without_including_unistd_h -+# else - _GL_WARN_ON_USE (gethostname, - "gethostname() used without including "); -+# endif - # endif --# endif --# if !defined _@GUARD_PREFIX@_SYS_SOCKET_H --# if !(defined __cplusplus && defined GNULIB_NAMESPACE) --# undef socket --# define socket socket_used_without_including_sys_socket_h --# undef connect --# define connect connect_used_without_including_sys_socket_h --# undef accept --# define accept accept_used_without_including_sys_socket_h --# undef bind --# define bind bind_used_without_including_sys_socket_h --# undef getpeername --# define getpeername getpeername_used_without_including_sys_socket_h --# undef getsockname --# define getsockname getsockname_used_without_including_sys_socket_h --# undef getsockopt --# define getsockopt getsockopt_used_without_including_sys_socket_h --# undef listen --# define listen listen_used_without_including_sys_socket_h --# undef recv --# define recv recv_used_without_including_sys_socket_h --# undef send --# define send send_used_without_including_sys_socket_h --# undef recvfrom --# define recvfrom recvfrom_used_without_including_sys_socket_h --# undef sendto --# define sendto sendto_used_without_including_sys_socket_h --# undef setsockopt --# define setsockopt setsockopt_used_without_including_sys_socket_h --# undef shutdown --# define shutdown shutdown_used_without_including_sys_socket_h --# else -+# if !defined _@GUARD_PREFIX@_SYS_SOCKET_H -+# if !(defined __cplusplus && defined GNULIB_NAMESPACE) -+# undef socket -+# define socket socket_used_without_including_sys_socket_h -+# undef connect -+# define connect connect_used_without_including_sys_socket_h -+# undef accept -+# define accept accept_used_without_including_sys_socket_h -+# undef bind -+# define bind bind_used_without_including_sys_socket_h -+# undef getpeername -+# define getpeername getpeername_used_without_including_sys_socket_h -+# undef getsockname -+# define getsockname getsockname_used_without_including_sys_socket_h -+# undef getsockopt -+# define getsockopt getsockopt_used_without_including_sys_socket_h -+# undef listen -+# define listen listen_used_without_including_sys_socket_h -+# undef recv -+# define recv recv_used_without_including_sys_socket_h -+# undef send -+# define send send_used_without_including_sys_socket_h -+# undef recvfrom -+# define recvfrom recvfrom_used_without_including_sys_socket_h -+# undef sendto -+# define sendto sendto_used_without_including_sys_socket_h -+# undef setsockopt -+# define setsockopt setsockopt_used_without_including_sys_socket_h -+# undef shutdown -+# define shutdown shutdown_used_without_including_sys_socket_h -+# else - _GL_WARN_ON_USE (socket, - "socket() used without including "); - _GL_WARN_ON_USE (connect, -@@ -186,18 +189,17 @@ - "setsockopt() used without including "); - _GL_WARN_ON_USE (shutdown, - "shutdown() used without including "); -+# endif - # endif --# endif --# if !defined _@GUARD_PREFIX@_SYS_SELECT_H --# if !(defined __cplusplus && defined GNULIB_NAMESPACE) --# undef select --# define select select_used_without_including_sys_select_h --# else -+# if !defined _@GUARD_PREFIX@_SYS_SELECT_H -+# if !(defined __cplusplus && defined GNULIB_NAMESPACE) -+# undef select -+# define select select_used_without_including_sys_select_h -+# else - _GL_WARN_ON_USE (select, - "select() used without including "); -+# endif - # endif - # endif --#endif - - #endif /* _@GUARD_PREFIX@_SYS_TIME_H */ --#endif /* _@GUARD_PREFIX@_SYS_TIME_H */ diff --git a/package/gettext/gettext.mk b/package/gettext/gettext.mk index 8dc701e04..90619287b 100644 --- a/package/gettext/gettext.mk +++ b/package/gettext/gettext.mk @@ -9,11 +9,25 @@ GETTEXT_SITE = $(BR2_GNU_MIRROR)/gettext GETTEXT_INSTALL_STAGING = YES GETTEXT_LICENSE = GPLv2+ GETTEXT_LICENSE_FILES = COPYING +GETTEXT_AUTORECONF = YES +HOST_GETTEXT_AUTORECONF = YES GETTEXT_DEPENDENCIES = $(if $(BR2_PACKAGE_LIBICONV),libiconv) HOST_GETTEXT_DEPENDENCIES = # we don't want the libiconv dependency GETTEXT_CONF_OPT += \ + --disable-libasprintf \ + --disable-acl \ + --disable-openmp \ + --disable-rpath \ + --disable-java \ + --disable-native-java \ + --disable-csharp \ + --disable-relocatable \ + --without-emacs \ + --disable-tools + +HOST_GETTEXT_CONF_OPT = \ --disable-libasprintf \ --disable-acl \ --disable-openmp \ @@ -42,19 +56,7 @@ define GETTEXT_INSTALL_TARGET_CMDS cp -dpf $(STAGING_DIR)/usr/lib/libintl*.so* $(TARGET_DIR)/usr/lib/ endef endif -# Ditch the tools since they're off and pull other dependencies -define GETTEXT_DISABLE_TOOLS - $(SED) 's/runtime gettext-tools/runtime/' $(@D)/Makefile.in -endef endif # GETTEXT_TOOLS = n -# The tools tests build fails with full toolchain without threads -define GETTEXT_DISABLE_TESTS - $(SED) 's/m4 tests/m4/' $(@D)/gettext-tools/Makefile.in -endef - -GETTEXT_POST_PATCH_HOOKS += GETTEXT_DISABLE_TOOLS -GETTEXT_POST_PATCH_HOOKS += GETTEXT_DISABLE_TESTS - $(eval $(autotools-package)) $(eval $(host-autotools-package)) -- cgit v1.2.3 From dc3e6500577b18309699e957257f2d4966790c83 Mon Sep 17 00:00:00 2001 From: Thomas Petazzoni Date: Mon, 27 May 2013 13:01:01 +0000 Subject: binutils: apply post-patch hook on both the host and target builds When a Xtensa specific patch needs to be applied, it should be applied both when doing the target and the host build. This change is part of the effort to remove the differences between host and target post-extract and post-patch hooks, that are problematic for the out-of-tree support. Signed-off-by: Thomas Petazzoni Signed-off-by: Peter Korsgaard --- package/binutils/binutils.mk | 1 + 1 file changed, 1 insertion(+) diff --git a/package/binutils/binutils.mk b/package/binutils/binutils.mk index 081be6ad4..a2c4150c9 100644 --- a/package/binutils/binutils.mk +++ b/package/binutils/binutils.mk @@ -81,6 +81,7 @@ define BINUTILS_XTENSA_PRE_PATCH tar xf $(BR2_XTENSA_OVERLAY_DIR)/xtensa_$(XTENSA_CORE_NAME).tar \ -C $(@D) --strip-components=1 binutils endef +BINUTILS_PRE_PATCH_HOOKS += BINUTILS_XTENSA_PRE_PATCH HOST_BINUTILS_PRE_PATCH_HOOKS += BINUTILS_XTENSA_PRE_PATCH endif -- cgit v1.2.3 From 4378648aaff35fffb04dc44b0cd5caf762c73737 Mon Sep 17 00:00:00 2001 From: Thomas Petazzoni Date: Mon, 27 May 2013 13:01:03 +0000 Subject: libgtk2: remove useless post-patch hook There used to be a post-patch hook to apply a patch only on the host variant of libgtk2. However, after the reorganization of the patch naming policy, this was no longer working properly, so dd1848bc73ee9dfe211ca3ed3a233707e3bc5955 changed this by a patch that works on both the target and host variants. We can therefore get rid of the useless post-patch hook. Signed-off-by: Thomas Petazzoni Signed-off-by: Peter Korsgaard --- package/libgtk2/libgtk2.mk | 6 ------ 1 file changed, 6 deletions(-) diff --git a/package/libgtk2/libgtk2.mk b/package/libgtk2/libgtk2.mk index b1ce99ae1..5881ea78a 100644 --- a/package/libgtk2/libgtk2.mk +++ b/package/libgtk2/libgtk2.mk @@ -175,12 +175,6 @@ HOST_LIBGTK2_CONF_OPT = \ --disable-cups \ --disable-debug -define HOST_LIBGTK2_PATCH_REDUCE_DEPENDENCIES_HOOK - support/scripts/apply-patches.sh $(@D) $($(PKG)_DIR_PREFIX)/$(RAWNAME) host-*.patch -endef - -HOST_LIBGTK2_POST_PATCH_HOOKS += HOST_LIBGTK2_PATCH_REDUCE_DEPENDENCIES_HOOK - define HOST_LIBGTK2_BUILD_CMDS $(HOST_MAKE_ENV) make -C $(@D)/gtk gtk-update-icon-cache endef -- cgit v1.2.3 From f0e3147ee52b274ad887e59450d8a20427ea75f6 Mon Sep 17 00:00:00 2001 From: Thomas Petazzoni Date: Mon, 27 May 2013 13:01:04 +0000 Subject: xlib_libX11: ensure target and host variant have the same patch hooks In preparation for the out-of-tree support, it is important that all packages have the same patch hooks for the host variant and the target variant (because the source tree will be shared between host and target variants when doing out-of-tree build). In the case of the xlib_libX11 package, the post-patch hook removes some flags from the build of the makekeys utility, so that when xlib_libX11 is built for the target, the build of makekeys for the host works properly. This modification can be applied to the host variant of xlib_libX11 without any problem. Signed-off-by: Thomas Petazzoni Signed-off-by: Peter Korsgaard --- package/x11r7/xlib_libX11/xlib_libX11.mk | 1 + 1 file changed, 1 insertion(+) diff --git a/package/x11r7/xlib_libX11/xlib_libX11.mk b/package/x11r7/xlib_libX11/xlib_libX11.mk index 3b106cd99..f80167304 100644 --- a/package/x11r7/xlib_libX11/xlib_libX11.mk +++ b/package/x11r7/xlib_libX11/xlib_libX11.mk @@ -41,6 +41,7 @@ define XLIB_LIBX11_DISABLE_MAKEKEYS_X11_CFLAGS endef XLIB_LIBX11_POST_PATCH_HOOKS += XLIB_LIBX11_DISABLE_MAKEKEYS_X11_CFLAGS +HOST_XLIB_LIBX11_POST_PATCH_HOOKS += XLIB_LIBX11_DISABLE_MAKEKEYS_X11_CFLAGS $(eval $(autotools-package)) $(eval $(host-autotools-package)) -- cgit v1.2.3 From 7b6c61d07f180805c1461754f685ecbd76efa3f9 Mon Sep 17 00:00:00 2001 From: Thomas Petazzoni Date: Mon, 27 May 2013 13:01:02 +0000 Subject: gutenprint: ensure target and host variant have the same patch hooks In preparation for the out-of-tree support, it is important that all packages have the same patch hooks for the host variant and the target variant (because the source tree will be shared between host and target variants when doing out-of-tree build). In the case of gutenprint, the patch hook executed for the target just creates one directory which is needed for autoreconf to work, and the host variant is not autoreconf'ed. So there is no harm in also applying this patch hook to the host variant. [Peter: autoreconf for host as pointed out by Arnout] Signed-off-by: Thomas Petazzoni Signed-off-by: Peter Korsgaard --- package/gutenprint/gutenprint.mk | 2 ++ 1 file changed, 2 insertions(+) diff --git a/package/gutenprint/gutenprint.mk b/package/gutenprint/gutenprint.mk index 046377138..b5d350dfd 100644 --- a/package/gutenprint/gutenprint.mk +++ b/package/gutenprint/gutenprint.mk @@ -12,6 +12,7 @@ GUTENPRINT_LICENSE_FILES = COPYING # Needed, as we touch Makefile.am GUTENPRINT_AUTORECONF = YES +HOST_GUTENPRINT_AUTORECONF = YES GUTENPRINT_DEPENDENCIES = cups host-pkgconf \ $(if $(BR2_PACKAGE_LIBICONV),libiconv) @@ -58,6 +59,7 @@ define GUTENPRINT_CREATE_M4_DIR mkdir -p $(@D)/m4local endef GUTENPRINT_POST_PATCH_HOOKS += GUTENPRINT_CREATE_M4_DIR +HOST_GUTENPRINT_POST_PATCH_HOOKS += GUTENPRINT_CREATE_M4_DIR define HOST_GUTENPRINT_POST_BUILD_INSTAL_TMP_HEADER cp $(@D)/src/xml/xmli18n-tmp.h $(HOST_DIR)/usr/include -- cgit v1.2.3 From db3efd92adfc1c86811d8d664e8e979a82c49944 Mon Sep 17 00:00:00 2001 From: Wojciech Slenska Date: Wed, 15 May 2013 10:34:44 +0000 Subject: qt5: add libQt5OpenGL.so library installation When qt5 is built with EGLFS support, libQt5OpenGL library should be copied to target. Signed-off-by: Wojciech Slenska Signed-off-by: Peter Korsgaard --- package/qt5/qt5base/qt5base.mk | 1 + 1 file changed, 1 insertion(+) diff --git a/package/qt5/qt5base/qt5base.mk b/package/qt5/qt5base/qt5base.mk index bfc6c911e..7c6a093bc 100644 --- a/package/qt5/qt5base/qt5base.mk +++ b/package/qt5/qt5base/qt5base.mk @@ -118,6 +118,7 @@ QT5BASE_INSTALL_LIBS_$(BR2_PACKAGE_QT5BASE_CONCURRENT) += Qt5Concurrent QT5BASE_INSTALL_LIBS_$(BR2_PACKAGE_QT5BASE_SQL) += Qt5Sql QT5BASE_INSTALL_LIBS_$(BR2_PACKAGE_QT5BASE_TEST) += Qt5Test QT5BASE_INSTALL_LIBS_$(BR2_PACKAGE_QT5BASE_XML) += Qt5Xml +QT5BASE_INSTALL_LIBS_$(BR2_PACKAGE_QT5BASE_EGLFS) += Qt5OpenGL QT5BASE_INSTALL_LIBS_$(BR2_PACKAGE_QT5BASE_GUI) += Qt5Gui QT5BASE_INSTALL_LIBS_$(BR2_PACKAGE_QT5BASE_WIDGETS) += Qt5Widgets -- cgit v1.2.3 From 64e04fb27a9a0a4fcc519bcc7344a67009490a91 Mon Sep 17 00:00:00 2001 From: Jeremy Rosen Date: Tue, 28 May 2013 21:11:57 +0000 Subject: libtool : bump to version 2.4.2 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Jérémy Rosen Signed-off-by: Peter Korsgaard --- package/libtool/libtool.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package/libtool/libtool.mk b/package/libtool/libtool.mk index 6f0b90464..25cd89dd8 100644 --- a/package/libtool/libtool.mk +++ b/package/libtool/libtool.mk @@ -3,7 +3,7 @@ # libtool # ############################################################# -LIBTOOL_VERSION = 2.2.10 +LIBTOOL_VERSION = 2.4.2 LIBTOOL_SOURCE = libtool-$(LIBTOOL_VERSION).tar.gz LIBTOOL_SITE = $(BR2_GNU_MIRROR)/libtool LIBTOOL_INSTALL_STAGING = YES -- cgit v1.2.3 From ac23d50496d590026fe5ae140bc5e98e72f208e3 Mon Sep 17 00:00:00 2001 From: Jeremy Rosen Date: Tue, 28 May 2013 21:11:58 +0000 Subject: pulseaudio : bump to version 3.0 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Jérémy Rosen Signed-off-by: Peter Korsgaard --- package/multimedia/pulseaudio/pulseaudio.mk | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/package/multimedia/pulseaudio/pulseaudio.mk b/package/multimedia/pulseaudio/pulseaudio.mk index 16df85555..f171fb986 100644 --- a/package/multimedia/pulseaudio/pulseaudio.mk +++ b/package/multimedia/pulseaudio/pulseaudio.mk @@ -3,8 +3,7 @@ # pulseaudio # ################################################################################ - -PULSEAUDIO_VERSION = 2.1 +PULSEAUDIO_VERSION = 3.0 PULSEAUDIO_SITE = http://freedesktop.org/software/pulseaudio/releases/ PULSEAUDIO_INSTALL_STAGING = YES PULSEAUDIO_CONF_OPT = \ @@ -47,6 +46,7 @@ endef PULSEAUDIO_POST_PATCH_HOOKS += PULSEAUDIO_FORCE_CC endif +PULSEAUDIO_CONF_OPT += $(if $(BR2_ARM_ENABLE_NEON),--enable-neon-opt=yes,--enable-neon-opt=no) # pulseaudio alsa backend needs pcm/mixer apis ifneq ($(BR2_PACKAGE_ALSA_LIB_PCM)$(BR2_PACKAGE_ALSA_LIB_MIXER),yy) PULSEAUDIO_CONF_OPT += --disable-alsa -- cgit v1.2.3 From 3e037134a4d4e0429a413e80f345291118e8157d Mon Sep 17 00:00:00 2001 From: "Yann E. MORIN" Date: Tue, 14 May 2013 11:45:57 +0000 Subject: package/pmake: force argv[0]=${0} in the pmake wrapper This forces bmake to call the wrapper, not itself. Also, use consistent "${0/*}" instead of "${0/pmake}". Signed-off-by: "Yann E. MORIN" Signed-off-by: Peter Korsgaard --- package/pmake/pmake.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package/pmake/pmake.mk b/package/pmake/pmake.mk index 7b2e5a6ef..50613e8d4 100644 --- a/package/pmake/pmake.mk +++ b/package/pmake/pmake.mk @@ -39,7 +39,7 @@ define HOST_PMAKE_INSTALL_CMDS for mk in $(@D)/mk/*; do \ $(INSTALL) -m 0644 $${mk} $(HOST_DIR)/usr/share/pmake/mk; \ done - printf '#!/bin/sh\nexec $${0%%/*}/bmake -m $${0%%/pmake}/../../usr/share/pmake/mk "$$@"\n' \ + printf '#!/bin/bash\nexec -a "$${0}" $${0%%/*}/bmake -m $${0%%/*}/../../usr/share/pmake/mk "$$@"\n' \ >$(HOST_DIR)/usr/bin/pmake chmod 0755 $(HOST_DIR)/usr/bin/pmake endef -- cgit v1.2.3 From d39f6da03c7b2179d0218293f18a0b08693c3fc9 Mon Sep 17 00:00:00 2001 From: "Yann E. MORIN" Date: Tue, 14 May 2013 11:45:58 +0000 Subject: package/libedit: new package [Peter: rename to libedit] Signed-off-by: "Yann E. MORIN" Cc: Arnout Vandecappelle Signed-off-by: Peter Korsgaard --- package/Config.in | 1 + package/libedit/Config.in | 9 ++++++ package/libedit/libedit.mk | 75 ++++++++++++++++++++++++++++++++++++++++++++++ package/libedit/libedit.pc | 13 ++++++++ 4 files changed, 98 insertions(+) create mode 100644 package/libedit/Config.in create mode 100644 package/libedit/libedit.mk create mode 100644 package/libedit/libedit.pc diff --git a/package/Config.in b/package/Config.in index ab6df09a9..428aabaae 100644 --- a/package/Config.in +++ b/package/Config.in @@ -621,6 +621,7 @@ menu "Text and terminal handling" source "package/enchant/Config.in" source "package/libfribidi/Config.in" source "package/icu/Config.in" +source "package/libedit/Config.in" source "package/libiconv/Config.in" source "package/linenoise/Config.in" source "package/ncurses/Config.in" diff --git a/package/libedit/Config.in b/package/libedit/Config.in new file mode 100644 index 000000000..b49c23cad --- /dev/null +++ b/package/libedit/Config.in @@ -0,0 +1,9 @@ +config BR2_PACKAGE_LIBEDIT + bool "libedit" + select BR2_PACKAGE_LIBBSD + select BR2_PACKAGE_NCURSES + help + The editline library (from BSD) provides generic line editing + and history functions. It slightly resembles GNU readline. + + http://ftp.netbsd.org/pub/NetBSD/NetBSD-release-5-0/src/lib/libedit/ diff --git a/package/libedit/libedit.mk b/package/libedit/libedit.mk new file mode 100644 index 000000000..575ca4940 --- /dev/null +++ b/package/libedit/libedit.mk @@ -0,0 +1,75 @@ +############################################################# +# +# libedit +# +############################################################# + +# Note: libedit does not have a regular homepage, and it seems +# there is no place where to download a tarball from. That's +# why we use the Debian way-back machine. +LIBEDIT_VERSION_MAJOR = 2 +LIBEDIT_VERSION_MINOR = 11 +LIBEDIT_VERSION_EXTRA = -20080614 +LIBEDIT_VERSION = $(LIBEDIT_VERSION_MAJOR).$(LIBEDIT_VERSION_MINOR) +LIBEDIT_SOURCE = libedit_$(LIBEDIT_VERSION)$(LIBEDIT_VERSION_EXTRA).orig.tar.bz2 +LIBEDIT_SITE = http://snapshot.debian.org/archive/debian/20120601T033558Z/pool/main/libe/libedit +LIBEDIT_SUBDIR = libedit +LIBEDIT_PATCH = libedit_2.11-20080614-5.debian.tar.bz2 +LIBEDIT_INSTALL_STAGING = YES +LIBEDIT_DEPENDENCIES = host-pmake libbsd ncurses + +define LIBEDIT_POST_PATCH_PERMISSIONS + chmod +x $(@D)/libedit/makelist +endef + +LIBEDIT_POST_PATCH_HOOKS += LIBEDIT_POST_PATCH_PERMISSIONS + +define LIBEDIT_FIX_VIS_H_INCLUDE + $(SED) 's,^#include $$,#include ,;' \ + $(@D)/libedit/filecomplete.c \ + $(@D)/libedit/history.c \ + $(@D)/libedit/readline.c +endef +LIBEDIT_POST_PATCH_HOOKS += LIBEDIT_FIX_VIS_H_INCLUDE + +LIBEDIT_PMAKE_OPTS = MKPROFILE=no MKCATPAGES=no MLINKS= MANPAGES= NOGCCERROR=1 \ + SHLIB_SHFLAGS="-Wl,-soname,libedit.so.${LIBEDIT_VERSION_MAJOR}" \ + +define LIBEDIT_BUILD_CMDS + cd $(@D)/$(LIBEDIT_SUBDIR); \ + $(TARGET_CONFIGURE_OPTS) LDADD="-lbsd -lcurses" pmake $(LIBEDIT_PMAKE_OPTS) +endef + +LIBEDIT_MAN_LINKS = el_init el_end el_reset el_gets el_getc el_push el_parse \ + el_set el_get el_source el_resize el_line el_insertstr \ + el_deletestr history_init history_end history + +# $1: DESTDIR to install into +# Can't use pmake to install, it wants to be root. sigh... :-( +# We need to create the .so links, otherwise we can't link; and waiting for +# ldconfig is too late as it's done just before building the images. +define LIBEDIT_INSTALL_CMDS + $(INSTALL) -D -m 0644 package/libedit/libedit.pc $(1)/usr/lib/pkgconfig/libedit.pc + $(INSTALL) -D -m 0644 $(@D)/libedit/libedit.a $(1)/usr/lib/libedit.a + $(INSTALL) -D -m 0644 $(@D)/libedit/libedit_pic.a $(1)/usr/lib/libedit_pic.a + $(INSTALL) -D -m 0644 $(@D)/libedit/libedit.so.2.11 $(1)/usr/lib/libedit.so.2.11 + $(INSTALL) -D -m 0644 $(@D)/libedit/histedit.h $(1)/usr/include/histedit.h + ln -sf libedit.so.$(LIBEDIT_VERSION) $(1)/usr/lib/libedit.so.$(LIBEDIT_VERSION_MAJOR) + ln -sf libedit.so.$(LIBEDIT_VERSION_MAJOR) $(1)/usr/lib/libedit.so + $(INSTALL) -D -m 0644 $(@D)/libedit/readline/readline.h $(1)/usr/include/editline/readline.h + $(INSTALL) -v -D -m 0644 $(@D)/libedit/editline.3 $(1)/usr/share/man/man3/editline.3el + $(INSTALL) -v -D -m 0644 $(@D)/libedit/editrc.5 $(1)/usr/share/man/man5/editrc.5el + for lnk in $(LIBEDIT_MAN_LINKS); do \ + ln -sfv editline.3el $(1)/usr/share/man/man3/$${lnk}.3el; \ + done +endef + +define LIBEDIT_INSTALL_STAGING_CMDS + $(call LIBEDIT_INSTALL_CMDS,$(STAGING_DIR)) +endef + +define LIBEDIT_INSTALL_TARGET_CMDS + $(call LIBEDIT_INSTALL_CMDS,$(TARGET_DIR)) +endef + +$(eval $(generic-package)) diff --git a/package/libedit/libedit.pc b/package/libedit/libedit.pc new file mode 100644 index 000000000..47ac871bc --- /dev/null +++ b/package/libedit/libedit.pc @@ -0,0 +1,13 @@ +prefix=/usr +exec_prefix=${prefix} +libdir=${exec_prefix}/lib +includedir=${prefix}/include + +Name: libedit +Description: Not just a replacement library for libreadline and libhistory. +Version: 2.11 +Requires: libbsd ncurses +Requires.private: +Libs: -L${libdir} -ledit +Libs.private: +Cflags: -I${includedir} -- cgit v1.2.3 From 164b90649b4f34c3e7cd1b6ded46c921db4fc2f1 Mon Sep 17 00:00:00 2001 From: "Yann E. MORIN" Date: Tue, 14 May 2013 11:45:59 +0000 Subject: package/snappy: new package [Peter: needs C++ support] Signed-off-by: "Yann E. MORIN" Signed-off-by: Peter Korsgaard --- package/Config.in | 1 + package/snappy/Config.in | 13 +++++++++++++ package/snappy/snappy.mk | 13 +++++++++++++ 3 files changed, 27 insertions(+) create mode 100644 package/snappy/Config.in create mode 100644 package/snappy/snappy.mk diff --git a/package/Config.in b/package/Config.in index 428aabaae..4233ff23b 100644 --- a/package/Config.in +++ b/package/Config.in @@ -386,6 +386,7 @@ endmenu menu "Compression and decompression" source "package/libarchive/Config.in" source "package/lzo/Config.in" +source "package/snappy/Config.in" source "package/zlib/Config.in" endmenu diff --git a/package/snappy/Config.in b/package/snappy/Config.in new file mode 100644 index 000000000..36093bc6a --- /dev/null +++ b/package/snappy/Config.in @@ -0,0 +1,13 @@ +config BR2_PACKAGE_SNAPPY + bool "snappy" + depends on BR2_INSTALL_LIBSTDCPP + help + Snappy is a compression/decompression library. It does not aim for + maximum compression, or compatibility with any other compression + library; instead, it aims for very high speeds and reasonable + compression. + + http://code.google.com/p/snappy/ + +comment "snappy requires a toolchain with C++ support" + depends on !BR2_INSTALL_LIBSTDCPP diff --git a/package/snappy/snappy.mk b/package/snappy/snappy.mk new file mode 100644 index 000000000..2704b9764 --- /dev/null +++ b/package/snappy/snappy.mk @@ -0,0 +1,13 @@ +############################################################# +# +# snappy +# +############################################################# + +SNAPPY_VERSION = 1.1.0 +SNAPPY_SITE = http://snappy.googlecode.com/files/ +SNAPPY_LICENSE = BSD-3c +SNAPPY_LICENSE_FILES = COPYING +SNAPPY_INSTALL_STAGING = YES + +$(eval $(autotools-package)) -- cgit v1.2.3 From 0b78baafbda4b97c96793231f559735139506ee1 Mon Sep 17 00:00:00 2001 From: Wojciech Slenska Date: Tue, 28 May 2013 09:05:37 +0000 Subject: qt5: mysql and sqlite plugins Added support for mysql and sqlite plugins. Configuration is based on qt package. [Peter: strip trailing spaces] Signed-off-by: Wojciech Slenska Signed-off-by: Peter Korsgaard --- package/qt5/qt5base/Config.in | 36 ++++++++++++++++++++++++++++++++++++ package/qt5/qt5base/qt5base.mk | 15 +++++++++++++++ 2 files changed, 51 insertions(+) diff --git a/package/qt5/qt5base/Config.in b/package/qt5/qt5base/Config.in index 797435711..9c7fd15da 100644 --- a/package/qt5/qt5base/Config.in +++ b/package/qt5/qt5base/Config.in @@ -43,6 +43,42 @@ config BR2_PACKAGE_QT5BASE_SQL help This options enables the Qt5Sql library. +if BR2_PACKAGE_QT5BASE_SQL +config BR2_PACKAGE_QT5BASE_MYSQL + bool "MySQL Plugin" + select BR2_PACKAGE_MYSQL_CLIENT + select BR2_PACKAGE_NCURSES + select BR2_PACKAGE_READLINE + depends on BR2_USE_MMU # mysql + help + Build MySQL plugin + If unsure, say n. +choice + prompt "SQLite 3 support" + default BR2_PACKAGE_QT5BASE_SQLITE_NONE + help + Select SQLite support. + +config BR2_PACKAGE_QT5BASE_SQLITE_NONE + bool "No sqlite support" + help + Do not compile any kind of SQLite support. + +config BR2_PACKAGE_QT5BASE_SQLITE_QT + bool "Qt SQLite" + help + Use Qt bundled SQLite support. + +config BR2_PACKAGE_QT5BASE_SQLITE_SYSTEM + bool "System SQLite" + select BR2_PACKAGE_SQLITE + help + Use system SQLite. + +endchoice + +endif + config BR2_PACKAGE_QT5BASE_TEST bool "test module" help diff --git a/package/qt5/qt5base/qt5base.mk b/package/qt5/qt5base/qt5base.mk index 7c6a093bc..cfa06ea1e 100644 --- a/package/qt5/qt5base/qt5base.mk +++ b/package/qt5/qt5base/qt5base.mk @@ -60,6 +60,21 @@ QT5BASE_LICENSE = Commercial license QT5BASE_REDISTRIBUTE = NO endif +# Qt5 SQL Plugins +ifeq ($(BR2_PACKAGE_QT5BASE_SQL),y) +ifeq ($(BR2_PACKAGE_QT5BASE_MYSQL),y) +QT5BASE_CONFIGURE_OPTS += -plugin-sql-mysql -mysql_config $(STAGING_DIR)/usr/bin/mysql_config +QT5BASE_DEPENDENCIES += mysql_client +else +QT5BASE_CONFIGURE_OPTS += -no-sql-mysql +endif + +QT5BASE_CONFIGURE_OPTS += $(if $(BR2_PACKAGE_QT5BASE_SQLITE_QT),-plugin-sql-sqlite) +QT5BASE_CONFIGURE_OPTS += $(if $(BR2_PACKAGE_QT5BASE_SQLITE_SYSTEM),-system-sqlite) +QT5BASE_DEPENDENCIES += $(if $(BR2_PACKAGE_QT5BASE_SQLITE_SYSTEM),sqlite) +QT5BASE_CONFIGURE_OPTS += $(if $(BR2_PACKAGE_QT5BASE_SQLITE_NONE),-no-sql-sqlite) +endif + # We have to use --enable-linuxfb, otherwise Qt thinks that -linuxfb # is to add a link against the "inuxfb" library. QT5BASE_CONFIGURE_OPTS += $(if $(BR2_PACKAGE_QT5BASE_GUI),-gui,-no-gui) -- cgit v1.2.3 From ed09a3601dd0b594defb6406b5f5816511ad154a Mon Sep 17 00:00:00 2001 From: Peter Korsgaard Date: Fri, 31 May 2013 13:56:59 +0200 Subject: gcc: bump 4.8.x version Signed-off-by: Peter Korsgaard --- toolchain/gcc/4.8.0/100-uclibc-conf.patch | 37 ------- toolchain/gcc/4.8.0/301-missing-execinfo_h.patch | 13 --- toolchain/gcc/4.8.0/302-c99-snprintf.patch | 13 --- .../gcc/4.8.0/305-libmudflap-susv3-legacy.patch | 49 --------- toolchain/gcc/4.8.0/810-arm-softfloat-libgcc.patch | 30 ----- toolchain/gcc/4.8.0/830-arm_unbreak_armv4t.patch | 13 --- .../powerpc-link-with-math-lib.patch.conditional | 122 --------------------- toolchain/gcc/4.8.1/100-uclibc-conf.patch | 37 +++++++ toolchain/gcc/4.8.1/301-missing-execinfo_h.patch | 13 +++ toolchain/gcc/4.8.1/302-c99-snprintf.patch | 13 +++ .../gcc/4.8.1/305-libmudflap-susv3-legacy.patch | 49 +++++++++ toolchain/gcc/4.8.1/810-arm-softfloat-libgcc.patch | 30 +++++ toolchain/gcc/4.8.1/830-arm_unbreak_armv4t.patch | 13 +++ .../powerpc-link-with-math-lib.patch.conditional | 122 +++++++++++++++++++++ toolchain/gcc/Config.in | 2 +- 15 files changed, 278 insertions(+), 278 deletions(-) delete mode 100644 toolchain/gcc/4.8.0/100-uclibc-conf.patch delete mode 100644 toolchain/gcc/4.8.0/301-missing-execinfo_h.patch delete mode 100644 toolchain/gcc/4.8.0/302-c99-snprintf.patch delete mode 100644 toolchain/gcc/4.8.0/305-libmudflap-susv3-legacy.patch delete mode 100644 toolchain/gcc/4.8.0/810-arm-softfloat-libgcc.patch delete mode 100644 toolchain/gcc/4.8.0/830-arm_unbreak_armv4t.patch delete mode 100644 toolchain/gcc/4.8.0/powerpc-link-with-math-lib.patch.conditional create mode 100644 toolchain/gcc/4.8.1/100-uclibc-conf.patch create mode 100644 toolchain/gcc/4.8.1/301-missing-execinfo_h.patch create mode 100644 toolchain/gcc/4.8.1/302-c99-snprintf.patch create mode 100644 toolchain/gcc/4.8.1/305-libmudflap-susv3-legacy.patch create mode 100644 toolchain/gcc/4.8.1/810-arm-softfloat-libgcc.patch create mode 100644 toolchain/gcc/4.8.1/830-arm_unbreak_armv4t.patch create mode 100644 toolchain/gcc/4.8.1/powerpc-link-with-math-lib.patch.conditional diff --git a/toolchain/gcc/4.8.0/100-uclibc-conf.patch b/toolchain/gcc/4.8.0/100-uclibc-conf.patch deleted file mode 100644 index d855b30ee..000000000 --- a/toolchain/gcc/4.8.0/100-uclibc-conf.patch +++ /dev/null @@ -1,37 +0,0 @@ -Index: gcc-4.8.0/contrib/regression/objs-gcc.sh -=================================================================== ---- gcc-4.8.0.orig/contrib/regression/objs-gcc.sh 2009-04-09 17:00:19.000000000 +0200 -+++ gcc-4.8.0/contrib/regression/objs-gcc.sh 2013-03-23 17:39:04.000000000 +0100 -@@ -106,6 +106,10 @@ - then - make all-gdb all-dejagnu all-ld || exit 1 - make install-gdb install-dejagnu install-ld || exit 1 -+elif [ $H_REAL_TARGET = $H_REAL_HOST -a $H_REAL_TARGET = i686-pc-linux-uclibc ] -+ then -+ make all-gdb all-dejagnu all-ld || exit 1 -+ make install-gdb install-dejagnu install-ld || exit 1 - elif [ $H_REAL_TARGET = $H_REAL_HOST ] ; then - make bootstrap || exit 1 - make install || exit 1 -Index: gcc-4.8.0/libjava/classpath/ltconfig -=================================================================== ---- gcc-4.8.0.orig/libjava/classpath/ltconfig 2011-02-13 12:45:53.000000000 +0100 -+++ gcc-4.8.0/libjava/classpath/ltconfig 2013-03-23 17:39:04.000000000 +0100 -@@ -603,7 +603,7 @@ - - # Transform linux* to *-*-linux-gnu*, to support old configure scripts. - case $host_os in --linux-gnu*) ;; -+linux-gnu*|linux-uclibc*) ;; - linux*) host=`echo $host | sed 's/^\(.*-.*-linux\)\(.*\)$/\1-gnu\2/'` - esac - -@@ -1247,7 +1247,7 @@ - ;; - - # This must be Linux ELF. --linux-gnu*) -+linux*) - version_type=linux - need_lib_prefix=no - need_version=no diff --git a/toolchain/gcc/4.8.0/301-missing-execinfo_h.patch b/toolchain/gcc/4.8.0/301-missing-execinfo_h.patch deleted file mode 100644 index 00efda24a..000000000 --- a/toolchain/gcc/4.8.0/301-missing-execinfo_h.patch +++ /dev/null @@ -1,13 +0,0 @@ -Index: gcc-4.8.0/boehm-gc/include/gc.h -=================================================================== ---- gcc-4.8.0.orig/boehm-gc/include/gc.h 2007-04-23 23:10:09.000000000 +0200 -+++ gcc-4.8.0/boehm-gc/include/gc.h 2013-03-23 17:39:20.000000000 +0100 -@@ -503,7 +503,7 @@ - #if defined(__linux__) || defined(__GLIBC__) - # include - # if (__GLIBC__ == 2 && __GLIBC_MINOR__ >= 1 || __GLIBC__ > 2) \ -- && !defined(__ia64__) -+ && !defined(__ia64__) && !defined(__UCLIBC__) - # ifndef GC_HAVE_BUILTIN_BACKTRACE - # define GC_HAVE_BUILTIN_BACKTRACE - # endif diff --git a/toolchain/gcc/4.8.0/302-c99-snprintf.patch b/toolchain/gcc/4.8.0/302-c99-snprintf.patch deleted file mode 100644 index cd4d2ccfb..000000000 --- a/toolchain/gcc/4.8.0/302-c99-snprintf.patch +++ /dev/null @@ -1,13 +0,0 @@ -Index: gcc-4.8.0/libstdc++-v3/include/c_global/cstdio -=================================================================== ---- gcc-4.8.0.orig/libstdc++-v3/include/c_global/cstdio 2013-02-03 18:54:05.000000000 +0100 -+++ gcc-4.8.0/libstdc++-v3/include/c_global/cstdio 2013-03-23 17:39:32.000000000 +0100 -@@ -138,7 +138,7 @@ - using ::vsprintf; - } // namespace - --#if _GLIBCXX_USE_C99 -+#if _GLIBCXX_USE_C99 || defined __UCLIBC__ - - #undef snprintf - #undef vfscanf diff --git a/toolchain/gcc/4.8.0/305-libmudflap-susv3-legacy.patch b/toolchain/gcc/4.8.0/305-libmudflap-susv3-legacy.patch deleted file mode 100644 index 35d5f5020..000000000 --- a/toolchain/gcc/4.8.0/305-libmudflap-susv3-legacy.patch +++ /dev/null @@ -1,49 +0,0 @@ -Index: gcc-4.8.0/libmudflap/mf-hooks2.c -=================================================================== ---- gcc-4.8.0.orig/libmudflap/mf-hooks2.c 2013-02-03 18:48:05.000000000 +0100 -+++ gcc-4.8.0/libmudflap/mf-hooks2.c 2013-03-23 17:39:43.000000000 +0100 -@@ -424,7 +424,7 @@ - { - TRACE ("%s\n", __PRETTY_FUNCTION__); - MF_VALIDATE_EXTENT(s, n, __MF_CHECK_WRITE, "bzero region"); -- bzero (s, n); -+ memset (s, 0, n); - } - - -@@ -434,7 +434,7 @@ - TRACE ("%s\n", __PRETTY_FUNCTION__); - MF_VALIDATE_EXTENT(src, n, __MF_CHECK_READ, "bcopy src"); - MF_VALIDATE_EXTENT(dest, n, __MF_CHECK_WRITE, "bcopy dest"); -- bcopy (src, dest, n); -+ memmove (dest, src, n); - } - - -@@ -444,7 +444,7 @@ - TRACE ("%s\n", __PRETTY_FUNCTION__); - MF_VALIDATE_EXTENT(s1, n, __MF_CHECK_READ, "bcmp 1st arg"); - MF_VALIDATE_EXTENT(s2, n, __MF_CHECK_READ, "bcmp 2nd arg"); -- return bcmp (s1, s2, n); -+ return n == 0 ? 0 : memcmp (s1, s2, n); - } - - -@@ -453,7 +453,7 @@ - size_t n = strlen (s); - TRACE ("%s\n", __PRETTY_FUNCTION__); - MF_VALIDATE_EXTENT(s, CLAMPADD(n, 1), __MF_CHECK_READ, "index region"); -- return index (s, c); -+ return strchr (s, c); - } - - -@@ -462,7 +462,7 @@ - size_t n = strlen (s); - TRACE ("%s\n", __PRETTY_FUNCTION__); - MF_VALIDATE_EXTENT(s, CLAMPADD(n, 1), __MF_CHECK_READ, "rindex region"); -- return rindex (s, c); -+ return strrchr (s, c); - } - - /* XXX: stpcpy, memccpy */ diff --git a/toolchain/gcc/4.8.0/810-arm-softfloat-libgcc.patch b/toolchain/gcc/4.8.0/810-arm-softfloat-libgcc.patch deleted file mode 100644 index c8cb377d5..000000000 --- a/toolchain/gcc/4.8.0/810-arm-softfloat-libgcc.patch +++ /dev/null @@ -1,30 +0,0 @@ -Index: gcc-4.8.0/gcc/config/arm/linux-elf.h -=================================================================== ---- gcc-4.8.0.orig/gcc/config/arm/linux-elf.h 2013-01-10 21:38:27.000000000 +0100 -+++ gcc-4.8.0/gcc/config/arm/linux-elf.h 2013-03-23 17:40:00.000000000 +0100 -@@ -55,7 +55,7 @@ - %{shared:-lc} \ - %{!shared:%{profile:-lc_p}%{!profile:-lc}}" - --#define LIBGCC_SPEC "%{mfloat-abi=soft*:-lfloat} -lgcc" -+#define LIBGCC_SPEC "-lgcc" - - #define GLIBC_DYNAMIC_LINKER "/lib/ld-linux.so.2" - -Index: gcc-4.8.0/libgcc/config/arm/t-linux -=================================================================== ---- gcc-4.8.0.orig/libgcc/config/arm/t-linux 2012-03-22 16:14:46.000000000 +0100 -+++ gcc-4.8.0/libgcc/config/arm/t-linux 2013-03-23 17:40:54.000000000 +0100 -@@ -1,6 +1,11 @@ - LIB1ASMSRC = arm/lib1funcs.S - LIB1ASMFUNCS = _udivsi3 _divsi3 _umodsi3 _modsi3 _dvmd_lnx _clzsi2 _clzdi2 \ -- _ctzsi2 _arm_addsubdf3 _arm_addsubsf3 -+ _ctzsi2 _arm_addsubdf3 _arm_addsubsf3 \ -+ _arm_addsubdf3 _arm_addsubsf3 \ -+ _arm_negdf2 _arm_muldivdf3 _arm_cmpdf2 _arm_unorddf2 \ -+ _arm_fixdfsi _arm_fixunsdfsi _arm_truncdfsf2 \ -+ _arm_negsf2 _arm_muldivsf3 _arm_cmpsf2 _arm_unordsf2 \ -+ _arm_fixsfsi _arm_fixunssfsi - - # Just for these, we omit the frame pointer since it makes such a big - # difference. diff --git a/toolchain/gcc/4.8.0/830-arm_unbreak_armv4t.patch b/toolchain/gcc/4.8.0/830-arm_unbreak_armv4t.patch deleted file mode 100644 index 37f8f2a54..000000000 --- a/toolchain/gcc/4.8.0/830-arm_unbreak_armv4t.patch +++ /dev/null @@ -1,13 +0,0 @@ -http://sourceware.org/ml/crossgcc/2008-05/msg00009.html - ---- a/gcc/config/arm/linux-eabi.h -+++ b/gcc/config/arm/linux-eabi.h -@@ -45,7 +45,7 @@ - The ARM10TDMI core is the default for armv5t, so set - SUBTARGET_CPU_DEFAULT to achieve this. */ - #undef SUBTARGET_CPU_DEFAULT --#define SUBTARGET_CPU_DEFAULT TARGET_CPU_arm10tdmi -+#define SUBTARGET_CPU_DEFAULT TARGET_CPU_arm9tdmi - - /* TARGET_BIG_ENDIAN_DEFAULT is set in - config.gcc for big endian configurations. */ diff --git a/toolchain/gcc/4.8.0/powerpc-link-with-math-lib.patch.conditional b/toolchain/gcc/4.8.0/powerpc-link-with-math-lib.patch.conditional deleted file mode 100644 index b7094fe65..000000000 --- a/toolchain/gcc/4.8.0/powerpc-link-with-math-lib.patch.conditional +++ /dev/null @@ -1,122 +0,0 @@ -http://gcc.gnu.org/ml/gcc-patches/2008-10/msg00269.html - -On glibc the libc.so carries a copy of the math function copysignl() but -on uClibc math functions like copysignl() live in libm. Since libgcc_s -contains unresolved symbols, any attempt to link against libgcc_s -without explicitely specifying -lm fails, resulting in a broken -bootstrap of the compiler. - -Forward port to gcc 4.5.1 by Gustavo Zacarias - ---- - libgcc/Makefile.in | 4 +++- - libgcc/configure | 32 ++++++++++++++++++++++++++++++++ - libgcc/configure.ac | 21 +++++++++++++++++++++ - 3 files changed, 56 insertions(+), 1 deletion(-) - -Index: gcc-4.8.0/libgcc/Makefile.in -=================================================================== ---- gcc-4.8.0.orig/libgcc/Makefile.in 2013-02-04 20:06:20.000000000 +0100 -+++ gcc-4.8.0/libgcc/Makefile.in 2013-03-24 09:12:43.000000000 +0100 -@@ -41,6 +41,7 @@ - decimal_float = @decimal_float@ - enable_decimal_float = @enable_decimal_float@ - fixed_point = @fixed_point@ -+LIBGCC_LIBM = @LIBGCC_LIBM@ - - host_noncanonical = @host_noncanonical@ - target_noncanonical = @target_noncanonical@ -@@ -927,9 +928,10 @@ - @multilib_dir@,$(MULTIDIR),$(subst \ - @shlib_objs@,$(objects) libgcc.a,$(subst \ - @shlib_base_name@,libgcc_s,$(subst \ -+ @libgcc_libm@,$(LIBGCC_LIBM),$(subst \ - @shlib_map_file@,$(mapfile),$(subst \ - @shlib_slibdir_qual@,$(MULTIOSSUBDIR),$(subst \ -- @shlib_slibdir@,$(shlib_slibdir),$(SHLIB_LINK)))))))) -+ @shlib_slibdir@,$(shlib_slibdir),$(SHLIB_LINK))))))))) - - libunwind$(SHLIB_EXT): $(libunwind-s-objects) $(extra-parts) - # @multilib_flags@ is still needed because this may use -Index: gcc-4.8.0/libgcc/configure -=================================================================== ---- gcc-4.8.0.orig/libgcc/configure 2012-11-05 00:08:42.000000000 +0100 -+++ gcc-4.8.0/libgcc/configure 2013-03-24 09:12:43.000000000 +0100 -@@ -564,6 +564,7 @@ - tmake_file - sfp_machine_header - set_use_emutls -+LIBGCC_LIBM - set_have_cc_tls - vis_hide - fixed_point -@@ -4481,6 +4482,37 @@ - fi - fi - -+# On powerpc libgcc_s references copysignl which is a libm function but -+# glibc apparently also provides it via libc as opposed to uClibc where -+# it lives in libm. -+echo "$as_me:$LINENO: checking for library containing copysignl" >&5 -+echo $ECHO_N "checking for library containing copysignl... $ECHO_C" >&6 -+if test "${libgcc_cv_copysignl_lib+set}" = set; then -+ echo $ECHO_N "(cached) $ECHO_C" >&6 -+else -+ -+ echo '#include ' > conftest.c -+ echo 'int the_libc = __UCLIBC__ + __powerpc__;' >> conftest.c -+ libgcc_cv_copysignl_lib="-lc" -+ if { ac_try='${CC-cc} -S conftest.c -o conftest.s 1>&5' -+ { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 -+ (eval $ac_try) 2>&5 -+ ac_status=$? -+ echo "$as_me:$LINENO: \$? = $ac_status" >&5 -+ (exit $ac_status); }; } -+ then -+ libgcc_cv_copysignl_lib="-lm" -+ fi -+ rm -f conftest.* -+ -+fi -+echo "$as_me:$LINENO: result: $libgcc_cv_copysignl_lib" >&5 -+echo "${ECHO_T}$libgcc_cv_copysignl_lib" >&6 -+ -+case /${libgcc_cv_copysignl_lib}/ in -+ /-lm/) LIBGCC_LIBM="$LIBGCC_LIBM -lm" ;; -+ *) LIBGCC_LIBM= ;; -+esac - - # Conditionalize the makefile for this target machine. - tmake_file_= -Index: gcc-4.8.0/libgcc/configure.ac -=================================================================== ---- gcc-4.8.0.orig/libgcc/configure.ac 2012-10-15 15:10:30.000000000 +0200 -+++ gcc-4.8.0/libgcc/configure.ac 2013-03-24 09:12:43.000000000 +0100 -@@ -326,6 +326,27 @@ - fi - AC_SUBST(set_have_cc_tls) - -+# On powerpc libgcc_s references copysignl which is a libm function but -+# glibc apparently also provides it via libc as opposed to uClibc where -+# it lives in libm. -+AC_CACHE_CHECK -+ libgcc_cv_copysignl_lib, -+ echo '#include ' > conftest.c -+ echo 'int the_libc = __UCLIBC__ + __powerpc__;' >> conftest.c -+ libgcc_cv_copysignl_lib="-lc" -+ if AC_TRY_COMMAND(${CC-cc} -S conftest.c -o conftest.s 1>&AS_MESSAGE_LOG_FD) -+ then -+ libgcc_cv_copysignl_lib="-lm" -+ fi -+ rm -f conftest.* -+ ]) -+ -+case /${libgcc_cv_copysignl_lib}/ in -+ /-lm/) LIBGCC_LIBM="$LIBGCC_LIBM -lm" ;; -+ *) LIBGCC_LIBM= ;; -+esac -+AC_SUBST(LIBGCC_LIBM) -+ - # See if we have emulated thread-local storage. - GCC_CHECK_EMUTLS - set_use_emutls= diff --git a/toolchain/gcc/4.8.1/100-uclibc-conf.patch b/toolchain/gcc/4.8.1/100-uclibc-conf.patch new file mode 100644 index 000000000..d855b30ee --- /dev/null +++ b/toolchain/gcc/4.8.1/100-uclibc-conf.patch @@ -0,0 +1,37 @@ +Index: gcc-4.8.0/contrib/regression/objs-gcc.sh +=================================================================== +--- gcc-4.8.0.orig/contrib/regression/objs-gcc.sh 2009-04-09 17:00:19.000000000 +0200 ++++ gcc-4.8.0/contrib/regression/objs-gcc.sh 2013-03-23 17:39:04.000000000 +0100 +@@ -106,6 +106,10 @@ + then + make all-gdb all-dejagnu all-ld || exit 1 + make install-gdb install-dejagnu install-ld || exit 1 ++elif [ $H_REAL_TARGET = $H_REAL_HOST -a $H_REAL_TARGET = i686-pc-linux-uclibc ] ++ then ++ make all-gdb all-dejagnu all-ld || exit 1 ++ make install-gdb install-dejagnu install-ld || exit 1 + elif [ $H_REAL_TARGET = $H_REAL_HOST ] ; then + make bootstrap || exit 1 + make install || exit 1 +Index: gcc-4.8.0/libjava/classpath/ltconfig +=================================================================== +--- gcc-4.8.0.orig/libjava/classpath/ltconfig 2011-02-13 12:45:53.000000000 +0100 ++++ gcc-4.8.0/libjava/classpath/ltconfig 2013-03-23 17:39:04.000000000 +0100 +@@ -603,7 +603,7 @@ + + # Transform linux* to *-*-linux-gnu*, to support old configure scripts. + case $host_os in +-linux-gnu*) ;; ++linux-gnu*|linux-uclibc*) ;; + linux*) host=`echo $host | sed 's/^\(.*-.*-linux\)\(.*\)$/\1-gnu\2/'` + esac + +@@ -1247,7 +1247,7 @@ + ;; + + # This must be Linux ELF. +-linux-gnu*) ++linux*) + version_type=linux + need_lib_prefix=no + need_version=no diff --git a/toolchain/gcc/4.8.1/301-missing-execinfo_h.patch b/toolchain/gcc/4.8.1/301-missing-execinfo_h.patch new file mode 100644 index 000000000..00efda24a --- /dev/null +++ b/toolchain/gcc/4.8.1/301-missing-execinfo_h.patch @@ -0,0 +1,13 @@ +Index: gcc-4.8.0/boehm-gc/include/gc.h +=================================================================== +--- gcc-4.8.0.orig/boehm-gc/include/gc.h 2007-04-23 23:10:09.000000000 +0200 ++++ gcc-4.8.0/boehm-gc/include/gc.h 2013-03-23 17:39:20.000000000 +0100 +@@ -503,7 +503,7 @@ + #if defined(__linux__) || defined(__GLIBC__) + # include + # if (__GLIBC__ == 2 && __GLIBC_MINOR__ >= 1 || __GLIBC__ > 2) \ +- && !defined(__ia64__) ++ && !defined(__ia64__) && !defined(__UCLIBC__) + # ifndef GC_HAVE_BUILTIN_BACKTRACE + # define GC_HAVE_BUILTIN_BACKTRACE + # endif diff --git a/toolchain/gcc/4.8.1/302-c99-snprintf.patch b/toolchain/gcc/4.8.1/302-c99-snprintf.patch new file mode 100644 index 000000000..cd4d2ccfb --- /dev/null +++ b/toolchain/gcc/4.8.1/302-c99-snprintf.patch @@ -0,0 +1,13 @@ +Index: gcc-4.8.0/libstdc++-v3/include/c_global/cstdio +=================================================================== +--- gcc-4.8.0.orig/libstdc++-v3/include/c_global/cstdio 2013-02-03 18:54:05.000000000 +0100 ++++ gcc-4.8.0/libstdc++-v3/include/c_global/cstdio 2013-03-23 17:39:32.000000000 +0100 +@@ -138,7 +138,7 @@ + using ::vsprintf; + } // namespace + +-#if _GLIBCXX_USE_C99 ++#if _GLIBCXX_USE_C99 || defined __UCLIBC__ + + #undef snprintf + #undef vfscanf diff --git a/toolchain/gcc/4.8.1/305-libmudflap-susv3-legacy.patch b/toolchain/gcc/4.8.1/305-libmudflap-susv3-legacy.patch new file mode 100644 index 000000000..35d5f5020 --- /dev/null +++ b/toolchain/gcc/4.8.1/305-libmudflap-susv3-legacy.patch @@ -0,0 +1,49 @@ +Index: gcc-4.8.0/libmudflap/mf-hooks2.c +=================================================================== +--- gcc-4.8.0.orig/libmudflap/mf-hooks2.c 2013-02-03 18:48:05.000000000 +0100 ++++ gcc-4.8.0/libmudflap/mf-hooks2.c 2013-03-23 17:39:43.000000000 +0100 +@@ -424,7 +424,7 @@ + { + TRACE ("%s\n", __PRETTY_FUNCTION__); + MF_VALIDATE_EXTENT(s, n, __MF_CHECK_WRITE, "bzero region"); +- bzero (s, n); ++ memset (s, 0, n); + } + + +@@ -434,7 +434,7 @@ + TRACE ("%s\n", __PRETTY_FUNCTION__); + MF_VALIDATE_EXTENT(src, n, __MF_CHECK_READ, "bcopy src"); + MF_VALIDATE_EXTENT(dest, n, __MF_CHECK_WRITE, "bcopy dest"); +- bcopy (src, dest, n); ++ memmove (dest, src, n); + } + + +@@ -444,7 +444,7 @@ + TRACE ("%s\n", __PRETTY_FUNCTION__); + MF_VALIDATE_EXTENT(s1, n, __MF_CHECK_READ, "bcmp 1st arg"); + MF_VALIDATE_EXTENT(s2, n, __MF_CHECK_READ, "bcmp 2nd arg"); +- return bcmp (s1, s2, n); ++ return n == 0 ? 0 : memcmp (s1, s2, n); + } + + +@@ -453,7 +453,7 @@ + size_t n = strlen (s); + TRACE ("%s\n", __PRETTY_FUNCTION__); + MF_VALIDATE_EXTENT(s, CLAMPADD(n, 1), __MF_CHECK_READ, "index region"); +- return index (s, c); ++ return strchr (s, c); + } + + +@@ -462,7 +462,7 @@ + size_t n = strlen (s); + TRACE ("%s\n", __PRETTY_FUNCTION__); + MF_VALIDATE_EXTENT(s, CLAMPADD(n, 1), __MF_CHECK_READ, "rindex region"); +- return rindex (s, c); ++ return strrchr (s, c); + } + + /* XXX: stpcpy, memccpy */ diff --git a/toolchain/gcc/4.8.1/810-arm-softfloat-libgcc.patch b/toolchain/gcc/4.8.1/810-arm-softfloat-libgcc.patch new file mode 100644 index 000000000..c8cb377d5 --- /dev/null +++ b/toolchain/gcc/4.8.1/810-arm-softfloat-libgcc.patch @@ -0,0 +1,30 @@ +Index: gcc-4.8.0/gcc/config/arm/linux-elf.h +=================================================================== +--- gcc-4.8.0.orig/gcc/config/arm/linux-elf.h 2013-01-10 21:38:27.000000000 +0100 ++++ gcc-4.8.0/gcc/config/arm/linux-elf.h 2013-03-23 17:40:00.000000000 +0100 +@@ -55,7 +55,7 @@ + %{shared:-lc} \ + %{!shared:%{profile:-lc_p}%{!profile:-lc}}" + +-#define LIBGCC_SPEC "%{mfloat-abi=soft*:-lfloat} -lgcc" ++#define LIBGCC_SPEC "-lgcc" + + #define GLIBC_DYNAMIC_LINKER "/lib/ld-linux.so.2" + +Index: gcc-4.8.0/libgcc/config/arm/t-linux +=================================================================== +--- gcc-4.8.0.orig/libgcc/config/arm/t-linux 2012-03-22 16:14:46.000000000 +0100 ++++ gcc-4.8.0/libgcc/config/arm/t-linux 2013-03-23 17:40:54.000000000 +0100 +@@ -1,6 +1,11 @@ + LIB1ASMSRC = arm/lib1funcs.S + LIB1ASMFUNCS = _udivsi3 _divsi3 _umodsi3 _modsi3 _dvmd_lnx _clzsi2 _clzdi2 \ +- _ctzsi2 _arm_addsubdf3 _arm_addsubsf3 ++ _ctzsi2 _arm_addsubdf3 _arm_addsubsf3 \ ++ _arm_addsubdf3 _arm_addsubsf3 \ ++ _arm_negdf2 _arm_muldivdf3 _arm_cmpdf2 _arm_unorddf2 \ ++ _arm_fixdfsi _arm_fixunsdfsi _arm_truncdfsf2 \ ++ _arm_negsf2 _arm_muldivsf3 _arm_cmpsf2 _arm_unordsf2 \ ++ _arm_fixsfsi _arm_fixunssfsi + + # Just for these, we omit the frame pointer since it makes such a big + # difference. diff --git a/toolchain/gcc/4.8.1/830-arm_unbreak_armv4t.patch b/toolchain/gcc/4.8.1/830-arm_unbreak_armv4t.patch new file mode 100644 index 000000000..37f8f2a54 --- /dev/null +++ b/toolchain/gcc/4.8.1/830-arm_unbreak_armv4t.patch @@ -0,0 +1,13 @@ +http://sourceware.org/ml/crossgcc/2008-05/msg00009.html + +--- a/gcc/config/arm/linux-eabi.h ++++ b/gcc/config/arm/linux-eabi.h +@@ -45,7 +45,7 @@ + The ARM10TDMI core is the default for armv5t, so set + SUBTARGET_CPU_DEFAULT to achieve this. */ + #undef SUBTARGET_CPU_DEFAULT +-#define SUBTARGET_CPU_DEFAULT TARGET_CPU_arm10tdmi ++#define SUBTARGET_CPU_DEFAULT TARGET_CPU_arm9tdmi + + /* TARGET_BIG_ENDIAN_DEFAULT is set in + config.gcc for big endian configurations. */ diff --git a/toolchain/gcc/4.8.1/powerpc-link-with-math-lib.patch.conditional b/toolchain/gcc/4.8.1/powerpc-link-with-math-lib.patch.conditional new file mode 100644 index 000000000..b7094fe65 --- /dev/null +++ b/toolchain/gcc/4.8.1/powerpc-link-with-math-lib.patch.conditional @@ -0,0 +1,122 @@ +http://gcc.gnu.org/ml/gcc-patches/2008-10/msg00269.html + +On glibc the libc.so carries a copy of the math function copysignl() but +on uClibc math functions like copysignl() live in libm. Since libgcc_s +contains unresolved symbols, any attempt to link against libgcc_s +without explicitely specifying -lm fails, resulting in a broken +bootstrap of the compiler. + +Forward port to gcc 4.5.1 by Gustavo Zacarias + +--- + libgcc/Makefile.in | 4 +++- + libgcc/configure | 32 ++++++++++++++++++++++++++++++++ + libgcc/configure.ac | 21 +++++++++++++++++++++ + 3 files changed, 56 insertions(+), 1 deletion(-) + +Index: gcc-4.8.0/libgcc/Makefile.in +=================================================================== +--- gcc-4.8.0.orig/libgcc/Makefile.in 2013-02-04 20:06:20.000000000 +0100 ++++ gcc-4.8.0/libgcc/Makefile.in 2013-03-24 09:12:43.000000000 +0100 +@@ -41,6 +41,7 @@ + decimal_float = @decimal_float@ + enable_decimal_float = @enable_decimal_float@ + fixed_point = @fixed_point@ ++LIBGCC_LIBM = @LIBGCC_LIBM@ + + host_noncanonical = @host_noncanonical@ + target_noncanonical = @target_noncanonical@ +@@ -927,9 +928,10 @@ + @multilib_dir@,$(MULTIDIR),$(subst \ + @shlib_objs@,$(objects) libgcc.a,$(subst \ + @shlib_base_name@,libgcc_s,$(subst \ ++ @libgcc_libm@,$(LIBGCC_LIBM),$(subst \ + @shlib_map_file@,$(mapfile),$(subst \ + @shlib_slibdir_qual@,$(MULTIOSSUBDIR),$(subst \ +- @shlib_slibdir@,$(shlib_slibdir),$(SHLIB_LINK)))))))) ++ @shlib_slibdir@,$(shlib_slibdir),$(SHLIB_LINK))))))))) + + libunwind$(SHLIB_EXT): $(libunwind-s-objects) $(extra-parts) + # @multilib_flags@ is still needed because this may use +Index: gcc-4.8.0/libgcc/configure +=================================================================== +--- gcc-4.8.0.orig/libgcc/configure 2012-11-05 00:08:42.000000000 +0100 ++++ gcc-4.8.0/libgcc/configure 2013-03-24 09:12:43.000000000 +0100 +@@ -564,6 +564,7 @@ + tmake_file + sfp_machine_header + set_use_emutls ++LIBGCC_LIBM + set_have_cc_tls + vis_hide + fixed_point +@@ -4481,6 +4482,37 @@ + fi + fi + ++# On powerpc libgcc_s references copysignl which is a libm function but ++# glibc apparently also provides it via libc as opposed to uClibc where ++# it lives in libm. ++echo "$as_me:$LINENO: checking for library containing copysignl" >&5 ++echo $ECHO_N "checking for library containing copysignl... $ECHO_C" >&6 ++if test "${libgcc_cv_copysignl_lib+set}" = set; then ++ echo $ECHO_N "(cached) $ECHO_C" >&6 ++else ++ ++ echo '#include ' > conftest.c ++ echo 'int the_libc = __UCLIBC__ + __powerpc__;' >> conftest.c ++ libgcc_cv_copysignl_lib="-lc" ++ if { ac_try='${CC-cc} -S conftest.c -o conftest.s 1>&5' ++ { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 ++ (eval $ac_try) 2>&5 ++ ac_status=$? ++ echo "$as_me:$LINENO: \$? = $ac_status" >&5 ++ (exit $ac_status); }; } ++ then ++ libgcc_cv_copysignl_lib="-lm" ++ fi ++ rm -f conftest.* ++ ++fi ++echo "$as_me:$LINENO: result: $libgcc_cv_copysignl_lib" >&5 ++echo "${ECHO_T}$libgcc_cv_copysignl_lib" >&6 ++ ++case /${libgcc_cv_copysignl_lib}/ in ++ /-lm/) LIBGCC_LIBM="$LIBGCC_LIBM -lm" ;; ++ *) LIBGCC_LIBM= ;; ++esac + + # Conditionalize the makefile for this target machine. + tmake_file_= +Index: gcc-4.8.0/libgcc/configure.ac +=================================================================== +--- gcc-4.8.0.orig/libgcc/configure.ac 2012-10-15 15:10:30.000000000 +0200 ++++ gcc-4.8.0/libgcc/configure.ac 2013-03-24 09:12:43.000000000 +0100 +@@ -326,6 +326,27 @@ + fi + AC_SUBST(set_have_cc_tls) + ++# On powerpc libgcc_s references copysignl which is a libm function but ++# glibc apparently also provides it via libc as opposed to uClibc where ++# it lives in libm. ++AC_CACHE_CHECK ++ libgcc_cv_copysignl_lib, ++ echo '#include ' > conftest.c ++ echo 'int the_libc = __UCLIBC__ + __powerpc__;' >> conftest.c ++ libgcc_cv_copysignl_lib="-lc" ++ if AC_TRY_COMMAND(${CC-cc} -S conftest.c -o conftest.s 1>&AS_MESSAGE_LOG_FD) ++ then ++ libgcc_cv_copysignl_lib="-lm" ++ fi ++ rm -f conftest.* ++ ]) ++ ++case /${libgcc_cv_copysignl_lib}/ in ++ /-lm/) LIBGCC_LIBM="$LIBGCC_LIBM -lm" ;; ++ *) LIBGCC_LIBM= ;; ++esac ++AC_SUBST(LIBGCC_LIBM) ++ + # See if we have emulated thread-local storage. + GCC_CHECK_EMUTLS + set_use_emutls= diff --git a/toolchain/gcc/Config.in b/toolchain/gcc/Config.in index f297e7387..fdb19e105 100644 --- a/toolchain/gcc/Config.in +++ b/toolchain/gcc/Config.in @@ -83,7 +83,7 @@ config BR2_GCC_VERSION default "4.5.4" if BR2_GCC_VERSION_4_5_X default "4.6.4" if BR2_GCC_VERSION_4_6_X default "4.7.3" if BR2_GCC_VERSION_4_7_X - default "4.8.0" if BR2_GCC_VERSION_4_8_X + default "4.8.1" if BR2_GCC_VERSION_4_8_X default $BR2_GCC_SNAP_DATE if BR2_GCC_VERSION_SNAP config BR2_EXTRA_GCC_CONFIG_OPTIONS -- cgit v1.2.3 From fb2f3d58bde6aaac12b62eeb16492c93329b8713 Mon Sep 17 00:00:00 2001 From: Gustavo Zacarias Date: Fri, 31 May 2013 02:27:16 +0000 Subject: iptables: bump to version 1.4.19.1 Signed-off-by: Gustavo Zacarias Signed-off-by: Peter Korsgaard --- package/iptables/iptables.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package/iptables/iptables.mk b/package/iptables/iptables.mk index ed11fdc04..5a21412c8 100644 --- a/package/iptables/iptables.mk +++ b/package/iptables/iptables.mk @@ -4,7 +4,7 @@ # ############################################################# -IPTABLES_VERSION = 1.4.18 +IPTABLES_VERSION = 1.4.19.1 IPTABLES_SOURCE = iptables-$(IPTABLES_VERSION).tar.bz2 IPTABLES_SITE = http://ftp.netfilter.org/pub/iptables IPTABLES_INSTALL_STAGING = YES -- cgit v1.2.3