* [Buildroot] [PATCH 7/7] docs/manual: do not suggest to create a symlink for shared download directory
From: Thomas Petazzoni @ 2012-12-29 14:42 UTC (permalink / raw)
To: buildroot
In-Reply-To: <1356792153-24033-1-git-send-email-thomas.petazzoni@free-electrons.com>
Creating a symbolic link for the download directory is really not a
useful suggestion, since we have the much better solution of the
BUILDROOT_DL_DIR environment variable. So emphasize this solution
instead, and remove the suggestion of the symbolic link.
Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
---
docs/manual/download-location.txt | 23 ++++++++---------------
1 file changed, 8 insertions(+), 15 deletions(-)
diff --git a/docs/manual/download-location.txt b/docs/manual/download-location.txt
index 4befe0a..36a1356 100644
--- a/docs/manual/download-location.txt
+++ b/docs/manual/download-location.txt
@@ -3,25 +3,18 @@
Location of downloaded packages
~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-The various tarballs that are downloaded by Buildroot are all stored in
-+DL_DIR+, which by default is the +dl+ directory. If you want
+The various tarballs that are downloaded by Buildroot are all stored
+in +BR2_DL_DIR+, which by default is the +dl+ directory. If you want
to keep a complete version of Buildroot which is known to be working
with the associated tarballs, you can make a copy of this directory.
-This will allow you to regenerate the toolchain and the target filesystem
-with exactly the same versions.
+This will allow you to regenerate the toolchain and the target
+filesystem with exactly the same versions.
If you maintain several Buildroot trees, it might be better to have a
-shared download location. This can be accessed by creating a symbolic
-link from the +dl+ directory to the shared download location:
-
------------------
- $ ln -s <shared download location> dl
------------------
-
-Another way of accessing a shared download location is to create the
-+BUILDROOT_DL_DIR+ environment variable. If this is set, then the
-value of DL_DIR in the project is overridden. The following line
-should be added to +<~/.bashrc>+.
+shared download location. This can be achieved by pointing the
++BUILDROOT_DL_DIR+ environment variable to a directory. If this is
+set, then the value of +BR2_DL_DIR+ in the Buildroot configuration is
+overridden. The following line should be added to +<~/.bashrc>+.
-----------------
$ export BUILDROOT_DL_DIR <shared download location>
--
1.7.9.5
^ permalink raw reply related
* [Buildroot] (no subject)
From: Stefan Fröberg @ 2012-12-29 14:56 UTC (permalink / raw)
To: buildroot
In-Reply-To: <20121229153251.6bdfecfe@skate>
29.12.2012 16:32, Thomas Petazzoni kirjoitti:
> Dear Stefan Fr?berg,
>
> On Sat, 29 Dec 2012 16:13:14 +0200, Stefan Fr?berg wrote:
>
>> Thomas, can you tell a git newbie like me how to make single patch but
>> still keeping that Signed-off line in
>> each logical file in that single one patch ?
> I am not sure to understand your question. I think you're confusing the
> SoB line in the Buildroot patch with the SoB line in the patches that
> apply on mesa3d, aren't you?
>
> So basically, your final patch should look like this:
>
> =======================================================================
> mesa3d: bump to version 8.0.5
>
> Here you explain that you're bumping to 8.0.5, and that it requires new
> patches, for this reason and that reason, and blablabla.
>
> Signed-off-by: Stefan Fr?berg <...>
> ---
> Here git will generate the diff-stat of your overall patch
>
> diff --git a/package/x11r7/mesa3d/mesa3d.mk b/package/x11r7/mesa3d/mesa3d.mk
> index ...
> --- a/package/x11r7/mesa3d/mesa3d.mk
> +++ b/package/x11r7/mesa3d/mesa3d.mk
> ... here your changes to mesa3d.mk
>
> diff --git a/package/x11r7/mesa3d/mesa3d-01-something.patch b/package/x11r7/mesa3d/mesa3d-01-something.patch
> index ...
> --- /dev/null
> +++ b/package/x11r7/mesa3d/mesa3d-01-something.patch
> + mesa3d: fix something
> +
> + This is the description of the mesa3d-01-something.patch. You explain
> + what you are doing here.
> +
> + Signed-off-by: Stefan Fr?berg <...>
> +
> + ... here your mesa3d-01-something.patch ...
>
> diff --git a/package/x11r7/mesa3d/mesa3d-02-something-else.patch b/package/x11r7/mesa3d/mesa3d-02-something-else.patch
> index ...
> --- /dev/null
> +++ b/package/x11r7/mesa3d/mesa3d-02-something-else.patch
> + mesa3d: fix something else
> +
> + This is the description of the mesa3d-02-something-else.patch. You explain
> + what you are doing here.
> +
> + Signed-off-by: Stefan Fr?berg <...>
> +
> + ... here your mesa3d-02-something-else.patch ...
> =======================================================================
>
> And that's it. See the recently posted "[Buildroot] [PATCH 20/20]
> enlightenment: new package" e-mail. It adds enlightenment.mk and
> contains a patch to it.
>
> Basically you need *one* Signed-off-by in the commit log of the Git
> patch that applies to Buildroot. And then one Signed-off-by per patch
> that you're applying to mesa3d, but those Signed-off-by are *inside*
> the patch applied to mesa3d, not in the commit log of the Git patch
> applied to Buildroot.
That's what I meant. Those *inside* Signed-off tags.
How should I add those inside Signed-off tags to individual patches
(either my own make or 3rd party)
applied to mesa3d ?
Does git diff command do that ? It does not have -s switch like commit does.
Regards
Stefan
^ permalink raw reply
* [Buildroot] (no subject) git format-patch
From: Carsten Schoenert @ 2012-12-29 15:23 UTC (permalink / raw)
To: buildroot
In-Reply-To: <50DF04B3.30801@petroprogram.com>
Hello Stefan,
Am 29.12.2012 15:56, schrieb Stefan Fr?berg:
> That's what I meant. Those *inside* Signed-off tags.
> How should I add those inside Signed-off tags to individual patches
> (either my own make or 3rd party)
> applied to mesa3d ?
>
> Does git diff command do that ? It does not have -s switch like commit does.
I do my signed off while using 'git format-patch'
git format-patch -s [against_some_branch]
Of course *after* the steps Thomas talked about. ;)
Regards
Carsten
^ permalink raw reply
* [Buildroot] (no subject) git format-patch
From: Stefan Fröberg @ 2012-12-29 15:31 UTC (permalink / raw)
To: buildroot
In-Reply-To: <50DF0B08.8050205@googlemail.com>
Hi Carsten
29.12.2012 17:23, Carsten Schoenert kirjoitti:
> Hello Stefan,
>
> Am 29.12.2012 15:56, schrieb Stefan Fr?berg:
>
>> That's what I meant. Those *inside* Signed-off tags.
>> How should I add those inside Signed-off tags to individual patches
>> (either my own make or 3rd party)
>> applied to mesa3d ?
>>
>> Does git diff command do that ? It does not have -s switch like commit does.
> I do my signed off while using 'git format-patch'
>
> git format-patch -s [against_some_branch]
>
> Of course *after* the steps Thomas talked about. ;)
>
> Regards
> Carsten
>
Oh, Ok.
Can you still please show in simple
line by line example (like I did in question to Thomas) your work
process with git when
you add new package.
So that there is no misunderstanding.
My brain is especially slow today :-)
Regards
Stefan
^ permalink raw reply
* [Buildroot] [pull request] Pull request for branch pre-built-packages
From: Thomas Petazzoni @ 2012-12-29 16:14 UTC (permalink / raw)
To: buildroot
Hello,
Recently, we have had a number of users having issues with external
toolchains because those are built for 32 bits Linux, and most
developers know use 64 bits build machines. The error message such
users get so far is very cryptic "Cannot execute cross-compiler".
So, this set of patches adds a small infrastructure in the form of a
Kconfig option and a check in dependencies.sh. The Kconfig option
allows packages to tell whether they need 32 bits compatibility
libraries, and the check in dependencies.sh verifies that those
libraries are installed (simply by checking the presence of the 32
bits dynamic loader).
Then, all pre-built external toolchains as well as the sam-ba tool are
modified to use this mechanism.
As a preliminary patch, all the pre-built external toolchains are
changed to be visible only if the host architecture is x86 or x86-64.
Thanks,
Thomas
The following changes since commit 4848386446b937d4d0d9d3e9489932ca3fcb1003:
libffi: fix mips build failures (2012-12-28 16:55:09 +0100)
are available in the git repository at:
git://git.free-electrons.com/users/thomas-petazzoni/buildroot.git pre-built-packages
for you to fetch changes up to fbccee70c941bfc2e0c8d0c62cf78e726ae35170:
sam-ba: select BR2_HOSTARCH_NEEDS_IA32_LIBS (2012-12-29 17:06:41 +0100)
----------------------------------------------------------------
Thomas Petazzoni (4):
toolchain-external: add dependency on BR2_HOST_ARCH
Infrastructure to warn the user about missing 32 bits libraries
toolchain-external: use BR2_HOSTARCH_NEEDS_IA32_LIBS where needed
sam-ba: select BR2_HOSTARCH_NEEDS_IA32_LIBS
Config.in | 6 ++++
package/sam-ba/Config.in.host | 1 +
support/dependencies/dependencies.sh | 11 +++++++
toolchain/toolchain-external/Config.in | 54 ++++++++++++++++++++++++++++++++
4 files changed, 72 insertions(+)
Thanks,
--
Thomas Petazzoni
^ permalink raw reply
* [Buildroot] [PATCH 1/4] toolchain-external: add dependency on BR2_HOST_ARCH
From: Thomas Petazzoni @ 2012-12-29 16:14 UTC (permalink / raw)
To: buildroot
In-Reply-To: <cover.1356797653.git.thomas.petazzoni@free-electrons.com>
The pre-build external toolchains are all built for x86, so they are
only available if the build machine is a x86 or x86-64 machine.
Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
---
toolchain/toolchain-external/Config.in | 27 +++++++++++++++++++++++++++
1 file changed, 27 insertions(+)
diff --git a/toolchain/toolchain-external/Config.in b/toolchain/toolchain-external/Config.in
index eeb40a3..c14736d 100644
--- a/toolchain/toolchain-external/Config.in
+++ b/toolchain/toolchain-external/Config.in
@@ -7,6 +7,7 @@ config BR2_TOOLCHAIN_EXTERNAL_LINARO_2012_12
bool "Linaro 2012.12"
depends on BR2_arm
depends on BR2_cortex_a5 || BR2_cortex_a8 || BR2_cortex_a9 || BR2_cortex_a15
+ depends on BR2_HOSTARCH = "x86_64" || BR2_HOSTARCH = "x86"
select BR2_TOOLCHAIN_EXTERNAL_GLIBC
select BR2_TOOLCHAIN_HAS_NATIVE_RPC
select BR2_INSTALL_LIBSTDCPP
@@ -24,6 +25,7 @@ config BR2_TOOLCHAIN_EXTERNAL_LINARO_2012_11
bool "Linaro 2012.11"
depends on BR2_arm
depends on BR2_cortex_a5 || BR2_cortex_a8 || BR2_cortex_a9 || BR2_cortex_a15
+ depends on BR2_HOSTARCH = "x86_64" || BR2_HOSTARCH = "x86"
select BR2_TOOLCHAIN_EXTERNAL_GLIBC
select BR2_TOOLCHAIN_HAS_NATIVE_RPC
select BR2_INSTALL_LIBSTDCPP
@@ -41,6 +43,7 @@ config BR2_TOOLCHAIN_EXTERNAL_LINARO_2012_10
bool "Linaro 2012.10"
depends on BR2_arm
depends on BR2_cortex_a5 || BR2_cortex_a8 || BR2_cortex_a9 || BR2_cortex_a15
+ depends on BR2_HOSTARCH = "x86_64" || BR2_HOSTARCH = "x86"
select BR2_TOOLCHAIN_EXTERNAL_GLIBC
select BR2_TOOLCHAIN_HAS_NATIVE_RPC
select BR2_INSTALL_LIBSTDCPP
@@ -61,6 +64,7 @@ comment "Linaro toolchains available for Cortex-A{5,8,9,15}"
config BR2_TOOLCHAIN_EXTERNAL_CODESOURCERY_ARM201203
bool "Sourcery CodeBench ARM 2012.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
@@ -83,6 +87,7 @@ config BR2_TOOLCHAIN_EXTERNAL_CODESOURCERY_ARM201203
config BR2_TOOLCHAIN_EXTERNAL_CODESOURCERY_ARM201109
bool "Sourcery CodeBench ARM 2011.09"
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
@@ -105,6 +110,7 @@ config BR2_TOOLCHAIN_EXTERNAL_CODESOURCERY_ARM201109
config BR2_TOOLCHAIN_EXTERNAL_CODESOURCERY_MIPS201209
bool "Sourcery CodeBench MIPS 2012.09"
depends on BR2_mips || BR2_mipsel
+ depends on BR2_HOSTARCH = "x86_64" || BR2_HOSTARCH = "x86"
select BR2_TOOLCHAIN_EXTERNAL_GLIBC
select BR2_TOOLCHAIN_HAS_NATIVE_RPC
select BR2_INSTALL_LIBSTDCPP
@@ -173,6 +179,7 @@ config BR2_TOOLCHAIN_EXTERNAL_CODESOURCERY_MIPS201209
config BR2_TOOLCHAIN_EXTERNAL_CODESOURCERY_MIPS201203
bool "Sourcery CodeBench MIPS 2012.03"
depends on BR2_mips || BR2_mipsel
+ depends on BR2_HOSTARCH = "x86_64" || BR2_HOSTARCH = "x86"
select BR2_TOOLCHAIN_EXTERNAL_GLIBC
select BR2_TOOLCHAIN_HAS_NATIVE_RPC
select BR2_INSTALL_LIBSTDCPP
@@ -241,6 +248,7 @@ config BR2_TOOLCHAIN_EXTERNAL_CODESOURCERY_MIPS201203
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
@@ -263,6 +271,7 @@ config BR2_TOOLCHAIN_EXTERNAL_CODESOURCERY_ARM201103
config BR2_TOOLCHAIN_EXTERNAL_CODESOURCERY_MIPS201109
bool "Sourcery CodeBench MIPS 2011.09"
depends on BR2_mips || BR2_mipsel
+ depends on BR2_HOSTARCH = "x86_64" || BR2_HOSTARCH = "x86"
select BR2_TOOLCHAIN_EXTERNAL_GLIBC
select BR2_TOOLCHAIN_HAS_NATIVE_RPC
select BR2_INSTALL_LIBSTDCPP
@@ -331,6 +340,7 @@ config BR2_TOOLCHAIN_EXTERNAL_CODESOURCERY_MIPS201109
config BR2_TOOLCHAIN_EXTERNAL_CODESOURCERY_POWERPC201103
bool "Sourcery CodeBench PowerPC 2011.03"
depends on BR2_powerpc
+ depends on BR2_HOSTARCH = "x86_64" || BR2_HOSTARCH = "x86"
select BR2_TOOLCHAIN_EXTERNAL_GLIBC
select BR2_TOOLCHAIN_HAS_NATIVE_RPC
select BR2_INSTALL_LIBSTDCPP
@@ -359,6 +369,7 @@ config BR2_TOOLCHAIN_EXTERNAL_CODESOURCERY_POWERPC201103
config BR2_TOOLCHAIN_EXTERNAL_CODESOURCERY_POWERPC201009
bool "Sourcery CodeBench PowerPC 2010.09"
depends on BR2_powerpc
+ depends on BR2_HOSTARCH = "x86_64" || BR2_HOSTARCH = "x86"
select BR2_TOOLCHAIN_EXTERNAL_GLIBC
select BR2_TOOLCHAIN_HAS_NATIVE_RPC
select BR2_INSTALL_LIBSTDCPP
@@ -387,6 +398,7 @@ config BR2_TOOLCHAIN_EXTERNAL_CODESOURCERY_POWERPC201009
config BR2_TOOLCHAIN_EXTERNAL_CODESOURCERY_SH201209
bool "Sourcery CodeBench SH 2012.09"
depends on BR2_sh4a || BR2_sh4aeb
+ depends on BR2_HOSTARCH = "x86_64" || BR2_HOSTARCH = "x86"
select BR2_TOOLCHAIN_EXTERNAL_GLIBC
select BR2_TOOLCHAIN_HAS_NATIVE_RPC
select BR2_INSTALL_LIBSTDCPP
@@ -407,6 +419,7 @@ config BR2_TOOLCHAIN_EXTERNAL_CODESOURCERY_SH201209
config BR2_TOOLCHAIN_EXTERNAL_CODESOURCERY_SH201203
bool "Sourcery CodeBench SH 2012.03"
depends on BR2_sh4a || BR2_sh4aeb
+ depends on BR2_HOSTARCH = "x86_64" || BR2_HOSTARCH = "x86"
select BR2_TOOLCHAIN_EXTERNAL_GLIBC
select BR2_INSTALL_LIBSTDCPP
help
@@ -426,6 +439,7 @@ config BR2_TOOLCHAIN_EXTERNAL_CODESOURCERY_SH201203
config BR2_TOOLCHAIN_EXTERNAL_CODESOURCERY_SH201103
bool "Sourcery CodeBench SH 2011.03"
depends on BR2_sh4a || BR2_sh4aeb
+ depends on BR2_HOSTARCH = "x86_64" || BR2_HOSTARCH = "x86"
select BR2_TOOLCHAIN_EXTERNAL_GLIBC
select BR2_TOOLCHAIN_HAS_NATIVE_RPC
select BR2_INSTALL_LIBSTDCPP
@@ -446,6 +460,7 @@ config BR2_TOOLCHAIN_EXTERNAL_CODESOURCERY_SH201103
config BR2_TOOLCHAIN_EXTERNAL_CODESOURCERY_SH2A_201103
bool "Sourcery CodeBench SH 2011.03"
depends on BR2_sh2a
+ depends on BR2_HOSTARCH = "x86_64" || BR2_HOSTARCH = "x86"
select BR2_TOOLCHAIN_EXTERNAL_UCLIBC
select BR2_LARGEFILE
select BR2_TOOLCHAIN_HAS_NATIVE_RPC
@@ -463,6 +478,7 @@ config BR2_TOOLCHAIN_EXTERNAL_CODESOURCERY_SH2A_201103
config BR2_TOOLCHAIN_EXTERNAL_CODESOURCERY_SH2A_201009
bool "Sourcery CodeBench SH 2010.09"
depends on BR2_sh2a
+ depends on BR2_HOSTARCH = "x86_64" || BR2_HOSTARCH = "x86"
select BR2_TOOLCHAIN_EXTERNAL_UCLIBC
select BR2_LARGEFILE
select BR2_TOOLCHAIN_HAS_NATIVE_RPC
@@ -480,6 +496,7 @@ config BR2_TOOLCHAIN_EXTERNAL_CODESOURCERY_SH2A_201009
config BR2_TOOLCHAIN_EXTERNAL_CODESOURCERY_X86_201209
bool "Sourcery CodeBench x86/x86_64 2012.09"
depends on BR2_i386 || BR2_x86_64
+ depends on BR2_HOSTARCH = "x86_64" || BR2_HOSTARCH = "x86"
select BR2_TOOLCHAIN_EXTERNAL_GLIBC
select BR2_TOOLCHAIN_HAS_NATIVE_RPC
select BR2_INSTALL_LIBSTDCPP
@@ -502,6 +519,7 @@ config BR2_TOOLCHAIN_EXTERNAL_CODESOURCERY_X86_201209
config BR2_TOOLCHAIN_EXTERNAL_CODESOURCERY_X86_201203
bool "Sourcery CodeBench x86/x86_64 2012.03"
depends on BR2_i386 || BR2_x86_64
+ depends on BR2_HOSTARCH = "x86_64" || BR2_HOSTARCH = "x86"
select BR2_TOOLCHAIN_EXTERNAL_GLIBC
select BR2_INSTALL_LIBSTDCPP
help
@@ -523,6 +541,7 @@ config BR2_TOOLCHAIN_EXTERNAL_CODESOURCERY_X86_201203
config BR2_TOOLCHAIN_EXTERNAL_CODESOURCERY_X86_201109
bool "Sourcery CodeBench x86/x86_64 2011.09"
depends on BR2_i386 || BR2_x86_64
+ depends on BR2_HOSTARCH = "x86_64" || BR2_HOSTARCH = "x86"
select BR2_TOOLCHAIN_EXTERNAL_GLIBC
select BR2_TOOLCHAIN_HAS_NATIVE_RPC
select BR2_INSTALL_LIBSTDCPP
@@ -545,6 +564,7 @@ config BR2_TOOLCHAIN_EXTERNAL_CODESOURCERY_X86_201109
config BR2_TOOLCHAIN_EXTERNAL_BLACKFIN_UCLINUX_2012R1
bool "Blackfin.uclinux.org 2012R1-BETA1"
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
@@ -560,6 +580,7 @@ config BR2_TOOLCHAIN_EXTERNAL_BLACKFIN_UCLINUX_2012R1
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
@@ -575,6 +596,7 @@ config BR2_TOOLCHAIN_EXTERNAL_BLACKFIN_UCLINUX_2011R1
config BR2_TOOLCHAIN_EXTERNAL_BLACKFIN_UCLINUX_2010RC1
bool "Blackfin.uclinux.org 2010RC1"
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
@@ -590,6 +612,7 @@ config BR2_TOOLCHAIN_EXTERNAL_BLACKFIN_UCLINUX_2010RC1
config BR2_TOOLCHAIN_EXTERNAL_XILINX_MICROBLAZEEL_V2
bool "Xilinx Little Endian Microblaze GNU Tools"
depends on BR2_microblazeel
+ depends on BR2_HOSTARCH = "x86_64" || BR2_HOSTARCH = "x86"
select BR2_TOOLCHAIN_EXTERNAL_GLIBC
select BR2_TOOLCHAIN_HAS_NATIVE_RPC
help
@@ -599,6 +622,7 @@ config BR2_TOOLCHAIN_EXTERNAL_XILINX_MICROBLAZEEL_V2
config BR2_TOOLCHAIN_EXTERNAL_XILINX_MICROBLAZEBE_V2
bool "Xilinx Big Endian Microblaze GNU Tools"
depends on BR2_microblazebe
+ depends on BR2_HOSTARCH = "x86_64" || BR2_HOSTARCH = "x86"
select BR2_TOOLCHAIN_EXTERNAL_GLIBC
select BR2_TOOLCHAIN_HAS_NATIVE_RPC
help
@@ -608,6 +632,7 @@ config BR2_TOOLCHAIN_EXTERNAL_XILINX_MICROBLAZEBE_V2
config BR2_TOOLCHAIN_EXTERNAL_LINARO_AARCH64_12_12
bool "Linaro AArch64 12.12"
depends on BR2_aarch64
+ depends on BR2_HOSTARCH = "x86_64" || BR2_HOSTARCH = "x86"
select BR2_TOOLCHAIN_EXTERNAL_GLIBC
select BR2_INSTALL_LIBSTDCPP
help
@@ -617,6 +642,7 @@ config BR2_TOOLCHAIN_EXTERNAL_LINARO_AARCH64_12_12
config BR2_TOOLCHAIN_EXTERNAL_LINARO_AARCH64_12_11
bool "Linaro AArch64 12.11"
depends on BR2_aarch64
+ depends on BR2_HOSTARCH = "x86_64" || BR2_HOSTARCH = "x86"
select BR2_TOOLCHAIN_EXTERNAL_GLIBC
select BR2_INSTALL_LIBSTDCPP
help
@@ -626,6 +652,7 @@ config BR2_TOOLCHAIN_EXTERNAL_LINARO_AARCH64_12_11
config BR2_TOOLCHAIN_EXTERNAL_LINARO_AARCH64_12_10
bool "Linaro AArch64 12.10"
depends on BR2_aarch64
+ depends on BR2_HOSTARCH = "x86_64" || BR2_HOSTARCH = "x86"
select BR2_TOOLCHAIN_EXTERNAL_GLIBC
select BR2_INSTALL_LIBSTDCPP
help
--
1.7.9.5
^ permalink raw reply related
* [Buildroot] [PATCH 2/4] Infrastructure to warn the user about missing 32 bits libraries
From: Thomas Petazzoni @ 2012-12-29 16:14 UTC (permalink / raw)
To: buildroot
In-Reply-To: <cover.1356797653.git.thomas.petazzoni@free-electrons.com>
Many users trying to use external toolchains on x86-64 machines get a
very confusing message:
"Can't execute cross-compiler"
They get this message because they forgot to install the 32 bits
compatibility libraries that are needed to run binaries compiled for
x86 on x86-64 machines.
Since this is the case for both external toolchains and certain
binary-only tools like SAM-BA, we add a new Kconfig option
BR2_HOSTARCH_NEEDS_IA32_LIBS, that packages must select if they need
the 32 bits compatibility libraries. When this option is enabled,
dependencies.sh checks that the 32 bits dynamic library loader is
present on the system, and if not, it stops and shows an error.
The path and name of the 32 bits dynamic loader is hardcoded because
it is very unlikely to change, as it would break the ABI for all
binaries.
Also, it is worth noting that the check will be done even if we're
running on a 32 bits machine. This is harmless, as 32 bits machines
necessarily have the 32 bits dynamic loader installed, so the error
will never show up in this case.
Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
---
Config.in | 6 ++++++
support/dependencies/dependencies.sh | 11 +++++++++++
2 files changed, 17 insertions(+)
diff --git a/Config.in b/Config.in
index b319ac7..af77a83 100644
--- a/Config.in
+++ b/Config.in
@@ -14,6 +14,12 @@ config BR2_HOSTARCH
string
option env="HOSTARCH"
+# Hidden boolean selected by pre-built packages for x86, when they
+# need to run on x86-64 machines (example: pre-built external
+# toolchains, binary tools like SAM-BA, etc.).
+config BR2_HOSTARCH_NEEDS_IA32_LIBS
+ bool
+
source "arch/Config.in"
menu "Build options"
diff --git a/support/dependencies/dependencies.sh b/support/dependencies/dependencies.sh
index 7a02512..03e2742 100755
--- a/support/dependencies/dependencies.sh
+++ b/support/dependencies/dependencies.sh
@@ -166,3 +166,14 @@ if grep -q ^BR2_PACKAGE_CLASSPATH=y $CONFIG_FILE ; then
fi
done
fi
+if grep -q ^BR2_HOSTARCH_NEEDS_IA32_LIBS=y $CONFIG_FILE ; then
+ if test ! -f /lib/ld-linux.so.2 ; then
+ /bin/echo -e "\nYour Buildroot configuration uses some pre-built tools for the x86 architecture,"
+ /bin/echo -e "but your build machine uses the x86-64 architecture without the 32 bits compatibility"
+ /bin/echo -e "library."
+ /bin/echo -e "If you're running a Debian/Ubuntu distribution, install the libc:i386 package."
+ /bin/echo -e "For other distributions, refer to the documentation on how to install the 32 bits"
+ /bin/echo -e "compatibility libraries."
+ exit 1
+ fi
+fi
--
1.7.9.5
^ permalink raw reply related
* [Buildroot] [PATCH 3/4] toolchain-external: use BR2_HOSTARCH_NEEDS_IA32_LIBS where needed
From: Thomas Petazzoni @ 2012-12-29 16:14 UTC (permalink / raw)
To: buildroot
In-Reply-To: <cover.1356797653.git.thomas.petazzoni@free-electrons.com>
All supported pre-built external toolchains are built for x86 Linux,
so we add the BR2_HOSTARCH_NEEDS_IA32_LIBS select.
Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
---
toolchain/toolchain-external/Config.in | 27 +++++++++++++++++++++++++++
1 file changed, 27 insertions(+)
diff --git a/toolchain/toolchain-external/Config.in b/toolchain/toolchain-external/Config.in
index c14736d..bdf4334 100644
--- a/toolchain/toolchain-external/Config.in
+++ b/toolchain/toolchain-external/Config.in
@@ -11,6 +11,7 @@ config BR2_TOOLCHAIN_EXTERNAL_LINARO_2012_12
select BR2_TOOLCHAIN_EXTERNAL_GLIBC
select BR2_TOOLCHAIN_HAS_NATIVE_RPC
select BR2_INSTALL_LIBSTDCPP
+ select BR2_HOSTARCH_NEEDS_IA32_LIBS
help
Linaro toolchain for the ARM architecture. It uses Linaro
GCC 2012.12 (based on gcc 4.7), Linaro GDB 2012.12 (based on
@@ -29,6 +30,7 @@ config BR2_TOOLCHAIN_EXTERNAL_LINARO_2012_11
select BR2_TOOLCHAIN_EXTERNAL_GLIBC
select BR2_TOOLCHAIN_HAS_NATIVE_RPC
select BR2_INSTALL_LIBSTDCPP
+ select BR2_HOSTARCH_NEEDS_IA32_LIBS
help
Linaro toolchain for the ARM architecture. It uses Linaro
GCC 2012.11 (based on gcc 4.7), Linaro GDB 2012.10 (based on
@@ -47,6 +49,7 @@ config BR2_TOOLCHAIN_EXTERNAL_LINARO_2012_10
select BR2_TOOLCHAIN_EXTERNAL_GLIBC
select BR2_TOOLCHAIN_HAS_NATIVE_RPC
select BR2_INSTALL_LIBSTDCPP
+ select BR2_HOSTARCH_NEEDS_IA32_LIBS
help
Linaro toolchain for the ARM architecture. It uses Linaro
GCC 2012.10 (based on gcc 4.7), Linaro GDB 2012.10 (based on
@@ -68,6 +71,7 @@ config BR2_TOOLCHAIN_EXTERNAL_CODESOURCERY_ARM201203
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.6.3, binutils 2.21.53, glibc
@@ -91,6 +95,7 @@ config BR2_TOOLCHAIN_EXTERNAL_CODESOURCERY_ARM201109
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.6.1, binutils 2.21.53, glibc
@@ -114,6 +119,7 @@ config BR2_TOOLCHAIN_EXTERNAL_CODESOURCERY_MIPS201209
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 MIPS architecture, from
Mentor Graphics. It uses gcc 4.7.2, binutils 2.23.51, glibc
@@ -183,6 +189,7 @@ config BR2_TOOLCHAIN_EXTERNAL_CODESOURCERY_MIPS201203
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 MIPS architecture, from
Mentor Graphics. It uses gcc 4.6.3, binutils 2.21.53, glibc
@@ -252,6 +259,7 @@ config BR2_TOOLCHAIN_EXTERNAL_CODESOURCERY_ARM201103
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
@@ -275,6 +283,7 @@ config BR2_TOOLCHAIN_EXTERNAL_CODESOURCERY_MIPS201109
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 MIPS architecture, from
Mentor Graphics. It uses gcc 4.5.2, binutils 2.21.53, glibc
@@ -344,6 +353,7 @@ config BR2_TOOLCHAIN_EXTERNAL_CODESOURCERY_POWERPC201103
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 PowerPC architecture,
from Mentor Graphics. It uses gcc 4.5.2, binutils 2.20.51,
@@ -373,6 +383,7 @@ config BR2_TOOLCHAIN_EXTERNAL_CODESOURCERY_POWERPC201009
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 PowerPC architecture,
from Mentor Graphics. It uses gcc 4.5.1, binutils 2.20,
@@ -402,6 +413,7 @@ config BR2_TOOLCHAIN_EXTERNAL_CODESOURCERY_SH201209
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 SuperH architecture,
from Mentor Graphics. It uses gcc 4.7.2, binutils 2.23.51,
@@ -422,6 +434,7 @@ config BR2_TOOLCHAIN_EXTERNAL_CODESOURCERY_SH201203
depends on BR2_HOSTARCH = "x86_64" || BR2_HOSTARCH = "x86"
select BR2_TOOLCHAIN_EXTERNAL_GLIBC
select BR2_INSTALL_LIBSTDCPP
+ select BR2_HOSTARCH_NEEDS_IA32_LIBS
help
Sourcery CodeBench toolchain for the SuperH architecture,
from Mentor Graphics. It uses gcc 4.6.3, binutils 2.21.53,
@@ -443,6 +456,7 @@ config BR2_TOOLCHAIN_EXTERNAL_CODESOURCERY_SH201103
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 SuperH architecture,
from Mentor Graphics. It uses gcc 4.5.2, binutils 2.20,
@@ -468,6 +482,7 @@ config BR2_TOOLCHAIN_EXTERNAL_CODESOURCERY_SH2A_201103
select BR2_TOOLCHAIN_HAS_THREADS
select BR2_TOOLCHAIN_HAS_THREADS_DEBUG
select BR2_INSTALL_LIBSTDCPP
+ select BR2_HOSTARCH_NEEDS_IA32_LIBS
help
Sourcery CodeBench toolchain for the SuperH architecture,
from Mentor Graphics. It uses gcc 4.5.2, binutils 2.20,
@@ -486,6 +501,7 @@ config BR2_TOOLCHAIN_EXTERNAL_CODESOURCERY_SH2A_201009
select BR2_TOOLCHAIN_HAS_THREADS
select BR2_TOOLCHAIN_HAS_THREADS_DEBUG
select BR2_INSTALL_LIBSTDCPP
+ select BR2_HOSTARCH_NEEDS_IA32_LIBS
help
Sourcery CodeBench toolchain for the SuperH architecture,
from Mentor Graphics. It uses gcc 4.5.1, binutils 2.20,
@@ -500,6 +516,7 @@ config BR2_TOOLCHAIN_EXTERNAL_CODESOURCERY_X86_201209
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 x86/x86_64
architectures, from Mentor Graphics. It uses gcc 4.7.2,
@@ -522,6 +539,7 @@ config BR2_TOOLCHAIN_EXTERNAL_CODESOURCERY_X86_201203
depends on BR2_HOSTARCH = "x86_64" || BR2_HOSTARCH = "x86"
select BR2_TOOLCHAIN_EXTERNAL_GLIBC
select BR2_INSTALL_LIBSTDCPP
+ select BR2_HOSTARCH_NEEDS_IA32_LIBS
help
Sourcery CodeBench toolchain for the x86/x86_64
architectures, from Mentor Graphics. It uses gcc 4.6.3,
@@ -545,6 +563,7 @@ config BR2_TOOLCHAIN_EXTERNAL_CODESOURCERY_X86_201109
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 x86/x86_64
architectures, from Mentor Graphics. It uses gcc 4.6.1,
@@ -573,6 +592,7 @@ config BR2_TOOLCHAIN_EXTERNAL_BLACKFIN_UCLINUX_2012R1
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.
@@ -589,6 +609,7 @@ config BR2_TOOLCHAIN_EXTERNAL_BLACKFIN_UCLINUX_2011R1
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.
@@ -605,6 +626,7 @@ config BR2_TOOLCHAIN_EXTERNAL_BLACKFIN_UCLINUX_2010RC1
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.
@@ -615,6 +637,7 @@ config BR2_TOOLCHAIN_EXTERNAL_XILINX_MICROBLAZEEL_V2
depends on BR2_HOSTARCH = "x86_64" || BR2_HOSTARCH = "x86"
select BR2_TOOLCHAIN_EXTERNAL_GLIBC
select BR2_TOOLCHAIN_HAS_NATIVE_RPC
+ select BR2_HOSTARCH_NEEDS_IA32_LIBS
help
Toolchain for the Microblaze architecture, from
http://wiki.xilinx.com/mb-gnu-tools
@@ -625,6 +648,7 @@ config BR2_TOOLCHAIN_EXTERNAL_XILINX_MICROBLAZEBE_V2
depends on BR2_HOSTARCH = "x86_64" || BR2_HOSTARCH = "x86"
select BR2_TOOLCHAIN_EXTERNAL_GLIBC
select BR2_TOOLCHAIN_HAS_NATIVE_RPC
+ select BR2_HOSTARCH_NEEDS_IA32_LIBS
help
Toolchain for the Microblaze architecture, from
http://wiki.xilinx.com/mb-gnu-tools
@@ -635,6 +659,7 @@ config BR2_TOOLCHAIN_EXTERNAL_LINARO_AARCH64_12_12
depends on BR2_HOSTARCH = "x86_64" || BR2_HOSTARCH = "x86"
select BR2_TOOLCHAIN_EXTERNAL_GLIBC
select BR2_INSTALL_LIBSTDCPP
+ select BR2_HOSTARCH_NEEDS_IA32_LIBS
help
Toolchain for the AArch64 architecture, from
http://www.linaro.org/engineering/armv8/
@@ -645,6 +670,7 @@ config BR2_TOOLCHAIN_EXTERNAL_LINARO_AARCH64_12_11
depends on BR2_HOSTARCH = "x86_64" || BR2_HOSTARCH = "x86"
select BR2_TOOLCHAIN_EXTERNAL_GLIBC
select BR2_INSTALL_LIBSTDCPP
+ select BR2_HOSTARCH_NEEDS_IA32_LIBS
help
Toolchain for the AArch64 architecture, from
http://www.linaro.org/engineering/armv8/
@@ -655,6 +681,7 @@ config BR2_TOOLCHAIN_EXTERNAL_LINARO_AARCH64_12_10
depends on BR2_HOSTARCH = "x86_64" || BR2_HOSTARCH = "x86"
select BR2_TOOLCHAIN_EXTERNAL_GLIBC
select BR2_INSTALL_LIBSTDCPP
+ select BR2_HOSTARCH_NEEDS_IA32_LIBS
help
Toolchain for the AArch64 architecture, from
http://www.linaro.org/engineering/armv8/
--
1.7.9.5
^ permalink raw reply related
* [Buildroot] [PATCH 4/4] sam-ba: select BR2_HOSTARCH_NEEDS_IA32_LIBS
From: Thomas Petazzoni @ 2012-12-29 16:14 UTC (permalink / raw)
To: buildroot
In-Reply-To: <cover.1356797653.git.thomas.petazzoni@free-electrons.com>
sam-ba is a pre-built binary tool built for x86 Linux, so on x86-64,
it requires the 32 bits compatibility libraries to be installed.
Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
---
package/sam-ba/Config.in.host | 1 +
1 file changed, 1 insertion(+)
diff --git a/package/sam-ba/Config.in.host b/package/sam-ba/Config.in.host
index 20b2b36..6093865 100644
--- a/package/sam-ba/Config.in.host
+++ b/package/sam-ba/Config.in.host
@@ -1,6 +1,7 @@
config BR2_PACKAGE_HOST_SAM_BA
bool "host sam-ba"
depends on BR2_HOSTARCH = "x86_64" || BR2_HOSTARCH = "x86"
+ select BR2_HOSTARCH_NEEDS_IA32_LIBS
help
Atmel SAM-BA software provides an open set of tools for
programming the Atmel SAM3, SAM7 and SAM9 ARM-based
--
1.7.9.5
^ permalink raw reply related
* [Buildroot] Generating patches against packages source code
From: Thomas Petazzoni @ 2012-12-29 16:15 UTC (permalink / raw)
To: buildroot
In-Reply-To: <50DF04B3.30801@petroprogram.com>
Dear Stefan Fr?berg,
On Sat, 29 Dec 2012 16:56:51 +0200, Stefan Fr?berg wrote:
> That's what I meant. Those *inside* Signed-off tags.
> How should I add those inside Signed-off tags to individual patches
> (either my own make or 3rd party)
> applied to mesa3d ?
>
> Does git diff command do that ? It does not have -s switch like commit does.
Ah, ok, I know understand your problem better. You're wondering how to
nicely generate patches against the package you're working on.
However, one thing you don't seem to realize is that the Signed-off-by
line is just pure text. There's nothing special about this line, so if
you have a patch sitting here in your directory, just open your
favorite text editor, and add the Signed-off-by line, that's it. You
don't need the '-s' option of Git to add the Signed-off-by line.
So basically, you have three choices (ordered below from the poorest to
the nicest, in my opinion).
1. Use the raw diff tool
We will use the raw diff tool only. So first, extract one copy of
mesa3d source code (outside of Buildroot), and rename the directory:
tar xf mesa3d-8.0.5.tar.bz2
mv mesa3d-8.0.5 mesa3d-8.0.5.orig
Extract another copy:
tar xf mesa3d-8.0.5.tar.bz2
Then, do your modifications in the mesa3d-8.0.5/ directory. The
mesa3d-8.0.5.orig/ must be kept unchanged. Once you're done doing your
modifications, do:
diff -ruN mesa3d-8.0.5.orig/ mesa3d-8.0.5/ > mesa3d-01-something.patch
And then, edit mesa3d-01-something.patch with your text editor to add
the patch description and the Signed-off-by line.
This method is really poor mainly because it is hard to handle multiple
patches with it. I do not recommend it.
2. Use quilt
quilt is a tool that allows to generate a stack of patches. I typically
use quilt as follows in the context of Buildroot. I start building a
package, and realize it doesn't work. So the package source code has
already been extracted in output/build/mesa3d-8.0.5/.
What I do is:
cd output/build/mesa3d-8.0.5/
mkdir patches
quilt new mesa3d-01-something.patch
quilt edit configure.ac
# Do my changes in configure.ac
Then, I can test to build the package against (of course, don't do a
make clean, or remove the package directory, or you would loose your
patches). You can continue editing more files using "quilt edit
<filename>".
You can also add more patches:
quilt new mesa3d-02-something-else.patch
quilt edit ...
At any point, to refresh (i.e generate) the current patch in the
patches/ directory, run "quilt refresh". You can move forward and
backward through your patches using quilt pop and quilt push.
When you're on a particular patch, you can edit its description using
'quilt header -e'. There, write your patch description and
Signed-off-by line.
Once you're happy with your patches, make sure to refresh them all, and
then do:
cp patches/*.patch ${your_buildroot_src}/package/mesa3d/
And that's its.
That's typically the method I use when I have only a few minor
modification to make to a package. It is practical because it can be
done directly within the build directory of a package.
3. Use Git
To use Git, the easiest way is to fetch the original source code of the
package by cloning the official repository of the project, and do the
modification here. So, something like:
git clone git://somewhere.org/mesa3d.git
cd mesa3d/
# identify the tag that corresponds to the official release
# you're working on, i.e 8.0.5. I'll assume it's called v8.0.5
git branch buildroot-work v8.0.5
git checkout buildroot-work
# Do your work as usual with Git.
# Then, to generate your patches:
git format-patch master
# All patches are named 000x-<something>.patch, so you'll have
# to rename them. Typically, I do:
for i in *.patch; do cp $i ${buildroot_src_dir}/package/mesa3d/mesa3d-$i ; done
Hope this helps,
Thomas
--
Thomas Petazzoni, Free Electrons
Kernel, drivers, real-time and embedded Linux
development, consulting, training and support.
http://free-electrons.com
^ permalink raw reply
* [Buildroot] [PATCH 1/2] taglib: bump to version 1.8
From: Gustavo Zacarias @ 2012-12-29 16:29 UTC (permalink / raw)
To: buildroot
Signed-off-by: Gustavo Zacarias <gustavo@zacarias.com.ar>
---
package/taglib/Config.in | 2 +-
package/taglib/taglib.mk | 7 ++++---
2 files changed, 5 insertions(+), 4 deletions(-)
diff --git a/package/taglib/Config.in b/package/taglib/Config.in
index d172c34..2777d0d 100644
--- a/package/taglib/Config.in
+++ b/package/taglib/Config.in
@@ -8,7 +8,7 @@ config BR2_PACKAGE_TAGLIB
and ID3v2 for MP3 files, Ogg Vorbis comments and ID3 tags and
Vorbis comments in FLAC, MPC, Speex, WavPack and TrueAudio files.
- http://developer.kde.org/~wheeler/taglib.html
+ http://taglib.github.com
config BR2_PACKAGE_TAGLIB_MP4
depends on BR2_PACKAGE_TAGLIB
diff --git a/package/taglib/taglib.mk b/package/taglib/taglib.mk
index 268318e..e1e1694 100644
--- a/package/taglib/taglib.mk
+++ b/package/taglib/taglib.mk
@@ -4,10 +4,11 @@
#
#############################################################
-TAGLIB_VERSION = 1.7.1
-TAGLIB_SOURCE = taglib-$(TAGLIB_VERSION).tar.gz
-TAGLIB_SITE = http://developer.kde.org/~wheeler/files/src
+TAGLIB_VERSION = 1.8
+TAGLIB_SITE = http://github.com/downloads/taglib/taglib
TAGLIB_INSTALL_STAGING = YES
+TAGLIB_LICENSE = LGPLv2.1 MPL
+TAGLIB_LICENSE_FILES = COPYING.LGPL COPYING.MPL
ifeq ($(BR2_PACKAGE_TAGLIB_ASF),y)
TAGLIB_CONF_OPT += -DWITH_ASF=ON
--
1.7.8.6
^ permalink raw reply related
* [Buildroot] [PATCH 2/2] ruby: bump to version 1.9.3-p362
From: Gustavo Zacarias @ 2012-12-29 16:29 UTC (permalink / raw)
To: buildroot
In-Reply-To: <1356798545-9246-1-git-send-email-gustavo@zacarias.com.ar>
Signed-off-by: Gustavo Zacarias <gustavo@zacarias.com.ar>
---
package/ruby/ruby-configure.patch | 30 ------------------------------
package/ruby/ruby.mk | 10 +++++-----
2 files changed, 5 insertions(+), 35 deletions(-)
delete mode 100644 package/ruby/ruby-configure.patch
diff --git a/package/ruby/ruby-configure.patch b/package/ruby/ruby-configure.patch
deleted file mode 100644
index 0077a67..0000000
--- a/package/ruby/ruby-configure.patch
+++ /dev/null
@@ -1,30 +0,0 @@
-diff -Nura ruby-1.9.2-p0.orig/configure.in ruby-1.9.2-p0/configure.in
---- ruby-1.9.2-p0.orig/configure.in 2010-08-14 05:11:59.000000000 -0300
-+++ ruby-1.9.2-p0/configure.in 2010-11-04 15:46:22.478191926 -0300
-@@ -1410,7 +1410,25 @@
- fi
-
- AC_FUNC_GETPGRP
--AC_FUNC_SETPGRP
-+
-+dnl AC_FUNC_SETPGRP does not work if cross compiling
-+dnl Instead, assume we will have a prototype for setpgrp if cross compiling.
-+if test "$cross_compiling" = no; then
-+ AC_FUNC_SETPGRP
-+else
-+ AC_CACHE_CHECK([whether setpgrp takes no argument], ac_cv_func_setpgrp_void,
-+ [AC_TRY_COMPILE([
-+#include <unistd.h>
-+], [
-+ if (setpgrp(1,1) == -1)
-+ exit (0);
-+ else
-+ exit (1);
-+], ac_cv_func_setpgrp_void=no, ac_cv_func_setpgrp_void=yes)])
-+if test $ac_cv_func_setpgrp_void = yes; then
-+ AC_DEFINE(SETPGRP_VOID, 1)
-+fi
-+fi
-
- AC_C_BIGENDIAN
- AC_C_CONST
diff --git a/package/ruby/ruby.mk b/package/ruby/ruby.mk
index a5b8cde..ee1f9ed 100644
--- a/package/ruby/ruby.mk
+++ b/package/ruby/ruby.mk
@@ -4,15 +4,15 @@
#
#############################################################
-RUBY_VERSION = 1.9.2-p320
+RUBY_VERSION = 1.9.3-p362
RUBY_SITE = ftp://ftp.ruby-lang.org/pub/ruby/1.9
-RUBY_AUTORECONF = YES
-HOST_RUBY_AUTORECONF = YES
-RUBY_DEPENDENCIES = host-ruby
-HOST_RUBY_DEPENDENCIES =
+RUBY_DEPENDENCIES = host-pkgconf host-ruby
+HOST_RUBY_DEPENDENCIES = host-pkgconf
RUBY_MAKE_ENV = $(TARGET_MAKE_ENV)
RUBY_CONF_OPT = --disable-install-doc --disable-rpath
HOST_RUBY_CONF_OPT = --disable-install-doc --with-out-ext=curses,readline
+RUBY_LICENSE = Ruby
+RUBY_LICENSE_FILES = LEGAL
# Force optionals to build before we do
ifeq ($(BR2_PACKAGE_BERKELEYDB),y)
--
1.7.8.6
^ permalink raw reply related
* [Buildroot] Generating patches against packages source code
From: Stefan Fröberg @ 2012-12-29 16:54 UTC (permalink / raw)
To: buildroot
In-Reply-To: <20121229171540.5bb22f40@skate>
Hi Thomas
29.12.2012 18:15, Thomas Petazzoni kirjoitti:
> Dear Stefan Fr?berg,
>
> On Sat, 29 Dec 2012 16:56:51 +0200, Stefan Fr?berg wrote:
>
>> That's what I meant. Those *inside* Signed-off tags.
>> How should I add those inside Signed-off tags to individual patches
>> (either my own make or 3rd party)
>> applied to mesa3d ?
>>
>> Does git diff command do that ? It does not have -s switch like commit does.
> Ah, ok, I know understand your problem better. You're wondering how to
> nicely generate patches against the package you're working on.
>
> However, one thing you don't seem to realize is that the Signed-off-by
> line is just pure text. There's nothing special about this line, so if
> you have a patch sitting here in your directory, just open your
> favorite text editor, and add the Signed-off-by line, that's it. You
> don't need the '-s' option of Git to add the Signed-off-by line.
Ah, I was hoping (because Im lazy ;-) ) that I don't need to add
manually all those
Signed-off lines.
> So basically, you have three choices (ordered below from the poorest to
> the nicest, in my opinion).
>
> 1. Use the raw diff tool
>
> We will use the raw diff tool only. So first, extract one copy of
> mesa3d source code (outside of Buildroot), and rename the directory:
>
> tar xf mesa3d-8.0.5.tar.bz2
> mv mesa3d-8.0.5 mesa3d-8.0.5.orig
>
> Extract another copy:
>
> tar xf mesa3d-8.0.5.tar.bz2
>
> Then, do your modifications in the mesa3d-8.0.5/ directory. The
> mesa3d-8.0.5.orig/ must be kept unchanged. Once you're done doing your
> modifications, do:
>
> diff -ruN mesa3d-8.0.5.orig/ mesa3d-8.0.5/ > mesa3d-01-something.patch
>
> And then, edit mesa3d-01-something.patch with your text editor to add
> the patch description and the Signed-off-by line.
>
> This method is really poor mainly because it is hard to handle multiple
> patches with it. I do not recommend it.
>
> 2. Use quilt
>
> quilt is a tool that allows to generate a stack of patches. I typically
> use quilt as follows in the context of Buildroot. I start building a
> package, and realize it doesn't work. So the package source code has
> already been extracted in output/build/mesa3d-8.0.5/.
>
> What I do is:
>
> cd output/build/mesa3d-8.0.5/
> mkdir patches
> quilt new mesa3d-01-something.patch
> quilt edit configure.ac
> # Do my changes in configure.ac
>
> Then, I can test to build the package against (of course, don't do a
> make clean, or remove the package directory, or you would loose your
> patches). You can continue editing more files using "quilt edit
> <filename>".
>
> You can also add more patches:
>
> quilt new mesa3d-02-something-else.patch
> quilt edit ...
>
> At any point, to refresh (i.e generate) the current patch in the
> patches/ directory, run "quilt refresh". You can move forward and
> backward through your patches using quilt pop and quilt push.
>
> When you're on a particular patch, you can edit its description using
> 'quilt header -e'. There, write your patch description and
> Signed-off-by line.
>
> Once you're happy with your patches, make sure to refresh them all, and
> then do:
>
> cp patches/*.patch ${your_buildroot_src}/package/mesa3d/
>
> And that's its.
>
> That's typically the method I use when I have only a few minor
> modification to make to a package. It is practical because it can be
> done directly within the build directory of a package.
>
> 3. Use Git
>
> To use Git, the easiest way is to fetch the original source code of the
> package by cloning the official repository of the project, and do the
> modification here. So, something like:
>
> git clone git://somewhere.org/mesa3d.git
> cd mesa3d/
> # identify the tag that corresponds to the official release
> # you're working on, i.e 8.0.5. I'll assume it's called v8.0.5
> git branch buildroot-work v8.0.5
> git checkout buildroot-work
>
> # Do your work as usual with Git.
>
> # Then, to generate your patches:
> git format-patch master
>
> # All patches are named 000x-<something>.patch, so you'll have
> # to rename them. Typically, I do:
> for i in *.patch; do cp $i ${buildroot_src_dir}/package/mesa3d/mesa3d-$i ; done
>
> Hope this helps,
>
> Thomas
This was really helpfull!
I was always wondering how other people add all those several inside
Signed-off lines when submitting one big patch to this list.
Thanks a million!
Stefan
^ permalink raw reply
* [Buildroot] Generating patches against packages source code
From: Richard Braun @ 2012-12-29 17:09 UTC (permalink / raw)
To: buildroot
In-Reply-To: <50DF2029.1040605@petroprogram.com>
On Sat, Dec 29, 2012 at 06:54:01PM +0200, Stefan Fr?berg wrote:
> Ah, I was hoping (because Im lazy ;-) ) that I don't need to add
> manually all those
> Signed-off lines.
You don't.
> I was always wondering how other people add all those several inside
> Signed-off lines when submitting one big patch to this list.
See git help format-patch. This command has an option -s (--signoff) to
automatically produce the signed-off lines.
--
Richard Braun
^ permalink raw reply
* [Buildroot] Generating patches against packages source code
From: Thomas Petazzoni @ 2012-12-29 17:13 UTC (permalink / raw)
To: buildroot
In-Reply-To: <20121229170948.GA15925@mail.sceen.net>
Dear Richard Braun,
On Sat, 29 Dec 2012 18:09:48 +0100, Richard Braun wrote:
> On Sat, Dec 29, 2012 at 06:54:01PM +0200, Stefan Fr?berg wrote:
> > Ah, I was hoping (because Im lazy ;-) ) that I don't need to add
> > manually all those
> > Signed-off lines.
>
> You don't.
>
> > I was always wondering how other people add all those several inside
> > Signed-off lines when submitting one big patch to this list.
>
> See git help format-patch. This command has an option -s (--signoff)
> to automatically produce the signed-off lines.
Please read the discussion before saying things that are out of topic.
Stefan is *NOT* talking about adding Signed-off-by lines to Buildroot
patches, but Signed-off-by lines to patches against packages in
Buildroot, i.e the patches that go in
package/<pkg>/<pkg>-something.patch.
And those patches are not necessarily generated with Git. They can be
manually generated with diff, generated with quilt, etc.
So, no, the story is not as simple as adding the -s option to git
commit or git format-patch, because Stefan is maybe not using git to
generate patches for the packages.
Thomas
--
Thomas Petazzoni, Free Electrons
Kernel, drivers, real-time and embedded Linux
development, consulting, training and support.
http://free-electrons.com
^ permalink raw reply
* [Buildroot] Generating patches against packages source code
From: Richard Braun @ 2012-12-29 17:33 UTC (permalink / raw)
To: buildroot
In-Reply-To: <20121229181301.37d3d131@skate>
On Sat, Dec 29, 2012 at 06:13:01PM +0100, Thomas Petazzoni wrote:
> Please read the discussion before saying things that are out of topic.
>
> Stefan is *NOT* talking about adding Signed-off-by lines to Buildroot
> patches, but Signed-off-by lines to patches against packages in
> Buildroot, i.e the patches that go in
> package/<pkg>/<pkg>-something.patch.
>
> And those patches are not necessarily generated with Git. They can be
> manually generated with diff, generated with quilt, etc.
>
> So, no, the story is not as simple as adding the -s option to git
> commit or git format-patch, because Stefan is maybe not using git to
> generate patches for the packages.
Well I understand that, which is why I've replied only after your answer
which mentions git to create the package patches. I didn't think it
would be out of topic then.
--
Richard Braun
^ permalink raw reply
* [Buildroot] Generating patches against packages source code
From: Yann E. MORIN @ 2012-12-29 18:03 UTC (permalink / raw)
To: buildroot
In-Reply-To: <20121229171540.5bb22f40@skate>
Stefan, Thomas, All,
On Saturday 29 December 2012 Thomas Petazzoni wrote:
> On Sat, 29 Dec 2012 16:56:51 +0200, Stefan Fr?berg wrote:
> > That's what I meant. Those *inside* Signed-off tags.
> > How should I add those inside Signed-off tags to individual patches
> > (either my own make or 3rd party)
> > applied to mesa3d ?
[--SNIP--]
> So basically, you have three choices (ordered below from the poorest to
> the nicest, in my opinion).
>
> 1. Use the raw diff tool
[--SNIP--]
> And then, edit mesa3d-01-something.patch with your text editor to add
> the patch description and the Signed-off-by line.
I am using vim as editor, and I use the snippet 'plugin'. To add any
SoB-like line, I just have to type:
sob<TAB>me<TAB>
and I get:
Signed-off-by: "Yann E. MORIN" <yann.morin.1998@free.fr>
Similarly, I have snippets configured for:
Reported-by:
Reviewed-by:
Acked-by:
Tested-by:
CC: (although that one is a bit overkill ;-) )
Snippets available, anyone wants them.
> 2. Use quilt
I've found using quilt to be troublesome. For example, you absolutely have
to tell quilt what files you are *going* to edit, otherwise, quilt will
miss your changes. And this situation happens more often than not; in my
experience, it happened quite often that I edited a file because I _knew_
where the failure was, to later find I forgot to tell quilt about that
file, and was missing that change in the patch series.
So, I would recommend against using quilt; rather use the package's
upstream repository, or at worse, create a temporary git tree just in
the package's extracted directory: it's much more convenient and
powerfull than using quilt.
Regards,
Yann E. MORIN.
--
.-----------------.--------------------.------------------.--------------------.
| Yann E. MORIN | Real-Time Embedded | /"\ ASCII RIBBON | Erics' conspiracy: |
| +33 662 376 056 | Software Designer | \ / CAMPAIGN | ___ |
| +33 223 225 172 `------------.-------: X AGAINST | \e/ There is no |
| http://ymorin.is-a-geek.org/ | _/*\_ | / \ HTML MAIL | v conspiracy. |
'------------------------------^-------^------------------^--------------------'
^ permalink raw reply
* [Buildroot] [PATCH v2] mesa3d: bumped to 8.0.5
From: Stefan Fröberg @ 2012-12-29 18:22 UTC (permalink / raw)
To: buildroot
Merged and fixed version of mesa3d 8.0.5 patch, as suggested by
Thomas Petazzoni.
Changes from previous patch set:
- Merged all individual patches to one big patch.
- Added MESA3D_LICENSE and MESA3D_LICENSE_FILES.
- Removed mesa3d-0002-crosscompile.patch and mesa3d-0003-fix-for-x32.patch
(caused conflicts with default builroot building and compiled fine without them)
- Added description to mesa3d-execinfo.patch
^ permalink raw reply
* [Buildroot] [PATCH v2] mesa3d: bumped to 8.0.5
From: Stefan Fröberg @ 2012-12-29 18:22 UTC (permalink / raw)
To: buildroot
In-Reply-To: <1356805344-1060-1-git-send-email-stefan.froberg@petroprogram.com>
Signed-off-by: Stefan Fr?berg <stefan.froberg@petroprogram.com>
---
...patch => mesa3d-0001-Compile-with-uclibc.patch} | 27 ++++++++--------
package/x11r7/mesa3d/mesa3d-execinfo.patch | 26 +++++++++++++++
package/x11r7/mesa3d/mesa3d.mk | 33 ++++++++++++++++---
3 files changed, 66 insertions(+), 20 deletions(-)
rename package/x11r7/mesa3d/{mesa3d-uclibc-locale.patch => mesa3d-0001-Compile-with-uclibc.patch} (59%)
create mode 100644 package/x11r7/mesa3d/mesa3d-execinfo.patch
diff --git a/package/x11r7/mesa3d/mesa3d-uclibc-locale.patch b/package/x11r7/mesa3d/mesa3d-0001-Compile-with-uclibc.patch
similarity index 59%
rename from package/x11r7/mesa3d/mesa3d-uclibc-locale.patch
rename to package/x11r7/mesa3d/mesa3d-0001-Compile-with-uclibc.patch
index 99afe8d..1d474ca 100644
--- a/package/x11r7/mesa3d/mesa3d-uclibc-locale.patch
+++ b/package/x11r7/mesa3d/mesa3d-0001-Compile-with-uclibc.patch
@@ -1,10 +1,9 @@
-[PATCH] Fix compilation on uClibc without locale support
+Compile with uclibc
-Based on similar patch from OE:
+Signed-off-by: Stefan Fr?berg <stefan.froberg@petroprogram.com>
-http://git.openembedded.org/openembedded-core/commit/meta/recipes-graphics/mesa/mesa/0001-Compile-with-uclibc.patch?id=e4039eb74b20e96d4b8837cd58cf2d13d091e1ad
-
-Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
+Upstream-Status: Pending
+URL: http://git.openembedded.org/openembedded-core/plain/meta/recipes-graphics/mesa/mesa/0001-Compile-with-uclibc.patch
---
configure.ac | 3 +++
src/glsl/strtod.c | 2 +-
@@ -15,7 +14,7 @@ diff --git a/configure.ac b/configure.ac
index fbaa376..454dad2 100644
--- a/configure.ac
+++ b/configure.ac
-@@ -450,6 +450,9 @@ AC_SUBST([DLOPEN_LIBS])
+@@ -543,6 +543,9 @@ AC_SUBST([DLOPEN_LIBS])
dnl See if posix_memalign is available
AC_CHECK_FUNC([posix_memalign], [DEFINES="$DEFINES -DHAVE_POSIX_MEMALIGN"])
@@ -29,12 +28,12 @@ diff --git a/src/glsl/strtod.c b/src/glsl/strtod.c
index a876e13..9fce7e9 100644
--- a/src/glsl/strtod.c
+++ b/src/glsl/strtod.c
-@@ -44,7 +44,7 @@ double
- double
+@@ -45,7 +45,7 @@ double
glsl_strtod(const char *s, char **end)
{
--#if defined(_GNU_SOURCE) && !defined(__CYGWIN__) && !defined(__FreeBSD__)
-+#if defined(_GNU_SOURCE) && !defined(__CYGWIN__) && !defined(__FreeBSD__) && defined(HAVE_NEWLOCALE)
+ #if defined(_GNU_SOURCE) && !defined(__CYGWIN__) && !defined(__FreeBSD__) && \
+- !defined(__HAIKU__)
++ !defined(__HAIKU__) && defined (HAVE_NEWLOCALE)
static locale_t loc = NULL;
if (!loc) {
loc = newlocale(LC_CTYPE_MASK, "C", NULL);
@@ -42,12 +41,12 @@ diff --git a/src/mesa/main/imports.c b/src/mesa/main/imports.c
index d3727ef..363bf32 100644
--- a/src/mesa/main/imports.c
+++ b/src/mesa/main/imports.c
-@@ -757,7 +757,7 @@ float
- float
+@@ -767,7 +767,7 @@ float
_mesa_strtof( const char *s, char **end )
{
--#if defined(_GNU_SOURCE) && !defined(__CYGWIN__) && !defined(__FreeBSD__)
-+#if defined(_GNU_SOURCE) && !defined(__CYGWIN__) && !defined(__FreeBSD__) && defined(HAVE_NEWLOCALE)
+ #if defined(_GNU_SOURCE) && !defined(__CYGWIN__) && !defined(__FreeBSD__) && \
+- !defined(ANDROID) && !defined(__HAIKU__)
++ !defined(ANDROID) && !defined(__HAIKU__) && defined (HAVE_NEWLOCALE)
static locale_t loc = NULL;
if (!loc) {
loc = newlocale(LC_CTYPE_MASK, "C", NULL);
diff --git a/package/x11r7/mesa3d/mesa3d-execinfo.patch b/package/x11r7/mesa3d/mesa3d-execinfo.patch
new file mode 100644
index 0000000..9a5bfe9
--- /dev/null
+++ b/package/x11r7/mesa3d/mesa3d-execinfo.patch
@@ -0,0 +1,26 @@
+uClibc does not have execinfo.h
+So we skip it's use here.
+
+Signed-off-by: Stefan Fr?berg <stefan.froberg@petroprogram.com>
+
+diff -Naur mesa3d-8.0.5.org/src/gallium/auxiliary/util/u_debug_symbol.c mesa3d-8.0.5/src/gallium/auxiliary/util/u_debug_symbol.c
+--- mesa3d-8.0.5.org/src/gallium/auxiliary/util/u_debug_symbol.c 2012-12-29 00:23:42.597893058 +0200
++++ mesa3d-8.0.5/src/gallium/auxiliary/util/u_debug_symbol.c 2012-12-29 00:26:08.639454184 +0200
+@@ -151,7 +151,7 @@
+ }
+ #endif
+
+-#ifdef __GLIBC__
++#if defined(__GLIBC__) && !defined(__UCLIBC__)
+ #include <execinfo.h>
+
+ /* This can only provide dynamic symbols, or binary offsets into a file.
+@@ -177,7 +177,7 @@
+ return;
+ #endif
+
+-#ifdef __GLIBC__
++#if defined(__GLIBC__) && !defined(__UCLIBC__)
+ debug_symbol_name_glibc(addr, buf, size);
+ if(buf[0])
+ return;
diff --git a/package/x11r7/mesa3d/mesa3d.mk b/package/x11r7/mesa3d/mesa3d.mk
index b16d5e6..0285a43 100644
--- a/package/x11r7/mesa3d/mesa3d.mk
+++ b/package/x11r7/mesa3d/mesa3d.mk
@@ -4,21 +4,26 @@
#
#############################################################
-MESA3D_VERSION = 7.10.1
-MESA3D_SOURCE = MesaLib-$(MESA3D_VERSION).tar.gz
+MESA3D_VERSION = 8.0.5
+MESA3D_SOURCE = MesaLib-$(MESA3D_VERSION).tar.bz2
MESA3D_SITE = ftp://ftp.freedesktop.org/pub/mesa/$(MESA3D_VERSION)
MESA3D_AUTORECONF = YES
MESA3D_INSTALL_STAGING = YES
+MESA3D_LICENSE = MIT (most of the code) and SGI-B-2.0 (rest of the GLES/GL code)
+MESA3D_LICENSE_FILES = doc/license.html include/GL/glu.h
+
MESA3D_CONF_OPT = \
--disable-egl \
--disable-glu \
- --disable-glw \
- --disable-glut \
- --disable-gallium \
+ --disable-selinux \
+ --disable-gallium-llvm \
+ --disable-gallium-egl \
+ --disable-gallium-gbm \
--with-driver=dri \
--with-dri-drivers=swrast \
- --disable-static
+ --disable-static \
+ --with-gallium-drivers=swrast
MESA3D_DEPENDENCIES = \
xproto_glproto \
@@ -32,4 +37,20 @@ MESA3D_DEPENDENCIES = \
host-libxml2 \
host-python
+# Build host "builtin_compiler" that is needed by
+# build process, install it and then do cleanup before
+# starting the actual building.
+# Additionally, we will make certain that the
+# $(HOST_DIR)/usr/bin/builtin_compiler will be used
+# in actual building process.
+
+define MESA3D_POST_CONFIGURE_CMDS
+ $(MAKE) $(HOST_CONFIGURE_OPTS) -C $(@D)/src/glsl builtin_compiler
+ $(INSTALL) $(@D)/src/glsl/builtin_compiler -m 755 $(HOST_DIR)/usr/bin
+ $(MAKE) -C $(@D) clean
+ sed -e "s#\.\/builtin_compiler#$(HOST_DIR)/usr/bin/builtin_compiler#g" -i $(@D)/src/glsl/Makefile
+endef
+
+MESA3D_POST_CONFIGURE_HOOKS += MESA3D_POST_CONFIGURE_CMDS
+
$(eval $(autotools-package))
--
1.7.7.6
^ permalink raw reply related
* [Buildroot] Generating patches against packages source code
From: Thomas Petazzoni @ 2012-12-29 18:39 UTC (permalink / raw)
To: buildroot
In-Reply-To: <201212291903.06705.yann.morin.1998@free.fr>
Dear Yann E. MORIN,
On Sat, 29 Dec 2012 19:03:06 +0100, Yann E. MORIN wrote:
> I've found using quilt to be troublesome. For example, you absolutely
> have to tell quilt what files you are *going* to edit, otherwise,
> quilt will miss your changes. And this situation happens more often
> than not; in my experience, it happened quite often that I edited a
> file because I _knew_ where the failure was, to later find I forgot
> to tell quilt about that file, and was missing that change in the
> patch series.
>
> So, I would recommend against using quilt; rather use the package's
> upstream repository, or at worse, create a temporary git tree just in
> the package's extracted directory: it's much more convenient and
> powerfull than using quilt.
<troll severity="strong">
That's because you're using a prehistoric, basic, limited and
feature-less text editor named vim.
Under the modern, wonderful, feature-rich text editor named Emacs,
there is something called "quilt-mode". Once you're in quilt mode,
Emacs turns all buffers of a quilt-managed project read-only, unless
that particular buffer edits a file that has been quilt-added into the
current patch.
Therefore, with quilt-mode in place, there is zero chance to
incorrectly edit a file you forgot to quilt add.
That said, even though I'm an heavy Emacs user, I'm not using
quilt-mode at the moment. I have been hit often enough with this quilt
"issue" that I no longer forget to do the quilt add. Or in fact, I
always use "quilt edit", which makes sure the file is "quilt added"
before starting up my favorite text editor.
</troll>
:-)
Thomas
--
Thomas Petazzoni, Free Electrons
Kernel, drivers, real-time and embedded Linux
development, consulting, training and support.
http://free-electrons.com
^ permalink raw reply
* [Buildroot] Generating patches against packages source code
From: Stefan Fröberg @ 2012-12-29 19:04 UTC (permalink / raw)
To: buildroot
In-Reply-To: <20121229193947.2e157779@skate>
29.12.2012 20:39, Thomas Petazzoni kirjoitti:
> Dear Yann E. MORIN,
>
> On Sat, 29 Dec 2012 19:03:06 +0100, Yann E. MORIN wrote:
>
>> I've found using quilt to be troublesome. For example, you absolutely
>> have to tell quilt what files you are *going* to edit, otherwise,
>> quilt will miss your changes. And this situation happens more often
>> than not; in my experience, it happened quite often that I edited a
>> file because I _knew_ where the failure was, to later find I forgot
>> to tell quilt about that file, and was missing that change in the
>> patch series.
>>
>> So, I would recommend against using quilt; rather use the package's
>> upstream repository, or at worse, create a temporary git tree just in
>> the package's extracted directory: it's much more convenient and
>> powerfull than using quilt.
> <troll severity="strong">
>
> That's because you're using a prehistoric, basic, limited and
> feature-less text editor named vim.
>
> Under the modern, wonderful, feature-rich text editor named Emacs,
> there is something called "quilt-mode". Once you're in quilt mode,
> Emacs turns all buffers of a quilt-managed project read-only, unless
> that particular buffer edits a file that has been quilt-added into the
> current patch.
>
> Therefore, with quilt-mode in place, there is zero chance to
> incorrectly edit a file you forgot to quilt add.
>
> That said, even though I'm an heavy Emacs user, I'm not using
> quilt-mode at the moment. I have been hit often enough with this quilt
> "issue" that I no longer forget to do the quilt add. Or in fact, I
> always use "quilt edit", which makes sure the file is "quilt added"
> before starting up my favorite text editor.
>
> </troll>
>
> :-)
>
> Thomas
Hope this is not escalating into Vim vs. Emacs flamewar :-)
We "real" programmers just use nano as editor and raw diff as our patch
generating tool.
;-)
From Dilbert comic strip/:
//*Old Guy*:/ When I started out we didn't have those sissy windows and
icons. All we had were zeros and ones./*
Wally:*/ We didn't have ones. I once wrote an entire program with just
zeros./*
Dilbert:*/ You had zeros? We had to use the letter "o".
Stefan
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.busybox.net/pipermail/buildroot/attachments/20121229/82c88164/attachment.html>
^ permalink raw reply
* [Buildroot] [git commit] taglib: bump to version 1.8
From: Peter Korsgaard @ 2012-12-29 19:39 UTC (permalink / raw)
To: buildroot
commit: http://git.buildroot.net/buildroot/commit/?id=3874b04f73ae81ab20fabb648ea78bddc4219ef6
branch: http://git.buildroot.net/buildroot/commit/?id=refs/heads/master
Signed-off-by: Gustavo Zacarias <gustavo@zacarias.com.ar>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
package/taglib/Config.in | 2 +-
package/taglib/taglib.mk | 7 ++++---
2 files changed, 5 insertions(+), 4 deletions(-)
diff --git a/package/taglib/Config.in b/package/taglib/Config.in
index d172c34..2777d0d 100644
--- a/package/taglib/Config.in
+++ b/package/taglib/Config.in
@@ -8,7 +8,7 @@ config BR2_PACKAGE_TAGLIB
and ID3v2 for MP3 files, Ogg Vorbis comments and ID3 tags and
Vorbis comments in FLAC, MPC, Speex, WavPack and TrueAudio files.
- http://developer.kde.org/~wheeler/taglib.html
+ http://taglib.github.com
config BR2_PACKAGE_TAGLIB_MP4
depends on BR2_PACKAGE_TAGLIB
diff --git a/package/taglib/taglib.mk b/package/taglib/taglib.mk
index 268318e..e1e1694 100644
--- a/package/taglib/taglib.mk
+++ b/package/taglib/taglib.mk
@@ -4,10 +4,11 @@
#
#############################################################
-TAGLIB_VERSION = 1.7.1
-TAGLIB_SOURCE = taglib-$(TAGLIB_VERSION).tar.gz
-TAGLIB_SITE = http://developer.kde.org/~wheeler/files/src
+TAGLIB_VERSION = 1.8
+TAGLIB_SITE = http://github.com/downloads/taglib/taglib
TAGLIB_INSTALL_STAGING = YES
+TAGLIB_LICENSE = LGPLv2.1 MPL
+TAGLIB_LICENSE_FILES = COPYING.LGPL COPYING.MPL
ifeq ($(BR2_PACKAGE_TAGLIB_ASF),y)
TAGLIB_CONF_OPT += -DWITH_ASF=ON
^ permalink raw reply related
* [Buildroot] [git commit] ruby: bump to version 1.9.3-p362
From: Peter Korsgaard @ 2012-12-29 19:39 UTC (permalink / raw)
To: buildroot
commit: http://git.buildroot.net/buildroot/commit/?id=6a497e3d8c07d816ec5b8d612d4f7563dff9e756
branch: http://git.buildroot.net/buildroot/commit/?id=refs/heads/master
Signed-off-by: Gustavo Zacarias <gustavo@zacarias.com.ar>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
package/ruby/ruby-configure.patch | 30 ------------------------------
package/ruby/ruby.mk | 10 +++++-----
2 files changed, 5 insertions(+), 35 deletions(-)
diff --git a/package/ruby/ruby-configure.patch b/package/ruby/ruby-configure.patch
deleted file mode 100644
index 0077a67..0000000
--- a/package/ruby/ruby-configure.patch
+++ /dev/null
@@ -1,30 +0,0 @@
-diff -Nura ruby-1.9.2-p0.orig/configure.in ruby-1.9.2-p0/configure.in
---- ruby-1.9.2-p0.orig/configure.in 2010-08-14 05:11:59.000000000 -0300
-+++ ruby-1.9.2-p0/configure.in 2010-11-04 15:46:22.478191926 -0300
-@@ -1410,7 +1410,25 @@
- fi
-
- AC_FUNC_GETPGRP
--AC_FUNC_SETPGRP
-+
-+dnl AC_FUNC_SETPGRP does not work if cross compiling
-+dnl Instead, assume we will have a prototype for setpgrp if cross compiling.
-+if test "$cross_compiling" = no; then
-+ AC_FUNC_SETPGRP
-+else
-+ AC_CACHE_CHECK([whether setpgrp takes no argument], ac_cv_func_setpgrp_void,
-+ [AC_TRY_COMPILE([
-+#include <unistd.h>
-+], [
-+ if (setpgrp(1,1) == -1)
-+ exit (0);
-+ else
-+ exit (1);
-+], ac_cv_func_setpgrp_void=no, ac_cv_func_setpgrp_void=yes)])
-+if test $ac_cv_func_setpgrp_void = yes; then
-+ AC_DEFINE(SETPGRP_VOID, 1)
-+fi
-+fi
-
- AC_C_BIGENDIAN
- AC_C_CONST
diff --git a/package/ruby/ruby.mk b/package/ruby/ruby.mk
index a5b8cde..ee1f9ed 100644
--- a/package/ruby/ruby.mk
+++ b/package/ruby/ruby.mk
@@ -4,15 +4,15 @@
#
#############################################################
-RUBY_VERSION = 1.9.2-p320
+RUBY_VERSION = 1.9.3-p362
RUBY_SITE = ftp://ftp.ruby-lang.org/pub/ruby/1.9
-RUBY_AUTORECONF = YES
-HOST_RUBY_AUTORECONF = YES
-RUBY_DEPENDENCIES = host-ruby
-HOST_RUBY_DEPENDENCIES =
+RUBY_DEPENDENCIES = host-pkgconf host-ruby
+HOST_RUBY_DEPENDENCIES = host-pkgconf
RUBY_MAKE_ENV = $(TARGET_MAKE_ENV)
RUBY_CONF_OPT = --disable-install-doc --disable-rpath
HOST_RUBY_CONF_OPT = --disable-install-doc --with-out-ext=curses,readline
+RUBY_LICENSE = Ruby
+RUBY_LICENSE_FILES = LEGAL
# Force optionals to build before we do
ifeq ($(BR2_PACKAGE_BERKELEYDB),y)
^ permalink raw reply related
* [Buildroot] [PATCH 1/2] taglib: bump to version 1.8
From: Peter Korsgaard @ 2012-12-29 19:40 UTC (permalink / raw)
To: buildroot
In-Reply-To: <1356798545-9246-1-git-send-email-gustavo@zacarias.com.ar>
>>>>> "Gustavo" == Gustavo Zacarias <gustavo@zacarias.com.ar> writes:
Gustavo> Signed-off-by: Gustavo Zacarias <gustavo@zacarias.com.ar>
Committed both, thanks.
--
Bye, Peter Korsgaard
^ permalink raw reply
* [Buildroot] Generating patches against packages source code
From: Yann E. MORIN @ 2012-12-29 19:52 UTC (permalink / raw)
To: buildroot
In-Reply-To: <20121229193947.2e157779@skate>
Thomas, All,
On Saturday 29 December 2012 Thomas Petazzoni wrote:
> On Sat, 29 Dec 2012 19:03:06 +0100, Yann E. MORIN wrote:
> > So, I would recommend against using quilt; rather use the package's
> > upstream repository, or at worse, create a temporary git tree just in
> > the package's extracted directory: it's much more convenient and
> > powerfull than using quilt.
>
> <troll severity="strong">
>
> That's because you're using a prehistoric, basic, limited and
> feature-less text editor named vim.
<troll mode="answer" next="no-more-please!">
OK, I've been stung to the quick! ;-)
http://www.vim.org/scripts/script.php?script_id=1656
Whatever emacs can do, vim does it better! ;-)
Cheers!
</troll>
Regards,
Yann E. MORIN, hiding...
--
.-----------------.--------------------.------------------.--------------------.
| Yann E. MORIN | Real-Time Embedded | /"\ ASCII RIBBON | Erics' conspiracy: |
| +33 662 376 056 | Software Designer | \ / CAMPAIGN | ___ |
| +33 223 225 172 `------------.-------: X AGAINST | \e/ There is no |
| http://ymorin.is-a-geek.org/ | _/*\_ | / \ HTML MAIL | v conspiracy. |
'------------------------------^-------^------------------^--------------------'
^ permalink raw reply
page: next (older) | prev (newer) | latest
- recent:[subjects (threaded)|topics (new)|topics (active)]
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox