Patches from the Patchwork Day

PATCH New Thomas Petazzoni 3 participants 45 messages May 26, 2013 – Jun 9, 2013

Subsystems (2)

Arm i.MX and Layerscape Arm/Allwinner sunXi SoC support

lore

Share & tools

lore

Thomas Petazzoni

author

2013-05-26 22:08 UTC #0 lore raw

cover Patches from the Patchwork Day

Hello,

Here is a set of patches that I collected/reworked during the Patchwork Day. In summary:

* Carlo Caione patches adding some Allwinner sunxi related packages and a defconfig for the cubieboard (based on the sunxi-specific kernel and not the mainline one).

* Updates of external toolchains by Fabio Porcedda (ARM) and Sonic Zhang (Blackfin).

* Rework + bump of Freescale i.MX stuff, addition of OpenGL/OpenVG/EGL implementation by Henk Fijnvandraat.

* Some random stuff from me.

Best regards,

Thomas

Carlo Caione (3):
sunxi-tools: new host/target package
sunxi-boards: new package
cubieboard: add support

Fabio Porcedda (2):
toolchain-external: add support for 'Sourcery CodeBench ARM 2013.05'
toolchain-external: remove support for 'Sourcery CodeBench ARM

    2011.03'

Henk Fijnvandraat (5):
freescale-imx: new package directory
imx-lib: move to the freescale-imx directory
firmware-imx: move to the freescale-imx directory
freescale-imx: bump to 1.1.0
gpu-viv-bin-mx6q: new package

Sonic Zhang (1):
toolchain: blackfin: Remove Blackfin toolchain 2011R1 release.

Thomas Petazzoni (7):
dropbear: factorize the 'depends on BR2_PACKAGE_DROPBEAR'
elf2flt: fix build when zlib is not installed on the host
gcc: fix gcc 4.8 build when thread support is disabled
flex: needs M4 at runtime
Remove useless CVS related files
network-manager: use a <pkg>_VERSION_MAJOR variable
network-manager: bump to 0.9.8.0

Will Newton (2):
numactl: new package
poco: Add upstream patch to add support for aarch64.

 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 +++++++
 package/Config.in                                  |    6 +-
 package/Config.in.host                             |    1 +
 package/dropbear/Config.in                         |    8 +-
 package/flex/Config.in                             |    2 +
 package/flex/flex.mk                               |    1 +
 package/freescale-imx/Config.in                    |    8 ++
 package/{ => freescale-imx}/firmware-imx/Config.in |    0
 .../firmware-imx/firmware-imx.mk                   |    7 +-
 package/freescale-imx/freescale-imx.mk             |   13 +++
 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 +++++++++++++
 package/{ => freescale-imx}/imx-lib/Config.in      |    0
 package/{ => freescale-imx}/imx-lib/imx-lib.mk     |    5 +-
 .../network-manager/network-manager-execinfo.patch |   31 -----
 package/network-manager/network-manager.mk         |   37 +++---
 package/numactl/Config.in                          |   12 ++
 package/numactl/numactl.mk                         |   21 ++++
 package/poco/Config.in                             |    4 +-
 package/poco/poco-aarch64.patch                    |   39 +++++++
 package/sunxi-boards/Config.in                     |   19 ++++
 package/sunxi-boards/sunxi-boards.mk               |   17 +++
 package/sunxi-tools/Config.in                      |   10 ++
 package/sunxi-tools/Config.in.host                 |   12 ++
 package/sunxi-tools/sunxi-tools.mk                 |   37 ++++++
 support/gnuconfig/.cvsignore                       |    5 -
 toolchain/elf2flt/elf2flt.mk                       |    4 +-
 toolchain/elf2flt/elf2flt/.cvsignore               |    3 -
 toolchain/elf2flt/elf2flt/CVS/Entries              |   17 ---
 toolchain/elf2flt/elf2flt/CVS/Repository           |    1 -
 toolchain/elf2flt/elf2flt/CVS/Root                 |    1 -
 toolchain/gcc/gcc-uclibc-4.x.mk                    |    2 +-
 toolchain/toolchain-external/Config.in             |   69 ++++--------
 toolchain/toolchain-external/ext-tool.mk           |   16 +--
 39 files changed, 617 insertions(+), 152 deletions(-)
 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
 create mode 100644 package/freescale-imx/Config.in
 rename package/{ => freescale-imx}/firmware-imx/Config.in (100%)
 rename package/{ => freescale-imx}/firmware-imx/firmware-imx.mk (85%)
 create mode 100644 package/freescale-imx/freescale-imx.mk
 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
 rename package/{ => freescale-imx}/imx-lib/Config.in (100%)
 rename package/{ => freescale-imx}/imx-lib/imx-lib.mk (86%)
 delete mode 100644 package/network-manager/network-manager-execinfo.patch
 create mode 100644 package/numactl/Config.in
 create mode 100644 package/numactl/numactl.mk
 create mode 100644 package/poco/poco-aarch64.patch
 create mode 100644 package/sunxi-boards/Config.in
 create mode 100644 package/sunxi-boards/sunxi-boards.mk
 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
 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

