From: Jan Kiszka <[email protected]> With latest Isar and latest xradio commit, we can drop both of our local patches.
Signed-off-by: Jan Kiszka <[email protected]> --- ...Adjust-wrapping-of-ieee80211_nullfunc_get.patch | 28 ------------------ .../0002-Makefile-Add-proper-build-targets.patch | 34 ---------------------- recipes-kernel/xradio/xradio.bb | 4 +-- 3 files changed, 1 insertion(+), 65 deletions(-) delete mode 100644 recipes-kernel/xradio/files/0001-Adjust-wrapping-of-ieee80211_nullfunc_get.patch delete mode 100644 recipes-kernel/xradio/files/0002-Makefile-Add-proper-build-targets.patch diff --git a/recipes-kernel/xradio/files/0001-Adjust-wrapping-of-ieee80211_nullfunc_get.patch b/recipes-kernel/xradio/files/0001-Adjust-wrapping-of-ieee80211_nullfunc_get.patch deleted file mode 100644 index 9254e9e..0000000 --- a/recipes-kernel/xradio/files/0001-Adjust-wrapping-of-ieee80211_nullfunc_get.patch +++ /dev/null @@ -1,28 +0,0 @@ -From 6265e69f787a4e2b63aa9e5d1def00ea52898e53 Mon Sep 17 00:00:00 2001 -From: Jan Kiszka <[email protected]> -Date: Sun, 17 Jun 2018 12:04:12 +0200 -Subject: [PATCH 1/2] Adjust wrapping of ieee80211_nullfunc_get - -The three-argument change got merged into 4.14.17 as well. - -Signed-off-by: Jan Kiszka <[email protected]> ---- - ap.c | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/ap.c b/ap.c -index b64078e..d18b48d 100644 ---- a/ap.c -+++ b/ap.c -@@ -1173,7 +1173,7 @@ static int xradio_upload_null(struct xradio_vif *priv) - .rate = 0xFF, - }; - --#if (LINUX_VERSION_CODE >= KERNEL_VERSION(4, 15, 0)) -+#if (LINUX_VERSION_CODE >= KERNEL_VERSION(4, 14, 17)) - frame.skb = ieee80211_nullfunc_get(priv->hw, priv->vif, false); - #else - frame.skb = ieee80211_nullfunc_get(priv->hw, priv->vif); --- -2.13.7 - diff --git a/recipes-kernel/xradio/files/0002-Makefile-Add-proper-build-targets.patch b/recipes-kernel/xradio/files/0002-Makefile-Add-proper-build-targets.patch deleted file mode 100644 index 715fc69..0000000 --- a/recipes-kernel/xradio/files/0002-Makefile-Add-proper-build-targets.patch +++ /dev/null @@ -1,34 +0,0 @@ -From 7da57801878ccee31517108d9d08e6a33ceeec37 Mon Sep 17 00:00:00 2001 -From: Jan Kiszka <[email protected]> -Date: Sun, 17 Jun 2018 12:25:56 +0200 -Subject: [PATCH 2/2] Makefile: Add proper build targets - -This allows to build and install the module by just providing KDIR to -make. It also respects DESTDIR to ease cross-installation. - -Signed-off-by: Jan Kiszka <[email protected]> ---- - Makefile | 10 ++++++++++ - 1 file changed, 10 insertions(+) - -diff --git a/Makefile b/Makefile -index fd15d31..9188e5f 100644 ---- a/Makefile -+++ b/Makefile -@@ -50,3 +50,13 @@ ccflags-y += -DXRADIO_USE_LONG_KEEP_ALIVE_PERIOD - ldflags-y += --strip-debug - - obj-$(CONFIG_XRADIO) += xradio_wlan.o -+ -+INSTALL_MOD_PATH ?= $(DESTDIR) -+export INSTALL_MOD_PATH -+ -+modules modules_install clean: -+ $(MAKE) -C $(KDIR) M=$(PWD) $@ -+ -+install: modules_install -+ -+.PHONY: modules modules_install install clean --- -2.13.7 - diff --git a/recipes-kernel/xradio/xradio.bb b/recipes-kernel/xradio/xradio.bb index e8d1d4c..40fb32f 100644 --- a/recipes-kernel/xradio/xradio.bb +++ b/recipes-kernel/xradio/xradio.bb @@ -15,13 +15,11 @@ FW_URL = "https://github.com/armbian/firmware/blob/7172b4b6608b131cbd6c60253c78a SRC_URI += " \ git://github.com/fifteenhex/xradio \ - file://0001-Adjust-wrapping-of-ieee80211_nullfunc_get.patch \ - file://0002-Makefile-Add-proper-build-targets.patch \ ${FW_URL}/boot_xr819.bin?raw=true;downloadfilename=boot_xr819.bin;sha256sum=6583350b3eb12f70fc6d6081426717bd0019b55c6558ffe820c1548f0702bb8c \ ${FW_URL}/fw_xr819.bin?raw=true;downloadfilename=fw_xr819.bin;sha256sum=4954ceb85807959c42e82c432109455bd9eabe95971402299a16d77ddd7d79f5 \ ${FW_URL}/sdd_xr819.bin?raw=true;downloadfilename=sdd_xr819.bin;sha256sum=84d3fb3ca8e5d25a0c113a5063bccbeb5b53da230a0afa236b5b625f37db5161 \ file://debian/xradio.install" -SRCREV = "3ffc0f729454a5d118d6118974ae925beeb521c1" +SRCREV = "b7789c274091344eeff47cf34a48e0b225de852b" S = "${WORKDIR}/git" -- 2.16.4 -- You received this message because you are subscribed to the Google Groups "Jailhouse" group. To unsubscribe from this group and stop receiving emails from it, send an email to [email protected]. For more options, visit https://groups.google.com/d/optout.
