diff options
author | Martin Jansa <Martin.Jansa@gmail.com> | 2013-01-11 18:07:36 +0100 |
---|---|---|
committer | Martin Jansa <Martin.Jansa@gmail.com> | 2013-01-18 10:49:41 +0100 |
commit | 13d3e76d99dfcf53347d76b95ebff5ac7292f347 (patch) | |
tree | feadf76bc13a81a9d7c4307ff3ad51f927e3b7fe | |
parent | 1edcda74a810c631107a8ec969ecd117bcdcff07 (diff) | |
download | meta-openembedded-contrib-13d3e76d99dfcf53347d76b95ebff5ac7292f347.tar.gz |
compat-wireless: upgrade and fixup
* use INC_PR
* fix RDEPENDS
* use normal PV
* move checksums from .inc to .bb
* upgrade, because old version fails to build with a lot of errors like this:
compat-wireless-3.5-rc5-1/include/linux/compat-3.5.h:102:8: error: redefinition of 'struct tc_fq_codel_xstats'
* 3.5.4-1, 3.6.8-1 can failed when kernel option is missing:
| compat-wireless-all/3.5.4-r1.0/compat-wireless-3.5.4-1/drivers/net/ethernet/broadcom/b44.c:2342:2:
error: implicit declaration of function 'ssb_pcihost_register' [-Werror=implicit-function-declaration]
| cc1: some warnings being treated as errors
Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
-rw-r--r-- | meta-oe/recipes-kernel/compat-wireless/compat-wireless-all/0001-ath5k-fix-compilation-without-CONFIG_PCI.patch (renamed from meta-oe/recipes-kernel/compat-wireless/files/0001-ath5k-fix-compilation-without-CONFIG_PCI.patch) | 0 | ||||
-rw-r--r-- | meta-oe/recipes-kernel/compat-wireless/compat-wireless-all_0.bb | 1 | ||||
-rw-r--r-- | meta-oe/recipes-kernel/compat-wireless/compat-wireless-all_3.6.8.bb | 5 | ||||
-rw-r--r-- | meta-oe/recipes-kernel/compat-wireless/compat-wireless.inc | 14 |
4 files changed, 10 insertions, 10 deletions
diff --git a/meta-oe/recipes-kernel/compat-wireless/files/0001-ath5k-fix-compilation-without-CONFIG_PCI.patch b/meta-oe/recipes-kernel/compat-wireless/compat-wireless-all/0001-ath5k-fix-compilation-without-CONFIG_PCI.patch index 3a51266d08..3a51266d08 100644 --- a/meta-oe/recipes-kernel/compat-wireless/files/0001-ath5k-fix-compilation-without-CONFIG_PCI.patch +++ b/meta-oe/recipes-kernel/compat-wireless/compat-wireless-all/0001-ath5k-fix-compilation-without-CONFIG_PCI.patch diff --git a/meta-oe/recipes-kernel/compat-wireless/compat-wireless-all_0.bb b/meta-oe/recipes-kernel/compat-wireless/compat-wireless-all_0.bb deleted file mode 100644 index 1d3395f9ec..0000000000 --- a/meta-oe/recipes-kernel/compat-wireless/compat-wireless-all_0.bb +++ /dev/null @@ -1 +0,0 @@ -include compat-wireless.inc diff --git a/meta-oe/recipes-kernel/compat-wireless/compat-wireless-all_3.6.8.bb b/meta-oe/recipes-kernel/compat-wireless/compat-wireless-all_3.6.8.bb new file mode 100644 index 0000000000..0c407defcf --- /dev/null +++ b/meta-oe/recipes-kernel/compat-wireless/compat-wireless-all_3.6.8.bb @@ -0,0 +1,5 @@ +include compat-wireless.inc +PR = "${INC_PR}.0" + +SRC_URI[md5sum] = "f02849a795137438238b4d166609eacc" +SRC_URI[sha256sum] = "9bbbc72bf0adf73012f377caa38147e90f6d77ef0369b52f9a687bc66bbfbcfa" diff --git a/meta-oe/recipes-kernel/compat-wireless/compat-wireless.inc b/meta-oe/recipes-kernel/compat-wireless/compat-wireless.inc index faf1aabe63..30d52cc19b 100644 --- a/meta-oe/recipes-kernel/compat-wireless/compat-wireless.inc +++ b/meta-oe/recipes-kernel/compat-wireless/compat-wireless.inc @@ -3,18 +3,17 @@ HOMEPAGE = "http://wireless.kernel.org/en/users/Download" SECTION = "kernel/modules" LICENSE = "GPLv2" LIC_FILES_CHKSUM = "file://COPYRIGHT;md5=d7810fab7487fb0aad327b76f1be7cd7" -RDEPENDS = "wireless-tools" -PR = "r0" +RDEPENDS_${PN} = "wireless-tools" +INC_PR = "r1" -COMPAT_WIRELESS_VERSION = "3.5-rc5-1" +COMPAT_WIRELESS_VERSION = "${PV}-1" +SHRT_VER = "${@d.getVar('PV',1).split('.')[0]}.${@d.getVar('PV',1).split('.')[1]}" SRC_URI = " \ - http://www.orbit-lab.org/kernel/compat-wireless-3-stable/v3.5/compat-wireless-${COMPAT_WIRELESS_VERSION}.tar.bz2 \ + http://www.orbit-lab.org/kernel/compat-wireless-3-stable/v${SHRT_VER}/compat-wireless-${COMPAT_WIRELESS_VERSION}.tar.bz2 \ file://0001-ath5k-fix-compilation-without-CONFIG_PCI.patch \ " -PV = "${COMPAT_WIRELESS_VERSION}" - S = "${WORKDIR}/compat-wireless-${COMPAT_WIRELESS_VERSION}" inherit module @@ -28,6 +27,3 @@ do_configure_append() { do_install() { oe_runmake DEPMOD=echo DESTDIR="${D}" INSTALL_MOD_PATH="${D}" LDFLAGS="" install-modules } - -SRC_URI[md5sum] = "5d26bb5fd830ba67e920e0e4b2cff284" -SRC_URI[sha256sum] = "f77ec3afd7c8fb1d9583cb5c82cdc683816c7fc43cebebc1f0f029d172fcce9a" |