Signature · 1 line

1.7.9.5

Thomas Petazzoni

author

2013-05-26 22:08 UTC #1 lore raw

PATCH 1/20 numactl: new package

From: Will Newton <[email protected]>

[Thomas: updated to 2.0.8, restricted to supported architectures, added licensing informations, updated to latest Buildroot package infrastructure]

Signed-off-by Will Newton <[email protected]>

Signed-off-by Thomas Petazzoni <[email protected]>

---
 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

package/Config.in +1 -0

index d980871..6094c1b 100644
@@ -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"

package/numactl/Config.in new file +12 -0

new file mode 100644
index 0000000..d39a733
@@ -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/

package/numactl/numactl.mk new file +21 -0

new file mode 100644
index 0000000..440847c
@@ -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))

Signature · 1 line

1.7.9.5

Peter Korsgaard

2013-05-27 08:42 UTC #2 lore raw

PATCH 1/20 numactl: new package

Quoted 1 line

Thomas> From: Will Newton <[email protected]>
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 <[email protected]> Thomas> Signed-off-by: Thomas Petazzoni <[email protected]> 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.

Signature · 1 line

Bye, Peter Korsgaard

Thomas Petazzoni

author

2013-05-26 22:08 UTC #3 lore raw

PATCH 2/20 dropbear: factorize the 'depends on BR2_PACKAGE_DROPBEAR'

In reply to Thomas Petazzoni

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 <[email protected]>

---
 package/dropbear/Config.in |    8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

package/dropbear/Config.in +4 -4

index 0903ad1..68c3b71 100644
@@ -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

Signature · 1 line

1.7.9.5

Peter Korsgaard

2013-05-27 11:11 UTC #4 lore raw

PATCH 2/20 dropbear: factorize the 'depends on BR2_PACKAGE_DROPBEAR'

Quoted 1 line

Thomas> Enclose all dropbear sub-options into a 'if BR2_PACKAGE_DROPBEAR' Thomas> ... 'endif' block rather than having 'depends on BR2_PACKAGE_DROPBEAR' Thomas> for each option.

Committed to next, thanks.

Signature · 1 line

Bye, Peter Korsgaard

Thomas Petazzoni

author

2013-05-26 22:08 UTC #5 lore raw

PATCH 3/20 elf2flt: fix build when zlib is not installed on the host

In reply to Thomas Petazzoni

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 <[email protected]>

---
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(-)

toolchain/elf2flt/elf2flt.mk +2 -2

index 134034b..52e199c 100644
@@ -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)

Signature · 1 line

1.7.9.5

Peter Korsgaard

2013-05-27 11:13 UTC #6 lore raw

PATCH 3/20 elf2flt: fix build when zlib is not installed on the host

Quoted 1 line

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.

Signature · 1 line

Bye, Peter Korsgaard

Thomas Petazzoni

author

2013-05-26 22:08 UTC #7 lore raw

