diff options
| author | Peter Korsgaard <peter@korsgaard.com> | 2014-02-28 14:30:23 +0100 |
|---|---|---|
| committer | Peter Korsgaard <peter@korsgaard.com> | 2014-02-28 14:30:23 +0100 |
| commit | b108fdcb83d457e5d43298fb93dbfd805d076f24 (patch) | |
| tree | 7fbd64a13fc915f5cea93708419cb3c6aa1b40ea /package/dmraid | |
| parent | a6cfaea44e5105cb66e4e797042f64335f5e7c01 (diff) | |
| parent | 9e40a1005f51d10784db295797ed270a130d79d5 (diff) | |
| download | buildroot-b108fdcb83d457e5d43298fb93dbfd805d076f24.tar.gz buildroot-b108fdcb83d457e5d43298fb93dbfd805d076f24.zip | |
Merge branch 'next'
Conflicts:
Makefile
package/dmraid/Config.in
package/gdb/Config.in.host
package/linux-headers/linux-headers.mk
package/python/python.mk
package/python3/python3.mk
package/rt-tests/Config.in
package/sdl/sdl.mk
package/systemd/systemd-01-fix-getty-unit.patch
package/systemd/systemd-02-fix-page-size.patch
package/systemd/systemd-03-uclibc-fix.patch
package/udev/Config.in
package/udisks/Config.in
package/vlc/vlc.mk
system/Config.in
Quite some merge conflicts, hopefully I didn't screw up anything.
Signed-off-by: Peter Korsgaard <peter@korsgaard.com>
Diffstat (limited to 'package/dmraid')
| -rw-r--r-- | package/dmraid/Config.in | 3 |
1 files changed, 0 insertions, 3 deletions
diff --git a/package/dmraid/Config.in b/package/dmraid/Config.in index 90aca296cc..fc370bd57d 100644 --- a/package/dmraid/Config.in +++ b/package/dmraid/Config.in @@ -3,8 +3,6 @@ config BR2_PACKAGE_DMRAID depends on BR2_LARGEFILE depends on BR2_USE_MMU # lvm2 depends on !BR2_PREFER_STATIC_LIB # lvm2 - # triggers gcc ice - depends on !BR2_arc select BR2_PACKAGE_LVM2 help dmraid discovers, activates, deactivates and displays properties @@ -16,4 +14,3 @@ config BR2_PACKAGE_DMRAID comment "dmraid needs a toolchain w/ largefile, dynamic library" depends on BR2_USE_MMU depends on !BR2_LARGEFILE || BR2_PREFER_STATIC_LIB - depends on !BR2_arc |
