4 files changed, 42 insertions, 32 deletions
diff --git a/recipes/linux-firmware/linux-firmware_git.bb b/recipes/linux-firmware/linux-firmware_git.bb
new file mode 100644
index 0000000000..2f408409aa
--- /dev/null
+++ b/recipes/linux-firmware/linux-firmware_git.bb
@@ -0,0 +1,22 @@
+DESCRIPTION = "Firmware files for use with Linux kernel"
+
+PR_append = "+gitr${SRCREV}"
+SRCREV = "80a203275fc368db0a5f166c42dd35a4a22f2453"
+
+SRC_URI = "git://git.kernel.org/pub/scm/linux/kernel/git/dwmw2/linux-firmware.git;protocol=git"
+
+S = "${WORKDIR}/git"
+
+do_compile() {
+	:
+}
+
+do_install() {
+	install -d  ${D}/lib/firmware/
+	cp -rpP * ${D}/lib/firmware/
+}
+
+FILES_${PN} += "/lib/firmware/*"
+PACKAGE_ARCH = "all"
+
+
diff --git a/recipes/linux-firmware/zd1211-firmware_1.4.bb b/recipes/linux-firmware/zd1211-firmware_1.4.bb
new file mode 100644
index 0000000000..c297921373
--- /dev/null
+++ b/recipes/linux-firmware/zd1211-firmware_1.4.bb
@@ -0,0 +1,20 @@
+DESCRIPTION = "zd1211 wifi files for the Linux kernel"
+HOMEPAGE = "http://zd1211.ath.cx/"
+LICENSE = "GPL"
+
+SRC_URI = "${SOURCEFORGE_MIRROR}/zd1211/zd1211-firmware-${PV}.tar.bz2"
+
+S = "${WORKDIR}"
+
+do_compile() {
+	:
+}
+
+do_install() {
+	install -d  ${D}/lib/firmware/zd1211
+	cp -rpP zd1211-firmware/* ${D}/lib/firmware/zd1211
+}
+
+FILES_${PN} += "/lib/firmware/zd1211/*"
+PACKAGE_ARCH = "all"
+
diff --git a/recipes/zd1211/zd1211-firmware_1.3.bb b/recipes/zd1211/zd1211-firmware_1.3.bb
deleted file mode 100644
index 372135d471..0000000000
--- a/recipes/zd1211/zd1211-firmware_1.3.bb
+++ /dev/null
@@ -1,16 +0,0 @@
-DESCRIPTION = "ZyDAS ZD1211 Firmware"
-HOMEPAGE = "http://zd1211.ath.cx/"
-SECTION = "net"
-PRIORITY = "optional"
-LICENSE = "GPL"
-
-SRC_URI = "${SOURCEFORGE_MIRROR}/zd1211/zd1211-firmware${PV}.tar.bz2"
-
-S = "${WORKDIR}/${PN}"
-
-do_install() {
-	install -d -m 0755 ${D}/lib/firmware/zd1211
-	install -m 0644 ${S}/zd1211* ${D}/lib/firmware/zd1211/
-}
-
-FILES_${PN} = "/lib/firmware"
diff --git a/recipes/zd1211/zd1211-firmware_1.4.bb b/recipes/zd1211/zd1211-firmware_1.4.bb
deleted file mode 100644
index b32ff2101b..0000000000
--- a/recipes/zd1211/zd1211-firmware_1.4.bb
+++ /dev/null
@@ -1,16 +0,0 @@
-DESCRIPTION = "ZyDAS ZD1211 Firmware"
-HOMEPAGE = "http://zd1211.ath.cx/"
-SECTION = "net"
-PRIORITY = "optional"
-LICENSE = "GPL"
-
-SRC_URI = "${SOURCEFORGE_MIRROR}/zd1211/zd1211-firmware-${PV}.tar.bz2"
-
-S = "${WORKDIR}/${PN}"
-
-do_install() {
-	install -d -m 0755 ${D}/lib/firmware/zd1211
-	install -m 0644 ${S}/zd1211* ${D}/lib/firmware/zd1211/
-}
-
-FILES_${PN} = "/lib/firmware"