PATCH 4/20 gcc: fix gcc 4.8 build when thread support is disabled

In reply to Thomas Petazzoni

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 <[email protected]>

---
 toolchain/gcc/gcc-uclibc-4.x.mk |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

toolchain/gcc/gcc-uclibc-4.x.mk +1 -1

index 21679ef..5be26c4 100644
@@ -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

Signature · 1 line

1.7.9.5

Peter Korsgaard

2013-05-27 11:36 UTC #8 lore raw

PATCH 4/20 gcc: fix gcc 4.8 build when thread support is disabled

Quoted 1 line

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.

Signature · 1 line

Bye, Peter Korsgaard

Peter Korsgaard

2013-05-27 21:55 UTC #9 lore raw

PATCH 4/20 gcc: fix gcc 4.8 build when thread support is disabled

In reply to Thomas Petazzoni

Quoted 1 line

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.

Signature · 1 line

Bye, Peter Korsgaard

Thomas Petazzoni

author

2013-05-26 22:08 UTC #10 lore raw

PATCH 5/20 toolchain: blackfin: Remove Blackfin toolchain 2011R1 release.

In reply to Thomas Petazzoni

From: Sonic Zhang <[email protected]>

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 <[email protected]>

Acked-by Thomas Petazzoni <[email protected]>

Signed-off-by Thomas Petazzoni <[email protected]>

---
 toolchain/toolchain-external/Config.in   |   19 -------------------
 toolchain/toolchain-external/ext-tool.mk |    8 +-------
 2 files changed, 1 insertion(+), 26 deletions(-)

toolchain/toolchain-external/Config.in +0 ~~-19~~

index a93ada3..02fb330 100644
@@ -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

toolchain/toolchain-external/ext-tool.mk +1 -7

index a87bc3b..58e58f6 100644
@@ -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))

Signature · 1 line

1.7.9.5

Peter Korsgaard

2013-05-27 11:36 UTC #11 lore raw

PATCH 5/20 toolchain: blackfin: Remove Blackfin toolchain 2011R1 release.

Quoted 1 line

Thomas> From: Sonic Zhang <[email protected]>
Thomas> ADI officially supports the buildroot and related GNU toolchain for Thomas> Blackfin since ADI's 2012R1 release only. In order to avoid confusion, Thomas> it is better to remove the 2011R1 GNU toolchain for Blackfin. In Thomas> addition, the 2011R1 GNU toolchain for Blackfin doesn't support the Thomas> BF60x processors.

Committed to next, thanks.

Signature · 1 line

Bye, Peter Korsgaard

Thomas Petazzoni

author

2013-05-26 22:08 UTC #12 lore raw

PATCH 6/20 poco: Add upstream patch to add support for aarch64.

In reply to Thomas Petazzoni

From: Will Newton <[email protected]>

Signed-off-by Will Newton <[email protected]>

Signed-off-by Thomas Petazzoni <[email protected]>

---
 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

package/poco/Config.in +2 -2

index 402f96d..47ca83d 100644
@@ -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)

package/poco/poco-aarch64.patch new file +39 -0

new file mode 100644
index 0000000..f629f7b
@@ -0,0 +1,39 @@
+From 37899eda9563d9134cb5864751b6432cabfaac3e Mon Sep 17 00:00:00 2001
+From: Will Newton <[email protected]>
+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
+

Signature · 1 line

1.7.9.5

Peter Korsgaard

2013-06-09 20:14 UTC #13 lore raw

PATCH 6/20 poco: Add upstream patch to add support for aarch64.

Quoted 1 line

Thomas> From: Will Newton <[email protected]>
Thomas> Signed-off-by: Will Newton <[email protected]> Thomas> Signed-off-by: Thomas Petazzoni <[email protected]>

Committed, thanks.

Signature · 1 line

Bye, Peter Korsgaard

Thomas Petazzoni

author

2013-05-26 22:08 UTC #14 lore raw

PATCH 7/20 flex: needs M4 at runtime

In reply to Thomas Petazzoni

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 <[email protected]>

