* [Buildroot] [PATCH 3/7] docs/manual: add details on toolchain configuration
From: Samuel Martin @ 2012-12-29 21:27 UTC (permalink / raw)
To: buildroot
In-Reply-To: <1356792153-24033-4-git-send-email-thomas.petazzoni@free-electrons.com>
Hi Thomas, all,
2012/12/29 Thomas Petazzoni <thomas.petazzoni@free-electrons.com>:
> This commit adds a new section
>
> Working with Buildroot
> -> Details in configuration
> -> Cross-compilation toolchain
>
> that gives a lot of details about our three toolchain backends. It
> takes some elements that were previously later in the manual in
> "Embedded basics" and in "External toolchain" and combines them with
> more details about internal backend and Crosstool-NG backend.
>
> The "Embedded basics" section becomes empty and is therefore
> removed. A few elements have been lost in the process, but they were
> considered to not be really useful, especially located so far in the
> manual.
>
> Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
Acked-by: Samuel Martin <s.martin49@gmail.com>
Regards,
--
Sam
^ permalink raw reply
* [Buildroot] [PATCH 2/7] docs/manual: Slightly improve the introduction
From: Samuel Martin @ 2012-12-29 21:23 UTC (permalink / raw)
To: buildroot
In-Reply-To: <1356792153-24033-3-git-send-email-thomas.petazzoni@free-electrons.com>
Hi Thomas, all,
2012/12/29 Thomas Petazzoni <thomas.petazzoni@free-electrons.com>:
> Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
Acked-by: Samuel Martin <s.martin49@gmail.com>
Regards,
--
Sam
^ permalink raw reply
* [Buildroot] [PATCH 1/7] docs/manual: add a new 'Details on Buildroot configuration' section
From: Samuel Martin @ 2012-12-29 21:23 UTC (permalink / raw)
To: buildroot
In-Reply-To: <1356792153-24033-2-git-send-email-thomas.petazzoni@free-electrons.com>
Hi Thomas, all,
2012/12/29 Thomas Petazzoni <thomas.petazzoni@free-electrons.com>:
> As discussed with Samuel Martin, there are a few questions about some
> Buildroot configuration aspects that come very often on the IRC
> channel and on the mailing-list. Topics such as the /dev management
> and init systems are often raised.
>
> Therefore, this patch adds a new section that provides details about
> the Buildroot configuration possibilities. It does not aim at
> replacing the help text of each configuration option, but rather to
> complement them by providing more background. Having those
> informations in the manual will also make it easier for us to point
> newcomers to the right place in the documentation when they have
> questions.
>
> Note that this section will replace the "Embedded basics" section that
> comes way too late in the manual. This is done in a followup commit.
>
> Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
Acked-by: Samuel Martin <s.martin49@gmail.com>
Definitely, 2 new sections that should help a lot of people.
Regards,
--
Samuel
^ permalink raw reply
* [Buildroot] Documentation improvements
From: Samuel Martin @ 2012-12-29 21:17 UTC (permalink / raw)
To: buildroot
In-Reply-To: <1356792153-24033-1-git-send-email-thomas.petazzoni@free-electrons.com>
Hi Thomas,
2012/12/29 Thomas Petazzoni <thomas.petazzoni@free-electrons.com>:
> Hello Samuel,
>
> Here is a set of patches that add more details in the documentation
> about /dev management, init systems and toolchain configuration, as
> per our discussion a few days ago on IRC.
>
> Besides adding information, I've also reorganized things a bit. I
> think the "Embedded basics" subsection was really misplaced in "Going
> further in Buildroot?s innards" section. Knowing the basics is really
> not something that should be in the "Going further" part.
>
> So what I've done is create a "Details of Buildroot configuration"
> sub-section in the "Working with Buildroot" section (chapter 3), and
> I've reorganized here the information coming from "Embedded
> basics". I've removed a few things that are really not Buildroot
> specific, and I've extended that with more details on toolchain, /dev
> and init.
>
> I also include some unrelated minor fixes to the documentation, as
> separate patches.
Great work! :-)
Thanks,
--
Samuel
^ permalink raw reply
* [Buildroot] Generating patches against packages source code
From: Stefan Fröberg @ 2012-12-29 20:18 UTC (permalink / raw)
To: buildroot
In-Reply-To: <201212292056.25164.yann.morin.1998@free.fr>
29.12.2012 21:56, Yann E. MORIN kirjoitti:
> Stefan, All,
>
> On Saturday 29 December 2012 Stefan Fr?berg wrote:
>> We "real" programmers just use nano as editor and raw diff as our patch
>> generating tool.
>> ;-)
> Real Programmers use butterflies:
> https://xkcd.com/378/
ROLF!
:D
> Regards,
> Yann E. MORIN.
>
^ permalink raw reply
* [Buildroot] [PATCH 15/20] efl/expedite: bump to 1.7.4
From: Peter Korsgaard @ 2012-12-29 20:15 UTC (permalink / raw)
To: buildroot
In-Reply-To: <20121228205048.38c0b205@skate>
>>>>> "Thomas" == Thomas Petazzoni <thomas.petazzoni@free-electrons.com> writes:
Thomas> On Fri, 28 Dec 2012 20:42:08 +0100, Thomas Petazzoni wrote:
>> Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
>> ---
>> package/efl/expedite/expedite.mk | 2 +-
>> 1 file changed, 1 insertion(+), 1 deletion(-)
>>
>> diff --git a/package/efl/expedite/expedite.mk b/package/efl/expedite/expedite.mk
>> index f25294e..4b245ec 100644
>> --- a/package/efl/expedite/expedite.mk
>> +++ b/package/efl/expedite/expedite.mk
>> @@ -4,7 +4,7 @@
>> #
>> #############################################################
>>
>> -EXPEDITE_VERSION = 1.7.3
>> +EXPEDITE_VERSION = 1.7.4
Thomas> Gaah, this should have been merged in PATCH 02/20. I'm fixing
Thomas> this and pushing an updated branch in my public Git repo. I
Thomas> will not repost immediately to the list, but instead wait for
Thomas> more reviews.
I believe it is good to go +/- the small comments I had. Care to fix up
those and resend?
--
Bye, Peter Korsgaard
^ permalink raw reply
* [Buildroot] [PATCH 20/20] enlightenment: new package
From: Peter Korsgaard @ 2012-12-29 20:13 UTC (permalink / raw)
To: buildroot
In-Reply-To: <df0808d07efd1959cfca0558857283d2e7240f4a.1356723702.git.thomas.petazzoni@free-electrons.com>
>>>>> "Thomas" == Thomas Petazzoni <thomas.petazzoni@free-electrons.com> writes:
Thomas> Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
Thomas> ---
Thomas> package/Config.in | 1 +
Thomas> package/enlightenment/Config.in | 29 ++++++++++++++
Thomas> .../enlightenment/enlightenment-no-execinfo.patch | 27 +++++++++++++
Thomas> package/enlightenment/enlightenment.mk | 40 ++++++++++++++++++++
Thomas> 4 files changed, 97 insertions(+)
Thomas> create mode 100644 package/enlightenment/Config.in
Thomas> create mode 100644 package/enlightenment/enlightenment-no-execinfo.patch
Thomas> create mode 100644 package/enlightenment/enlightenment.mk
Thomas> diff --git a/package/Config.in b/package/Config.in
Thomas> index 3d556b2..97a28c8 100644
Thomas> --- a/package/Config.in
Thomas> +++ b/package/Config.in
Thomas> @@ -151,6 +151,7 @@ source "package/liberation/Config.in"
Thomas> source "package/libsexy/Config.in"
Thomas> comment "X Window managers"
Thomas> +source "package/enlightenment/Config.in"
Thomas> source "package/matchbox/Config.in"
Thomas> source "package/metacity/Config.in"
Thomas> source "package/blackbox/Config.in"
Thomas> diff --git a/package/enlightenment/Config.in b/package/enlightenment/Config.in
Thomas> new file mode 100644
Thomas> index 0000000..d973813
Thomas> --- /dev/null
Thomas> +++ b/package/enlightenment/Config.in
Thomas> @@ -0,0 +1,29 @@
Thomas> +config BR2_PACKAGE_ENLIGHTENMENT
Thomas> + bool "enlightenment"
Thomas> + select BR2_PACKAGE_LIBECORE
Thomas> + select BR2_PACKAGE_LIBECORE_X
Thomas> + select BR2_PACKAGE_LIBEINA
Thomas> + select BR2_PACKAGE_LIBEET
Thomas> + select BR2_PACKAGE_LIBEVAS
Thomas> + select BR2_PACKAGE_LIBEVAS_JPEG
Thomas> + select BR2_PACKAGE_LIBEVAS_PNG
Thomas> + select BR2_PACKAGE_LIBEVAS_EET
Thomas> + select BR2_PACKAGE_LIBECORE_EVAS
Thomas> + select BR2_PACKAGE_LIBEDJE
Thomas> + select BR2_PACKAGE_LIBEFREET
Thomas> + select BR2_PACKAGE_LIBEDBUS
Thomas> + select BR2_PACKAGE_LIBEIO
Thomas> + select BR2_PACKAGE_XCB_UTIL_KEYSYMS
Thomas> + select BR2_PACKAGE_LIBEVAS_GENERIC_LOADERS
Thomas> + select BR2_PACKAGE_LIBEVAS_GENERIC_LOADERS_SVG
Thomas> + # libevas-generic-loaders-svg -> librsvg -> glib2
Thomas> + depends on BR2_USE_WCHAR
Thomas> + # libedbus -> dbus
Thomas> + depends on BR2_TOOLCHAIN_HAS_THREADS
Thomas> + # libedbus -> dbus
Thomas> + depends on BR2_USE_MMU
Thomas> + depends on BR2_PACKAGE_XORG7
Thomas> +
No help text?
Thomas> +++ b/package/enlightenment/enlightenment-no-execinfo.patch
Thomas> @@ -0,0 +1,27 @@
Thomas> +Do not include <execinfo.h> when not available
Thomas> +
Thomas> +On uClibc, <execinfo.h> is not necessarily installed, depending on the
Thomas> +configuration. Enlightenment properly makes <execinfo.h> optional, but
Thomas> +uses __GLIBC__ to check if it is available or not. Unfortunately,
Thomas> +uClibc defines __GLIBC__, so it is not the right way to decide if
Thomas> +<execinfo.h> is available.
Thomas> +
Thomas> +Instead, Enlightenment already has a configure.ac check for
Thomas> +execinfo.h, so we simply use the result of this configure.ac check to
Thomas> +decide whether execinfo.h is to be included or not.
Thomas> +
Thomas> +Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
Don't forget to send this upstream.
--
Bye, Peter Korsgaard
^ permalink raw reply
* [Buildroot] [PATCH 14/20] efl/libeio: new package
From: Peter Korsgaard @ 2012-12-29 20:09 UTC (permalink / raw)
To: buildroot
In-Reply-To: <def1e95b3470173f129cd36c95f40260e9893594.1356723702.git.thomas.petazzoni@free-electrons.com>
>>>>> "Thomas" == Thomas Petazzoni <thomas.petazzoni@free-electrons.com> writes:
Thomas> Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
Thomas> ---
Thomas> package/efl/Config.in | 1 +
Thomas> package/efl/libeio/Config.in | 15 +++++++++++++++
Thomas> package/efl/libeio/libeio.mk | 15 +++++++++++++++
Thomas> 3 files changed, 31 insertions(+)
Thomas> create mode 100644 package/efl/libeio/Config.in
Thomas> create mode 100644 package/efl/libeio/libeio.mk
Thomas> diff --git a/package/efl/Config.in b/package/efl/Config.in
Thomas> index c783d7f..a526d87 100644
Thomas> --- a/package/efl/Config.in
Thomas> +++ b/package/efl/Config.in
Thomas> @@ -13,6 +13,7 @@ source "package/efl/libeina/Config.in"
Thomas> source "package/efl/libecore/Config.in"
Thomas> source "package/efl/libeet/Config.in"
Thomas> source "package/efl/libefreet/Config.in"
Thomas> +source "package/efl/libeio/Config.in"
Thomas> source "package/efl/libevas/Config.in"
Thomas> source "package/efl/libembryo/Config.in"
Thomas> source "package/efl/libedje/Config.in"
Thomas> diff --git a/package/efl/libeio/Config.in b/package/efl/libeio/Config.in
Thomas> new file mode 100644
Thomas> index 0000000..889d079
Thomas> --- /dev/null
Thomas> +++ b/package/efl/libeio/Config.in
Thomas> @@ -0,0 +1,15 @@
Thomas> +config BR2_PACKAGE_LIBEIO
Thomas> + bool "libeio"
Thomas> + help
Thomas> + Eio integrates with EFL (Ecore, Eina) to provide efficient
Thomas> + filesystem Input/Output? (I/O). It use the best techniques
The question mark after Input/Output shouldn't be here.
No dependencies on ecore or eina?
--
Bye, Peter Korsgaard
^ permalink raw reply
* [Buildroot] Generating patches against packages source code
From: Yann E. MORIN @ 2012-12-29 19:56 UTC (permalink / raw)
To: buildroot
In-Reply-To: <50DF3ED3.60702@petroprogram.com>
Stefan, All,
On Saturday 29 December 2012 Stefan Fr?berg wrote:
> We "real" programmers just use nano as editor and raw diff as our patch
> generating tool.
> ;-)
Real Programmers use butterflies:
https://xkcd.com/378/
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] 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
* [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] [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] [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] 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] 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] [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] [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] 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] 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: 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: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: 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] [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] [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] 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
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