* [Buildroot] [PATCH 01/12] sh: add /dev/ttyASx console devices
2010-11-04 2:50 [Buildroot] [pull request] Pull request for branch 2010.11-various-bumps llandwerlin at gmail.com
@ 2010-11-04 2:50 ` llandwerlin at gmail.com
2010-11-04 13:33 ` Thomas Petazzoni
2010-11-04 2:50 ` [Buildroot] [PATCH 02/12] rsync: drop special case now managed in Makefile.package.in llandwerlin at gmail.com
` (10 subsequent siblings)
11 siblings, 1 reply; 37+ messages in thread
From: llandwerlin at gmail.com @ 2010-11-04 2:50 UTC (permalink / raw)
To: buildroot
From: Lionel Landwerlin <llandwerlin@gmail.com>
Signed-off-by: Lionel Landwerlin <llandwerlin@gmail.com>
---
target/generic/Config.in | 12 ++++++++++++
1 files changed, 12 insertions(+), 0 deletions(-)
diff --git a/target/generic/Config.in b/target/generic/Config.in
index 54ff1d6..f5d8286 100644
--- a/target/generic/Config.in
+++ b/target/generic/Config.in
@@ -45,6 +45,18 @@ config BR2_TARGET_GENERIC_GETTY_TTYAMA2
config BR2_TARGET_GENERIC_GETTY_TTYAMA3
bool "ttyAMA3"
depends on BR2_arm
+config BR2_TARGET_GENERIC_GETTY_TTYAS0
+ bool "ttyAS0"
+ depends on BR2_sh
+config BR2_TARGET_GENERIC_GETTY_TTYAS1
+ bool "ttyAS1"
+ depends on BR2_sh
+config BR2_TARGET_GENERIC_GETTY_TTYAS2
+ bool "ttyAS2"
+ depends on BR2_sh
+config BR2_TARGET_GENERIC_GETTY_TTYAS3
+ bool "ttyAS3"
+ depends on BR2_sh
config BR2_TARGET_GENERIC_GETTY_TTYSAC0
bool "ttySAC0"
depends on BR2_arm
--
1.7.2.3
^ permalink raw reply related [flat|nested] 37+ messages in thread* [Buildroot] [PATCH 01/12] sh: add /dev/ttyASx console devices
2010-11-04 2:50 ` [Buildroot] [PATCH 01/12] sh: add /dev/ttyASx console devices llandwerlin at gmail.com
@ 2010-11-04 13:33 ` Thomas Petazzoni
2010-11-04 13:38 ` Lionel Landwerlin
0 siblings, 1 reply; 37+ messages in thread
From: Thomas Petazzoni @ 2010-11-04 13:33 UTC (permalink / raw)
To: buildroot
On Thu, 4 Nov 2010 03:50:20 +0100
llandwerlin at gmail.com wrote:
> From: Lionel Landwerlin <llandwerlin@gmail.com>
>
> Signed-off-by: Lionel Landwerlin <llandwerlin@gmail.com>
I'd prefer to see
http://lists.busybox.net/pipermail/buildroot/2010-September/037987.html
be merged into Buildroot.
Basically, the idea of the patch is to get rid of the choice, and use a
basic free form field instead.
Regards,
Thomas
--
Thomas Petazzoni, Free Electrons
Kernel, drivers, real-time and embedded Linux
development, consulting, training and support.
http://free-electrons.com
^ permalink raw reply [flat|nested] 37+ messages in thread
* [Buildroot] [PATCH 02/12] rsync: drop special case now managed in Makefile.package.in
2010-11-04 2:50 [Buildroot] [pull request] Pull request for branch 2010.11-various-bumps llandwerlin at gmail.com
2010-11-04 2:50 ` [Buildroot] [PATCH 01/12] sh: add /dev/ttyASx console devices llandwerlin at gmail.com
@ 2010-11-04 2:50 ` llandwerlin at gmail.com
2010-11-04 13:38 ` Thomas Petazzoni
2010-11-04 2:50 ` [Buildroot] [PATCH 03/12] autotools: fix MESSAGE calls llandwerlin at gmail.com
` (9 subsequent siblings)
11 siblings, 1 reply; 37+ messages in thread
From: llandwerlin at gmail.com @ 2010-11-04 2:50 UTC (permalink / raw)
To: buildroot
From: Lionel Landwerlin <llandwerlin@gmail.com>
Signed-off-by: Lionel Landwerlin <llandwerlin@gmail.com>
---
package/rsync/rsync.mk | 11 +++--------
1 files changed, 3 insertions(+), 8 deletions(-)
diff --git a/package/rsync/rsync.mk b/package/rsync/rsync.mk
index e1bb28e..d7c2ccd 100644
--- a/package/rsync/rsync.mk
+++ b/package/rsync/rsync.mk
@@ -9,14 +9,9 @@ RSYNC_SOURCE:=rsync-$(RSYNC_VERSION).tar.gz
RSYNC_SITE:=http://rsync.samba.org/ftp/rsync/src
RSYNC_INSTALL_STAGING:=NO
RSYNC_INSTALL_TARGET:=YES
-RSYNC_CONF_OPT=$(if $(BR2_ENABLE_DEBUG),--enable-debug,--disable-debug)
-ifeq ($(BR2_ENABLE_DEBUG),y)
-RSYNC_INSTALL_TARGET_OPT:=DESTDIR=$(TARGET_DIR) INSTALLCMD='./install-sh -c' \
- install
-else
-RSYNC_INSTALL_TARGET_OPT:=DESTDIR=$(TARGET_DIR) INSTALLCMD='./install-sh -c' \
- STRIPPROG="$(TARGET_STRIP)" install-strip
-endif
+
+RSYNC_MAKE_ENV = STRIPPROG="$(STRIPCMD)"
+
RSYNC_CONF_OPT:=--with-included-popt
$(eval $(call AUTOTARGETS,package,rsync))
--
1.7.2.3
^ permalink raw reply related [flat|nested] 37+ messages in thread* [Buildroot] [PATCH 02/12] rsync: drop special case now managed in Makefile.package.in
2010-11-04 2:50 ` [Buildroot] [PATCH 02/12] rsync: drop special case now managed in Makefile.package.in llandwerlin at gmail.com
@ 2010-11-04 13:38 ` Thomas Petazzoni
0 siblings, 0 replies; 37+ messages in thread
From: Thomas Petazzoni @ 2010-11-04 13:38 UTC (permalink / raw)
To: buildroot
Hello,
On Thu, 4 Nov 2010 03:50:21 +0100
llandwerlin at gmail.com wrote:
> -RSYNC_CONF_OPT=$(if $(BR2_ENABLE_DEBUG),--enable-debug,--disable-debug)
As far as I can see, passing --{enable,disable}-debug is not handled by
the autotools infrastructure. Maybe those are not needed, but this
change is not transparent.
> -ifeq ($(BR2_ENABLE_DEBUG),y)
> -RSYNC_INSTALL_TARGET_OPT:=DESTDIR=$(TARGET_DIR) INSTALLCMD='./install-sh -c' \
> - install
> -else
> -RSYNC_INSTALL_TARGET_OPT:=DESTDIR=$(TARGET_DIR) INSTALLCMD='./install-sh -c' \
> - STRIPPROG="$(TARGET_STRIP)" install-strip
> -endif
> +
> +RSYNC_MAKE_ENV = STRIPPROG="$(STRIPCMD)"
The autotools infrastructure no longer uses the "install-strip" target.
So is this still useful ?
Other question: the autotools infrastructure does not pass INSTALLCMD.
If it's really needed by this package, then this patch will break the
package.
Regards,
Thomas
--
Thomas Petazzoni, Free Electrons
Kernel, drivers, real-time and embedded Linux
development, consulting, training and support.
http://free-electrons.com
^ permalink raw reply [flat|nested] 37+ messages in thread
* [Buildroot] [PATCH 03/12] autotools: fix MESSAGE calls
2010-11-04 2:50 [Buildroot] [pull request] Pull request for branch 2010.11-various-bumps llandwerlin at gmail.com
2010-11-04 2:50 ` [Buildroot] [PATCH 01/12] sh: add /dev/ttyASx console devices llandwerlin at gmail.com
2010-11-04 2:50 ` [Buildroot] [PATCH 02/12] rsync: drop special case now managed in Makefile.package.in llandwerlin at gmail.com
@ 2010-11-04 2:50 ` llandwerlin at gmail.com
2010-11-04 13:39 ` Thomas Petazzoni
2010-11-05 8:48 ` Peter Korsgaard
2010-11-04 2:50 ` [Buildroot] [PATCH 04/12] autotools: introduce $(PKG_NAME)_AUTORECONF_ENV/$(PKG_NAME)_AUTORECONF_OPT variables llandwerlin at gmail.com
` (8 subsequent siblings)
11 siblings, 2 replies; 37+ messages in thread
From: llandwerlin at gmail.com @ 2010-11-04 2:50 UTC (permalink / raw)
To: buildroot
From: Lionel Landwerlin <llandwerlin@gmail.com>
Signed-off-by: Lionel Landwerlin <llandwerlin@gmail.com>
---
package/Makefile.autotools.in | 4 ++--
1 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/package/Makefile.autotools.in b/package/Makefile.autotools.in
index 87c3092..b24c2b1 100644
--- a/package/Makefile.autotools.in
+++ b/package/Makefile.autotools.in
@@ -138,7 +138,7 @@ $(2)_POST_PATCH_HOOKS += UPDATE_CONFIG_HOOK
# Hook to patch libtool to make it work properly for cross-compilation
#
define LIBTOOL_PATCH_HOOK
- @$(call MESSAGE,"Patching libtool")
+ @$$(call MESSAGE,"Patching libtool")
$(Q)if test "$$($$(PKG)_LIBTOOL_PATCH)" = "YES" \
-a "$$($$(PKG)_AUTORECONF)" != "YES"; then \
for i in `find $$($$(PKG)_SRCDIR) -name ltmain.sh`; do \
@@ -162,7 +162,7 @@ endif
# Hook to autoreconf the package if needed
#
define AUTORECONF_HOOK
- @$(call MESSAGE,"Autoreconfiguring")
+ @$$(call MESSAGE,"Autoreconfiguring")
$(Q)cd $$($$(PKG)_SRCDIR) && $(AUTORECONF) $$($$(PKG)_AUTORECONF_OPT)
$(Q)if test "$$($$(PKG)_LIBTOOL_PATCH)" = "YES"; then \
for i in `find $$($$(PKG)_SRCDIR) -name ltmain.sh`; do \
--
1.7.2.3
^ permalink raw reply related [flat|nested] 37+ messages in thread* [Buildroot] [PATCH 03/12] autotools: fix MESSAGE calls
2010-11-04 2:50 ` [Buildroot] [PATCH 03/12] autotools: fix MESSAGE calls llandwerlin at gmail.com
@ 2010-11-04 13:39 ` Thomas Petazzoni
2010-11-05 8:48 ` Peter Korsgaard
1 sibling, 0 replies; 37+ messages in thread
From: Thomas Petazzoni @ 2010-11-04 13:39 UTC (permalink / raw)
To: buildroot
On Thu, 4 Nov 2010 03:50:22 +0100
llandwerlin at gmail.com wrote:
> From: Lionel Landwerlin <llandwerlin@gmail.com>
>
> Signed-off-by: Lionel Landwerlin <llandwerlin@gmail.com>
Acked-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
--
Thomas Petazzoni, Free Electrons
Kernel, drivers, real-time and embedded Linux
development, consulting, training and support.
http://free-electrons.com
^ permalink raw reply [flat|nested] 37+ messages in thread
* [Buildroot] [PATCH 03/12] autotools: fix MESSAGE calls
2010-11-04 2:50 ` [Buildroot] [PATCH 03/12] autotools: fix MESSAGE calls llandwerlin at gmail.com
2010-11-04 13:39 ` Thomas Petazzoni
@ 2010-11-05 8:48 ` Peter Korsgaard
1 sibling, 0 replies; 37+ messages in thread
From: Peter Korsgaard @ 2010-11-05 8:48 UTC (permalink / raw)
To: buildroot
>>>>> "llandwerlin" == llandwerlin <llandwerlin@gmail.com> writes:
llandwerlin> From: Lionel Landwerlin <llandwerlin@gmail.com>
llandwerlin> Signed-off-by: Lionel Landwerlin <llandwerlin@gmail.com>
Committed, thanks.
--
Bye, Peter Korsgaard
^ permalink raw reply [flat|nested] 37+ messages in thread
* [Buildroot] [PATCH 04/12] autotools: introduce $(PKG_NAME)_AUTORECONF_ENV/$(PKG_NAME)_AUTORECONF_OPT variables
2010-11-04 2:50 [Buildroot] [pull request] Pull request for branch 2010.11-various-bumps llandwerlin at gmail.com
` (2 preceding siblings ...)
2010-11-04 2:50 ` [Buildroot] [PATCH 03/12] autotools: fix MESSAGE calls llandwerlin at gmail.com
@ 2010-11-04 2:50 ` llandwerlin at gmail.com
2010-11-04 13:44 ` Thomas Petazzoni
2010-11-04 2:50 ` [Buildroot] [PATCH 05/12] package: move autoreconfigure step to pre configure hook llandwerlin at gmail.com
` (7 subsequent siblings)
11 siblings, 1 reply; 37+ messages in thread
From: llandwerlin at gmail.com @ 2010-11-04 2:50 UTC (permalink / raw)
To: buildroot
From: Lionel Landwerlin <llandwerlin@gmail.com>
Rather than defining the AUTORECONF variable containing the path to
the autoreconf tool + all its arguments, we split the variable in two.
There is now :
- AUTORECONF which contains the path to the autoreconf tool,
- $(PKG_NAME)_AUTORECONF_OPT which contains the autoreconf arguments,
- and we add $(PKG_NAME)_AUTORECONF_ENV which contains the autoreconf
environment variables.
This allow us to define a specific setup to run autoreconf for both
target and host as well as per package if needed.
Signed-off-by: Lionel Landwerlin <llandwerlin@gmail.com>
---
docs/buildroot.html | 35 +++++++++++++++++++++++++++--------
package/Makefile.autotools.in | 19 ++++++++++++++++++-
package/autoconf/autoconf.mk | 2 +-
package/automake/automake.mk | 5 +++--
4 files changed, 49 insertions(+), 12 deletions(-)
diff --git a/docs/buildroot.html b/docs/buildroot.html
index 00808ff..814198b 100644
--- a/docs/buildroot.html
+++ b/docs/buildroot.html
@@ -1253,15 +1253,34 @@ LIBFOO_POST_PATCH_HOOKS += LIBFOO_POST_PATCH_FIXUP
pass to make in the build step. These are passed after the
<code>make</code> command. By default, empty.</li>
- <li><code>LIBFOO_AUTORECONF</code>, tells whether the package should
- be autoreconfigured or not (i.e, if the configure script and
- Makefile.in files should be re-generated by re-running autoconf,
- automake, libtool, etc.). Valid values are <code>YES</code> and
- <code>NO</code>. By default, the value is <code>NO</code></li>
-
- <li><code>LIBFOO_AUTORECONF_OPT</code> to specify additional options
+ <li><code>LIBFOO_AUTORECONF</code>, tells whether the package
+ should be autoreconfigured or not (i.e, if the configure script
+ and Makefile.in files should be re-generated by re-running
+ autoconf, automake, libtool, etc.). Valid values
+ are <code>YES</code> and <code>NO</code>. By default, the value
+ is <code>NO</code></li>
+
+ <li><code>LIBFOO_AUTORECONF_OPT</code> to specify additional
+ options passed to the <i>autoreconf</i> program
+ if <code>LIBFOO_AUTORECONF=YES</code>. By default, empty.</li>
+
+ <li><code>LIBFOO_AUTORECONF_ENV</code>, to specify environment
+ variables to pass to <i>autoreconf</i> program if
+ <code>LIBFOO_AUTORECONF=YES</code>. By default, it depends
+ whether we're building a package for the host or target, but it
+ should always define the following variables :
+ <ul>
+ <li>ACLOCAL</li>
+ <li>AUTOCONF</li>
+ <li>AUTOHEADER</li>
+ <li>AUTOMAKE</li>
+ <li>LIBTOOLIZE</li>
+ </ul></li>
+
+ <li><code>LIBFOO_AUTORECONF_OPT</code>, to specify options
passed to the <i>autoreconf</i> program if
- <code>LIBFOO_AUTORECONF=YES</code>. By default, empty.</li>
+ <code>LIBFOO_AUTORECONF=YES</code>. By default, <code>-f -i -I
+ "$(ACLOCAL_DIR)"</code>.</li>
<li><code>LIBFOO_LIBTOOL_PATCH</code> tells whether the Buildroot
patch to fix libtool cross-compilation issues should be applied or
diff --git a/package/Makefile.autotools.in b/package/Makefile.autotools.in
index b24c2b1..4a992d9 100644
--- a/package/Makefile.autotools.in
+++ b/package/Makefile.autotools.in
@@ -62,8 +62,25 @@ $(2)_CONF_OPT ?=
$(2)_MAKE ?= $(MAKE)
$(2)_MAKE_ENV ?=
$(2)_MAKE_OPT ?=
+ifeq ($(5),host)
$(2)_AUTORECONF ?= NO
-$(2)_AUTORECONF_OPT ?=
+$(2)_AUTORECONF_OPT ?= -f -i -I "$$(ACLOCAL_HOST_DIR)"
+$(2)_AUTORECONF_ENV ?= $$(HOST_CONFIGURE_OPTS) \
+ ACLOCAL="$$(ACLOCAL)" \
+ AUTOCONF="$$(AUTOCONF)" \
+ AUTOHEADER="$$(AUTOHEADER)" \
+ AUTOMAKE="$$(AUTOMAKE)" \
+ LIBTOOLIZE="$$(LIBTOOLIZE)"
+else
+$(2)_AUTORECONF ?= YES
+$(2)_AUTORECONF_OPT ?= -f -i -I "$$(ACLOCAL_STAGING_DIR)"
+$(2)_AUTORECONF_ENV ?= $$(TARGET_CONFIGURE_OPTS) \
+ ACLOCAL="$$(ACLOCAL)" \
+ AUTOCONF="$$(AUTOCONF)" \
+ AUTOHEADER="$$(AUTOHEADER)" \
+ AUTOMAKE="$$(AUTOMAKE)" \
+ LIBTOOLIZE="$$(LIBTOOLIZE)"
+endif
$(2)_USE_CONFIG_CACHE ?= $(if $(BR2_CONFIG_CACHE),YES,NO)
$(2)_INSTALL_STAGING_OPT ?= DESTDIR=$$(STAGING_DIR) install
$(2)_INSTALL_TARGET_OPT ?= DESTDIR=$$(TARGET_DIR) install
diff --git a/package/autoconf/autoconf.mk b/package/autoconf/autoconf.mk
index a21192f..4b58986 100644
--- a/package/autoconf/autoconf.mk
+++ b/package/autoconf/autoconf.mk
@@ -23,4 +23,4 @@ $(eval $(call AUTOTARGETS,package,autoconf,host))
# variables used by other packages
AUTOCONF:=$(HOST_DIR)/usr/bin/autoconf
AUTOHEADER:=$(HOST_DIR)/usr/bin/autoheader
-AUTORECONF=$(HOST_CONFIGURE_OPTS) ACLOCAL="$(ACLOCAL)" AUTOCONF="$(AUTOCONF)" AUTOHEADER="$(AUTOHEADER)" AUTOMAKE="$(AUTOMAKE)" $(HOST_DIR)/usr/bin/autoreconf -f -i -I "$(ACLOCAL_DIR)"
+AUTORECONF=$(HOST_DIR)/usr/bin/autoreconf
diff --git a/package/automake/automake.mk b/package/automake/automake.mk
index a33c9f4..1d198f4 100644
--- a/package/automake/automake.mk
+++ b/package/automake/automake.mk
@@ -22,5 +22,6 @@ $(eval $(call AUTOTARGETS,package,automake,host))
# variables used by other packages
AUTOMAKE = $(HOST_DIR)/usr/bin/automake
-ACLOCAL_DIR = $(STAGING_DIR)/usr/share/aclocal
-ACLOCAL = $(HOST_DIR)/usr/bin/aclocal -I $(ACLOCAL_DIR)
+ACLOCAL_STAGING_DIR = $(STAGING_DIR)/usr/share/aclocal
+ACLOCAL_HOST_DIR = $(HOST_DIR)/usr/share/aclocal
+ACLOCAL = $(HOST_DIR)/usr/bin/aclocal
--
1.7.2.3
^ permalink raw reply related [flat|nested] 37+ messages in thread* [Buildroot] [PATCH 04/12] autotools: introduce $(PKG_NAME)_AUTORECONF_ENV/$(PKG_NAME)_AUTORECONF_OPT variables
2010-11-04 2:50 ` [Buildroot] [PATCH 04/12] autotools: introduce $(PKG_NAME)_AUTORECONF_ENV/$(PKG_NAME)_AUTORECONF_OPT variables llandwerlin at gmail.com
@ 2010-11-04 13:44 ` Thomas Petazzoni
2010-11-04 13:49 ` Lionel Landwerlin
0 siblings, 1 reply; 37+ messages in thread
From: Thomas Petazzoni @ 2010-11-04 13:44 UTC (permalink / raw)
To: buildroot
Hello,
On Thu, 4 Nov 2010 03:50:23 +0100
llandwerlin at gmail.com wrote:
> Rather than defining the AUTORECONF variable containing the path to
> the autoreconf tool + all its arguments, we split the variable in two.
> There is now :
> - AUTORECONF which contains the path to the autoreconf tool,
> - $(PKG_NAME)_AUTORECONF_OPT which contains the autoreconf arguments,
>
> - and we add $(PKG_NAME)_AUTORECONF_ENV which contains the autoreconf
> environment variables.
>
> This allow us to define a specific setup to run autoreconf for both
> target and host as well as per package if needed.
Ok on the principle, but see comment below.
> + <li><code>LIBFOO_AUTORECONF_OPT</code> to specify additional
> + options passed to the <i>autoreconf</i> program
> + if <code>LIBFOO_AUTORECONF=YES</code>. By default, empty.</li>
Seems to be a duplication of :
> + <li><code>LIBFOO_AUTORECONF_OPT</code>, to specify options
> passed to the <i>autoreconf</i> program if
> - <code>LIBFOO_AUTORECONF=YES</code>. By default, empty.</li>
> + <code>LIBFOO_AUTORECONF=YES</code>. By default, <code>-f -i -I
> + "$(ACLOCAL_DIR)"</code>.</li>
Thomas
--
Thomas Petazzoni, Free Electrons
Kernel, drivers, real-time and embedded Linux
development, consulting, training and support.
http://free-electrons.com
^ permalink raw reply [flat|nested] 37+ messages in thread
* [Buildroot] [PATCH 04/12] autotools: introduce $(PKG_NAME)_AUTORECONF_ENV/$(PKG_NAME)_AUTORECONF_OPT variables
2010-11-04 13:44 ` Thomas Petazzoni
@ 2010-11-04 13:49 ` Lionel Landwerlin
2010-11-04 15:30 ` Thomas Petazzoni
0 siblings, 1 reply; 37+ messages in thread
From: Lionel Landwerlin @ 2010-11-04 13:49 UTC (permalink / raw)
To: buildroot
Ok... this set of patch is a bunch of crap...
That would teach me to rebase things at 3:30am :)
Thanks again for reviewing.
Regards,
--
Lionel Landwerlin
On Thu, Nov 4, 2010 at 2:44 PM, Thomas Petazzoni
<thomas.petazzoni@free-electrons.com> wrote:
> Hello,
>
> On Thu, ?4 Nov 2010 03:50:23 +0100
> llandwerlin at gmail.com wrote:
>
>> Rather than defining the AUTORECONF variable containing the path to
>> the autoreconf tool + all its arguments, we split the variable in two.
>> There is now :
>> ? ? ? - AUTORECONF which contains the path to the autoreconf tool,
>> ? ? ? - $(PKG_NAME)_AUTORECONF_OPT which contains the autoreconf arguments,
>>
>> ? ? ? - and we add $(PKG_NAME)_AUTORECONF_ENV which contains the autoreconf
>> ? ? ? ? environment variables.
>>
>> This allow us to define a specific setup to run autoreconf for both
>> target and host as well as per package if needed.
>
> Ok on the principle, but see comment below.
>
>> + ? ? ?<li><code>LIBFOO_AUTORECONF_OPT</code> to specify additional
>> + ? ? ?options passed to the <i>autoreconf</i> program
>> + ? ? ?if <code>LIBFOO_AUTORECONF=YES</code>. By default, empty.</li>
>
> Seems to be a duplication of :
>
>> + ? ? ?<li><code>LIBFOO_AUTORECONF_OPT</code>, to specify options
>> ? ? ? ?passed to the <i>autoreconf</i> program if
>> - ? ? ?<code>LIBFOO_AUTORECONF=YES</code>. By default, empty.</li>
>> + ? ? ?<code>LIBFOO_AUTORECONF=YES</code>. By default, <code>-f -i -I
>> + ? ? ?"$(ACLOCAL_DIR)"</code>.</li>
>
> Thomas
> --
> Thomas Petazzoni, Free Electrons
> Kernel, drivers, real-time and embedded Linux
> development, consulting, training and support.
> http://free-electrons.com
> _______________________________________________
> buildroot mailing list
> buildroot at busybox.net
> http://lists.busybox.net/mailman/listinfo/buildroot
>
^ permalink raw reply [flat|nested] 37+ messages in thread
* [Buildroot] [PATCH 05/12] package: move autoreconfigure step to pre configure hook
2010-11-04 2:50 [Buildroot] [pull request] Pull request for branch 2010.11-various-bumps llandwerlin at gmail.com
` (3 preceding siblings ...)
2010-11-04 2:50 ` [Buildroot] [PATCH 04/12] autotools: introduce $(PKG_NAME)_AUTORECONF_ENV/$(PKG_NAME)_AUTORECONF_OPT variables llandwerlin at gmail.com
@ 2010-11-04 2:50 ` llandwerlin at gmail.com
2010-11-04 13:45 ` Thomas Petazzoni
2010-11-05 9:04 ` Peter Korsgaard
2010-11-04 2:50 ` [Buildroot] [PATCH 06/12] gdk-pixbuf/libgtk2: move gdk-pixbuf loader cache setup script llandwerlin at gmail.com
` (6 subsequent siblings)
11 siblings, 2 replies; 37+ messages in thread
From: llandwerlin at gmail.com @ 2010-11-04 2:50 UTC (permalink / raw)
To: buildroot
From: Lionel Landwerlin <llandwerlin@gmail.com>
Signed-off-by: Lionel Landwerlin <llandwerlin@gmail.com>
---
package/Makefile.autotools.in | 2 +-
package/Makefile.package.in | 2 ++
2 files changed, 3 insertions(+), 1 deletions(-)
diff --git a/package/Makefile.autotools.in b/package/Makefile.autotools.in
index 4a992d9..178e34c 100644
--- a/package/Makefile.autotools.in
+++ b/package/Makefile.autotools.in
@@ -194,7 +194,7 @@ define AUTORECONF_HOOK
endef
ifeq ($$($(2)_AUTORECONF),YES)
-$(2)_POST_PATCH_HOOKS += AUTORECONF_HOOK
+$(2)_PRE_CONFIGURE_HOOKS += AUTORECONF_HOOK
$(2)_DEPENDENCIES += host-automake host-autoconf host-libtool
endif
diff --git a/package/Makefile.package.in b/package/Makefile.package.in
index 377df65..816a013 100644
--- a/package/Makefile.package.in
+++ b/package/Makefile.package.in
@@ -261,6 +261,7 @@ $(BUILD_DIR)/%/.stamp_patched:
# Configure
$(BUILD_DIR)/%/.stamp_configured:
+ $(foreach hook,$($(PKG)_PRE_CONFIGURE_HOOKS),$(call $(hook))$(sep))
@$(call MESSAGE,"Configuring")
$($(PKG)_CONFIGURE_CMDS)
$(foreach hook,$($(PKG)_POST_CONFIGURE_HOOKS),$(call $(hook))$(sep))
@@ -410,6 +411,7 @@ $(2)_TARGET_DIRCLEAN = $$($(2)_DIR)/.stamp_dircleaned
# post-steps hooks
$(2)_POST_EXTRACT_HOOKS ?=
$(2)_POST_PATCH_HOOKS ?=
+$(2)_PRE_CONFIGURE_HOOKS ?=
$(2)_POST_CONFIGURE_HOOKS ?=
$(2)_POST_BUILD_HOOKS ?=
$(2)_POST_INSTALL_HOOKS ?=
--
1.7.2.3
^ permalink raw reply related [flat|nested] 37+ messages in thread* [Buildroot] [PATCH 05/12] package: move autoreconfigure step to pre configure hook
2010-11-04 2:50 ` [Buildroot] [PATCH 05/12] package: move autoreconfigure step to pre configure hook llandwerlin at gmail.com
@ 2010-11-04 13:45 ` Thomas Petazzoni
2010-11-05 9:04 ` Peter Korsgaard
1 sibling, 0 replies; 37+ messages in thread
From: Thomas Petazzoni @ 2010-11-04 13:45 UTC (permalink / raw)
To: buildroot
On Thu, 4 Nov 2010 03:50:24 +0100
llandwerlin at gmail.com wrote:
> From: Lionel Landwerlin <llandwerlin@gmail.com>
>
> Signed-off-by: Lionel Landwerlin <llandwerlin@gmail.com>
Acked-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
--
Thomas Petazzoni, Free Electrons
Kernel, drivers, real-time and embedded Linux
development, consulting, training and support.
http://free-electrons.com
^ permalink raw reply [flat|nested] 37+ messages in thread
* [Buildroot] [PATCH 05/12] package: move autoreconfigure step to pre configure hook
2010-11-04 2:50 ` [Buildroot] [PATCH 05/12] package: move autoreconfigure step to pre configure hook llandwerlin at gmail.com
2010-11-04 13:45 ` Thomas Petazzoni
@ 2010-11-05 9:04 ` Peter Korsgaard
1 sibling, 0 replies; 37+ messages in thread
From: Peter Korsgaard @ 2010-11-05 9:04 UTC (permalink / raw)
To: buildroot
>>>>> "llandwerlin" == llandwerlin <llandwerlin@gmail.com> writes:
llandwerlin> From: Lionel Landwerlin <llandwerlin@gmail.com>
llandwerlin> Signed-off-by: Lionel Landwerlin <llandwerlin@gmail.com>
Thanks, committed. You forgot to update the documentation, but I've done
that.
--
Bye, Peter Korsgaard
^ permalink raw reply [flat|nested] 37+ messages in thread
* [Buildroot] [PATCH 06/12] gdk-pixbuf/libgtk2: move gdk-pixbuf loader cache setup script
2010-11-04 2:50 [Buildroot] [pull request] Pull request for branch 2010.11-various-bumps llandwerlin at gmail.com
` (4 preceding siblings ...)
2010-11-04 2:50 ` [Buildroot] [PATCH 05/12] package: move autoreconfigure step to pre configure hook llandwerlin at gmail.com
@ 2010-11-04 2:50 ` llandwerlin at gmail.com
2010-11-04 8:10 ` Paulius Zaleckas
` (2 more replies)
2010-11-04 2:50 ` [Buildroot] [PATCH 07/12] automake: bump to 1.11.1 llandwerlin at gmail.com
` (5 subsequent siblings)
11 siblings, 3 replies; 37+ messages in thread
From: llandwerlin at gmail.com @ 2010-11-04 2:50 UTC (permalink / raw)
To: buildroot
From: Lionel Landwerlin <llandwerlin@gmail.com>
Signed-off-by: Lionel Landwerlin <llandwerlin@gmail.com>
---
package/gdk-pixbuf/S26gdk-pixbuf | 19 +++++++++++++++++++
package/gdk-pixbuf/gdk-pixbuf.mk | 4 ++++
package/libgtk2/S26libgtk2 | 19 -------------------
package/libgtk2/libgtk2.mk | 1 -
4 files changed, 23 insertions(+), 20 deletions(-)
create mode 100644 package/gdk-pixbuf/S26gdk-pixbuf
delete mode 100644 package/libgtk2/S26libgtk2
diff --git a/package/gdk-pixbuf/S26gdk-pixbuf b/package/gdk-pixbuf/S26gdk-pixbuf
new file mode 100644
index 0000000..037746d
--- /dev/null
+++ b/package/gdk-pixbuf/S26gdk-pixbuf
@@ -0,0 +1,19 @@
+#!/bin/sh
+#
+# run pgdk-pixbuf-query-loaders if needed
+
+FILE=/usr/lib/gdk-pixbuf-2.0/2.10.0/loaders.cache
+
+case "$1" in
+ start|"")
+ if [ ! -f "$FILE" ] ; then
+ /usr/bin/gdk-pixbuf-query-loaders --update-cache
+ fi
+ ;;
+ stop)
+ ;;
+ *)
+ echo "Usage: $0 {start|stop}" >&2
+ exit 1
+ ;;
+esac
diff --git a/package/gdk-pixbuf/gdk-pixbuf.mk b/package/gdk-pixbuf/gdk-pixbuf.mk
index 4c3e108..c54f0a6 100644
--- a/package/gdk-pixbuf/gdk-pixbuf.mk
+++ b/package/gdk-pixbuf/gdk-pixbuf.mk
@@ -40,6 +40,10 @@ endif
GDK_PIXBUF_DEPENDENCIES += $(if $(BR2_NEEDS_GETTEXT_IF_LOCALE),gettext libintl) host-pkg-config libglib2 libiconv
+define GDK_PIXBUF_POST_INSTALL_TWEAKS
+ $(INSTALL) -m 755 package/gdk-pixbuf/S26gdk-pixbuf $(TARGET_DIR)/etc/init.d/
+endef
+
$(eval $(call AUTOTARGETS,package,gdk-pixbuf))
HOST_GDK_PIXBUF_CONF_OPT = \
diff --git a/package/libgtk2/S26libgtk2 b/package/libgtk2/S26libgtk2
deleted file mode 100644
index 037746d..0000000
--- a/package/libgtk2/S26libgtk2
+++ /dev/null
@@ -1,19 +0,0 @@
-#!/bin/sh
-#
-# run pgdk-pixbuf-query-loaders if needed
-
-FILE=/usr/lib/gdk-pixbuf-2.0/2.10.0/loaders.cache
-
-case "$1" in
- start|"")
- if [ ! -f "$FILE" ] ; then
- /usr/bin/gdk-pixbuf-query-loaders --update-cache
- fi
- ;;
- stop)
- ;;
- *)
- echo "Usage: $0 {start|stop}" >&2
- exit 1
- ;;
-esac
diff --git a/package/libgtk2/libgtk2.mk b/package/libgtk2/libgtk2.mk
index e41fcc9..6e14d27 100644
--- a/package/libgtk2/libgtk2.mk
+++ b/package/libgtk2/libgtk2.mk
@@ -115,7 +115,6 @@ LIBGTK2_CONF_OPT += --disable-cups
endif
define LIBGTK2_POST_INSTALL_TWEAKS
- $(INSTALL) -m 755 package/libgtk2/S26libgtk2 $(TARGET_DIR)/etc/init.d/
rm -rf $(TARGET_DIR)/usr/share/gtk-2.0/demo $(TARGET_DIR)/usr/bin/gtk-demo
endef
--
1.7.2.3
^ permalink raw reply related [flat|nested] 37+ messages in thread* [Buildroot] [PATCH 06/12] gdk-pixbuf/libgtk2: move gdk-pixbuf loader cache setup script
2010-11-04 2:50 ` [Buildroot] [PATCH 06/12] gdk-pixbuf/libgtk2: move gdk-pixbuf loader cache setup script llandwerlin at gmail.com
@ 2010-11-04 8:10 ` Paulius Zaleckas
2010-11-04 8:21 ` Lionel Landwerlin
2010-11-04 13:46 ` Thomas Petazzoni
2010-11-05 9:07 ` Peter Korsgaard
2 siblings, 1 reply; 37+ messages in thread
From: Paulius Zaleckas @ 2010-11-04 8:10 UTC (permalink / raw)
To: buildroot
On Thu, Nov 4, 2010 at 4:50 AM, <llandwerlin@gmail.com> wrote:
> From: Lionel Landwerlin <llandwerlin@gmail.com>
>
> Signed-off-by: Lionel Landwerlin <llandwerlin@gmail.com>
> ---
[...]
> diff --git a/package/gdk-pixbuf/gdk-pixbuf.mk b/package/gdk-pixbuf/gdk-pixbuf.mk
> index 4c3e108..c54f0a6 100644
> --- a/package/gdk-pixbuf/gdk-pixbuf.mk
> +++ b/package/gdk-pixbuf/gdk-pixbuf.mk
> @@ -40,6 +40,10 @@ endif
>
> GDK_PIXBUF_DEPENDENCIES += $(if $(BR2_NEEDS_GETTEXT_IF_LOCALE),gettext libintl) host-pkg-config libglib2 libiconv
>
> +define GDK_PIXBUF_POST_INSTALL_TWEAKS
> + $(INSTALL) -m 755 package/gdk-pixbuf/S26gdk-pixbuf $(TARGET_DIR)/etc/init.d/
> +endef
> +
Oh... come on!.. Don't break it the third time in these couple months :)
You defined the hook - OK, but who will call it?
- Hide quoted text -
> $(eval $(call AUTOTARGETS,package,gdk-pixbuf))
>
> HOST_GDK_PIXBUF_CONF_OPT = \
^ permalink raw reply [flat|nested] 37+ messages in thread
* [Buildroot] [PATCH 06/12] gdk-pixbuf/libgtk2: move gdk-pixbuf loader cache setup script
2010-11-04 2:50 ` [Buildroot] [PATCH 06/12] gdk-pixbuf/libgtk2: move gdk-pixbuf loader cache setup script llandwerlin at gmail.com
2010-11-04 8:10 ` Paulius Zaleckas
@ 2010-11-04 13:46 ` Thomas Petazzoni
2010-11-05 9:07 ` Peter Korsgaard
2 siblings, 0 replies; 37+ messages in thread
From: Thomas Petazzoni @ 2010-11-04 13:46 UTC (permalink / raw)
To: buildroot
On Thu, 4 Nov 2010 03:50:25 +0100
llandwerlin at gmail.com wrote:
> From: Lionel Landwerlin <llandwerlin@gmail.com>
>
> Signed-off-by: Lionel Landwerlin <llandwerlin@gmail.com>
Besides Paulius comment:
Acked-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
--
Thomas Petazzoni, Free Electrons
Kernel, drivers, real-time and embedded Linux
development, consulting, training and support.
http://free-electrons.com
^ permalink raw reply [flat|nested] 37+ messages in thread
* [Buildroot] [PATCH 06/12] gdk-pixbuf/libgtk2: move gdk-pixbuf loader cache setup script
2010-11-04 2:50 ` [Buildroot] [PATCH 06/12] gdk-pixbuf/libgtk2: move gdk-pixbuf loader cache setup script llandwerlin at gmail.com
2010-11-04 8:10 ` Paulius Zaleckas
2010-11-04 13:46 ` Thomas Petazzoni
@ 2010-11-05 9:07 ` Peter Korsgaard
2 siblings, 0 replies; 37+ messages in thread
From: Peter Korsgaard @ 2010-11-05 9:07 UTC (permalink / raw)
To: buildroot
>>>>> "llandwerlin" == llandwerlin <llandwerlin@gmail.com> writes:
llandwerlin> From: Lionel Landwerlin <llandwerlin@gmail.com>
llandwerlin> Signed-off-by: Lionel Landwerlin <llandwerlin@gmail.com>
Committed (fixed version), thanks.
--
Bye, Peter Korsgaard
^ permalink raw reply [flat|nested] 37+ messages in thread
* [Buildroot] [PATCH 07/12] automake: bump to 1.11.1
2010-11-04 2:50 [Buildroot] [pull request] Pull request for branch 2010.11-various-bumps llandwerlin at gmail.com
` (5 preceding siblings ...)
2010-11-04 2:50 ` [Buildroot] [PATCH 06/12] gdk-pixbuf/libgtk2: move gdk-pixbuf loader cache setup script llandwerlin at gmail.com
@ 2010-11-04 2:50 ` llandwerlin at gmail.com
2010-11-04 13:48 ` Thomas Petazzoni
2010-11-05 8:49 ` Peter Korsgaard
2010-11-04 2:50 ` [Buildroot] [PATCH 08/12] sysstat: bump to 9.1.5 llandwerlin at gmail.com
` (4 subsequent siblings)
11 siblings, 2 replies; 37+ messages in thread
From: llandwerlin at gmail.com @ 2010-11-04 2:50 UTC (permalink / raw)
To: buildroot
From: Lionel Landwerlin <llandwerlin@gmail.com>
Signed-off-by: Lionel Landwerlin <llandwerlin@gmail.com>
---
package/automake/automake.mk | 2 +-
1 files changed, 1 insertions(+), 1 deletions(-)
diff --git a/package/automake/automake.mk b/package/automake/automake.mk
index 1d198f4..565bd42 100644
--- a/package/automake/automake.mk
+++ b/package/automake/automake.mk
@@ -3,7 +3,7 @@
# automake
#
#############################################################
-AUTOMAKE_VERSION = 1.10
+AUTOMAKE_VERSION = 1.11.1
AUTOMAKE_SOURCE = automake-$(AUTOMAKE_VERSION).tar.bz2
AUTOMAKE_SITE = $(BR2_GNU_MIRROR)/automake
--
1.7.2.3
^ permalink raw reply related [flat|nested] 37+ messages in thread* [Buildroot] [PATCH 07/12] automake: bump to 1.11.1
2010-11-04 2:50 ` [Buildroot] [PATCH 07/12] automake: bump to 1.11.1 llandwerlin at gmail.com
@ 2010-11-04 13:48 ` Thomas Petazzoni
2010-11-05 8:49 ` Peter Korsgaard
1 sibling, 0 replies; 37+ messages in thread
From: Thomas Petazzoni @ 2010-11-04 13:48 UTC (permalink / raw)
To: buildroot
On Thu, 4 Nov 2010 03:50:26 +0100
llandwerlin at gmail.com wrote:
> From: Lionel Landwerlin <llandwerlin@gmail.com>
>
> Signed-off-by: Lionel Landwerlin <llandwerlin@gmail.com>
Not tested, but:
Acked-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
--
Thomas Petazzoni, Free Electrons
Kernel, drivers, real-time and embedded Linux
development, consulting, training and support.
http://free-electrons.com
^ permalink raw reply [flat|nested] 37+ messages in thread
* [Buildroot] [PATCH 07/12] automake: bump to 1.11.1
2010-11-04 2:50 ` [Buildroot] [PATCH 07/12] automake: bump to 1.11.1 llandwerlin at gmail.com
2010-11-04 13:48 ` Thomas Petazzoni
@ 2010-11-05 8:49 ` Peter Korsgaard
1 sibling, 0 replies; 37+ messages in thread
From: Peter Korsgaard @ 2010-11-05 8:49 UTC (permalink / raw)
To: buildroot
>>>>> "llandwerlin" == llandwerlin <llandwerlin@gmail.com> writes:
llandwerlin> From: Lionel Landwerlin <llandwerlin@gmail.com>
llandwerlin> Signed-off-by: Lionel Landwerlin <llandwerlin@gmail.com>
Committed, thanks.
--
Bye, Peter Korsgaard
^ permalink raw reply [flat|nested] 37+ messages in thread
* [Buildroot] [PATCH 08/12] sysstat: bump to 9.1.5
2010-11-04 2:50 [Buildroot] [pull request] Pull request for branch 2010.11-various-bumps llandwerlin at gmail.com
` (6 preceding siblings ...)
2010-11-04 2:50 ` [Buildroot] [PATCH 07/12] automake: bump to 1.11.1 llandwerlin at gmail.com
@ 2010-11-04 2:50 ` llandwerlin at gmail.com
2010-11-05 9:09 ` Peter Korsgaard
2010-11-04 2:50 ` [Buildroot] [PATCH 09/12] libpcap: bump to 1.1.1 llandwerlin at gmail.com
` (3 subsequent siblings)
11 siblings, 1 reply; 37+ messages in thread
From: llandwerlin at gmail.com @ 2010-11-04 2:50 UTC (permalink / raw)
To: buildroot
From: Lionel Landwerlin <llandwerlin@gmail.com>
Signed-off-by: Lionel Landwerlin <llandwerlin@gmail.com>
---
package/sysstat/sysstat.mk | 6 ++----
1 files changed, 2 insertions(+), 4 deletions(-)
diff --git a/package/sysstat/sysstat.mk b/package/sysstat/sysstat.mk
index 324580e..7294b86 100644
--- a/package/sysstat/sysstat.mk
+++ b/package/sysstat/sysstat.mk
@@ -4,7 +4,7 @@
#
#############################################################
-SYSSTAT_VERSION = 9.0.5
+SYSSTAT_VERSION = 9.1.5
SYSSTAT_SOURCE = sysstat-$(SYSSTAT_VERSION).tar.bz2
SYSSTAT_SITE = http://pagesperso-orange.fr/sebastien.godard/
SYSSTAT_AUTORECONF = NO
@@ -12,9 +12,7 @@ SYSSTAT_LIBTOOL_PATCH = NO
SYSSTAT_INSTALL_STAGING = NO
SYSSTAT_INSTALL_TARGET = YES
-# Should be --disable-man-group, it might be a little mistake in the
-# configure.in script.
-SYSSTAT_CONF_OPT = --enable-man-group
+SYSSTAT_CONF_OPT = --disable-man-group
ifneq ($(BR2_HAVE_DOCUMENTATION),y)
SYSSTAT_CONF_OPT += --disable-documentation
endif
--
1.7.2.3
^ permalink raw reply related [flat|nested] 37+ messages in thread* [Buildroot] [PATCH 09/12] libpcap: bump to 1.1.1
2010-11-04 2:50 [Buildroot] [pull request] Pull request for branch 2010.11-various-bumps llandwerlin at gmail.com
` (7 preceding siblings ...)
2010-11-04 2:50 ` [Buildroot] [PATCH 08/12] sysstat: bump to 9.1.5 llandwerlin at gmail.com
@ 2010-11-04 2:50 ` llandwerlin at gmail.com
2010-11-05 8:52 ` Peter Korsgaard
2010-11-04 2:50 ` [Buildroot] [PATCH 10/12] linux-fusion: bump to 8.1.2 llandwerlin at gmail.com
` (2 subsequent siblings)
11 siblings, 1 reply; 37+ messages in thread
From: llandwerlin at gmail.com @ 2010-11-04 2:50 UTC (permalink / raw)
To: buildroot
From: Lionel Landwerlin <llandwerlin@gmail.com>
This new release avoids problems when running autoreconf.
Signed-off-by: Lionel Landwerlin <llandwerlin@gmail.com>
---
package/libpcap/libpcap-1.0.0-wireless.patch | 26 --------------------------
package/libpcap/libpcap.mk | 2 +-
2 files changed, 1 insertions(+), 27 deletions(-)
delete mode 100644 package/libpcap/libpcap-1.0.0-wireless.patch
diff --git a/package/libpcap/libpcap-1.0.0-wireless.patch b/package/libpcap/libpcap-1.0.0-wireless.patch
deleted file mode 100644
index 7bcfcda..0000000
--- a/package/libpcap/libpcap-1.0.0-wireless.patch
+++ /dev/null
@@ -1,26 +0,0 @@
-[PATCH]: pcap-linux: fix build with wireless support
-
-Based on ba23aa7b upstream.
-
-linux/wireless.h includes linux/if.h, which conflicts with net/if.h as
-they both define if* structures. Fix build by simply using linux/if.h
-instead of net/if.h.
-
-Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
----
- pcap-linux.c | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-Index: libpcap-1.0.0/pcap-linux.c
-===================================================================
---- libpcap-1.0.0.orig/pcap-linux.c
-+++ libpcap-1.0.0/pcap-linux.c
-@@ -93,7 +93,7 @@ static const char rcsid[] _U_ =
- #include <sys/ioctl.h>
- #include <sys/utsname.h>
- #include <sys/mman.h>
--#include <net/if.h>
-+#include <linux/if.h>
- #include <netinet/in.h>
- #include <linux/if_ether.h>
- #include <net/if_arp.h>
diff --git a/package/libpcap/libpcap.mk b/package/libpcap/libpcap.mk
index b14a6f7..eebfc03 100644
--- a/package/libpcap/libpcap.mk
+++ b/package/libpcap/libpcap.mk
@@ -4,7 +4,7 @@
#
#############################################################
-LIBPCAP_VERSION:=1.0.0
+LIBPCAP_VERSION:=1.1.1
LIBPCAP_SITE:=http://www.tcpdump.org/release
LIBPCAP_SOURCE:=libpcap-$(LIBPCAP_VERSION).tar.gz
LIBPCAP_INSTALL_STAGING:=YES
--
1.7.2.3
^ permalink raw reply related [flat|nested] 37+ messages in thread* [Buildroot] [PATCH 10/12] linux-fusion: bump to 8.1.2
2010-11-04 2:50 [Buildroot] [pull request] Pull request for branch 2010.11-various-bumps llandwerlin at gmail.com
` (8 preceding siblings ...)
2010-11-04 2:50 ` [Buildroot] [PATCH 09/12] libpcap: bump to 1.1.1 llandwerlin at gmail.com
@ 2010-11-04 2:50 ` llandwerlin at gmail.com
2010-11-05 9:11 ` Peter Korsgaard
2010-11-04 2:50 ` [Buildroot] [PATCH 11/12] directfb: bump to 1.4.10 llandwerlin at gmail.com
2010-11-04 2:50 ` [Buildroot] [PATCH 12/12] sawman: " llandwerlin at gmail.com
11 siblings, 1 reply; 37+ messages in thread
From: llandwerlin at gmail.com @ 2010-11-04 2:50 UTC (permalink / raw)
To: buildroot
From: Lionel Landwerlin <llandwerlin@gmail.com>
Signed-off-by: Lionel Landwerlin <llandwerlin@gmail.com>
---
.../linux-fusion-8.1.1-missing-include.patch | 17 --------
...ux-fusion-8.1.2-fix-warnings-at-link-time.patch | 40 ++++++++++++++++++++
package/linux-fusion/linux-fusion.mk | 7 ++-
3 files changed, 44 insertions(+), 20 deletions(-)
delete mode 100644 package/linux-fusion/linux-fusion-8.1.1-missing-include.patch
create mode 100644 package/linux-fusion/linux-fusion-8.1.2-fix-warnings-at-link-time.patch
diff --git a/package/linux-fusion/linux-fusion-8.1.1-missing-include.patch b/package/linux-fusion/linux-fusion-8.1.1-missing-include.patch
deleted file mode 100644
index d7b6f23..0000000
--- a/package/linux-fusion/linux-fusion-8.1.1-missing-include.patch
+++ /dev/null
@@ -1,17 +0,0 @@
-fusiondev.c does not compile due to TASK_INTERRUPTIBLE and other
-related constants not being defined.
-
-Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
-
-Index: linux-fusion-8.1.1/linux/drivers/char/fusion/fusiondev.c
-===================================================================
---- linux-fusion-8.1.1.orig/linux/drivers/char/fusion/fusiondev.c 2010-07-16 22:49:23.000000000 +0200
-+++ linux-fusion-8.1.1/linux/drivers/char/fusion/fusiondev.c 2010-07-16 22:49:39.000000000 +0200
-@@ -32,6 +32,7 @@
- #include <linux/proc_fs.h>
- #include <linux/poll.h>
- #include <linux/init.h>
-+#include <linux/sched.h>
- #include <asm/io.h>
- #include <asm/uaccess.h>
-
diff --git a/package/linux-fusion/linux-fusion-8.1.2-fix-warnings-at-link-time.patch b/package/linux-fusion/linux-fusion-8.1.2-fix-warnings-at-link-time.patch
new file mode 100644
index 0000000..7c46eaf
--- /dev/null
+++ b/package/linux-fusion/linux-fusion-8.1.2-fix-warnings-at-link-time.patch
@@ -0,0 +1,40 @@
+From 7884688ba7a2e4cb7772cbedb34245a7fc9bf9d9 Mon Sep 17 00:00:00 2001
+From: Lionel Landwerlin <llandwerlin@gmail.com>
+Date: Wed, 3 Nov 2010 10:25:17 +0100
+Subject: [PATCH] Fix warnings at link time
+
+Signed-off-by: Lionel Landwerlin <llandwerlin@gmail.com>
+---
+ linux/drivers/char/fusion/entries.c | 2 +-
+ linux/drivers/char/fusion/fusiondev.c | 2 +-
+ 2 files changed, 2 insertions(+), 2 deletions(-)
+
+diff --git a/linux/drivers/char/fusion/entries.c b/linux/drivers/char/fusion/entries.c
+index 11edd43..8d102cf 100644
+--- a/linux/drivers/char/fusion/entries.c
++++ b/linux/drivers/char/fusion/entries.c
+@@ -28,7 +28,7 @@
+ #include "fusiondev.h"
+ #include "entries.h"
+
+-struct timeval now;
++static struct timeval now;
+
+ void
+ fusion_entries_init(FusionEntries * entries,
+diff --git a/linux/drivers/char/fusion/fusiondev.c b/linux/drivers/char/fusion/fusiondev.c
+index 2457bc1..7c7680d 100644
+--- a/linux/drivers/char/fusion/fusiondev.c
++++ b/linux/drivers/char/fusion/fusiondev.c
+@@ -64,7 +64,7 @@
+ MODULE_LICENSE("GPL");
+ MODULE_AUTHOR("Denis Oliver Kropp <dok@directfb.org>");
+
+-struct proc_dir_entry *proc_fusion_dir;
++static struct proc_dir_entry *proc_fusion_dir;
+
+ static int fusion_major = FUSION_MAJOR;
+
+--
+1.6.0.6
+
diff --git a/package/linux-fusion/linux-fusion.mk b/package/linux-fusion/linux-fusion.mk
index e7cd3e4..2cd564f 100644
--- a/package/linux-fusion/linux-fusion.mk
+++ b/package/linux-fusion/linux-fusion.mk
@@ -3,7 +3,7 @@
# linux-fusion
#
#############################################################
-LINUX_FUSION_VERSION = 8.1.1
+LINUX_FUSION_VERSION = 8.1.2
LINUX_FUSION_SOURCE = linux-fusion-$(LINUX_FUSION_VERSION).tar.gz
LINUX_FUSION_SITE = http://directfb.org/downloads/Core/linux-fusion
LINUX_FUSION_INSTALL_STAGING = YES
@@ -22,17 +22,18 @@ LINUX_FUSION_MAKE_OPTS += CROSS_COMPILE=$(TARGET_CROSS)
LINUX_FUSION_MAKE_OPTS += KERNEL_MODLIB=/lib/modules/$(LINUX_FOR_FUSION)/kernel
define LINUX_FUSION_BUILD_CMDS
- $(MAKE) $(TARGET_CONFIGURE_OPTS) $(LINUX_FUSION_MAKE_OPTS) -C $(@D)
+ $(MAKE) $(TARGET_CONFIGURE_OPTS) $(LINUX_FUSION_MAKE_OPTS) INSTALL_MOD_PATH=$(STAGING_DIR) -C $(@D)
endef
# Only the header file is needed in the staging directory
define LINUX_FUSION_INSTALL_STAGING_CMDS
- install -m 644 $(@D)/linux/include/linux/fusion.h $(STAGING_DIR)/usr/include/linux
+ $(MAKE) $(TARGET_CONFIGURE_OPTS) $(LINUX_FUSION_MAKE_OPTS) INSTALL_MOD_PATH=$(STAGING_DIR) -C $(@D) headers_install
endef
define LINUX_FUSION_INSTALL_TARGET_CMDS
$(MAKE) $(TARGET_CONFIGURE_OPTS) \
$(LINUX_FUSION_MAKE_OPTS) \
+ INSTALL_MOD_PATH=$(TARGET_DIR) \
-C $(@D) install
mkdir -p $(LINUX_FUSION_ETC_DIR)
cp -dpf package/linux-fusion/40-fusion.rules $(LINUX_FUSION_ETC_DIR)
--
1.7.2.3
^ permalink raw reply related [flat|nested] 37+ messages in thread* [Buildroot] [PATCH 10/12] linux-fusion: bump to 8.1.2
2010-11-04 2:50 ` [Buildroot] [PATCH 10/12] linux-fusion: bump to 8.1.2 llandwerlin at gmail.com
@ 2010-11-05 9:11 ` Peter Korsgaard
0 siblings, 0 replies; 37+ messages in thread
From: Peter Korsgaard @ 2010-11-05 9:11 UTC (permalink / raw)
To: buildroot
>>>>> "llandwerlin" == llandwerlin <llandwerlin@gmail.com> writes:
llandwerlin> From: Lionel Landwerlin <llandwerlin@gmail.com>
llandwerlin> Signed-off-by: Lionel Landwerlin <llandwerlin@gmail.com>
llandwerlin> +++ b/package/linux-fusion/linux-fusion.mk
llandwerlin> @@ -3,7 +3,7 @@
llandwerlin> # linux-fusion
llandwerlin> #
llandwerlin> #############################################################
llandwerlin> -LINUX_FUSION_VERSION = 8.1.1
llandwerlin> +LINUX_FUSION_VERSION = 8.1.2
llandwerlin> LINUX_FUSION_SOURCE = linux-fusion-$(LINUX_FUSION_VERSION).tar.gz
llandwerlin> LINUX_FUSION_SITE = http://directfb.org/downloads/Core/linux-fusion
llandwerlin> LINUX_FUSION_INSTALL_STAGING = YES
llandwerlin> @@ -22,17 +22,18 @@ LINUX_FUSION_MAKE_OPTS += CROSS_COMPILE=$(TARGET_CROSS)
llandwerlin> LINUX_FUSION_MAKE_OPTS += KERNEL_MODLIB=/lib/modules/$(LINUX_FOR_FUSION)/kernel
llandwerlin> define LINUX_FUSION_BUILD_CMDS
llandwerlin> - $(MAKE) $(TARGET_CONFIGURE_OPTS) $(LINUX_FUSION_MAKE_OPTS) -C $(@D)
llandwerlin> + $(MAKE) $(TARGET_CONFIGURE_OPTS) $(LINUX_FUSION_MAKE_OPTS) INSTALL_MOD_PATH=$(STAGING_DIR) -C $(@D)
Why is INSTALL_MOD_PATH needed at build time?
llandwerlin> endef
llandwerlin> # Only the header file is needed in the staging directory
llandwerlin> define LINUX_FUSION_INSTALL_STAGING_CMDS
llandwerlin> - install -m 644 $(@D)/linux/include/linux/fusion.h $(STAGING_DIR)/usr/include/linux
That comment should presumably go now?
--
Bye, Peter Korsgaard
^ permalink raw reply [flat|nested] 37+ messages in thread
* [Buildroot] [PATCH 11/12] directfb: bump to 1.4.10
2010-11-04 2:50 [Buildroot] [pull request] Pull request for branch 2010.11-various-bumps llandwerlin at gmail.com
` (9 preceding siblings ...)
2010-11-04 2:50 ` [Buildroot] [PATCH 10/12] linux-fusion: bump to 8.1.2 llandwerlin at gmail.com
@ 2010-11-04 2:50 ` llandwerlin at gmail.com
2010-11-05 9:13 ` Peter Korsgaard
2010-11-05 12:52 ` Peter Korsgaard
2010-11-04 2:50 ` [Buildroot] [PATCH 12/12] sawman: " llandwerlin at gmail.com
11 siblings, 2 replies; 37+ messages in thread
From: llandwerlin at gmail.com @ 2010-11-04 2:50 UTC (permalink / raw)
To: buildroot
From: Lionel Landwerlin <llandwerlin@gmail.com>
Signed-off-by: Lionel Landwerlin <llandwerlin@gmail.com>
---
package/directfb/directfb.mk | 2 +-
1 files changed, 1 insertions(+), 1 deletions(-)
diff --git a/package/directfb/directfb.mk b/package/directfb/directfb.mk
index e4b6d90..2703677 100644
--- a/package/directfb/directfb.mk
+++ b/package/directfb/directfb.mk
@@ -4,7 +4,7 @@
#
#############################################################
DIRECTFB_VERSION_MAJOR:=1.4
-DIRECTFB_VERSION:=1.4.5
+DIRECTFB_VERSION:=$(DIRECTFB_VERSION_MAJOR).10
DIRECTFB_SITE:=http://www.directfb.org/downloads/Core/DirectFB-$(DIRECTFB_VERSION_MAJOR)
DIRECTFB_SOURCE:=DirectFB-$(DIRECTFB_VERSION).tar.gz
DIRECTFB_AUTORECONF = NO
--
1.7.2.3
^ permalink raw reply related [flat|nested] 37+ messages in thread* [Buildroot] [PATCH 11/12] directfb: bump to 1.4.10
2010-11-04 2:50 ` [Buildroot] [PATCH 11/12] directfb: bump to 1.4.10 llandwerlin at gmail.com
@ 2010-11-05 9:13 ` Peter Korsgaard
2010-11-05 12:52 ` Peter Korsgaard
1 sibling, 0 replies; 37+ messages in thread
From: Peter Korsgaard @ 2010-11-05 9:13 UTC (permalink / raw)
To: buildroot
>>>>> "llandwerlin" == llandwerlin <llandwerlin@gmail.com> writes:
llandwerlin> From: Lionel Landwerlin <llandwerlin@gmail.com>
llandwerlin> Signed-off-by: Lionel Landwerlin <llandwerlin@gmail.com>
Committed, thanks.
--
Bye, Peter Korsgaard
^ permalink raw reply [flat|nested] 37+ messages in thread
* [Buildroot] [PATCH 11/12] directfb: bump to 1.4.10
2010-11-04 2:50 ` [Buildroot] [PATCH 11/12] directfb: bump to 1.4.10 llandwerlin at gmail.com
2010-11-05 9:13 ` Peter Korsgaard
@ 2010-11-05 12:52 ` Peter Korsgaard
2010-11-05 13:30 ` Lionel Landwerlin
1 sibling, 1 reply; 37+ messages in thread
From: Peter Korsgaard @ 2010-11-05 12:52 UTC (permalink / raw)
To: buildroot
>>>>> "llandwerlin" == llandwerlin <llandwerlin@gmail.com> writes:
llandwerlin> From: Lionel Landwerlin <llandwerlin@gmail.com>
llandwerlin> Signed-off-by: Lionel Landwerlin <llandwerlin@gmail.com>
llandwerlin> ---
llandwerlin> package/directfb/directfb.mk | 2 +-
llandwerlin> 1 files changed, 1 insertions(+), 1 deletions(-)
llandwerlin> diff --git a/package/directfb/directfb.mk b/package/directfb/directfb.mk
llandwerlin> index e4b6d90..2703677 100644
llandwerlin> --- a/package/directfb/directfb.mk
llandwerlin> +++ b/package/directfb/directfb.mk
llandwerlin> @@ -4,7 +4,7 @@
llandwerlin> #
llandwerlin> #############################################################
llandwerlin> DIRECTFB_VERSION_MAJOR:=1.4
llandwerlin> -DIRECTFB_VERSION:=1.4.5
llandwerlin> +DIRECTFB_VERSION:=$(DIRECTFB_VERSION_MAJOR).10
I'm getting build breakage with:
libtool: link: /scratch/peko/staging/usr/bin/arm-unknown-linux-uclibcgnueabi-gcc
--sysroot=/scratch/peko/staging -I/scratch/peko/staging/usr/include/freetype2 -
O3 -ffast-math -pipe -pipe -Os -mtune=arm926ej-s -march=armv5te -mabi=aapcs-linu
x -msoft-float -I/scratch/peko/staging/usr/include -I/scratch/peko/staging/inclu
de -D_GNU_SOURCE -finstrument-functions -std=gnu99 -Werror-implicit-function-dec
laration -o .libs/dfbinspector dfbinspector.o -L/scratch/peko/staging/lib -L/sc
ratch/peko/staging/usr/lib ../src/.libs/libdirectfb.so ../lib/fusion/.libs/libfu
sion.so ../lib/direct/.libs/libdirect.so -ldl -lpthread -Wl,-rpath -Wl,/usr/lib
../src/.libs/libdirectfb.so: undefined reference to `sqrt'
collect2: ld returned 1 exit status
make[3]: *** [dfbg] Error 1
We seem to be dropping -lm.
Any idea why? If not, then I'll revert the patch as I would like to put
out -rc1 this weekend.
--
Bye, Peter Korsgaard
^ permalink raw reply [flat|nested] 37+ messages in thread
* [Buildroot] [PATCH 11/12] directfb: bump to 1.4.10
2010-11-05 12:52 ` Peter Korsgaard
@ 2010-11-05 13:30 ` Lionel Landwerlin
2010-11-05 14:00 ` Peter Korsgaard
0 siblings, 1 reply; 37+ messages in thread
From: Lionel Landwerlin @ 2010-11-05 13:30 UTC (permalink / raw)
To: buildroot
On Fri, Nov 5, 2010 at 1:52 PM, Peter Korsgaard <jacmet@uclibc.org> wrote:
>>>>>> "llandwerlin" == llandwerlin ?<llandwerlin@gmail.com> writes:
>
> ?llandwerlin> From: Lionel Landwerlin <llandwerlin@gmail.com>
> ?llandwerlin> Signed-off-by: Lionel Landwerlin <llandwerlin@gmail.com>
> ?llandwerlin> ---
> ?llandwerlin> ?package/directfb/directfb.mk | ? ?2 +-
> ?llandwerlin> ?1 files changed, 1 insertions(+), 1 deletions(-)
>
> ?llandwerlin> diff --git a/package/directfb/directfb.mk b/package/directfb/directfb.mk
> ?llandwerlin> index e4b6d90..2703677 100644
> ?llandwerlin> --- a/package/directfb/directfb.mk
> ?llandwerlin> +++ b/package/directfb/directfb.mk
> ?llandwerlin> @@ -4,7 +4,7 @@
> ?llandwerlin> ?#
> ?llandwerlin> ?#############################################################
> ?llandwerlin> ?DIRECTFB_VERSION_MAJOR:=1.4
> ?llandwerlin> -DIRECTFB_VERSION:=1.4.5
> ?llandwerlin> +DIRECTFB_VERSION:=$(DIRECTFB_VERSION_MAJOR).10
>
> I'm getting build breakage with:
>
> libtool: link: /scratch/peko/staging/usr/bin/arm-unknown-linux-uclibcgnueabi-gcc
> ?--sysroot=/scratch/peko/staging -I/scratch/peko/staging/usr/include/freetype2 -
> O3 -ffast-math -pipe -pipe -Os -mtune=arm926ej-s -march=armv5te -mabi=aapcs-linu
> x -msoft-float -I/scratch/peko/staging/usr/include -I/scratch/peko/staging/inclu
> de -D_GNU_SOURCE -finstrument-functions -std=gnu99 -Werror-implicit-function-dec
> laration -o .libs/dfbinspector dfbinspector.o ?-L/scratch/peko/staging/lib -L/sc
> ratch/peko/staging/usr/lib ../src/.libs/libdirectfb.so ../lib/fusion/.libs/libfu
> sion.so ../lib/direct/.libs/libdirect.so -ldl -lpthread -Wl,-rpath -Wl,/usr/lib
> ../src/.libs/libdirectfb.so: undefined reference to `sqrt'
> collect2: ld returned 1 exit status
> make[3]: *** [dfbg] Error 1
>
> We seem to be dropping -lm.
>
> Any idea why? If not, then I'll revert the patch as I would like to put
> out -rc1 this weekend.
>
I issue has been discussed on the directfb mailing list indeed.
I haven't seen it with glibc...
If you're about reverting it, you also have to revert the sawman bump.
I think I can add a patch to force -lm for now, I will send this patch
tonight. Can you wait for it ?
Regards,
--
Lionel Landwerlin
^ permalink raw reply [flat|nested] 37+ messages in thread
* [Buildroot] [PATCH 11/12] directfb: bump to 1.4.10
2010-11-05 13:30 ` Lionel Landwerlin
@ 2010-11-05 14:00 ` Peter Korsgaard
0 siblings, 0 replies; 37+ messages in thread
From: Peter Korsgaard @ 2010-11-05 14:00 UTC (permalink / raw)
To: buildroot
>>>>> "Lionel" == Lionel Landwerlin <llandwerlin@gmail.com> writes:
Hi,
>> We seem to be dropping -lm.
>>
>> Any idea why? If not, then I'll revert the patch as I would like to put
>> out -rc1 this weekend.
>>
Lionel> I issue has been discussed on the directfb mailing list indeed.
Lionel> I haven't seen it with glibc...
Lionel> If you're about reverting it, you also have to revert the sawman bump.
Lionel> I think I can add a patch to force -lm for now, I will send this patch
Lionel> tonight. Can you wait for it ?
Sure, I'm planning on cutting -rc1 Sunday.
--
Bye, Peter Korsgaard
^ permalink raw reply [flat|nested] 37+ messages in thread
* [Buildroot] [PATCH 12/12] sawman: bump to 1.4.10
2010-11-04 2:50 [Buildroot] [pull request] Pull request for branch 2010.11-various-bumps llandwerlin at gmail.com
` (10 preceding siblings ...)
2010-11-04 2:50 ` [Buildroot] [PATCH 11/12] directfb: bump to 1.4.10 llandwerlin at gmail.com
@ 2010-11-04 2:50 ` llandwerlin at gmail.com
2010-11-05 9:14 ` Peter Korsgaard
11 siblings, 1 reply; 37+ messages in thread
From: llandwerlin at gmail.com @ 2010-11-04 2:50 UTC (permalink / raw)
To: buildroot
From: Lionel Landwerlin <llandwerlin@gmail.com>
Signed-off-by: Lionel Landwerlin <llandwerlin@gmail.com>
---
package/sawman/sawman.mk | 2 +-
1 files changed, 1 insertions(+), 1 deletions(-)
diff --git a/package/sawman/sawman.mk b/package/sawman/sawman.mk
index c9ec06d..c01a26f 100644
--- a/package/sawman/sawman.mk
+++ b/package/sawman/sawman.mk
@@ -3,7 +3,7 @@
# SAWMAN
#
#############################################################
-SAWMAN_VERSION:=1.4.3
+SAWMAN_VERSION:=1.4.10
SAWMAN_SOURCE:=SaWMan-$(SAWMAN_VERSION).tar.gz
SAWMAN_SITE:=http://www.directfb.org/downloads/Extras
SAWMAN_INSTALL_STAGING = YES
--
1.7.2.3
^ permalink raw reply related [flat|nested] 37+ messages in thread