---
 package/flex/Config.in |    2 ++
 package/flex/flex.mk   |    1 +
 2 files changed, 3 insertions(+)

package/flex/Config.in +2 -0

index f74a0f0..1ecd0c3 100644
@@ -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.

package/flex/flex.mk +1 -0

index f7e319f..748365b 100644
@@ -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

Signature · 1 line

1.7.9.5

Peter Korsgaard

2013-05-27 21:55 UTC #15 lore raw

PATCH 7/20 flex: needs M4 at runtime

Quoted 1 line

Thomas> For proper runtime execution, flex requires m4 to be Thomas> installed. Passing a M4 variable at configure time is needed, Thomas> otherwise flex on the target will try to use a 'm4' binary with a Thomas> build machine path.

Thomas> Fixes bug #4988.

Committed, thanks.

Signature · 1 line

Bye, Peter Korsgaard

Thomas Petazzoni

author

2013-05-26 22:08 UTC #16 lore raw

PATCH 8/20 Remove useless CVS related files

In reply to Thomas Petazzoni

Fixes bug #5912.

Signed-off-by Thomas Petazzoni <[email protected]>

---
 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

support/gnuconfig/.cvsignore deleted +0 -5

deleted file mode 100644
index 669c89f..0000000
@@ -1,5 +0,0 @@
-.cvsignore
-README.buildroot
-gnuconfig.mk
-patches
-.svn

toolchain/elf2flt/elf2flt/.cvsignore deleted +0 -3

deleted file mode 100644
index 18cff9a..0000000
@@ -1,3 +0,0 @@
-.cvsignore
-.svn
-maketarball.sh

toolchain/elf2flt/elf2flt/CVS/Entries deleted +0 ~~-17~~

deleted file mode 100644
index 1b3750f..0000000
@@ -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

toolchain/elf2flt/elf2flt/CVS/Repository deleted +0 -1

deleted file mode 100644
index 61a695f..0000000
@@ -1 +0,0 @@
-elf2flt

toolchain/elf2flt/elf2flt/CVS/Root deleted +0 -1

deleted file mode 100644
index 0b9f527..0000000
@@ -1 +0,0 @@
-:pserver:anonymous at cvs.uclinux.org:/var/cvs

Signature · 1 line

1.7.9.5

Peter Korsgaard

2013-05-27 21:59 UTC #17 lore raw

PATCH 8/20 Remove useless CVS related files

Quoted 1 line

Thomas> Fixes bug #5912.
Thomas> Signed-off-by: Thomas Petazzoni <[email protected]>

Committed, thanks.

Signature · 1 line

Bye, Peter Korsgaard

Thomas Petazzoni

author

2013-05-26 22:08 UTC #18 lore raw

PATCH 9/20 toolchain-external: add support for 'Sourcery CodeBench ARM 2013.05'

In reply to Thomas Petazzoni

From: Fabio Porcedda <[email protected]>

Signed-off-by Fabio Porcedda <[email protected]>

Signed-off-by Thomas Petazzoni <[email protected]>

---
 toolchain/toolchain-external/Config.in   |   25 +++++++++++++++++++++++++
 toolchain/toolchain-external/ext-tool.mk |    3 +++
 2 files changed, 28 insertions(+)

toolchain/toolchain-external/Config.in +25 -0

index 02fb330..9d29509 100644
@@ -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

toolchain/toolchain-external/ext-tool.mk +3 -0

index 58e58f6..182d689 100644
@@ -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

Signature · 1 line

1.7.9.5

Peter Korsgaard

2013-05-27 22:03 UTC #19 lore raw

PATCH 9/20 toolchain-external: add support for 'Sourcery CodeBench ARM 2013.05'

Quoted 1 line

Thomas> From: Fabio Porcedda <[email protected]>
Thomas> Signed-off-by: Fabio Porcedda <[email protected]> Thomas> Signed-off-by: Thomas Petazzoni <[email protected]>

Committed to next, thanks.

Signature · 1 line

Bye, Peter Korsgaard

Thomas Petazzoni

