From ec69feaa65584be3e6975ef53dbd722810f238d9 Mon Sep 17 00:00:00 2001 From: Marcin Juszkiewicz Date: Tue, 13 Jan 2009 21:53:15 +0100 Subject: mpg321/mpg123: let only main package conflict --- packages/mpg123/mpg123_0.66.bb | 5 +++-- packages/mpg321/mpg321_0.2.10.bb | 5 +++-- 2 files changed, 6 insertions(+), 4 deletions(-) (limited to 'packages') diff --git a/packages/mpg123/mpg123_0.66.bb b/packages/mpg123/mpg123_0.66.bb index a92cf877a9..f766f930dc 100644 --- a/packages/mpg123/mpg123_0.66.bb +++ b/packages/mpg123/mpg123_0.66.bb @@ -3,8 +3,9 @@ for Layer 1, 2 and 3. It uses floating point math (unlike libmad)." LICENSE = "LGPL" DESCRIPTION = "multimedia" HOMEPAGE = "http://www.mpg123.de" -RCONFLICTS = "mpg321" -RREPLACES = "mpg321" +RCONFLICTS_${PN} = "mpg321" +RREPLACES_${PN} = "mpg321" +PR = "r1" SRC_URI = "${SOURCEFORGE_MIRROR}/mpg123/mpg123-${PV}.tar.bz2" diff --git a/packages/mpg321/mpg321_0.2.10.bb b/packages/mpg321/mpg321_0.2.10.bb index 018fb17b7b..cdbbd521d5 100644 --- a/packages/mpg321/mpg321_0.2.10.bb +++ b/packages/mpg321/mpg321_0.2.10.bb @@ -4,8 +4,9 @@ DEPENDS = "libmad libao" LICENSE = "GPL" AUTHOR = "Joe Drew " HOMEPAGE = "http://mpg321.sourceforge.net/" -RCONFLICTS = "mpg123" -RREPLACES = "mpg123" +RCONFLICTS_${PN} = "mpg123" +RREPLACES_${PN} = "mpg123" +PR = "r1" SRC_URI = "${SOURCEFORGE_MIRROR}/mpg321/mpg321-0.2.10.tar.gz \ file://libao.m4.patch;patch=1" -- cgit v1.2.3 From 8b2d2b1400542052f15a3c3705ccb9887c82ab82 Mon Sep 17 00:00:00 2001 From: Marcin Juszkiewicz Date: Tue, 13 Jan 2009 21:47:38 +0100 Subject: udev: move /sbin/udevadm to udev-utils udevadm is multibinary which provides udevinfo, udevsynthetize. HAL uses udevinfo to gather informations about system devices. On system where mdev (from busybox) is used as hotplug manager HAL was not able to find any device due to lack of udevinfo command. --- packages/udev/udev.inc | 4 ++-- packages/udev/udev_092.bb | 2 +- packages/udev/udev_097.bb | 2 +- packages/udev/udev_100.bb | 2 +- packages/udev/udev_118.bb | 2 +- packages/udev/udev_124.bb | 2 +- 6 files changed, 7 insertions(+), 7 deletions(-) (limited to 'packages') diff --git a/packages/udev/udev.inc b/packages/udev/udev.inc index d04b63e1e0..86f851db05 100644 --- a/packages/udev/udev.inc +++ b/packages/udev/udev.inc @@ -66,7 +66,7 @@ do_stage () { PACKAGES =+ "udev-utils libvolume-id libvolume-id-dev" FILES_libvolume-id-dev = "${includedir}/libvolume_id.h ${libdir}/libvolume_id.a ${libdir}/libvolume_id.so ${libdir}/pkgconfig/libvolume_id.pc" -FILES_udev-utils = "${usrbindir}/udevinfo ${usrbindir}/udevtest" +FILES_udev-utils = "${usrbindir}/udevinfo ${sbindir}/udevadm ${usrbindir}/udevtest" FILES_libvolume-id = "${base_libdir}/libvolume_id.so.*" -FILES_${PN} += "${usrbindir}/* ${usrsbindir}/*" +FILES_${PN} += "${usrbindir}/* ${usrsbindir}/udevd" FILES_${PN}-dbg += "${usrbindir}/.debug ${usrsbindir}/.debug" diff --git a/packages/udev/udev_092.bb b/packages/udev/udev_092.bb index 78060dbda4..37b95ca96a 100644 --- a/packages/udev/udev_092.bb +++ b/packages/udev/udev_092.bb @@ -3,7 +3,7 @@ DESCRIPTION = "udev is a daemon which dynamically creates and removes device nod the hotplug package and requires a kernel not older than 2.6.12." RPROVIDES_${PN} = "hotplug" -PR = "r22" +PR = "r23" SRC_URI = "${KERNELORG_MIRROR}/pub/linux/utils/kernel/hotplug/udev-${PV}.tar.gz \ file://noasmlinkage.patch;patch=1 \ diff --git a/packages/udev/udev_097.bb b/packages/udev/udev_097.bb index 7dce303cb7..e9a26940b3 100644 --- a/packages/udev/udev_097.bb +++ b/packages/udev/udev_097.bb @@ -8,7 +8,7 @@ used to detect the type of a file system and read its metadata." DESCRIPTION_libvolume-id-dev = "libvolume_id development headers, \ needed to link programs with libvolume_id." -PR = "r11" +PR = "r12" SRC_URI = "${KERNELORG_MIRROR}/pub/linux/utils/kernel/hotplug/udev-${PV}.tar.gz \ file://noasmlinkage.patch;patch=1 \ diff --git a/packages/udev/udev_100.bb b/packages/udev/udev_100.bb index 2aa71d6819..b0958c66b1 100644 --- a/packages/udev/udev_100.bb +++ b/packages/udev/udev_100.bb @@ -9,7 +9,7 @@ used to detect the type of a file system and read its metadata." DESCRIPTION_libvolume-id-dev = "libvolume_id development headers, \ needed to link programs with libvolume_id." -PR = "r13" +PR = "r14" SRC_URI = "${KERNELORG_MIRROR}/pub/linux/utils/kernel/hotplug/udev-${PV}.tar.gz \ file://noasmlinkage.patch;patch=1 \ diff --git a/packages/udev/udev_118.bb b/packages/udev/udev_118.bb index fbb780d089..7fcd4c546c 100644 --- a/packages/udev/udev_118.bb +++ b/packages/udev/udev_118.bb @@ -3,7 +3,7 @@ DESCRIPTION = "udev is a daemon which dynamically creates and removes device nod the hotplug package and requires a kernel not older than 2.6.12." RPROVIDES_${PN} = "hotplug" -PR = "r4" +PR = "r5" DEFAULT_PREFERENCE = "-118" diff --git a/packages/udev/udev_124.bb b/packages/udev/udev_124.bb index 9b64bdc677..515debe490 100644 --- a/packages/udev/udev_124.bb +++ b/packages/udev/udev_124.bb @@ -3,7 +3,7 @@ DESCRIPTION = "udev is a daemon which dynamically creates and removes device nod the hotplug package and requires a kernel not older than 2.6.12." RPROVIDES_${PN} = "hotplug" -PR = "r10" +PR = "r11" SRC_URI = "http://kernel.org/pub/linux/utils/kernel/hotplug/udev-${PV}.tar.gz \ file://noasmlinkage.patch;patch=1 \ -- cgit v1.2.3 From ea793d9ebd8567900c15da4f39304a71d503e2d5 Mon Sep 17 00:00:00 2001 From: Marcin Juszkiewicz Date: Tue, 13 Jan 2009 21:51:07 +0100 Subject: hal: depend on udev-utils not on udev HAL uses 'udevinfo' command which is part of udev-utils. In previous commit I made 'udevinfo' command working without installing main 'udev' package (which is not needed on systems where mdev is used as hotplug manager). --- packages/hal/hal.inc | 3 +-- packages/hal/hal_0.5.11.bb | 2 +- packages/hal/hal_0.5.9.1.bb | 5 ++--- packages/hal/hal_0.5.9.bb | 2 +- packages/hal/hal_git.bb | 5 ++--- 5 files changed, 7 insertions(+), 10 deletions(-) (limited to 'packages') diff --git a/packages/hal/hal.inc b/packages/hal/hal.inc index d0c74e84af..98d02d5a2b 100644 --- a/packages/hal/hal.inc +++ b/packages/hal/hal.inc @@ -10,8 +10,7 @@ S = "${WORKDIR}/hal-${PV}" inherit autotools pkgconfig DEPENDS = "virtual/kernel dbus-glib udev intltool intltool-native expat libusb gperf-native" -RDEPENDS += "udev hal-info" -RRECOMMENDS = "udev-utils" +RDEPENDS += "hal-info udev-utils" SRC_URI += "file://99_hal \ file://20hal \ diff --git a/packages/hal/hal_0.5.11.bb b/packages/hal/hal_0.5.11.bb index 2b56fdfca5..f51f6b0343 100644 --- a/packages/hal/hal_0.5.11.bb +++ b/packages/hal/hal_0.5.11.bb @@ -1,6 +1,6 @@ require hal.inc -PR = "r2" +PR = "r3" SRC_URI += " file://hal-right-input-h.patch;patch=1 \ file://fix-configure.diff;patch=1" diff --git a/packages/hal/hal_0.5.9.1.bb b/packages/hal/hal_0.5.9.1.bb index 8bd193c40a..ecc98e10bc 100644 --- a/packages/hal/hal_0.5.9.1.bb +++ b/packages/hal/hal_0.5.9.1.bb @@ -4,10 +4,9 @@ SECTION = "unknown" LICENSE = "GPL LGPL AFL" DEPENDS = "virtual/kernel dbus-glib udev intltool-native expat libusb-compat" -RDEPENDS_${PN} += "udev hal-info" -RRECOMMENDS_${PN} += "udev-utils" +RDEPENDS_${PN} += "udev-utils hal-info" -PR = "r8" +PR = "r9" SRC_URI = "http://freedesktop.org/~david/dist/hal-${PV}.tar.gz \ file://configure_fix.patch;patch=1 \ diff --git a/packages/hal/hal_0.5.9.bb b/packages/hal/hal_0.5.9.bb index 68ee572f25..1993304545 100644 --- a/packages/hal/hal_0.5.9.bb +++ b/packages/hal/hal_0.5.9.bb @@ -1,3 +1,3 @@ require hal.inc -PR = "r8" +PR = "r9" diff --git a/packages/hal/hal_git.bb b/packages/hal/hal_git.bb index 49ecfde9ea..5fcd7433ed 100644 --- a/packages/hal/hal_git.bb +++ b/packages/hal/hal_git.bb @@ -6,15 +6,14 @@ LICENSE = "GPL LGPL AFL" DEFAULT_PREFERENCE = "-1" DEPENDS = "virtual/kernel dbus-glib udev intltool-native expat libusb-compat" -RDEPENDS_${PN} += "udev hal-info" -RRECOMMENDS_${PN} += "udev-utils" +RDEPENDS_${PN} += "udev-utils hal-info" SRC_URI = "git://anongit.freedesktop.org/hal/;protocol=git \ file://20hal \ file://99_hal" PV = "0.5.9.1+git${SRCDATE}" -PR = "r6" +PR = "r7" S = "${WORKDIR}/git" -- cgit v1.2.3