* [Buildroot] [PATCH] add lzop dependency
From: Peter Korsgaard @ 2010-09-28 12:48 UTC (permalink / raw)
To: buildroot
In-Reply-To: <4CA0542C.4080400@visionsystems.de>
>>>>> "Yegor" == Yegor Yefremov <yegor_sub1@visionsystems.de> writes:
Yegor> lzop will be required to compress Linux kernel via lzo compression method.
Yegor> Signed-off-by: Yegor Yefremov <yegorslists@googlemail.com>
Lzop isn't that common and it's only needed for a fairly specific setup,
wouldn't it make more sense to build it if needed using the host
infrastructure we have instead?
--
Bye, Peter Korsgaard
^ permalink raw reply
* [Buildroot] [PATCH] fix buildroot.html typos
From: Peter Korsgaard @ 2010-09-28 12:47 UTC (permalink / raw)
To: buildroot
In-Reply-To: <4CA1DF87.1000000@visionsystems.de>
>>>>> "Yegor" == Yegor Yefremov <yegor_sub1@visionsystems.de> writes:
Yegor> Signed-off-by: Yegor Yefremov <yegorslists@googlemail.com>
Yegor> Index: b/docs/buildroot.html
Yegor> ===================================================================
Yegor> --- a/docs/buildroot.html 2010-09-28 11:22:51.000000000 +0200
Yegor> +++ b/docs/buildroot.html 2010-09-28 14:24:37.000000000 +0200
Yegor> @@ -171,7 +171,7 @@
Thanks, committed!
--
Bye, Peter Korsgaard
^ permalink raw reply
* [Buildroot] [git commit master 1/1] barebox/u-boot/linux: don't error out on missing config when make source
From: Peter Korsgaard @ 2010-09-28 12:43 UTC (permalink / raw)
To: buildroot
commit: http://git.buildroot.net/buildroot/commit/?id=3e5e39a8a25a4a085afe08bdcf46933c8d569ed7
branch: http://git.buildroot.net/buildroot/commit/?id=refs/heads/master
As it breaks 'make allyesconfig; make source', used for the source mirror.
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
boot/barebox/barebox.mk | 4 +++-
boot/u-boot/u-boot.mk | 4 +++-
linux/linux.mk | 5 ++++-
3 files changed, 10 insertions(+), 3 deletions(-)
diff --git a/boot/barebox/barebox.mk b/boot/barebox/barebox.mk
index 7c2cbc1..85224ca 100644
--- a/boot/barebox/barebox.mk
+++ b/boot/barebox/barebox.mk
@@ -53,9 +53,11 @@ barebox: $(BAREBOX_DIR)/.installed
ifeq ($(BR2_TARGET_BAREBOX),y)
TARGETS+=barebox
-# we NEED a board defconfig file
+# we NEED a board defconfig file unless we're at make source
+ifeq ($(filter source,$(MAKECMDGOALS)),)
ifeq ($(BAREBOX_BOARD_DEFCONFIG),)
$(error No Barebox defconfig file. Check your BR2_TARGET_BAREBOX_BOARD_DEFCONFIG setting)
endif
+endif
endif
diff --git a/boot/u-boot/u-boot.mk b/boot/u-boot/u-boot.mk
index f97674a..9719207 100644
--- a/boot/u-boot/u-boot.mk
+++ b/boot/u-boot/u-boot.mk
@@ -193,9 +193,11 @@ u-boot-configured: $(U_BOOT_DIR)/.header_modified
ifeq ($(BR2_TARGET_UBOOT),y)
TARGETS+=u-boot
-# we NEED a board name
+# we NEED a board name unless we're at make source
+ifeq ($(filter source,$(MAKECMDGOALS)),)
ifeq ($(U_BOOT_BOARD_NAME),)
$(error NO U-Boot board name set. Check your BR2_TARGET_UBOOT_BOARDNAME setting)
endif
+endif
endif
diff --git a/linux/linux.mk b/linux/linux.mk
index ea338fc..aabecc1 100644
--- a/linux/linux.mk
+++ b/linux/linux.mk
@@ -159,6 +159,7 @@ TARGETS+=linux26
endif
# Checks to give errors that the user can understand
+ifeq ($(filter source,$(MAKECMDGOALS)),)
ifeq ($(BR2_LINUX_KERNEL_USE_DEFCONFIG),y)
ifeq ($(call qstrip,$(BR2_LINUX_KERNEL_DEFCONFIG)),)
$(error No kernel defconfig name specified, check your BR2_LINUX_KERNEL_DEFCONFIG setting)
@@ -169,4 +170,6 @@ ifeq ($(BR2_LINUX_KERNEL_USE_CUSTOM_CONFIG),y)
ifeq ($(call qstrip,$(BR2_LINUX_KERNEL_CUSTOM_CONFIG_FILE)),)
$(error No kernel configuration file specified, check your BR2_LINUX_KERNEL_CUSTOM_CONFIG_FILE setting)
endif
-endif
\ No newline at end of file
+endif
+
+endif
--
1.7.1
^ permalink raw reply related
* [Buildroot] [PATCH] fix buildroot.html typos
From: Yegor Yefremov @ 2010-09-28 12:28 UTC (permalink / raw)
To: buildroot
Signed-off-by: Yegor Yefremov <yegorslists@googlemail.com>
Index: b/docs/buildroot.html
===================================================================
--- a/docs/buildroot.html 2010-09-28 11:22:51.000000000 +0200
+++ b/docs/buildroot.html 2010-09-28 14:24:37.000000000 +0200
@@ -171,7 +171,7 @@
<p>All of these "make" commands will need to build a configuration
utility, so you may need to install "development" packages for
- relevent libraries used by the configuration utilities.
+ relevant libraries used by the configuration utilities.
On Debian-like systems, the
<code>libncurses5-dev</code> package is required to use the
<i>menuconfig</i> interface, <code>libqt3-mt-dev</code> is
@@ -345,7 +345,7 @@
toolchain and tools, these changes will be lost. </li>
<li>Customize the target filesystem skeleton available under
- <code>target/generic/target_skeleton/</code>. You can customize
+ <code>fs/skeleton/</code>. You can customize
configuration files or other stuff here. However, the full file hierarchy
is not yet present because it's created during the compilation process.
Therefore, you can't do everything on this target filesystem skeleton, but
@@ -486,12 +486,12 @@
and which steps remain to be done, Buildroot maintains stamp
files (empty files that just tell whether this or that action
has been done). The problem is that these stamp files are not
- uniformely named and handled by the different packages, so some
+ uniformly named and handled by the different packages, so some
understanding of the particular package is needed.</p>
<p>For packages relying on Buildroot packages infrastructures (see
<a href="#add_packages">this section</a> for details), the
- following stamp files are relevent:</p>
+ following stamp files are relevant:</p>
<ul>
@@ -704,7 +704,7 @@
<p>The toolchain generated by Buildroot is located by default in
<code>output/staging/</code>. The simplest way to use it
is to add <code>output/staging/usr/bin/</code> to your PATH
- environnement variable and then to use
+ environment variable and then to use
<code>ARCH-linux-gcc</code>, <code>ARCH-linux-objdump</code>,
<code>ARCH-linux-ld</code>, etc. </p>
@@ -885,7 +885,7 @@
href="#generic-reference">reference</a>.</li>
<li>Makefiles for autotools-based (autoconf, automake, etc.)
- softwares. We provide a dedicated infrastructure for such
+ software. We provide a dedicated infrastructure for such
packages, since autotools is a very common build system. This
infrastructure <i>must</i> be used for new packages that rely on
the autotools as their build system.<br/>We cover them through a
@@ -1614,8 +1614,8 @@
gettext library should not be compiled, because it creates various
kind of build failures.</p>
- <p>Additionnaly, some packages (such as libglib2) do require
- gettext unconditionnally, while other packages (those who
+ <p>Additionally, some packages (such as libglib2) do require
+ gettext unconditionally, while other packages (those who
support <code>--disable-nls</code> in general) only require
gettext when locale support is enabled.</p>
@@ -1631,7 +1631,7 @@
</ul>
- <p>Therefore, packages that unconditionnally need gettext should:</p>
+ <p>Therefore, packages that unconditionally need gettext should:</p>
<ol>
<li>Use <code>select BR2_PACKAGE_GETTEXT if
^ permalink raw reply
* [Buildroot] [git commit master 1/1] docs/news.html: typo, fix Thomas' family name
From: Peter Korsgaard @ 2010-09-28 12:03 UTC (permalink / raw)
To: buildroot
commit: http://git.buildroot.net/buildroot/commit/?id=a70d443483b360a0cc0ca1759e9a410b7855dbe8
branch: http://git.buildroot.net/buildroot/commit/?id=refs/heads/master
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
docs/news.html | 2 +-
1 files changed, 1 insertions(+), 1 deletions(-)
diff --git a/docs/news.html b/docs/news.html
index 8bfc226..43beac8 100644
--- a/docs/news.html
+++ b/docs/news.html
@@ -17,7 +17,7 @@
<a href="http://lists.busybox.net/pipermail/buildroot/2010-September/037930.html">announcement</a>
for more info.</p>
- <p>Thanks to Thomas Petazzon for taking care of the practical
+ <p>Thanks to Thomas Petazzoni for taking care of the practical
arrangements.</p>
<li><b>31 August 2010 -- 2010.08 released</b>
--
1.7.1
^ permalink raw reply related
* [Buildroot] [PATCH] matchbox-common was missing in Config.in
From: Paulius Zaleckas @ 2010-09-28 11:52 UTC (permalink / raw)
To: buildroot
While at it add option to install PDA style desktop folders.
Signed-off-by: Paulius Zaleckas <paulius.zaleckas@gmail.com>
---
package/matchbox/Config.in | 10 ++++++++++
.../matchbox/matchbox-common/matchbox-common.mk | 4 ++++
2 files changed, 14 insertions(+), 0 deletions(-)
diff --git a/package/matchbox/Config.in b/package/matchbox/Config.in
index 43189ca..e4b6149 100644
--- a/package/matchbox/Config.in
+++ b/package/matchbox/Config.in
@@ -22,6 +22,16 @@ config BR2_PACKAGE_MATCHBOX_DESKTOP
help
A PDA style application launcher or 'item browser'.
+config BR2_PACKAGE_MATCHBOX_COMMON
+ bool "Matchbox session common files"
+ depends on BR2_PACKAGE_MATCHBOX && BR2_PACKAGE_MATCHBOX_PANEL && BR2_PACKAGE_MATCHBOX_DESKTOP
+ help
+ Common desktop folders and matchbox-session script.
+
+config BR2_PACKAGE_MATCHBOX_COMMON_PDA
+ bool "PDA style desktop folders"
+ depends on BR2_PACKAGE_MATCHBOX_COMMON
+
config BR2_PACKAGE_MATCHBOX_KEYBOARD
bool "Matchbox Virtual Keyboard"
depends on BR2_PACKAGE_MATCHBOX
diff --git a/package/matchbox/matchbox-common/matchbox-common.mk b/package/matchbox/matchbox-common/matchbox-common.mk
index 81a1729..d35d11b 100644
--- a/package/matchbox/matchbox-common/matchbox-common.mk
+++ b/package/matchbox/matchbox-common/matchbox-common.mk
@@ -9,6 +9,10 @@ MATCHBOX_COMMON_SOURCE = matchbox-common-$(MATCHBOX_COMMON_VERSION).tar.bz2
MATCHBOX_COMMON_SITE = http://matchbox-project.org/sources/matchbox-common/$(MATCHBOX_COMMON_VERSION)
MATCHBOX_COMMON_DEPENDENCIES = matchbox-lib
+ifeq ($(strip $(BR2_PACKAGE_MATCHBOX_COMMON_PDA)),y)
+ MATCHBOX_COMMON_CONF_OPT += --enable-pda-folders
+endif
+
#############################################################
$(eval $(call AUTOTARGETS,package/matchbox,matchbox-common))
^ permalink raw reply related
* [Buildroot] [PATCH] xterm: should select libXaw and bump to latest version
From: Paulius Zaleckas @ 2010-09-28 11:52 UTC (permalink / raw)
To: buildroot
Signed-off-by: Paulius Zaleckas <paulius.zaleckas@gmail.com>
---
package/xterm/Config.in | 1 +
package/xterm/xterm.mk | 4 ++--
2 files changed, 3 insertions(+), 2 deletions(-)
diff --git a/package/xterm/Config.in b/package/xterm/Config.in
index da3e9fe..9473fad 100644
--- a/package/xterm/Config.in
+++ b/package/xterm/Config.in
@@ -1,5 +1,6 @@
config BR2_PACKAGE_XTERM
bool "xterm"
+ select BR2_PACKAGE_XLIB_LIBXAW
depends on BR2_PACKAGE_XORG7
help
xterm terminal emulator
diff --git a/package/xterm/xterm.mk b/package/xterm/xterm.mk
index b07eda4..8952e24 100644
--- a/package/xterm/xterm.mk
+++ b/package/xterm/xterm.mk
@@ -4,10 +4,10 @@
#
#############################################################
-XTERM_VERSION:=259
+XTERM_VERSION:=262
XTERM_SOURCE:=xterm-$(XTERM_VERSION).tgz
XTERM_SITE:=ftp://invisible-island.net/xterm
-XTERM_DEPENDENCIES = xserver_xorg-server
+XTERM_DEPENDENCIES = xserver_xorg-server xlib_libXaw
XTERM_INSTALL_TARGET_OPT = DESTDIR=$(TARGET_DIR) install
$(eval $(call AUTOTARGETS,package,xterm))
^ permalink raw reply related
* [Buildroot] [PATCH] package/config: .gitignore cleanup
From: Paulius Zaleckas @ 2010-09-28 11:34 UTC (permalink / raw)
To: buildroot
Now all configure generated files go to output directory.
Signed-off-by: Paulius Zaleckas <paulius.zaleckas@gmail.com>
---
package/config/.gitignore | 24 ------------------------
1 files changed, 0 insertions(+), 24 deletions(-)
diff --git a/package/config/.gitignore b/package/config/.gitignore
index 106bc12..2694c9a 100644
--- a/package/config/.gitignore
+++ b/package/config/.gitignore
@@ -1,28 +1,4 @@
#
-# Generated files
-#
-config*
-lex.*.c
-*.tab.c
-*.tab.h
-zconf.hash.c
-*.moc
-lkc_defs.h
-gconf.glade.h
-*.pot
-*.mo
-
-#
-# configuration programs
-#
-conf
-mconf
-nconf
-qconf
-gconf
-kxgettext
-
-#
# Quilt is being used to handle the patch series
#
.pc
^ permalink raw reply related
* [Buildroot] [git commit master 1/1] news.html: Announce developer day in Cambridge, UK
From: Peter Korsgaard @ 2010-09-28 10:06 UTC (permalink / raw)
To: buildroot
commit: http://git.buildroot.net/buildroot/commit/?id=332ec387e2743b35550a11ebd555c4babfb135ee
branch: http://git.buildroot.net/buildroot/commit/?id=refs/heads/master
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
docs/news.html | 14 ++++++++++++++
1 files changed, 14 insertions(+), 0 deletions(-)
diff --git a/docs/news.html b/docs/news.html
index 9545b86..8bfc226 100644
--- a/docs/news.html
+++ b/docs/news.html
@@ -6,6 +6,20 @@
<ul>
+ <li><b>28 September 2010 - Buildroot Developer Day</b>
+
+ <p>A <i>Buildroot Developer Day</i> will take place on
+ Friday, October 29th in Cambridge, UK - Just the day after the
+ <a href="http://www.embeddedlinuxconference.com/elc_europe10/">Embedded
+ Linux Conference Europe</a>. This <i>Developer Day</i> aims
+ at allowing Buildroot developers to meet and exchange ideas on the
+ project and its future. See the
+ <a href="http://lists.busybox.net/pipermail/buildroot/2010-September/037930.html">announcement</a>
+ for more info.</p>
+
+ <p>Thanks to Thomas Petazzon for taking care of the practical
+ arrangements.</p>
+
<li><b>31 August 2010 -- 2010.08 released</b>
<p>The stable 2010.08 release is out - Thanks to everyone
--
1.7.1
^ permalink raw reply related
* [Buildroot] Buildroot Developer Day at ELCE, October 29th
From: Thomas Petazzoni @ 2010-09-28 8:37 UTC (permalink / raw)
To: buildroot
Hello,
As announced in June [1], we are organizing a "Buildroot Developer Day"
in Cambridge, UK, on Friday 29th October. This date and location has
been choosen because it is just after the Embedded Linux Conference
Europe event [2].
This Buildroot Developer Day is open to Buildroot developers, and will
allow to discuss Buildroot current issues, Buildroot future, etc. Even
if you can't make it to the event, feel free to share your ideas and
wishes about Buildroot before that date so that your suggestions can be
discussed during the Developer Day.
For the moment, I've noted the participation of :
1. Peter Korsgaard
2. Yann E. Morin
3. Lionel Landwerlin
4. Thomas Petazzoni
We have a few places available, so don't hesitate to candidate if
you're an active Buildroot developer/contributor/user.
The event will take place at CB2 Bistro <http://www.cb2bistro.com/>,
and will start at 10 AM (the time at which CB2 opens). This place will
offer us: free Internet access, possibility of drinks and lunch.
Regards,
Thomas
[1] http://lists.busybox.net/pipermail/buildroot/2010-June/035491.html
[2] http://www.embeddedlinuxconference.com/elc_europe10/index.html
--
Thomas Petazzoni, Free Electrons
Kernel, drivers, real-time and embedded Linux
development, consulting, training and support.
http://free-electrons.com
^ permalink raw reply
* [Buildroot] menuconfig fails to compile
From: Bjørn Forsman @ 2010-09-28 8:24 UTC (permalink / raw)
To: buildroot
In-Reply-To: <4CA19CB9.2040107@gmail.com>
On 28 September 2010 09:43, Paulius Zaleckas <paulius.zaleckas@gmail.com> wrote:
> I have just did git pull and now menuconfig fails to compile:
>
> [paulius at pauliusz buildroot]$ make
> /usr/bin/make -j2 ?silentoldconfig
> make[1]: Entering directory `/home/paulius/buildroot'
> mkdir -p /home/paulius/buildroot/output/build/buildroot-config/lxdialog
> /usr/bin/make CC="/usr/bin/gcc"
> obj=/home/paulius/buildroot/output/build/buildroot-config -C package/config
> -f Makefile.br conf
> make[2]: Entering directory `/home/paulius/buildroot/package/config'
> /usr/bin/gcc -I/usr/include/ncurses -DCURSES_LOC="<ncurses.h>" -DLOCALE
> ?-I/home/paulius/buildroot/output/build/buildroot-config -g -O2 -MM *.c >
> /home/paulius/buildroot/output/build/buildroot-config/.depend 2>/dev/null ||
> :
> make[2]: Leaving directory `/home/paulius/buildroot/package/config'
> make[2]: Entering directory `/home/paulius/buildroot/package/config'
> /usr/bin/gcc -I/usr/include/ncurses -DCURSES_LOC="<ncurses.h>" -DLOCALE
> ?-I/home/paulius/buildroot/output/build/buildroot-config -g -O2 ?-c conf.c
> -o /home/paulius/buildroot/output/build/buildroot-config/conf.o
> /usr/bin/gcc -I/usr/include/ncurses -DCURSES_LOC="<ncurses.h>" -DLOCALE
> ?-I/home/paulius/buildroot/output/build/buildroot-config -g -O2 ?-c
> kxgettext.c -o
> /home/paulius/buildroot/output/build/buildroot-config/kxgettext.o
> /usr/bin/gcc -I/usr/include/ncurses -DCURSES_LOC="<ncurses.h>" -DLOCALE
> ?-I/home/paulius/buildroot/output/build/buildroot-config -g -O2 -I. -c
> zconf.tab.c -o
> /home/paulius/buildroot/output/build/buildroot-config/zconf.tab.o
> zconf.tab.c:181: error: conflicting types for ?symbol_hash?
> lkc_proto.h:27: note: previous declaration of ?symbol_hash? was here
> make[2]: ***
> [/home/paulius/buildroot/output/build/buildroot-config/zconf.tab.o] Error 1
> make[2]: Leaving directory `/home/paulius/buildroot/package/config'
> make[1]: *** [/home/paulius/buildroot/output/build/buildroot-config/conf]
> Error 2
> make[1]: Leaving directory `/home/paulius/buildroot'
> make: *** [/home/paulius/buildroot/output/build/buildroot-config/auto.conf]
> Error 2
I just had the same issue. To fix it:
rm package/config/zconf.tab.c
and rebuild.
Best regards,
Bj?rn Forsman
^ permalink raw reply
* [Buildroot] menuconfig fails to compile
From: Lionel Landwerlin @ 2010-09-28 7:54 UTC (permalink / raw)
To: buildroot
In-Reply-To: <4CA19CB9.2040107@gmail.com>
Again, this is due to the kconfig update, you have to cleanup your
repository to fix that.
Regards,
--
Lionel Landwerlin
On Tue, Sep 28, 2010 at 9:43 AM, Paulius Zaleckas
<paulius.zaleckas@gmail.com> wrote:
> I have just did git pull and now menuconfig fails to compile:
>
> [paulius at pauliusz buildroot]$ make
> /usr/bin/make -j2 ?silentoldconfig
> make[1]: Entering directory `/home/paulius/buildroot'
> mkdir -p /home/paulius/buildroot/output/build/buildroot-config/lxdialog
> /usr/bin/make CC="/usr/bin/gcc"
> obj=/home/paulius/buildroot/output/build/buildroot-config -C package/config
> -f Makefile.br conf
> make[2]: Entering directory `/home/paulius/buildroot/package/config'
> /usr/bin/gcc -I/usr/include/ncurses -DCURSES_LOC="<ncurses.h>" -DLOCALE
> ?-I/home/paulius/buildroot/output/build/buildroot-config -g -O2 -MM *.c >
> /home/paulius/buildroot/output/build/buildroot-config/.depend 2>/dev/null ||
> :
> make[2]: Leaving directory `/home/paulius/buildroot/package/config'
> make[2]: Entering directory `/home/paulius/buildroot/package/config'
> /usr/bin/gcc -I/usr/include/ncurses -DCURSES_LOC="<ncurses.h>" -DLOCALE
> ?-I/home/paulius/buildroot/output/build/buildroot-config -g -O2 ?-c conf.c
> -o /home/paulius/buildroot/output/build/buildroot-config/conf.o
> /usr/bin/gcc -I/usr/include/ncurses -DCURSES_LOC="<ncurses.h>" -DLOCALE
> ?-I/home/paulius/buildroot/output/build/buildroot-config -g -O2 ?-c
> kxgettext.c -o
> /home/paulius/buildroot/output/build/buildroot-config/kxgettext.o
> /usr/bin/gcc -I/usr/include/ncurses -DCURSES_LOC="<ncurses.h>" -DLOCALE
> ?-I/home/paulius/buildroot/output/build/buildroot-config -g -O2 -I. -c
> zconf.tab.c -o
> /home/paulius/buildroot/output/build/buildroot-config/zconf.tab.o
> zconf.tab.c:181: error: conflicting types for ?symbol_hash?
> lkc_proto.h:27: note: previous declaration of ?symbol_hash? was here
> make[2]: ***
> [/home/paulius/buildroot/output/build/buildroot-config/zconf.tab.o] Error 1
> make[2]: Leaving directory `/home/paulius/buildroot/package/config'
> make[1]: *** [/home/paulius/buildroot/output/build/buildroot-config/conf]
> Error 2
> make[1]: Leaving directory `/home/paulius/buildroot'
> make: *** [/home/paulius/buildroot/output/build/buildroot-config/auto.conf]
> Error 2
> _______________________________________________
> buildroot mailing list
> buildroot at busybox.net
> http://lists.busybox.net/mailman/listinfo/buildroot
>
^ permalink raw reply
* [Buildroot] menuconfig fails to compile
From: Paulius Zaleckas @ 2010-09-28 7:43 UTC (permalink / raw)
To: buildroot
I have just did git pull and now menuconfig fails to compile:
[paulius at pauliusz buildroot]$ make
/usr/bin/make -j2 silentoldconfig
make[1]: Entering directory `/home/paulius/buildroot'
mkdir -p /home/paulius/buildroot/output/build/buildroot-config/lxdialog
/usr/bin/make CC="/usr/bin/gcc"
obj=/home/paulius/buildroot/output/build/buildroot-config -C
package/config -f Makefile.br conf
make[2]: Entering directory `/home/paulius/buildroot/package/config'
/usr/bin/gcc -I/usr/include/ncurses -DCURSES_LOC="<ncurses.h>" -DLOCALE
-I/home/paulius/buildroot/output/build/buildroot-config -g -O2 -MM *.c
> /home/paulius/buildroot/output/build/buildroot-config/.depend
2>/dev/null || :
make[2]: Leaving directory `/home/paulius/buildroot/package/config'
make[2]: Entering directory `/home/paulius/buildroot/package/config'
/usr/bin/gcc -I/usr/include/ncurses -DCURSES_LOC="<ncurses.h>" -DLOCALE
-I/home/paulius/buildroot/output/build/buildroot-config -g -O2 -c
conf.c -o /home/paulius/buildroot/output/build/buildroot-config/conf.o
/usr/bin/gcc -I/usr/include/ncurses -DCURSES_LOC="<ncurses.h>" -DLOCALE
-I/home/paulius/buildroot/output/build/buildroot-config -g -O2 -c
kxgettext.c -o
/home/paulius/buildroot/output/build/buildroot-config/kxgettext.o
/usr/bin/gcc -I/usr/include/ncurses -DCURSES_LOC="<ncurses.h>" -DLOCALE
-I/home/paulius/buildroot/output/build/buildroot-config -g -O2 -I. -c
zconf.tab.c -o
/home/paulius/buildroot/output/build/buildroot-config/zconf.tab.o
zconf.tab.c:181: error: conflicting types for ?symbol_hash?
lkc_proto.h:27: note: previous declaration of ?symbol_hash? was here
make[2]: ***
[/home/paulius/buildroot/output/build/buildroot-config/zconf.tab.o] Error 1
make[2]: Leaving directory `/home/paulius/buildroot/package/config'
make[1]: ***
[/home/paulius/buildroot/output/build/buildroot-config/conf] Error 2
make[1]: Leaving directory `/home/paulius/buildroot'
make: ***
[/home/paulius/buildroot/output/build/buildroot-config/auto.conf] Error 2
^ permalink raw reply
* [Buildroot] [git commit master 1/1] dropbear: fix xauth tweak since dbcec2b2
From: Peter Korsgaard @ 2010-09-28 7:22 UTC (permalink / raw)
To: buildroot
commit: http://git.buildroot.net/buildroot/commit/?id=d5576fd2f084b1c51a51f14b278b99215366ca80
branch: http://git.buildroot.net/buildroot/commit/?id=refs/heads/master
The recent conversion to new-style hooks didn't actually enable the
xauth tweaking. Also rename to FIX_XAUTH as it just tweaks the path,
it doesn't disable anything.
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
package/dropbear/dropbear.mk | 4 ++--
1 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/package/dropbear/dropbear.mk b/package/dropbear/dropbear.mk
index 0b0d4c7..0457935 100644
--- a/package/dropbear/dropbear.mk
+++ b/package/dropbear/dropbear.mk
@@ -17,11 +17,11 @@ DROPBEAR_CONF_ENV = ac_cv_type_struct_sockaddr_storage=yes
DROPBEAR_MAKE = $(MAKE) MULTI=1 SCPPROGRESS=1 \
PROGRAMS="dropbear dbclient dropbearkey dropbearconvert scp"
-define DROPBEAR_DISABLE_XAUTH
+define DROPBEAR_FIX_XAUTH
$(SED) 's,^#define XAUTH_COMMAND.*/xauth,#define XAUTH_COMMAND "/usr/bin/xauth,g' $(@D)/options.h
endef
-DROPBEAR_POST_EXTRACT_HOOKS += DROPBEAR_ADJUST_OPTIONS
+DROPBEAR_POST_EXTRACT_HOOKS += DROPBEAR_FIX_AUTH
define DROPBEAR_DISABLE_REVERSE_DNS
$(SED) 's,^#define DO_HOST_LOOKUP.*,/* #define DO_HOST_LOOKUP */,' $(@D)/options.h
--
1.7.1
^ permalink raw reply related
* [Buildroot] [PATCH] introducing transmission bittorrent client
From: Marcus Osdoba @ 2010-09-27 21:46 UTC (permalink / raw)
To: buildroot
In-Reply-To: <AANLkTi=D9f0qz=DsgeX-hwZPwxvSsp-nncS+r0BiqP0y@mail.gmail.com>
Am 21.09.2010 04:00, schrieb Kelvin Cheung:
> Hi Marcus,
>
> I have tried the patch.
> It works fine.
Hi Kelvin,
I don't know why, but the transmission daemon is not able to create the
temporary torrent and resume file.
All other config files were written without problems in the given
config-dir. I haven't forwarded a specific port to the machine where
embedded transmission runs on - until now.
Why won't transmssion write the temporary files? Or is it correct
behaviour? I'm confused about "Couldn't save & Success" in the same
status line.
Did you encounter similar errors with your installation?
Btw: Thomas preferres another solution for the init-d skript (without
sleep 5 init). I wasn't able to figure out clearly, why and where the
IP_ADDR variable is used, so I'm experimenting with the "official"
init-d-skript from the transmission wiki.
Would this be a problem in your eyes?
Kind regards,
Marcus
$ /usr/bin/transmission-daemon -f -a 192.168.1.* --config-dir=/data
[23:32:24.095] Transmission 2.04 (11151) started (session.c:622)
[23:32:24.097] RPC Server Adding address to whitelist: 192.168.1.*
(rpc-server.c:767)
[23:32:24.100] RPC Server Serving RPC and Web requests on port 9091
(rpc-server.c:940)
[23:32:24.102] RPC Server Whitelist enabled (rpc-server.c:944)
[23:32:24.104] DHT Generating new id (tr-dht.c:378)
[23:32:24.106] Port Forwarding (NAT-PMP) initnatpmp succeeded (0)
(natpmp.c:67)
[23:32:24.108] Port Forwarding (NAT-PMP) sendpublicaddressrequest
succeeded (2) (natpmp.c:67)
[23:32:24.110] Using settings from "/data" (daemon.c:443)
[23:32:24.113] Saved "/data/settings.json" (bencode.c:1651)
[23:32:25.116] Port Forwarding (UPnP) Found Internet Gateway Device
"http://192.168.1.1:49000/upnp/control/WANIPConn1" (upnp.c:113)
[23:32:25.118] Port Forwarding (UPnP) Local Address is "192.168.1.254"
(upnp.c:115)
[23:32:25.120] Port Forwarding (UPnP) Port forwarding through
"http://192.168.1.1:49000/upnp/control/WANIPConn1", service
"urn:schemas-upnp-org:service:WANIPConnection:1". (local address:
192.168.1.254:51413) (upnp.c:202)
[23:32:25.123] Port Forwarding State changed from "Not forwarded" to
"Starting" (port-forwarding.c:89)
[23:32:31.126] Port Forwarding State changed from "Starting" to "???"
(port-forwarding.c:89)
[23:32:59.130] DHT Attempting bootstrap from dht.transmissionbt.com
(tr-dht.c:234)
[23:33:16.135] Couldn't save file
"/data/torrents/evbarmcd-5.0.2.iso.9fe3ef5b5a32e862.torrent": Success
(bencode.c:1663)
[23:33:34.139] evbarmcd-5.0.2.iso Starting DHT announce (poor, 9 nodes)
(tr-dht.c:669)
[23:34:23.146] Couldn't save file
"/data/resume/evbarmcd-5.0.2.iso.9fe3ef5b5a32e862.resume": Success
(bencode.c:1663)
[23:35:04.151] evbarmcd-5.0.2.iso Removing torrent (torrent.c:1557)
[23:35:04.154] evbarmcd-5.0.2.iso Pausing (torrent.c:1513)
Closing transmission session... done.
^ permalink raw reply
* [Buildroot] [git commit master 1/1] hdparm: convert to gentargets and bump to 9.32
From: Peter Korsgaard @ 2010-09-27 21:24 UTC (permalink / raw)
To: buildroot
commit: http://git.buildroot.net/buildroot/commit/?id=3a19ee499bec80d896c0e23c21ae206c6a2d91bd
branch: http://git.buildroot.net/buildroot/commit/?id=refs/heads/master
[Peter: remove stripping, get rid of _BINARY variables]
Signed-off-by: Martin Banky <Martin.Banky@gmail.com>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
CHANGES | 2 +-
package/hdparm/hdparm.mk | 59 +++++++++++++++---------------------------
package/hdparm/hdparm.patch | 12 --------
3 files changed, 22 insertions(+), 51 deletions(-)
delete mode 100644 package/hdparm/hdparm.patch
diff --git a/CHANGES b/CHANGES
index a446905..6e6539c 100644
--- a/CHANGES
+++ b/CHANGES
@@ -25,7 +25,7 @@
bootutils, bridge-utils, bsdiff, busybox, dbus, dmraid,
docker, dosfstools, dropbear, e2fsprogs, expat, ezxml, fbset,
ffmpeg, freetype, gamin, gawk, gperf, gtk2-themes, gtkperf,
- gvfs, haserl, hostapd, hwdata, ifplugd, iperf, iproute2,
+ gvfs, haserl, hdparm, hostapd, hwdata, ifplugd, iperf, iproute2,
iptables, jpeg, kexec, kismet, less, libcgi, libcurl, libdnet,
libevent, libglade, libgtk2, libiconv, libidn, libmms, libnl,
liboil, libpcap, libpng, libtool, libungif, libxml2, libxslt,
diff --git a/package/hdparm/hdparm.mk b/package/hdparm/hdparm.mk
index cc747eb..02d76a9 100644
--- a/package/hdparm/hdparm.mk
+++ b/package/hdparm/hdparm.mk
@@ -3,51 +3,34 @@
# hdparm
#
#############################################################
-HDPARM_VERSION:=7.7
-HDPARM_SOURCE:=hdparm-$(HDPARM_VERSION).tar.gz
-HDPARM_SITE:=http://$(BR2_SOURCEFORGE_MIRROR).dl.sourceforge.net/sourceforge/hdparm
-HDPARM_CAT:=$(ZCAT)
-HDPARM_DIR:=$(BUILD_DIR)/hdparm-$(HDPARM_VERSION)
-HDPARM_BINARY:=hdparm
-HDPARM_TARGET_BINARY:=sbin/hdparm
+HDPARM_VERSION = 9.32
+HDPARM_SOURCE = hdparm-$(HDPARM_VERSION).tar.gz
+HDPARM_SITE = http://$(BR2_SOURCEFORGE_MIRROR).dl.sourceforge.net/sourceforge/hdparm
-$(DL_DIR)/$(HDPARM_SOURCE):
- $(call DOWNLOAD,$(HDPARM_SITE),$(HDPARM_SOURCE))
-
-hdparm-source: $(DL_DIR)/$(HDPARM_SOURCE)
-
-$(HDPARM_DIR)/.unpacked: $(DL_DIR)/$(HDPARM_SOURCE)
- $(HDPARM_CAT) $(DL_DIR)/$(HDPARM_SOURCE) | tar -C $(BUILD_DIR) $(TAR_OPTIONS) -
- toolchain/patch-kernel.sh $(HDPARM_DIR) package/hdparm \*.patch
- touch $@
-
-$(HDPARM_DIR)/$(HDPARM_BINARY): $(HDPARM_DIR)/.unpacked
- $(MAKE) $(TARGET_CONFIGURE_OPTS) -C $(HDPARM_DIR) \
+define HDPARM_BUILD_CMDS
+ $(MAKE) $(TARGET_CONFIGURE_OPTS) -C $(@D) \
CFLAGS="$(TARGET_CFLAGS)" \
LDFLAGS="$(TARGET_LDFLAGS)"
+endef
-$(TARGET_DIR)/$(HDPARM_TARGET_BINARY): $(HDPARM_DIR)/$(HDPARM_BINARY)
- rm -f $(TARGET_DIR)/$(HDPARM_TARGET_BINARY)
- $(INSTALL) -D -m 0755 $(HDPARM_DIR)/$(HDPARM_BINARY) $(TARGET_DIR)/$(HDPARM_TARGET_BINARY)
ifeq ($(BR2_HAVE_DOCUMENTATION),y)
- $(INSTALL) -D $(HDPARM_DIR)/hdparm.8 $(TARGET_DIR)/usr/share/man/man8/hdparm.8
+define HDPARM_INSTALL_DOCUMENTATION
+ $(INSTALL) -D $(@D)/hdparm.8 $(TARGET_DIR)/usr/share/man/man8/hdparm.8
+endef
endif
- $(STRIPCMD) $(STRIP_STRIP_ALL) $@
-hdparm: $(TARGET_DIR)/$(HDPARM_TARGET_BINARY)
+define HDPARM_INSTALL_TARGET_CMDS
+ $(INSTALL) -D -m 0755 $(@D)/hdparm $(TARGET_DIR)/sbin/hdparm
+ $(HDPARM_INSTALL_DOCUMENTATION)
+endef
-hdparm-clean:
- -$(MAKE) -C $(HDPARM_DIR) clean
- rm -f $(TARGET_DIR)/$(HDPARM_TARGET_BINARY)
+define HDPARM_UNINSTALL_TARGET_CMDS
+ rm -f $(TARGET_DIR)/sbin/hdparm
+ rm -f $(TARGET_DIR)/usr/share/man/man8/hdparm.8
+endef
-hdparm-dirclean:
- rm -rf $(HDPARM_DIR)
+define HDPARM_CLEAN_CMDS
+ -$(MAKE) -C $(@D) clean
+endef
-#############################################################
-#
-# Toplevel Makefile options
-#
-#############################################################
-ifeq ($(BR2_PACKAGE_HDPARM),y)
-TARGETS+=hdparm
-endif
+$(eval $(call GENTARGETS,package,hdparm))
diff --git a/package/hdparm/hdparm.patch b/package/hdparm/hdparm.patch
deleted file mode 100644
index d271eb8..0000000
--- a/package/hdparm/hdparm.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-diff -ur hdparm-7.6/Makefile hdparm-7.6-patched/Makefile
---- hdparm-7.6/Makefile 2007-06-07 12:39:24.000000000 -0500
-+++ hdparm-7.6-patched/Makefile 2007-07-19 12:11:03.000000000 -0500
-@@ -28,7 +28,7 @@
-
- hdparm: hdparm.h $(OBJS)
- $(CC) $(LDFLAGS) -o hdparm $(OBJS)
-- strip hdparm
-+ $(STRIP) hdparm
-
- install: all hdparm.8
- if [ ! -z $(DESTDIR) ]; then $(INSTALL_DIR) $(DESTDIR) ; fi
--
1.7.1
^ permalink raw reply related
* [Buildroot] [PATCH 13/18] hdparm: convert to gentargets and bump to 9.32
From: Peter Korsgaard @ 2010-09-27 21:20 UTC (permalink / raw)
To: buildroot
In-Reply-To: <1285485249-29212-13-git-send-email-Martin.Banky@gmail.com>
>>>>> "Martin" == Martin Banky <martin.banky@gmail.com> writes:
Martin> Signed-off-by: Martin Banky <Martin.Banky@gmail.com>
Thanks, committed with minor tweaks.
--
Bye, Peter Korsgaard
^ permalink raw reply
* [Buildroot] [git commit master 1/1] lm-sensors: full install, install into staging, make bins configurable
From: Peter Korsgaard @ 2010-09-27 21:14 UTC (permalink / raw)
To: buildroot
commit: http://git.buildroot.net/buildroot/commit/?id=e4fe19c9b4049b47f7ae14f9878805a95fef5a93
branch: http://git.buildroot.net/buildroot/commit/?id=refs/heads/master
Use make install to install so we get libraries and man pages if enabled,
install into staging so other programs can find libsensors and add kconfig
options for each of the available programs.
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
package/lm-sensors/Config.in | 41 ++++++++++++++++++++++++++++++++++++++
package/lm-sensors/lm-sensors.mk | 37 +++++++++++++++++++++++-----------
2 files changed, 66 insertions(+), 12 deletions(-)
diff --git a/package/lm-sensors/Config.in b/package/lm-sensors/Config.in
index 50eac38..33c59fd 100644
--- a/package/lm-sensors/Config.in
+++ b/package/lm-sensors/Config.in
@@ -8,3 +8,44 @@ config BR2_PACKAGE_LM_SENSORS
http://www.lm-sensors.org/
+if BR2_PACKAGE_LM_SENSORS
+comment "lm-sensors tools"
+
+config BR2_PACKAGE_LM_SENSORS_SENSORS
+ bool "sensors"
+ default y
+ help
+ Sensors is used to show the current readings of all sensor
+ chips.
+
+config BR2_PACKAGE_LM_SENSORS_FANCONTROL
+ bool "fancontrol"
+ help
+ Script for temperature driven fan control
+
+config BR2_PACKAGE_LM_SENSORS_ISADUMP
+ bool "isadump"
+ help
+ Isadump is a small helper program to examine registers
+ visible through the ISA bus.
+
+config BR2_PACKAGE_LM_SENSORS_ISASET
+ bool "isaset"
+ help
+ Isaset is a small helper program to set register visible
+ through the ISA bus.
+
+config BR2_PACKAGE_LM_SENSORS_PWMCONFIG
+ bool "pwmconfig"
+ help
+ Pwmconfig searches your sensors for pulse width modulation (PWM)
+ controls, and tests each one to see if it controls a fan on
+ your motherboard.
+
+config BR2_PACKAGE_LM_SENSORS_SENSORS_DETECT
+ bool "sensors-detect"
+ help
+ Sensors-detect is an interactive program for detecting
+ available hardware monitoring chips.
+
+endif
diff --git a/package/lm-sensors/lm-sensors.mk b/package/lm-sensors/lm-sensors.mk
index 9eb8a87..9543d2e 100644
--- a/package/lm-sensors/lm-sensors.mk
+++ b/package/lm-sensors/lm-sensors.mk
@@ -6,27 +6,40 @@
LM_SENSORS_VERSION = 3.1.2
LM_SENSORS_SOURCE = lm_sensors-$(LM_SENSORS_VERSION).tar.bz2
LM_SENSORS_SITE = http://dl.lm-sensors.org/lm-sensors/releases
-LM_SENSORS_TARGET_BINARY = usr/bin/sensors
+LM_SENSORS_INSTALL_STAGING = YES
+
+LM_SENSORS_BINS_ = bin/sensors-conf-convert
+LM_SENSORS_BINS_$(BR2_PACKAGE_LM_SENSORS_SENSORS) += bin/sensors
+LM_SENSORS_BINS_$(BR2_PACKAGE_LM_SENSORS_FANCONTROL) += sbin/fancontrol
+LM_SENSORS_BINS_$(BR2_PACKAGE_LM_SENSORS_ISADUMP) += sbin/isadump
+LM_SENSORS_BINS_$(BR2_PACKAGE_LM_SENSORS_ISASET) += sbin/isaset
+LM_SENSORS_BINS_$(BR2_PACKAGE_LM_SENSORS_SENSORS_DETECT) += sbin/sensors-detect
define LM_SENSORS_BUILD_CMDS
- $(MAKE) $(TARGET_CONFIGURE_OPTS) MACHINE=$(KERNEL_ARCH) -C $(@D)
+ $(MAKE) $(TARGET_CONFIGURE_OPTS) MACHINE=$(KERNEL_ARCH) \
+ PREFIX=/usr -C $(@D)
+endef
+
+define LM_SENSORS_INSTALL_STAGING_CMDS
+ $(MAKE) -C $(@D) PREFIX=/usr DESTDIR=$(STAGING_DIR) install
+ rm -f $(addprefix $(STAGING_DIR)/usr/,$(LM_SENSORS_BINS_) $(LM_SENSORS_BINS_y))
+endef
+
+define LM_SENSORS_UNINSTALL_STAGING_CMDS
+ $(MAKE) -C $(@D) PREFIX=/usr DESTDIR=$(STAGING_DIR) uninstall
endef
define LM_SENSORS_INSTALL_TARGET_CMDS
- if [ ! -f $(TARGET_DIR)/etc/sensors.conf ]; then \
- cp -dpf $(@D)/etc/sensors.conf.eg $(TARGET_DIR)/etc/sensors.conf; \
- $(SED) '/^#/d' -e '/^[[:space:]]*$$/d' $(TARGET_DIR)/etc/sensors.conf; \
- fi
- cp -dpf $(@D)/prog/sensors/sensors $(TARGET_DIR)/$(LM_SENSORS_TARGET_BINARY)
- cp -dpf $(@D)/lib/libsensors.so* \
- $(@D)/lib/libsensors.a $(TARGET_DIR)/usr/lib/
+ $(MAKE) -C $(@D) PREFIX=/usr DESTDIR=$(TARGET_DIR) install
+ rm -f $(addprefix $(TARGET_DIR)/usr/,$(LM_SENSORS_BINS_))
+endef
+
+define LM_SENSORS_UNINSTALL_TARGET_CMDS
+ $(MAKE) -C $(@D) PREFIX=/usr DESTDIR=$(TARGET_DIR) uninstall
endef
define LM_SENSORS_CLEAN_CMDS
-$(MAKE) -C $(@D) clean
- rm -f $(TARGET_DIR)/$(LM_SENSORS_TARGET_BINARY) \
- $(TARGET_DIR)/usr/lib/libsensors* \
- $(TARGET_DIR)/etc/sensors.conf
endef
$(eval $(call GENTARGETS,package,lm-sensors))
--
1.7.1
^ permalink raw reply related
* [Buildroot] [git commit master 1/1] lm-sensors: convert to gentargets and bump to 3.1.2
From: Martin Banky @ 2010-09-27 21:14 UTC (permalink / raw)
To: buildroot
commit: http://git.buildroot.net/buildroot/commit/?id=fe35fdcdeccc162db614e79f984fad4d64fdb2bc
branch: http://git.buildroot.net/buildroot/commit/?id=refs/heads/master
[Peter: remove stripping]
Signed-off-by: Martin Banky <Martin.Banky@gmail.com>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
CHANGES | 16 +++++-----
package/lm-sensors/lm-sensors.mk | 64 ++++++++++---------------------------
2 files changed, 26 insertions(+), 54 deletions(-)
diff --git a/CHANGES b/CHANGES
index 375a8f7..a446905 100644
--- a/CHANGES
+++ b/CHANGES
@@ -29,14 +29,14 @@
iptables, jpeg, kexec, kismet, less, libcgi, libcurl, libdnet,
libevent, libglade, libgtk2, libiconv, libidn, libmms, libnl,
liboil, libpcap, libpng, libtool, libungif, libxml2, libxslt,
- lighttpd, lite, logrotate, m4, mdadm, mesa3d, metacity,
- mtd-utils, mysql_client, nano, nbd, ncftp, neon, netperf,
- netsnmp, ng-spice-rework, ntfsprogs, ntp, openntpd, openssh,
- openvpn, oprofile, pango, patch, pcre, php, pkg-config,
- prboom, radvd, rdesktop, ruby, qt, samba, sawman, sdl_mixer,
- sdl_sound, setserial, shared-mime-info, speex, sqlite,
- squashfs, strace, sylpheed, taglib, tcpdump, thttpd, tiff,
- tn5250, udev, udpcast, usbmount, usbutils, vsftpd, vtun,
+ lighttpd, lite, lm-sensors, logrotate, m4, mdadm, mesa3d,
+ metacity, mtd-utils, mysql_client, nano, nbd, ncftp, neon,
+ netperf, netsnmp, ng-spice-rework, ntfsprogs, ntp, openntpd,
+ openssh, openvpn, oprofile, pango, patch, pcre, php,
+ pkg-config, prboom, radvd, rdesktop, ruby, qt, samba, sawman,
+ sdl_mixer, sdl_sound, setserial, shared-mime-info, speex,
+ sqlite, squashfs, strace, sylpheed, taglib, tcpdump, thttpd,
+ tiff, tn5250, udev, udpcast, usbmount, usbutils, vsftpd, vtun,
which, wpa_supplicant,
xdriver_xf86-input-{acecad,aiptek,evdev,joystick,keyboard},
xdriver-xf86-input-{mouse,synaptics,vmmouse,void},
diff --git a/package/lm-sensors/lm-sensors.mk b/package/lm-sensors/lm-sensors.mk
index 1844f75..9eb8a87 100644
--- a/package/lm-sensors/lm-sensors.mk
+++ b/package/lm-sensors/lm-sensors.mk
@@ -3,58 +3,30 @@
# lm-sensors
#
#############################################################
-LM_SENSORS_VERSION:=3.0.2
-LM_SENSORS_SOURCE:=lm_sensors-$(LM_SENSORS_VERSION).tar.bz2
-LM_SENSORS_SITE:=http://dl.lm-sensors.org/lm-sensors/releases
-LM_SENSORS_DIR:=$(BUILD_DIR)/lm_sensors-$(LM_SENSORS_VERSION)
-LM_SENSORS_CAT:=$(BZCAT)
-LM_SENSORS_BINARY:=prog/sensors/sensors
-LM_SENSORS_TARGET_BINARY:=usr/bin/sensors
+LM_SENSORS_VERSION = 3.1.2
+LM_SENSORS_SOURCE = lm_sensors-$(LM_SENSORS_VERSION).tar.bz2
+LM_SENSORS_SITE = http://dl.lm-sensors.org/lm-sensors/releases
+LM_SENSORS_TARGET_BINARY = usr/bin/sensors
-$(DL_DIR)/$(LM_SENSORS_SOURCE):
- $(call DOWNLOAD,$(LM_SENSORS_SITE),$(LM_SENSORS_SOURCE))
+define LM_SENSORS_BUILD_CMDS
+ $(MAKE) $(TARGET_CONFIGURE_OPTS) MACHINE=$(KERNEL_ARCH) -C $(@D)
+endef
-$(LM_SENSORS_DIR)/.unpacked: $(DL_DIR)/$(LM_SENSORS_SOURCE)
- $(LM_SENSORS_CAT) $(DL_DIR)/$(LM_SENSORS_SOURCE) | tar -C $(BUILD_DIR) $(TAR_OPTIONS) -
- toolchain/patch-kernel.sh $(LM_SENSORS_DIR) package/lm-sensors/ lm-sensors\*.patch
- touch $@
-
-$(LM_SENSORS_DIR)/$(LM_SENSORS_BINARY): $(LM_SENSORS_DIR)/.unpacked
- $(MAKE) $(TARGET_CONFIGURE_OPTS) MACHINE=$(KERNEL_ARCH)\
- -C $(LM_SENSORS_DIR)
-
-$(TARGET_DIR)/$(LM_SENSORS_TARGET_BINARY): $(LM_SENSORS_DIR)/$(LM_SENSORS_BINARY)
+define LM_SENSORS_INSTALL_TARGET_CMDS
if [ ! -f $(TARGET_DIR)/etc/sensors.conf ]; then \
- cp -dpf $(LM_SENSORS_DIR)/etc/sensors.conf.eg \
- $(TARGET_DIR)/etc/sensors.conf; \
- $(SED) '/^#/d' -e '/^[[:space:]]*$$/d' \
- $(TARGET_DIR)/etc/sensors.conf; \
+ cp -dpf $(@D)/etc/sensors.conf.eg $(TARGET_DIR)/etc/sensors.conf; \
+ $(SED) '/^#/d' -e '/^[[:space:]]*$$/d' $(TARGET_DIR)/etc/sensors.conf; \
fi
- cp -dpf $(LM_SENSORS_DIR)/$(LM_SENSORS_BINARY) $@
- cp -dpf $(LM_SENSORS_DIR)/lib/libsensors.so* \
- $(LM_SENSORS_DIR)/lib/libsensors.a $(TARGET_DIR)/usr/lib/
- -$(STRIPCMD) $(STRIP_STRIP_ALL) $(TARGET_DIR)/usr/lib/libsensors.so*
- $(STRIPCMD) $(STRIP_STRIP_ALL) $@
-
-lm-sensors-source: $(DL_DIR)/$(LM_SENSORS_SOURCE) $(LM_SENSORS_PATCH_FILE)
-
-lm-sensors-unpacked: $(LM_SENSORS_DIR)/.unpacked
-
-lm-sensors: $(TARGET_DIR)/$(LM_SENSORS_TARGET_BINARY)
+ cp -dpf $(@D)/prog/sensors/sensors $(TARGET_DIR)/$(LM_SENSORS_TARGET_BINARY)
+ cp -dpf $(@D)/lib/libsensors.so* \
+ $(@D)/lib/libsensors.a $(TARGET_DIR)/usr/lib/
+endef
-lm-sensors-clean:
- -$(MAKE) -C $(LM_SENSORS_DIR) clean
+define LM_SENSORS_CLEAN_CMDS
+ -$(MAKE) -C $(@D) clean
rm -f $(TARGET_DIR)/$(LM_SENSORS_TARGET_BINARY) \
$(TARGET_DIR)/usr/lib/libsensors* \
$(TARGET_DIR)/etc/sensors.conf
+endef
-lm-sensors-dirclean:
- rm -rf $(LM_SENSORS_DIR)
-#############################################################
-#
-# Toplevel Makefile options
-#
-#############################################################
-ifeq ($(BR2_PACKAGE_LM_SENSORS),y)
-TARGETS+=lm-sensors
-endif
+$(eval $(call GENTARGETS,package,lm-sensors))
--
1.7.1
^ permalink raw reply related
* [Buildroot] [PATCH 16/18] lm-sensors: convert to gentargets and bump to 3.1.2
From: Peter Korsgaard @ 2010-09-27 20:48 UTC (permalink / raw)
To: buildroot
In-Reply-To: <1285485249-29212-16-git-send-email-Martin.Banky@gmail.com>
>>>>> "Martin" == Martin Banky <martin.banky@gmail.com> writes:
Martin> Signed-off-by: Martin Banky <Martin.Banky@gmail.com>
Martin> ---
Martin> package/lm-sensors/lm-sensors.mk | 65 +++++++++++--------------------------
Thanks, committed with minor tweaks.
--
Bye, Peter Korsgaard
^ permalink raw reply
* [Buildroot] [git commit master 1/1] packages: remove unneeded _INSTALL_TARGET_OPT definitions
From: Thomas Petazzoni @ 2010-09-27 20:34 UTC (permalink / raw)
To: buildroot
commit: http://git.buildroot.net/buildroot/commit/?id=478ea1a12dffca0025c0ad55ad702cbaec465f93
branch: http://git.buildroot.net/buildroot/commit/?id=refs/heads/master
Now that <pkg>_INSTALL_TARGET_OPT always defaults to
'DESTDIR=$(TARGET_DIR) install', we can remove the
<pkg>_INSTALL_TARGET_OPT definition from a lot of packages.
Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
Patch is too large, so refusing to show it
^ permalink raw reply
* [Buildroot] [git commit master 1/1] CHANGES: update with recent development
From: Peter Korsgaard @ 2010-09-27 20:34 UTC (permalink / raw)
To: buildroot
commit: http://git.buildroot.net/buildroot/commit/?id=edfb1264efa075c1cf59e7a0f9ca626e799af54d
branch: http://git.buildroot.net/buildroot/commit/?id=refs/heads/master
Add changes from no-install-strip branch and add #2563.
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
CHANGES | 39 +++++++++++++++++++++++++++------------
1 files changed, 27 insertions(+), 12 deletions(-)
diff --git a/CHANGES b/CHANGES
index 8677189..375a8f7 100644
--- a/CHANGES
+++ b/CHANGES
@@ -20,20 +20,34 @@
New packages: xz
- Updated/fixed packages: alsa-lib, at, avahi, axel, berkeleydb,
- bind, bmon, boa, bridge-utils, bsdiff, busybox, dbus, dmraid,
+ Updated/fixed packages: alsa-lib, argus, at, autoconf,
+ automake, avahi, axel, beecrypt, berkeleydb, bind, bmon, boa,
+ bootutils, bridge-utils, bsdiff, busybox, dbus, dmraid,
docker, dosfstools, dropbear, e2fsprogs, expat, ezxml, fbset,
- freetype, gawk, gvfs, haserl, hostapd, hwdata, ifplugd, iperf,
- iproute2, iptables, jpeg, kexec, kismet, less, libcurl,
- libdnet, libevent, libglade, libgtk2, libiconv, libidn,
- libmms, libnl, liboil, libpcap, libpng, libungif, libxml2,
- libxslt, lighttpd, lite, logrotate, m4, mdadm, metacity,
+ ffmpeg, freetype, gamin, gawk, gperf, gtk2-themes, gtkperf,
+ gvfs, haserl, hostapd, hwdata, ifplugd, iperf, iproute2,
+ iptables, jpeg, kexec, kismet, less, libcgi, libcurl, libdnet,
+ libevent, libglade, libgtk2, libiconv, libidn, libmms, libnl,
+ liboil, libpcap, libpng, libtool, libungif, libxml2, libxslt,
+ lighttpd, lite, logrotate, m4, mdadm, mesa3d, metacity,
mtd-utils, mysql_client, nano, nbd, ncftp, neon, netperf,
- ntfsprogs, ntp, openntpd, openssh, openvpn, oprofile, pango,
- pcre, php, prboom, radvd, qt, samba, sdl_mixer, sdl_sound,
- shared-mime-info, speex, sqlite, squashfs, strace, taglib,
- tcpdump, thttpd, tiff, tn5250, udev, udpcast, usbmount,
- usbutils, vsftpd, which, xlib_libX11, zlib
+ netsnmp, ng-spice-rework, ntfsprogs, ntp, openntpd, openssh,
+ openvpn, oprofile, pango, patch, pcre, php, pkg-config,
+ prboom, radvd, rdesktop, ruby, qt, samba, sawman, sdl_mixer,
+ sdl_sound, setserial, shared-mime-info, speex, sqlite,
+ squashfs, strace, sylpheed, taglib, tcpdump, thttpd, tiff,
+ tn5250, udev, udpcast, usbmount, usbutils, vsftpd, vtun,
+ which, wpa_supplicant,
+ xdriver_xf86-input-{acecad,aiptek,evdev,joystick,keyboard},
+ xdriver-xf86-input-{mouse,synaptics,vmmouse,void},
+ xdriver-xf86-video-{apm,ark,ast,ati,chips,cirrus,dummy,fbdev},
+ xdriver-xf86-video-{geode,glide,glint,i128,i740,intel,mach64},
+ xdriver-xf86-video-{mga,neomagic,newport,nv,openchrome,r128},
+ xdriver-xf86-video-{rendition,s3,s3virge,savage,siliconmotion},
+ xdriver-xf86-video-{sis,sisusb,suncg3,suncg6,suncg14,sunffb},
+ xdriver-xf86-video-{sunleo,suntcx,tdfx,tga,trident,v4l,vesa},
+ xdriver-xf86-video-{vmware,voodeo,wsfb,xgi,xgixp},
+ xkeyboard-config, xlib_libX11, xstroke, xvkbd, zlib
Deprecated packages: hotplug, lzma
@@ -43,6 +57,7 @@
Issues resolved (http://bugs.uclibc.org):
#2521: Can't compile sdl_mixer, mikmod.h can't be found
+ #2563: [PATCH] cairo: Expose the configure option to disable some...
#2581: libmms: Update to 0.6, and patch to work on architectures...
2010.08: Released August 31th, 2010:
--
1.7.1
^ permalink raw reply related
* [Buildroot] [git commit master 1/1] docs/buildroot.html: document Makefile wrapper in output dir
From: Peter Korsgaard @ 2010-09-27 20:34 UTC (permalink / raw)
To: buildroot
commit: http://git.buildroot.net/buildroot/commit/?id=1110062e465354fdee9ee887024f4a58783533c6
branch: http://git.buildroot.net/buildroot/commit/?id=refs/heads/master
For out-of-tree builds.
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
docs/buildroot.html | 17 ++++++++++++++++-
1 files changed, 16 insertions(+), 1 deletions(-)
diff --git a/docs/buildroot.html b/docs/buildroot.html
index edb75b1..b7a8641 100644
--- a/docs/buildroot.html
+++ b/docs/buildroot.html
@@ -278,15 +278,30 @@ or
$ make O=/tmp/build
</pre>
+ <p>Or:</p>
+
+<pre>
+ $ cd /tmp/build; make O=$PWD -C path/to/buildroot
+</pre>
+
<p>All the output files will be located under
<code>/tmp/build</code>.</p>
<p>When using out-of-tree builds, the Buildroot
- <code>.config</code> and temporary files are also stored in the
+ <code>.config</code> and temporary files are also stored in the
output directory. This means that you can safely run multiple
builds in parallel using the same source tree as long as they use
unique output directories.</p>
+ <p>For ease of use, Buildroot generates a Makefile wrapper in the
+ output directory - So after the first run, you no longer need to
+ pass <code>O=..</code> and <code>-C ..</code>, simply run (in the
+ output directory):</p>
+
+<pre>
+ $ make <target>
+</pre>
+
<h3><a name="environment_variables" id="environment_variables"></a>
Environment variables</h3>
--
1.7.1
^ permalink raw reply related
* [Buildroot] [git commit master 1/1] docs/buildroot.html: minor tweaks
From: Peter Korsgaard @ 2010-09-27 20:34 UTC (permalink / raw)
To: buildroot
commit: http://git.buildroot.net/buildroot/commit/?id=677ae6f6a5554d9ce1162bb472c489df41ca2c8e
branch: http://git.buildroot.net/buildroot/commit/?id=refs/heads/master
- We have gconfig as well nowadays
- Variables like BUILDROOT_DL_DIR can also be set permanently in the
environment, and not just passed to make every time.
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
docs/buildroot.html | 4 ++--
1 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/docs/buildroot.html b/docs/buildroot.html
index 6d4f17c..edb75b1 100644
--- a/docs/buildroot.html
+++ b/docs/buildroot.html
@@ -260,7 +260,7 @@ or
<p>If you intend to do an offline build and just want to download
all sources that you previously selected in the configurator
- (<i>menuconfig</i> or <i>xconfig</i>), then issue:</p>
+ (<i>menuconfig</i>, <i>xconfig</i> or <i>gconfig</i>), then issue:</p>
<pre>
$ make source
</pre>
@@ -291,7 +291,7 @@ or
Environment variables</h3>
<p>Buildroot also honors some environment variables when they are passed
- to <code>make</code>:</p>
+ to <code>make</code> or set in the environment:</p>
<ul>
<li><code>HOSTCXX</code>, the host C++ compiler to use</li>
<li><code>HOSTCC</code>, the host C compiler to use</li>
--
1.7.1
^ permalink raw reply related
* [Buildroot] [git commit master 1/1] autotargets: don't use install-strip
From: Thomas Petazzoni @ 2010-09-27 20:34 UTC (permalink / raw)
To: buildroot
commit: http://git.buildroot.net/buildroot/commit/?id=55ade5c7964e15f9b1eba061ab840cc4c25e4e37
branch: http://git.buildroot.net/buildroot/commit/?id=refs/heads/master
Many packages using the AUTOTARGETS infrastructure do not support the
install-strip target. Moreover, we are already stripping all binary
files in the $(TARGET_DIR) anyway, so using install-strip is a bit
useless.
So, we use "make install" in all cases, and let Buildroot do the
stripping of the binaries if BR2_ENABLE_DEBUG is not set.
Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
---
package/Makefile.autotools.in | 4 ----
1 files changed, 0 insertions(+), 4 deletions(-)
diff --git a/package/Makefile.autotools.in b/package/Makefile.autotools.in
index 1ccf44c..589079b 100644
--- a/package/Makefile.autotools.in
+++ b/package/Makefile.autotools.in
@@ -66,11 +66,7 @@ $(2)_AUTORECONF ?= NO
$(2)_AUTORECONF_OPT ?=
$(2)_USE_CONFIG_CACHE ?= $(if $(BR2_CONFIG_CACHE),YES,NO)
$(2)_INSTALL_STAGING_OPT ?= DESTDIR=$$(STAGING_DIR) install
-ifeq ($(BR2_ENABLE_DEBUG),y)
$(2)_INSTALL_TARGET_OPT ?= DESTDIR=$$(TARGET_DIR) install
-else
-$(2)_INSTALL_TARGET_OPT ?= DESTDIR=$$(TARGET_DIR) install-strip
-endif
$(2)_CLEAN_OPT ?= clean
$(2)_UNINSTALL_STAGING_OPT ?= DESTDIR=$$(STAGING_DIR) uninstall
$(2)_UNINSTALL_TARGET_OPT ?= DESTDIR=$$(TARGET_DIR) uninstall
--
1.7.1
^ permalink raw reply related
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