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/gpsd | |
parent | a6cfaea44e5105cb66e4e797042f64335f5e7c01 (diff) | |
parent | 9e40a1005f51d10784db295797ed270a130d79d5 (diff) |
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/gpsd')
-rw-r--r-- | package/gpsd/gpsd.mk | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/package/gpsd/gpsd.mk b/package/gpsd/gpsd.mk index efc8d37b2..0f655ba28 100644 --- a/package/gpsd/gpsd.mk +++ b/package/gpsd/gpsd.mk @@ -222,7 +222,7 @@ define GPSD_INSTALL_STAGING_CMDS install) endef -ifeq ($(BR2_ROOTFS_DEVICE_CREATION_DYNAMIC_UDEV),y) +ifeq ($(BR2_PACKAGE_HAS_UDEV),y) define GPSD_INSTALL_UDEV_RULES (cd $(@D); \ $(GPSD_SCONS_ENV) \ |