* [Buildroot] [git commit] legacy: BR2_PACKAGE_LIBINTL is replaced by gettext
From: Peter Korsgaard @ 2012-11-30 20:07 UTC (permalink / raw)
To: buildroot
commit: http://git.buildroot.net/buildroot/commit/?id=26803e88013ca7e30153952435d110f5da8c88ce
branch: http://git.buildroot.net/buildroot/commit/?id=refs/heads/master
Signed-off-by: Arnout Vandecappelle (Essensium/Mind) <arnout@mind.be>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
Config.in.legacy | 15 +++++++++++++++
1 files changed, 15 insertions(+), 0 deletions(-)
diff --git a/Config.in.legacy b/Config.in.legacy
index 04ccb92..7ddc6ea 100644
--- a/Config.in.legacy
+++ b/Config.in.legacy
@@ -48,6 +48,21 @@ if BR2_LEGACY_CHECK_2012_11
# Legacy options from 2012.08
#
+config BR2_PACKAGE_GETTEXT_STATIC
+ bool "libgettext.a is now selected by BR2_PREFER_STATIC_LIB"
+ select BR2_LEGACY
+ help
+ To build a static gettext library, select BR2_PREFER_STATIC_LIB.
+
+
+config BR2_PACKAGE_LIBINTL
+ bool "libintl"
+ select BR2_LEGACY
+ select BR2_PACKAGE_GETTEXT
+ help
+ libintl is now installed by selecting BR2_PACKAGE_GETTEXT. This now
+ only installs the library, not the executables.
+
config BR2_PACKAGE_INPUT_TOOLS_EVTEST
bool "input-tools evtest is now a separate package evtest"
select BR2_LEGACY
^ permalink raw reply related
* [Buildroot] [git commit] legacy: evtest is dropped from input-tools package
From: Peter Korsgaard @ 2012-11-30 20:07 UTC (permalink / raw)
To: buildroot
commit: http://git.buildroot.net/buildroot/commit/?id=c430fab22242efd4251a6fc1ccba87f4d732e303
branch: http://git.buildroot.net/buildroot/commit/?id=refs/heads/master
We select BR2_PACKAGE_EVTEST automatically. This has only limited use:
when the LEGACY_CHECK menu is disabled in menuconfig (or even oldconfig),
it will also unselect BR2_PACKAGE_EVTEST again. Still, it can serve as a
hint of how to fix things.
Signed-off-by: Arnout Vandecappelle (Essensium/Mind) <arnout@mind.be>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
Config.in.legacy | 7 +++++++
1 files changed, 7 insertions(+), 0 deletions(-)
diff --git a/Config.in.legacy b/Config.in.legacy
index 4bc8784..04ccb92 100644
--- a/Config.in.legacy
+++ b/Config.in.legacy
@@ -48,4 +48,11 @@ if BR2_LEGACY_CHECK_2012_11
# Legacy options from 2012.08
#
+config BR2_PACKAGE_INPUT_TOOLS_EVTEST
+ bool "input-tools evtest is now a separate package evtest"
+ select BR2_LEGACY
+ select BR2_PACKAGE_EVTEST
+ help
+ The evtest program from input-tools is now a separate package.
+
endif
^ permalink raw reply related
* [Buildroot] [git commit] legacy: add error target for host-pkg-config
From: Peter Korsgaard @ 2012-11-30 20:07 UTC (permalink / raw)
To: buildroot
commit: http://git.buildroot.net/buildroot/commit/?id=be2460c545def6f00b6aade8719e1eef5f3ba875
branch: http://git.buildroot.net/buildroot/commit/?id=refs/heads/master
Signed-off-by: Arnout Vandecappelle (Essensium/Mind) <arnout@mind.be>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
Makefile.legacy | 10 ++++++++++
1 files changed, 10 insertions(+), 0 deletions(-)
diff --git a/Makefile.legacy b/Makefile.legacy
index c8b568d..e0b7ec2 100644
--- a/Makefile.legacy
+++ b/Makefile.legacy
@@ -13,6 +13,16 @@ $(error "You have legacy configuration in your .config! Please check your config
endif
#
+# Legacy options from 2012.08
+#
+
+host-pkg-config:
+ @$(call MESSAGE,host-pkg-config is replaced by host-pkgconf)
+ @$(call MESSAGE,please update your .mk files)
+ @false
+.PHONY: host-pkg-config
+
+#
# Legacy options from 2012.05
#
GENTARGETS = $$(error The GENTARGETS macro no longer exists; use $$$$(eval $$$$(generic-package)) or $$$$(eval $$$$(host-generic-package)))
^ permalink raw reply related
* [Buildroot] [git commit] legacy: move old GENTARGETS macros to Makefile.legacy
From: Peter Korsgaard @ 2012-11-30 20:06 UTC (permalink / raw)
To: buildroot
commit: http://git.buildroot.net/buildroot/commit/?id=cc1cd3b267212c0e932db4855ff7c1afe0b45e67
branch: http://git.buildroot.net/buildroot/commit/?id=refs/heads/master
Signed-off-by: Arnout Vandecappelle (Essensium/Mind) <arnout@mind.be>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
Makefile.legacy | 7 +++++++
package/Makefile.in | 6 ------
2 files changed, 7 insertions(+), 6 deletions(-)
diff --git a/Makefile.legacy b/Makefile.legacy
index 2e015a1..c8b568d 100644
--- a/Makefile.legacy
+++ b/Makefile.legacy
@@ -11,3 +11,10 @@
ifeq ($(BR2_LEGACY),y)
$(error "You have legacy configuration in your .config! Please check your configuration.")
endif
+
+#
+# Legacy options from 2012.05
+#
+GENTARGETS = $$(error The GENTARGETS macro no longer exists; use $$$$(eval $$$$(generic-package)) or $$$$(eval $$$$(host-generic-package)))
+AUTOTARGETS = $$(error The AUTOTARGETS macro no longer exists; use $$$$(eval $$$$(autotools-package)) or $$$$(eval $$$$(host-autotools-package)))
+CMAKETARGETS = $$(error The CMAKETARGETS macro no longer exists; use $$$$(eval $$$$(cmake-package)) or $$$$(eval $$$$(host-cmake-package)))
diff --git a/package/Makefile.in b/package/Makefile.in
index 9fdc745..2dd81c7 100644
--- a/package/Makefile.in
+++ b/package/Makefile.in
@@ -305,12 +305,6 @@ else
SHARED_STATIC_LIBS_OPTS=--enable-static --enable-shared
endif
-# Warn if a package uses the deprecated GENTARGETS macros. This can be
-# removed again for BR-2012.11.
-GENTARGETS = $$(error The GENTARGETS macro no longer exists; use $$$$(eval $$$$(generic-package)) or $$$$(eval $$$$(host-generic-package)))
-AUTOTARGETS = $$(error The AUTOTARGETS macro no longer exists; use $$$$(eval $$$$(autotools-package)) or $$$$(eval $$$$(host-autotools-package)))
-CMAKETARGETS = $$(error The CMAKETARGETS macro no longer exists; use $$$$(eval $$$$(cmake-package)) or $$$$(eval $$$$(host-cmake-package)))
-
include package/pkg-utils.mk
include package/pkg-download.mk
include package/pkg-autotools.mk
^ permalink raw reply related
* [Buildroot] [git commit] pkg-infra: introduce errors for legacy API
From: Peter Korsgaard @ 2012-11-30 20:06 UTC (permalink / raw)
To: buildroot
commit: http://git.buildroot.net/buildroot/commit/?id=ebcfa987df4095a7805ff124ab648fb607c89215
branch: http://git.buildroot.net/buildroot/commit/?id=refs/heads/master
As discussed in the BR developer days, we want to be more strict about API
changes in buildroot. I.e., we want to make it less likely that a user's
customizations break down after upgrading buildroot.
A first step is to make sure that the user is warned about API changes.
This patch introduces Makefile.legacy and Config.in.legacy, which will
issue clear error messages for such situations.
Signed-off-by: Arnout Vandecappelle (Essensium/Mind) <arnout@mind.be>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
Config.in | 2 ++
Config.in.legacy | 51 +++++++++++++++++++++++++++++++++++++++++++++++++++
Makefile | 7 ++++++-
Makefile.legacy | 13 +++++++++++++
4 files changed, 72 insertions(+), 1 deletions(-)
diff --git a/Config.in b/Config.in
index eaafece..b319ac7 100644
--- a/Config.in
+++ b/Config.in
@@ -434,3 +434,5 @@ source "fs/Config.in"
source "boot/Config.in"
source "linux/Config.in"
+
+source "Config.in.legacy"
diff --git a/Config.in.legacy b/Config.in.legacy
new file mode 100644
index 0000000..4bc8784
--- /dev/null
+++ b/Config.in.legacy
@@ -0,0 +1,51 @@
+#
+# Config.in.legacy - support for backward compatibility
+#
+# When an existing Config.in symbol is removed, it should be added again in this
+# file, and take appropriate action to approximate backward compatibility. If
+# there is an equivalent (set of) new symbols, these can just be select'ed by
+# the old symbol. This makes sure that running 'make oldconfig' will make things
+# "just work" when upgrading to a new buildroot version. If the change is too
+# fundamental and cannot be fixed by a simple select, then the old symbol should
+# select BR2_LEGACY. If that symbol is set, the build will issue an error.
+#
+# When adding legacy symbols to this file, add them to the front. The oldest
+# symbols will be removed again after about two years.
+#
+# The symbol should be copied as-is from the place where it was previously
+# defined, but the help text should be removed or replaced with something that
+# explains how to fix it.
+
+config BR2_LEGACY
+ bool
+ help
+ This option is selected automatically when your old .config uses an
+ option that no longer exists in current buildroot. In that case, the
+ build will fail. Look for config options which are selected in the
+ menu below: they no longer exist and should be replaced by something
+ else.
+
+# This comment fits exactly in a 80-column display
+comment "Legacy detected: check the content of the menu below"
+ depends on BR2_LEGACY
+
+# This option should get a new name with every buildroot release, so it defaults
+# to y again for people who upgrade.
+menuconfig BR2_LEGACY_CHECK_2012_11
+ bool "Check for legacy config options"
+ default y
+ help
+ Select this option to see the config options that are present in your
+ current .config but are no longer supported by buildroot. If any of
+ the options in this menu is selected, they should be replaced with
+ something else. As long as they stay selected, the build will fail.
+ Just de-select this option to automatically remove all the legacy
+ configuration.
+
+if BR2_LEGACY_CHECK_2012_11
+
+#
+# Legacy options from 2012.08
+#
+
+endif
diff --git a/Makefile b/Makefile
index 21aa054..1e257e9 100644
--- a/Makefile
+++ b/Makefile
@@ -290,6 +290,12 @@ endif
all: world
+# Include legacy before the other things, because package .mk files
+# may rely on it.
+ifneq ($(BR2_DEPRECATED),y)
+include Makefile.legacy
+endif
+
include package/Makefile.in
include support/dependencies/dependencies.mk
@@ -762,4 +768,3 @@ print-version:
include docs/manual/manual.mk
.PHONY: $(noconfig_targets)
-
diff --git a/Makefile.legacy b/Makefile.legacy
new file mode 100644
index 0000000..2e015a1
--- /dev/null
+++ b/Makefile.legacy
@@ -0,0 +1,13 @@
+#
+# Makefile.legacy - support for backward compatibility
+#
+# This file contains placeholders to detect backward-compatibility problems.
+# When a buildroot "API" feature is being deprecated, a rule should be added
+# here that issues an error when the old feature is used.
+#
+# This file is not included if BR2_DEPRECATED is selected, so it is possible
+# to bypass the errors (although that's usually a bad idea).
+
+ifeq ($(BR2_LEGACY),y)
+$(error "You have legacy configuration in your .config! Please check your configuration.")
+endif
^ permalink raw reply related
* [Buildroot] [PATCH 17/33] matchbox packages: fix broken urls
From: Samuel Martin @ 2012-11-30 19:57 UTC (permalink / raw)
To: buildroot
In-Reply-To: <87fw3rayff.fsf@dell.be.48ers.dk>
2012/11/30 Peter Korsgaard <jacmet@uclibc.org>:
>>>>>> "Samuel" == Samuel Martin <s.martin49@gmail.com> writes:
[...]
> Samuel> -MATCHBOX_COMMON_SITE = http://matchbox-project.org/sources/matchbox-common/$(MATCHBOX_COMMON_VERSION)
> Samuel> +MATCHBOX_COMMON_SITE = http://projects.o-hand.com/matchbox/sources/matchbox-common/$(MATCHBOX_COMMON_VERSION_MAJOR)
>
> Hmm, projects.o-hand.com doesn't seem to exist?
At least, it did...
>
> host -a projects.o-hand.com
> Trying "projects.o-hand.com"
> Received 105 bytes from 64.71.0.60#53 in 59 ms
> Trying "projects.o-hand.com"
> Host projects.o-hand.com not found: 3(NXDOMAIN)
Indeed... it seems pretty down :-(
Luckily, by the time this patch tried to be merged it got down!
Well, I'll switch to some alive location and repost.
Regards,
--
Sam
^ permalink raw reply
* [Buildroot] [PATCH] matchbox-lib: Append -lX11 to the linker
From: Peter Korsgaard @ 2012-11-30 19:55 UTC (permalink / raw)
To: buildroot
In-Reply-To: <1351596554-27077-1-git-send-email-markos.chandras@gmail.com>
>>>>> "Markos" == Markos Chandras <markos.chandras@gmail.com> writes:
Markos> From: Markos Chandras <markos.chandras@imgtec.com>
Markos> Fixes building with binutils-2.22
Markos> http://autobuild.buildroot.net/results/b4b26dd9c7d7bebe45638ba125fb49a5f5d0cc14/build-end.log
Committed, thanks.
--
Bye, Peter Korsgaard
^ permalink raw reply
* [Buildroot] [git commit] matchbox-lib: Append -lX11 to the linker
From: Peter Korsgaard @ 2012-11-30 19:54 UTC (permalink / raw)
To: buildroot
commit: http://git.buildroot.net/buildroot/commit/?id=cc6da8b28ef6b6dde2eaaaf40d21f366508221ad
branch: http://git.buildroot.net/buildroot/commit/?id=refs/heads/master
Fixes building with binutils-2.22
http://autobuild.buildroot.net/results/b4b26dd9c7d7bebe45638ba125fb49a5f5d0cc14/build-end.log
Signed-off-by: Markos Chandras <markos.chandras@imgtec.com>
Acked-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
Tested-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
package/matchbox/matchbox-lib/matchbox-lib.mk | 1 +
1 files changed, 1 insertions(+), 0 deletions(-)
diff --git a/package/matchbox/matchbox-lib/matchbox-lib.mk b/package/matchbox/matchbox-lib/matchbox-lib.mk
index de11dfc..339f512 100644
--- a/package/matchbox/matchbox-lib/matchbox-lib.mk
+++ b/package/matchbox/matchbox-lib/matchbox-lib.mk
@@ -10,6 +10,7 @@ MATCHBOX_LIB_SITE = http://matchbox-project.org/sources/libmatchbox/$(MATCHBOX_L
MATCHBOX_LIB_INSTALL_STAGING = YES
MATCHBOX_LIB_DEPENDENCIES = host-pkgconf expat xlib_libXext
MATCHBOX_LIB_CONF_OPT = --enable-expat --disable-doxygen-docs
+MATCHBOX_LIB_CONF_ENV = LIBS="-lX11"
define MATCHBOX_LIB_POST_INSTALL_FIXES
$(SED) 's:-I[^$$].*/usr/include/freetype2:-I/usr/include/freetype2:' $(STAGING_DIR)/usr/lib/pkgconfig/libmb.pc
^ permalink raw reply related
* [Buildroot] [PATCHv2] flex: fix build for nommu systems
From: Peter Korsgaard @ 2012-11-30 19:53 UTC (permalink / raw)
To: buildroot
In-Reply-To: <1354272363-10162-1-git-send-email-gustavo@zacarias.com.ar>
>>>>> "Gustavo" == Gustavo Zacarias <gustavo@zacarias.com.ar> writes:
Gustavo> The flex binary uses fork() so it breaks on !MMU builds.
Gustavo> Since we usually don't require flex in the target and the common
Gustavo> scenario is that we just want libfl in staging reverse the options so
Gustavo> that BR2_PACKAGE_FLEX just builds and install libfl.a and change the
Gustavo> LIBFL option to BR2_PACKAGE_FLEX_BINARY to install the binary in the
Gustavo> target.
Committed, thanks.
--
Bye, Peter Korsgaard
^ permalink raw reply
* [Buildroot] [git commit] flex: fix build for nommu systems
From: Peter Korsgaard @ 2012-11-30 19:52 UTC (permalink / raw)
To: buildroot
commit: http://git.buildroot.net/buildroot/commit/?id=bd72a13a4ca3033bacbaf9e9a2b424acf149f83d
branch: http://git.buildroot.net/buildroot/commit/?id=refs/heads/master
The flex binary uses fork() so it breaks on !MMU builds.
Since we usually don't require flex in the target and the common
scenario is that we just want libfl in staging reverse the options so
that BR2_PACKAGE_FLEX just builds and install libfl.a and change the
LIBFL option to BR2_PACKAGE_FLEX_BINARY to install the binary in the
target.
Signed-off-by: Gustavo Zacarias <gustavo@zacarias.com.ar>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
package/flex/Config.in | 10 +++++-----
package/flex/flex.mk | 20 +++++---------------
2 files changed, 10 insertions(+), 20 deletions(-)
diff --git a/package/flex/Config.in b/package/flex/Config.in
index b10eb00..adef468 100644
--- a/package/flex/Config.in
+++ b/package/flex/Config.in
@@ -6,10 +6,10 @@ config BR2_PACKAGE_FLEX
http://www.gnu.org/software/flex/
-config BR2_PACKAGE_FLEX_LIBFL
- bool "Install libfl.a under staging_dir/usr/lib"
- default y
+config BR2_PACKAGE_FLEX_BINARY
+ bool "Install tool in the target"
+ # needs fork()
+ depends on BR2_USE_MMU
depends on BR2_PACKAGE_FLEX
help
- Install libfl.a under staging_dir/usr/lib for further development
- on a host machine.
+ Install the flex binary tool in the target filesystem.
diff --git a/package/flex/flex.mk b/package/flex/flex.mk
index 2599cdc..0c1ed5a 100644
--- a/package/flex/flex.mk
+++ b/package/flex/flex.mk
@@ -16,30 +16,20 @@ FLEX_DEPENDENCIES = \
# we don't have a host-gettext/libintl
HOST_FLEX_DEPENDENCIES =
+ifeq ($(BR2_PACKAGE_FLEX_BINARY),y)
# lex -> flex
define FLEX_INSTALL_LEX
cd $(TARGET_DIR)/usr/bin && ln -snf flex lex
endef
-
-define FLEX_UNINSTALL_LEX
- -rm $(TARGET_DIR)/usr/bin/lex
-endef
-
FLEX_POST_INSTALL_HOOKS += FLEX_INSTALL_LEX
-FLEX_POST_CLEAN_HOOKS += FLEX_UNINSTALL_LEX
-# libfl installation
-ifeq ($(BR2_PACKAGE_FLEX_LIBFL),y)
-define FLEX_INSTALL_LIBFL
- install -D $(FLEX_DIR)/libfl.a $(STAGING_DIR)/usr/lib/libfl.a
-endef
+else
-define FLEX_UNINSTALL_LIBFL
- -rm $(STAGING_DIR)/lib/libfl.a
+define FLEX_DISABLE_PROGRAM
+ $(SED) 's/^bin_PROGRAMS.*//' $(@D)/Makefile.in
endef
+FLEX_POST_PATCH_HOOKS += FLEX_DISABLE_PROGRAM
-FLEX_POST_INSTALL_HOOKS += FLEX_INSTALL_LIBFL
-FLEX_POST_CLEAN_HOOKS += FLEX_UNINSTALL_LIBFL
endif
$(eval $(autotools-package))
^ permalink raw reply related
* [Buildroot] can-utils or site method git broken
From: Peter Korsgaard @ 2012-11-30 19:51 UTC (permalink / raw)
To: buildroot
In-Reply-To: <50B8FB71.4000309@relinux.de>
>>>>> "Stephan" == Stephan Hoffmann <sho@relinux.de> writes:
Stephan> Hi,
Stephan> I am currently trying to build can-utils without success. Obviously,
Stephan> getting the required commit from gitorious.org fails. I verified that I
Stephan> can clone the repo by hand and that it contains the right hash.
Stephan> Configuration: beaglebone_defconfig, added can-utils, branch
Stephan> master from today (82583bf4), Ubuntu 10.04 LTS.
Odd, it works here:
make can-utils-patch
>>> can-utils 836d3cc0122ce31a1b732d369cbd27b690c3110f Downloading
Cloning into bare repository 'can-utils-836d3cc0122ce31a1b732d369cbd27b690c3110f'...
warning: Could not find remote branch 836d3cc0122ce31a1b732d369cbd27b690c3110f to clone.
fatal: Remote branch 836d3cc0122ce31a1b732d369cbd27b690c3110f not found in upstream origin
Cloning into bare repository 'can-utils-836d3cc0122ce31a1b732d369cbd27b690c3110f'...
remote: Counting objects: 732, done.
remote: Compressing objects: 100% (253/253), done.
remote: Total 732 (delta 485), reused 706 (delta 468)
Receiving objects: 100% (732/732), 221.56 KiB | 118 KiB/s, done.
Resolving deltas: 100% (485/485), done.
>>> can-utils 836d3cc0122ce31a1b732d369cbd27b690c3110f Extracting
gzip -d -c /var/lib/downloads/can-utils-836d3cc0122ce31a1b732d369cbd27b690c3110f.tar.gz | tar --strip-components=1 -C /home/peko/source/buildroot/output/build/can-utils-836d3cc0122ce31a1b732d369cbd27b690c3110f -xf -
>>> can-utils 836d3cc0122ce31a1b732d369cbd27b690c3110f Patching package//can-utils
>>> can-utils 836d3cc0122ce31a1b732d369cbd27b690c3110f Updating config.sub and config.guess
for file in config.guess config.sub; do for i in $(find /home/peko/source/buildroot/output/build/can-utils-836d3cc0122ce31a1b732d369cbd27b690c3110f -name $file); do cp support/gnuconfig/$file $i; done; done
>>> can-utils 836d3cc0122ce31a1b732d369cbd27b690c3110f Patching libtool
Do you have an old git version on your build machine? I have 1.7.10.4.
--
Bye, Peter Korsgaard
^ permalink raw reply
* [Buildroot] [PATCH v5] Add /var/www to device table
From: Peter Korsgaard @ 2012-11-30 19:49 UTC (permalink / raw)
To: buildroot
In-Reply-To: <1354298185-2974-1-git-send-email-spdawson@gmail.com>
>>>>> "spdawson" == spdawson <spdawson@gmail.com> writes:
spdawson> From: Simon Dawson <spdawson@gmail.com>
spdawson> The /var/www directory is listed in /etc/passwd in the skeleton target
spdawson> filesystem as the home directory of the www-data user (uid 33).
spdawson> In the final target filesystem, /var/www should be owned by
spdawson> www-data. This is important for the lighttpd package, for
spdawson> example.
Committed, thanks.
--
Bye, Peter Korsgaard
^ permalink raw reply
* [Buildroot] [git commit] Add /var/www to device table
From: Peter Korsgaard @ 2012-11-30 19:48 UTC (permalink / raw)
To: buildroot
commit: http://git.buildroot.net/buildroot/commit/?id=e2af1822252af1a70a5b199921ede15572b46d0e
branch: http://git.buildroot.net/buildroot/commit/?id=refs/heads/master
The /var/www directory is listed in /etc/passwd in the skeleton target
filesystem as the home directory of the www-data user (uid 33).
In the final target filesystem, /var/www should be owned by www-data. This
is important for the lighttpd package, for example.
Signed-off-by: Simon Dawson <spdawson@gmail.com>
Acked-by: Arnout Vandecappelle (Essensium/Mind) <arnout@mind.be>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
system/device_table.txt | 1 +
1 files changed, 1 insertions(+), 0 deletions(-)
diff --git a/system/device_table.txt b/system/device_table.txt
index fc397a9..421728b 100644
--- a/system/device_table.txt
+++ b/system/device_table.txt
@@ -10,6 +10,7 @@
/tmp d 1777 0 0 - - - - -
/etc d 755 0 0 - - - - -
/home/default d 2755 1000 1000 - - - - -
+/var/www d 755 33 33 - - - - -
/etc/shadow f 600 0 0 - - - - -
/etc/passwd f 644 0 0 - - - - -
/etc/network/if-up.d d 755 0 0 - - - - -
^ permalink raw reply related
* [Buildroot] can-utils or site method git broken
From: Stephan Hoffmann @ 2012-11-30 18:31 UTC (permalink / raw)
To: buildroot
Hi,
I am currently trying to build can-utils without success. Obviously,
getting the required commit from gitorious.org fails. I verified that I
can clone the repo by hand and that it contains the right hash.
Configuration: beaglebone_defconfig, added can-utils, branch master from
today (82583bf4), Ubuntu 10.04 LTS.
Kind regards
Stephan
> >>> can-utils 836d3cc0122ce31a1b732d369cbd27b690c3110f Downloading
> Initialized empty Git repository in
> /home/stephan/Dokumente/dl/can-utils-836d3cc0122ce31a1b732d369cbd27b690c3110f/
> remote: Counting objects: 62, done.
> remote: Compressing objects: 100% (51/51), done.
> remote: Total 62 (delta 10), reused 22 (delta 0)
> Receiving objects: 100% (62/62), 100.37 KiB, done.
> Resolving deltas: 100% (10/10), done.
> warning: Remote branch 836d3cc0122ce31a1b732d369cbd27b690c3110f not
> found in upstream origin, using HEAD instead
> fatal: not a tree object
> >>> can-utils 836d3cc0122ce31a1b732d369cbd27b690c3110f Extracting
> gzip -d -c
> /home/stephan/Dokumente/dl/can-utils-836d3cc0122ce31a1b732d369cbd27b690c3110f.tar.gz
> | tar --strip-components=1 -C
> /home/stephan/Dokumente/BeagleBone/buildroot/output/build/can-utils-836d3cc0122ce31a1b732d369cbd27b690c3110f
> -xf -
> tar: This does not look like a tar archive
> tar: Exiting with failure status due to previous errors
> make: ***
> [/home/stephan/Dokumente/BeagleBone/buildroot/output/build/can-utils-836d3cc0122ce31a1b732d369cbd27b690c3110f/.stamp_extracted]
> Error 2
--
reLinux - Stephan Hoffmann
Am Schmidtgrund 124 50765 K?ln
Tel. +49.221.95595-19 Fax: -64
www.reLinux.de sho at reLinux.de
^ permalink raw reply
* [Buildroot] [PATCH v5] Add /var/www to device table
From: spdawson at gmail.com @ 2012-11-30 17:56 UTC (permalink / raw)
To: buildroot
From: Simon Dawson <spdawson@gmail.com>
The /var/www directory is listed in /etc/passwd in the skeleton target
filesystem as the home directory of the www-data user (uid 33).
In the final target filesystem, /var/www should be owned by www-data. This
is important for the lighttpd package, for example.
Signed-off-by: Simon Dawson <spdawson@gmail.com>
Acked-by: Arnout Vandecappelle (Essensium/Mind) <arnout@mind.be>
---
v5: Rework for relocation device table file (now under system)
v4: Resend.
v3: Added Acked-by information.
v2: Removed redundant TAB from line added device table file.
system/device_table.txt | 1 +
1 file changed, 1 insertion(+)
diff --git a/system/device_table.txt b/system/device_table.txt
index fc397a9..421728b 100644
--- a/system/device_table.txt
+++ b/system/device_table.txt
@@ -10,6 +10,7 @@
/tmp d 1777 0 0 - - - - -
/etc d 755 0 0 - - - - -
/home/default d 2755 1000 1000 - - - - -
+/var/www d 755 33 33 - - - - -
/etc/shadow f 600 0 0 - - - - -
/etc/passwd f 644 0 0 - - - - -
/etc/network/if-up.d d 755 0 0 - - - - -
--
1.7.10.4
^ permalink raw reply related
* [Buildroot] [PATCH 06/51] package/usbredir: new package
From: Yann E. MORIN @ 2012-11-30 16:48 UTC (permalink / raw)
To: buildroot
In-Reply-To: <20121129094247.03f7c7d2@skate>
Thomas, All,
On Thursday 29 November 2012 Thomas Petazzoni wrote:
> On Thu, 29 Nov 2012 00:54:05 +0100, Yann E. MORIN wrote:
> > +comment "usbredir requires libusb"
> > + depends on !BR2_PACKAGE_LIBUSB
>
> Hum, why a "depends on" and not a "select", like we normally do for
> libraries? libusb is not a "big" thing, so I'd say it should be
> automatically selected.
Because libusb depends on THREADS, and I do not want to play the ugly
game of inheriting dependencies of my own dependencies.
Hence "depends on" rather than "select".
> > diff --git a/package/usbredir/usbredir.mk b/package/usbredir/usbredir.mk
> > new file mode 100644
> > index 0000000..9f6c011
> > --- /dev/null
> > +++ b/package/usbredir/usbredir.mk
[--SNIP==]
> > +USBREDIR_LICENSE = LGPLv2.1+
>
> Maybe:
> USBREDIR_LICENSE = LGPLv2.1+ (library)
Yep.
Regards,
Yann E. MORIN.
--
.-----------------.--------------------.------------------.--------------------.
| Yann E. MORIN | Real-Time Embedded | /"\ ASCII RIBBON | Erics' conspiracy: |
| +33 662 376 056 | Software Designer | \ / CAMPAIGN | ___ |
| +33 223 225 172 `------------.-------: X AGAINST | \e/ There is no |
| http://ymorin.is-a-geek.org/ | _/*\_ | / \ HTML MAIL | v conspiracy. |
'------------------------------^-------^------------------^--------------------'
^ permalink raw reply
* [Buildroot] [PATCH 03/51] package/dtc: add option to install programs
From: Yann E. MORIN @ 2012-11-30 16:38 UTC (permalink / raw)
To: buildroot
In-Reply-To: <50B77872.80005@mind.be>
Arnout, All,
On Thursday 29 November 2012 Arnout Vandecappelle wrote:
> I (and I think Peter as well) prefer the more verbose
>
> ifeq ($(BR2_PACKAGE_DTC_BINARY),y)
> DTC_INSTALL_RULE = install
> else
> DTC_BUILD_RULE = libfdt
> DTC_INSTALL_RULE = libfdt_install
> endif
Yes, it's easier to read.
> I would also call it _TARGET instead of _RULE.
Why? DTC_INSTALL_TARGET already exists, and is meant to specify if the
package is to be installed in tharget.
OTOH, DTC_INSTALL_RULE (or DTC_INSTALL_MAKERULE, but it's ugly) is more
explicit: it is the make rule to install the package.
> I would prefer the same rule for staging and target install:
> - it doesn't hurt to have the executable in staging;
> - it's easier to read if it's the same;
Well, not too fond of it: staging serves a different purpose than target,
so I prefer separating the rules. Peter: arbitration, please! ;-)
> - when we finally get around to creating $(make-package), the default install
> commands will be
> $(MAKE) -C $(@D) DESTDIR=... $($(PKG)_INSTALL_TARGET)
> (where _INSTALL_TARGET is the same for target and staging and defaults to
> 'install')
I was not aware of the make-package upcoming infra. However:
- as already said above: $(PKG)_INSTALL_TARGET is already used.
- I'd suggest using _RULE (or _MAKERULE) as the suffix
- hopefully, we'll have a way to specify different rules for straging
and target.
Regards,
Yann E. MORIN.
--
.-----------------.--------------------.------------------.--------------------.
| Yann E. MORIN | Real-Time Embedded | /"\ ASCII RIBBON | Erics' conspiracy: |
| +33 662 376 056 | Software Designer | \ / CAMPAIGN | ___ |
| +33 223 225 172 `------------.-------: X AGAINST | \e/ There is no |
| http://ymorin.is-a-geek.org/ | _/*\_ | / \ HTML MAIL | v conspiracy. |
'------------------------------^-------^------------------^--------------------'
^ permalink raw reply
* [Buildroot] [PATCH v5 0/6] Add support for the snowball board
From: Peter Korsgaard @ 2012-11-30 16:03 UTC (permalink / raw)
To: buildroot
In-Reply-To: <1354279156-20649-1-git-send-email-gregory.hermant@calao-systems.com>
>>>>> "Gregory" == Gregory Hermant <gregory.hermant@calao-systems.com> writes:
Gregory> Snowball board is a low power, low cost Single Board Computer based
Gregory> on the ST-Ericsson Nova A9500 processor (Dual Cortex-A9 + MALI 400 GPU).
Gregory> More info at www.igloocommunity.org
Gregory> The snowball board boots from eMMC, loads the linux kernel and mounts
Gregory> its root filesystem either from eMMC or from a microSD card.
Gregory> The user should prepare a microSD card with two partitions.
Gregory> On the fist partition he will install the kernel image and on the second
Gregory> one the root filesystem.
Gregory> TO DO:
Gregory> * Add the GPS support.
Gregory> * Add the possibility to build an eMMC image directly from buildroot.
Gregory> * Add the riff tool package
Committed to next, thanks!
--
Bye, Peter Korsgaard
^ permalink raw reply
* [Buildroot] [git commit] Add config file for the snowball board
From: Peter Korsgaard @ 2012-11-30 16:02 UTC (permalink / raw)
To: buildroot
commit: http://git.buildroot.net/buildroot/commit/?id=fd1b89f9c97660a8c0c5c2e7dedf9ef577ec3ac8
branch: http://git.buildroot.net/buildroot/commit/?id=refs/heads/master
Signed-off-by: Gregory Hermant <gregory.hermant@calao-systems.com>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
configs/calao_snowball_defconfig | 24 ++++++++++++++++++++++++
1 files changed, 24 insertions(+), 0 deletions(-)
diff --git a/configs/calao_snowball_defconfig b/configs/calao_snowball_defconfig
new file mode 100644
index 0000000..360ed51
--- /dev/null
+++ b/configs/calao_snowball_defconfig
@@ -0,0 +1,24 @@
+BR2_arm=y
+BR2_cortex_a9=y
+BR2_GCC_VERSION_4_7_X=y
+# BR2_SOFT_FLOAT is not set
+BR2_TOOLCHAIN_BUILDROOT_WCHAR=y
+BR2_TOOLCHAIN_BUILDROOT_CXX=y
+BR2_VFP_FLOAT=y
+BR2_ROOTFS_DEVICE_CREATION_DYNAMIC_MDEV=y
+BR2_TARGET_GENERIC_GETTY_PORT="ttyAMA2"
+BR2_PACKAGE_BUSYBOX_SHOW_OTHERS=y
+BR2_PACKAGE_SNOWBALL_HDMISERVICE=y
+BR2_PACKAGE_LIBNL=y
+BR2_PACKAGE_SNOWBALL_INIT=y
+BR2_PACKAGE_WPA_SUPPLICANT=y
+BR2_TARGET_ROOTFS_TAR_GZIP=y
+BR2_TARGET_UBOOT=y
+BR2_TARGET_UBOOT_BOARDNAME="snowball"
+BR2_LINUX_KERNEL=y
+BR2_LINUX_KERNEL_CUSTOM_GIT=y
+BR2_LINUX_KERNEL_CUSTOM_GIT_REPO_URL="git://igloocommunity.org/git/kernel/igloo-kernel.git"
+BR2_LINUX_KERNEL_CUSTOM_GIT_VERSION="stable-linux-ux500-3.4"
+BR2_LINUX_KERNEL_PATCH="board/calao/snowball/"
+BR2_LINUX_KERNEL_DEFCONFIG="u8500"
+BR2_LINUX_KERNEL_INSTALL_TARGET=y
^ permalink raw reply related
* [Buildroot] [git commit branch/next] Add config file for the snowball board
From: Peter Korsgaard @ 2012-11-30 16:02 UTC (permalink / raw)
To: buildroot
commit: http://git.buildroot.net/buildroot/commit/?id=fd1b89f9c97660a8c0c5c2e7dedf9ef577ec3ac8
branch: http://git.buildroot.net/buildroot/commit/?id=refs/heads/next
Signed-off-by: Gregory Hermant <gregory.hermant@calao-systems.com>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
configs/calao_snowball_defconfig | 24 ++++++++++++++++++++++++
1 files changed, 24 insertions(+), 0 deletions(-)
diff --git a/configs/calao_snowball_defconfig b/configs/calao_snowball_defconfig
new file mode 100644
index 0000000..360ed51
--- /dev/null
+++ b/configs/calao_snowball_defconfig
@@ -0,0 +1,24 @@
+BR2_arm=y
+BR2_cortex_a9=y
+BR2_GCC_VERSION_4_7_X=y
+# BR2_SOFT_FLOAT is not set
+BR2_TOOLCHAIN_BUILDROOT_WCHAR=y
+BR2_TOOLCHAIN_BUILDROOT_CXX=y
+BR2_VFP_FLOAT=y
+BR2_ROOTFS_DEVICE_CREATION_DYNAMIC_MDEV=y
+BR2_TARGET_GENERIC_GETTY_PORT="ttyAMA2"
+BR2_PACKAGE_BUSYBOX_SHOW_OTHERS=y
+BR2_PACKAGE_SNOWBALL_HDMISERVICE=y
+BR2_PACKAGE_LIBNL=y
+BR2_PACKAGE_SNOWBALL_INIT=y
+BR2_PACKAGE_WPA_SUPPLICANT=y
+BR2_TARGET_ROOTFS_TAR_GZIP=y
+BR2_TARGET_UBOOT=y
+BR2_TARGET_UBOOT_BOARDNAME="snowball"
+BR2_LINUX_KERNEL=y
+BR2_LINUX_KERNEL_CUSTOM_GIT=y
+BR2_LINUX_KERNEL_CUSTOM_GIT_REPO_URL="git://igloocommunity.org/git/kernel/igloo-kernel.git"
+BR2_LINUX_KERNEL_CUSTOM_GIT_VERSION="stable-linux-ux500-3.4"
+BR2_LINUX_KERNEL_PATCH="board/calao/snowball/"
+BR2_LINUX_KERNEL_DEFCONFIG="u8500"
+BR2_LINUX_KERNEL_INSTALL_TARGET=y
^ permalink raw reply related
* [Buildroot] [git commit] bluez-utils: add support for the ST-Ericsson cg2900 combo controller
From: Peter Korsgaard @ 2012-11-30 16:01 UTC (permalink / raw)
To: buildroot
commit: http://git.buildroot.net/buildroot/commit/?id=0ca2a3bb51ff8f69030b12bc67cefde9846348c0
branch: http://git.buildroot.net/buildroot/commit/?id=refs/heads/master
Signed-off-by: Gregory Hermant <gregory.hermant@calao-systems.com>
Acked-by: Arnout Vandecappelle (Essensium/Mind) <arnout@mind.be>
Tested-by: Arnout Vandecappelle (Essensium/Mind) <arnout@mind.be>
(with the calao_snowball_defconfig)
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
...tils-4.101-enable_cg2900_on_upstream_4.91.patch | 106 ++++++++++++++++++++
1 files changed, 106 insertions(+), 0 deletions(-)
diff --git a/package/bluez_utils/bluez_utils-4.101-enable_cg2900_on_upstream_4.91.patch b/package/bluez_utils/bluez_utils-4.101-enable_cg2900_on_upstream_4.91.patch
new file mode 100644
index 0000000..e80af5f
--- /dev/null
+++ b/package/bluez_utils/bluez_utils-4.101-enable_cg2900_on_upstream_4.91.patch
@@ -0,0 +1,106 @@
+From ac7992081abba87627c9e91735b3309584b48585 Mon Sep 17 00:00:00 2001
+From: Gregory Hermant <gregory.hermant@calao-systems.com>
+Date: Wed, 14 Nov 2012 14:27:02 +0100
+Subject: [PATCH] add support for the ST-Ericsson CG2900 GPS FM Bluetooth
+ combo controller
+
+
+Signed-off-by: Gregory Hermant <gregory.hermant@calao-systems.com>
+---
+ tools/hciattach.c | 22 +++++++++++++++-------
+ tools/hciattach.h | 1 +
+ 2 files changed, 16 insertions(+), 7 deletions(-)
+
+diff --git a/tools/hciattach.c b/tools/hciattach.c
+index e4d5aa1..7f08243 100644
+--- a/tools/hciattach.c
++++ b/tools/hciattach.c
+@@ -1066,6 +1066,11 @@ struct uart_t uart[] = {
+ { "texasalt", 0x0000, 0x0000, HCI_UART_LL, 115200, 115200,
+ FLOW_CTL, DISABLE_PM, NULL, texasalt, NULL },
+
++ /* ST-Ericsson CG2900 GPS FM Bluetooth combo controller */
++ { "cg2900", 0x0000, 0x0000, HCI_UART_STE, 115200, 115200,
++ FLOW_CTL, DISABLE_PM, NULL, NULL },
++
++
+ /* ST Microelectronics minikits based on STLC2410/STLC2415 */
+ { "st", 0x0000, 0x0000, HCI_UART_H4, 57600, 115200,
+ FLOW_CTL, DISABLE_PM, NULL, st },
+@@ -1157,10 +1162,10 @@ static struct uart_t * get_by_type(char *type)
+ }
+
+ /* Initialize UART driver */
+-static int init_uart(char *dev, struct uart_t *u, int send_break, int raw)
++static int init_uart(char *dev, struct uart_t *u, int send_break, int raw, int line_disc)
+ {
+ struct termios ti;
+- int fd, i;
++ int fd;
+ unsigned long flags = 0;
+
+ if (raw)
+@@ -1217,8 +1222,7 @@ static int init_uart(char *dev, struct uart_t *u, int send_break, int raw)
+ }
+
+ /* Set TTY to N_HCI line discipline */
+- i = N_HCI;
+- if (ioctl(fd, TIOCSETD, &i) < 0) {
++ if (ioctl(fd, TIOCSETD, &line_disc) < 0) {
+ perror("Can't set line discipline");
+ return -1;
+ }
+@@ -1243,7 +1247,7 @@ static void usage(void)
+ {
+ printf("hciattach - HCI UART driver initialization utility\n");
+ printf("Usage:\n");
+- printf("\thciattach [-n] [-p] [-b] [-r] [-t timeout] [-s initial_speed] <tty> <type | id> [speed] [flow|noflow] [bdaddr]\n");
++ printf("\thciattach [-n] [-p] [-a line_disc_nr] [-b] [-r] [-t timeout] [-s initial_speed] <tty> <type | id> [speed] [flow|noflow] [bdaddr]\n");
+ printf("\thciattach -l\n");
+ }
+
+@@ -1252,6 +1256,7 @@ int main(int argc, char *argv[])
+ struct uart_t *u = NULL;
+ int detach, printpid, raw, opt, i, n, ld, err;
+ int to = 10;
++ int line_disc = N_HCI;
+ int init_speed = 0;
+ int send_break = 0;
+ pid_t pid;
+@@ -1264,8 +1269,11 @@ int main(int argc, char *argv[])
+ printpid = 0;
+ raw = 0;
+
+- while ((opt=getopt(argc, argv, "bnpt:s:lr")) != EOF) {
++ while ((opt=getopt(argc, argv, "bnpt:s:lra:")) != EOF) {
+ switch(opt) {
++ case 'a':
++ line_disc = atoi(optarg);
++ break;
+ case 'b':
+ send_break = 1;
+ break;
+@@ -1381,7 +1389,7 @@ int main(int argc, char *argv[])
+ alarm(to);
+ bcsp_max_retries = to;
+
+- n = init_uart(dev, u, send_break, raw);
++ n = init_uart(dev, u, send_break, raw, line_disc);
+ if (n < 0) {
+ perror("Can't initialize device");
+ exit(1);
+diff --git a/tools/hciattach.h b/tools/hciattach.h
+index fed0d11..09b534d 100644
+--- a/tools/hciattach.h
++++ b/tools/hciattach.h
+@@ -39,6 +39,7 @@
+ #define HCI_UART_H4DS 3
+ #define HCI_UART_LL 4
+ #define HCI_UART_ATH3K 5
++#define HCI_UART_STE 6
+
+ #define HCI_UART_RAW_DEVICE 0
+
+--
+1.7.9.5
+
^ permalink raw reply related
* [Buildroot] [git commit branch/next] bluez-utils: add support for the ST-Ericsson cg2900 combo controller
From: Peter Korsgaard @ 2012-11-30 16:01 UTC (permalink / raw)
To: buildroot
commit: http://git.buildroot.net/buildroot/commit/?id=0ca2a3bb51ff8f69030b12bc67cefde9846348c0
branch: http://git.buildroot.net/buildroot/commit/?id=refs/heads/next
Signed-off-by: Gregory Hermant <gregory.hermant@calao-systems.com>
Acked-by: Arnout Vandecappelle (Essensium/Mind) <arnout@mind.be>
Tested-by: Arnout Vandecappelle (Essensium/Mind) <arnout@mind.be>
(with the calao_snowball_defconfig)
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
...tils-4.101-enable_cg2900_on_upstream_4.91.patch | 106 ++++++++++++++++++++
1 files changed, 106 insertions(+), 0 deletions(-)
diff --git a/package/bluez_utils/bluez_utils-4.101-enable_cg2900_on_upstream_4.91.patch b/package/bluez_utils/bluez_utils-4.101-enable_cg2900_on_upstream_4.91.patch
new file mode 100644
index 0000000..e80af5f
--- /dev/null
+++ b/package/bluez_utils/bluez_utils-4.101-enable_cg2900_on_upstream_4.91.patch
@@ -0,0 +1,106 @@
+From ac7992081abba87627c9e91735b3309584b48585 Mon Sep 17 00:00:00 2001
+From: Gregory Hermant <gregory.hermant@calao-systems.com>
+Date: Wed, 14 Nov 2012 14:27:02 +0100
+Subject: [PATCH] add support for the ST-Ericsson CG2900 GPS FM Bluetooth
+ combo controller
+
+
+Signed-off-by: Gregory Hermant <gregory.hermant@calao-systems.com>
+---
+ tools/hciattach.c | 22 +++++++++++++++-------
+ tools/hciattach.h | 1 +
+ 2 files changed, 16 insertions(+), 7 deletions(-)
+
+diff --git a/tools/hciattach.c b/tools/hciattach.c
+index e4d5aa1..7f08243 100644
+--- a/tools/hciattach.c
++++ b/tools/hciattach.c
+@@ -1066,6 +1066,11 @@ struct uart_t uart[] = {
+ { "texasalt", 0x0000, 0x0000, HCI_UART_LL, 115200, 115200,
+ FLOW_CTL, DISABLE_PM, NULL, texasalt, NULL },
+
++ /* ST-Ericsson CG2900 GPS FM Bluetooth combo controller */
++ { "cg2900", 0x0000, 0x0000, HCI_UART_STE, 115200, 115200,
++ FLOW_CTL, DISABLE_PM, NULL, NULL },
++
++
+ /* ST Microelectronics minikits based on STLC2410/STLC2415 */
+ { "st", 0x0000, 0x0000, HCI_UART_H4, 57600, 115200,
+ FLOW_CTL, DISABLE_PM, NULL, st },
+@@ -1157,10 +1162,10 @@ static struct uart_t * get_by_type(char *type)
+ }
+
+ /* Initialize UART driver */
+-static int init_uart(char *dev, struct uart_t *u, int send_break, int raw)
++static int init_uart(char *dev, struct uart_t *u, int send_break, int raw, int line_disc)
+ {
+ struct termios ti;
+- int fd, i;
++ int fd;
+ unsigned long flags = 0;
+
+ if (raw)
+@@ -1217,8 +1222,7 @@ static int init_uart(char *dev, struct uart_t *u, int send_break, int raw)
+ }
+
+ /* Set TTY to N_HCI line discipline */
+- i = N_HCI;
+- if (ioctl(fd, TIOCSETD, &i) < 0) {
++ if (ioctl(fd, TIOCSETD, &line_disc) < 0) {
+ perror("Can't set line discipline");
+ return -1;
+ }
+@@ -1243,7 +1247,7 @@ static void usage(void)
+ {
+ printf("hciattach - HCI UART driver initialization utility\n");
+ printf("Usage:\n");
+- printf("\thciattach [-n] [-p] [-b] [-r] [-t timeout] [-s initial_speed] <tty> <type | id> [speed] [flow|noflow] [bdaddr]\n");
++ printf("\thciattach [-n] [-p] [-a line_disc_nr] [-b] [-r] [-t timeout] [-s initial_speed] <tty> <type | id> [speed] [flow|noflow] [bdaddr]\n");
+ printf("\thciattach -l\n");
+ }
+
+@@ -1252,6 +1256,7 @@ int main(int argc, char *argv[])
+ struct uart_t *u = NULL;
+ int detach, printpid, raw, opt, i, n, ld, err;
+ int to = 10;
++ int line_disc = N_HCI;
+ int init_speed = 0;
+ int send_break = 0;
+ pid_t pid;
+@@ -1264,8 +1269,11 @@ int main(int argc, char *argv[])
+ printpid = 0;
+ raw = 0;
+
+- while ((opt=getopt(argc, argv, "bnpt:s:lr")) != EOF) {
++ while ((opt=getopt(argc, argv, "bnpt:s:lra:")) != EOF) {
+ switch(opt) {
++ case 'a':
++ line_disc = atoi(optarg);
++ break;
+ case 'b':
+ send_break = 1;
+ break;
+@@ -1381,7 +1389,7 @@ int main(int argc, char *argv[])
+ alarm(to);
+ bcsp_max_retries = to;
+
+- n = init_uart(dev, u, send_break, raw);
++ n = init_uart(dev, u, send_break, raw, line_disc);
+ if (n < 0) {
+ perror("Can't initialize device");
+ exit(1);
+diff --git a/tools/hciattach.h b/tools/hciattach.h
+index fed0d11..09b534d 100644
+--- a/tools/hciattach.h
++++ b/tools/hciattach.h
+@@ -39,6 +39,7 @@
+ #define HCI_UART_H4DS 3
+ #define HCI_UART_LL 4
+ #define HCI_UART_ATH3K 5
++#define HCI_UART_STE 6
+
+ #define HCI_UART_RAW_DEVICE 0
+
+--
+1.7.9.5
+
^ permalink raw reply related
* [Buildroot] [git commit] Add init script files for snowball board
From: Peter Korsgaard @ 2012-11-30 16:00 UTC (permalink / raw)
To: buildroot
commit: http://git.buildroot.net/buildroot/commit/?id=4d4b1e4c5d98cbaafb8473c29d06b0d472cb34df
branch: http://git.buildroot.net/buildroot/commit/?id=refs/heads/master
Signed-off-by: Gregory Hermant <gregory.hermant@calao-systems.com>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
package/Config.in | 1 +
package/snowball-init/Config.in | 14 ++++++++++++++
package/snowball-init/snowball-init.mk | 15 +++++++++++++++
3 files changed, 30 insertions(+), 0 deletions(-)
diff --git a/package/Config.in b/package/Config.in
index c369f74..9c23ae3 100644
--- a/package/Config.in
+++ b/package/Config.in
@@ -554,6 +554,7 @@ source "package/empty/Config.in"
source "package/googlefontdirectory/Config.in"
source "package/mobile-broadband-provider-info/Config.in"
source "package/shared-mime-info/Config.in"
+source "package/snowball-init/Config.in"
source "package/sound-theme-borealis/Config.in"
source "package/sound-theme-freedesktop/Config.in"
endmenu
diff --git a/package/snowball-init/Config.in b/package/snowball-init/Config.in
new file mode 100644
index 0000000..99abb35
--- /dev/null
+++ b/package/snowball-init/Config.in
@@ -0,0 +1,14 @@
+config BR2_PACKAGE_SNOWBALL_INIT
+ bool "snowball-init"
+ # Runtime dependency, needed by snowball startup script
+ select BR2_PACKAGE_BLUEZ_UTILS
+ depends on !BR2_avr32
+ depends on BR2_USE_WCHAR # libglib2
+ depends on BR2_TOOLCHAIN_HAS_THREADS # dbus, alsa-lib
+ depends on BR2_USE_MMU # dbus
+ select BR2_PACKAGE_UX500_FIRMWARE
+ help
+ Snowball init scripts
+
+ http://www.igloocommunity.org
+
diff --git a/package/snowball-init/snowball-init.mk b/package/snowball-init/snowball-init.mk
new file mode 100644
index 0000000..278cacb
--- /dev/null
+++ b/package/snowball-init/snowball-init.mk
@@ -0,0 +1,15 @@
+#############################################################
+#
+# snowball-init
+#
+#############################################################
+SNOWBALL_INIT_VERSION = b064be21de25729039e5e54037bbdd2e25cfd5b7
+SNOWBALL_INIT_SITE = git://igloocommunity.org/git/bsp/snowball-init.git
+SNOWBALL_INIT_LICENSE = BSD-4c
+SNOWBALL_INIT_LICENSE_FILES = debian/copyright
+
+define SNOWBALL_INIT_INSTALL_TARGET_CMDS
+ $(INSTALL) -D -m 0755 $(@D)/snowball $(TARGET_DIR)/etc/init.d/S50snowball
+endef
+
+$(eval $(generic-package))
^ permalink raw reply related
* [Buildroot] [git commit branch/next] Add init script files for snowball board
From: Peter Korsgaard @ 2012-11-30 16:00 UTC (permalink / raw)
To: buildroot
commit: http://git.buildroot.net/buildroot/commit/?id=4d4b1e4c5d98cbaafb8473c29d06b0d472cb34df
branch: http://git.buildroot.net/buildroot/commit/?id=refs/heads/next
Signed-off-by: Gregory Hermant <gregory.hermant@calao-systems.com>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
package/Config.in | 1 +
package/snowball-init/Config.in | 14 ++++++++++++++
package/snowball-init/snowball-init.mk | 15 +++++++++++++++
3 files changed, 30 insertions(+), 0 deletions(-)
diff --git a/package/Config.in b/package/Config.in
index c369f74..9c23ae3 100644
--- a/package/Config.in
+++ b/package/Config.in
@@ -554,6 +554,7 @@ source "package/empty/Config.in"
source "package/googlefontdirectory/Config.in"
source "package/mobile-broadband-provider-info/Config.in"
source "package/shared-mime-info/Config.in"
+source "package/snowball-init/Config.in"
source "package/sound-theme-borealis/Config.in"
source "package/sound-theme-freedesktop/Config.in"
endmenu
diff --git a/package/snowball-init/Config.in b/package/snowball-init/Config.in
new file mode 100644
index 0000000..99abb35
--- /dev/null
+++ b/package/snowball-init/Config.in
@@ -0,0 +1,14 @@
+config BR2_PACKAGE_SNOWBALL_INIT
+ bool "snowball-init"
+ # Runtime dependency, needed by snowball startup script
+ select BR2_PACKAGE_BLUEZ_UTILS
+ depends on !BR2_avr32
+ depends on BR2_USE_WCHAR # libglib2
+ depends on BR2_TOOLCHAIN_HAS_THREADS # dbus, alsa-lib
+ depends on BR2_USE_MMU # dbus
+ select BR2_PACKAGE_UX500_FIRMWARE
+ help
+ Snowball init scripts
+
+ http://www.igloocommunity.org
+
diff --git a/package/snowball-init/snowball-init.mk b/package/snowball-init/snowball-init.mk
new file mode 100644
index 0000000..278cacb
--- /dev/null
+++ b/package/snowball-init/snowball-init.mk
@@ -0,0 +1,15 @@
+#############################################################
+#
+# snowball-init
+#
+#############################################################
+SNOWBALL_INIT_VERSION = b064be21de25729039e5e54037bbdd2e25cfd5b7
+SNOWBALL_INIT_SITE = git://igloocommunity.org/git/bsp/snowball-init.git
+SNOWBALL_INIT_LICENSE = BSD-4c
+SNOWBALL_INIT_LICENSE_FILES = debian/copyright
+
+define SNOWBALL_INIT_INSTALL_TARGET_CMDS
+ $(INSTALL) -D -m 0755 $(@D)/snowball $(TARGET_DIR)/etc/init.d/S50snowball
+endef
+
+$(eval $(generic-package))
^ permalink raw reply related
* [Buildroot] [git commit] Add board files for snowball
From: Peter Korsgaard @ 2012-11-30 15:59 UTC (permalink / raw)
To: buildroot
commit: http://git.buildroot.net/buildroot/commit/?id=4052e3325c240034e24cbb1b445adf32320baa98
branch: http://git.buildroot.net/buildroot/commit/?id=refs/heads/master
Signed-off-by: Gregory Hermant <gregory.hermant@calao-systems.com>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
board/calao/snowball/linux-3.4.patch | 45 ++++++++++++++++++++++++++++++++++
1 files changed, 45 insertions(+), 0 deletions(-)
diff --git a/board/calao/snowball/linux-3.4.patch b/board/calao/snowball/linux-3.4.patch
new file mode 100644
index 0000000..4e6fb51
--- /dev/null
+++ b/board/calao/snowball/linux-3.4.patch
@@ -0,0 +1,45 @@
+From 3d1a9b44b9dcd2c0f5d54c09596c96c0524d8340 Mon Sep 17 00:00:00 2001
+From: Gregory Hermant <gregory.hermant@calao-systems.com>
+Date: Tue, 13 Nov 2012 11:47:41 +0100
+Subject: [PATCH] trace-debug[stm]: Fix for BT/WLAN instability
+
+Pins under mop500_ske_pins array are used for different
+functionalities in snowball. Ex: GPIO161 pin configured
+for keypad here must stay configured as GPIO alternate
+function for operating PMU_EN pin of BT/WLAN chip in snowball.
+So forbid configuring these pins, for snowball
+
+Signed-off-by: Rajanikanth H.V <rajanikanth.hv@stericsson.com>
+Signed-off-by: Gregory Hermant <gregory.hermant@calao-systems.com>
+---
+ arch/arm/mach-ux500/board-mop500-stm.c | 7 +++++--
+ 1 file changed, 5 insertions(+), 2 deletions(-)
+
+diff --git a/arch/arm/mach-ux500/board-mop500-stm.c b/arch/arm/mach-ux500/board-mop500-stm.c
+index 1bef2a0..532fb9e 100644
+--- a/arch/arm/mach-ux500/board-mop500-stm.c
++++ b/arch/arm/mach-ux500/board-mop500-stm.c
+@@ -121,7 +121,9 @@ static int stm_ste_disable_ape_on_mipi60(void)
+ if (retval)
+ STM_ERR("Failed to disable MIPI60\n");
+ else {
+- retval = nmk_config_pins(ARRAY_AND_SIZE(mop500_ske_pins));
++ if (!machine_is_snowball())
++ retval = nmk_config_pins(
++ ARRAY_AND_SIZE(mop500_ske_pins));
+ if (retval)
+ STM_ERR("Failed to enable SKE gpio\n");
+ }
+@@ -314,7 +316,8 @@ static int stm_ste_connection(enum stm_connection_type con_type)
+ /* Enable altC3 on GPIO70-74 (STMMOD) and GPIO75-76 (UARTMOD) */
+ prcmu_enable_stm_mod_uart();
+ /* Enable APE on MIPI60 */
+- retval = nmk_config_pins_sleep(ARRAY_AND_SIZE(mop500_ske_pins));
++ if (!machine_is_snowball())
++ retval = nmk_config_pins_sleep(ARRAY_AND_SIZE(mop500_ske_pins));
+ if (retval)
+ STM_ERR("Failed to disable SKE GPIO\n");
+ else {
+--
+1.7.9.5
+
^ 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