author

2013-05-26 22:08 UTC #20 lore raw

PATCH 10/20 toolchain-external: remove support for 'Sourcery CodeBench ARM 2011.03'

In reply to Thomas Petazzoni

From: Fabio Porcedda <[email protected]>

Signed-off-by Fabio Porcedda <[email protected]>

Signed-off-by Thomas Petazzoni <[email protected]>

---
 toolchain/toolchain-external/Config.in   |   25 -------------------------
 toolchain/toolchain-external/ext-tool.mk |    5 +----
 2 files changed, 1 insertion(+), 29 deletions(-)

toolchain/toolchain-external/Config.in +0 ~~-25~~

index 9d29509..47b2bf5 100644
@@ -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

toolchain/toolchain-external/ext-tool.mk +1 -4

index 182d689..93b3b15 100644
@@ -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)

Signature · 1 line

1.7.9.5

Peter Korsgaard

2013-05-27 22:03 UTC #21 lore raw

PATCH 10/20 toolchain-external: remove support for 'Sourcery CodeBench ARM 2011.03'

Quoted 1 line

Thomas> From: Fabio Porcedda <[email protected]>
Thomas> Signed-off-by: Fabio Porcedda <[email protected]> Thomas> Signed-off-by: Thomas Petazzoni <[email protected]>

Committed to next, thanks.

Signature · 1 line

Bye, Peter Korsgaard

Thomas Petazzoni

author

2013-05-26 22:08 UTC #22 lore raw

PATCH 11/20 sunxi-tools: new host/target package

In reply to Thomas Petazzoni

From: Carlo Caione <[email protected]>

Signed-off-by Carlo Caione <[email protected]>

Signed-off-by Thomas Petazzoni <[email protected]>

---
 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

package/Config.in +1 -0

index 6094c1b..1bd9309 100644
@@ -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

package/Config.in.host +1 -0

index 7c0dd20..54178ea 100644
@@ -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

package/sunxi-tools/Config.in new file +10 -0

new file mode 100644
index 0000000..a085aeb
@@ -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
+

package/sunxi-tools/Config.in.host new file +12 -0

new file mode 100644
index 0000000..b5e4193
@@ -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
+

package/sunxi-tools/sunxi-tools.mk new file +37 -0

new file mode 100644
index 0000000..a97dfcb
@@ -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))

Signature · 1 line

1.7.9.5

Peter Korsgaard

2013-05-27 22:09 UTC #23 lore raw

PATCH 11/20 sunxi-tools: new host/target package

Quoted 1 line

Thomas> From: Carlo Caione <[email protected]>
Thomas> Signed-off-by: Carlo Caione <[email protected]> Thomas> Signed-off-by: Thomas Petazzoni <[email protected]> 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.

Signature · 1 line

Bye, Peter Korsgaard

Thomas Petazzoni

author

2013-05-26 22:08 UTC #24 lore raw

PATCH 12/20 sunxi-boards: new package

In reply to Thomas Petazzoni

From: Carlo Caione <[email protected]>

Signed-off-by Carlo Caione <[email protected]>

Signed-off-by Thomas Petazzoni <[email protected]>

---
 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

package/Config.in +1 -0

index 1bd9309..50683ff 100644
@@ -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

package/sunxi-boards/Config.in new file +19 -0

new file mode 100644
index 0000000..27ee8fc
@@ -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

package/sunxi-boards/sunxi-boards.mk new file +17 -0

new file mode 100644
index 0000000..1f52110
@@ -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))

Signature · 1 line

1.7.9.5

Peter Korsgaard

2013-05-28 21:29 UTC #25 lore raw

PATCH 12/20 sunxi-boards: new package

Quoted 1 line

Thomas> From: Carlo Caione <[email protected]>
Thomas> Signed-off-by: Carlo Caione <[email protected]> Thomas> Signed-off-by: Thomas Petazzoni <[email protected]> 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.

Signature · 1 line

Bye, Peter Korsgaard

Thomas Petazzoni

author

2013-05-26 22:08 UTC #26 lore raw

