bslathi19/buildroot
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'next'

Browse Source 
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>
This commit is contained in:
Peter Korsgaard
2014-02-28 14:30:23 +01:00
parent a6cfaea44e 9e40a1005f
commit b108fdcb83
238 changed files with 4279 additions and 2966 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
package/dmraid/Config.in
View File

@@ -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