--- /dev/null
+DESCRIPTION = "Universal Hardware Driver Firmware"
+HOMEPAGE = "http://www.ettus.com"
+LICENSE = "GPLv3"
+
+INC_PR = "r0"
+
+PACKAGE_ARCH = "all"
+
+SRC_URI = "http://www.ettus.com/downloads/uhd_images/UHD-images-${PV}/UHD-images-${PV}-Linux.tar.gz"
+
+S = ${WORKDIR}/UHD-images-${PV}-Linux
+
+do_install() {
+ install -d ${D}${datadir}/uhd/images
+ install -m 0644 ${S}/share/uhd/images/* ${D}${datadir}/uhd/images
+}
+
+PACKAGES = "${PN}"
+FILES_${PN} = ${datadir}/uhd/images
+
+++ /dev/null
-DESCRIPTION = "Universal Hardware Driver Firmware"
-HOMEPAGE = "http://www.ettus.com"
-LICENSE = "GPLv3"
-
-SRC_URI = "http://www.ettus.com/downloads/uhd_images/UHD-images-20100901.003255.b5461fc%20--%20most%20recent/UHD-images-20100901.003255.b5461fc-Linux.tar.gz"
-
-# Yes, matching the directory name to package version is annoying
-S = ${WORKDIR}/UHD-images-20100901.003255.b5461fc-Linux
-
-do_install() {
- install -d ${D}${datadir}/uhd/images
- install -m 0644 ${S}/share/uhd/images/* ${D}${datadir}/uhd/images
-}
-
-PACKAGES = "${PN}"
-FILES_${PN} = ${datadir}/uhd/images
-
-SRC_URI[md5sum] = "8945f57993da07f18568145f17bb5927"
-SRC_URI[sha256sum] = "2a19fa33d5461b44ab25c2f80f4916269d320b8f58988d2d72a0865c1da93132"
-
--- /dev/null
+require openembedded/recipes/uhd/uhd-firmware.inc
+
+PR = "${INC_PR}.0"
+
+SRC_URI[md5sum] = "6db20f93e3c4646395bd6e8260e2261f"
+SRC_URI[sha256sum] = "4c73655519cd9f4e49e5727f094b463850b03db13d91a8b0429b789e74a9deea"
+