PATCH 13/20 cubieboard: add support

In reply to Thomas Petazzoni

From: Carlo Caione <[email protected]>

Signed-off-by Carlo Caione <[email protected]>

Signed-off-by Thomas Petazzoni <[email protected]>

---
 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

board/cubietech/cubieboard/boot.cmd new file +4 -0

new file mode 100644
index 0000000..849ed00
@@ -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

board/cubietech/cubieboard/mkcubiecard.sh new file +119 -0

119 lines not on this page · raw message

board/cubietech/cubieboard/post-build.sh new file +15 -0

new file mode 100755
index 0000000..cd6675b
@@ -0,0 +1,15 @@
+#!/bin/sh
+# post-build.sh for CubieBoard
+# 2013, Carlo Caione <[email protected]>
+
+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
+

board/cubietech/cubieboard/readme.txt new file +59 -0

59 lines not on this page · raw message

configs/cubieboard_defconfig new file +39 -0

new file mode 100644
index 0000000..77806f6
@@ -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"

Signature · 1 line

1.7.9.5

Peter Korsgaard

2013-05-29 10:54 UTC #27 lore raw

PATCH 13/20 cubieboard: add support

Quoted 1 line

Thomas> From: Carlo Caione <[email protected]>
Thomas> Signed-off-by: Carlo Caione <[email protected]> Thomas> Signed-off-by: Thomas Petazzoni <[email protected]> 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.

Signature · 1 line

Bye, Peter Korsgaard

Thomas Petazzoni

author

2013-05-26 22:08 UTC #28 lore raw

PATCH 14/20 freescale-imx: new package directory

In reply to Thomas Petazzoni

From: Henk Fijnvandraat <[email protected]>

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 <[email protected]>

Signed-off-by Thomas Petazzoni <[email protected]>

---
 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

package/Config.in +1 -0

index 50683ff..d8a2cf7 100644
@@ -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"

package/freescale-imx/Config.in new file +4 -0

new file mode 100644
index 0000000..389bcc6
@@ -0,0 +1,4 @@
+menu "Freescale i.MX libraries"
+	depends on BR2_arm
+
+endmenu

package/freescale-imx/freescale-imx.mk new file +13 -0

new file mode 100644
index 0000000..0d5400b
@@ -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
+

Signature · 1 line

1.7.9.5

Peter Korsgaard

2013-05-29 12:24 UTC #29 lore raw

PATCH 14/20 freescale-imx: new package directory

Quoted 1 line

Thomas> From: Henk Fijnvandraat <[email protected]> Thomas> The freescale-imx directory is intended to contain all freescale Thomas> i.MXyy related packages, together with their download site and version Thomas> info

Committed to next, thanks.

Signature · 1 line

Bye, Peter Korsgaard

Thomas Petazzoni

author

2013-05-26 22:08 UTC #30 lore raw

PATCH 15/20 imx-lib: move to the freescale-imx directory

In reply to Thomas Petazzoni

From: Henk Fijnvandraat <[email protected]>

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 <[email protected]>

Signed-off-by Thomas Petazzoni <[email protected]>

---
 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%)

package/Config.in +0 -1

index d8a2cf7..a3b3e05 100644
@@ -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"

package/freescale-imx/Config.in +2 -0

index 389bcc6..edc9ab5 100644
@@ -1,4 +1,6 @@
 menu "Freescale i.MX libraries"
 	depends on BR2_arm
 
+source "package/freescale-imx/imx-lib/Config.in"
+
 endmenu

package/freescale-imx/imx-lib/Config.in renamed from package/imx-lib/Config.in +0 -0

similarity index 100%
rename from package/imx-lib/Config.in
rename to package/freescale-imx/imx-lib/Config.in

package/freescale-imx/imx-lib/imx-lib.mk renamed from package/imx-lib/imx-lib.mk +2 -3

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
@@ -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

Signature · 1 line

1.7.9.5

Peter Korsgaard

2013-05-29 12:28 UTC #31 lore raw

