diff options
| author | Peter Korsgaard <jacmet@sunsite.dk> | 2009-07-25 09:13:44 +0200 |
|---|---|---|
| committer | Peter Korsgaard <jacmet@sunsite.dk> | 2009-07-25 09:13:44 +0200 |
| commit | 441c122606e3a921a947f4126a414c9974d64533 (patch) | |
| tree | a6ad7f810150142b2d0f2a51ee49a1ddbff285a5 /package/docker | |
| parent | 8c1fc169ab7330ddaed774d1e780b9d81edb4f25 (diff) | |
| parent | 74ecbaa23da486182a1bb20b43361aaf2a478877 (diff) | |
Merge branch 'xorg' of git://git.busybox.net/~tpetazzoni/git/buildroot
Diffstat (limited to 'package/docker')
| -rw-r--r-- | package/docker/Config.in | 2 | ||||
| -rw-r--r-- | package/docker/docker.mk | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/package/docker/Config.in b/package/docker/Config.in index 1c89a79c8..02ef83c2e 100644 --- a/package/docker/Config.in +++ b/package/docker/Config.in @@ -1,6 +1,6 @@ config BR2_PACKAGE_DOCKER bool "docker" - depends on BR2_PACKAGE_XORG||BR2_PACKAGE_XORG7||BR2_PACKAGE_TINYX + depends on BR2_PACKAGE_XORG7 select BR2_PACKAGE_LIBGLIB2 help a system tray dock for X diff --git a/package/docker/docker.mk b/package/docker/docker.mk index 860cd7e81..3b8c25cfe 100644 --- a/package/docker/docker.mk +++ b/package/docker/docker.mk @@ -19,7 +19,7 @@ DOCKER_MAKE_OPT = CC=$(TARGET_CC) CXX=$(TARGET_CXX) LD=$(TARGET_LD) \ DOCKER_INSTALL_TARGET_OPT = PREFIX=$(TARGET_DIR)/usr install -DOCKER_DEPENDENCIES = uclibc host-pkgconfig libglib2 $(XSERVER) +DOCKER_DEPENDENCIES = uclibc host-pkgconfig libglib2 xserver_xorg-server $(eval $(call AUTOTARGETS,package,docker)) |