* [Buildroot] [PATCH 01/20] numactl: new package
2013-05-26 22:08 [Buildroot] [PATCH 00/20] Patches from the Patchwork Day Thomas Petazzoni
@ 2013-05-26 22:08 ` Thomas Petazzoni
2013-05-27 8:42 ` Peter Korsgaard
2013-05-26 22:08 ` [Buildroot] [PATCH 02/20] dropbear: factorize the 'depends on BR2_PACKAGE_DROPBEAR' Thomas Petazzoni
` (18 subsequent siblings)
19 siblings, 1 reply; 45+ messages in thread
From: Thomas Petazzoni @ 2013-05-26 22:08 UTC (permalink / raw)
To: buildroot
From: Will Newton <will.newton@imgtec.com>
[Thomas: updated to 2.0.8, restricted to supported architectures,
added licensing informations, updated to latest Buildroot package
infrastructure]
Signed-off-by: Will Newton <will.newton@imgtec.com>
Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
---
package/Config.in | 1 +
package/numactl/Config.in | 12 ++++++++++++
package/numactl/numactl.mk | 21 +++++++++++++++++++++
3 files changed, 34 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 d980871..6094c1b 100644
--- a/package/Config.in
+++ b/package/Config.in
@@ -852,6 +852,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 0000000..d39a733
--- /dev/null
+++ b/package/numactl/Config.in
@@ -0,0 +1,12 @@
+config BR2_PACKAGE_NUMACTL
+ bool "numactl"
+ # numactl uses some system calls that are not available on all
+ # architectures.
+ 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/
diff --git a/package/numactl/numactl.mk b/package/numactl/numactl.mk
new file mode 100644
index 0000000..440847c
--- /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)
+NUMCTL_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))
--
1.7.9.5
^ permalink raw reply related [flat|nested] 45+ messages in thread* [Buildroot] [PATCH 01/20] numactl: new package
2013-05-26 22:08 ` [Buildroot] [PATCH 01/20] numactl: new package Thomas Petazzoni
@ 2013-05-27 8:42 ` Peter Korsgaard
0 siblings, 0 replies; 45+ messages in thread
From: Peter Korsgaard @ 2013-05-27 8:42 UTC (permalink / raw)
To: buildroot
>>>>> "Thomas" == Thomas Petazzoni <thomas.petazzoni@free-electrons.com> writes:
Thomas> From: Will Newton <will.newton@imgtec.com>
Thomas> [Thomas: updated to 2.0.8, restricted to supported architectures,
Thomas> added licensing informations, updated to latest Buildroot package
Thomas> infrastructure]
Thomas> Signed-off-by: Will Newton <will.newton@imgtec.com>
Thomas> Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
Thomas> ---
Thomas> package/Config.in | 1 +
Thomas> package/numactl/Config.in | 12 ++++++++++++
Thomas> package/numactl/numactl.mk | 21 +++++++++++++++++++++
Thomas> 3 files changed, 34 insertions(+)
Thomas> create mode 100644 package/numactl/Config.in
Thomas> create mode 100644 package/numactl/numactl.mk
Thomas> diff --git a/package/Config.in b/package/Config.in
Thomas> index d980871..6094c1b 100644
Thomas> --- a/package/Config.in
Thomas> +++ b/package/Config.in
Thomas> @@ -852,6 +852,7 @@ source "package/module-init-tools/Config.in"
Thomas> endif
Thomas> source "package/monit/Config.in"
Thomas> source "package/ncdu/Config.in"
Thomas> +source "package/numactl/Config.in"
Thomas> source "package/polkit/Config.in"
Thomas> if BR2_PACKAGE_BUSYBOX_SHOW_OTHERS
Thomas> source "package/procps/Config.in"
Thomas> diff --git a/package/numactl/Config.in b/package/numactl/Config.in
Thomas> new file mode 100644
Thomas> index 0000000..d39a733
Thomas> --- /dev/null
Thomas> +++ b/package/numactl/Config.in
Thomas> @@ -0,0 +1,12 @@
Thomas> +config BR2_PACKAGE_NUMACTL
Thomas> + bool "numactl"
Thomas> + # numactl uses some system calls that are not available on all
Thomas> + # architectures.
Thomas> + depends on BR2_i386 || BR2_mips || BR2_mipsel || \
Thomas> + BR2_mips64 || BR2_mips64el || BR2_powerpc || BR2_x86_64
Thomas> + help
Thomas> + numactl allows you to run your application on specific cpus
Thomas> + and memory nodes. It does this by supplying a NUMA memory
Thomas> + policy to the operating system before running your program.
Thomas> +
Thomas> + http://oss.sgi.com/projects/libnuma/
Thomas> diff --git a/package/numactl/numactl.mk b/package/numactl/numactl.mk
Thomas> new file mode 100644
Thomas> index 0000000..440847c
Thomas> --- /dev/null
Thomas> +++ b/package/numactl/numactl.mk
Thomas> @@ -0,0 +1,21 @@
Thomas> +#############################################################
Thomas> +#
Thomas> +# numactl
Thomas> +#
Thomas> +#############################################################
Thomas> +
Thomas> +NUMACTL_VERSION = 2.0.8
Thomas> +NUMACTL_SOURCE = numactl-$(NUMACTL_VERSION).tar.gz
Thomas> +NUMACTL_SITE = ftp://oss.sgi.com/www/projects/libnuma/download/
Thomas> +NUMACTL_LICENSE = LGPLv2.1 (libnuma), GPLv2 (programs)
Thomas> +NUMCTL_LICENSE_FILES = README
s/NUMCTL/NUMACTL/
The package uses stat64, so it needs largefile support in toolchain.
Committed to next with those issues fixed, thanks.
--
Bye, Peter Korsgaard
^ permalink raw reply [flat|nested] 45+ messages in thread
* [Buildroot] [PATCH 02/20] dropbear: factorize the 'depends on BR2_PACKAGE_DROPBEAR'
2013-05-26 22:08 [Buildroot] [PATCH 00/20] Patches from the Patchwork Day Thomas Petazzoni
2013-05-26 22:08 ` [Buildroot] [PATCH 01/20] numactl: new package Thomas Petazzoni
@ 2013-05-26 22:08 ` Thomas Petazzoni
2013-05-27 11:11 ` Peter Korsgaard
2013-05-26 22:08 ` [Buildroot] [PATCH 03/20] elf2flt: fix build when zlib is not installed on the host Thomas Petazzoni
` (17 subsequent siblings)
19 siblings, 1 reply; 45+ messages in thread
From: Thomas Petazzoni @ 2013-05-26 22:08 UTC (permalink / raw)
To: buildroot
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 <thomas.petazzoni@free-electrons.com>
---
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 0903ad1..68c3b71 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
--
1.7.9.5
^ permalink raw reply related [flat|nested] 45+ messages in thread* [Buildroot] [PATCH 03/20] elf2flt: fix build when zlib is not installed on the host
2013-05-26 22:08 [Buildroot] [PATCH 00/20] Patches from the Patchwork Day Thomas Petazzoni
2013-05-26 22:08 ` [Buildroot] [PATCH 01/20] numactl: new package Thomas Petazzoni
2013-05-26 22:08 ` [Buildroot] [PATCH 02/20] dropbear: factorize the 'depends on BR2_PACKAGE_DROPBEAR' Thomas Petazzoni
@ 2013-05-26 22:08 ` Thomas Petazzoni
2013-05-27 11:13 ` Peter Korsgaard
2013-05-26 22:08 ` [Buildroot] [PATCH 04/20] gcc: fix gcc 4.8 build when thread support is disabled Thomas Petazzoni
` (16 subsequent siblings)
19 siblings, 1 reply; 45+ messages in thread
From: Thomas Petazzoni @ 2013-05-26 22:08 UTC (permalink / raw)
To: buildroot
For a reason that's fairly unclear to me, Peter added a '-lz' link
flag to the elf2flt.mk build in d5664ee99 ("elf2flt: fix link").
However, the zlib library may not necessarily be installed on the host
machine, so we should depend on host-zlib, and pass the appropriate
LDFLAGS. This is what this patch does.
Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
---
Note: I already have a patch that converts elf2flt to the package
infrastructure, but I am waiting to have the patches to make the
entire internal toolchain logic use the package infrastructure to send
them.
---
toolchain/elf2flt/elf2flt.mk | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/toolchain/elf2flt/elf2flt.mk b/toolchain/elf2flt/elf2flt.mk
index 134034b..52e199c 100644
--- a/toolchain/elf2flt/elf2flt.mk
+++ b/toolchain/elf2flt/elf2flt.mk
@@ -19,7 +19,7 @@ $(ELF2FLT_DIR)/.patched: $(ELF2FLT_DIR)/.unpacked
$(ELF2FLT_DIR)/.configured: $(ELF2FLT_DIR)/.patched
(cd $(ELF2FLT_DIR); rm -rf config.cache; \
- LDFLAGS=-lz \
+ LDFLAGS="$(HOST_LDFLAGS) -lz" \
$(ELF2FLT_DIR)/configure $(QUIET) \
--with-bfd-include-dir=$(HOST_BINUTILS_DIR)/bfd/ \
--with-binutils-include-dir=$(HOST_BINUTILS_DIR)/include/ \
@@ -33,7 +33,7 @@ $(ELF2FLT_DIR)/$(ELF2FLT_BINARY): $(ELF2FLT_DIR)/.configured
$(MAKE) -C $(ELF2FLT_DIR) all
$(MAKE) -C $(ELF2FLT_DIR) install
-elf2flt: uclibc_target uclibc-configured binutils gcc $(ELF2FLT_DIR)/$(ELF2FLT_BINARY)
+elf2flt: uclibc_target uclibc-configured binutils gcc host-zlib $(ELF2FLT_DIR)/$(ELF2FLT_BINARY)
elf2flt-clean:
rm -rf $(ELF2FLT_SOURCE)
--
1.7.9.5
^ permalink raw reply related [flat|nested] 45+ messages in thread* [Buildroot] [PATCH 03/20] elf2flt: fix build when zlib is not installed on the host
2013-05-26 22:08 ` [Buildroot] [PATCH 03/20] elf2flt: fix build when zlib is not installed on the host Thomas Petazzoni
@ 2013-05-27 11:13 ` Peter Korsgaard
0 siblings, 0 replies; 45+ messages in thread
From: Peter Korsgaard @ 2013-05-27 11:13 UTC (permalink / raw)
To: buildroot
>>>>> "Thomas" == Thomas Petazzoni <thomas.petazzoni@free-electrons.com> writes:
Thomas> For a reason that's fairly unclear to me, Peter added a '-lz' link
Thomas> flag to the elf2flt.mk build in d5664ee99 ("elf2flt: fix link").
I also don't recall the details anymore.
Thomas> However, the zlib library may not necessarily be installed on the host
Thomas> machine, so we should depend on host-zlib, and pass the appropriate
Thomas> LDFLAGS. This is what this patch does.
Committed, thanks.
Thomas> ---
Thomas> Note: I already have a patch that converts elf2flt to the package
Thomas> infrastructure, but I am waiting to have the patches to make the
Thomas> entire internal toolchain logic use the package infrastructure to send
Thomas> them.
Ok.
--
Bye, Peter Korsgaard
^ permalink raw reply [flat|nested] 45+ messages in thread
* [Buildroot] [PATCH 04/20] gcc: fix gcc 4.8 build when thread support is disabled
2013-05-26 22:08 [Buildroot] [PATCH 00/20] Patches from the Patchwork Day Thomas Petazzoni
` (2 preceding siblings ...)
2013-05-26 22:08 ` [Buildroot] [PATCH 03/20] elf2flt: fix build when zlib is not installed on the host Thomas Petazzoni
@ 2013-05-26 22:08 ` Thomas Petazzoni
2013-05-27 11:36 ` Peter Korsgaard
2013-05-27 21:55 ` Peter Korsgaard
2013-05-26 22:08 ` [Buildroot] [PATCH 05/20] toolchain: blackfin: Remove Blackfin toolchain 2011R1 release Thomas Petazzoni
` (15 subsequent siblings)
19 siblings, 2 replies; 45+ messages in thread
From: Thomas Petazzoni @ 2013-05-26 22:08 UTC (permalink / raw)
To: buildroot
When thread support is disabled, the libitm and libatomic libraries
from gcc should be disabled, otherwise, the build of gcc fails.
Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
---
toolchain/gcc/gcc-uclibc-4.x.mk | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/toolchain/gcc/gcc-uclibc-4.x.mk b/toolchain/gcc/gcc-uclibc-4.x.mk
index 21679ef..5be26c4 100644
--- a/toolchain/gcc/gcc-uclibc-4.x.mk
+++ b/toolchain/gcc/gcc-uclibc-4.x.mk
@@ -203,7 +203,7 @@ GCC_TLS:=--disable-tls
endif
ifeq ($(BR2_PTHREADS_NONE),y)
-THREADS:=--disable-threads
+THREADS:=--disable-threads --disable-libitm --disable-libatomic
else
THREADS:=--enable-threads
endif
--
1.7.9.5
^ permalink raw reply related [flat|nested] 45+ messages in thread* [Buildroot] [PATCH 04/20] gcc: fix gcc 4.8 build when thread support is disabled
2013-05-26 22:08 ` [Buildroot] [PATCH 04/20] gcc: fix gcc 4.8 build when thread support is disabled Thomas Petazzoni
@ 2013-05-27 11:36 ` Peter Korsgaard
2013-05-27 21:55 ` Peter Korsgaard
1 sibling, 0 replies; 45+ messages in thread
From: Peter Korsgaard @ 2013-05-27 11:36 UTC (permalink / raw)
To: buildroot
>>>>> "Thomas" == Thomas Petazzoni <thomas.petazzoni@free-electrons.com> writes:
Thomas> When thread support is disabled, the libitm and libatomic libraries
Thomas> from gcc should be disabled, otherwise, the build of gcc fails.
Committed to next, thanks.
--
Bye, Peter Korsgaard
^ permalink raw reply [flat|nested] 45+ messages in thread
* [Buildroot] [PATCH 04/20] gcc: fix gcc 4.8 build when thread support is disabled
2013-05-26 22:08 ` [Buildroot] [PATCH 04/20] gcc: fix gcc 4.8 build when thread support is disabled Thomas Petazzoni
2013-05-27 11:36 ` Peter Korsgaard
@ 2013-05-27 21:55 ` Peter Korsgaard
1 sibling, 0 replies; 45+ messages in thread
From: Peter Korsgaard @ 2013-05-27 21:55 UTC (permalink / raw)
To: buildroot
>>>>> "Thomas" == Thomas Petazzoni <thomas.petazzoni@free-electrons.com> writes:
Thomas> When thread support is disabled, the libitm and libatomic libraries
Thomas> from gcc should be disabled, otherwise, the build of gcc fails.
I've added this for 2013.05 instead, thanks.
--
Bye, Peter Korsgaard
^ permalink raw reply [flat|nested] 45+ messages in thread
* [Buildroot] [PATCH 05/20] toolchain: blackfin: Remove Blackfin toolchain 2011R1 release.
2013-05-26 22:08 [Buildroot] [PATCH 00/20] Patches from the Patchwork Day Thomas Petazzoni
` (3 preceding siblings ...)
2013-05-26 22:08 ` [Buildroot] [PATCH 04/20] gcc: fix gcc 4.8 build when thread support is disabled Thomas Petazzoni
@ 2013-05-26 22:08 ` Thomas Petazzoni
2013-05-27 11:36 ` Peter Korsgaard
2013-05-26 22:08 ` [Buildroot] [PATCH 06/20] poco: Add upstream patch to add support for aarch64 Thomas Petazzoni
` (14 subsequent siblings)
19 siblings, 1 reply; 45+ messages in thread
From: Thomas Petazzoni @ 2013-05-26 22:08 UTC (permalink / raw)
To: buildroot
From: Sonic Zhang <sonic.zhang@analog.com>
ADI officially supports the buildroot and related GNU toolchain for
Blackfin since ADI's 2012R1 release only. In order to avoid confusion,
it is better to remove the 2011R1 GNU toolchain for Blackfin. In
addition, the 2011R1 GNU toolchain for Blackfin doesn't support the
BF60x processors.
Signed-off-by: Sonic Zhang <sonic.zhang@analog.com>
Acked-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
---
toolchain/toolchain-external/Config.in | 19 -------------------
toolchain/toolchain-external/ext-tool.mk | 8 +-------
2 files changed, 1 insertion(+), 26 deletions(-)
diff --git a/toolchain/toolchain-external/Config.in b/toolchain/toolchain-external/Config.in
index a93ada3..02fb330 100644
--- a/toolchain/toolchain-external/Config.in
+++ b/toolchain/toolchain-external/Config.in
@@ -614,23 +614,6 @@ config BR2_TOOLCHAIN_EXTERNAL_BLACKFIN_UCLINUX_2012R1
Toolchain for the Blackfin architecture, from
http://blackfin.uclinux.org.
-config BR2_TOOLCHAIN_EXTERNAL_BLACKFIN_UCLINUX_2011R1
- bool "Blackfin.uclinux.org 2011R1-RC4"
- depends on BR2_bfin
- depends on BR2_HOSTARCH = "x86_64" || BR2_HOSTARCH = "x86"
- select BR2_TOOLCHAIN_EXTERNAL_UCLIBC
- select BR2_INSTALL_LIBSTDCPP
- select BR2_LARGEFILE
- select BR2_INET_IPV6
- select BR2_TOOLCHAIN_HAS_NATIVE_RPC
- select BR2_USE_WCHAR
- select BR2_TOOLCHAIN_HAS_THREADS
- select BR2_TOOLCHAIN_HAS_THREADS_DEBUG
- select BR2_HOSTARCH_NEEDS_IA32_LIBS
- help
- Toolchain for the Blackfin architecture, from
- http://blackfin.uclinux.org.
-
config BR2_TOOLCHAIN_EXTERNAL_XILINX_MICROBLAZEEL_14_3
bool "Xilinx Little Endian Microblaze GNU Tools"
depends on BR2_microblazeel
@@ -784,8 +767,6 @@ config BR2_TOOLCHAIN_EXTERNAL_PREFIX
default "i686-pc-linux-gnu" if BR2_TOOLCHAIN_EXTERNAL_CODESOURCERY_X86_201109
default "i686-pc-linux-gnu" if BR2_TOOLCHAIN_EXTERNAL_CODESOURCERY_X86_201203
default "i686-pc-linux-gnu" if BR2_TOOLCHAIN_EXTERNAL_CODESOURCERY_X86_201209
- default "bfin-uclinux" if BR2_TOOLCHAIN_EXTERNAL_BLACKFIN_UCLINUX_2011R1 && BR2_BINFMT_FLAT
- default "bfin-linux-uclibc" if BR2_TOOLCHAIN_EXTERNAL_BLACKFIN_UCLINUX_2011R1 && BR2_BINFMT_FDPIC
default "bfin-uclinux" if BR2_TOOLCHAIN_EXTERNAL_BLACKFIN_UCLINUX_2012R1 && BR2_BINFMT_FLAT
default "bfin-linux-uclibc" if BR2_TOOLCHAIN_EXTERNAL_BLACKFIN_UCLINUX_2012R1 && BR2_BINFMT_FDPIC
default "bfin-uclinux" if BR2_TOOLCHAIN_EXTERNAL_BLACKFIN_UCLINUX_2012R2 && BR2_BINFMT_FLAT
diff --git a/toolchain/toolchain-external/ext-tool.mk b/toolchain/toolchain-external/ext-tool.mk
index a87bc3b..58e58f6 100644
--- a/toolchain/toolchain-external/ext-tool.mk
+++ b/toolchain/toolchain-external/ext-tool.mk
@@ -248,12 +248,6 @@ TOOLCHAIN_EXTERNAL_SOURCE=ia32-2012.03-27-i686-pc-linux-gnu-i386-linux.tar.bz2
else ifeq ($(BR2_TOOLCHAIN_EXTERNAL_CODESOURCERY_X86_201209),y)
TOOLCHAIN_EXTERNAL_SITE=https://sourcery.mentor.com/public/gnu_toolchain/i686-pc-linux-gnu/
TOOLCHAIN_EXTERNAL_SOURCE=ia32-2012.09-62-i686-pc-linux-gnu-i386-linux.tar.bz2
-else ifeq ($(BR2_TOOLCHAIN_EXTERNAL_BLACKFIN_UCLINUX_2011R1),y)
-TOOLCHAIN_EXTERNAL_SITE_1 = http://blackfin.uclinux.org/gf/download/frsrelease/531/9509/
-TOOLCHAIN_EXTERNAL_SOURCE_1 = blackfin-toolchain-2011R1-RC4.i386.tar.bz2
-TOOLCHAIN_EXTERNAL_SITE_2 = http://blackfin.uclinux.org/gf/download/frsrelease/531/9517/
-TOOLCHAIN_EXTERNAL_SOURCE_2 = blackfin-toolchain-uclibc-full-2011R1-RC4.i386.tar.bz2
-TOOLCHAIN_EXTERNAL_SOURCE = $(TOOLCHAIN_EXTERNAL_SOURCE_1) $(TOOLCHAIN_EXTERNAL_SOURCE_2)
else ifeq ($(BR2_TOOLCHAIN_EXTERNAL_BLACKFIN_UCLINUX_2012R1),y)
TOOLCHAIN_EXTERNAL_SITE_1 = http://blackfin.uclinux.org/gf/download/frsrelease/559/9858/
TOOLCHAIN_EXTERNAL_SOURCE_1 = blackfin-toolchain-2012R1-RC2.i386.tar.bz2
@@ -305,7 +299,7 @@ endif
# contain ./opt/uClinux/{bfin-uclinux,bfin-linux-uclibc} directories,
# which themselves contain the toolchain. This is why we strip more
# components than usual.
-ifeq ($(BR2_TOOLCHAIN_EXTERNAL_BLACKFIN_UCLINUX_2011R1)$(BR2_TOOLCHAIN_EXTERNAL_BLACKFIN_UCLINUX_2012R1)$(BR2_TOOLCHAIN_EXTERNAL_BLACKFIN_UCLINUX_2012R2),y)
+ifeq ($(BR2_TOOLCHAIN_EXTERNAL_BLACKFIN_UCLINUX_2012R1)$(BR2_TOOLCHAIN_EXTERNAL_BLACKFIN_UCLINUX_2012R2),y)
$(DL_DIR)/$(TOOLCHAIN_EXTERNAL_SOURCE_1):
$(call DOWNLOAD,$(TOOLCHAIN_EXTERNAL_SITE_1:/=:/=)/$(TOOLCHAIN_EXTERNAL_SOURCE_1))
--
1.7.9.5
^ permalink raw reply related [flat|nested] 45+ messages in thread* [Buildroot] [PATCH 06/20] poco: Add upstream patch to add support for aarch64.
2013-05-26 22:08 [Buildroot] [PATCH 00/20] Patches from the Patchwork Day Thomas Petazzoni
` (4 preceding siblings ...)
2013-05-26 22:08 ` [Buildroot] [PATCH 05/20] toolchain: blackfin: Remove Blackfin toolchain 2011R1 release Thomas Petazzoni
@ 2013-05-26 22:08 ` Thomas Petazzoni
2013-06-09 20:14 ` Peter Korsgaard
2013-05-26 22:08 ` [Buildroot] [PATCH 07/20] flex: needs M4 at runtime Thomas Petazzoni
` (13 subsequent siblings)
19 siblings, 1 reply; 45+ messages in thread
From: Thomas Petazzoni @ 2013-05-26 22:08 UTC (permalink / raw)
To: buildroot
From: Will Newton <will.newton@linaro.org>
Signed-off-by: Will Newton <will.newton@linaro.org>
Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
---
package/poco/Config.in | 4 ++--
package/poco/poco-aarch64.patch | 39 +++++++++++++++++++++++++++++++++++++++
2 files changed, 41 insertions(+), 2 deletions(-)
create mode 100644 package/poco/poco-aarch64.patch
diff --git a/package/poco/Config.in b/package/poco/Config.in
index 402f96d..47ca83d 100644
--- a/package/poco/Config.in
+++ b/package/poco/Config.in
@@ -3,7 +3,7 @@ config BR2_PACKAGE_POCO
depends on BR2_INSTALL_LIBSTDCPP
depends on BR2_USE_WCHAR
depends on BR2_TOOLCHAIN_HAS_THREADS
- depends on !(BR2_aarch64 || BR2_arc || BR2_bfin || BR2_microblaze || BR2_mipsel || BR2_xtensa)
+ depends on !(BR2_arc || BR2_bfin || BR2_microblaze || BR2_mipsel || BR2_xtensa)
select BR2_PACKAGE_ZLIB
select BR2_PACKAGE_PCRE
help
@@ -62,4 +62,4 @@ endif # BR2_PACKAGE_POCO
comment "poco requires a toolchain with WCHAR, threads, and C++ support"
depends on !BR2_USE_WCHAR || !BR2_INSTALL_LIBSTDCPP \
|| !BR2_TOOLCHAIN_HAS_THREADS
- depends on !(BR2_aarch64 || BR2_arc || BR2_bfin || BR2_microblaze || BR2_mipsel || BR2_xtensa)
+ depends on !(BR2_arc || BR2_bfin || BR2_microblaze || BR2_mipsel || BR2_xtensa)
diff --git a/package/poco/poco-aarch64.patch b/package/poco/poco-aarch64.patch
new file mode 100644
index 0000000..f629f7b
--- /dev/null
+++ b/package/poco/poco-aarch64.patch
@@ -0,0 +1,39 @@
+From 37899eda9563d9134cb5864751b6432cabfaac3e Mon Sep 17 00:00:00 2001
+From: Will Newton <will.newton@linaro.org>
+Date: Tue, 21 May 2013 22:11:05 +0100
+Subject: [PATCH] Foundation/include/Poco/Platform.h: Add support for AArch64.
+
+Add support for big and little endian AArch64 preprocessor defines.
+---
+ Foundation/include/Poco/Platform.h | 8 +++++++-
+ 1 file changed, 7 insertions(+), 1 deletion(-)
+
+diff --git a/Foundation/include/Poco/Platform.h b/Foundation/include/Poco/Platform.h
+index f34f277..8ddb4cb 100644
+--- a/Foundation/include/Poco/Platform.h
++++ b/Foundation/include/Poco/Platform.h
+@@ -145,6 +145,7 @@
+ #define POCO_ARCH_S390 0x0c
+ #define POCO_ARCH_SH 0x0d
+ #define POCO_ARCH_NIOS2 0x0e
++#define POCO_ARCH_AARCH64 0x0f
+
+
+ #if defined(__ALPHA) || defined(__alpha) || defined(__alpha__) || defined(_M_ALPHA)
+@@ -207,7 +208,12 @@
+ #else
+ #define POCO_ARCH_BIG_ENDIAN 1
+ #endif
+-
++#elif defined(__AARCH64EL__)
++ #define POCO_ARCH POCO_ARCH_AARCH64
++ #define POCO_ARCH_LITTLE_ENDIAN 1
++#elif defined(__AARCH64EB__)
++ #define POCO_ARCH POCO_ARCH_AARCH64
++ #define POCO_ARCH_BIG_ENDIAN 1
+ #endif
+
+
+--
+1.8.1.4
+
--
1.7.9.5
^ permalink raw reply related [flat|nested] 45+ messages in thread* [Buildroot] [PATCH 07/20] flex: needs M4 at runtime
2013-05-26 22:08 [Buildroot] [PATCH 00/20] Patches from the Patchwork Day Thomas Petazzoni
` (5 preceding siblings ...)
2013-05-26 22:08 ` [Buildroot] [PATCH 06/20] poco: Add upstream patch to add support for aarch64 Thomas Petazzoni
@ 2013-05-26 22:08 ` Thomas Petazzoni
2013-05-27 21:55 ` Peter Korsgaard
2013-05-26 22:08 ` [Buildroot] [PATCH 08/20] Remove useless CVS related files Thomas Petazzoni
` (12 subsequent siblings)
19 siblings, 1 reply; 45+ messages in thread
From: Thomas Petazzoni @ 2013-05-26 22:08 UTC (permalink / raw)
To: buildroot
For proper runtime execution, flex requires m4 to be
installed. Passing a M4 variable at configure time is needed,
otherwise flex on the target will try to use a 'm4' binary with a
build machine path.
Fixes bug #4988.
Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
---
package/flex/Config.in | 2 ++
package/flex/flex.mk | 1 +
2 files changed, 3 insertions(+)
diff --git a/package/flex/Config.in b/package/flex/Config.in
index f74a0f0..1ecd0c3 100644
--- a/package/flex/Config.in
+++ b/package/flex/Config.in
@@ -12,5 +12,7 @@ config BR2_PACKAGE_FLEX_BINARY
# needs fork()
depends on BR2_USE_MMU
depends on BR2_PACKAGE_FLEX
+ # runtime dependency
+ select BR2_PACKAGE_M4
help
Install the flex binary tool in the target filesystem.
diff --git a/package/flex/flex.mk b/package/flex/flex.mk
index f7e319f..748365b 100644
--- a/package/flex/flex.mk
+++ b/package/flex/flex.mk
@@ -11,6 +11,7 @@ FLEX_LICENSE = FLEX
FLEX_LICENSE_FILES = COPYING
FLEX_DEPENDENCIES = \
$(if $(BR2_PACKAGE_GETTEXT_IF_LOCALE),gettext) host-m4
+FLEX_CONF_ENV = M4=/usr/bin/m4
# we don't have a host-gettext/libintl
HOST_FLEX_DEPENDENCIES = host-m4
--
1.7.9.5
^ permalink raw reply related [flat|nested] 45+ messages in thread* [Buildroot] [PATCH 08/20] Remove useless CVS related files
2013-05-26 22:08 [Buildroot] [PATCH 00/20] Patches from the Patchwork Day Thomas Petazzoni
` (6 preceding siblings ...)
2013-05-26 22:08 ` [Buildroot] [PATCH 07/20] flex: needs M4 at runtime Thomas Petazzoni
@ 2013-05-26 22:08 ` Thomas Petazzoni
2013-05-27 21:59 ` Peter Korsgaard
2013-05-26 22:08 ` [Buildroot] [PATCH 09/20] toolchain-external: add support for 'Sourcery CodeBench ARM 2013.05' Thomas Petazzoni
` (11 subsequent siblings)
19 siblings, 1 reply; 45+ messages in thread
From: Thomas Petazzoni @ 2013-05-26 22:08 UTC (permalink / raw)
To: buildroot
Fixes bug #5912.
Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
---
support/gnuconfig/.cvsignore | 5 -----
toolchain/elf2flt/elf2flt/.cvsignore | 3 ---
toolchain/elf2flt/elf2flt/CVS/Entries | 17 -----------------
toolchain/elf2flt/elf2flt/CVS/Repository | 1 -
toolchain/elf2flt/elf2flt/CVS/Root | 1 -
5 files changed, 27 deletions(-)
delete mode 100644 support/gnuconfig/.cvsignore
delete mode 100644 toolchain/elf2flt/elf2flt/.cvsignore
delete mode 100644 toolchain/elf2flt/elf2flt/CVS/Entries
delete mode 100644 toolchain/elf2flt/elf2flt/CVS/Repository
delete mode 100644 toolchain/elf2flt/elf2flt/CVS/Root
diff --git a/support/gnuconfig/.cvsignore b/support/gnuconfig/.cvsignore
deleted file mode 100644
index 669c89f..0000000
--- a/support/gnuconfig/.cvsignore
+++ /dev/null
@@ -1,5 +0,0 @@
-.cvsignore
-README.buildroot
-gnuconfig.mk
-patches
-.svn
diff --git a/toolchain/elf2flt/elf2flt/.cvsignore b/toolchain/elf2flt/elf2flt/.cvsignore
deleted file mode 100644
index 18cff9a..0000000
--- a/toolchain/elf2flt/elf2flt/.cvsignore
+++ /dev/null
@@ -1,3 +0,0 @@
-.cvsignore
-.svn
-maketarball.sh
diff --git a/toolchain/elf2flt/elf2flt/CVS/Entries b/toolchain/elf2flt/elf2flt/CVS/Entries
deleted file mode 100644
index 1b3750f..0000000
--- a/toolchain/elf2flt/elf2flt/CVS/Entries
+++ /dev/null
@@ -1,17 +0,0 @@
-/LICENSE.TXT/1.1/Tue Jan 10 04:34:09 2006//
-/README/1.5/Tue Jan 10 04:34:09 2006/-ko/
-/config.guess/1.2/Tue Jan 10 04:34:08 2006/-ko/
-/e1-elf2flt.ld/1.1/Tue Jan 10 04:34:09 2006//
-/flat.h/1.6/Tue Jan 10 04:34:08 2006/-ko/
-/install-sh/1.1.1.1/Tue Jan 10 04:34:08 2006/-ko/
-/stubs.c/1.1/Tue Jan 10 04:34:08 2006//
-/config.sub/1.8/Wed Jan 11 13:36:39 2006/-ko/
-/cygwin-elf.h/1.4/Wed Jan 11 13:36:39 2006//
-/Makefile.in/1.17/Result of merge/-ko/
-/configure/1.12/Sun Jan 28 05:27:28 2007/-ko/
-/configure.in/1.10/Sun Jan 28 05:27:28 2007/-ko/
-/elf2flt.c/1.46/Result of merge/-ko/
-/elf2flt.ld/1.15/Sun Jan 28 05:27:28 2007/-ko/
-/flthdr.c/1.10/Sun Jan 28 05:27:28 2007/-ko/
-/ld-elf2flt.in/1.15/Sun Jan 28 05:27:28 2007//
-D
diff --git a/toolchain/elf2flt/elf2flt/CVS/Repository b/toolchain/elf2flt/elf2flt/CVS/Repository
deleted file mode 100644
index 61a695f..0000000
--- a/toolchain/elf2flt/elf2flt/CVS/Repository
+++ /dev/null
@@ -1 +0,0 @@
-elf2flt
diff --git a/toolchain/elf2flt/elf2flt/CVS/Root b/toolchain/elf2flt/elf2flt/CVS/Root
deleted file mode 100644
index 0b9f527..0000000
--- a/toolchain/elf2flt/elf2flt/CVS/Root
+++ /dev/null
@@ -1 +0,0 @@
-:pserver:anonymous at cvs.uclinux.org:/var/cvs
--
1.7.9.5
^ permalink raw reply related [flat|nested] 45+ messages in thread* [Buildroot] [PATCH 09/20] toolchain-external: add support for 'Sourcery CodeBench ARM 2013.05'
2013-05-26 22:08 [Buildroot] [PATCH 00/20] Patches from the Patchwork Day Thomas Petazzoni
` (7 preceding siblings ...)
2013-05-26 22:08 ` [Buildroot] [PATCH 08/20] Remove useless CVS related files Thomas Petazzoni
@ 2013-05-26 22:08 ` Thomas Petazzoni
2013-05-27 22:03 ` Peter Korsgaard
2013-05-26 22:08 ` [Buildroot] [PATCH 10/20] toolchain-external: remove support for 'Sourcery CodeBench ARM 2011.03' Thomas Petazzoni
` (10 subsequent siblings)
19 siblings, 1 reply; 45+ messages in thread
From: Thomas Petazzoni @ 2013-05-26 22:08 UTC (permalink / raw)
To: buildroot
From: Fabio Porcedda <fabio.porcedda@gmail.com>
Signed-off-by: Fabio Porcedda <fabio.porcedda@gmail.com>
Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
---
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 02fb330..9d29509 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
@@ -747,6 +771,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 58e58f6..182d689 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
--
1.7.9.5
^ permalink raw reply related [flat|nested] 45+ messages in thread* [Buildroot] [PATCH 10/20] toolchain-external: remove support for 'Sourcery CodeBench ARM 2011.03'
2013-05-26 22:08 [Buildroot] [PATCH 00/20] Patches from the Patchwork Day Thomas Petazzoni
` (8 preceding siblings ...)
2013-05-26 22:08 ` [Buildroot] [PATCH 09/20] toolchain-external: add support for 'Sourcery CodeBench ARM 2013.05' Thomas Petazzoni
@ 2013-05-26 22:08 ` Thomas Petazzoni
2013-05-27 22:03 ` Peter Korsgaard
2013-05-26 22:08 ` [Buildroot] [PATCH 11/20] sunxi-tools: new host/target package Thomas Petazzoni
` (9 subsequent siblings)
19 siblings, 1 reply; 45+ messages in thread
From: Thomas Petazzoni @ 2013-05-26 22:08 UTC (permalink / raw)
To: buildroot
From: Fabio Porcedda <fabio.porcedda@gmail.com>
Signed-off-by: Fabio Porcedda <fabio.porcedda@gmail.com>
Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
---
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 9d29509..47b2bf5 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
@@ -768,7 +744,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 182d689..93b3b15 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)
--
1.7.9.5
^ permalink raw reply related [flat|nested] 45+ messages in thread* [Buildroot] [PATCH 11/20] sunxi-tools: new host/target package
2013-05-26 22:08 [Buildroot] [PATCH 00/20] Patches from the Patchwork Day Thomas Petazzoni
` (9 preceding siblings ...)
2013-05-26 22:08 ` [Buildroot] [PATCH 10/20] toolchain-external: remove support for 'Sourcery CodeBench ARM 2011.03' Thomas Petazzoni
@ 2013-05-26 22:08 ` Thomas Petazzoni
2013-05-27 22:09 ` Peter Korsgaard
2013-05-26 22:08 ` [Buildroot] [PATCH 12/20] sunxi-boards: new package Thomas Petazzoni
` (8 subsequent siblings)
19 siblings, 1 reply; 45+ messages in thread
From: Thomas Petazzoni @ 2013-05-26 22:08 UTC (permalink / raw)
To: buildroot
From: Carlo Caione <carlo.caione@gmail.com>
Signed-off-by: Carlo Caione <carlo.caione@gmail.com>
Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
---
package/Config.in | 1 +
package/Config.in.host | 1 +
package/sunxi-tools/Config.in | 10 ++++++++++
package/sunxi-tools/Config.in.host | 12 ++++++++++++
package/sunxi-tools/sunxi-tools.mk | 37 ++++++++++++++++++++++++++++++++++++
5 files changed, 61 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 6094c1b..1bd9309 100644
--- a/package/Config.in
+++ b/package/Config.in
@@ -207,6 +207,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 7c0dd20..54178ea 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 0000000..a085aeb
--- /dev/null
+++ b/package/sunxi-tools/Config.in
@@ -0,0 +1,10 @@
+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 0000000..b5e4193
--- /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 0000000..a97dfcb
--- /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))
--
1.7.9.5
^ permalink raw reply related [flat|nested] 45+ messages in thread* [Buildroot] [PATCH 11/20] sunxi-tools: new host/target package
2013-05-26 22:08 ` [Buildroot] [PATCH 11/20] sunxi-tools: new host/target package Thomas Petazzoni
@ 2013-05-27 22:09 ` Peter Korsgaard
0 siblings, 0 replies; 45+ messages in thread
From: Peter Korsgaard @ 2013-05-27 22:09 UTC (permalink / raw)
To: buildroot
>>>>> "Thomas" == Thomas Petazzoni <thomas.petazzoni@free-electrons.com> writes:
Thomas> From: Carlo Caione <carlo.caione@gmail.com>
Thomas> Signed-off-by: Carlo Caione <carlo.caione@gmail.com>
Thomas> Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
Thomas> ---
Thomas> package/Config.in | 1 +
Thomas> package/Config.in.host | 1 +
Thomas> package/sunxi-tools/Config.in | 10 ++++++++++
Thomas> package/sunxi-tools/Config.in.host | 12 ++++++++++++
Thomas> package/sunxi-tools/sunxi-tools.mk | 37 ++++++++++++++++++++++++++++++++++++
Thomas> 5 files changed, 61 insertions(+)
Thomas> create mode 100644 package/sunxi-tools/Config.in
Thomas> create mode 100644 package/sunxi-tools/Config.in.host
Thomas> create mode 100644 package/sunxi-tools/sunxi-tools.mk
Thomas> diff --git a/package/Config.in b/package/Config.in
Thomas> index 6094c1b..1bd9309 100644
Thomas> --- a/package/Config.in
Thomas> +++ b/package/Config.in
Thomas> @@ -207,6 +207,7 @@ source "package/ntfs-3g/Config.in"
Thomas> source "package/squashfs/Config.in"
Thomas> source "package/squashfs3/Config.in"
Thomas> source "package/sshfs/Config.in"
Thomas> +source "package/sunxi-tools/Config.in"
Thomas> source "package/unionfs/Config.in"
Thomas> source "package/xfsprogs/Config.in"
Thomas> endmenu
Thomas> diff --git a/package/Config.in.host b/package/Config.in.host
Thomas> index 7c0dd20..54178ea 100644
Thomas> --- a/package/Config.in.host
Thomas> +++ b/package/Config.in.host
Thomas> @@ -10,6 +10,7 @@ source "package/mtools/Config.in.host"
Thomas> source "package/omap-u-boot-utils/Config.in.host"
Thomas> source "package/openocd/Config.in.host"
Thomas> source "package/sam-ba/Config.in.host"
Thomas> +source "package/sunxi-tools/Config.in.host"
Thomas> source "package/uboot-tools/Config.in.host"
Thomas> endmenu
Thomas> diff --git a/package/sunxi-tools/Config.in b/package/sunxi-tools/Config.in
Thomas> new file mode 100644
Thomas> index 0000000..a085aeb
Thomas> --- /dev/null
Thomas> +++ b/package/sunxi-tools/Config.in
Thomas> @@ -0,0 +1,10 @@
Thomas> +config BR2_PACKAGE_SUNXI_TOOLS
Thomas> + bool "sunxi nand-part"
Thomas> + depends on BR2_arm
Thomas> + help
Thomas> + nand-part is part of sunxi-tools for Allwinner A10 (aka sun4i) and
Thomas> + A13 (aka sun5i) based devices. It is a tool to repartition the
Thomas> + internal NAND on sunxi devices.
Thomas> +
Thomas> + http://linux-sunxi.org/Sunxi-tools
Thomas> +
Extra newline.
Thomas> diff --git a/package/sunxi-tools/Config.in.host b/package/sunxi-tools/Config.in.host
Thomas> new file mode 100644
Thomas> index 0000000..b5e4193
Thomas> --- /dev/null
Thomas> +++ b/package/sunxi-tools/Config.in.host
Thomas> @@ -0,0 +1,12 @@
Thomas> +config BR2_PACKAGE_HOST_SUNXI_TOOLS
Thomas> + bool "host sunxi-tools"
Thomas> + depends on BR2_arm
Thomas> + help
Thomas> + Tools for Allwinner A10 (aka sun4i) and A13 (aka sun5i) based devices.
Thomas> + This includes fex2bin which can be used to compile .fex board definition
Thomas> + files to the binary script.bin format required by the linux-sunxi kernel.
Thomas> + These tools are specific for linux-sunxi kernel and do not apply to
Thomas> + the mainline Linux kernel version.
Thomas> +
Thomas> + http://linux-sunxi.org/Sunxi-tools
Thomas> +
Too long lines and extra newline.
Committed to next with those issues fixed, thanks.
--
Bye, Peter Korsgaard
^ permalink raw reply [flat|nested] 45+ messages in thread
* [Buildroot] [PATCH 12/20] sunxi-boards: new package
2013-05-26 22:08 [Buildroot] [PATCH 00/20] Patches from the Patchwork Day Thomas Petazzoni
` (10 preceding siblings ...)
2013-05-26 22:08 ` [Buildroot] [PATCH 11/20] sunxi-tools: new host/target package Thomas Petazzoni
@ 2013-05-26 22:08 ` Thomas Petazzoni
2013-05-28 21:29 ` Peter Korsgaard
2013-05-26 22:08 ` [Buildroot] [PATCH 13/20] cubieboard: add support Thomas Petazzoni
` (7 subsequent siblings)
19 siblings, 1 reply; 45+ messages in thread
From: Thomas Petazzoni @ 2013-05-26 22:08 UTC (permalink / raw)
To: buildroot
From: Carlo Caione <carlo.caione@gmail.com>
Signed-off-by: Carlo Caione <carlo.caione@gmail.com>
Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
---
package/Config.in | 1 +
package/sunxi-boards/Config.in | 19 +++++++++++++++++++
package/sunxi-boards/sunxi-boards.mk | 17 +++++++++++++++++
3 files changed, 37 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 1bd9309..50683ff 100644
--- a/package/Config.in
+++ b/package/Config.in
@@ -218,6 +218,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 0000000..27ee8fc
--- /dev/null
+++ b/package/sunxi-boards/Config.in
@@ -0,0 +1,19 @@
+config BR2_PACKAGE_SUNXI_BOARDS
+ bool "sunxi script.bin board file"
+ select BR2_PACKAGE_HOST_SUNXI_TOOLS
+ help
+ Sunxi-boards requires a compiled .fex files for hardware description,
+ used by 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_BOARD_NAME
+ string "Board name"
+ help
+ This field defines the name of the board for which the .bin
+ files should be generated. See inside sys_config/a10 directory in
+ sunxi-boards source code to see the list of valid board names.
+endif
diff --git a/package/sunxi-boards/sunxi-boards.mk b/package/sunxi-boards/sunxi-boards.mk
new file mode 100644
index 0000000..1f52110
--- /dev/null
+++ b/package/sunxi-boards/sunxi-boards.mk
@@ -0,0 +1,17 @@
+#############################################################
+#
+# 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
+
+define SUNXI_BOARDS_INSTALL_IMAGES_CMDS
+ $(FEX2BIN) $(@D)/sys_config/a10/$(BR2_PACKAGE_SUNXI_BOARDS_BOARD_NAME).fex $(BINARIES_DIR)/script.bin
+endef
+
+$(eval $(generic-package))
--
1.7.9.5
^ permalink raw reply related [flat|nested] 45+ messages in thread* [Buildroot] [PATCH 12/20] sunxi-boards: new package
2013-05-26 22:08 ` [Buildroot] [PATCH 12/20] sunxi-boards: new package Thomas Petazzoni
@ 2013-05-28 21:29 ` Peter Korsgaard
0 siblings, 0 replies; 45+ messages in thread
From: Peter Korsgaard @ 2013-05-28 21:29 UTC (permalink / raw)
To: buildroot
>>>>> "Thomas" == Thomas Petazzoni <thomas.petazzoni@free-electrons.com> writes:
Thomas> From: Carlo Caione <carlo.caione@gmail.com>
Thomas> Signed-off-by: Carlo Caione <carlo.caione@gmail.com>
Thomas> Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
Thomas> ---
Thomas> package/Config.in | 1 +
Thomas> package/sunxi-boards/Config.in | 19 +++++++++++++++++++
Thomas> package/sunxi-boards/sunxi-boards.mk | 17 +++++++++++++++++
Thomas> 3 files changed, 37 insertions(+)
Thomas> create mode 100644 package/sunxi-boards/Config.in
Thomas> create mode 100644 package/sunxi-boards/sunxi-boards.mk
Thomas> diff --git a/package/Config.in b/package/Config.in
Thomas> index 1bd9309..50683ff 100644
Thomas> --- a/package/Config.in
Thomas> +++ b/package/Config.in
Thomas> @@ -218,6 +218,7 @@ source "package/b43-firmware/Config.in"
Thomas> source "package/firmware-imx/Config.in"
Thomas> source "package/linux-firmware/Config.in"
Thomas> source "package/rpi-firmware/Config.in"
Thomas> +source "package/sunxi-boards/Config.in"
Thomas> source "package/ux500-firmware/Config.in"
Thomas> source "package/zd1211-firmware/Config.in"
Thomas> endmenu
Thomas> diff --git a/package/sunxi-boards/Config.in b/package/sunxi-boards/Config.in
Thomas> new file mode 100644
Thomas> index 0000000..27ee8fc
Thomas> --- /dev/null
Thomas> +++ b/package/sunxi-boards/Config.in
Thomas> @@ -0,0 +1,19 @@
Thomas> +config BR2_PACKAGE_SUNXI_BOARDS
Thomas> + bool "sunxi script.bin board file"
Thomas> + select BR2_PACKAGE_HOST_SUNXI_TOOLS
This should depend on BR2_arm like sunxi-tools.
Thomas> + help
Thomas> + Sunxi-boards requires a compiled .fex files for hardware description,
Thomas> + used by kernel during boot for hardware initialization. This package
Thomas> + is specific for linux-sunxi kernel and it is useless for mainline
Thomas> + kernel versions.
Thomas> +
Thomas> + https://github.com/linux-sunxi/sunxi-boards
Thomas> +
Thomas> +if BR2_PACKAGE_SUNXI_BOARDS
Thomas> +config BR2_PACKAGE_SUNXI_BOARDS_BOARD_NAME
Thomas> + string "Board name"
Thomas> + help
Thomas> + This field defines the name of the board for which the .bin
Thomas> + files should be generated. See inside sys_config/a10 directory in
Thomas> + sunxi-boards source code to see the list of valid board names.
Thomas> +endif
It's imho silly to restrict this to the a10 variants, so I've changed
this to be a BR2_PACKAGE_SUNXI_FEX_FILE option, which is the exact
filename (including .fex extension) relative to the sys_config/
directory - E.G.:
BR2_PACKAGE_SUNXI_FEX_FILE="a10/mele_a1000.fex"
Thomas> diff --git a/package/sunxi-boards/sunxi-boards.mk b/package/sunxi-boards/sunxi-boards.mk
Thomas> new file mode 100644
Thomas> index 0000000..1f52110
Thomas> --- /dev/null
Thomas> +++ b/package/sunxi-boards/sunxi-boards.mk
Thomas> @@ -0,0 +1,17 @@
Thomas> +#############################################################
Thomas> +#
Thomas> +# sunxi-boards
Thomas> +#
Thomas> +#############################################################
Thomas> +
Thomas> +SUNXI_BOARDS_VERSION = 88d663db44f65b73ef65c4148a28c6fa3665d2b6
Thomas> +SUNXI_BOARDS_SITE = https://github.com/linux-sunxi/sunxi-boards/tarball/master
Thomas> +SUNXI_BOARDS_DEPENDENCIES = host-sunxi-tools
Thomas> +SUNXI_BOARDS_INSTALL_IMAGES = YES
Thomas> +SUNXI_BOARDS_INSTALL_TARGET = NO
Thomas> +
Thomas> +define SUNXI_BOARDS_INSTALL_IMAGES_CMDS
Thomas> + $(FEX2BIN) $(@D)/sys_config/a10/$(BR2_PACKAGE_SUNXI_BOARDS_BOARD_NAME).fex $(BINARIES_DIR)/script.bin
Long line, so I've wrapped this. We also normally qstrip the text
strings so I've added that as well.
For the other text fields (like barebox/u-boot/linux defconfig name) we
do an early check to ensure the value isn't the empty string and error
out with a sensible error message, so I've added that as well.
Committed to next with these issues fixed, thanks.
--
Bye, Peter Korsgaard
^ permalink raw reply [flat|nested] 45+ messages in thread
* [Buildroot] [PATCH 13/20] cubieboard: add support
2013-05-26 22:08 [Buildroot] [PATCH 00/20] Patches from the Patchwork Day Thomas Petazzoni
` (11 preceding siblings ...)
2013-05-26 22:08 ` [Buildroot] [PATCH 12/20] sunxi-boards: new package Thomas Petazzoni
@ 2013-05-26 22:08 ` Thomas Petazzoni
2013-05-29 10:54 ` Peter Korsgaard
2013-05-26 22:08 ` [Buildroot] [PATCH 14/20] freescale-imx: new package directory Thomas Petazzoni
` (6 subsequent siblings)
19 siblings, 1 reply; 45+ messages in thread
From: Thomas Petazzoni @ 2013-05-26 22:08 UTC (permalink / raw)
To: buildroot
From: Carlo Caione <carlo.caione@gmail.com>
Signed-off-by: Carlo Caione <carlo.caione@gmail.com>
Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
---
board/cubietech/cubieboard/boot.cmd | 4 +
board/cubietech/cubieboard/mkcubiecard.sh | 119 +++++++++++++++++++++++++++++
board/cubietech/cubieboard/post-build.sh | 15 ++++
board/cubietech/cubieboard/readme.txt | 59 ++++++++++++++
configs/cubieboard_defconfig | 39 ++++++++++
5 files changed, 236 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 0000000..849ed00
--- /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 0000000..4ffb223
--- /dev/null
+++ b/board/cubietech/cubieboard/mkcubiecard.sh
@@ -0,0 +1,119 @@
+#! /bin/sh
+# mkCubieCard.sh v0.1:
+# 2013, Carlo Caione <carlo.caione@gmail.com>
+# heavely based on :
+# mkA10card.sh v0.1
+# 2012, Jason Plum <jplum@archlinuxarm.org>
+# loosely based on :
+# mkcard.sh v0.5
+# (c) Copyright 2009 Graeme Gregory <dp@xora.org.uk>
+# 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 <images_dir> <drive>"
+ 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 0000000..cd6675b
--- /dev/null
+++ b/board/cubietech/cubieboard/post-build.sh
@@ -0,0 +1,15 @@
+#!/bin/sh
+# post-build.sh for CubieBoard
+# 2013, Carlo Caione <carlo.caione@gmail.com>
+
+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 0000000..1c47117
--- /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
+(<device>) and then:
+
+# sudo ./mkcubiecard.sh <images_dir> <device>
+
+where:
+ - <images_dir> is the directory containing the generated files (usually
+ output/images)
+ - <device> is the device file of the SD card (usually /dev/sdX)
+
+
+
+--
+Carlo Caione <carlo.caione@gmail.com>
diff --git a/configs/cubieboard_defconfig b/configs/cubieboard_defconfig
new file mode 100644
index 0000000..77806f6
--- /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_BOARD_NAME="cubieboard"
+
+# 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"
--
1.7.9.5
^ permalink raw reply related [flat|nested] 45+ messages in thread* [Buildroot] [PATCH 13/20] cubieboard: add support
2013-05-26 22:08 ` [Buildroot] [PATCH 13/20] cubieboard: add support Thomas Petazzoni
@ 2013-05-29 10:54 ` Peter Korsgaard
0 siblings, 0 replies; 45+ messages in thread
From: Peter Korsgaard @ 2013-05-29 10:54 UTC (permalink / raw)
To: buildroot
>>>>> "Thomas" == Thomas Petazzoni <thomas.petazzoni@free-electrons.com> writes:
Thomas> From: Carlo Caione <carlo.caione@gmail.com>
Thomas> Signed-off-by: Carlo Caione <carlo.caione@gmail.com>
Thomas> Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
Thomas> ---
Thomas> board/cubietech/cubieboard/boot.cmd | 4 +
Thomas> board/cubietech/cubieboard/mkcubiecard.sh | 119 +++++++++++++++++++++++++++++
Thomas> board/cubietech/cubieboard/post-build.sh | 15 ++++
Thomas> board/cubietech/cubieboard/readme.txt | 59 ++++++++++++++
Thomas> configs/cubieboard_defconfig | 39 ++++++++++
Thomas> 5 files changed, 236 insertions(+)
Thomas> create mode 100644 board/cubietech/cubieboard/boot.cmd
Thomas> create mode 100755 board/cubietech/cubieboard/mkcubiecard.sh
Thomas> create mode 100755 board/cubietech/cubieboard/post-build.sh
Thomas> create mode 100644 board/cubietech/cubieboard/readme.txt
Thomas> create mode 100644 configs/cubieboard_defconfig
Committed to next with the defconfig adjusted for the _FEX_FILE change,
thanks.
--
Bye, Peter Korsgaard
^ permalink raw reply [flat|nested] 45+ messages in thread
* [Buildroot] [PATCH 14/20] freescale-imx: new package directory
2013-05-26 22:08 [Buildroot] [PATCH 00/20] Patches from the Patchwork Day Thomas Petazzoni
` (12 preceding siblings ...)
2013-05-26 22:08 ` [Buildroot] [PATCH 13/20] cubieboard: add support Thomas Petazzoni
@ 2013-05-26 22:08 ` Thomas Petazzoni
2013-05-29 12:24 ` Peter Korsgaard
2013-05-26 22:08 ` [Buildroot] [PATCH 15/20] imx-lib: move to the freescale-imx directory Thomas Petazzoni
` (5 subsequent siblings)
19 siblings, 1 reply; 45+ messages in thread
From: Thomas Petazzoni @ 2013-05-26 22:08 UTC (permalink / raw)
To: buildroot
From: Henk Fijnvandraat <h.fijnvandraat@inter.nl.net>
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 <h.fijnvandraat@inter.nl.net>
Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
---
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 50683ff..d8a2cf7 100644
--- a/package/Config.in
+++ b/package/Config.in
@@ -222,6 +222,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 0000000..389bcc6
--- /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 0000000..0d5400b
--- /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
+
--
1.7.9.5
^ permalink raw reply related [flat|nested] 45+ messages in thread* [Buildroot] [PATCH 15/20] imx-lib: move to the freescale-imx directory
2013-05-26 22:08 [Buildroot] [PATCH 00/20] Patches from the Patchwork Day Thomas Petazzoni
` (13 preceding siblings ...)
2013-05-26 22:08 ` [Buildroot] [PATCH 14/20] freescale-imx: new package directory Thomas Petazzoni
@ 2013-05-26 22:08 ` Thomas Petazzoni
2013-05-29 12:28 ` Peter Korsgaard
2013-05-26 22:08 ` [Buildroot] [PATCH 16/20] firmware-imx: " Thomas Petazzoni
` (4 subsequent siblings)
19 siblings, 1 reply; 45+ messages in thread
From: Thomas Petazzoni @ 2013-05-26 22:08 UTC (permalink / raw)
To: buildroot
From: Henk Fijnvandraat <h.fijnvandraat@inter.nl.net>
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 <h.fijnvandraat@inter.nl.net>
Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
---
package/Config.in | 1 -
package/freescale-imx/Config.in | 2 ++
package/{ => freescale-imx}/imx-lib/Config.in | 0
package/{ => freescale-imx}/imx-lib/imx-lib.mk | 5 ++---
4 files changed, 4 insertions(+), 4 deletions(-)
rename package/{ => freescale-imx}/imx-lib/Config.in (100%)
rename package/{ => freescale-imx}/imx-lib/imx-lib.mk (86%)
diff --git a/package/Config.in b/package/Config.in
index d8a2cf7..a3b3e05 100644
--- a/package/Config.in
+++ b/package/Config.in
@@ -462,7 +462,6 @@ endmenu
menu "Hardware handling"
source "package/ccid/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 389bcc6..edc9ab5 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/imx-lib/Config.in b/package/freescale-imx/imx-lib/Config.in
similarity index 100%
rename from package/imx-lib/Config.in
rename to package/freescale-imx/imx-lib/Config.in
diff --git a/package/imx-lib/imx-lib.mk b/package/freescale-imx/imx-lib/imx-lib.mk
similarity index 86%
rename from package/imx-lib/imx-lib.mk
rename to package/freescale-imx/imx-lib/imx-lib.mk
index c168c80..67e8db3 100644
--- a/package/imx-lib/imx-lib.mk
+++ b/package/freescale-imx/imx-lib/imx-lib.mk
@@ -4,9 +4,8 @@
#
#############################################################
-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_VERSION = $(FREESCALE_IMX_VERSION)
+IMX_LIB_SITE = $(FREESCALE_IMX_MIRROR_SITE)
IMX_LIB_LICENSE = LGPLv2.1+
# No license file included
--
1.7.9.5
^ permalink raw reply related [flat|nested] 45+ messages in thread* [Buildroot] [PATCH 16/20] firmware-imx: move to the freescale-imx directory
2013-05-26 22:08 [Buildroot] [PATCH 00/20] Patches from the Patchwork Day Thomas Petazzoni
` (14 preceding siblings ...)
2013-05-26 22:08 ` [Buildroot] [PATCH 15/20] imx-lib: move to the freescale-imx directory Thomas Petazzoni
@ 2013-05-26 22:08 ` Thomas Petazzoni
2013-05-29 12:31 ` Peter Korsgaard
2013-05-26 22:08 ` [Buildroot] [PATCH 17/20] freescale-imx: bump to 1.1.0 Thomas Petazzoni
` (3 subsequent siblings)
19 siblings, 1 reply; 45+ messages in thread
From: Thomas Petazzoni @ 2013-05-26 22:08 UTC (permalink / raw)
To: buildroot
From: Henk Fijnvandraat <h.fijnvandraat@inter.nl.net>
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 <h.fijnvandraat@inter.nl.net>
Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
---
package/Config.in | 1 -
package/freescale-imx/Config.in | 1 +
package/{ => freescale-imx}/firmware-imx/Config.in | 0
.../firmware-imx/firmware-imx.mk | 7 +++----
4 files changed, 4 insertions(+), 5 deletions(-)
rename package/{ => freescale-imx}/firmware-imx/Config.in (100%)
rename package/{ => freescale-imx}/firmware-imx/firmware-imx.mk (85%)
diff --git a/package/Config.in b/package/Config.in
index a3b3e05..2874eb6 100644
--- a/package/Config.in
+++ b/package/Config.in
@@ -215,7 +215,6 @@ endmenu
menu "Hardware handling"
menu "Misc devices firmwares"
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/freescale-imx/Config.in b/package/freescale-imx/Config.in
index edc9ab5..840b83b 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/firmware-imx/Config.in b/package/freescale-imx/firmware-imx/Config.in
similarity index 100%
rename from package/firmware-imx/Config.in
rename to package/freescale-imx/firmware-imx/Config.in
diff --git a/package/firmware-imx/firmware-imx.mk b/package/freescale-imx/firmware-imx/firmware-imx.mk
similarity index 85%
rename from package/firmware-imx/firmware-imx.mk
rename to package/freescale-imx/firmware-imx/firmware-imx.mk
index 3b43bef..85f8dc2 100644
--- a/package/firmware-imx/firmware-imx.mk
+++ b/package/freescale-imx/firmware-imx/firmware-imx.mk
@@ -1,12 +1,11 @@
#############################################################
#
-# buildroot makefile for firmware-imx
+# 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_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)
--
1.7.9.5
^ permalink raw reply related [flat|nested] 45+ messages in thread* [Buildroot] [PATCH 16/20] firmware-imx: move to the freescale-imx directory
2013-05-26 22:08 ` [Buildroot] [PATCH 16/20] firmware-imx: " Thomas Petazzoni
@ 2013-05-29 12:31 ` Peter Korsgaard
0 siblings, 0 replies; 45+ messages in thread
From: Peter Korsgaard @ 2013-05-29 12:31 UTC (permalink / raw)
To: buildroot
>>>>> "Thomas" == Thomas Petazzoni <thomas.petazzoni@free-electrons.com> writes:
Thomas> From: Henk Fijnvandraat <h.fijnvandraat@inter.nl.net>
Thomas> This commit moves the firmware-imx package to the newly introduced
Thomas> freescale-imx/ directory, and uses the new variables provided by
Thomas> freescale-imx/freescale-imx.mk.
Committed to next, thanks.
--
Bye, Peter Korsgaard
^ permalink raw reply [flat|nested] 45+ messages in thread
* [Buildroot] [PATCH 17/20] freescale-imx: bump to 1.1.0
2013-05-26 22:08 [Buildroot] [PATCH 00/20] Patches from the Patchwork Day Thomas Petazzoni
` (15 preceding siblings ...)
2013-05-26 22:08 ` [Buildroot] [PATCH 16/20] firmware-imx: " Thomas Petazzoni
@ 2013-05-26 22:08 ` Thomas Petazzoni
2013-05-29 13:19 ` Peter Korsgaard
2013-05-26 22:08 ` [Buildroot] [PATCH 18/20] gpu-viv-bin-mx6q: new package Thomas Petazzoni
` (2 subsequent siblings)
19 siblings, 1 reply; 45+ messages in thread
From: Thomas Petazzoni @ 2013-05-26 22:08 UTC (permalink / raw)
To: buildroot
From: Henk Fijnvandraat <h.fijnvandraat@inter.nl.net>
This commit bumps both imx-lib and firmware-imx to version 1.1.0.
Signed-off-by: Henk Fijnvandraat <h.fijnvandraat@inter.nl.net>
Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
---
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 0d5400b..2553f67 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
--
1.7.9.5
^ permalink raw reply related [flat|nested] 45+ messages in thread* [Buildroot] [PATCH 18/20] gpu-viv-bin-mx6q: new package
2013-05-26 22:08 [Buildroot] [PATCH 00/20] Patches from the Patchwork Day Thomas Petazzoni
` (16 preceding siblings ...)
2013-05-26 22:08 ` [Buildroot] [PATCH 17/20] freescale-imx: bump to 1.1.0 Thomas Petazzoni
@ 2013-05-26 22:08 ` Thomas Petazzoni
2013-05-29 13:39 ` Peter Korsgaard
2013-05-26 22:08 ` [Buildroot] [PATCH 19/20] network-manager: use a <pkg>_VERSION_MAJOR variable Thomas Petazzoni
2013-05-26 22:08 ` [Buildroot] [PATCH 20/20] network-manager: bump to 0.9.8.0 Thomas Petazzoni
19 siblings, 1 reply; 45+ messages in thread
From: Thomas Petazzoni @ 2013-05-26 22:08 UTC (permalink / raw)
To: buildroot
From: Henk Fijnvandraat <h.fijnvandraat@inter.nl.net>
This patch adds a new package for the OpenGL, OpenVG and EGL
proprietary implementations specific to the Vivante GPU of i.MX6
processors.
Signed-off-by: Henk Fijnvandraat <h.fijnvandraat@inter.nl.net>
Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
---
package/freescale-imx/Config.in | 1 +
package/freescale-imx/gpu-viv-bin-mx6q/Config.in | 30 ++++++++
...gpu-viv-bin-mx6q-0001-correct-HAL-include.patch | 16 ++++
.../gpu-viv-bin-mx6q/gpu-viv-bin-mx6q.mk | 79 ++++++++++++++++++++
4 files changed, 126 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 840b83b..7c22f79 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 0000000..37f8e03
--- /dev/null
+++ b/package/freescale-imx/gpu-viv-bin-mx6q/Config.in
@@ -0,0 +1,30 @@
+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-1.4.16.
+
+ 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 0000000..c83cd55
--- /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 <h.fijnvandraat@inter.nl.net>
+
+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 <EGL/egl.h>
+-#include "gc_hal_eglplatform_type.h"
++#include <HAL/gc_hal_eglplatform_type.h>
+
+
+ /*******************************************************************************
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 0000000..f988d25
--- /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))
--
1.7.9.5
^ permalink raw reply related [flat|nested] 45+ messages in thread* [Buildroot] [PATCH 18/20] gpu-viv-bin-mx6q: new package
2013-05-26 22:08 ` [Buildroot] [PATCH 18/20] gpu-viv-bin-mx6q: new package Thomas Petazzoni
@ 2013-05-29 13:39 ` Peter Korsgaard
2013-05-29 13:48 ` Thomas Petazzoni
0 siblings, 1 reply; 45+ messages in thread
From: Peter Korsgaard @ 2013-05-29 13:39 UTC (permalink / raw)
To: buildroot
>>>>> "Thomas" == Thomas Petazzoni <thomas.petazzoni@free-electrons.com> writes:
Thomas> From: Henk Fijnvandraat <h.fijnvandraat@inter.nl.net>
Thomas> This patch adds a new package for the OpenGL, OpenVG and EGL
Thomas> proprietary implementations specific to the Vivante GPU of i.MX6
Thomas> processors.
Thomas> Signed-off-by: Henk Fijnvandraat <h.fijnvandraat@inter.nl.net>
Thomas> Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
Thomas> ---
Thomas> package/freescale-imx/Config.in | 1 +
Thomas> package/freescale-imx/gpu-viv-bin-mx6q/Config.in | 30 ++++++++
Thomas> ...gpu-viv-bin-mx6q-0001-correct-HAL-include.patch | 16 ++++
Thomas> .../gpu-viv-bin-mx6q/gpu-viv-bin-mx6q.mk | 79 ++++++++++++++++++++
Thomas> 4 files changed, 126 insertions(+)
Thomas> create mode 100644 package/freescale-imx/gpu-viv-bin-mx6q/Config.in
Thomas> create mode 100644 package/freescale-imx/gpu-viv-bin-mx6q/gpu-viv-bin-mx6q-0001-correct-HAL-include.patch
Thomas> create mode 100644 package/freescale-imx/gpu-viv-bin-mx6q/gpu-viv-bin-mx6q.mk
Thomas> diff --git a/package/freescale-imx/Config.in b/package/freescale-imx/Config.in
Thomas> index 840b83b..7c22f79 100644
Thomas> --- a/package/freescale-imx/Config.in
Thomas> +++ b/package/freescale-imx/Config.in
Thomas> @@ -3,5 +3,6 @@ menu "Freescale i.MX libraries"
Thomas> source "package/freescale-imx/imx-lib/Config.in"
Thomas> source "package/freescale-imx/firmware-imx/Config.in"
Thomas> +source "package/freescale-imx/gpu-viv-bin-mx6q/Config.in"
Thomas> endmenu
Thomas> diff --git a/package/freescale-imx/gpu-viv-bin-mx6q/Config.in b/package/freescale-imx/gpu-viv-bin-mx6q/Config.in
Thomas> new file mode 100644
Thomas> index 0000000..37f8e03
Thomas> --- /dev/null
Thomas> +++ b/package/freescale-imx/gpu-viv-bin-mx6q/Config.in
Thomas> @@ -0,0 +1,30 @@
Thomas> +config BR2_PACKAGE_GPU_VIV_BIN_MX6Q
Thomas> + bool "gpu-viv-bin-mx6q"
Thomas> + select BR2_PACKAGE_HAS_OPENGL_EGL
Thomas> + select BR2_PACKAGE_HAS_OPENGL_ES
Thomas> + depends on BR2_arm # Only relevant for i.MX6
Thomas> + # Library binaries are linked against libc.so.6
Thomas> + depends on BR2_TOOLCHAIN_CTNG_glibc || \
Thomas> + BR2_TOOLCHAIN_CTNG_eglibc || \
Thomas> + BR2_TOOLCHAIN_EXTERNAL_GLIBC
We should also inform the user about this, so I've added a comment
option, similar to how we handle to other toolchain options.
Thomas> + help
Thomas> + Userspace libraries for Vivante GPU on i.MX6 platforms
Thomas> +
Thomas> + It contains libraries and headers for GLES, OpenCL, and
Thomas> + OpenVG. It also contains a DRI plugin for X11. It also
Thomas> + contains a plugin for DirectFB-1.4.0, but that doesn't work
Thomas> + together with buildroot's DirectFB-1.4.16.
This is already outdated, so I changed this to 'buildroot's DirectFB
version'.
Committed to next, thanks - But I don't see it hooked up with the
opengl/* virtual packages, so it doesn't seem really useful yet.
What kind of kernel dependencies does this package have?
--
Bye, Peter Korsgaard
^ permalink raw reply [flat|nested] 45+ messages in thread
* [Buildroot] [PATCH 18/20] gpu-viv-bin-mx6q: new package
2013-05-29 13:39 ` Peter Korsgaard
@ 2013-05-29 13:48 ` Thomas Petazzoni
2013-05-29 13:54 ` Peter Korsgaard
2013-06-01 18:14 ` Arnout Vandecappelle
0 siblings, 2 replies; 45+ messages in thread
From: Thomas Petazzoni @ 2013-05-29 13:48 UTC (permalink / raw)
To: buildroot
Dear Peter Korsgaard,
On Wed, 29 May 2013 15:39:30 +0200, Peter Korsgaard wrote:
> Thomas> +config BR2_PACKAGE_GPU_VIV_BIN_MX6Q
> Thomas> + bool "gpu-viv-bin-mx6q"
> Thomas> + select BR2_PACKAGE_HAS_OPENGL_EGL
> Thomas> + select BR2_PACKAGE_HAS_OPENGL_ES
> Thomas> + depends on BR2_arm # Only relevant for i.MX6
> Thomas> + # Library binaries are linked against libc.so.6
> Thomas> + depends on BR2_TOOLCHAIN_CTNG_glibc || \
> Thomas> + BR2_TOOLCHAIN_CTNG_eglibc || \
> Thomas> + BR2_TOOLCHAIN_EXTERNAL_GLIBC
>
> We should also inform the user about this, so I've added a comment
> option, similar to how we handle to other toolchain options.
Then we should fix BR2_PACKAGE_ELFUTILS_PROGS, BR2_PACKAGE_MONGREL2,
BR2_PACKAGE_NSS_MDNS and BR2_PACKAGE_TZDATA (even though for the
latter, I'm not sure, since tzdata is not useful at all with uClibc).
> Thomas> + help
> Thomas> + Userspace libraries for Vivante GPU on i.MX6 platforms
> Thomas> +
> Thomas> + It contains libraries and headers for GLES, OpenCL, and
> Thomas> + OpenVG. It also contains a DRI plugin for X11. It also
> Thomas> + contains a plugin for DirectFB-1.4.0, but that doesn't work
> Thomas> + together with buildroot's DirectFB-1.4.16.
>
> This is already outdated, so I changed this to 'buildroot's DirectFB
> version'.
Right.
> Committed to next, thanks - But I don't see it hooked up with the
> opengl/* virtual packages, so it doesn't seem really useful yet.
Correct. I've mainly taken Henk's patch and tried to make it suitable
for upstream. Further improvements are definitely needed.
> What kind of kernel dependencies does this package have?
As far as I can see, it doesn't have any build-time dependency. It's
just a bunch of pre-built shared libraries and header files that get
copied around. At runtime, I believe a specific kernel driver is
needed.
But Arnout/Henk can probably comment on this.
Thanks,
Thomas
--
Thomas Petazzoni, Free Electrons
Kernel, drivers, real-time and embedded Linux
development, consulting, training and support.
http://free-electrons.com
^ permalink raw reply [flat|nested] 45+ messages in thread
* [Buildroot] [PATCH 18/20] gpu-viv-bin-mx6q: new package
2013-05-29 13:48 ` Thomas Petazzoni
@ 2013-05-29 13:54 ` Peter Korsgaard
2013-06-01 18:14 ` Arnout Vandecappelle
1 sibling, 0 replies; 45+ messages in thread
From: Peter Korsgaard @ 2013-05-29 13:54 UTC (permalink / raw)
To: buildroot
>>>>> "Thomas" == Thomas Petazzoni <thomas.petazzoni@free-electrons.com> writes:
Thomas> Dear Peter Korsgaard,
Thomas> On Wed, 29 May 2013 15:39:30 +0200, Peter Korsgaard wrote:
Thomas> +config BR2_PACKAGE_GPU_VIV_BIN_MX6Q
Thomas> + bool "gpu-viv-bin-mx6q"
Thomas> + select BR2_PACKAGE_HAS_OPENGL_EGL
Thomas> + select BR2_PACKAGE_HAS_OPENGL_ES
Thomas> + depends on BR2_arm # Only relevant for i.MX6
Thomas> + # Library binaries are linked against libc.so.6
Thomas> + depends on BR2_TOOLCHAIN_CTNG_glibc || \
Thomas> + BR2_TOOLCHAIN_CTNG_eglibc || \
Thomas> + BR2_TOOLCHAIN_EXTERNAL_GLIBC
>>
>> We should also inform the user about this, so I've added a comment
>> option, similar to how we handle to other toolchain options.
Thomas> Then we should fix BR2_PACKAGE_ELFUTILS_PROGS, BR2_PACKAGE_MONGREL2,
Thomas> BR2_PACKAGE_NSS_MDNS and BR2_PACKAGE_TZDATA (even though for the
Thomas> latter, I'm not sure, since tzdata is not useful at all with uClibc).
I think we should, yes (exept for tzdata and arguably also nss_mdns).
--
Bye, Peter Korsgaard
^ permalink raw reply [flat|nested] 45+ messages in thread
* [Buildroot] [PATCH 18/20] gpu-viv-bin-mx6q: new package
2013-05-29 13:48 ` Thomas Petazzoni
2013-05-29 13:54 ` Peter Korsgaard
@ 2013-06-01 18:14 ` Arnout Vandecappelle
1 sibling, 0 replies; 45+ messages in thread
From: Arnout Vandecappelle @ 2013-06-01 18:14 UTC (permalink / raw)
To: buildroot
On 29/05/13 15:48, Thomas Petazzoni wrote:
>> >What kind of kernel dependencies does this package have?
> As far as I can see, it doesn't have any build-time dependency. It's
> just a bunch of pre-built shared libraries and header files that get
> copied around. At runtime, I believe a specific kernel driver is
> needed.
It's hard to know for sure. Like most SoC vendors, Freescale assume
you'll just use _their_ kernel, _their_ toolchain, _their_ binary
libraries and even _their_ LTIB (though it seems Freescale is becoming
more open about this).
Now, regarding the kernel it's pretty easy: upstream support for i.MX6
is limited to UART, SD and USB so you're bound to the Freescale kernel if
you want to use any graphics at all. And the Freescale kernel contains
the galcore module needed for accessing the vivante GPU.
There is also firmware for the VPU in the imx-firmware package, but I
think that is only needed for the H.264 etc. codecs.
Regards,
Arnout
--
Arnout Vandecappelle arnout at mind be
Senior Embedded Software Architect +32-16-286500
Essensium/Mind http://www.mind.be
G.Geenslaan 9, 3001 Leuven, Belgium BE 872 984 063 RPR Leuven
LinkedIn profile: http://www.linkedin.com/in/arnoutvandecappelle
GPG fingerprint: 7CB5 E4CC 6C2E EFD4 6E3D A754 F963 ECAB 2450 2F1F
^ permalink raw reply [flat|nested] 45+ messages in thread
* [Buildroot] [PATCH 19/20] network-manager: use a <pkg>_VERSION_MAJOR variable
2013-05-26 22:08 [Buildroot] [PATCH 00/20] Patches from the Patchwork Day Thomas Petazzoni
` (17 preceding siblings ...)
2013-05-26 22:08 ` [Buildroot] [PATCH 18/20] gpu-viv-bin-mx6q: new package Thomas Petazzoni
@ 2013-05-26 22:08 ` Thomas Petazzoni
2013-05-29 13:45 ` Peter Korsgaard
2013-05-26 22:08 ` [Buildroot] [PATCH 20/20] network-manager: bump to 0.9.8.0 Thomas Petazzoni
19 siblings, 1 reply; 45+ messages in thread
From: Thomas Petazzoni @ 2013-05-26 22:08 UTC (permalink / raw)
To: buildroot
Just like we do for many other GNOME-hosted tarballs, use a
<pkg>_VERSION_MAJOR variable for network-manager.
Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
---
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 b3715d8..261f2d3 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
--
1.7.9.5
^ permalink raw reply related [flat|nested] 45+ messages in thread* [Buildroot] [PATCH 20/20] network-manager: bump to 0.9.8.0
2013-05-26 22:08 [Buildroot] [PATCH 00/20] Patches from the Patchwork Day Thomas Petazzoni
` (18 preceding siblings ...)
2013-05-26 22:08 ` [Buildroot] [PATCH 19/20] network-manager: use a <pkg>_VERSION_MAJOR variable Thomas Petazzoni
@ 2013-05-26 22:08 ` Thomas Petazzoni
2013-05-29 14:09 ` Peter Korsgaard
19 siblings, 1 reply; 45+ messages in thread
From: Thomas Petazzoni @ 2013-05-26 22:08 UTC (permalink / raw)
To: buildroot
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 <thomas.petazzoni@free-electrons.com>
---
.../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 8dc83f0..0000000
--- 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 <jacmet@sunsite.dk>
-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 <jacmet@sunsite.dk>
----
- 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 <dlfcn.h>
- #include <syslog.h>
--#include <execinfo.h>
- #include <stdio.h>
- #include <stdlib.h>
- #include <unistd.h>
---
-1.7.7.1
-
diff --git a/package/network-manager/network-manager.mk b/package/network-manager/network-manager.mk
index 261f2d3..9be624c 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))
--
1.7.9.5
^ permalink raw reply related [flat|nested] 45+ messages in thread