PATCH 15/20 imx-lib: move to the freescale-imx directory

Quoted 1 line

Thomas> From: Henk Fijnvandraat <[email protected]> Thomas> This commit moves the imx-lib 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.

Signature · 1 line

Bye, Peter Korsgaard

Thomas Petazzoni

author

2013-05-26 22:08 UTC #32 lore raw

PATCH 16/20 firmware-imx: move to the freescale-imx directory

In reply to Thomas Petazzoni

From: Henk Fijnvandraat <[email protected]>

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 <[email protected]>

Signed-off-by Thomas Petazzoni <[email protected]>

---
 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%)

package/Config.in +0 -1

index a3b3e05..2874eb6 100644
@@ -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"

package/freescale-imx/Config.in +1 -0

index edc9ab5..840b83b 100644
@@ -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

package/freescale-imx/firmware-imx/Config.in renamed from package/firmware-imx/Config.in +0 -0

similarity index 100%
rename from package/firmware-imx/Config.in
rename to package/freescale-imx/firmware-imx/Config.in

package/freescale-imx/firmware-imx/firmware-imx.mk renamed from package/firmware-imx/firmware-imx.mk +3 -4

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
@@ -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)

Signature · 1 line

1.7.9.5

Peter Korsgaard

2013-05-29 12:31 UTC #33 lore raw

PATCH 16/20 firmware-imx: move to the freescale-imx directory

Quoted 1 line

Thomas> From: Henk Fijnvandraat <[email protected]> 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.

Signature · 1 line

Bye, Peter Korsgaard

Thomas Petazzoni

author

2013-05-26 22:08 UTC #34 lore raw

PATCH 17/20 freescale-imx: bump to 1.1.0

In reply to Thomas Petazzoni

From: Henk Fijnvandraat <[email protected]>

This commit bumps both imx-lib and firmware-imx to version 1.1.0.

Signed-off-by Henk Fijnvandraat <[email protected]>

Signed-off-by Thomas Petazzoni <[email protected]>

---
 package/freescale-imx/freescale-imx.mk |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

package/freescale-imx/freescale-imx.mk +1 -1

index 0d5400b..2553f67 100644
@@ -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

Signature · 1 line

1.7.9.5

Peter Korsgaard

2013-05-29 13:19 UTC #35 lore raw

PATCH 17/20 freescale-imx: bump to 1.1.0

Quoted 1 line

Thomas> From: Henk Fijnvandraat <[email protected]> Thomas> This commit bumps both imx-lib and firmware-imx to version 1.1.0.

Committed to next, thanks.

Signature · 1 line

Bye, Peter Korsgaard

Thomas Petazzoni

author

2013-05-26 22:08 UTC #36 lore raw

PATCH 18/20 gpu-viv-bin-mx6q: new package

In reply to Thomas Petazzoni

From: Henk Fijnvandraat <[email protected]>

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 <[email protected]>

Signed-off-by Thomas Petazzoni <[email protected]>

---
 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

package/freescale-imx/Config.in +1 -0

index 840b83b..7c22f79 100644
@@ -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

package/freescale-imx/gpu-viv-bin-mx6q/Config.in new file +30 -0

new file mode 100644
index 0000000..37f8e03
@@ -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

package/freescale-imx/gpu-viv-bin-mx6q/gpu-viv-bin-mx6q-0001-correct-HAL-include.patch new file +16 -0

