summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorPeter Korsgaard <jacmet@sunsite.dk>2010-05-27 12:48:47 (GMT)
committer Peter Korsgaard <jacmet@sunsite.dk>2010-05-27 12:48:47 (GMT)
commit170b3d3d0550b8000cfc0cf789a5a902237353e1 (patch)
tree68548b382093de5a64dd0f09dcae5957cbd9411d
parentbbd96dbaa73a8078d876b8882d2f89d271ab3448 (diff)
downloadbuildroot-170b3d3d0550b8000cfc0cf789a5a902237353e1.tar.gz
buildroot-170b3d3d0550b8000cfc0cf789a5a902237353e1.tar.bz2
hal: dbus expat option is BR2_DBUS_EXPAT
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
-rw-r--r--CHANGES6
-rw-r--r--Config.in2
-rw-r--r--package/hal/Config.in2
3 files changed, 8 insertions, 2 deletions
diff --git a/CHANGES b/CHANGES
index 202913d..f6a4ecd 100644
--- a/CHANGES
+++ b/CHANGES
@@ -1,3 +1,9 @@
+2010.05-rc4, Not yet released:
+
+ Fixes all over the tree.
+
+ Updated/fixed packages: hal
+
2010.05-rc3, Released May 27th, 2010:
Fixes all over the tree.
diff --git a/Config.in b/Config.in
index 4d4dfc9..9451be7 100644
--- a/Config.in
+++ b/Config.in
@@ -8,7 +8,7 @@ config BR2_HAVE_DOT_CONFIG
config BR2_VERSION
string
- default "2010.05-rc3"
+ default "2010.05-rc3-git"
source "target/Config.in.arch"
source "target/device/Config.in"
diff --git a/package/hal/Config.in b/package/hal/Config.in
index f8dc9dd..1951c9d 100644
--- a/package/hal/Config.in
+++ b/package/hal/Config.in
@@ -7,7 +7,7 @@ config BR2_PACKAGE_HAL
select BR2_PACKAGE_LIBINTL if BR2_NEEDS_GETTEXT_IF_LOCALE
select BR2_PACKAGE_LIBICONV if !BR2_ENABLE_LOCALE
select BR2_PACKAGE_DBUS
- select BR2_PACKAGE_DBUS_EXPAT
+ select BR2_DBUS_EXPAT
select BR2_PACKAGE_DBUS_GLIB
select BR2_PACKAGE_HWDATA
select BR2_PACKAGE_UDEV