diff options
| -rw-r--r-- | recipes/udev/udev-compat141_141.bb | 19 | ||||
| -rw-r--r-- | recipes/udev/udev.inc | 6 | ||||
| -rw-r--r-- | recipes/udev/udev_141.bb | 2 | ||||
| -rw-r--r-- | recipes/udev/udev_151.bb | 6 | ||||
| -rw-r--r-- | recipes/udev/udev_154.bb | 6 |
5 files changed, 25 insertions, 14 deletions
diff --git a/recipes/udev/udev-compat141_141.bb b/recipes/udev/udev-compat141_141.bb index 3eb99e8a9a..2411fc6f72 100644 --- a/recipes/udev/udev-compat141_141.bb +++ b/recipes/udev/udev-compat141_141.bb @@ -1,18 +1,23 @@ # To use this package, you need: -# - udev main package with init scrit that supports udev-compat-wrapper (enable per-platform in the udev.inc and udev*.bb files) -# - this package must be embedded into the image (otherwise system will refuse to boot) -# - only one compat package is supported (pick the newest udev that supports your oldest kernel) +# - udev main package with init script that supports udev-compat-wrapper +# (enable per-platform in the udev.inc and udev*.bb files) +# - this package must be embedded into the image +# (otherwise system will refuse to boot) +# - only one compat package is supported (pick the newest udev that +# supports your oldest kernel and set is as +# PREFERRED_PROVIDER_udev-compat in your machine config) # FILESPATHPKG =. "udev-${PV}:udev:" require udev_141.bb S = "${WORKDIR}/udev-${PV}" DESCRIPTION = "udev compatibility helper package for systems that run old kernels" PACKAGES = "${PN} ${PN}-dbg" +PROVIDES = "udev-compat" -# Need udev with udev-compat-wrapper support. -RDEPENDS_${PN} += "udev-compat-wrapper" +# Need udev with udev-compat-wrapper support and nothing else. +RDEPENDS_${PN} = "udev-compat-wrapper" # Remove hotplug RPROVIDES -RPROVIDES_${PN} = "" +RPROVIDES_${PN} = "udev-compat" # We cannot use newer library: udev_monitor_new_from_netlink_compat() will fail. # We cannot use older udev_monitor_new_from_netlink_compat(): Structures are incompatible. @@ -28,5 +33,5 @@ do_install_append () { rmdir ${D}${prefix} 2>/dev/null || true } -# Remove udev init script installation +# Remove udev init script installation. INITSCRIPT_PACKAGES = "" diff --git a/recipes/udev/udev.inc b/recipes/udev/udev.inc index 2edc10b0bd..364e4deafc 100644 --- a/recipes/udev/udev.inc +++ b/recipes/udev/udev.inc @@ -43,11 +43,13 @@ EXTRA_OEMAKE = "-e \ 'EXTRAS=${UDEV_EXTRAS}' \ 'STRIP=echo'" -RPROVIDES_udev_spitz = "udev-compat-wrapper" +RPROVIDES_udev_spitz += "udev-compat-wrapper" +RDEPENDS_udev_spitz += "udev-compat" do_unpack_append_spitz() { bb.build.exec_func('do_apply_compat_wrapper', d) } -RPROVIDES_udev_akita = "udev-compat-wrapper" +RPROVIDES_udev_akita += "udev-compat-wrapper" +RDEPENDS_udev_akita += "udev-compat" do_unpack_append_akita() { bb.build.exec_func('do_apply_compat_wrapper', d) } diff --git a/recipes/udev/udev_141.bb b/recipes/udev/udev_141.bb index 798590c3b7..3ef9f7d660 100644 --- a/recipes/udev/udev_141.bb +++ b/recipes/udev/udev_141.bb @@ -7,7 +7,7 @@ DEFAULT_PREFERENCE = "-1" require udev.inc -PR = "${INC_PR}.1" +PR = "${INC_PR}.0" SRC_URI += "file://mount.blacklist \ file://run.rules \ diff --git a/recipes/udev/udev_151.bb b/recipes/udev/udev_151.bb index eb0d6a9f38..6d09ff4246 100644 --- a/recipes/udev/udev_151.bb +++ b/recipes/udev/udev_151.bb @@ -75,11 +75,13 @@ FILES_${PN}-dbg += "${usrbindir}/.debug ${usrsbindir}/.debug" FILES_${PN} += "/lib/udev* ${libdir}/ConsoleKit" FILES_${PN}-dbg += "/lib/udev/.debug" -RPROVIDES_udev_spitz = "udev-compat-wrapper" +RPROVIDES_udev_append_spitz += "udev-compat-wrapper" +RDEPENDS_udev_append_spitz += "udev-compat" do_unpack_append_spitz() { bb.build.exec_func('do_apply_compat_wrapper', d) } -RPROVIDES_udev_akita = "udev-compat-wrapper" +RPROVIDES_udev_append_akita += "udev-compat-wrapper" +RDEPENDS_udev_append_akita += "udev-compat" do_unpack_append_akita() { bb.build.exec_func('do_apply_compat_wrapper', d) } diff --git a/recipes/udev/udev_154.bb b/recipes/udev/udev_154.bb index 3cf6358819..565e202bde 100644 --- a/recipes/udev/udev_154.bb +++ b/recipes/udev/udev_154.bb @@ -76,11 +76,13 @@ FILES_${PN}-dbg += "${usrbindir}/.debug ${usrsbindir}/.debug" FILES_${PN} += "/lib/udev* ${libdir}/ConsoleKit" FILES_${PN}-dbg += "/lib/udev/.debug" -RPROVIDES_udev_spitz = "udev-compat-wrapper" +RPROVIDES_udev_spitz += "udev-compat-wrapper" +RDEPENDS_udev_spitz += "udev-compat" do_unpack_append_spitz() { bb.build.exec_func('do_apply_compat_wrapper', d) } -RPROVIDES_udev_akita = "udev-compat-wrapper" +RPROVIDES_udev_akita += "udev-compat-wrapper" +RDEPENDS_udev_akita += "udev-compat" do_unpack_append_akita() { bb.build.exec_func('do_apply_compat_wrapper', d) } |