new file mode 100644
index 0000000..c83cd55
@@ -0,0 +1,16 @@
+Correct the directory path for gc_hal_eglplatform_type.h
+
+Signed-off-by: Henk Fijnvandraat <[email protected]>
+
+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>
+ 
+ 
+ /*******************************************************************************

package/freescale-imx/gpu-viv-bin-mx6q/gpu-viv-bin-mx6q.mk new file +79 -0

79 lines not on this page · raw message

Signature · 1 line

1.7.9.5

Peter Korsgaard

2013-05-29 13:39 UTC #37 lore raw

PATCH 18/20 gpu-viv-bin-mx6q: new package

Quoted 1 line

Thomas> From: Henk Fijnvandraat <[email protected]> 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 <[email protected]> Thomas> Signed-off-by: Thomas Petazzoni <[email protected]> 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?

Signature · 1 line

Bye, Peter Korsgaard

Thomas Petazzoni

author

2013-05-29 13:48 UTC #38 lore raw

PATCH 18/20 gpu-viv-bin-mx6q: new package

Dear Peter Korsgaard,

Quoted 10 lines · Peter Korsgaard

Quoted 2 lines

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).

Quoted 10 lines

Right.

Quoted 2 lines

Correct. I've mainly taken Henk's patch and tried to make it suitable for upstream. Further improvements are definitely needed.

Quoted 1 line

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

Signature · 4 lines

Thomas Petazzoni, Free Electrons
Kernel, drivers, real-time and embedded Linux
development, consulting, training and support.
http://free-electrons.com

Peter Korsgaard

2013-05-29 13:54 UTC #39 lore raw

PATCH 18/20 gpu-viv-bin-mx6q: new package

Quoted 1 line

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

Quoted 3 lines

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).

Signature · 1 line

Bye, Peter Korsgaard

Arnout Vandecappelle

2013-06-01 18:14 UTC #40 lore raw

PATCH 18/20 gpu-viv-bin-mx6q: new package

In reply to Thomas Petazzoni

Quoted 6 lines · Thomas Petazzoni

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

Signature · 6 lines

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

Thomas Petazzoni

author

2013-05-26 22:08 UTC #41 lore raw

PATCH 19/20 network-manager: use a <pkg>_VERSION_MAJOR variable

In reply to Thomas Petazzoni

Just like we do for many other GNOME-hosted tarballs, use a <pkg>_VERSION_MAJOR variable for network-manager.

Signed-off-by Thomas Petazzoni <[email protected]>

---
 package/network-manager/network-manager.mk |    6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

package/network-manager/network-manager.mk +4 -2

index b3715d8..261f2d3 100644
@@ -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

Signature · 1 line

1.7.9.5

Peter Korsgaard

2013-05-29 13:45 UTC #42 lore raw

PATCH 19/20 network-manager: use a <pkg>_VERSION_MAJOR variable

Quoted 1 line

Thomas> Just like we do for many other GNOME-hosted tarballs, use a Thomas> <pkg>_VERSION_MAJOR variable for network-manager.

Committed, thanks.

Signature · 1 line

Bye, Peter Korsgaard

Thomas Petazzoni

author

2013-05-26 22:08 UTC #43 lore raw

PATCH 20/20 network-manager: bump to 0.9.8.0

In reply to Thomas Petazzoni

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 <[email protected]>

---
 .../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

package/network-manager/network-manager-execinfo.patch deleted +0 ~~-31~~

deleted file mode 100644
index 8dc83f0..0000000
@@ -1,31 +0,0 @@
-From ff9471b7d83545614100a270e2d85b7b272abe97 Mon Sep 17 00:00:00 2001
-From: Peter Korsgaard <[email protected]>
-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 <[email protected]>
----
- 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
-

package/network-manager/network-manager.mk +13 ~~-20~~

index 261f2d3..9be624c 100644
@@ -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))

Signature · 1 line

1.7.9.5

Peter Korsgaard

2013-05-29 14:09 UTC #44 lore raw

PATCH 20/20 network-manager: bump to 0.9.8.0

Quoted 1 line

Thomas> This upstream version (the latest available at the time of this
Thomas> writing) contains
Thomas> http://cgit.freedesktop.org/NetworkManager/NetworkManager/commit/?id=6b64e4db2f3c9cfc0e0e240cf0bc58f3b3e90c1f
Thomas> which fixes a build issue of network-manager against recent kernel
Thomas> headers.

Thomas> We also remove our patch against network-manager, because it has been Thomas> merged upstream as commit cbf72aeb34a6f1fd1bcd7f78ae88985154dc85af.

Committed to next, thanks.

Signature · 1 line

Bye, Peter Korsgaard